Mercurial > qqw

changeset 63:1166d58d3c73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverse message and unlock_message on locked tiles
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Sun, 17 Feb 2013 18:57:56 +0100
parents 7ad0d17e7f9e
children 202281d7730b
files dw.js index.html
diffstat 2 files changed, 16 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/dw.js	Sun Feb 17 18:45:16 2013 +0100
+++ b/dw.js	Sun Feb 17 18:57:56 2013 +0100
@@ -235,9 +235,14 @@
             var nx = self.x + DX[facing];
             var ny = self.y + DY[facing];
             var blocked = false;
+            var locked = false;
             if (module.field.get_prop(nx, ny, 'block')) {
                 blocked = true;
             };
+            var text =module.field.get_prop(nx, ny, 'message');
+            if (text !== void 0) {
+                module.Message(text);
+            };
             var unlock = module.field.get_prop(nx, ny, 'unlock');
             if (unlock) {
                if (self.has_item(unlock)) {
@@ -248,15 +253,19 @@
                             sprite.set_image(s);
                         };
                     };
+                    var text = module.field.get_prop(nx, ny, 'unlock_message');
+                    if (text !== void 0) {
+                        module.Message(text);
+                    };
                 } else {
-                    blocked = true;
+                    locked = true;
                 };
             };
-            if (!unlock || !blocked) {
+            if (!locked) {
                 var give = module.field.get_prop(nx, ny, 'give');
                 if (give) {
                     if (!self.has_item(give)) {
-                        module.Message("You have " + give + " now.");
+                        module.Message("You have " + give + ".");
                         self.add_item(give);
                         var s = module.field.get_prop(nx, ny, 'give_sprite');
                         if (s !== void 0) {
@@ -267,17 +276,8 @@
                         };
                     };
                 };
-                if (module.field.get_prop(nx, ny, 'message')) {
-                    var text = module.field.get_prop(nx, ny, 'message');
-                    module.Message(text);
-                };
-            } else {
-                if (module.field.get_prop(nx, ny, 'unlock_message')) {
-                    var text = module.field.get_prop(nx, ny, 'unlock_message');
-                    module.Message(text);
-                };
             };
-            if (!blocked) {
+            if (!blocked && !locked) {
                 self.x = nx;
                 self.y = ny;
                 self.steps = 8;
--- a/index.html	Sun Feb 17 18:45:16 2013 +0100
+++ b/index.html	Sun Feb 17 18:57:56 2013 +0100
@@ -92,13 +92,14 @@
                 'sprite': "locked.png",
                 'unlock': "key",
                 'unlock_sprite': "open_bars.png",
-                'message': "Open gate",
-                'unlock_message': "Locked gate",
+                'message': "You need a key",
+                'unlock_message': "The gate is open",
             },
             'k': {
                 'tile': '.',
                 'sprite': "key.png",
                 'give': "key",
+                'give_sprite': "",
             },
             'h': {
                 'tile': '.',