Merge remote-tracking branch 'mainline/master'

6 files changed, 26 insertions, 11 deletions

diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt
index c91971a3..2607bf29 100644
--- a/world/map/npc/001-1/elanore.txt
+++ b/world/map/npc/001-1/elanore.txt
@@ -154,7 +154,8 @@ L_Main:
     close;
 
 OnPCKillEvent:
-    attachrid(@killerrid);
+    if (attachrid(@killerrid) == 0)
+        end;
     set @Q_heal_exp, MAGIC_EXPERIENCE >> 24;
     if (@Q_heal_exp < 8) goto L_OnPcKillWipe;
     set @Q_heal_exp, @Q_heal_exp - 8;
diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt
index a6ba52f6..eae8641a 100644
--- a/world/map/npc/008-1/andra.txt
+++ b/world/map/npc/008-1/andra.txt
@@ -1,6 +1,9 @@
 // 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;
     if ($@andra_status == 1) goto L_Planting;
@@ -57,8 +60,8 @@ L_PreSummon:
 OnTimer1000:
     set $@plant_id, rand(1029,1032);
     areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
-    if (isloggedin(getcharid(3,$@farmer$))==0) goto L_Spawn1000;    
-    attachrid(getcharid(3,$@farmer$));
+    if (attachrid(getcharid(3,$@farmer$)) == 0)
+        goto L_Spawn1000;
     message strcharinfo(0), "Andra: I think some plants will grow almost instantly! Just Watch...";
 
 L_Spawn1000:
@@ -80,8 +83,8 @@ OnTimer5000:
 OnTimer7000:
     set $@plant_id, rand(1029,1032);
     areamonster "008-1.gat",44,18,135,46,"plant",$@plant_id,$@PLANTS_PER_SEED, "Andra::OnPlantDeath";
-    if (isloggedin(getcharid(3,$@farmer$))==0) goto L_Spawn7000;
-    attachrid(getcharid(3,$@farmer$));
+    if (attachrid(getcharid(3,$@farmer$)) == 0)
+        goto L_Spawn7000;
     message strcharinfo(0), "Andra: Good... Just take a walk and you will be able to see how your seeds turned into some nice looking plants.";
 
 L_Spawn7000:
@@ -150,6 +153,7 @@ 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 1a7e32b7..a1f726c6 100644
--- a/world/map/npc/025-1/barrier.txt
+++ b/world/map/npc/025-1/barrier.txt
@@ -1,6 +1,8 @@
 // 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/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt
index ace4aadb..c59d1036 100644
--- a/world/map/npc/033-1/kimarr.txt
+++ b/world/map/npc/033-1/kimarr.txt
@@ -174,9 +174,8 @@ L_Attention:
 
 OnTimer1000:
 // Checking if player is logged
-    if (isloggedin($@Fluffy_FighterID) == 0)
+    if (attachrid($@Fluffy_FighterID) == 0)
         goto L_GotOut;
-    attachrid($@Fluffy_FighterID);
 // Checking if player is still in the map or used a towell or spell to get out
     if (getareausers("033-1.gat", 79, 28, 88, 42) == 0)
         goto L_GotOut;
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 8394bd7e..1d5a67fd 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -2,6 +2,8 @@
 // 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);
@@ -157,7 +159,8 @@ L_Cliff_Up:
 L_SummonAgain:
     message strcharinfo(0), "Kaan is mad at you for your interference! He walks over to the edge of the cliff and throws a rock on top of your head, then lets another scorpion run just near Hasan!";
     percentheal -100, 0;
-    attachrid(getcharid(3,$@ScorpionFighter$));
+    if (attachrid(getcharid(3,$@ScorpionFighter$)) == 0)
+        end;
     message strcharinfo(0), "Kaan: \"Just go while he is distracted and no one is interfering!\"";
     monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath";
     end;
@@ -168,8 +171,8 @@ L_Clean:
     set $@scorp, 0;
     stopnpctimer;
     setnpctimer 0;
-    if (isloggedin(getcharid(3,$@ScorpionFighter$))==0) end;
-    attachrid(getcharid(3,$@ScorpionFighter$));
+    if (attachrid(getcharid(3,$@ScorpionFighter$)) == 0)
+        end;
     if (PC_DIE_COUNTER > $@ScorpDeath) goto L_MessageDeath;
     message strcharinfo(0), "Hasan, with his eyes almost closed, trembling with fear, runs toward the scorpion and stabs it with all his strength! Seems like you took too long and the plan didn't work this time.";
     warp "042-1.gat", 112, 64;
@@ -186,7 +189,8 @@ L_Wait:
     close;
 
 OnTimer5000:
-    if(isloggedin(getcharid(3,$@ScorpionFighter$))==0) goto L_Clean;
+    if(isloggedin(getcharid(3,$@ScorpionFighter$)) == 0)
+        goto L_Clean;
     set $@ScorpionTimer, $@ScorpionTimer + 5;
     if ($@ScorpionTimer >= 300) goto L_Clean;
     attachrid(getcharid(3,$@ScorpionFighter$));
@@ -208,6 +212,7 @@ onScorpionDeath:
     end;
 
 OnInit:
+    end;
     initnpctimer;
     stopnpctimer;
 
@@ -218,6 +223,7 @@ OnInit:
     end;
 
 OnTouch:
+    end;
     if ($@scorp && $@ScorpionFighter$ == strcharinfo(0)) 
         end;
     if ((FLAGS & FLAG_TUTORIAL_DONE) || (hasan == 4))
diff --git a/world/map/npc/halloween/2009/Candyman.txt b/world/map/npc/halloween/2009/Candyman.txt
index 517e94b3..1ee73bf5 100644
--- a/world/map/npc/halloween/2009/Candyman.txt
+++ b/world/map/npc/halloween/2009/Candyman.txt
@@ -8,6 +8,9 @@
 //#  Reward: Skull Mask                                                           #
 //#################################################################################
 
+// This script is buggy, don't even think of enabling it
+// -o11c
+
 // The Candy Man
 009-1.gat,90,27,0	script	The Candy Man	183, {