summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
Diffstat (limited to 'world/map')
-rw-r--r--world/map/db/over_100_mob_db.txt6
-rw-r--r--world/map/npc/008-1/annualeaster.txt3
-rw-r--r--world/map/npc/009-4/barriers.txt12
-rw-r--r--world/map/npc/009-4/torches.txt6
-rw-r--r--world/map/npc/009-7/trapdoor.txt2
-rw-r--r--world/map/npc/042-2/sorfina.txt8
-rw-r--r--world/map/npc/042-2/tanisha.txt2
-rw-r--r--world/map/npc/annuals/halloween/config.txt9
-rw-r--r--world/map/npc/annuals/xmas/config.txt9
-rw-r--r--world/map/npc/functions/ferry.txt4
10 files changed, 29 insertions, 32 deletions
diff --git a/world/map/db/over_100_mob_db.txt b/world/map/db/over_100_mob_db.txt
index 09362981..0515258c 100644
--- a/world/map/db/over_100_mob_db.txt
+++ b/world/map/db/over_100_mob_db.txt
@@ -23,9 +23,9 @@
1102, Luvia, Luvia, 127, 48044, 60, 0, 12172, 5, 339, 364, 50, 92, 1, 29, 55, 255, 255, 255, 31, 30, 1, 0, 69, 181, 220, 1200, 672, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1106, WickedMushroom, WickedMushroom, 110, 550, 0, 0, 30, 1, 70, 80, 4, 4, 16, 12, 10, 10, 35, 10, 1, 1, 1, 3, 22, 133, 800, 1800, 672, 480, 613, 600, 4007, 50, 567, 100, 566, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60
1114, Nutcracker, Nutcracker, 110, 6000, 0, 0, 769, 1, 81, 281, 20, 42, 40, 20, 10, 5, 60, 40, 1, 1, 1, 0, 29, 133, 400, 872, 672, 900, 569, 1000, 660, 750, 539, 750, 503, 250, 640, 200, 4004, 200, 4001, 600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
-1119, Thug, Thug, 180, 5000, 0, 0, 999, 1, 125, 250, 40, 6, 0, 10, 50, 0, 40, 80, 1, 10, 1, 0, 2, 175, 500, 1200, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
-1120, Swashbuckler, Swashbuckler, 180, 5000, 0, 0, 999, 1, 75, 250, 18, 22, 10, 20, 30, 20, 80, 80, 1, 10, 1, 0, 2, 175, 400, 800, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
-1121, Grenadier, Grenadier, 180, 5000, 0, 0, 999, 8, 100, 200, 8, 60, 2, 10, 40, 50, 80, 80, 1, 10, 1, 0, 5, 175, 500, 2000, 672, 480, 539, 1000, 657, 1000, 701, 500, 704, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
+1119, Thug, Thug, 180, 5000, 0, 0, 999, 1, 125, 250, 30, 6, 0, 10, 50, 0, 40, 60, 1, 10, 1, 0, 2, 175, 500, 1200, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
+1120, Swashbuckler, Swashbuckler, 180, 5000, 0, 0, 999, 1, 75, 250, 23, 27, 10, 20, 30, 20, 80, 60, 1, 10, 1, 0, 2, 175, 400, 800, 672, 480, 539, 1000, 657, 1000, 701, 500, 703, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
+1121, Grenadier, Grenadier, 180, 6000, 0, 0, 999, 6, 100, 200, 8, 60, 2, 10, 40, 50, 80, 60, 1, 10, 1, 0, 5, 175, 500, 2000, 672, 480, 539, 1000, 657, 1000, 701, 500, 704, 250, 700, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
1122, DreadPirateMarley, DreadPirateMarley, 180, 10000, 0, 0, 20000, 4, 175, 250, 38, 32, 10, 20, 40, 20, 90, 80, 1, 30, 1, 0, 2, 175, 400, 700, 672, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1123, DreadPirateMarleyClone, DreadPirateMarleyClone, 150, 2000, 0, 0, 0, 4, 175, 250, 18, 22, 10, 40, 30, 20, 80, 40, 1, 30, 1, 0, 2, 175, 500, 1200, 672, 480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1126, PsiBrain, PsiBrain, 100, 10000, 0, 0, 4000, 2, 220, 500, 23, 30, 35, 15, 3, 50, 50, 50, 2, 2, 1, 1, 29, 175, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 40, 5111, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index 698aa65f..a8bbc20b 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -163,8 +163,7 @@ OnInit:
end;
L_FAULTY_SETUP:
- gmcommand "@mapexit";
- end;
+ mapexit;
OnTimer1000:
setnpctimer 0;
diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 9e3e85b9..9e9ef7bc 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -81,11 +81,11 @@ L_Started:
if (OrumQuest > 7 && @TorchColor == @BarrierColor)
goto L_Allow_Second_Passage;
- warp "009-4.gat", 61, 56;
+ 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";
- mes "Looking closely between the two torches you can see the barrier has a " + @colors$[@BarrierColor] + " tint to it.";
+ mes "Looking closely between the two torches you can see the barrier has a ##B" + @colors$[@BarrierColor] + "##b tint to it.";
close;
L_Allow_Second_Passage:
@@ -126,11 +126,11 @@ L_Advance_Quest:
if (OrumQuest > 8 && @Torch2Color == @firstColor && @Torch1Color == @secondColor)
goto L_Allow_Third_Passage;
- warp "009-4.gat", 24, 64;
+ 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";
- mes "Looking closely between the two torches you can see the barrier has a " + @colors$[@BarrierColor] + " tint to it.";
+ mes "Looking closely between the two torches you can see the barrier has a ##B" + @colors$[@BarrierColor] + "##b tint to it.";
close;
L_Allow_Third_Passage:
@@ -239,11 +239,11 @@ L_Advance_Quest:
goto L_Deny_Final_Passage;
L_Deny_Final_Passage:
- warp "009-4.gat", 48, 36;
+ 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";
- mes "Looking closely between the two torches you can see the barrier has a " + @colors$[@BarrierColor] + " tint to it.";
+ mes "Looking closely between the two torches you can see the barrier has a ##B" + @colors$[@BarrierColor] + "##b tint to it.";
close;
L_Allow_Final_Passage:
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index b92098c0..fbb88a84 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -132,7 +132,7 @@ function|script|TorchLoop
"yellow", "light green", "green", "dark green",
"blue", "dark purple", "purple", "light purple";
setarray @intensities$, "calm", "bright", "blinding";
- mes "Looking closely you notice that this torch is not like the others. This one has a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + " tint to it.";
+ mes "Looking closely you notice that this torch is not like the others. This one has a " + @intensities$[@TorchIntensity] + " ##B" + @colors$[@TorchColor] + "##b tint to it.";
goto L_Color_Loop;
L_Color_Loop:
@@ -257,7 +257,7 @@ L_Color_Inc:
L_Show_Color:
callfunc "SetTorchColor";
misceffect 5;
- mes "As your pour the powder into the flame you can see its tint transform to a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + ".";
+ mes "As your pour the powder into the flame you can see its tint transform to a " + @intensities$[@TorchIntensity] + " ##B" + @colors$[@TorchColor] + "##b.";
goto L_Color_Loop;
L_WrongColor:
@@ -267,7 +267,7 @@ L_WrongColor:
goto L_Failed;
callfunc "SetTorchIntensity";
misceffect 5;
- mes "As you pour the powder into the flame it flares violently for a moment and then turns into a " + @intensities$[@TorchIntensity] + " " + @colors$[@TorchColor] + ".";
+ mes "As you pour the powder into the flame it flares violently for a moment and then turns into a " + @intensities$[@TorchIntensity] + " ##B" + @colors$[@TorchColor] + "##b.";
goto L_Color_Loop;
L_Failed:
diff --git a/world/map/npc/009-7/trapdoor.txt b/world/map/npc/009-7/trapdoor.txt
index 7ab6b0b6..aff98cbd 100644
--- a/world/map/npc/009-7/trapdoor.txt
+++ b/world/map/npc/009-7/trapdoor.txt
@@ -58,6 +58,6 @@ L_Close:
OnInit:
setarray $@fightclub_randompasswords$, "Abibliophobia", "Anencephalous", "Batrachomyomachy", "Blunderbuss", "Boustrophedon", "Bumbershoot", "Canoodle", "Cockalorum", "Cockamamie", "Collywobbles", "Eructation", "Flibbertigibbet", "Formication", "Gaberlunzie", "Gastromancy", "Gobemouche", "Hemidemisemiquaver", "Hobbledehoy", "Hootenanny", "Lickspittle", "Lollygag", "Mumpsimus", "Nincompoop", "Oocephalus", "Pettifogger", "Sialoquent", "Slangwhanger", "Smellfungus", "Tatterdemalion", "Vomitory", "Widdershins", "Avoirdupois", "Embonpoint", "Bibble", "Erinaceous", "Impignorate", "Nudiustertian", "Tittynope", "Winklepicker", "Yarborough", "Floccinaucinihilipilification";
setarray $@fightclub_definitions$, "The fear of running out of reading material","Lacking a brain","Making a mountain out of a molehill","A gun with a flared muzzle or disorganized activity","A back and forth pattern","An umbrella","To hug and kiss","A small, haughty man","Absurd, outlandish","Butterflies in the stomach","A burp, belch","Nonsense, balderdash","The sense of ants crawling on your skin","A wandering beggar","Telling fortune from the rumblings of the stomach","A highly gullible person","A musical timing of 1/64","An awkward or ill-mannered young boy","A country or folk music get-together","A servile person, a toady","To move slowly, fall behind","To move slowly, fall behind","A foolish person","An egghead","A person who tries to befuddle others with his speech","Spitting while speaking","A loud abusive speaker or obnoxious writer","A perpetual pessimist","A child in rags","An exit or outlet","In a contrary or counterclockwise direction", "Commodities sold by weight", "A plump, hourglass figure", "To drink often; to eat and/or drink noisily", "Resembling a hedgehog", "To pawn or mortgage something", "The day before yesterday", "A small quantity of something left over", "Style of shoe or boot with a sharp and long pointed toe", "Hand of cards containing no card above a nine", "Estimation that something is valueless";
- if(getarraysize($@fightclub_randompasswords$) != getarraysize($@fightclub_definitions$)) gmcommand "@mapexit";
+ if(getarraysize($@fightclub_randompasswords$) != getarraysize($@fightclub_definitions$)) mapexit;
end;
}
diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt
index 92e27f9a..839a5f65 100644
--- a/world/map/npc/042-2/sorfina.txt
+++ b/world/map/npc/042-2/sorfina.txt
@@ -69,8 +69,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, ###keyMoveDown; to move down, ";
- mes " ###keyMoveLeft; to move left, ###keyMoveRight; to move right ";
+ 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 " or click on the place you want to go to.\"";
set @tutorial_tmp, 1;
callfunc "SetTutorialMask";
@@ -141,8 +141,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, ###keyMoveDown; to move down, ";
- mes " ###keyMoveLeft; to move left, ###keyMoveRight; to move right ";
+ 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 " or click on the place you want to go to.\"";
mes "This only works if that place is reachable and walkable.\"";
goto L_Close;
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index aad93769..72d68d84 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -62,7 +62,7 @@ L_Fight_Again:
mes "\"Ok, listen what to do.";
mes "Equip a weapon and kill the maggots.\"";
next;
- mes "\"Press A 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.\"";
diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt
index 226d8bbb..0401fc3d 100644
--- a/world/map/npc/annuals/halloween/config.txt
+++ b/world/map/npc/annuals/halloween/config.txt
@@ -339,11 +339,11 @@ L_Main:
if(gettime(6) <= $@halloween_end_month && gettime(5) > $@halloween_reward_end_day)
goto L_NoEventTime;
- if((gettime(6) == $@halloween_reward_start_month && gettime(5) >= $@halloween_reward_start_day
+ if((gettime(6) == $@halloween_reward_start_month && gettime(5) >= $@halloween_reward_start_day
&& (gettime(5) <= $@halloween_reward_end_day && $@halloween_reward_start_month == $@halloween_end_month
|| !($@halloween_reward_start_month == $@halloween_end_month)))
- || (gettime(6) == $@halloween_end_month && gettime(5) <= $@halloween_reward_end_day
- && (gettime(5) >= $@halloween_reward_start_day && $@halloween_reward_start_month == $@halloween_end_month
+ || (gettime(6) == $@halloween_end_month && gettime(5) <= $@halloween_reward_end_day
+ && (gettime(5) >= $@halloween_reward_start_day && $@halloween_reward_start_month == $@halloween_end_month
|| !($@halloween_reward_start_month == $@halloween_end_month)))
|| (gettime(6) < $@halloween_end_month && gettime(6) > $@halloween_reward_start_month))
goto L_RewardTime;
@@ -372,6 +372,5 @@ L_Return:
L_HalloweenError:
debugmes "Halloween is Dead Jim.";
- gmcommand "@mapexit";
- end;
+ mapexit;
}
diff --git a/world/map/npc/annuals/xmas/config.txt b/world/map/npc/annuals/xmas/config.txt
index 70eb5b05..e95494d3 100644
--- a/world/map/npc/annuals/xmas/config.txt
+++ b/world/map/npc/annuals/xmas/config.txt
@@ -262,11 +262,11 @@ L_Main:
set $@xmas_spawn_y2, 89;
set $@xmas_respawn_count, 9;
- if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day
+ if((gettime(6) == $@xmas_reward_start_month && gettime(5) >= $@xmas_reward_start_day
&& (gettime(5) <= $@xmas_reward_end_day && $@xmas_reward_start_month == $@xmas_end_month
|| !($@xmas_reward_start_month == $@xmas_end_month)))
- || (gettime(6) == $@xmas_end_month && gettime(5) <= $@xmas_reward_end_day
- && (gettime(5) >= $@xmas_reward_start_day && $@xmas_reward_start_month == $@xmas_end_month
+ || (gettime(6) == $@xmas_end_month && gettime(5) <= $@xmas_reward_end_day
+ && (gettime(5) >= $@xmas_reward_start_day && $@xmas_reward_start_month == $@xmas_end_month
|| !($@xmas_reward_start_month == $@xmas_end_month)))
|| (gettime(6) < $@xmas_end_month && gettime(6) > $@xmas_reward_start_month))
goto L_RewardTime;
@@ -299,6 +299,5 @@ L_Return:
L_XmasError:
debugmes "Xmas is Dead Jim.";
- gmcommand "@mapexit";
- end;
+ mapexit;
}
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 829b5f2f..cc5bfa14 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -124,8 +124,8 @@ function|script|BoardFerry
{
mes "Board the ferry?";
menu
- "yes.", L_Board,
- "no.", L_Return;
+ "Yes.", L_Board,
+ "No.", L_Return;
L_Board:
warp "035-2.tmx",39,29;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-06 08:21:33 +0000