summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
Diffstat (limited to 'world')
-rw-r--r--world/map/data/045-1.wlkbin40004 -> 40004 bytes
-rw-r--r--world/map/npc/001-1/weellos.txt2
-rw-r--r--world/map/npc/002-1/luca.txt2
-rw-r--r--world/map/npc/009-4/barriers.txt63
-rw-r--r--world/map/npc/009-6/brodomir.txt6
-rw-r--r--world/map/npc/020-2/baktar.txt4
-rw-r--r--world/map/npc/029-2/sorfina.txt26
-rw-r--r--world/map/npc/029-2/tanisha.txt16
-rw-r--r--world/map/npc/052-1/janitor.txt2
9 files changed, 72 insertions, 49 deletions
diff --git a/world/map/data/045-1.wlk b/world/map/data/045-1.wlk
index adc5cb45..01c0f1f2 100644
--- a/world/map/data/045-1.wlk
+++ b/world/map/data/045-1.wlk
Binary files differ
diff --git a/world/map/npc/001-1/weellos.txt b/world/map/npc/001-1/weellos.txt
index 7400402a..b2a89aed 100644
--- a/world/map/npc/001-1/weellos.txt
+++ b/world/map/npc/001-1/weellos.txt
@@ -9,7 +9,7 @@
set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowWeellosNT;
set @kylian, ((QUEST_NorthTulimshar & NIBBLE_5_MASK) >> NIBBLE_5_SHIFT);
- if isin("001-1.gat", 48, 20, 61, 28) goto L_In;
+ if (isin("001-1.gat", 48, 20, 61, 28)) goto L_In;
mes "[Weellos]";
mes "\"This is a very historic building. One of the oldest in the area.\"";
diff --git a/world/map/npc/002-1/luca.txt b/world/map/npc/002-1/luca.txt
index c6c47647..17ac66c7 100644
--- a/world/map/npc/002-1/luca.txt
+++ b/world/map/npc/002-1/luca.txt
@@ -316,7 +316,7 @@ L_MenuItems1:
L_unfocus:
if (countitem("GrimaceOfDementia") > 0) goto L_unfocus_menu;
- if (MAGIG_FLAGS & MFLAG_KNOWS_UNFOCUS_RECIPE) goto L_nopotion;
+ if (MAGIC_FLAGS & MFLAG_KNOWS_UNFOCUS_RECIPE) goto L_nopotion;
mes "[Luca the Hunter]";
mes "\"Unfocusing is one of the harder parts though, because it is sunk in. You see?\"";
diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 9e9ef7bc..49fd3877 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -44,12 +44,11 @@ L_Error2:
// Starting Barrier / Quest Entrance
-009-4.gat,37,120,0|script|#OrumCaveStartBarrier|127,1,0
+009-4.gat,37,119,0|script|#OrumCaveStartMessage|127,0,0
{
- if (OrumQuest >= 3) close;
+ if (OrumQuest >= 3) end;
if (OrumQuest == 2) goto L_Started;
- warp "009-4.gat", 37, 118;
mes "As you try to pass, two torches begin to flare and push you back. They seem to form some kind of barrier.";
close;
@@ -59,8 +58,15 @@ L_Started:
close;
}
+009-4.gat,37,120,0|script|#OrumCaveStartBarrier|127,0,0
+{
+ if (OrumQuest >= 3) end;
+ warp "009-4.gat", 37, 118;
+ end;
+}
+
// First Barrier
-009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|127,1,0
+009-4.gat,57,29,0|script|#OrumCaveFirstBarrier|127,0,0
{
if (OrumQuest >= 5) close;
@@ -70,7 +76,7 @@ L_Started:
}
// Second Barrier
-009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|127,1,0
+009-4.gat,61,55,0|script|#OrumCaveSecondMessage|127,0,0
{
if (OrumQuest == 3) set OrumQuest, 4;
@@ -81,7 +87,6 @@ L_Started:
if (OrumQuest > 7 && @TorchColor == @BarrierColor)
goto L_Allow_Second_Passage;
- warp "009-4.gat", 60, 56;
mes "As you try to pass, the torches begin to flare and push you back. Perhaps there's a way to get past it.";
mes "";
setarray @colors$,"transparent","red","dark orange","orange","light orange","yellow","light green","green","dark green","blue","dark purple","purple","light purple";
@@ -90,18 +95,29 @@ L_Started:
L_Allow_Second_Passage:
if (OrumQuest < 9) goto L_Advance_Quest;
- close;
+ end;
L_Advance_Quest:
message strcharinfo(0), "The torches dim as you enter like the first. You must be on the right trail.";
set OrumQuest, 9;
- close;
+ end;
+}
+
+009-4.gat,61,54,0|script|#OrumCaveSecondBarrier|127,0,0
+{
+ if (OrumQuest >= 9) end;
+ warp "009-4.gat", 60, 56;
+ end;
}
// Third Barrier
-009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|127,1,0
+009-4.gat,24,65,0|script|#OrumCaveThirdMessage|127,0,0
{
if (OrumQuest == 3) set OrumQuest, 4;
+ if (OrumQuest > 8 && @Torch1Color == @firstColor && @Torch2Color == @secondColor)
+ goto L_Allow_Third_Passage;
+ if (OrumQuest > 8 && @Torch2Color == @firstColor && @Torch1Color == @secondColor)
+ goto L_Allow_Third_Passage;
set @Barrier, 1;
callfunc("GetBarrierColor");
@@ -121,12 +137,6 @@ L_Advance_Quest:
if (@secondColor > 12)
set @secondColor, 1;
- if (OrumQuest > 8 && @Torch1Color == @firstColor && @Torch2Color == @secondColor)
- goto L_Allow_Third_Passage;
- if (OrumQuest > 8 && @Torch2Color == @firstColor && @Torch1Color == @secondColor)
- goto L_Allow_Third_Passage;
-
- warp "009-4.gat", 23, 64;
mes "As you try to pass, the torches begin to flare and push you back. Perhaps there is a way to get past it.";
mes "";
setarray @colors$,"transparent","red","dark orange","orange","light orange","yellow","light green","green","dark green","blue","dark purple","purple","light purple";
@@ -135,17 +145,24 @@ L_Advance_Quest:
L_Allow_Third_Passage:
if (OrumQuest < 10) goto L_Advance_Quest;
- close;
+ end;
L_Advance_Quest:
set OrumQuest, 10;
- close;
+ end;
+}
+
+009-4.gat,24,66,0|script|#OrumCaveThirdBarrier|127,0,0
+{
+ if (OrumQuest >= 10) end;
+ warp "009-4.gat", 23, 64;
+ end;
}
// Ending Barrier
-009-4.gat,48,38,0|script|#OrumCaveEndBarrier|127,1,0
+009-4.gat,48,37,0|script|#OrumCaveEndMessage|127,0,0
{
- if (OrumQuest >= 11) close;
+ if (OrumQuest >= 11) end;
if (OrumQuest == 3) set OrumQuest, 4;
set @Barrier, 2;
@@ -239,7 +256,6 @@ L_Advance_Quest:
goto L_Deny_Final_Passage;
L_Deny_Final_Passage:
- warp "009-4.gat", 47, 36;
mes "As you try to pass, the torches begin to flare and push you back. Perhaps there is a way to get past it.";
mes "";
setarray @colors$,"transparent","red","dark orange","orange","light orange","yellow","light green","green","dark green","blue","dark purple","purple","light purple";
@@ -255,3 +271,10 @@ L_Advance_Quest:
set OrumQuest, 11;
close;
}
+
+009-4.gat,48,38,0|script|#OrumCaveEndBarrier|127,0,0
+{
+ if (OrumQuest >= 11) end;
+ warp "009-4.gat", 47, 36;
+ end;
+}
diff --git a/world/map/npc/009-6/brodomir.txt b/world/map/npc/009-6/brodomir.txt
index e0443bc4..f1ca3789 100644
--- a/world/map/npc/009-6/brodomir.txt
+++ b/world/map/npc/009-6/brodomir.txt
@@ -133,11 +133,11 @@ L_Go:
set $@BRODOMIR_MONEY, @brodomir_money;
set $@brodomir_delay_seconds, 600;
set $@BRODOMIR_PVP_STATUS, 1;
- announce "Brodomir:* In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0;
+ announce "Brodomir: In "+$@brodomir_delay_seconds/60+" minutes, I will start a PvP tournament, if at least 3 fighters are present. Make your way in Hurnscald Underground Caves!", 0;
if ($@BRODOMIR_ITEM_AMOUNT > 0)
- announce "Brodomir:* The winner will receive 150GP per fighter and " + $@BRODOMIR_ITEM_AMOUNT + " " + $@BRODOMIR_ITEM$ + ".", 0;
+ announce "Brodomir: The winner will receive 150GP per fighter and " + $@BRODOMIR_ITEM_AMOUNT + " " + $@BRODOMIR_ITEM$ + ".", 0;
if ($@BRODOMIR_MONEY > 0)
- announce "Brodomir:* The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0;
+ announce "Brodomir: The winner will receive " + $@BRODOMIR_MONEY + "GP and additionally 150GP per fighter.", 0;
mes "[Brodomir]";
mes "\"In "+$@brodomir_delay_seconds/60+" minutes I will bring you all to the PvP cave. If there are less than 3 players here the event will not start and your money will be lost.\"";
set $@BRODOMIR_START_TIME, gettimetick(2) + $@brodomir_delay_seconds;
diff --git a/world/map/npc/020-2/baktar.txt b/world/map/npc/020-2/baktar.txt
index 1c6e3202..cc6b7ef2 100644
--- a/world/map/npc/020-2/baktar.txt
+++ b/world/map/npc/020-2/baktar.txt
@@ -95,9 +95,9 @@ L_Delivery:
goto L_Close;
L_Start:
- if(sex)
+ if(Sex)
set @type$, "man";
- if(!sex)
+ if(!Sex)
set @type$, "woman";
if(@Q_status & (1<<@BIT_KNOWHIM)) goto L_KnowAlready;
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 671835f1..4f55ef76 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -57,8 +57,8 @@ L_Tut:
L_Carpet:
mes "[Sorfina]";
mes "\"Try to take a few steps and walk to that carpet over there.";
- mes "Just use the ###keyMoveUp; to move up, press ###keyMoveDown; to move down, ";
- mes "press ###keyMoveLeft; to move left, press ###keyMoveRight; to move right ";
+ mes "Press [###keyMoveUp;] to move up, press [###keyMoveDown;] to move down, ";
+ mes "press [###keyMoveLeft;] to move left, press [###keyMoveRight;] to move right ";
mes " or click on the place you want to go to.\"";
set @tutorial_tmp, 1;
callfunc "SetTutorialMask";
@@ -67,15 +67,15 @@ L_Carpet:
L_Dresser:
mes "[Sorfina]";
mes "\"In that dresser there are some clothes you can wear.\"";
- mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press ###keyTargetNPC; to focus and ###keyTalk; to talk/activate.\"";
+ mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press [###keyTargetNPC;] to focus and [###keyTalk;] to talk/activate.\"";
mes "\"Now get the clothes out of the dresser.\"";
goto L_Close;
L_Naked:
mes "[Sorfina]";
- mes "\"Press ###keyWindowInventory; or click on the Inventory button in the bar at the upper right corner to open your bag.\"";
+ mes "\"Press [###keyWindowInventory;] or click on the Inventory button in the bar at the upper right corner to open your bag.\"";
mes "\"Once we stop talking, double-click on the clothes to equip.\"";
- mes "\"Talk to me again after you get dressed. You can either click on me, or press ###keyTargetNPC; to focus on me and ###keyTalk; to talk.\"";
+ mes "\"Talk to me again after you get dressed. You can either click on me, or press [###keyTargetNPC;] to focus on me and [###keyTalk;] to talk.\"";
goto L_Close;
L_Clothes:
@@ -136,8 +136,8 @@ L_Explain:
L_Walk:
mes "[Sorfina]";
mes "\"You can use the arrow keys to walk around.";
- mes "Just use the ###keyMoveUp; to move up, press ###keyMoveDown; to move down, ";
- mes "press ###keyMoveLeft; to move left, press ###keyMoveRight; to move right ";
+ mes "Press [###keyMoveUp;] to move up, press [###keyMoveDown;] to move down, ";
+ mes "press [###keyMoveLeft;] to move left, press [###keyMoveRight;] to move right ";
mes " or click on the place you want to go to.\"";
mes "This only works if that place is reachable and walkable.\"";
goto L_Close;
@@ -145,16 +145,16 @@ L_Walk:
L_Talk:
mes "[Sorfina]";
mes "\"If you want to talk to a normal person, you can click at him or her.";
- mes "Or you can press ###keyTargetNPC; to focus on the nearest person and then press ###keyTalk; to talk.\"";
+ mes "Or you can press [###keyTargetNPC;] to focus on the nearest person and then press [###keyTalk;] to talk.\"";
next;
- mes "\"If you want to talk to other adventurers, press ###keyChat; to open your chat window.";
+ mes "\"If you want to talk to other adventurers, press [###keyChat;] to open your chat window.";
mes "Then type your message and press Enter to send.\"";
next;
mes "\"You may want to talk privately to another adventurer sometimes. In that case you can whisper.";
- mes "After pressing ###keyChat; type '/whisper [name] [message]'.";
+ mes "After pressing [###keyChat;] type '/whisper [name] [message]'.";
mes "Or you can right click on someone and choose the whisper option.\"";
next;
- mes "\"Press ###keyWindowChat; to show and hide your chat window.\"";
+ mes "\"Press [###keyWindowChat;] to show and hide your chat window.\"";
goto L_Close;
L_Items:
@@ -173,7 +173,7 @@ L_Items:
mes "\"Your HitchHikers Towel will return you to your last set soul menhir or here if not set.\"";
mes "\"It can't be used constantly as the magic needs time to power the jump.\"";
next;
- mes "\"Press ###keyWindowInventory; to open your inventory.";
+ mes "\"Press [###keyWindowInventory;] to open your inventory.";
mes "When placing your cursor over an item there, you can see a box with some information about that item.\"";
next;
mes "\"To use or equip an item, select it by double-clicking on it.";
@@ -182,7 +182,7 @@ L_Items:
L_Shortcut:
mes "[Sorfina]";
- mes "\"Press ###keyWindowShortcut; or click the Shortcut button in the bar at the upper right to open your shortcut window.\"";
+ mes "\"Press [###keyWindowShortcut;] or click the Shortcut button in the bar at the upper right to open your shortcut window.\"";
next;
mes "\"You can select the item you want to put on a shortcut with your mouse and then click on the position in the shortcut window you want to place it.\"";
next;
diff --git a/world/map/npc/029-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt
index b45b5d06..92ffccaf 100644
--- a/world/map/npc/029-2/tanisha.txt
+++ b/world/map/npc/029-2/tanisha.txt
@@ -58,14 +58,14 @@ L_Fight_Again:
mes "[Tanisha]";
mes "\"Ok, listen what to do.";
mes "Equip a weapon and kill the maggots.\"";
- mes "\"Press ###keyTargetMonster; to focus on a monster. With ###keyTargetAttack; you can focus and start attacking the same time.";
+ mes "\"Press [###keyTargetMonster;] to focus on a monster. With [###keyTargetAttack;] you can focus and start attacking the same time.";
mes "But it also works to click on the monster with your mouse.\"";
next;
- mes "\"If you press the ###keyTarget;, you can abort your attack.\"";
+ mes "\"If you press the [###keyTarget;], you can abort your attack.\"";
next;
mes "\"Maggots aren't aggressive, so they won't harm you until you attack them first. Take them out one by one.\"";
next;
- mes "\"Sometimes dead monsters leave some useful things. You can pick them up by pressing ###keyPickup; or clicking on the items with your mouse.\"";
+ mes "\"Sometimes dead monsters leave some useful things. You can pick them up by pressing [###keyPickup;] or clicking on the items with your mouse.\"";
close2;
// The getitem must be in the same place as set @tutorial, 2;
// since it was moved to after L_Fight_Again, add it conditionally
@@ -101,7 +101,7 @@ L_Stats:
mes "\"That was great! Like a professional exterminator!\"";
mes "\"And it seems you became stronger and more experienced.";
mes "That means you got some status points which you can use to increase your abilities.\"";
- mes "\"Press ###keyWindowStatus; or click the Status button in the bar at the upper right to see your status window. There you can distribute your points on six different properties.\"";
+ mes "\"Press [###keyWindowStatus;] or click the Status button in the bar at the upper right to see your status window. There you can distribute your points on six different properties.\"";
next;
goto L_StatsRe;
@@ -150,14 +150,14 @@ L_Explain:
L_Fight:
mes "[Tanisha]";
- mes "\"Press ###keyTargetMonster; to focus on a monster. With ###keyTargetAttack; you can focus and attack.";
+ mes "\"Press [###keyTargetMonster;] to focus on a monster. With [###keyTargetAttack;] you can focus and attack.";
mes "But it also works to click on the monster with your mouse.\"";
next;
- mes "\"If you press the ###keyTarget; button, you can abort your attack.\"";
+ mes "\"If you press the [###keyTarget;] button, you can abort your attack.\"";
next;
- mes "\"Sometimes dead monsters leave some useful things. You can pick them up with pressing ###keyPickup; or clicking on the items with your mouse.\"";
+ mes "\"Sometimes dead monsters leave some useful things. You can pick them up with pressing [###keyPickup;] or clicking on the items with your mouse.\"";
next;
- mes "\"If you feel exhausted from battle you can sit down by pressing ###keyBeingSit; to recover faster.\"";
+ mes "\"If you feel exhausted from battle you can sit down by pressing [###keyBeingSit;] to recover faster.\"";
goto L_Close;
L_Mob:
diff --git a/world/map/npc/052-1/janitor.txt b/world/map/npc/052-1/janitor.txt
index 26b52d38..d0067d6e 100644
--- a/world/map/npc/052-1/janitor.txt
+++ b/world/map/npc/052-1/janitor.txt
@@ -7,7 +7,7 @@ end;
OnCommandClean:
// Kill all monsters (that includes the spawned Demonic Spirits and Azul Slimes)
// Note that the loot the slimes may have picked will be deleted at the same time.
- killmonsterall "052-1.gat";
+ killmonster "052-1", "All";
// Delete the magic stones that are still laying around.
// FIXME Syntax error happens if not setting a variable...
set $@dummy_var, getareadropitem("052-1.gat", 1, 1, 98, 78, 873, 1) +
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 16:05:02 +0000