Merge remote-tracking branch 'testing/master'v2011.09.08

1 files changed, 4 insertions, 9 deletions

diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index eae8641a..0ad3ab2a 100644
--- a/world/map/npc/008-1/andra.txt
+++ b/world/map/npc/008-1/andra.txt
@@ -1,8 +1,6 @@
 // Andra asks for your help to keep the soil fertile. The best way to do it is planting, so she asks for water and seeds. When she plants the seeds, some plants are spawned.
 
-008-1.gat,36,26,0	script	Andra	201,{
-    mes "This script is disabled because of possible bugs";
-    close;
+008-1.gat,36,26,0|script|Andra|201,{
 
     set @water_amount, 1;
     set @seeds_amount, 4;
@@ -45,8 +43,8 @@
     mes "[Andra]";
     mes "\"Great! Thank you for you help. If you have more items and want to help again, feel free to talk to me. We just have to be careful to not oversoak the soil with water.. but you don't need to worry, I will know when it is the right time to stop planting.";
     next;
-    delitem "BottleOfWater", @water_amount;	
-    delitem "GrassSeed", @seeds_amount;	
+    delitem "BottleOfWater", @water_amount;
+    delitem "GrassSeed", @seeds_amount;
     set FLAGS, FLAGS | FLAG_ANDRA_HELPED;
     mes "Andra pours some water in a lot of different places and then throws some seeds to the sky. The wind carries some of them really far from her.";
     close2;
@@ -104,7 +102,7 @@ L_Return:
         "No, I just wanted to say hello.", L_Bye;
     if ($@spawned_plants >= $@MAX_GLOBAL_PLANTS) goto L_Gather;
     if (countitem("BottleOfWater") < @water_amount || countitem("GrassSeed") < @seeds_amount) goto L_NotEnough;
-    delitem "BottleOfWater", @water_amount;	
+    delitem "BottleOfWater", @water_amount;
     delitem "GrassSeed", @seeds_amount;
     mes "Andra pours some water in a lot of different places and then throws the seeds to the sky. The wind carries some of them really far from her.";
     close2;
@@ -153,9 +151,6 @@ L_TooYoung:
     close;
 
 OnInit:
-    end;
     set $@PLANTS_PER_SEED, 3;
     set $@MAX_GLOBAL_PLANTS, 100; // You can plant only if the amount of plants currently in the map is < than this value.
-    initnpctimer;
-    stopnpctimer;
 }