From 0ead7b5e41f73ef4f572c2b042b2a1e96c9b89ee Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Sun, 4 Sep 2011 11:36:10 +0200
Subject: Reenable disabled NPCs.

---
 world/map/npc/008-1/andra.txt   | 9 +++------
 world/map/npc/025-1/barrier.txt | 2 --
 world/map/npc/042-1/hasan.txt   | 2 --
 3 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'world/map/npc')

diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index eae8641a..de5f0b9d 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;
 
     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,7 +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;
diff --git a/world/map/npc/025-1/barrier.txt b/world/map/npc/025-1/barrier.txt
index a1f726c6..1a7e32b7 100644
--- a/world/map/npc/025-1/barrier.txt
+++ b/world/map/npc/025-1/barrier.txt
@@ -1,8 +1,6 @@
 // Authors: alastrim, Ali-g, Dark Mage
 
 025-1.gat,42,79,0	script	#JuliaBarrier	45,1,1,{
-  mes "This quest is disabled due to bugs";
-  close;
 
   if (Rossy_Quest > 14 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Warp;
   if (Rossy_Quest <= 13) goto L_Block;
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 819c1873..9f154b58 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -2,8 +2,6 @@
 // Authors: Jenalya, alastrim
 
 042-1.gat,111,68,0|script|Hasan|189,{
-    mes "This NPC is disabled due to bugs, sorry.";
-    close;
 
     set @toll, 10000;
     set @x, getx(0);
-- 
cgit v1.2.3-70-g09d2