Mercurial > nagslang

changeset 541:a5ef90d7db2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author David Sharpe <decoydavid@gmail.com>
date Sat, 07 Sep 2013 21:22:35 +0200
parents 57a6ce38f8ea (current diff) 37f018f70758 (diff)
children 08721c50e7ec 06ed0160cd92
files
diffstat 5 files changed, 120 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/data/levels/alientunnel3	Sat Sep 07 21:22:07 2013 +0200
+++ b/data/levels/alientunnel3	Sat Sep 07 21:22:35 2013 +0200
@@ -40,8 +40,8 @@
   name: 3to2
 - args:
   - [350, 1050]
-  - alientunnel3
-  - [375, 1025]
+  - finale
+  - [2075, 725]
   - 135
   - keycard_white
   classname: KeyedDoor
--- a/data/levels/crew	Sat Sep 07 21:22:07 2013 +0200
+++ b/data/levels/crew	Sat Sep 07 21:22:35 2013 +0200
@@ -45,6 +45,61 @@
   - 300
   classname: ChargingAlien
   name: charging_9
+- args:
+  - [834, 1842]
+  - [500, 500]
+  classname: PatrollingAlien
+  name: patrol_1
+- args:
+  - [740, 2122]
+  - [500, 500]
+  classname: PatrollingAlien
+  name: patrol_1
+- args:
+  - [936, 1668]
+  - [900, 900]
+  classname: PatrollingAlien
+  name: patrol_2
+- args:
+  - [624, 1716]
+  - [900, 900]
+  classname: PatrollingAlien
+  name: patrol_3
+- args:
+  - [1024, 1788]
+  - [900, 900]
+  classname: PatrollingAlien
+  name: patrol_4
+- args:
+  - [748, 1640]
+  - [900, 900]
+  classname: PatrollingAlien
+  name: patrol_5
+- args:
+  - [572, 2016]
+  - [900, 900]
+  classname: PatrollingAlien
+  name: patrol_6
+- args:
+  - [552, 1864]
+  - [900, 900]
+  classname: PatrollingAlien
+  name: patrol_7
+- args:
+  - [1044, 1936]
+  - [900, 900]
+  classname: PatrollingAlien
+  name: patrol_8
+- args:
+  - [932, 2072]
+  - [900, 900]
+  classname: PatrollingAlien
+  name: patrol_9
+- args:
+  - [740, 1938]
+  - [900, 900]
+  classname: PatrollingAlien
+  name: patrol_10
 game_objects:
 - args:
   - [730, 936]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/data/levels/finale	Sat Sep 07 21:22:35 2013 +0200
@@ -0,0 +1,51 @@
+base_tile: tiles/alien_tile.png
+enemies: []
+game_objects:
+- args:
+  - [2100, 700]
+  - alientunnel3
+  - [375, 1025]
+  - 135
+  classname: Door
+  name: from3
+- args:
+  - [1000, 400]
+  - - [1000, 400]
+    - [1400, 1100]
+    - [1800, 400]
+  classname: AcidFloor
+  name: acid_1
+- args:
+  - [1000, 2400]
+  - - [1800, 2400]
+    - [1400, 1700]
+    - [1000, 2400]
+  classname: AcidFloor
+  name: acid_2
+- args:
+  - [400, 1800]
+  - - [400, 1800]
+    - [1100, 1400]
+    - [400, 1000]
+  classname: AcidFloor
+  name: acid_3
+- args:
+  - [2400, 1800]
+  - - [2400, 1000]
+    - [1700, 1400]
+    - [2400, 1800]
+  classname: AcidFloor
+  name: acid_4
+lines: []
+polygons:
+  1:
+  - [1000, 2400]
+  - [1800, 2400]
+  - [2400, 1800]
+  - [2400, 1000]
+  - [1800, 400]
+  - [1000, 400]
+  - [400, 1000]
+  - [400, 1800]
+  - [1000, 2400]
+size: [2800, 2800]
--- a/nagslang/collectable.py	Sat Sep 07 21:22:07 2013 +0200
+++ b/nagslang/collectable.py	Sat Sep 07 21:22:35 2013 +0200
@@ -41,7 +41,7 @@
     def _object(self, protagonist):
         AddDrawableEvent.post(EphemeralNote(
             "You can't get a grip on it, but you have no pockets in this form"
-            " anyway.", 2))
+            " anyway.", 3))
 
     def update(self, dt):
         if self.collected:
--- a/nagslang/protagonist.py	Sat Sep 07 21:22:07 2013 +0200
+++ b/nagslang/protagonist.py	Sat Sep 07 21:22:35 2013 +0200
@@ -189,7 +189,11 @@
         return obj
 
     def handle_attack_key_down(self):
-        if self.changing_sequence or self.check_timer('attack_cooldown'):
+        if self.changing_sequence:
+            self.fire_note(
+                "You can't do anything until your form has stabilised.")
+            return
+        if self.check_timer('attack_cooldown'):
             return
         self.start_timer('attack_cooldown')
         self.world.attacks += 1
@@ -197,7 +201,8 @@
 
     def handle_keypress(self, key_command):
         if self.changing_sequence:
-            return
+            self.fire_note(
+                "You can't do anything until your form has stabilised.")
         if key_command == CMD_TOGGLE_FORM:
             self.world.transformations += 1
             self.toggle_form()
@@ -301,7 +306,7 @@
 
     def shoot(self):
         if not self.has_item('gun'):
-            AddDrawableEvent.post(EphemeralNote('You are not armed.', 1))
+            self.fire_note('You are not armed.')
             return
         vec = vec_from_angle(self.angle, BULLET_SPEED)
         return Result(add=(Bullet(self.get_space(), self.physicser.position,
@@ -374,3 +379,6 @@
         if self.in_human_form() and not self.changing_sequence:
             self.toggle_form()
         self.start_timer('change_delay')
+
+    def fire_note(self, msg, secs=1):
+        AddDrawableEvent.post(EphemeralNote(msg, secs))