diff options
author | Haru <haru@dotalux.com> | 2013-11-09 16:41:40 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2013-11-09 16:41:40 +0100 |
commit | 857bdc4f98be6cd1e185a24565d6b6b54752b9b4 (patch) | |
tree | 948d7b4ee8c991a128f5db2aa9df5b8ecf5ab37d /npc/custom | |
parent | 8ed38f98894fb04b4403b44dc0f36281cfd36326 (diff) | |
download | hercules-857bdc4f98be6cd1e185a24565d6b6b54752b9b4.tar.gz hercules-857bdc4f98be6cd1e185a24565d6b6b54752b9b4.tar.bz2 hercules-857bdc4f98be6cd1e185a24565d6b6b54752b9b4.tar.xz hercules-857bdc4f98be6cd1e185a24565d6b6b54752b9b4.zip |
Consolidated commands called in scripts to their lowercase version
- Added a note about variables and command scripts case sensitivity.
Even though the engine still accepts variable, function and command
names in a case insensitive way, it is discouraged to rely on such
behavior. Please update your custom scripts as soon as possible.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/custom')
-rw-r--r-- | npc/custom/battleground/bg_common.txt | 2 | ||||
-rw-r--r-- | npc/custom/etc/lottery.txt | 28 | ||||
-rw-r--r-- | npc/custom/etc/quest_warper.txt | 2 | ||||
-rw-r--r-- | npc/custom/quests/may_hats.txt | 10 | ||||
-rw-r--r-- | npc/custom/quests/thq/THQS_QuestNPC.txt | 8 | ||||
-rw-r--r-- | npc/custom/resetnpc.txt | 8 | ||||
-rw-r--r-- | npc/custom/woe_controller.txt | 6 |
7 files changed, 32 insertions, 32 deletions
diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt index 6f701d582..8886921f2 100644 --- a/npc/custom/battleground/bg_common.txt +++ b/npc/custom/battleground/bg_common.txt @@ -1237,7 +1237,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ mes "[Erundek]"; mes "We have many items, so please take a look and purchase deliberately."; close2; - Readbook 11010,1; + readbook 11010,1; end; case 5: mes "[Erundek]"; diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt index eec2efd0d..ef169c190 100644 --- a/npc/custom/etc/lottery.txt +++ b/npc/custom/etc/lottery.txt @@ -63,9 +63,9 @@ Pick6: // BROADCASTS DRAW L_Broadcast: - Announce "Lottery: Welcome to tonight's lotto draw!",8; - Announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8; - Announce "Congratulations to the winners of tonight!",8; + announce "Lottery: Welcome to tonight's lotto draw!",8; + announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8; + announce "Congratulations to the winners of tonight!",8; // GENERATES DRAW ID CODE L_GenID: @@ -293,7 +293,7 @@ LWinBig: mes "Jackpot!"; mes "You've won ^0000FF" + $L_Prize_Money + "z^000000."; set zeny,zeny+$L_Prize_Money; - Announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8; + announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8; set #LID,0; close; @@ -303,7 +303,7 @@ LWinSmall: mes "You have matched at least 4 numbers!"; mes "You've won ^0000FF" + $L_Prize_Money_Small + "z^000000."; set zeny,zeny+$L_Prize_Money_Small; - Announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8; + announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8; set #LID,0; close; @@ -373,9 +373,9 @@ GMPick6: // BROADCASTS DRAW L_Broadcast: - Announce "Lottery: Welcome to the special GM's lotto draw!",8; - Announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8; - Announce "Congratulations to the winners!",8; + announce "Lottery: Welcome to the special GM's lotto draw!",8; + announce "The numbers are as follows: [" + $LW1 + "] [" + $LW2 + "] [" + $LW3 + "] [" + $LW4 + "] [" + $LW5 + "] [" + $LW6 + "]",8; + announce "Congratulations to the winners!",8; // GENERATES DRAW ID CODE L_GenID: @@ -406,29 +406,29 @@ L_GM_Rig: set $LR5,0; set $LR6,0; GMInput1: - Input $LR1; + input $LR1; if ($LR1 < 1 || $LR1 > 40) goto GMInput1; mes $LR1; GMInput2: - Input $LR2; + input $LR2; if ($LR2 < 1 || $LR2 > 40) goto GMInput2; if ($LR2 == $LR1) goto GMInput2; mes $LR2; GMInput3: - Input $LR3; + input $LR3; if ($LR3 < 1 || $LR3 > 40) goto GMInput3; if ($LR3 == $LR1) goto GMInput3; if ($LR3 == $LR2) goto GMInput3; mes $LR3; GMInput4: - Input $LR4; + input $LR4; if ($LR4 < 1 || $LR4 > 40) goto GMInput4; if ($LR4 == $LR1) goto GMInput4; if ($LR4 == $LR2) goto GMInput4; if ($LR4 == $LR3) goto GMInput4; mes $LR4; GMInput5: - Input $LR5; + input $LR5; if ($LR5 < 1 || $LR5 > 40) goto GMInput5; if ($LR5 == $LR1) goto GMInput5; if ($LR5 == $LR2) goto GMInput5; @@ -436,7 +436,7 @@ GMInput5: if ($LR5 == $LR4) goto GMInput5; mes $LR5; GMInput6: - Input $LR6; + input $LR6; if ($LR6 < 1 || $LR6 > 40) goto GMInput6; if ($LR6 == $LR1) goto GMInput6; if ($LR6 == $LR2) goto GMInput6; diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt index 0caa9b82c..5bac0fd3f 100644 --- a/npc/custom/etc/quest_warper.txt +++ b/npc/custom/etc/quest_warper.txt @@ -495,7 +495,7 @@ L_GStorage: if ($QW_KPoint == 1) set RESRVPTS, RESRVPTS + ($QW_GS_PRICE/5); next; mes "[Warpra]"; - mes "Close this window and I will open the ^5533FF" + GetGuildName(@GID) + "^000000 storage."; + mes "Close this window and I will open the ^5533FF" + getguildname(@GID) + "^000000 storage."; close2; guildopenstorage; end; diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt index eda6b2aa6..cd81e0149 100644 --- a/npc/custom/quests/may_hats.txt +++ b/npc/custom/quests/may_hats.txt @@ -36,7 +36,7 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{ next; menu "Yeah.",-,"Nay.",M_EXIT; - if(countitem(5067) < 1 || countitem(916) < 920 || countitem(925) < 310) GOTO L_NOITEM;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds, + if(countitem(5067) < 1 || countitem(916) < 920 || countitem(925) < 310) goto L_NOITEM;//Items: Sombrero, Feather_of_Birds, Bill_of_Birds, delitem 5067,1;//Items: Sombrero, delitem 916,920;//Items: Feather_of_Birds, delitem 925,310;//Items: Bill_of_Birds, @@ -63,7 +63,7 @@ M_2: next; menu "Yeah.",-,"Nay.",M_EXIT; - if(countitem(5098) < 1 || countitem(1030) < 10 || countitem(1029) < 30 || countitem(7267) < 300) GOTO L_NOITEM;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty, + if(countitem(5098) < 1 || countitem(1030) < 10 || countitem(1029) < 30 || countitem(7267) < 300) goto L_NOITEM;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty, delitem 5098,1;//Items: Tiger_Mask, delitem 1030,10;//Items: Tiger's_Footskin, delitem 1029,30;//Items: Tiger_Skin, @@ -92,7 +92,7 @@ M_3: next; menu "Yeah.",-,"Nay.",M_EXIT; - if(countitem(2508) < 1 || countitem(2506) < 2 || countitem(2609) < 3 || countitem(7207) < 10) GOTO L_NOITEM;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau, + if(countitem(2508) < 1 || countitem(2506) < 2 || countitem(2609) < 3 || countitem(7207) < 10) goto L_NOITEM;//Items: Ragamuffin_Manteau, Manteau_, Skull_Ring, Old_Manteau, delitem 2508,1;//Items: Ragamuffin_Manteau, delitem 2506,2;//Items: Manteau_, delitem 2609,3;//Items: Skull_Ring, @@ -121,7 +121,7 @@ M_4: next; menu "Yeah.",-,"Nay.",M_EXIT; - if(countitem(2269) < 3 || countitem(2207) < 3 || countitem(2612) < 2 || countitem(2287)<3 ) GOTO L_NOITEM;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring, + if(countitem(2269) < 3 || countitem(2207) < 3 || countitem(2612) < 2 || countitem(2287)<3 ) goto L_NOITEM;//Items: Romantic_Flower, Fancy_Flower, Flower_Ring, delitem 2269,3;//Items: Romantic_Flower, delitem 2207,3;//Items: Fancy_Flower, delitem 2612,2;//Items: Flower_Ring, @@ -152,7 +152,7 @@ M_5: next; menu "Yeah.",-,"Nay.",M_EXIT; - if(countitem(975) < 1 || countitem(980) < 1 || countitem(2272) < 2 || countitem(2262) < 3 || countitem(7298) < 180 || countitem(7164) < 20) GOTO L_NOITEM;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach, + if(countitem(975) < 1 || countitem(980) < 1 || countitem(2272) < 2 || countitem(2262) < 3 || countitem(7298) < 180 || countitem(7164) < 20) goto L_NOITEM;//Items: Scarlet_Dyestuff, Orange_Dyestuff, Stop_Post, Clown_Nose, Fig_Leaf, Solid_Peach, delitem 975,1;//Items: Scarlet_Dyestuff, delitem 980,1;//Items: Orange_Dyestuff, delitem 2272,2;//Items: Stop_Post, diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt index b89279aec..1fad134aa 100644 --- a/npc/custom/quests/thq/THQS_QuestNPC.txt +++ b/npc/custom/quests/thq/THQS_QuestNPC.txt @@ -44,7 +44,7 @@ N_PayZeny: set On_Quest, 0; set Zeny,Zeny-2500; //add time delay penalty. You can get another quest after 2 - 3 hours. [Lupus] - set #THQ_DELAY, (GetTime(7)*12*31*24+GetTime(6)*31*24+GetTime(5)*24+GetTime(3)+rand(2,3)); + set #THQ_DELAY, (gettime(7)*12*31*24+gettime(6)*31*24+gettime(5)*24+gettime(3)+rand(2,3)); mes "[Guy]"; mes "Its sad to see someone give a quest up..."; mes "Shame on you."; @@ -59,7 +59,7 @@ N_ZenyFail: N_NewQuest: if (Event_THQS == 0) goto N_Signup; //checking if time penalty is over [Lupus] - if (#THQ_DELAY > (GetTime(7)*12*31*24 + GetTime(6)*31*24 + GetTime(5)*24 + GetTime(3)) ) goto L_NoQuestsForYet; + if (#THQ_DELAY > (gettime(7)*12*31*24 + gettime(6)*31*24 + gettime(5)*24 + gettime(3)) ) goto L_NoQuestsForYet; mes "[Guy]"; mes "Ahh welcome fellow Treasure Hunter."; mes "You currently have ^FF0000"+#Treasure_Token+"^000000 treasure tokens!!!"; @@ -71,7 +71,7 @@ N_NewQuest: mes "Ok lets see what quest we can give you today."; mes "The quest names in ^FF0000This Colour^000000 mean that they are more challanging then the rest, but have better rewards."; next; - set #THQ_DELAY,(GetTime(7)*12*31*24+GetTime(6)*31*24+GetTime(5)*24+GetTime(3) + 1); //you can get another quest after 1 hour [Lupus] + set #THQ_DELAY,(gettime(7)*12*31*24+gettime(6)*31*24+gettime(5)*24+gettime(3) + 1); //you can get another quest after 1 hour [Lupus] emotion 21; if(@treasure_job==0) set @treasure_job,rand(1,10); //doesn't allow cheaters to pick any quest they want if(@treasure_job==2) goto N_JobList2; @@ -100,7 +100,7 @@ N_Signup: L_NoQuestsForYet: mes "[Guy]"; mes "I'm afraid there aren't any Quests for you yet."; - mes "Call in "+ (#THQ_DELAY - (GetTime(7)*12*31*24+GetTime(6)*31*24+GetTime(5)*24+GetTime(3)) )+" hours later."; + mes "Call in "+ (#THQ_DELAY - (gettime(7)*12*31*24+gettime(6)*31*24+gettime(5)*24+gettime(3)) )+" hours later."; emotion 17; close; diff --git a/npc/custom/resetnpc.txt b/npc/custom/resetnpc.txt index 757f0da66..ae86ea035 100644 --- a/npc/custom/resetnpc.txt +++ b/npc/custom/resetnpc.txt @@ -35,7 +35,7 @@ prontera,150,193,4 script Reset Girl 4_F_TELEPORTER,{ } set Zeny, Zeny-.@ResetSkill; sc_end SC_ALL; - ResetSkill; + resetskill; mes "There you go!"; close; case 2: @@ -45,7 +45,7 @@ prontera,150,193,4 script Reset Girl 4_F_TELEPORTER,{ close; } set Zeny, Zeny-.@ResetStat; - ResetStatus; + resetstatus; mes "There you go!"; close; case 3: @@ -56,8 +56,8 @@ prontera,150,193,4 script Reset Girl 4_F_TELEPORTER,{ } set Zeny, Zeny-.@ResetBoth; sc_end SC_ALL; - ResetSkill; - ResetStatus; + resetskill; + resetstatus; mes "There you go!"; close; case 4: diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt index 74faa45e0..609b7942c 100644 --- a/npc/custom/woe_controller.txt +++ b/npc/custom/woe_controller.txt @@ -105,7 +105,7 @@ OnMinute00: if (gettime(4) == $WOE_CONTROL[.@i] && gettime(3) == $WOE_CONTROL[.@i+2]) { OnWOEEnd: announce "The War Of Emperium is over!",bc_all|bc_woe; - AgitEnd; AgitEnd2; + agitend; agitend2; sleep 1000; for(set .@j,0; .@j<30; set .@j,.@j+1) { if (.Active[0]&(1<<.@j)) Disp_Owner(.Castles$[.@j],1); @@ -123,10 +123,10 @@ OnMinute00: if (gettime(4) == $WOE_CONTROL[.@i] && gettime(3) >= $WOE_CONTROL[.@i+1] && gettime(3) < $WOE_CONTROL[.@i+2]) { deletearray .Active[0],2; set .Active[0], $WOE_CONTROL[.@i+3]; - if (.Init) { AgitEnd; AgitEnd2; } + if (.Init) { agitend; agitend2; } else announce "The War Of Emperium has begun!",bc_all|bc_woe; sleep 1000; - AgitStart; AgitStart2; + agitstart; agitstart2; for(set .@j,0; .@j<30; set .@j,.@j+1) { if (.Active[0]&(1<<.@j)) { if (!.Init) Disp_Owner(.Castles$[.@j],0); |