summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/029-3/parua.txt9
-rw-r--r--world/map/npc/068-2/hetchel.txt2
-rw-r--r--world/map/npc/functions/ferry.txt4
3 files changed, 8 insertions, 7 deletions
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 3047396e..4d8dc384 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -36,9 +36,9 @@ L_Paying:
goto L_NotEnough;
// Do not charge the money if the fight or the announces were already started by someone else
if ($@FIGHT_CAVE_STATUS != 0)
- close;
+ goto L_AlreadyStarted;
if ($@FIGHT_CAVE_PAID != 0)
- close;
+ goto L_AlreadyStarted;
set Zeny, Zeny - @FIGHT_CAVE_COST;
set $@FIGHT_CAVE_PAID, 1;
goto L_StartFight;
@@ -76,13 +76,13 @@ L_AcceptHelp:
L_TimeFightStart:
// Do not charge the money if the fight or the announces were already started by someone else
if ($@FIGHT_CAVE_STATUS != 0)
- close;
+ goto L_AlreadyStarted;
if (getmapusers("029-3.gat") < 5)
goto L_NotEnoughPlayers;
if (Zeny < @FIGHT_CAVE_COST + @FIGHT_CAVE_ANNOUNCE_COST)
goto L_NotEnough_Announce;
if ($@FIGHT_CAVE_PAID != 0)
- close;
+ goto L_AlreadyStarted;
set Zeny, Zeny - (@FIGHT_CAVE_COST + @FIGHT_CAVE_ANNOUNCE_COST);
set $@FIGHT_CAVE_PAID, 1;
set $@SPONSOR$, strcharinfo(0);
@@ -325,6 +325,7 @@ L_CleanUp:
mapannounce "029-1.gat", "Parua:* The dungeon is now ready for its next victims.", 0;
areatimer "029-3.gat", 20, 20, 70, 60, 10, "Parua::OnReward";
set $@FIGHT_CAVE_STATUS, 0;
+ set $@FIGHT_CAVE_PAID, 0;
set $@FIGHT_CAVE_PLAYER_COUNT, 0;
set $@FIGHT_CAVE_LEVEL, 1;
set $@FIGHT_CAVE_ROUND_TIMER, 0;
diff --git a/world/map/npc/068-2/hetchel.txt b/world/map/npc/068-2/hetchel.txt
index 7c20231f..c81d0cf1 100644
--- a/world/map/npc/068-2/hetchel.txt
+++ b/world/map/npc/068-2/hetchel.txt
@@ -169,7 +169,7 @@ L_Spants_Cry_Cont_2:
mes "";
mes "\"Oh my friend, I have been dreaming of making a garment of my own.";
mes "It always bothered me to see all those wizards and witches here being naked under their cloaks\"";
- mes "\"They must be so embarrassed - they are true heros to give up their dignity to be able to fight the perils of this world\"";
+ mes "\"They must be so embarrassed - they are true heroes to give up their dignity to be able to fight the perils of this world\"";
mes "Hetchel sobs";
menu
"\"So you want to make pants for mages?\"", L_Spants_Cry_Cont_3,
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 8cc6de47..829b5f2f 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -139,8 +139,8 @@ function|script|BoardCandorFerry
{
mes "Board the ferry?";
menu
- "yes.", L_Board,
- "no.", L_Return;
+ "Yes.", L_Board,
+ "No.", L_Return;
L_Board:
if (BaseLevel < 40) goto L_TooYoung;