X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=data%2Flevels%2Fworld2%2Fdefault.nut;h=1cc6aae34676b95d3e67f98d4413323021e8c707;hb=924c5fa5b35ade9f90a2b6f21f55ea7630b90f49;hp=65ddc2cb60e152ab2bd20bb5e0bcc7dee534635d;hpb=071c31e7fcf8bfbd00ec8d7d19313d7f6e433885;p=supertux.git

diff --git a/data/levels/world2/default.nut b/data/levels/world2/default.nut
index 65ddc2cb6..1cc6aae34 100644
--- a/data/levels/world2/default.nut
+++ b/data/levels/world2/default.nut
@@ -1,20 +1,125 @@
+function add_key(key)
+{
+  local keys = state.world2_keys;
+  if (key == "air")
+    keys.air = true;
+  else if (key == "earth")
+    keys.earth = true;
+  else if (key == "wood")
+    keys.wood = true;
+  else if (key == "fire")
+    keys.fire = true;
+  else if (key == "water")
+    keys.water = true;
+  update_keys();
+}
 
-function get_gold_key()
+function get_water_key()
+{
+  add_key("air");
+  end_level();
+}
+function get_earth_key()
+{
+  add_key("earth");
+  end_level();
+}
+function get_wood_key()
+{
+  add_key("wood");
+  end_level();
+}
+function get_fire_key()
+{
+  add_key("fire");
+  end_level();
+}
+function get_air_key()
 {
-  add_key(KEY_GOLD);
+  add_key("water");
   end_level();
 }
 
 function level2_init()
 {
+  add_key("air");
+  add_key("earth");
+  add_key("wood");
+  add_key("fire");
+  add_key("water");
   Tux.deactivate();
-  DisplayEffect.sixteen_to_nine();
+  Effect.sixteen_to_nine(2);
   Text.set_text(translate("---Insert Cutscene Here---"));
   Tux.walk(100);
   Text.fade_in(2);
   wait(4);
   Text.fade_out(1);
   wait(1);
-  DisplayEffect.four_to_three();
+  Effect.four_to_three();
   Tux.activate();
 }
+
+/***************************************
+ * Handling of the "keys" in the world *
+ ***************************************/
+if(! ("world2_keys" in state))
+	state.world2_keys <- {}
+	
+local keys = state.world2_keys;
+if(! ("air" in keys))
+	keys.water <- false;
+if(! ("earth" in keys))
+	keys.earth <- false;
+if(! ("wood" in keys))
+	keys.wood <- false;
+if(! ("fire" in keys))
+	keys.fire <- false;
+if(! ("water" in keys))
+	keys.air <- false;
+
+/// this function updates the key images (call this if tux has collected a key)
+function update_keys()
+{
+	local keys = state.world2_keys;
+	key_air.set_action(keys.water ? "display" : "outline");
+	key_earth.set_action(keys.earth ? "display" : "outline");
+	key_wood.set_action(keys.wood ? "display" : "outline");
+	key_fire.set_action(keys.fire ? "display" : "outline");
+	key_water.set_action(keys.air ? "display" : "outline");
+}
+
+local x = 10;
+local y = 10;
+
+
+key_air <- FloatingImage("images/objects/keys/key_air.sprite");
+key_air.set_anchor_point(ANCHOR_TOP_LEFT);
+key_air.set_pos(x, y);
+key_air.set_visible(true);
+x += 30;
+
+key_earth <- FloatingImage("images/objects/keys/key_earth.sprite");
+key_earth.set_anchor_point(ANCHOR_TOP_LEFT);
+key_earth.set_pos(x, y);
+key_earth.set_visible(true);
+x += 30;
+
+key_wood <- FloatingImage("images/objects/keys/key_wood.sprite");
+key_wood.set_anchor_point(ANCHOR_TOP_LEFT);
+key_wood.set_pos(x, y);
+key_wood.set_visible(true);
+x += 30;
+
+key_fire <- FloatingImage("images/objects/keys/key_fire.sprite");
+key_fire.set_anchor_point(ANCHOR_TOP_LEFT);
+key_fire.set_pos(x, y);
+key_fire.set_visible(true);
+x += 30;
+
+key_water <- FloatingImage("images/objects/keys/key_water.sprite");
+key_water.set_anchor_point(ANCHOR_TOP_LEFT);
+key_water.set_pos(x, y);
+key_water.set_visible(true);
+x += 30;
+
+update_keys();