summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/002-1/elanore.txt5
-rw-r--r--world/map/npc/004-5/chest.txt1
-rw-r--r--world/map/npc/006-1/miriam.txt1
-rw-r--r--world/map/npc/006-1/pachua.txt1
-rw-r--r--world/map/npc/008-1/annualeaster.txt6
-rw-r--r--world/map/npc/009-4/barriers.txt4
-rw-r--r--world/map/npc/009-4/torches.txt44
-rw-r--r--world/map/npc/009-7/core.txt2
-rw-r--r--world/map/npc/011-1/oscar.txt7
-rw-r--r--world/map/npc/027-1/graves.txt12
-rw-r--r--world/map/npc/029-1/aahna.txt6
-rw-r--r--world/map/npc/029-1/hasan.txt3
-rw-r--r--world/map/npc/029-1/kaan.txt1
-rw-r--r--world/map/npc/029-1/liana.txt1
-rw-r--r--world/map/npc/029-1/valon.txt2
-rw-r--r--world/map/npc/029-1/zegas.txt1
-rw-r--r--world/map/npc/029-2/barrels_config.txt1
-rw-r--r--world/map/npc/029-2/morgan.txt2
-rw-r--r--world/map/npc/029-2/sorfina.txt1
-rw-r--r--world/map/npc/029-2/stat_reset.txt2
-rw-r--r--world/map/npc/029-2/tanisha.txt1
-rw-r--r--world/map/npc/052-1/channelling.txt7
-rw-r--r--world/map/npc/functions/banker.txt2
-rwxr-xr-xworld/map/npc/functions/debug.txt2
-rw-r--r--world/map/npc/functions/default_npc_checks.txt5
-rw-r--r--world/map/npc/functions/ferry.txt2
-rw-r--r--world/map/npc/functions/mob_points.txt11
-rw-r--r--world/map/npc/items/scissors.txt4
-rw-r--r--world/map/npc/items/shock_sweet.txt4
-rw-r--r--world/map/npc/items/warpTowels.txt2
30 files changed, 72 insertions, 71 deletions
diff --git a/world/map/npc/002-1/elanore.txt b/world/map/npc/002-1/elanore.txt
index b6cdde5a..ea3b78bf 100644
--- a/world/map/npc/002-1/elanore.txt
+++ b/world/map/npc/002-1/elanore.txt
@@ -20,7 +20,7 @@ function|script|ElanoreFix
function|script|elanore_decrease_exp
{
if (attachrid(@killerrid) == 0)
- end;
+ goto L_Return;
set @Q_heal_exp, MAGIC_EXPERIENCE >> 24;
if (@Q_heal_exp < 8) goto L_OnPcKillWipe;
set @Q_heal_exp, @Q_heal_exp - 8;
@@ -32,6 +32,9 @@ L_OnPcKillWipe:
L_OnPcKillFinish:
set MAGIC_EXPERIENCE, (MAGIC_EXPERIENCE & ~(255 << 24)) | (@Q_heal_exp << 24);
+ goto L_Return;
+
+L_Return:
return;
}
diff --git a/world/map/npc/004-5/chest.txt b/world/map/npc/004-5/chest.txt
index 2b815aa3..92b55e6c 100644
--- a/world/map/npc/004-5/chest.txt
+++ b/world/map/npc/004-5/chest.txt
@@ -2,6 +2,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
set @spants_state, ((QUEST_WG_state & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT);
if(@spants_state > 5) goto L_Looted;
if(@spants_state != 5) goto L_Unknown;
diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt
index f2c454fd..edcb5b63 100644
--- a/world/map/npc/006-1/miriam.txt
+++ b/world/map/npc/006-1/miriam.txt
@@ -22,6 +22,7 @@
{
set @npc_distance, 2;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
if (getskilllv(SKILL_SPEED)) goto L_fast;
if (getequipid(equip_torso) < 0) goto L_naked;
diff --git a/world/map/npc/006-1/pachua.txt b/world/map/npc/006-1/pachua.txt
index 905ffcb4..f0230a7a 100644
--- a/world/map/npc/006-1/pachua.txt
+++ b/world/map/npc/006-1/pachua.txt
@@ -1,6 +1,7 @@
006-1,24,113,0|script|Pachua|143
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
set @halloween_npc_id, $@halloween_npc_pachua;
callfunc "TrickOrTreat";
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index a9ba5963..d0898823 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -225,14 +225,14 @@ S_disableEggs:
S_relocateEasterEgg:
if ($@peopleFoundEggs[$@EggID] < $@AEASTER_mapcount)
- goto L_Return;
+ goto S_Return;
set $@peopleFoundEggs[$@EggID], 0;
set $@eastereggPos, rand(getarraysize($@easteregg_posx));
npcwarp $@easteregg_posx[$@eastereggPos], $@easteregg_posy[$@eastereggPos], "#TestEgg" + $@EggID;
- goto L_Return;
+ goto S_Return;
-L_Return:
+S_Return:
return;
}
diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index f629722f..f82df12f 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -269,12 +269,12 @@ L_Deny_Final_Passage:
L_Allow_Final_Passage:
if (OrumQuest < 11) goto L_Advance_Quest;
- close;
+ end;
L_Advance_Quest:
message strcharinfo(0), "The torches dim as you enter. At last you finally have access!";
set OrumQuest, 11;
- close;
+ end;
}
009-4,48,38,0|script|#OrumCaveEndBarrier|32767,0,0
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index 558e17c8..0164acd4 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -94,41 +94,6 @@ L_Return:
return;
}
-// To make sure in range of torches
-function|script|InRangeTorch1
-{
- if (isin("009-4",67,20,69,25))
- goto L_Return;
- mes "You're too far away to do anything with that torch.";
- close2;
- goto L_Return;
-
-L_Return:
- return;
-}
-function|script|InRangeTorch2
-{
- if (isin("009-4",65,41,69,46))
- goto L_Return;
- mes "You're too far away to do anything with that torch.";
- close2;
- goto L_Return;
-
-L_Return:
- return;
-}
-function|script|InRangeTorch3
-{
- if (isin("009-4",33,84,37,88))
- goto L_Return;
- mes "You're too far away to do anything with that torch.";
- close2;
- goto L_Return;
-
-L_Return:
- return;
-}
-
function|script|TorchLoop
{
// Variables used here:
@@ -297,7 +262,8 @@ L_Failed:
// First Torch
009-4,68,21,0|script|Torch#1|400
{
- callfunc "InRangeTorch1";
+ callfunc "PCtoNPCRange";
+ if(@npc_check) end;
callfunc "DoneWithTorches";
set @Torch, 0;
@@ -309,7 +275,8 @@ L_Failed:
// Second Torch
009-4,67,42,0|script|Torch#2|400
{
- callfunc "InRangeTorch2";
+ callfunc "PCtoNPCRange";
+ if(@npc_check) end;
callfunc "DoneWithTorches";
set @Torch, 1;
@@ -321,7 +288,8 @@ L_Failed:
// Third Torch
009-4,33,86,0|script|Torch#3|400
{
- callfunc "InRangeTorch3";
+ callfunc "PCtoNPCRange";
+ if(@npc_check) end;
callfunc "DoneWithTorches";
set @Torch, 2;
diff --git a/world/map/npc/009-7/core.txt b/world/map/npc/009-7/core.txt
index 528642c2..e1f0b58d 100644
--- a/world/map/npc/009-7/core.txt
+++ b/world/map/npc/009-7/core.txt
@@ -58,7 +58,7 @@ L_Proceed:
goto L_Missing;
L_Missing:
- end;
+ return;
L_Proceed2:
set $@fightclub_myself, 0;
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index 157dc0c9..7240f2d0 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -31,10 +31,13 @@
function|script|HalloweenQuestWaterPumpkins
{
if (Quest_Halloween != 5 || $@HalloweenQuest_PumpkinHunter$ != "")
- end;
+ goto L_Return;
set $@HalloweenQuest_PumpkinHunter$, strcharinfo(0);
donpcevent "Oscar::OnCommandSpg";
- end;
+ goto L_Return;
+
+L_Return:
+ return;
}
011-1,94,38,0|script|Oscar|142
diff --git a/world/map/npc/027-1/graves.txt b/world/map/npc/027-1/graves.txt
index a5c56049..d10c3309 100644
--- a/world/map/npc/027-1/graves.txt
+++ b/world/map/npc/027-1/graves.txt
@@ -4,6 +4,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ FotherJ ~";
mes "The mad sprite making genius who made all the creepy undead monster graphics.";
close;
@@ -13,6 +14,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ Yosuhara ~";
mes "Contributed some of the tombstones.";
close;
@@ -22,6 +24,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ Feline Monstrosity ~";
mes "Made the background music you are hearing.";
close;
@@ -31,6 +34,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ Superkoop ~";
mes "Mapped the swamp to the south.";
close;
@@ -40,6 +44,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ Aroleon ~";
mes "Mapped the swamp to the southeast.";
close;
@@ -49,6 +54,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ John P ~";
mes "Wrote the graveyard backstory and the dialog for the caretaker quest.";
close;
@@ -58,6 +64,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ Spit23 ~";
mes "Made those freakin awesome cemetery gates.";
close;
@@ -67,6 +74,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ Black Don ~";
mes "Contributed those cool gargoyle statues.";
close;
@@ -76,6 +84,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ Jaxad0127 ~";
mes "Did all the scripting work for the graveyard. Made Caretaker's house.";
close;
@@ -85,6 +94,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ Ces Vargavind ~";
mes "Scripted caretaker's daughter.";
close;
@@ -94,6 +104,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ Crush ~";
mes "Organizer of the whole graveyard project, graveyard fence graphics, mapping of the graveyard itself.";
close;
@@ -103,6 +114,7 @@
{
set @npc_distance, 1;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
mes "~ Freeyorp ~";
mes "Planned out monster stats and placements.";
close;
diff --git a/world/map/npc/029-1/aahna.txt b/world/map/npc/029-1/aahna.txt
index 92f7ff6b..453774a9 100644
--- a/world/map/npc/029-1/aahna.txt
+++ b/world/map/npc/029-1/aahna.txt
@@ -5,13 +5,9 @@
{
set @npc_distance, 3;
callfunc "PCtoNPCRange";
- goto L_Meet;
+ if(@npc_check) end;
-L_Meet:
mes "[Aahna]";
mes "\"Hello, What a lovely day for a stroll.\"";
- goto L_Close;
-
-L_Close:
close;
}
diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt
index eef3eb64..626c5570 100644
--- a/world/map/npc/029-1/hasan.txt
+++ b/world/map/npc/029-1/hasan.txt
@@ -9,6 +9,8 @@
029-1,35,33,0|script|Scared Man|160
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
+
if (QL_BEGIN >= 13)
goto L_TutDone;
message strcharinfo(0), "He looks too afraid to say anything.";
@@ -24,6 +26,7 @@ L_End:
029-1,33,33,0|script|Hasan|189,3,3
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
goto L_Main;
L_Main:
diff --git a/world/map/npc/029-1/kaan.txt b/world/map/npc/029-1/kaan.txt
index 297849fa..1133744c 100644
--- a/world/map/npc/029-1/kaan.txt
+++ b/world/map/npc/029-1/kaan.txt
@@ -4,6 +4,7 @@
029-1,46,95,0|script|Kaan|160
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
set @kaan_talked, (STARTAREA & $@SpokeToKaan);
if (!(@kaan_talked)) goto L_Tanisha;
diff --git a/world/map/npc/029-1/liana.txt b/world/map/npc/029-1/liana.txt
index 4cde049b..e3ffe889 100644
--- a/world/map/npc/029-1/liana.txt
+++ b/world/map/npc/029-1/liana.txt
@@ -3,6 +3,7 @@
029-1,62,96,0|script|Liana|205
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
goto L_Talk;
L_Talk:
diff --git a/world/map/npc/029-1/valon.txt b/world/map/npc/029-1/valon.txt
index e7a276c8..20cbbcf8 100644
--- a/world/map/npc/029-1/valon.txt
+++ b/world/map/npc/029-1/valon.txt
@@ -65,6 +65,8 @@ OnInit:
029-1,72,86,0|script|Valon|156
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
+
callfunc "ValonCount";
if (QL_VALON >= 6)
goto L_QuestComplete;
diff --git a/world/map/npc/029-1/zegas.txt b/world/map/npc/029-1/zegas.txt
index a350447d..b25bd6c9 100644
--- a/world/map/npc/029-1/zegas.txt
+++ b/world/map/npc/029-1/zegas.txt
@@ -5,6 +5,7 @@
{
set @npc_distance, 2;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
if (QL_ZEGAS == 1)
goto L_Find;
diff --git a/world/map/npc/029-2/barrels_config.txt b/world/map/npc/029-2/barrels_config.txt
index b2e340a6..8ad1cfd5 100644
--- a/world/map/npc/029-2/barrels_config.txt
+++ b/world/map/npc/029-2/barrels_config.txt
@@ -42,6 +42,7 @@ function|script|CheckBarrel
{
set @npc_distance, 2;
callfunc "PCtoNPCRange";
+ if(@npc_check) goto L_Return;
if (!(QL_ZEGAS == 2))
goto L_NoI;
if (STARTAREA & $@BarrelBits[@barrel])
diff --git a/world/map/npc/029-2/morgan.txt b/world/map/npc/029-2/morgan.txt
index 3f7d3e1e..20000a11 100644
--- a/world/map/npc/029-2/morgan.txt
+++ b/world/map/npc/029-2/morgan.txt
@@ -26,6 +26,8 @@ OnInit:
029-2,101,57,0|script|Morgan#_M|355
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
+
if (Int >= 5)
goto L_Learn;
goto L_NotMagic;
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 984312cf..181a2589 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -4,6 +4,7 @@
{
set @npc_distance, 2;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
goto L_Main;
L_Main:
diff --git a/world/map/npc/029-2/stat_reset.txt b/world/map/npc/029-2/stat_reset.txt
index c1dafd7b..6123f632 100644
--- a/world/map/npc/029-2/stat_reset.txt
+++ b/world/map/npc/029-2/stat_reset.txt
@@ -3,6 +3,8 @@
029-2,98,92,0|script|Jessie|159
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
+
if (BaseLevel >= 10)
goto L_Sorry;
diff --git a/world/map/npc/029-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt
index 9a7ee081..0a594410 100644
--- a/world/map/npc/029-2/tanisha.txt
+++ b/world/map/npc/029-2/tanisha.txt
@@ -5,6 +5,7 @@
029-2,110,88,0|script|Tanisha|114
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
if (isin("029-2", 98, 84, 106, 89))
goto L_Fighting;
diff --git a/world/map/npc/052-1/channelling.txt b/world/map/npc/052-1/channelling.txt
index 4474a2ce..565f96fd 100644
--- a/world/map/npc/052-1/channelling.txt
+++ b/world/map/npc/052-1/channelling.txt
@@ -95,9 +95,9 @@ L_SuggestChannelling:
function|script|StartChannelling
{
if (isat("052-1",53,38) == 0)
- end;
+ goto L_Return;
if ($@illia_level_4_progress > 0)
- end;
+ goto L_Return;
set $@illia_level_4_progress, 1;
set $@illia_char_channelling$, strcharinfo(0);
@@ -126,6 +126,9 @@ function|script|StartChannelling
message strcharinfo(0), "Ok, let's stay focused now!";
donpcevent "#Power Circle::OnCommandSt";
+ goto L_Return;
+
+L_Return:
return;
}
diff --git a/world/map/npc/functions/banker.txt b/world/map/npc/functions/banker.txt
index 2caa2ad0..5650c5ed 100644
--- a/world/map/npc/functions/banker.txt
+++ b/world/map/npc/functions/banker.txt
@@ -25,7 +25,7 @@ L_Start:
L_Storage:
if (#BankOptions & OPT_STORAGE_CLOSE) close2;
openstorage;
- if (#BankOptions & OPT_STORAGE_CLOSE) end;
+ if (#BankOptions & OPT_STORAGE_CLOSE) goto L_Return;
goto L_Start;
L_Dep:
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index f20d27b8..44af4d40 100755
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -7,7 +7,7 @@ function|script|Debug
mes "";
mes "%%E ##a"+ getspellinvocation("debug0") +"##0";
set @debug_npc, 0;
- close;
+ goto L_Close;
L_Begin:
set @debug_mask, 65535;
diff --git a/world/map/npc/functions/default_npc_checks.txt b/world/map/npc/functions/default_npc_checks.txt
index d20ed187..c714c931 100644
--- a/world/map/npc/functions/default_npc_checks.txt
+++ b/world/map/npc/functions/default_npc_checks.txt
@@ -21,13 +21,12 @@ function|script|PCtoNPCRange
if(@distance_handler) goto L_Return;
set @dnpc_name$, strnpcinfo(1);
if(@dnpc_name$ != "") goto L_Named;
- mes "You need to move closer to interact with this npc.";
- close2;
+ message strcharinfo(0), "##3Server : ##BYou need to move closer to interact with this npc.";
goto L_Return;
L_Named:
message strcharinfo(0), "##3"+@dnpc_name$+" : ##BPlease move closer.";
- end;
+ goto L_Return;
L_Return:
set @dnpc_name$, "";
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 9d1a9ba8..eb7196d1 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -135,6 +135,7 @@ function|script|BoardFerry
"No.", L_Return;
L_Board:
+ close2;
warp "035-2",39,29;
goto L_Return;
@@ -150,6 +151,7 @@ function|script|BoardCandorFerry
"No.", L_Return;
L_Board:
+ close2;
warp "036-2",39,29;
goto L_Return;
diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt
index ba2910b1..d60c68b6 100644
--- a/world/map/npc/functions/mob_points.txt
+++ b/world/map/npc/functions/mob_points.txt
@@ -184,20 +184,17 @@ L_NatureKarma:
set @value, 3;
if (@value == 0)
- goto L_end;
+ goto L_Return;
callfunc "QuestSagathaAnnoy";
- goto L_end;
+ goto L_Return;
L_good:
set @value, 1;
callfunc "QuestSagathaHappy";
- goto L_end;
-
-L_end:
- set @value, 0;
- end;
+ goto L_Return;
L_Return:
+ set @value, 0;
return;
}
diff --git a/world/map/npc/items/scissors.txt b/world/map/npc/items/scissors.txt
index 44dbbac8..640cc1c5 100644
--- a/world/map/npc/items/scissors.txt
+++ b/world/map/npc/items/scissors.txt
@@ -5,10 +5,10 @@ function|script|useScissors
message strcharinfo(0), "Whoops!";
heal -20 - rand(Hp >> 1), 0;
getitem "Scissors", 1;
- end;
+ return;
L_Change:
setlook LOOK_HAIR_STYLE, rand(20);
getitem "Scissors", 1;
- end;
+ return;
}
diff --git a/world/map/npc/items/shock_sweet.txt b/world/map/npc/items/shock_sweet.txt
index 1ae787e3..4de758d1 100644
--- a/world/map/npc/items/shock_sweet.txt
+++ b/world/map/npc/items/shock_sweet.txt
@@ -4,12 +4,12 @@ function|script|useShockSweet
goto L_Change;
message strcharinfo(0), "Yuck, this tastes like earwax!";
heal -20 - (Hp >> 2), 0;
- end;
+ return;
L_Change:
setlook LOOK_HAIR_COLOR, HC_WHITE;
message strcharinfo(0), "Gah! That was some strong stuff!";
sc_start sc_poison, 1, 20;
misceffect 15, strcharinfo(0);
- end;
+ return;
}
diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt
index f586ed99..8e9ef4ac 100644
--- a/world/map/npc/items/warpTowels.txt
+++ b/world/map/npc/items/warpTowels.txt
@@ -152,7 +152,7 @@ L_End:
set @NextLocationX, 0;
set @NextLocationY, 0;
set @warpTowelName$, "";
- end;
+ return;
}
function|script|MultiWarpTowel