summaryrefslogtreecommitdiff
path: root/npc/custom/etc
diff options
context:
space:
mode:
Diffstat (limited to 'npc/custom/etc')
-rw-r--r--npc/custom/etc/quest_warper.txt44
-rw-r--r--npc/custom/etc/rpsroulette.txt8
2 files changed, 26 insertions, 26 deletions
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index 5bac0fd3f..62ea56c93 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -94,7 +94,7 @@ function script Q_Warpra {
case 10: goto L_GStorage;
case 11:
default:
- goto L_end;
+ goto L_End;
}
//=====================GM-Menu=Functions===========================
@@ -320,7 +320,7 @@ L_town:
freeloop(0);
set @TWMenu,select(.@menu$);
- if (@Tmenuref[@TWMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+ if (@Tmenuref[@TWMenu-1] == 57005) goto L_End; // 57005='dead' in hex
if(Zeny<@pTprice[@Tmenuref[@TWMenu-1]]) callsub L_Short_on_zeny,0;
set Zeny, Zeny-@pTprice[@Tmenuref[@TWMenu-1]];
@@ -341,7 +341,7 @@ L_dungeon:
freeloop(0);
set @DWMenu,select(.@menu$);
- if (@Dmenuref[@DWMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+ if (@Dmenuref[@DWMenu-1] == 57005) goto L_End; // 57005='dead' in hex
set @DwarpMenu, (@Dmenuref[@DWMenu-1]);
callfunc "QWS_DLarray";
@@ -355,7 +355,7 @@ L_dungeon:
freeloop(0);
set @DWLMenu,select(.@menu$);
- if (@DWLmenuref[@DWLMenu-1] == 57005) goto L_end; // 57005='dead' in hex
+ if (@DWLmenuref[@DWLMenu-1] == 57005) goto L_End; // 57005='dead' in hex
set @Darrayref, @DWLmenuref[@DWLMenu-1];
set @warpprice, @pDprice[@Dmenuref[@DWMenu-1]]+(getd(@pDfee$[@Dmenuref[@DWMenu-1]])*(@DDepth[@Darrayref]));
@@ -387,22 +387,22 @@ L_heal_Part:
if (@healchoice == 1) callsub PHeal,1,1;
if (@healchoice == 2) callsub PHeal,1,0;
if (@healchoice == 3) callsub PHeal,0,1;
- goto L_end;
+ goto L_End;
PHeal:
next;
set @Hp, MaxHp-Hp;
set @Sp, MaxSp-Sp;
- set @HpPrice, @hp*$QW_HP_H_PRICE;
- set @SpPrice, @sp*$QW_HP_S_PRICE;
+ set @HpPrice, @Hp*$QW_HP_H_PRICE;
+ set @SpPrice, @Sp*$QW_HP_S_PRICE;
mes "[Warpra]";
if(getarg(0) == 1) mes ""+@HpPrice+" Zeny for "+@Hp+" health points";
if(getarg(1) == 1) mes ""+@SpPrice+" Zeny for "+@Sp+" skill points";
set @total, @HpPrice+@SpPrice;
mes "for a total of "+@total+" zeny";
- if (select("Heal me","Let me see the choices again")==2) goto L_heal_Part;
-
- if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE;
+ if (select("Heal me","Let me see the choices again")==2) goto L_heal_Part;
+
+ if(getarg(0) == 1)set @HpPrice, (MaxHp-Hp)*$QW_HP_H_PRICE;
if(getarg(1) == 1)set @SpPrice, (MaxSp-Sp)*$QW_HP_S_PRICE;
set @healfee, @HpPrice+@SpPrice;
if (getarg(0) == 1)&&(getarg(1) == 1)&&(Zeny<@healfee) goto Zeny_Short_Both;
@@ -419,18 +419,18 @@ Zeny_Short_Both:
mes "[Warpra]";
mes "Choose another option, you can afford both.";
mes "I can heal as much as you can afford, too.";
- if (select("OK","Exit") == 2) goto L_end;
+ if (select("OK","Exit") == 2) goto L_End;
goto PHeal;
Zeny_short_HP:
mes "[Warpra]";
mes "Do you want me to partly heal your HP?";
- if (select("Yes","No") == 2) goto L_end;
+ if (select("Yes","No") == 2) goto L_End;
set @Hp, Zeny/$QW_HP_H_PRICE;
- set @HpPrice, @Hp*$QW_HP_H_PRICE;
- if (@Hp == 1) mes "You're not worth the effort.";
- if (@Hp == 1) goto L_end;
- set Zeny, Zeny-@HpPrice;
+ set @HpPrice, @Hp*$QW_HP_H_PRICE;
+ if (@Hp == 1) mes "You're not worth the effort.";
+ if (@Hp == 1) goto L_End;
+ set Zeny, Zeny-@HpPrice;
heal @Hp,0;
close;
end;
@@ -438,12 +438,12 @@ Zeny_short_HP:
Zeny_short_SP:
mes "[Warpra]";
mes "Do you want me to partly heal your SP?";
- if (select("Yes","No") == 2) goto L_end;
+ if (select("Yes","No") == 2) goto L_End;
set @Sp, Zeny/$QW_HP_S_PRICE;
- set @SpPrice, @Sp*$QW_HP_S_PRICE;
- if (@Sp == 1) mes "You're not worth the effort.";
- if (@Sp == 1) goto L_end;
- set Zeny, Zeny-@SpPrice;
+ set @SpPrice, @Sp*$QW_HP_S_PRICE;
+ if (@Sp == 1) mes "You're not worth the effort.";
+ if (@Sp == 1) goto L_End;
+ set Zeny, Zeny-@SpPrice;
heal 0,@Sp;
close;
end;
@@ -500,7 +500,7 @@ L_GStorage:
guildopenstorage;
end;
-L_end:
+L_End:
close;
end;
diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt
index fccb365ef..22123580d 100644
--- a/npc/custom/etc/rpsroulette.txt
+++ b/npc/custom/etc/rpsroulette.txt
@@ -16,7 +16,7 @@ cmd_in02,182,126,2 script Crazy Boris 4_M_03,{
set @counter,1;
mes "Hey you! Up for Rock Scissors Roulette?";
next;
- menu "Let me play.",PLAY,"Explain the rules.",RULES,"Leave",LEAVE;
+ menu "Let me play.",PLAY,"Explain the rules.",L_Rules,"Leave",LEAVE;
SAME:
mes "Draw! Again!";
next;
@@ -37,9 +37,9 @@ LOSE:
PLAY:
mes "Rock... Paper...";
set @opp,rand (1,3);
- menu "^0000FFROCK!",ROCK,"^FF0000SCISSORS!",SCISSORS,"^00FF00PAPER!^000000",PAPER;
+ menu "^0000FFROCK!",L_Rock,"^FF0000SCISSORS!",SCISSORS,"^00FF00PAPER!^000000",PAPER;
-ROCK:
+L_Rock:
if (@lastchoice == 1) set @opp,rand (1,3);
if (@opp == 1) emotion 11;
if (@opp == 2) emotion 10;
@@ -203,7 +203,7 @@ KILL:
next;
goto PRIZE;
-RULES:
+L_Rules:
mes "Ok here are the rules:";
mes "I have with me a ^FF00006^000000 chamber pistol with ^FF00001^000000 round. First we play ^FF0000Scissors ^00FF00Paper ^0000FFRock^000000. The loser pulls the trigger. The winner is whoever comes out best.";
mes "Beat me to win a prize.";