Mercurial > qqw

changeset 56:061a1780b9fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Locked tiles don't give items
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Sun, 17 Feb 2013 17:05:13 +0100
parents f7cb57155eb3
children ee8b3e82443b
files dw.js
diffstat 1 files changed, 16 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/dw.js	Sun Feb 17 16:38:12 2013 +0100
+++ b/dw.js	Sun Feb 17 17:05:13 2013 +0100
@@ -250,24 +250,26 @@
                     blocked = true;
                 };
             };
+            if (!unlock || !blocked) {
+                var give = module.field.get_prop(nx, ny, 'give');
+                if (give) {
+                    if (!self.has_item(give)) {
+                        module.Message("You have " + give + " now.");
+                        self.add_item(give);
+                        var s = module.field.get_prop(nx, ny, 'give_sprite');
+                        if (s !== null) {
+                            var sprite = module.find_sprite(nx, ny);
+                            if (sprite) {
+                                sprite.set_image(s);
+                            };
+                        };
+                    };
+                };
+            };
             if (module.field.get_prop(nx, ny, 'message')) {
                 var text = module.field.get_prop(nx, ny, 'message');
                 module.Message(text);
             };
-            var give = module.field.get_prop(nx, ny, 'give');
-            if (give) {
-                if (!self.has_item(give)) {
-                    module.Message("You have " + give + " now.");
-                    self.add_item(give);
-                    var s = module.field.get_prop(nx, ny, 'give_sprite');
-                    if (s !== null) {
-                        var sprite = module.find_sprite(nx, ny);
-                        if (sprite) {
-                            sprite.set_image(s);
-                        };
-                    };
-                };
-            };
             if (!blocked) {
                 self.x = nx;
                 self.y = ny;