Merge pull request #274 from PanduhBeer/master

Updating Thelda

Author: TinyCircuits

Thelda/Thelda.py

@@ -1,10 +1,13 @@
-import thumby
 import gc
+import thumby
+gc.collect()
 import json
+gc.collect()
 from sys import path
 path.append("/Games/Thelda")
 # import thumbyHardware
 import fonthandler
+gc.collect()
 from player import Player
 gc.collect()
 from enemycontroller import EnemyController
@@ -35,6 +38,7 @@ def loadgame():
     with open("/Games/Thelda/save.json", 'r') as savefile:
         thisdata = json.load(savefile)
         return thisdata
+gc.collect()
 
 title_screen = bytearray([0,252,14,246,26,234,234,234,106,106,106,234,106,234,106,234,106,234,234,234,234,106,234,234,234,106,234,234,234,106,106,234,234,106,234,234,234,106,106,234,234,106,106,234,234,234,106,106,106,234,106,106,106,234,234,234,234,234,234,234,234,234,234,234,234,234,234,26,22,14,252,0,
            0,255,0,255,0,255,255,255,159,164,183,55,244,246,52,55,52,4,5,207,247,52,5,197,63,196,244,53,7,196,13,244,247,20,20,21,7,204,7,244,7,12,253,254,7,247,244,53,52,103,204,30,63,255,7,247,23,23,55,199,15,63,255,255,255,255,255,0,0,0,255,0,
@@ -115,7 +119,7 @@ def loadgame():
     thumby.display.fill(1) # Fill canvas to white
     scene_controller.build_scene(scene_controller.scene_x, scene_controller.scene_y, font_handler, thumby.display, enemy_controller)
     enemy_controller.populate_enemies(scene_controller)
-    enemy_controller.move_enemies(scene_controller)
+    enemy_controller.move_enemies(scene_controller, my_player)
     enemy_controller.attack(my_player)
     enemy_controller.display_loot(my_player, enemy_controller, thumby.display)
     if not my_player.swinging:
@@ -134,4 +138,4 @@ def loadgame():
     # print(f"Memory Free: {freemem}")
     # print(f"Keys used: {scene_controller.keys_used}")
     thumby.display.update()
-    
+    

Thelda/arcade_description.txt

@@ -7,7 +7,7 @@ It's dangerous to go alone!
 Don't forget to grab your sword from the cave on the 
 starting map screen.
 
-Currently has six unique enemies.
+Now has nine unique enemies!
 
 If you encounter an UNDER CONSTRUCTION screen, 
 simply return the way you came.
@@ -25,13 +25,15 @@ and only if you're not attacking on impact.
 THIS IS A WORK IN PROGRESS AND IS UNFINISHED
 
 The world isn't fully populated with enemies, the first 
-dungeon is still unfinished.  There is currently no actual 
-goal for the player to accomplish.  Right now, it's just an
-explorable sandbox.
+dungeon is still partially unfinished but now includes
+spike traps, gels, pushable blocks, a boss, and a 
+heart container pickup as a reward. There is currently
+no actual other goal for the player to accomplish.  
+Right now, it's mostly just an explorable sandbox.
 
-SOON:  The next update should include a larger world map,
- three more enemy types, pushable blocks, spike traps, 
-Dungeon Boss 1 and working bow and arrows.
+SOON:  The next update should include a larger world map, 
+working bow and arrows, peahats, and two other enemies, 
+the first Triforce piece, and Fairies.
 
 FUTURE:  Shops, loot changes, more enemies, more items, 
 music and more sound effects.
@@ -40,7 +42,10 @@ music and more sound effects.
 The current state of this project has been reached without
 using any AI assistance, and is a labor of love and obsession.
 
+A big thanks to anyone playing! Please feel free to find me
+on discord if you have any feedback.
+
 
 Author: PanduhBeer
-Version: 0.3.11
+Version: 0.3.2
 

Thelda/bosses.py

@@ -0,0 +1,57 @@
+from thumby import Sprite, display
+import gc
+from sys import path
+path.append("/Games/Thelda")
+from random import choice, randrange, randint
+
+
+class Aquamentus:
+    def __init__(self, x, y, identity):
+        self.identity = identity
+        self.enemy_type = "aquamentus"
+        self.x = x
+        self.y = y
+        self.damage = 1
+        self.starting_health = 6
+        self.health = 6
+        self.frozen = False
+        self.is_dead = False
+        self.attack_speed = 199
+        self.magic = []
+        self.prespawn = False
+        self.walk_distance = 0
+        self.direction = -1
+        self.blank_map = bytearray([255,255,255,255,255,255,255,255,255,255,
+           3,3,3,3,3,3,3,3,3,3])
+        self.prespawn_map = bytearray([25,233,242,252,224,222,95,219,231,15,
+           3,0,1,2,2,2,2,0,1,2])
+        self.prespawn_mask = bytearray([230,246,255,255,255,225,224,228,248,240,
+           0,1,3,1,1,1,1,3,3,1])
+        self.has_fired = False
+        self.pick_new_direction_and_distance()
+        self.move_tick = 0
+        self.spawn_animation_counter = 0
+
+    def pick_new_direction_and_distance(self):
+        self.direction = choice([-1, 1])
+        self.walk_distance = randint(1, 6)
+        self.target_x = self.x + self.direction * self.walk_distance
+        if self.direction == -1:
+            self.target_x = max(35, self.target_x)
+        else:
+            self.target_x = min(55, self.target_x)
+
+    def move(self):
+        # Move every 4 ticks
+        if self.move_tick == 0:
+            if self.direction == -1:
+                self.x = max(35, self.x - 1)
+            else:
+                self.x = min(55, self.x + 1)
+            
+            if self.x == self.target_x or (self.direction == -1 and self.x == 35) or (self.direction == 1 and self.x == 55):
+                self.pick_new_direction_and_distance()
+
+        self.move_tick = (self.move_tick + 1) % 4
+            
+    

Thelda/dungeons1.py

@@ -1,5 +1,6 @@
 from random import randint
-
+from thumby import Sprite
+from items import Heart_Container
 class NSDoorway:
     def __init__(self, x, y):
         self.doorway = bytearray([31,31,31,31,31,31])
@@ -33,11 +34,8 @@ def __init__(self, x, y, identity):
         self.y = y
         self.size_x = 5
 
-
 class Scenes80:
     def __init__(self):
-        
-        
         self.scenes = {
              "scene -797,404": {
                 "barriers": [(1, 5), (6, 5), (11, 5), (16, 5), (21, 5), (26, 5), (31, 5), (36, 5), (41, 5), (46, 5), (51, 5), (56, 5), (61, 5), (66, 5),
@@ -82,7 +80,9 @@ def __init__(self):
                 "blocks": [(46, 10), (51, 10), (56, 10), (61, 10), 
                     (56, 15), (61, 15), 
                     (56, 25), (61, 25), 
-                    (46, 30), (51, 30), (56, 30), (61, 30)], 
+                    (46, 30), (51, 30), (56, 30), (61, 30)],
+                "items": [Heart_Container(55, 20, "HC01")],
+                "enemies": {"aquamentus": [(45, 15, "D1E39")]}
             },
 
             "scene -799,400": {
@@ -236,7 +236,9 @@ def __init__(self):
                     (1, 30), (66, 30),
                     (1, 35), (6, 35),  (11, 35), (16, 35), (21, 35), (26, 35), (41, 35), (46, 35), (51, 35), (56, 35), (61, 35), (66, 35)], 
                 "doorways": [EWDoorway(1, 20), EWDoorway(66, 20), NSDoorway(33, 35)], 
-                "blocks": [(31, 20)]
+                "pushableblocks": [(31, 20, "left", "D1PB01")],
+                "blocklocks": [(1, 20, "D1PB01", "EW")],
+                "enemies": {"gel": [("D1E32"), ("D1E33"), ("D1E34")]},
             },
 
             "scene -801,405": {
@@ -248,8 +250,11 @@ def __init__(self):
                     (1, 35), (6, 35), (11, 35), (16, 35), (21, 35), (26, 35), (41, 35), (46, 35), (51, 35), (56, 35), (61, 35), (66, 35), 
                     (33, 5), (33, 35), (1, 20)], 
                 "doorways": [EWDoorway(66, 20)],
-                "blocks": [(36, 15), (31, 20), (41, 20), (36, 25)],
-                "stairs": [(36, 20)]
+                "blocks": [(36, 15), (41, 20), (36, 25)],
+                "doors": [(36, 20)],
+                "stairs": [(36, 20)], 
+                "pushableblocks": [(31, 20, "down", "D1PB02")],
+                "enemies": {"blade": [(6, 10, 25, 7, "D1E35"), (60, 10, 25, 7, "D1E36"), (6, 30, 25, 7, "D1E37"), (60, 30, 25, 7, "D1E38")]},
             },
 
             "scene -801,400": {