Changeset 371:21c1c329f8e3 for nagslang/protagonist.py

Timestamp:

Sep 6, 2013, 7:56:57 PM (7 years ago)

Author:

Jeremy Thurgood <firxen@…>

Branch:

default

Message:

Automatic weapons.

File:

• nagslang/protagonist.py (modified) (6 diffs)

nagslang/protagonist.py

@@ -9 +9 @@
     PROTAGONIST_HEALTH_MIN_LEVEL, PROTAGONIST_HEALTH_MAX_LEVEL,
     NON_GAME_OBJECT_COLLIDERS, BULLET_DAMAGE, BULLET_SPEED, CLAW_DAMAGE,
-    CMD_TOGGLE_FORM, CMD_ATTACK, CMD_ACTION)
+    CMD_TOGGLE_FORM, CMD_ACTION)
 from nagslang.events import FireEvent, ClawEvent
 from nagslang.game_object import GameObject, Physicser, make_body
@@ -79 +79 @@
         self.is_moving = False
         self.changing_sequence = []
-        self.change_delay = 0
+        self.add_timer('attack_cooldown', 0.2)
+        self.add_timer('change_delay', 0.1)
 
         self.go_human()
@@ -188 +189 @@
         return obj
 
+    def handle_attack_key_down(self):
+        if self.changing_sequence or self.check_timer('attack_cooldown'):
+            return
+        self.start_timer('attack_cooldown')
+        self.world.attacks += 1
+        self.attack()
+
     def handle_keypress(self, key_command):
         if self.changing_sequence:
-            print "Changing, can't act."
             return
         if key_command == CMD_TOGGLE_FORM:
             self.world.transformations += 1
             self.toggle_form()
-        if key_command == CMD_ATTACK:
-            self.world.attacks += 1
-            self.attack()
         if key_command == CMD_ACTION:
             self.perform_action()
@@ -256 +260 @@
 
     def toggle_form(self):
-        if self.change_delay:
+        if self.check_timer('change_delay'):
             return
         self.changing_sequence.extend(self.CHANGING_SEQUENCE[self.form])
@@ -353 +357 @@
             self.health_level = PROTAGONIST_HEALTH_MAX_LEVEL
 
+    def _decrement_timer(self, timer, dt):
+        if self._timers[timer] > 0:
+            self._timers[timer] -= dt
+        if self._timers[timer] < 0:
+            self._timers[timer] = 0
+
     def update(self, dt):
-        if self.change_delay > 0:
-            self.change_delay -= 1
         if self.changing_sequence:
             self._go_to_next_form()
@@ -366 +374 @@
         if self.in_human_form() and not self.changing_sequence:
             self.toggle_form()
-        self.change_delay = 2
+        self.start_timer('change_delay')