mima-engine 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

mima/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.0"
+__version__ = "0.2.2"

mima/backend/pygame_events.py

@@ -277,16 +277,19 @@ class PygameUserInput:
         if event.type == pygame.FINGERDOWN:
             tap = time.time()
             for key, area in DEFAULT_TOUCHSCREEN_MAP.items():
+
                 if (
                     area[0][0] <= event.x < area[1][0]
                     and area[0][1] <= event.y < area[1][1]
                 ):
-                    if key == K.UP:
+                    if key == K.P1_UP:
                         self._left_finger_tap_pos = finger_pos
                         if tap - self._last_left_tap < DOUBLE_TAP_SPEED:
                             # print("Left Double Tap")
-                            self.set_key(K.SELECT)
+                            self.set_key(K.P1_SELECT)
                         self._last_left_tap = tap
+                    elif key == K.P1_L:
+                        self.set_key(K.P1_L)
                     else:
                         self.set_key(key)
                         self._right_finger_tap_pos = finger_pos
@@ -346,23 +349,23 @@ class PygameUserInput:
                 #     print("Left Single Tap")
                 #     # self.set_key(K.START)
 
-                self.unset_key(K.SELECT)
-                self.unset_key(K.RIGHT)
-                self.unset_key(K.LEFT)
-                self.unset_key(K.UP)
-                self.unset_key(K.DOWN)
-                self.unset_key(K.L)
+                self.unset_key(K.P1_SELECT)
+                self.unset_key(K.P1_RIGHT)
+                self.unset_key(K.P1_LEFT)
+                self.unset_key(K.P1_UP)
+                self.unset_key(K.P1_DOWN)
+                self.unset_key(K.P1_L)
                 # print(
                 #     f"Left Finger moved {finger_dist} "
                 #     f"({release - self._last_left_tap} s)"
                 # )
             else:
-                self.unset_key(K.START)
-                self.unset_key(K.A)
-                self.unset_key(K.B)
-                self.unset_key(K.Y)
-                self.unset_key(K.X)
-                self.unset_key(K.R)
+                self.unset_key(K.P1_START)
+                self.unset_key(K.P1_A)
+                self.unset_key(K.P1_B)
+                self.unset_key(K.P1_Y)
+                self.unset_key(K.P1_X)
+                self.unset_key(K.P1_R)
             # print(f"Right Finger Up: {finger_pos}")
             # if (
             #     SINGLE_TAP_MIN
@@ -396,45 +399,45 @@ class PygameUserInput:
         if event.type == pygame.FINGERMOTION:
             if event.x < 0.5:
                 vd = finger_pos - self._left_finger_tap_pos
-                self.unset_key(K.RIGHT)
-                self.unset_key(K.LEFT)
-                self.unset_key(K.UP)
-                self.unset_key(K.DOWN)
+                self.unset_key(K.P1_RIGHT)
+                self.unset_key(K.P1_LEFT)
+                self.unset_key(K.P1_UP)
+                self.unset_key(K.P1_DOWN)
                 if abs(vd.x) > 2 * abs(vd.y):
                     # Horizontal
                     if vd.x > 5.0:
-                        self.set_key(K.RIGHT)
-                        self.unset_key(K.LEFT)
-                        self.unset_key(K.UP)
-                        self.unset_key(K.DOWN)
+                        self.set_key(K.P1_RIGHT)
+                        self.unset_key(K.P1_LEFT)
+                        self.unset_key(K.P1_UP)
+                        self.unset_key(K.P1_DOWN)
                     elif vd.x < -5.0:
-                        self.set_key(K.LEFT)
-                        self.unset_key(K.RIGHT)
-                        self.unset_key(K.UP)
-                        self.unset_key(K.DOWN)
+                        self.set_key(K.P1_LEFT)
+                        self.unset_key(K.P1_RIGHT)
+                        self.unset_key(K.P1_UP)
+                        self.unset_key(K.P1_DOWN)
                 elif abs(vd.x) * 2 < abs(vd.y):
                     # Vertical
                     if vd.y > 5.0:
-                        self.unset_key(K.RIGHT)
-                        self.unset_key(K.LEFT)
-                        self.unset_key(K.UP)
-                        self.set_key(K.DOWN)
+                        self.unset_key(K.P1_RIGHT)
+                        self.unset_key(K.P1_LEFT)
+                        self.unset_key(K.P1_UP)
+                        self.set_key(K.P1_DOWN)
                     elif vd.y < -5.0:
-                        self.unset_key(K.LEFT)
-                        self.unset_key(K.RIGHT)
-                        self.set_key(K.UP)
-                        self.unset_key(K.DOWN)
+                        self.unset_key(K.P1_LEFT)
+                        self.unset_key(K.P1_RIGHT)
+                        self.set_key(K.P1_UP)
+                        self.unset_key(K.P1_DOWN)
                 elif abs(vd.x) * 1.05 > abs(vd.y) or abs(vd.x) < 1.05 * abs(
                     vd.y
                 ):
                     if vd.x < 0:
-                        self.set_key(K.LEFT)
+                        self.set_key(K.P1_LEFT)
                     elif vd.x > 0:
-                        self.set_key(K.RIGHT)
+                        self.set_key(K.P1_RIGHT)
                     if vd.y < 0:
-                        self.set_key(K.UP)
+                        self.set_key(K.P1_UP)
                     elif vd.y > 0:
-                        self.set_key(K.DOWN)
+                        self.set_key(K.P1_DOWN)
                 # else:
                 #     vd = finger_pos - self._right_finger_tap_pos
                 #     self.unset_key(K.A)

mima/objects/creature.py

@@ -75,7 +75,7 @@ class Creature(Dynamic):
         }
         self._light = None
 
-        self.attributes.speed = 5.0
+        # self.attributes.speed = 1.0
         # self.use_acceleration = True
         # self.use_friction = True
         # self.attributes.friction = 0.1

mima/objects/world/color_gate.py

@@ -15,28 +15,29 @@ class ColorGate(Gate):
         self,
         px: float,
         py: float,
+        name: str = "ColorGate",
+        *,
+        color: GateColor,
+        tilemap=None,
+        dyn_id: int = -1,
         tileset_name: str,
         image_name: str,
         sprite_name: str,
         graphic_state: GraphicState,
         facing_direction: Direction,
-        color: GateColor,
-        tilemap=None,
-        dyn_id: int = -1,
-        name: str = "ColorGate",
     ):
         super().__init__(
             px,
             py,
             name,
-            tileset_name,
-            image_name,
-            sprite_name,
-            graphic_state,
-            facing_direction,
-            False,
-            tilemap,
-            dyn_id,
+            tilemap=tilemap,
+            dyn_id=dyn_id,
+            tileset_name=tileset_name,
+            image_name=image_name,
+            sprite_name=sprite_name,
+            graphic_state=graphic_state,
+            facing_direction=facing_direction,
+            bombable=False,
         )
         self.color = color
         self.type = ObjectType.COLOR_GATE

mima/objects/world/gate.py

@@ -15,24 +15,28 @@ class Gate(Dynamic):
         self,
         px: float,
         py: float,
+        name: str = "Gate",
+        *,
+        tilemap=None,
+        dyn_id: int = 0,
         tileset_name: str,
         image_name: str,
         sprite_name: str,
         graphic_state: GraphicState,
         facing_direction: Direction,
         bombable: bool = False,
-        tilemap=None,
-        dyn_id: int = 0,
-        name: str = "Gate",
     ):
-        assert graphic_state in [
+        if graphic_state not in (
             GraphicState.OPEN,
             GraphicState.CLOSED,
             GraphicState.LOCKED,
-        ], (
-            f"graphic_state of Gate {name}{dyn_id} must be either 'open'"
-            f", 'closed', or 'locked', but it {graphic_state}"
-        )
+        ):
+            msg = (
+                f"graphic_state of Gate {name}{dyn_id} must be either 'open'"
+                f", 'closed', or 'locked', but it {graphic_state}"
+            )
+
+            raise ValueError(msg)
 
         super().__init__(px, py, name, tilemap, dyn_id)
 
@@ -126,6 +130,9 @@ class Gate(Dynamic):
             Gate(
                 px=px,
                 py=py,
+                name=obj.name,
+                tilemap=tilemap,
+                dyn_id=obj.object_id,
                 tileset_name=obj.get_string("tileset_name"),
                 image_name=obj.get_string("tileset_name"),
                 sprite_name=obj.get_string("sprite_name"),
@@ -136,9 +143,6 @@ class Gate(Dynamic):
                     obj.get_string("facing_direction", "south").upper()
                 ],
                 bombable=obj.get_bool("bombable"),
-                tilemap=tilemap,
-                dyn_id=obj.object_id,
-                name=obj.name,
             )
         ]
 

mima/scripts/commands/close_dialog.py

@@ -3,6 +3,7 @@ from ..command import Command
 
 class CommandCloseDialog(Command):
     def start(self):
-        self.engine.dialog_active = False
+        for player in self.players:
+            self.engine.trigger_dialog(False, player)
         self.engine.exit_dialog_active = False
         self.completed = True

mima/util/input_defaults.py

@@ -147,12 +147,12 @@ DEFAULT_JOYSTICK_MAP = {
 }
 
 DEFAULT_TOUCHSCREEN_MAP = {
-    K.UP: [[0, 0], [0.5, 1.0]],
-    K.L: [[0, 0], [0.0625, 0.1111]],
-    K.R: [[0.9375, 0], [1.0, 0.1111]],
-    K.START: [[0.5, 0], [1.0, 0.3]],
-    K.Y: [[0.5, 0.3], [0.75, 0.5]],
-    K.X: [[0.75, 0.3], [1.0, 0.5]],
-    K.B: [[0.5, 0.5], [0.75, 1.0]],
-    K.A: [[0.75, 0.5], [1.0, 1.0]],
+    K.P1_UP: [[0, 0], [0.5, 1.0]],
+    K.P1_L: [[0, 0], [0.0625, 0.1111]],
+    K.P1_R: [[0.9375, 0], [1.0, 0.1111]],
+    K.P1_START: [[0.5, 0], [1.0, 0.3]],
+    K.P1_Y: [[0.5, 0.3], [0.75, 0.5]],
+    K.P1_X: [[0.75, 0.3], [1.0, 0.5]],
+    K.P1_B: [[0.5, 0.5], [0.75, 1.0]],
+    K.P1_A: [[0.75, 0.5], [1.0, 1.0]],
 }

{mima_engine-0.2.0.dist-info → mima_engine-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mima-engine
-Version: 0.2.0
+Version: 0.2.2
 Summary: A game engine based on pygame.
 Author-email: Stephan Balduin <stephan.balduin@mailbox.org>
 Classifier: Programming Language :: Python :: 3

{mima_engine-0.2.0.dist-info → mima_engine-0.2.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mima/__init__.py,sha256=Zn1KFblwuFHiDRdRAiRnDBRkbPttWh44jKa5zG2ov0E,22
+mima/__init__.py,sha256=m6kyaNpwBcP1XYcqrelX2oS3PJuOnElOcRdBa9pEb8c,22
 mima/collision.py,sha256=-XISlbgGK9QI0Z--vm2KEsFx7QsDPrhIu0mM71AuH38,9251
 mima/engine.py,sha256=xsRtw5TRKDRMLSI342SnxgNdRdX2OZ1FRP4xA55dTls,10459
 mima/mode_engine.py,sha256=Yidqa1lTNGyNHTMpz4ysIjFRdabQj71QeNTuQDx4PSA,2259
@@ -8,7 +8,7 @@ mima/backend/pygame_assets.py,sha256=TdDmKASk1n6whwh4ONxX41kofVS_iXhsdEzCV5l8NeM
 mima/backend/pygame_audio.py,sha256=gag9bM-UT8DfYpGDYvKBn8jdnwgFU4NklEs2aNwHhRY,2365
 mima/backend/pygame_backend.py,sha256=yS_QMkugldd6vzHCoZSF6jtyGp__NkQZbiSiloN4iIs,18470
 mima/backend/pygame_camera.py,sha256=5ietEyhDryT3SBChvcY_jdsWRi09gcTg5O5mvg_15mM,2059
-mima/backend/pygame_events.py,sha256=j825eapDFS0sKJLpRwg4otVXaze7x4qL_jQXlDwCMaM,26477
+mima/backend/pygame_events.py,sha256=orxC6a3EtWKWbTMyKO-9MMrcemw8qrN7y3S6DyLyX-0,26677
 mima/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mima/maps/template.py,sha256=xBIIzf2o6ATHevfZA5b5XP-o6o71-04u7OAS4847buY,1178
 mima/maps/tile.py,sha256=ZIPtpVCrX_dnL8SKwobj_0etMCUrQxRL5d04KnEmwNQ,639
@@ -31,7 +31,7 @@ mima/objects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mima/objects/animated_sprite.py,sha256=RMhd8iALN-CdnmLDS0-WSy0Z0Gie8f2BlZ0nUMFSiA0,6784
 mima/objects/attribute_effect.py,sha256=zikOSb6-hD6Ecm4L9EyRocTyJQ7IYC0CJ9DCBxbK4cU,650
 mima/objects/attributes.py,sha256=qqIVjuIXUQDv3qtdoaRDvBnx5oUbjuPdvcGR49fHRwM,3781
-mima/objects/creature.py,sha256=0clnIjSRF4D6d9N5fVzUwIOaWWxOPnMAEY1I2YU7SG4,12553
+mima/objects/creature.py,sha256=SbyDRobooNQ6sHiHjjKkaxiBPDPkKIHKYTMHOiTK6TM,12555
 mima/objects/dynamic.py,sha256=dUKYRczqXob80Vo-YzDVoXfs32gCy3n2ragzi4wWrM8,6362
 mima/objects/loader.py,sha256=ofJQUeKF6V3R0qPQPNngc4U8FLX8bjGD1mPW__TzQ6A,4374
 mima/objects/projectile.py,sha256=xsbIcGKru1A2xZ47c8Qfl-8U708go0DPT1KUx-HiQZM,3001
@@ -44,11 +44,11 @@ mima/objects/effects/show_sprite.py,sha256=vR50nWV1LtPrje1NCOllLVMVilI03R9IcpdRC
 mima/objects/effects/walking_on_grass.py,sha256=kjBNPEapFFWr-_HZX_vgub7QasXvpPJ34rsRQqKxpOQ,1677
 mima/objects/effects/walking_on_water.py,sha256=9KbeQut852I8O_vwWB5gSf0CnMgoa5tScQijEGLUHR4,1548
 mima/objects/world/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mima/objects/world/color_gate.py,sha256=JPV5tApbHWYFQtdxWd-slCZodw6ucFvkEMT698lEigs,2029
+mima/objects/world/color_gate.py,sha256=FgS98BY10AfVF2a9Eun4nJeuWmr2NNCJCOLjTxirteA,2131
 mima/objects/world/color_switch.py,sha256=1HN1ZYWAGFuepX4ELREKfsa_1EA4Fx7siPCMxPMEVAk,3400
 mima/objects/world/container.py,sha256=r6wWoKG_6btGtqlTS_AbxKBJ_-WxSx2ixoDxRHLZleQ,6212
 mima/objects/world/floor_switch.py,sha256=Tplii1SjbQQq734Sz1d_HMWhWPlsRs-xxk6hvWLiVRg,3453
-mima/objects/world/gate.py,sha256=ZUMQ9R25twyt75ao7Te7j1LaZIiAVdpruaEgiK3iweI,5774
+mima/objects/world/gate.py,sha256=B9Enhfe-ICo7yWb9EigFO-2p9L5qyGbdHsdPu_gte7Y,5850
 mima/objects/world/light_source.py,sha256=0N8wJOnWTeYb-p-N2qD7-opEsdsfBokLvIbRWB0mSxk,4013
 mima/objects/world/logic_gate.py,sha256=WFwWoF-nQY-1gt1-4hawQkLxWzM1dtKiM2iclchRoe0,5148
 mima/objects/world/movable.py,sha256=7qxXavKIoKZN3zHTKYsQddfmf6s9U3Qte4dbvfak_KI,12041
@@ -62,7 +62,7 @@ mima/scripts/script_processor.py,sha256=IPl6oFlVAnZ2uibc9X4ffyTNwpendk4cMGZMvZDO
 mima/scripts/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mima/scripts/commands/add_quest.py,sha256=r5eCLgAarLJmtMROxLqMTryK5Bfv9wUSqsC8p0RHVkU,387
 mima/scripts/commands/change_map.py,sha256=I1_sr3iDmXDzupbZIIyt6GkkNq2rv3OF8aB3QqWStno,981
-mima/scripts/commands/close_dialog.py,sha256=-yWyEtYA41RsehJ4c-zIXhxIhR25e8GTWN20GuTnT80,207
+mima/scripts/commands/close_dialog.py,sha256=3MBCcUJxIQBbI3kuhJCZS41AaXv6ReWnR6RhwBJ91rk,255
 mima/scripts/commands/equip_weapon.py,sha256=pKx_i-b48EbrUu0-Ak65W_VH40IuQj_2SfazY-kKztQ,636
 mima/scripts/commands/give_item.py,sha256=yc6iRTy40TvdEqU6u3q4Bh0JAlHzoFs0ul9Lwt5DQ3c,688
 mima/scripts/commands/give_resource.py,sha256=J9c0hk__DY4To1BStZ5qmcEOMbAYRefNJT8Kk5WyORE,1805
@@ -111,7 +111,7 @@ mima/util/__init__.py,sha256=KMuEDnRsGr32gXED12ZyL1za6iKAuk_Tn8S3mTtpYds,42
 mima/util/colors.py,sha256=u4YVTCvSNFBhHaR9dFiMVzvE9fRM1UlW1m8gDa7oDY4,1483
 mima/util/constants.py,sha256=Sy-6vwAXJf86drHy7IxQLDXtuBbcGhuNU0-YKTUNBFM,1353
 mima/util/functions.py,sha256=GqAgT4-ATZcCvaaUyEOCeXphUu8xJXmVshAbFPJfOWI,1130
-mima/util/input_defaults.py,sha256=XHcoxzo7BPCSUTWK-kKS5OIVjqoBLHRgMWXmPE5VB4U,2617
+mima/util/input_defaults.py,sha256=6S9YlXqtvA5Q1yAFqwicyorCXcy5FEhi3AlyzqpUxAc,2641
 mima/util/logging.py,sha256=p6-C1ozlCs_sCkmykh_B0NgZtvSkcZXXseE6qA6Zwew,1197
 mima/util/property.py,sha256=o6dEWpIOWxwS_lf6MvYZSjkyI5Amo56P2JIDa7AMaRY,107
 mima/util/runtime_config.py,sha256=uRJJ4Tgr6fBv8Oc0w2oBRxWAj0ljTqhy_8Ff1blROVw,9505
@@ -122,7 +122,7 @@ mima/view/mima_mode.py,sha256=fFOcjJzaFK-3OIyqW8nTynKFVNYJcNWOF8hJe2B-t5s,21981
 mima/view/mima_scene.py,sha256=oGfyM-WLN-eQLILnIbzI0sa160BqsS8dE2UaC2qq2XY,6988
 mima/view/mima_view.py,sha256=tKLcoNWVwldoqgG3jxhI_jMsFAXzod2csXyEbhub2xI,217
 mima/view/mima_window.py,sha256=LllwqhKo1D-MoNAXJaiufTi0AacRo_QnVZX8WYUH4ds,4790
-mima_engine-0.2.0.dist-info/METADATA,sha256=oscjbQvpywuUoYE9MkygVi5kd5ltZ_LyLWILzyziHNg,487
-mima_engine-0.2.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-mima_engine-0.2.0.dist-info/top_level.txt,sha256=5t1cOdQSaPQ0jWDhKDvDXwpV2XZ_a1GSSFAIvEsG0fQ,5
-mima_engine-0.2.0.dist-info/RECORD,,
+mima_engine-0.2.2.dist-info/METADATA,sha256=sdQq2GGV9rf5MORGh8dXekYkvMWb61aWhqS3KbH3X2c,487
+mima_engine-0.2.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+mima_engine-0.2.2.dist-info/top_level.txt,sha256=5t1cOdQSaPQ0jWDhKDvDXwpV2XZ_a1GSSFAIvEsG0fQ,5
+mima_engine-0.2.2.dist-info/RECORD,,