missing bracket

[supertux.git] / data / levels / world2 / default.nut

diff --git a/data/levels/world2/default.nut b/data/levels/world2/default.nut
index f271897..4d720bd 100644 (file)
--- a/data/levels/world2/default.nut
+++ b/data/levels/world2/default.nut
@@ -1,15 +1,16 @@
-
-
-function get_gold_key()
+function add_key(key)
 {
-  add_key(KEY_GOLD);
-  end_level();
+  local keys = state.world2_keys;
+  keys[key] = true;
+  update_keys();
 }
 
 function level2_init()
 {
-  add_key(KEY_BRASS);
-  add_key(KEY_IRON);
+  foreach(name in ["air", "earth", "wood", "fire", "water"])
+  {
+    add_key(name);
+  }
   Tux.deactivate();
   Effect.sixteen_to_nine(2);
   Text.set_text(translate("---Insert Cutscene Here---"));
@@ -29,59 +30,37 @@ if(! ("world2_keys" in state))
        state.world2_keys <- {}
        
 local keys = state.world2_keys;
-if(! ("brass" in keys))
-       keys.brass <- false;
-if(! ("iron" in keys))
-       keys.iron <- false;
-if(! ("bronze" in keys))
-       keys.bronze <- false;
-if(! ("silver" in keys))
-       keys.silver <- false;
-if(! ("gold" in keys))
-       keys.gold <- false;
+foreach(name in ["air", "earth", "wood", "fire", "water"])
+{
+  if(! (name in keys))
+    keys[name] <- false;
+}
 
 /// this function updates the key images (call this if tux has collected a key)
 function update_keys()
 {
        local keys = state.world2_keys;
-       key_brass.set_action(keys.brass ? "display" : "outline");
-       key_iron.set_action(keys.iron ? "display" : "outline");
-       key_bronze.set_action(keys.bronze ? "display" : "outline");
-       key_silver.set_action(keys.silver ? "display" : "outline");
-       key_gold.set_action(keys.gold ? "display" : "outline");
+       foreach(name in ["air", "earth", "wood", "fire", "water"])
+       {
+         key[name].set_action(keys[name] ? "display" : "outline");
+       }
 }
 
+if(! ("key" in this))
+ key <- {};
+
 local x = 10;
 local y = 10;
 
-key_brass <- FloatingImage("images/objects/keys/key_brass.sprite");
-key_brass.set_anchor_point(ANCHOR_TOP_LEFT);
-key_brass.set_pos(x, y);
-key_brass.set_visible(true);
-x += 30;
-
-key_iron <- FloatingImage("images/objects/keys/key_iron.sprite");
-key_iron.set_anchor_point(ANCHOR_TOP_LEFT);
-key_iron.set_pos(x, y);
-key_iron.set_visible(true);
-x += 30;
-
-key_bronze <- FloatingImage("images/objects/keys/key_bronze.sprite");
-key_bronze.set_anchor_point(ANCHOR_TOP_LEFT);
-key_bronze.set_pos(x, y);
-key_bronze.set_visible(true);
-x += 30;
-
-key_silver <- FloatingImage("images/objects/keys/key_silver.sprite");
-key_silver.set_anchor_point(ANCHOR_TOP_LEFT);
-key_silver.set_pos(x, y);
-key_silver.set_visible(true);
-x += 30;
-
-key_gold <- FloatingImage("images/objects/keys/key_gold.sprite");
-key_gold.set_anchor_point(ANCHOR_TOP_LEFT);
-key_gold.set_pos(x, y);
-key_gold.set_visible(true);
-x += 30;
+foreach(name in ["air", "earth", "wood", "fire", "water"])
+{
+  if(! (name in key) ) {
+    key[name] <- FloatingImage("images/objects/keys/key_" + name + ".sprite");
+    key[name].set_anchor_point(ANCHOR_TOP_LEFT);
+    key[name].set_pos(x, y);
+    key[name].set_visible(true);
+  }
+  x += 30;
+}
 
 update_keys();