Mercurial > qqw

changeset 64:202281d7730b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up the messages
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Sun, 17 Feb 2013 19:06:08 +0100
parents 1166d58d3c73
children 35a4bee36afe
files dw.js index.html
diffstat 2 files changed, 13 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/dw.js	Sun Feb 17 18:57:56 2013 +0100
+++ b/dw.js	Sun Feb 17 19:06:08 2013 +0100
@@ -236,13 +236,11 @@
             var ny = self.y + DY[facing];
             var blocked = false;
             var locked = false;
+            var message;
+            message = module.field.get_prop(nx, ny, 'message');
             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)) {
@@ -253,19 +251,21 @@
                             sprite.set_image(s);
                         };
                     };
-                    var text = module.field.get_prop(nx, ny, 'unlock_message');
-                    if (text !== void 0) {
-                        module.Message(text);
-                    };
+                    message = module.field.get_prop(nx, ny, 'unlock_message');
                 } else {
                     locked = true;
+                    if (!message) {
+                        message = "You need " + unlock + ".";
+                    }
                 };
             };
             if (!locked) {
                 var give = module.field.get_prop(nx, ny, 'give');
                 if (give) {
                     if (!self.has_item(give)) {
-                        module.Message("You have " + give + ".");
+                        if (!message) {
+                            message = "You have " + give + ".";
+                        };
                         self.add_item(give);
                         var s = module.field.get_prop(nx, ny, 'give_sprite');
                         if (s !== void 0) {
@@ -282,6 +282,9 @@
                 self.y = ny;
                 self.steps = 8;
             };
+            if (message !== void 0) {
+                module.Message(message);
+            };
         };
 
         self.has_item = function (item) {
--- a/index.html	Sun Feb 17 18:57:56 2013 +0100
+++ b/index.html	Sun Feb 17 19:06:08 2013 +0100
@@ -92,7 +92,7 @@
                 'sprite': "locked.png",
                 'unlock': "key",
                 'unlock_sprite': "open_bars.png",
-                'message': "You need a key",
+                'message': "You have to find a key",
                 'unlock_message': "The gate is open",
             },
             'k': {