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 | |
| 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')
62 files changed, 403 insertions, 403 deletions
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index e9139dacd..eecb76888 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -798,7 +798,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{ mes "Just have your drink"; mes "and then leave!"; next; - if (Select("I'm a member of Single Army!!:...I just wanted to congratulate them...") == 1) { + if (select("I'm a member of Single Army!!:...I just wanted to congratulate them...") == 1) { mes "[Employee]"; mes "Yeah, right."; mes "Knock it off already."; 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); diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index c56563c86..01d9734d5 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -121,7 +121,7 @@ yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{ mes "Have a good time."; donpcevent "Rmimi Ravies#gq_fes01::OnStart"; - announce "["+ strcharinfo(0) +"] member of ["+ GetGuildName(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb"; + announce "["+ strcharinfo(0) +"] member of ["+ getguildname(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb"; close; } else { @@ -502,7 +502,7 @@ rachel,132,117,3 script Rhehe Ravies#gq_fes03 4_F_HUGIRL,{ mes "[Rhehe Ravies]"; mes "I hope you enjoy yourself!"; donpcevent "Rhehe Ravies#gq_fes03::OnStart"; - announce "["+ strcharinfo(0) +"] member of ["+ GetGuildName(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Rachel'.",bc_all,"0x70dbdb"; + announce "["+ strcharinfo(0) +"] member of ["+ getguildname(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Rachel'.",bc_all,"0x70dbdb"; close; } else { diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt index 2fd6b7594..9b24c50b6 100644 --- a/npc/events/nguild/nguild_dunsw.txt +++ b/npc/events/nguild/nguild_dunsw.txt @@ -14,7 +14,7 @@ //================================================== function script F_GldDunSw { - set .@GID, GetCastleData(getarg(0),1); + set .@GID, getcastledata(getarg(0),1); if (.@GID == 0) { mes "[ Echoing Voice ]"; mes " ' The one who can overcome an ordeal and show true bravery... will find the way... ' "; diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt index 96c16136c..f35903828 100644 --- a/npc/events/nguild/nguild_ev_agit.txt +++ b/npc/events/nguild/nguild_ev_agit.txt @@ -21,10 +21,10 @@ function script F_AgitStart { set .@empx, getarg(2); set .@empy, getarg(3); - MapRespawnGuildID .@map$,GetCastleData(.@map$,1),2; + maprespawnguildid .@map$,getcastledata(.@map$,1),2; monster .@map$,.@empx,.@empy,"Emperium",1288,1,"Agit_"+.@castle$+"::OnAgitBreak"; - GvgOn .@map$; - if (GetCastleData(.@map$,1) != 0) return; + gvgon .@map$; + if (getcastledata(.@map$,1) != 0) return; end; } @@ -35,10 +35,10 @@ function script F_GuildBreak { killmonsterall .@map$; - Announce "Guild Base [" + GetCastleName(.@map$) + "] has been abandoned.",0; + announce "Guild Base [" + getcastlename(.@map$) + "] has been abandoned.",0; disablenpc "Kafra Staff#"+.@castle$; - SetCastleData .@map$,0,0; + setcastledata .@map$,0,0; return; } @@ -50,29 +50,29 @@ function script F_AgitBreak { set .@GID,getcharid(2); if (.@GID <= 0) return; - set .@Economy,GetCastleData(.@map$,2) - 5; + set .@Economy,getcastledata(.@map$,2) - 5; if (.@Economy < 0) set .@Economy, 0; - SetCastleData .@map$, 2, .@Economy; + setcastledata .@map$, 2, .@Economy; - set .@Defence,GetCastleData(.@map$,3) - 5; + set .@Defence,getcastledata(.@map$,3) - 5; if (.@Defence < 0) set .@Defence, 0; - SetCastleData .@map$, 3, .@Defence; + setcastledata .@map$, 3, .@Defence; - SetCastleData .@map$,1, .@GID; - MapAnnounce .@map$,"The emperium has been destroyed.",bc_map,0x00CCFF; - Announce "The [" + GetCastleName(.@map$) + "] castle has been conquered by the [" + GetGuildName(.@GID) + "] guild.",bc_all; + setcastledata .@map$,1, .@GID; + mapannounce .@map$,"The emperium has been destroyed.",bc_map,0x00CCFF; + announce "The [" + getcastlename(.@map$) + "] castle has been conquered by the [" + getguildname(.@GID) + "] guild.",bc_all; donpcevent "::OnRecvCastle"+.@castle$; disablenpc "Kafra Staff#"+.@castle$; // remove investment data and kafra for( set .@i, 4; .@i <= 9; set .@i, .@i+1 ) - SetCastleData .@map$, .@i, 0; + setcastledata .@map$, .@i, 0; // if the new guild doesn't have Guardian Research, erase guardians if( getgdskilllv(.@GID,10002) == 0 ) for( set .@i, 10; .@i <= 17; set .@i, .@i+1 ) - SetCastleData .@map$, .@i, 0; + setcastledata .@map$, .@i, 0; return; } @@ -83,12 +83,12 @@ function script F_AgitEnd { set .@map$, getarg(0); set .@castle$, getarg(1); - GvgOff .@map$; + gvgoff .@map$; // Disable the following if statment to keep empty // castles from being aquired after after WoE ends. - if (GetCastleData(.@map$,1) == 0) return; - MapRespawnGuildID .@map$,GetCastleData(.@map$,1),4; - KillMonster .@map$,"Agit_"+.@castle$+"::OnAgitBreak"; + if (getcastledata(.@map$,1) == 0) return; + maprespawnguildid .@map$,getcastledata(.@map$,1),4; + killmonster .@map$,"Agit_"+.@castle$+"::OnAgitBreak"; end; } @@ -98,7 +98,7 @@ OnInterIfInitOnce: donpcevent "::OnRecvCastleN01"; end; OnRecvCastleN01: - RequestGuildInfo GetCastleData("nguild_alde",1); + requestguildinfo getcastledata("nguild_alde",1); end; OnAgitStart: callfunc "F_AgitStart","nguild_alde","N01",216,24; @@ -111,8 +111,8 @@ OnGuildBreak: callfunc "F_GuildBreak","nguild_alde","N01"; end; OnAgitEliminate: - MapRespawnGuildID "nguild_alde",GetCastleData("nguild_alde",1),6; - Monster "nguild_alde",216,24,"EMPERIUM",1288,1,"Agit_N01::OnAgitBreak"; + maprespawnguildid "nguild_alde",getcastledata("nguild_alde",1),6; + monster "nguild_alde",216,24,"EMPERIUM",1288,1,"Agit_N01::OnAgitBreak"; end; OnAgitEnd: callfunc "F_AgitEnd","nguild_alde","N01"; @@ -125,7 +125,7 @@ OnInterIfInitOnce: donpcevent "::OnRecvCastleN02"; end; OnRecvCastleN02: - RequestGuildInfo GetCastleData("nguild_gef",1); + requestguildinfo getcastledata("nguild_gef",1); end; OnAgitStart: callfunc "F_AgitStart","nguild_gef","N02",198,182; @@ -138,8 +138,8 @@ OnGuildBreak: callfunc "F_GuildBreak","nguild_gef","N02"; end; OnAgitEliminate: - MapRespawnGuildID "nguild_gef",GetCastleData("nguild_gef",1),6; - Monster "nguild_gef",198,182,"EMPERIUM",1288,1,"Agit_N02::OnAgitBreak"; + maprespawnguildid "nguild_gef",getcastledata("nguild_gef",1),6; + monster "nguild_gef",198,182,"EMPERIUM",1288,1,"Agit_N02::OnAgitBreak"; end; OnAgitEnd: callfunc "F_AgitEnd","nguild_gef","N02"; @@ -152,7 +152,7 @@ OnInterIfInitOnce: donpcevent "::OnRecvCastleN03"; end; OnRecvCastleN03: - RequestGuildInfo GetCastleData("nguild_pay",1); + requestguildinfo getcastledata("nguild_pay",1); end; OnAgitStart: callfunc "F_AgitStart","nguild_pay","N03",139,139; @@ -165,8 +165,8 @@ OnGuildBreak: callfunc "F_GuildBreak","nguild_pay","N03"; end; OnAgitEliminate: - MapRespawnGuildID "nguild_pay",GetCastleData("nguild_pay",1),6; - Monster "nguild_pay",139,139,"EMPERIUM",1288,1,"Agit_N03::OnAgitBreak"; + maprespawnguildid "nguild_pay",getcastledata("nguild_pay",1),6; + monster "nguild_pay",139,139,"EMPERIUM",1288,1,"Agit_N03::OnAgitBreak"; end; OnAgitEnd: callfunc "F_AgitEnd","nguild_pay","N03"; @@ -179,7 +179,7 @@ OnInterIfInitOnce: donpcevent "::OnRecvCastleN04"; end; OnRecvCastleN04: - RequestGuildInfo GetCastleData("nguild_prt",1); + requestguildinfo getcastledata("nguild_prt",1); end; OnAgitStart: callfunc "F_AgitStart","nguild_prt","N04",197,197; @@ -192,8 +192,8 @@ OnGuildBreak: callfunc "F_GuildBreak","nguild_prt","N04"; end; OnAgitEliminate: - MapRespawnGuildID "nguild_prt",GetCastleData("nguild_prt",1),6; - Monster "nguild_prt",197,197,"EMPERIUM",1288,1,"Agit_N04::OnAgitBreak"; + maprespawnguildid "nguild_prt",getcastledata("nguild_prt",1),6; + monster "nguild_prt",197,197,"EMPERIUM",1288,1,"Agit_N04::OnAgitBreak"; end; OnAgitEnd: callfunc "F_AgitEnd","nguild_prt","N04"; diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt index 17e1db744..8c629adf9 100644 --- a/npc/events/nguild/nguild_flags.txt +++ b/npc/events/nguild/nguild_flags.txt @@ -16,7 +16,7 @@ /// Flag Function //============================================================ function script F_Flags { - set .@GID, GetCastleData(getarg(1),1); + set .@GID, getcastledata(getarg(1),1); if (getarg(5) == 0) return; if (.@GID == 0) { mes " [ Edict of the Divine Rune Midgard Kingdom ]"; @@ -38,7 +38,7 @@ function script F_Flags { mes "Do you wish to return to your honorable place?"; next; if (select("Return to the guild castle.:Quit.") == 1) { - if (getcharid(2) == GetCastleData(getarg(1),1)) + if (getcharid(2) == getcastledata(getarg(1),1)) warp getarg(1),getarg(2),getarg(3); } return; @@ -48,10 +48,10 @@ function script F_Flags { mes "1. Following the ordinance of the"; mes "Divine Rune Midgard Kingdom,"; mes "we approve that this place is in"; - mes "the private possession of ^ff0000" + GetGuildName(.@GID) + "^000000 Guild."; + mes "the private possession of ^ff0000" + getguildname(.@GID) + "^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+ GetGuildName(.@GID) + "^000000 Guild is"; - mes "^FF0000" + GetGuildMaster(.@GID) + "^000000"; + mes "2. The guild Master of ^ff0000"+ getguildname(.@GID) + "^000000 Guild is"; + mes "^FF0000" + getguildmaster(.@GID) + "^000000"; mes "If there is anyone who objects to this,"; mes " prove your strength and honor with a steel blade in your hand."; return; @@ -66,7 +66,7 @@ n_castle,110,96,1 script NGuild Aldebaran#a1-1 GUILD_FLAG,{ close; OnRecvCastleN01: - FlagEmblem GetCastleData("nguild_alde",1); + flagemblem getcastledata("nguild_alde",1); end; } @@ -75,7 +75,7 @@ nguild_alde,30,248,4 script NGuild Aldebaran#a1-6::NGuildAlde GUILD_FLAG,{ close; OnRecvCastleN01: - FlagEmblem GetCastleData("nguild_alde",1); + flagemblem getcastledata("nguild_alde",1); end; } // In Castle ============================================ @@ -105,7 +105,7 @@ n_castle,110,109,3 script NGuild Geffen#g1-1 GUILD_FLAG,{ close; OnRecvCastleN02: - FlagEmblem GetCastleData("nguild_gef",1); + flagemblem getcastledata("nguild_gef",1); end; } @@ -114,7 +114,7 @@ nguild_gef,28,157,4 script NGuild Geffen#g1-6::NGuildGef GUILD_FLAG,{ close; OnRecvCastleN02: - FlagEmblem GetCastleData("nguild_gef",1); + flagemblem getcastledata("nguild_gef",1); end; } // In Castle ============================================= @@ -135,7 +135,7 @@ n_castle,94,109,5 script NGuild Payon#f1-1 GUILD_FLAG,{ close; OnRecvCastleN03: - FlagEmblem GetCastleData("nguild_pay",1); + flagemblem getcastledata("nguild_pay",1); end; } @@ -144,7 +144,7 @@ nguild_pay,238,67,4 script NGuild Payon#f1-6::NGuildPay GUILD_FLAG,{ close; OnRecvCastleN03: - FlagEmblem GetCastleData("nguild_pay",1); + flagemblem getcastledata("nguild_pay",1); end; } // In Castle =============================================== @@ -166,7 +166,7 @@ n_castle,94,96,7 script NGuild Prontera#p1-1 GUILD_FLAG,{ close; OnRecvCastleN04: - FlagEmblem GetCastleData("nguild_prt",1); + flagemblem getcastledata("nguild_prt",1); end; } @@ -175,7 +175,7 @@ nguild_prt,58,56,4 script NGuild Prontera#p1-7::NGuildPrt GUILD_FLAG,{ close; OnRecvCastleN04: - FlagEmblem GetCastleData("nguild_prt",1); + flagemblem getcastledata("nguild_prt",1); end; } // In Castle ============================================= diff --git a/npc/events/nguild/nguild_guardians.txt b/npc/events/nguild/nguild_guardians.txt index 7b0e5bab4..3a34259c2 100644 --- a/npc/events/nguild/nguild_guardians.txt +++ b/npc/events/nguild/nguild_guardians.txt @@ -15,73 +15,73 @@ //------------------------------------------------------------------------------ nguild_alde,216,24,0 script Guardian_N01 -1,{ OnAgitInit: - if (GetCastleData("nguild_alde",10) == 1) guardian "nguild_alde",18,219,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",0; - if (GetCastleData("nguild_alde",11) == 1) guardian "nguild_alde",117,42,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",1; - if (GetCastleData("nguild_alde",12) == 1) guardian "nguild_alde",207,153,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",2; - if (GetCastleData("nguild_alde",13) == 1) guardian "nguild_alde",68,70,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",3; - if (GetCastleData("nguild_alde",14) == 1) guardian "nguild_alde",187,140,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",4; - if (GetCastleData("nguild_alde",15) == 1) guardian "nguild_alde",62,204,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",5; - if (GetCastleData("nguild_alde",16) == 1) guardian "nguild_alde",113,100,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",6; - if (GetCastleData("nguild_alde",17) == 1) guardian "nguild_alde",211,174,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",7; + if (getcastledata("nguild_alde",10) == 1) guardian "nguild_alde",18,219,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",0; + if (getcastledata("nguild_alde",11) == 1) guardian "nguild_alde",117,42,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",1; + if (getcastledata("nguild_alde",12) == 1) guardian "nguild_alde",207,153,"Soldier Guardian",1287,"Guardian_N01::OnGuardianDied",2; + if (getcastledata("nguild_alde",13) == 1) guardian "nguild_alde",68,70,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",3; + if (getcastledata("nguild_alde",14) == 1) guardian "nguild_alde",187,140,"Archer Guardian",1285,"Guardian_N01::OnGuardianDied",4; + if (getcastledata("nguild_alde",15) == 1) guardian "nguild_alde",62,204,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",5; + if (getcastledata("nguild_alde",16) == 1) guardian "nguild_alde",113,100,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",6; + if (getcastledata("nguild_alde",17) == 1) guardian "nguild_alde",211,174,"Knight Guardian",1286,"Guardian_N01::OnGuardianDied",7; end; OnGuardianDied: // Event when Guardian dies - MapAnnounce "nguild_alde","A Guardian Has Fallen",17; + mapannounce "nguild_alde","A Guardian Has Fallen",17; end; } //------------------------------------------------------------------------------ nguild_gef,198,182,0 script Guardian_N02 -1,{ OnAgitInit: - if (GetCastleData("nguild_gef",10) == 1) guardian "nguild_gef",30,178,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",0; - if (GetCastleData("nguild_gef",11) == 1) guardian "nguild_gef",64,180,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",1; - if (GetCastleData("nguild_gef",12) == 1) guardian "nguild_gef",61,25,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",2; - if (GetCastleData("nguild_gef",13) == 1) guardian "nguild_gef",61,44,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",3; - if (GetCastleData("nguild_gef",14) == 1) guardian "nguild_gef",189,43,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",4; - if (GetCastleData("nguild_gef",15) == 1) guardian "nguild_gef",51,192,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",5; - if (GetCastleData("nguild_gef",16) == 1) guardian "nguild_gef",49,67,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",6; - if (GetCastleData("nguild_gef",17) == 1) guardian "nguild_gef",181,14,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",7; + if (getcastledata("nguild_gef",10) == 1) guardian "nguild_gef",30,178,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",0; + if (getcastledata("nguild_gef",11) == 1) guardian "nguild_gef",64,180,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",1; + if (getcastledata("nguild_gef",12) == 1) guardian "nguild_gef",61,25,"Soldier Guardian",1287,"Guardian_N02::OnGuardianDied",2; + if (getcastledata("nguild_gef",13) == 1) guardian "nguild_gef",61,44,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",3; + if (getcastledata("nguild_gef",14) == 1) guardian "nguild_gef",189,43,"Archer Guardian",1285,"Guardian_N02::OnGuardianDied",4; + if (getcastledata("nguild_gef",15) == 1) guardian "nguild_gef",51,192,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",5; + if (getcastledata("nguild_gef",16) == 1) guardian "nguild_gef",49,67,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",6; + if (getcastledata("nguild_gef",17) == 1) guardian "nguild_gef",181,14,"Knight Guardian",1286,"Guardian_N02::OnGuardianDied",7; end; OnGuardianDied: // Event when Guardian dies - MapAnnounce "nguild_gef","A Guardian Has Fallen",17; + mapannounce "nguild_gef","A Guardian Has Fallen",17; end; } //------------------------------------------------------------------------------ nguild_pay,139,139,0 script Guardian_N03 -1,{ OnAgitInit: - if (GetCastleData("nguild_pay",10) == 1) guardian "nguild_pay",210,120,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",0; - if (GetCastleData("nguild_pay",11) == 1) guardian "nguild_pay",69,26,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",1; - if (GetCastleData("nguild_pay",12) == 1) guardian "nguild_pay",23,141,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",2; - if (GetCastleData("nguild_pay",13) == 1) guardian "nguild_pay",224,87,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",3; - if (GetCastleData("nguild_pay",14) == 1) guardian "nguild_pay",81,45,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",4; - if (GetCastleData("nguild_pay",15) == 1) guardian "nguild_pay",214,53,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",5; - if (GetCastleData("nguild_pay",16) == 1) guardian "nguild_pay",69,26,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",6; - if (GetCastleData("nguild_pay",17) == 1) guardian "nguild_pay",23,141,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",7; + if (getcastledata("nguild_pay",10) == 1) guardian "nguild_pay",210,120,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",0; + if (getcastledata("nguild_pay",11) == 1) guardian "nguild_pay",69,26,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",1; + if (getcastledata("nguild_pay",12) == 1) guardian "nguild_pay",23,141,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",2; + if (getcastledata("nguild_pay",13) == 1) guardian "nguild_pay",224,87,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",3; + if (getcastledata("nguild_pay",14) == 1) guardian "nguild_pay",81,45,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",4; + if (getcastledata("nguild_pay",15) == 1) guardian "nguild_pay",214,53,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",5; + if (getcastledata("nguild_pay",16) == 1) guardian "nguild_pay",69,26,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",6; + if (getcastledata("nguild_pay",17) == 1) guardian "nguild_pay",23,141,"Knight Guardian",1286,"Guardian_N03::OnGuardianDied",7; end; OnGuardianDied: // Event when Guardian dies - MapAnnounce "nguild_pay","A Guardian Has Fallen",17; + mapannounce "nguild_pay","A Guardian Has Fallen",17; end; } //------------------------------------------------------------------------------ nguild_prt,197,197,0 script Guardian_N04 -1,{ OnAgitInit: - if (GetCastleData("nguild_prt",10) == 1) guardian "nguild_prt",196,92,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",0; - if (GetCastleData("nguild_prt",11) == 1) guardian "nguild_prt",113,200,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",1; - if (GetCastleData("nguild_prt",12) == 1) guardian "nguild_prt",111,186,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",2; - if (GetCastleData("nguild_prt",13) == 1) guardian "nguild_prt",76,202,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",3; - if (GetCastleData("nguild_prt",14) == 1) guardian "nguild_prt",90,26,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",4; - if (GetCastleData("nguild_prt",15) == 1) guardian "nguild_prt",58,59,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",5; - if (GetCastleData("nguild_prt",16) == 1) guardian "nguild_prt",112,200,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",6; - if (GetCastleData("nguild_prt",17) == 1) guardian "nguild_prt",101,194,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",7; + if (getcastledata("nguild_prt",10) == 1) guardian "nguild_prt",196,92,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",0; + if (getcastledata("nguild_prt",11) == 1) guardian "nguild_prt",113,200,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",1; + if (getcastledata("nguild_prt",12) == 1) guardian "nguild_prt",111,186,"Soldier Guardian",1287,"Guardian_N04::OnGuardianDied",2; + if (getcastledata("nguild_prt",13) == 1) guardian "nguild_prt",76,202,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",3; + if (getcastledata("nguild_prt",14) == 1) guardian "nguild_prt",90,26,"Archer Guardian",1285,"Guardian_N04::OnGuardianDied",4; + if (getcastledata("nguild_prt",15) == 1) guardian "nguild_prt",58,59,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",5; + if (getcastledata("nguild_prt",16) == 1) guardian "nguild_prt",112,200,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",6; + if (getcastledata("nguild_prt",17) == 1) guardian "nguild_prt",101,194,"Knight Guardian",1286,"Guardian_N04::OnGuardianDied",7; end; OnGuardianDied: // Event when Guardian dies - MapAnnounce "nguild_prt","A Guardian Has Fallen",17; + mapannounce "nguild_prt","A Guardian Has Fallen",17; end; } diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt index 155c33792..100751f7a 100644 --- a/npc/events/nguild/nguild_kafras.txt +++ b/npc/events/nguild/nguild_kafras.txt @@ -16,11 +16,11 @@ function script F_GKafra { cutin "kafra_01",2; - set @GID, GetCastleData(getarg(0),1); + set @GID, getcastledata(getarg(0),1); if (getcharid(2) == @GID && getgdskilllv(@GID,10001)) goto L_StartG; mes "[Kafra Service]"; - mes "I am contracted to provide service only for the ^ff0000" + GetGuildName(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience."; + mes "I am contracted to provide service only for the ^ff0000" + getguildname(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience."; cutin "",255; close; L_StartG: @@ -36,7 +36,7 @@ nguild_alde,218,170,0 script Kafra Service#N01 4_F_KAFRA1,{ callfunc "F_GKafra", "nguild_alde", "Prontera"; end; OnRecvCastleN01: - if (GetCastleData("nguild_alde",9) < 1) disablenpc "Kafra Service#N01"; + if (getcastledata("nguild_alde",9) < 1) disablenpc "Kafra Service#N01"; end; } @@ -46,7 +46,7 @@ nguild_gef,35,37,0 script Kafra Service#N02 4_F_KAFRA1,{ callfunc "F_GKafra", "nguild_gef", "Prontera"; end; OnRecvCastleN02: - if (GetCastleData("nguild_gef",9) < 1) disablenpc "Kafra Service#N02"; + if (getcastledata("nguild_gef",9) < 1) disablenpc "Kafra Service#N02"; end; } @@ -55,7 +55,7 @@ nguild_pay,128,58,3 script Kafra Service#N03 4_F_KAFRA1,{ callfunc "F_GKafra", "nguild_pay", "Prontera"; end; OnRecvCastleN03: - if (GetCastleData("nguild_pay",9) < 1) disablenpc "Kafra Service#N03"; + if (getcastledata("nguild_pay",9) < 1) disablenpc "Kafra Service#N03"; end; } @@ -64,6 +64,6 @@ nguild_prt,96,173,0 script Kafra Service#N04 4_F_KAFRA1,{ callfunc "F_GKafra", "nguild_prt", "Prontera"; end; OnRecvCastleN04: - if (GetCastleData("nguild_prt",9) < 1) disablenpc "Kafra Service#N04"; + if (getcastledata("nguild_prt",9) < 1) disablenpc "Kafra Service#N04"; end; } diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt index fd5fc6053..de185213e 100644 --- a/npc/events/nguild/nguild_managers.txt +++ b/npc/events/nguild/nguild_managers.txt @@ -23,7 +23,7 @@ //============================================== function script F_GldManager { - set @GID, GetCastleData(getarg(1),1); + set @GID, getcastledata(getarg(1),1); mes "[ "+getarg(0)+" ]"; if (@GID == 0){ mes "I am waiting for my master. Brave adventurer, follow your destiny!"; @@ -48,7 +48,7 @@ function script F_GldManager { M_Kaf: //====== mes "[ "+getarg(0)+" ]"; - if (GetCastleData(getarg(1),9) == 1) goto L_Dismiss; + if (getcastledata(getarg(1),9) == 1) goto L_Dismiss; if (getgdskilllv(@GID,10001) == 0){ mes "Master, you don't have a contract with the Kafra Staff Company."; mes "In order to hire a Kafra, you must first learn the Guild skill ^5533FFContract With Kafra^000000."; @@ -67,7 +67,7 @@ function script F_GldManager { } set Zeny,Zeny-10000; enablenpc "Kafra Staff#"+getarg(4); - SetCastleData getarg(1),9,1; + setcastledata getarg(1),9,1; mes "You have created a contract with the Kafra Staff Company."; next; cutin "kafra_01",2; @@ -100,7 +100,7 @@ function script F_GldManager { mes "It's unfortunate that I won't be able to serve your guild anymore...."; next; disablenpc "Kafra Staff#"+getarg(4); - SetCastleData getarg(1),9,0; + setcastledata getarg(1),9,0; cutin "kafra_01",255; mes "[ "+getarg(0)+" ]"; mes "The Kafra has been dismissed. But... we should really get a Kafra as soon as possible!"; diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt index cc3d7db1e..fe5512835 100644 --- a/npc/events/nguild/nguild_treas.txt +++ b/npc/events/nguild/nguild_treas.txt @@ -26,13 +26,13 @@ function script F_GldTreas { //killmonster getarg(0),"Treasure_"+getarg(1)+"::OnDied"; // Don't spawn treasures if Castle is empty, or Eco is greater than 100 - if(GetCastleData(getarg(0),2) > 100 || GetCastleData(getarg(0),1) == 0) return; + if(getcastledata(getarg(0),2) > 100 || getcastledata(getarg(0),1) == 0) return; // Only spawn one treasure chest for novice castles. if (compare(getarg(0),"nguild")) set getarg(2),1; else - set getarg(2),GetCastleData(getarg(0),2)/5+4; + set getarg(2),getcastledata(getarg(0),2)/5+4; if (getarg(2) <= 0) return; diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt index 283807a46..4db4a3c5e 100644 --- a/npc/guild/agit_controller.txt +++ b/npc/guild/agit_controller.txt @@ -48,7 +48,7 @@ OnAgitInit: (gettime(4)==4) && (gettime(3)>=21 && gettime(3)<23) || (gettime(4)==6) && (gettime(3)>=16 && gettime(3)<18)) { if (!agitcheck()) { - AgitStart; + agitstart; callsub S_DisplayOwners; } end; @@ -59,7 +59,7 @@ OnAgitInit: (gettime(4)==4) && (gettime(3)==23) || (gettime(4)==6) && (gettime(3)==18)) { if (agitcheck()) { - AgitEnd; + agitend; callsub S_DisplayOwners; } end; @@ -72,10 +72,10 @@ S_DisplayOwners: setarray .@maps$[10],"payg_cas01","payg_cas02","payg_cas03","payg_cas04","payg_cas05"; setarray .@maps$[15],"prtg_cas01","prtg_cas02","prtg_cas03","prtg_cas04","prtg_cas05"; for( set .@i, 0; .@i <= 19; set .@i, .@i+1 ) { - if (GetCastleData(.@maps$[.@i],1)) - Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle has been conquered by the [" + GetGuildName(GetCastleData(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe; + if (getcastledata(.@maps$[.@i],1)) + announce "The [" + getcastlename(.@maps$[.@i]) + "] castle has been conquered by the [" + getguildname(getcastledata(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe; else - Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all|bc_woe; + announce "The [" + getcastlename(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all|bc_woe; } end; } diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt index 324fd71fd..9438174ac 100644 --- a/npc/guild/agit_main.txt +++ b/npc/guild/agit_main.txt @@ -61,8 +61,8 @@ // War of Emperium has started. OnAgitStart: if (strnpcinfo(0) == "Gld_Agit_Manager") end; - MapRespawnGuildID strnpcinfo(2),GetCastleData(strnpcinfo(2),1),6; - GvgOn strnpcinfo(2); + maprespawnguildid strnpcinfo(2),getcastledata(strnpcinfo(2),1),6; + gvgon strnpcinfo(2); // Spawn (fall through), or respawn the Emperium once it has been broken. OnStartArena: @@ -107,31 +107,31 @@ OnAgitBreak: end; } // Adjust Economy Invest Level for Castle - set .@Economy,GetCastleData(strnpcinfo(2),2) - 5; + set .@Economy,getcastledata(strnpcinfo(2),2) - 5; if (.@Economy < 0) set .@Economy, 0; - SetCastleData strnpcinfo(2), 2, .@Economy; + setcastledata strnpcinfo(2), 2, .@Economy; // Adjust Defense Invest Level for Castle - set .@Defence,GetCastleData(strnpcinfo(2),3) - 5; + set .@Defence,getcastledata(strnpcinfo(2),3) - 5; if (.@Defence < 0) set .@Defence, 0; - SetCastleData strnpcinfo(2), 3, .@Defence; + setcastledata strnpcinfo(2), 3, .@Defence; // Set new Castle Occupant - SetCastleData strnpcinfo(2),1, .@GID; + setcastledata strnpcinfo(2),1, .@GID; // Announce that the Emperium is destroyed, and respawn all but new castle-occupants. mapannounce strnpcinfo(2),"The emperium has been destroyed.",bc_map|bc_woe,"0x00CCFF",FW_NORMAL,12; - MapRespawnGuildID strnpcinfo(2),.@GID,6; + maprespawnguildid strnpcinfo(2),.@GID,6; // Refresh castle data, disable Kafra and reset Invest information. donpcevent strnpcinfo(0)+"::OnRecvCastle"; disablenpc "Kafra Staff#"+strnpcinfo(2); for( set .@i, 4; .@i <= 9; set .@i, .@i+1 ) { - SetCastleData strnpcinfo(2), .@i, 0; + setcastledata strnpcinfo(2), .@i, 0; } // Erase Guardian Database information if the new owners do not have Guardian Research. if( getgdskilllv(.@GID,10002) == 0 ) { for( set .@i, 10; .@i <= 17; set .@i, .@i+1 ) { - SetCastleData strnpcinfo(2), .@i, 0; + setcastledata strnpcinfo(2), .@i, 0; } } // Respawn the Emperium, and display new owners. @@ -139,16 +139,16 @@ OnAgitBreak: if( agitcheck() ) donpcevent "Agit#"+strnpcinfo(2)+"::OnStartArena"; sleep 7000; - announce "The [" + getcastlename(strnpcinfo(2)) + "] castle has been conquered by the [" + getguildName(.@GID) + "] guild.",bc_all|bc_woe; + announce "The [" + getcastlename(strnpcinfo(2)) + "] castle has been conquered by the [" + getguildname(.@GID) + "] guild.",bc_all|bc_woe; end; // War of Emperium has ended. OnAgitEnd: if (strnpcinfo(0) == "Gld_Agit_Manager") end; - GvgOff strnpcinfo(2); + gvgoff strnpcinfo(2); // If the castle has no owner at the end of WoE, do not kill Emperium. - if (GetCastleData(strnpcinfo(2),1)) { - KillMonster strnpcinfo(2),"Agit#"+strnpcinfo(2)+"::OnAgitBreak"; + if (getcastledata(strnpcinfo(2),1)) { + killmonster strnpcinfo(2),"Agit#"+strnpcinfo(2)+"::OnAgitBreak"; } end; @@ -158,10 +158,10 @@ OnGuildBreak: // Kill guardians, disable the Kafra, and set owner to 0. killmonster strnpcinfo(2),"Guardian#"+strnpcinfo(2)+"::OnGuardianDied"; disablenpc "Kafra Staff#"+strnpcinfo(2); - SetCastleData strnpcinfo(2),1,0; + setcastledata strnpcinfo(2),1,0; // Wait before refreshing guild information. sleep 7000; - Announce "Guild Base [" + GetCastleName(strnpcinfo(2)) + "] has been abandoned.",0; + announce "Guild Base [" + getcastlename(strnpcinfo(2)) + "] has been abandoned.",0; donpcevent strnpcinfo(0)+"::OnRecvCastle"; end; @@ -169,7 +169,7 @@ OnAgitInit: OnRecvCastle: if (strnpcinfo(0) == "Gld_Agit_Manager") end; // Spawn Monsters if the castle is empty. - set .@GID, GetCastleData(strnpcinfo(2),1); + set .@GID, getcastledata(strnpcinfo(2),1); if (.@GID == 0) { killmonsterall strnpcinfo(2); if (compare(strnpcinfo(2),"aldeg")) { @@ -307,7 +307,7 @@ OnRecvCastle: // And load purchased Guardian in castles. donpcevent "Guardian#"+strnpcinfo(2)+"::OnSpawnGuardians"; // And display Kafra if purchased. - if (GetCastleData(strnpcinfo(2),9) < 1) disablenpc "Kafra Staff#"+strnpcinfo(2); + if (getcastledata(strnpcinfo(2),9) < 1) disablenpc "Kafra Staff#"+strnpcinfo(2); } end; } @@ -316,7 +316,7 @@ OnRecvCastle: //============================================================ - script Kafra Staff#woe::guildkafra -1,{ - set .@GID,GetCastleData(strnpcinfo(2),1); + set .@GID,getcastledata(strnpcinfo(2),1); if (compare(strnpcinfo(2),"aldeg")) { setarray .@destination$[0],"Al De Baran","aldebaran"; @@ -342,7 +342,7 @@ OnRecvCastle: cutin "kafra_01",2; if (getcharid(2) == .@GID) { mes "[Kafra Employee]"; - mes "Welcome. ^ff0000" + GetGuildName(.@GID) + "^000000 Member."; + mes "Welcome. ^ff0000" + getguildname(.@GID) + "^000000 Member."; mes "The Kafra Corporation will stay with you wherever you go."; next; switch (select("Use Storage:Use Teleport Service:Rent a Pushcart:Cancel")) { @@ -455,7 +455,7 @@ OnRecvCastle: } } mes "[Kafra Employee]"; - mes "I am instructed to only offer my services to the ^ff0000"+GetGuildName(.@GID)+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience."; + mes "I am instructed to only offer my services to the ^ff0000"+getguildname(.@GID)+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience."; close2; cutin "",255; end; @@ -465,7 +465,7 @@ OnRecvCastle: //============================================================ - script Castle Manager#cm::cm -1,{ - set .@GID,GetCastleData(strnpcinfo(2),1); + set .@GID,getcastledata(strnpcinfo(2),1); // .@guardiantype = Defines the types of guardians per castle basis. // 1 - Soldier Guardian, 2 - Archer Guardian, 3 - Knight Guardian @@ -608,9 +608,9 @@ OnRecvCastle: mes "Brave soul... fate will guide you towards your future..."; close; } - if (GetGuildMaster(.@GID) != strcharinfo(0)) { + if (getguildmaster(.@GID) != strcharinfo(0)) { mes "["+strnpcinfo(1)+"]"; - mes "No matter how much you pester me, I'll still follow my master ^ff0000"+GetGuildMaster(.@GID)+"^000000. Where are the Guardians?! Send these ruffians away right now!"; + mes "No matter how much you pester me, I'll still follow my master ^ff0000"+getguildmaster(.@GID)+"^000000. Where are the Guardians?! Send these ruffians away right now!"; close; } mes "["+strnpcinfo(1)+"]"; @@ -622,19 +622,19 @@ OnRecvCastle: mes "["+strnpcinfo(1)+"]"; mes "I will report the Castle briefing, Master."; mes " "; - mes "^0000ffNow, the commercial growth level is "+GetCastleData(strnpcinfo(2),2)+"."; - if (GetCastleData(strnpcinfo(2),4)) { - mes " You invested "+GetCastleData(strnpcinfo(2),4)+" times in past 1 day."; + mes "^0000ffNow, the commercial growth level is "+getcastledata(strnpcinfo(2),2)+"."; + if (getcastledata(strnpcinfo(2),4)) { + mes " You invested "+getcastledata(strnpcinfo(2),4)+" times in past 1 day."; } - mes " Now, the Castle Defense level is "+GetCastleData(strnpcinfo(2),3)+".^000000"; - if (GetCastleData(strnpcinfo(2),5)) { - mes " ^0000ff- You invested "+GetCastleData(strnpcinfo(2),5)+" times in past 1 day.^000000"; + mes " Now, the Castle Defense level is "+getcastledata(strnpcinfo(2),3)+".^000000"; + if (getcastledata(strnpcinfo(2),5)) { + mes " ^0000ff- You invested "+getcastledata(strnpcinfo(2),5)+" times in past 1 day.^000000"; } mes " "; mes "That's all I have to report, Master."; close; case 2: - set .@Economy,GetCastleData(strnpcinfo(2),2); + set .@Economy,getcastledata(strnpcinfo(2),2); if (.@Economy < 6) { set .@eco_invest,5000; } else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; } else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; } @@ -656,7 +656,7 @@ OnRecvCastle: else if ((.@Economy >= 91) && (.@Economy <= 95)) { set .@eco_invest,860000; } else if ((.@Economy >= 96) && (.@Economy <= 100)) { set .@eco_invest,955000; } //Quadruple the cost of investing if you've already invested once. - if (GetCastleData(strnpcinfo(2),4)) { + if (getcastledata(strnpcinfo(2),4)) { set .@eco_invest,.@eco_invest*4; } mes "["+strnpcinfo(1)+"]"; @@ -668,12 +668,12 @@ OnRecvCastle: mes "^ff0000The commercial growth level of our Castle is at it's highest, 100%. No more investments are needed. Just as I have expected from a great economist like you, Master.^000000"; close; } - if (GetCastleData(strnpcinfo(2),4) >= 2) { + if (getcastledata(strnpcinfo(2),4) >= 2) { mes " "; mes "^ff0000You have already invested twice today. You cannot invest any more.^000000 I expect riches of the guild to grow at a high rate."; close; } - if (GetCastleData(strnpcinfo(2),4) == 0) { + if (getcastledata(strnpcinfo(2),4) == 0) { mes " "; mes "The current investment amount required is ^ff0000"+.@eco_invest+"^000000 zeny. Will you invest?"; } @@ -690,7 +690,7 @@ OnRecvCastle: close; } set Zeny, Zeny - .@eco_invest; - SetCastleData strnpcinfo(2),4,GetCastleData(strnpcinfo(2),4)+1; + setcastledata strnpcinfo(2),4,getcastledata(strnpcinfo(2),4)+1; mes "[ "+strnpcinfo(1)+"]"; mes "We finished the investment safely. I expect that our growth level will be increased by tomorrow."; close; @@ -700,7 +700,7 @@ OnRecvCastle: close; } case 3: - set .@Defence,GetCastleData(strnpcinfo(2),3); + set .@Defence,getcastledata(strnpcinfo(2),3); if (.@Defence < 6) { set .@def_invest,10000; } else if ((.@Defence >= 6) && (.@Defence <= 10)) { set .@def_invest,20000; } else if ((.@Defence >= 11) && (.@Defence <= 15)) { set .@def_invest,40000; } @@ -722,7 +722,7 @@ OnRecvCastle: else if ((.@Defence >= 91) && (.@Defence <= 95)) { set .@def_invest,1720000; } else if ((.@Defence >= 96) && (.@Defence <= 100)) { set .@def_invest,1910000; } //Quadruple the cost of investing if you've already invested once. - if (GetCastleData(strnpcinfo(2),5)) { + if (getcastledata(strnpcinfo(2),5)) { set .@def_invest,.@def_invest*4; } mes "["+strnpcinfo(1)+"]"; @@ -734,12 +734,12 @@ OnRecvCastle: mes "^ff0000But the Castle Defense level of our Castle is at it's highest, 100%. No more investments are needed. Just as I have expected from a great strategist like you, Master.^000000"; close; } - if (GetCastleData(strnpcinfo(2),5) >= 2) { + if (getcastledata(strnpcinfo(2),5) >= 2) { mes " "; mes "^ff0000You have already invested twice today. You cannot invest any more.^000000 I expect the Defenses of the guild to grow at a high rate."; close; } - if (GetCastleData(strnpcinfo(2),5) == 0) { + if (getcastledata(strnpcinfo(2),5) == 0) { mes " "; mes "The current investment amount required is ^ff0000"+.@def_invest+"^000000 zeny. Will you invest?"; } @@ -756,7 +756,7 @@ OnRecvCastle: close; } set Zeny, Zeny - .@def_invest; - SetCastleData strnpcinfo(2),5,GetCastleData(strnpcinfo(2),5)+1; + setcastledata strnpcinfo(2),5,getcastledata(strnpcinfo(2),5)+1; mes "[ "+strnpcinfo(1)+"]"; mes "We finished the investment safely. I expect that our Castle Defense level will be increased by tomorrow."; close; @@ -793,7 +793,7 @@ OnRecvCastle: mes "Master, we have not the resources to Summon the Guardian. If you want to accumulate them, you have to learn the Guild skill. We failed to summon the Guardian."; close; } - if (GetCastleData(strnpcinfo(2),.@GDnum) == 1) { + if (getcastledata(strnpcinfo(2),.@GDnum) == 1) { mes "["+strnpcinfo(1)+"]"; mes "Master, you already have summoned that Guardian. We cannot summon another."; close; @@ -804,7 +804,7 @@ OnRecvCastle: close; } set Zeny, Zeny - 10000; - SetCastleData strnpcinfo(2),.@GDnum,1; // mark as 'installed' + setcastledata strnpcinfo(2),.@GDnum,1; // mark as 'installed' set .@UseGID,.@GDnum - 10; if (.@guardiantype[.@UseGID] == 1) { set .@type,1287; } else if (.@guardiantype[.@UseGID] == 2) { set .@type,1285; } @@ -819,7 +819,7 @@ OnRecvCastle: close; } case 5: - if (GetCastleData(strnpcinfo(2),9) == 1) { + if (getcastledata(strnpcinfo(2),9) == 1) { mes "["+strnpcinfo(1)+"]"; mes "We are currently hiring a Kafra Employee... Do you want to fire the Kafra Employee?"; next; @@ -848,7 +848,7 @@ OnRecvCastle: close; } disablenpc "Kafra Staff#"+strnpcinfo(2); - SetCastleData strnpcinfo(2),9,0; + setcastledata strnpcinfo(2),9,0; mes "["+strnpcinfo(1)+"]"; mes "...."; mes "I have discharged the Kafra Employee... But... are you unsatisfied with something?"; @@ -872,7 +872,7 @@ OnRecvCastle: } set Zeny, Zeny - 10000; enablenpc "Kafra Staff#"+strnpcinfo(2); - SetCastleData strnpcinfo(2),9,1; + setcastledata strnpcinfo(2),9,1; mes "["+strnpcinfo(1)+"]"; mes "We obtained a contract with the kafra Main Office, and hired a Kafra Employee."; next; @@ -917,7 +917,7 @@ OnRecvCastle: //============================================================ - script Lever#gd::gdlever -1,{ - set .@GID,GetCastleData(strnpcinfo(2),1); + set .@GID,getcastledata(strnpcinfo(2),1); if (.@GID == 0) { mes "[Ringing Voice]"; @@ -1112,7 +1112,7 @@ OnSpawnGuardians: if (.@guardiantype[.@i] == 1) { set .@type,1287; } else if (.@guardiantype[.@i] == 2) { set .@type,1285; } else { set .@type,1286; } - if (GetCastleData(strnpcinfo(2),.@UseGID)) { + if (getcastledata(strnpcinfo(2),.@UseGID)) { guardian strnpcinfo(2),.@guardianposx[.@i],.@guardianposy[.@i],strmobinfo(2,.@type),.@type,"Guardian#"+strnpcinfo(2)+"::OnGuardianDied",.@i; } } @@ -1131,13 +1131,13 @@ OnClock0001: // Do nothing if this script is the template. if (strnpcinfo(1) == "Gld_Trea_Spawn") end; - set .@GID, GetCastleData(strnpcinfo(2),1); + set .@GID, getcastledata(strnpcinfo(2),1); // If there is no owner, do nothing. if (!.@GID) end; // Is there Economy in this castle? - set .@Treasure,GetCastleData(strnpcinfo(2),2)/5+4; + set .@Treasure,getcastledata(strnpcinfo(2),2)/5+4; // Set information if (strnpcinfo(2) == "aldeg_cas01") { @@ -1247,15 +1247,15 @@ OnClock0001: // Apply investment to Eco. and Def. Only happens if there were investments made. // Permanent Development can only happen once per day. - if (GetCastleData(strnpcinfo(2),4)) { - set .@Economy,GetCastleData(strnpcinfo(2),2); - SetCastleData strnpcinfo(2),2,.@Economy + GetCastleData(strnpcinfo(2),4) + (rand(2) && getgdskilllv(.@GID,10014)); - if (GetCastleData(strnpcinfo(2),2) > 100) SetCastleData strnpcinfo(2),2,100; - } - if (GetCastleData(strnpcinfo(2),5)) { - set .@Defence,GetCastleData(strnpcinfo(2),3); - SetCastleData strnpcinfo(2),3,.@Defence + GetCastleData(strnpcinfo(2),5); - if (GetCastleData(strnpcinfo(2),3) > 100) SetCastleData strnpcinfo(2),3,100; + if (getcastledata(strnpcinfo(2),4)) { + set .@Economy,getcastledata(strnpcinfo(2),2); + setcastledata strnpcinfo(2),2,.@Economy + getcastledata(strnpcinfo(2),4) + (rand(2) && getgdskilllv(.@GID,10014)); + if (getcastledata(strnpcinfo(2),2) > 100) setcastledata strnpcinfo(2),2,100; + } + if (getcastledata(strnpcinfo(2),5)) { + set .@Defence,getcastledata(strnpcinfo(2),3); + setcastledata strnpcinfo(2),3,.@Defence + getcastledata(strnpcinfo(2),5); + if (getcastledata(strnpcinfo(2),3) > 100) setcastledata strnpcinfo(2),3,100; } // Reset daily investment limits. setcastledata strnpcinfo(2),4,0; diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt index 537dce7a4..82b09d608 100644 --- a/npc/guild/aldeg_cas01.txt +++ b/npc/guild/aldeg_cas01.txt @@ -16,7 +16,7 @@ //============================================================ - script Neuschwanstein#1::OutsideFlagsA1 GUILD_FLAG,{ - set .@GID, GetCastleData("aldeg_cas01",1); + set .@GID, getcastledata("aldeg_cas01",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -39,7 +39,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("aldeg_cas01",1)) { + if (getcharid(2) == getcastledata("aldeg_cas01",1)) { warp "aldeg_cas01",218,170; end; } @@ -51,16 +51,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastleA01: - FlagEmblem GetCastleData("aldeg_cas01",1); + flagemblem getcastledata("aldeg_cas01",1); end; } @@ -75,7 +75,7 @@ alde_gld,51,87,8 duplicate(OutsideFlagsA1) Neuschwanstein#4 GUILD_FLAG end; OnRecvCastleA01: - FlagEmblem GetCastleData("aldeg_cas01",1); + flagemblem getcastledata("aldeg_cas01",1); end; } diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt index c5c03175f..fe98f22a8 100644 --- a/npc/guild/aldeg_cas02.txt +++ b/npc/guild/aldeg_cas02.txt @@ -16,7 +16,7 @@ //============================================================ - script Hohenschwangau#1::OutsideFlagsA2 GUILD_FLAG,{ - set .@GID, GetCastleData("aldeg_cas02",1); + set .@GID, getcastledata("aldeg_cas02",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -39,7 +39,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("aldeg_cas02",1)) { + if (getcharid(2) == getcastledata("aldeg_cas02",1)) { warp "aldeg_cas02",220,190; end; } @@ -51,16 +51,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastleA02: - FlagEmblem GetCastleData("aldeg_cas02",1); + flagemblem getcastledata("aldeg_cas02",1); end; } @@ -73,7 +73,7 @@ alde_gld,99,244,4 duplicate(OutsideFlagsA2) Hohenschwangau#2 GUILD_FLAG end; OnRecvCastleA02: - FlagEmblem GetCastleData("aldeg_cas02",1); + flagemblem getcastledata("aldeg_cas02",1); end; } diff --git a/npc/guild/aldeg_cas03.txt b/npc/guild/aldeg_cas03.txt index d36ed707e..d5aa3535c 100644 --- a/npc/guild/aldeg_cas03.txt +++ b/npc/guild/aldeg_cas03.txt @@ -16,7 +16,7 @@ //============================================================ - script Nuernberg#1::OutsideFlagsA3 GUILD_FLAG,{ - set .@GID, GetCastleData("aldeg_cas03",1); + set .@GID, getcastledata("aldeg_cas03",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -39,7 +39,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("aldeg_cas03",1)) { + if (getcharid(2) == getcastledata("aldeg_cas03",1)) { warp "aldeg_cas03",205,186; end; } @@ -51,16 +51,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastleA03: - FlagEmblem GetCastleData("aldeg_cas03",1); + flagemblem getcastledata("aldeg_cas03",1); end; } @@ -73,7 +73,7 @@ alde_gld,138,82,8 duplicate(OutsideFlagsA3) Nuernberg#2 GUILD_FLAG end; OnRecvCastleA03: - FlagEmblem GetCastleData("aldeg_cas03",1); + flagemblem getcastledata("aldeg_cas03",1); end; } diff --git a/npc/guild/aldeg_cas04.txt b/npc/guild/aldeg_cas04.txt index 30009c707..4f6bb1265 100644 --- a/npc/guild/aldeg_cas04.txt +++ b/npc/guild/aldeg_cas04.txt @@ -16,7 +16,7 @@ //============================================================ - script Wuerzburg#1::OutsideFlagsA4 GUILD_FLAG,{ - set .@GID, GetCastleData("aldeg_cas04",1); + set .@GID, getcastledata("aldeg_cas04",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -39,7 +39,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("aldeg_cas04",1)) { + if (getcharid(2) == getcastledata("aldeg_cas04",1)) { warp "aldeg_cas04",116,217; end; } @@ -51,16 +51,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastleA04: - FlagEmblem GetCastleData("aldeg_cas04",1); + flagemblem getcastledata("aldeg_cas04",1); end; } @@ -73,7 +73,7 @@ alde_gld,239,239,2 duplicate(OutsideFlagsA4) Wuerzburg#2 GUILD_FLAG end; OnRecvCastleA04: - FlagEmblem GetCastleData("aldeg_cas04",1); + flagemblem getcastledata("aldeg_cas04",1); end; } diff --git a/npc/guild/aldeg_cas05.txt b/npc/guild/aldeg_cas05.txt index d6ddabfda..8712d314a 100644 --- a/npc/guild/aldeg_cas05.txt +++ b/npc/guild/aldeg_cas05.txt @@ -16,7 +16,7 @@ //============================================================ - script Rothenburg#1::OutsideFlagsA5 GUILD_FLAG,{ - set .@GID, GetCastleData("aldeg_cas05",1); + set .@GID, getcastledata("aldeg_cas05",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -39,7 +39,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("aldeg_cas05",1)) { + if (getcharid(2) == getcastledata("aldeg_cas05",1)) { warp "aldeg_cas05",167,225; end; } @@ -51,16 +51,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastleA05: - FlagEmblem GetCastleData("aldeg_cas05",1); + flagemblem getcastledata("aldeg_cas05",1); end; } @@ -73,7 +73,7 @@ alde_gld,265,87,6 duplicate(OutsideFlagsA5) Rothenburg#2 GUILD_FLAG end; OnRecvCastleA05: - FlagEmblem GetCastleData("aldeg_cas05",1); + flagemblem getcastledata("aldeg_cas05",1); end; } diff --git a/npc/guild/gefg_cas01.txt b/npc/guild/gefg_cas01.txt index a05b72b8f..71a227173 100644 --- a/npc/guild/gefg_cas01.txt +++ b/npc/guild/gefg_cas01.txt @@ -16,7 +16,7 @@ //============================================================ - script Repherion#1::OutsideFlagsG1 GUILD_FLAG,{ - set .@GID, GetCastleData("gefg_cas01",1); + set .@GID, getcastledata("gefg_cas01",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -39,7 +39,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("gefg_cas01",1)) { + if (getcharid(2) == getcastledata("gefg_cas01",1)) { warp "gefg_cas01",197,36; end; } @@ -51,16 +51,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastleG01: - FlagEmblem GetCastleData("gefg_cas01",1); + flagemblem getcastledata("gefg_cas01",1); end; } @@ -75,7 +75,7 @@ gef_fild13,211,71,6 duplicate(OutsideFlagsG1) Repherion#4 GUILD_FLAG end; OnRecvCastleG01: - FlagEmblem GetCastleData("gefg_cas01",1); + flagemblem getcastledata("gefg_cas01",1); end; } diff --git a/npc/guild/gefg_cas02.txt b/npc/guild/gefg_cas02.txt index f4c5bd37f..8aa183045 100644 --- a/npc/guild/gefg_cas02.txt +++ b/npc/guild/gefg_cas02.txt @@ -16,7 +16,7 @@ //============================================================ - script Eeyorbriggar#1::OutsideFlagsG2 GUILD_FLAG,{ - set .@GID, GetCastleData("gefg_cas02",1); + set .@GID, getcastledata("gefg_cas02",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -39,7 +39,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("gefg_cas02",1)) { + if (getcharid(2) == getcastledata("gefg_cas02",1)) { warp "gefg_cas02",178,43; end; } @@ -51,16 +51,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastleG02: - FlagEmblem GetCastleData("gefg_cas02",1); + flagemblem getcastledata("gefg_cas02",1); end; } @@ -75,7 +75,7 @@ gef_fild13,324,243,4 duplicate(OutsideFlagsG2) Eeyorbriggar#4 GUILD_FLAG end; OnRecvCastleG02: - FlagEmblem GetCastleData("gefg_cas02",1); + flagemblem getcastledata("gefg_cas02",1); end; } diff --git a/npc/guild/gefg_cas03.txt b/npc/guild/gefg_cas03.txt index 60e3c46fd..50ba0005b 100644 --- a/npc/guild/gefg_cas03.txt +++ b/npc/guild/gefg_cas03.txt @@ -16,7 +16,7 @@ //============================================================ - script Yesnelph#1::OutsideFlagsG3 GUILD_FLAG,{ - set .@GID, GetCastleData("gefg_cas03",1); + set .@GID, getcastledata("gefg_cas03",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -39,7 +39,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("gefg_cas03",1)) { + if (getcharid(2) == getcastledata("gefg_cas03",1)) { warp "gefg_cas03",221,30; end; } @@ -51,16 +51,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastleG03: - FlagEmblem GetCastleData("gefg_cas03",1); + flagemblem getcastledata("gefg_cas03",1); end; } @@ -77,7 +77,7 @@ gef_fild13,144,244,6 duplicate(OutsideFlagsG3) Yesnelph#6 GUILD_FLAG end; OnRecvCastleG03: - FlagEmblem GetCastleData("gefg_cas03",1); + flagemblem getcastledata("gefg_cas03",1); end; } diff --git a/npc/guild/gefg_cas04.txt b/npc/guild/gefg_cas04.txt index cd4eccf0e..67c490baf 100644 --- a/npc/guild/gefg_cas04.txt +++ b/npc/guild/gefg_cas04.txt @@ -16,7 +16,7 @@ //============================================================ - script Bergel#1::OutsideFlagsG4 GUILD_FLAG,{ - set .@GID, GetCastleData("gefg_cas04",1); + set .@GID, getcastledata("gefg_cas04",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -39,7 +39,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("gefg_cas04",1)) { + if (getcharid(2) == getcastledata("gefg_cas04",1)) { warp "gefg_cas04",168,43; end; } @@ -51,16 +51,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastleG04: - FlagEmblem GetCastleData("gefg_cas04",1); + flagemblem getcastledata("gefg_cas04",1); end; } @@ -73,7 +73,7 @@ gef_fild13,199,274,3 duplicate(OutsideFlagsG4) Bergel#2 GUILD_FLAG end; OnRecvCastleG04: - FlagEmblem GetCastleData("gefg_cas04",1); + flagemblem getcastledata("gefg_cas04",1); end; } diff --git a/npc/guild/gefg_cas05.txt b/npc/guild/gefg_cas05.txt index 08abccf5b..aa802ea15 100644 --- a/npc/guild/gefg_cas05.txt +++ b/npc/guild/gefg_cas05.txt @@ -16,7 +16,7 @@ //============================================================ - script Mersetzdeitz#1::OutsideFlagsG5 GUILD_FLAG,{ - set .@GID, GetCastleData("gefg_cas05",1); + set .@GID, getcastledata("gefg_cas05",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -39,7 +39,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("gefg_cas05",1)) { + if (getcharid(2) == getcastledata("gefg_cas05",1)) { warp "gefg_cas05",168,31; end; } @@ -51,16 +51,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastleG05: - FlagEmblem GetCastleData("gefg_cas05",1); + flagemblem getcastledata("gefg_cas05",1); end; } @@ -75,7 +75,7 @@ gef_fild13,26,147,2 duplicate(OutsideFlagsG5) Mersetzdeitz#4 GUILD_FLAG end; OnRecvCastleG05: - FlagEmblem GetCastleData("gefg_cas05",1); + flagemblem getcastledata("gefg_cas05",1); end; } diff --git a/npc/guild/payg_cas01.txt b/npc/guild/payg_cas01.txt index 4570f7db5..2b172929b 100644 --- a/npc/guild/payg_cas01.txt +++ b/npc/guild/payg_cas01.txt @@ -18,7 +18,7 @@ //============================================================ - script Bright Arbor#1::OutsideFlagsPA1 GUILD_FLAG,{ - set .@GID, GetCastleData("payg_cas01",1); + set .@GID, getcastledata("payg_cas01",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -41,7 +41,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("payg_cas01",1)) { + if (getcharid(2) == getcastledata("payg_cas01",1)) { warp "payg_cas01",54,144; end; } @@ -53,16 +53,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastlePy01: - FlagEmblem GetCastleData("payg_cas01",1); + flagemblem getcastledata("payg_cas01",1); end; } @@ -77,7 +77,7 @@ pay_gld,91,239,2 duplicate(OutsideFlagsPA1) Bright Arbor#4 GUILD_FLAG end; OnRecvCastlePy01: - FlagEmblem GetCastleData("payg_cas01",1); + flagemblem getcastledata("payg_cas01",1); end; } diff --git a/npc/guild/payg_cas02.txt b/npc/guild/payg_cas02.txt index 5119ee896..cb7403c6a 100644 --- a/npc/guild/payg_cas02.txt +++ b/npc/guild/payg_cas02.txt @@ -19,7 +19,7 @@ //============================================================ - script Scarlet Palace#1::OutsideFlagsPA2 GUILD_FLAG,{ - set .@GID, GetCastleData("payg_cas02",1); + set .@GID, getcastledata("payg_cas02",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -42,7 +42,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("payg_cas02",1)) { + if (getcharid(2) == getcastledata("payg_cas02",1)) { warp "payg_cas02",278,251; end; } @@ -54,16 +54,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastlePy02: - FlagEmblem GetCastleData("payg_cas02",1); + flagemblem getcastledata("payg_cas02",1); end; } @@ -78,7 +78,7 @@ pay_gld,271,163,0 duplicate(OutsideFlagsPA2) Scarlet Palace#4 GUILD_FLAG end; OnRecvCastlePy02: - FlagEmblem GetCastleData("payg_cas02",1); + flagemblem getcastledata("payg_cas02",1); end; } diff --git a/npc/guild/payg_cas03.txt b/npc/guild/payg_cas03.txt index 94b566b2d..54c69087e 100644 --- a/npc/guild/payg_cas03.txt +++ b/npc/guild/payg_cas03.txt @@ -18,7 +18,7 @@ //============================================================ - script Holy Shadow#1::OutsideFlagsPA3 GUILD_FLAG,{ - set .@GID, GetCastleData("payg_cas03",1); + set .@GID, getcastledata("payg_cas03",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -41,7 +41,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("payg_cas03",1)) { + if (getcharid(2) == getcastledata("payg_cas03",1)) { warp "payg_cas03",9,263; end; } @@ -53,16 +53,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastlePy03: - FlagEmblem GetCastleData("payg_cas03",1); + flagemblem getcastledata("payg_cas03",1); end; } @@ -77,7 +77,7 @@ pay_gld,333,254,4 duplicate(OutsideFlagsPA3) Holy Shadow#4 GUILD_FLAG end; OnRecvCastlePy03: - FlagEmblem GetCastleData("payg_cas03",1); + flagemblem getcastledata("payg_cas03",1); end; } diff --git a/npc/guild/payg_cas04.txt b/npc/guild/payg_cas04.txt index 53c327081..265ace62f 100644 --- a/npc/guild/payg_cas04.txt +++ b/npc/guild/payg_cas04.txt @@ -19,7 +19,7 @@ //============================================================ - script Sacred Altar#1::OutsideFlagsPA4 GUILD_FLAG,{ - set .@GID, GetCastleData("payg_cas04",1); + set .@GID, getcastledata("payg_cas04",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -42,7 +42,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("payg_cas04",1)) { + if (getcharid(2) == getcastledata("payg_cas04",1)) { warp "payg_cas04",40,235; end; } @@ -54,16 +54,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastlePy04: - FlagEmblem GetCastleData("payg_cas04",1); + flagemblem getcastledata("payg_cas04",1); end; } @@ -78,7 +78,7 @@ pay_gld,153,166,1 duplicate(OutsideFlagsPA4) Sacred Altar#4 GUILD_FLAG end; OnRecvCastlePy04: - FlagEmblem GetCastleData("payg_cas04",1); + flagemblem getcastledata("payg_cas04",1); end; } diff --git a/npc/guild/payg_cas05.txt b/npc/guild/payg_cas05.txt index f7d61fc70..ec616656e 100644 --- a/npc/guild/payg_cas05.txt +++ b/npc/guild/payg_cas05.txt @@ -18,7 +18,7 @@ //============================================================ - script Bamboo Grove Hill#1::OutsideFlagsPA5 GUILD_FLAG,{ - set .@GID, GetCastleData("payg_cas05",1); + set .@GID, getcastledata("payg_cas05",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -41,7 +41,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("payg_cas05",1)) { + if (getcharid(2) == getcastledata("payg_cas05",1)) { warp "payg_cas05",243,27; end; } @@ -53,16 +53,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastlePy05: - FlagEmblem GetCastleData("payg_cas05",1); + flagemblem getcastledata("payg_cas05",1); end; } @@ -77,7 +77,7 @@ pay_gld,187,294,2 duplicate(OutsideFlagsPA5) Bamboo Grove Hill#4 GUILD_FLAG end; OnRecvCastlePy05: - FlagEmblem GetCastleData("payg_cas05",1); + flagemblem getcastledata("payg_cas05",1); end; } diff --git a/npc/guild/prtg_cas01.txt b/npc/guild/prtg_cas01.txt index e739735de..a99f37ac9 100644 --- a/npc/guild/prtg_cas01.txt +++ b/npc/guild/prtg_cas01.txt @@ -18,7 +18,7 @@ //============================================================ - script Kriemhild#1::OutsideFlagsPR1 GUILD_FLAG,{ - set .@GID, GetCastleData("prtg_cas01",1); + set .@GID, getcastledata("prtg_cas01",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -41,7 +41,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("prtg_cas01",1)) { + if (getcharid(2) == getcastledata("prtg_cas01",1)) { warp "prtg_cas01",96,173; end; } @@ -53,16 +53,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastlePt01: - FlagEmblem GetCastleData("prtg_cas01",1); + flagemblem getcastledata("prtg_cas01",1); end; } @@ -77,7 +77,7 @@ prt_gld,135,60,6 duplicate(OutsideFlagsPR1) Kriemhild#4 GUILD_FLAG end; OnRecvCastlePt01: - FlagEmblem GetCastleData("prtg_cas01",1); + flagemblem getcastledata("prtg_cas01",1); end; } diff --git a/npc/guild/prtg_cas02.txt b/npc/guild/prtg_cas02.txt index 7c3df9334..ceaae4821 100644 --- a/npc/guild/prtg_cas02.txt +++ b/npc/guild/prtg_cas02.txt @@ -18,7 +18,7 @@ //============================================================ - script Swanhild#1::OutsideFlagsPR2 GUILD_FLAG,{ - set .@GID, GetCastleData("prtg_cas02",1); + set .@GID, getcastledata("prtg_cas02",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -41,7 +41,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("prtg_cas02",1)) { + if (getcharid(2) == getcastledata("prtg_cas02",1)) { warp "prtg_cas02",169,55; end; } @@ -53,16 +53,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastlePt02: - FlagEmblem GetCastleData("prtg_cas02",1); + flagemblem getcastledata("prtg_cas02",1); end; } @@ -77,7 +77,7 @@ prt_gld,236,128,8 duplicate(OutsideFlagsPR2) Swanhild#4 GUILD_FLAG end; OnRecvCastlePt02: - FlagEmblem GetCastleData("prtg_cas02",1); + flagemblem getcastledata("prtg_cas02",1); end; } diff --git a/npc/guild/prtg_cas03.txt b/npc/guild/prtg_cas03.txt index 07b7aec4a..b0e0515ec 100644 --- a/npc/guild/prtg_cas03.txt +++ b/npc/guild/prtg_cas03.txt @@ -18,7 +18,7 @@ //============================================================ - script Fadhgridh#1::OutsideFlagsPR3 GUILD_FLAG,{ - set .@GID, GetCastleData("prtg_cas03",1); + set .@GID, getcastledata("prtg_cas03",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -41,7 +41,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("prtg_cas03",1)) { + if (getcharid(2) == getcastledata("prtg_cas03",1)) { warp "prtg_cas03",181,215; end; } @@ -53,16 +53,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastlePt03: - FlagEmblem GetCastleData("prtg_cas03",1); + flagemblem getcastledata("prtg_cas03",1); end; } @@ -77,7 +77,7 @@ prt_gld,158,136,4 duplicate(OutsideFlagsPR3) Fadhgridh#4 GUILD_FLAG end; OnRecvCastlePt03: - FlagEmblem GetCastleData("prtg_cas03",1); + flagemblem getcastledata("prtg_cas03",1); end; } diff --git a/npc/guild/prtg_cas04.txt b/npc/guild/prtg_cas04.txt index 0c072bd66..08f1522db 100644 --- a/npc/guild/prtg_cas04.txt +++ b/npc/guild/prtg_cas04.txt @@ -18,7 +18,7 @@ //============================================================ - script Skoegul#1::OutsideFlagsPR4 GUILD_FLAG,{ - set .@GID, GetCastleData("prtg_cas04",1); + set .@GID, getcastledata("prtg_cas04",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -41,7 +41,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("prtg_cas04",1)) { + if (getcharid(2) == getcastledata("prtg_cas04",1)) { warp "prtg_cas04",258,247; end; } @@ -53,16 +53,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastlePt04: - FlagEmblem GetCastleData("prtg_cas04",1); + flagemblem getcastledata("prtg_cas04",1); end; } @@ -77,7 +77,7 @@ prt_gld,122,236,6 duplicate(OutsideFlagsPR4) Skoegul#4 GUILD_FLAG end; OnRecvCastlePt04: - FlagEmblem GetCastleData("prtg_cas04",1); + flagemblem getcastledata("prtg_cas04",1); end; } diff --git a/npc/guild/prtg_cas05.txt b/npc/guild/prtg_cas05.txt index 0c4938a26..69ac3eb32 100644 --- a/npc/guild/prtg_cas05.txt +++ b/npc/guild/prtg_cas05.txt @@ -18,7 +18,7 @@ //============================================================ - script Gondul#1::OutsideFlagsPR5 GUILD_FLAG,{ - set .@GID, GetCastleData("prtg_cas05",1); + set .@GID, getcastledata("prtg_cas05",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; @@ -41,7 +41,7 @@ next; if(select("Return to the guild castle.:Quit.") == 1) { close2; - if (getcharid(2) == GetCastleData("prtg_cas05",1)) { + if (getcharid(2) == getcastledata("prtg_cas05",1)) { warp "prtg_cas05",52,41; end; } @@ -53,16 +53,16 @@ mes " "; mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, "; mes "we approve that this place is in"; - mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild."; + mes "the private prossession of ^ff0000"+getguildname(.@GID)+"^000000 Guild."; mes " "; - mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is"; - mes "^ff0000"+GetGuildMaster(.@GID)+"^000000"; + mes "2. The guild Master of ^ff0000"+getguildname(.@GID)+"^000000 Guild is"; + mes "^ff0000"+getguildmaster(.@GID)+"^000000"; mes "If there is anyone who objects to this,"; mes "prove your strength and honor with a steel blade in your hand."; close; OnRecvCastlePt05: - FlagEmblem GetCastleData("prtg_cas05",1); + flagemblem getcastledata("prtg_cas05",1); end; } @@ -77,7 +77,7 @@ prt_gld,197,236,2 duplicate(OutsideFlagsPR5) Gondul#4 GUILD_FLAG end; OnRecvCastlePt05: - FlagEmblem GetCastleData("prtg_cas05",1); + flagemblem getcastledata("prtg_cas05",1); end; } diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index c4c22b165..580fb2944 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -840,7 +840,7 @@ OnInit: if (getcharid(2) == .@GID && getgdskilllv(.@GID,10001)) { mes "[Kafra Employee]"; mes "Welcome, proud member"; - mes "of the ^FF0000"+GetGuildName(.@GID)+"^000000 Guild!"; + mes "of the ^FF0000"+getguildname(.@GID)+"^000000 Guild!"; mes "The Kafra Corporation is ready"; mes "to assist you wherever you go!"; next; diff --git a/npc/guild2/agit_start_se.txt b/npc/guild2/agit_start_se.txt index ec9de3d9b..39c3ae1ea 100644 --- a/npc/guild2/agit_start_se.txt +++ b/npc/guild2/agit_start_se.txt @@ -31,7 +31,7 @@ OnAgitInit2: (gettime(4)==4) && (gettime(3)>=18 && gettime(3)<21) || (gettime(4)==6) && (gettime(3)>=22 && gettime(3)<23)) { if (!agitcheck2()) { - AgitStart2; + agitstart2; } end; } @@ -41,7 +41,7 @@ OnAgitInit2: (gettime(4)==4) && (gettime(3)==21) || (gettime(4)==6) && (gettime(3)==23)) { if (agitcheck2()) { - AgitEnd2; + agitend2; } end; } diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt index 5639c7c6d..be190c77f 100644 --- a/npc/guild2/arug_cas01.txt +++ b/npc/guild2/arug_cas01.txt @@ -46,7 +46,7 @@ arug_cas01,92,126,4 script Mardol#LF_ar01_3::LF_ar01_2 HIDDEN_NPC,{ end; OnAgitInit2: OnRecvCastleAr01: - FlagEmblem GetCastleData("arug_cas01",1); + flagemblem getcastledata("arug_cas01",1); end; } arug_cas01,127,126,4 duplicate(LF_ar01_2) Mardol#LF_ar01_3 HIDDEN_NPC @@ -67,9 +67,9 @@ aru_gld,164,270,4 script Mardol#flag_Ar01_1::Ar01_Flag GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastleAr01: - FlagEmblem GetCastleData("arug_cas01",1); + flagemblem getcastledata("arug_cas01",1); end; } aru_gld,142,235,4 duplicate(Ar01_Flag) Mardol#flag_Ar01_2 GUILD_FLAG aru_gld,164,245,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_3 GUILD_FLAG -aru_gld,182,255,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_4 GUILD_FLAG
\ No newline at end of file +aru_gld,182,255,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_4 GUILD_FLAG diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt index 31bd02ad6..bf7f639eb 100644 --- a/npc/guild2/arug_cas02.txt +++ b/npc/guild2/arug_cas02.txt @@ -54,7 +54,7 @@ arug_cas02,129,178,4 script Cyr#LF_ar02_13::LF_ar02_2 GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastleAr02: - FlagEmblem GetCastleData("arug_cas02",1); + flagemblem getcastledata("arug_cas02",1); end; } arug_cas02,149,178,4 duplicate(LF_ar02_2) Cyr#LF_ar02_14 GUILD_FLAG @@ -66,7 +66,7 @@ aru_gld,80,41,6 script Cyr#flag_Ar02_1::Ar02_Flag GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastleAr02: - FlagEmblem GetCastleData("arug_cas02",1); + flagemblem getcastledata("arug_cas02",1); end; } aru_gld,80,52,6 duplicate(Ar02_Flag) Cyr#flag_Ar02_2 GUILD_FLAG @@ -75,6 +75,6 @@ aru_gld,120,83,5 script Cyr#flag_Ar02_3 GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastleAr02: - FlagEmblem GetCastleData("arug_cas02",1); + flagemblem getcastledata("arug_cas02",1); end; -}
\ No newline at end of file +} diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt index 415788f54..0a1665566 100644 --- a/npc/guild2/arug_cas03.txt +++ b/npc/guild2/arug_cas03.txt @@ -54,7 +54,7 @@ arug_cas03,148,103,4 script Horn#LF_ar03_10::LF_ar03_02 GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastleAr03: - FlagEmblem GetCastleData("arug_cas03",1); + flagemblem getcastledata("arug_cas03",1); end; } arug_cas03,135,103,4 duplicate(LF_ar03_02) Horn#LF_ar03_11 GUILD_FLAG @@ -66,7 +66,7 @@ aru_gld,60,174,0 script Horn#flag_Ar03_1::Ar03_Flag GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastleAr03: - FlagEmblem GetCastleData("arug_cas03",1); + flagemblem getcastledata("arug_cas03",1); end; } -aru_gld,74,174,0 duplicate(Ar03_Flag) Horn#flag_Ar03_2 GUILD_FLAG
\ No newline at end of file +aru_gld,74,174,0 duplicate(Ar03_Flag) Horn#flag_Ar03_2 GUILD_FLAG diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt index c74ad619f..5ff71a806 100644 --- a/npc/guild2/arug_cas04.txt +++ b/npc/guild2/arug_cas04.txt @@ -54,7 +54,7 @@ arug_cas04,148,103,4 script Gefn#LF_ar04_10::LF_ar04_02 GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlear04: - FlagEmblem GetCastleData("arug_cas04",1); + flagemblem getcastledata("arug_cas04",1); end; } arug_cas04,135,103,4 duplicate(LF_ar04_02) Gefn#LF_ar04_11 GUILD_FLAG @@ -66,7 +66,7 @@ aru_gld,306,359,6 script Gefn#flag_ar04_1::ar04_Flag GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlear04: - FlagEmblem GetCastleData("arug_cas04",1); + flagemblem getcastledata("arug_cas04",1); end; } aru_gld,306,348,6 duplicate(ar04_Flag) Gefn#flag_ar04_2 GUILD_FLAG @@ -75,7 +75,7 @@ aru_gld,301,318,4 script Gefn#flag_ar04_3::ar04_Flag2 GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlear04: - FlagEmblem GetCastleData("arug_cas04",1); + flagemblem getcastledata("arug_cas04",1); end; } -aru_gld,313,318,4 duplicate(ar04_Flag2) Gefn#flag_ar04_4 GUILD_FLAG
\ No newline at end of file +aru_gld,313,318,4 duplicate(ar04_Flag2) Gefn#flag_ar04_4 GUILD_FLAG diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt index 92c9d60bd..e32f4e4db 100644 --- a/npc/guild2/arug_cas05.txt +++ b/npc/guild2/arug_cas05.txt @@ -54,7 +54,7 @@ arug_cas05,148,103,4 script Banadis#LF_ar05_10::LF_ar05_02 GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlear05: - FlagEmblem GetCastleData("arug_cas05",1); + flagemblem getcastledata("arug_cas05",1); end; } arug_cas05,135,103,4 duplicate(LF_ar05_02) Banadis#LF_ar05_11 GUILD_FLAG @@ -66,7 +66,7 @@ aru_gld,289,103,6 script Banadis#flag_ar05_1::ar05_Flag GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlear05: - FlagEmblem GetCastleData("arug_cas05",1); + flagemblem getcastledata("arug_cas05",1); end; } aru_gld,289,112,6 duplicate(ar05_Flag) Banadis#flag_ar05_2 GUILD_FLAG @@ -75,7 +75,7 @@ aru_gld,350,98,6 script Banadis#flag_ar05_3::ar05_Flag2 GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlear05: - FlagEmblem GetCastleData("arug_cas05",1); + flagemblem getcastledata("arug_cas05",1); end; } -aru_gld,350,88,6 duplicate(ar05_Flag2) Banadis#flag_ar05_4 GUILD_FLAG
\ No newline at end of file +aru_gld,350,88,6 duplicate(ar05_Flag2) Banadis#flag_ar05_4 GUILD_FLAG diff --git a/npc/guild2/guild_flags.txt b/npc/guild2/guild_flags.txt index fac506f32..c5bbd1d08 100644 --- a/npc/guild2/guild_flags.txt +++ b/npc/guild2/guild_flags.txt @@ -16,7 +16,7 @@ yuno,109,167,5 script Himinn GUILD_FLAG,{ OnAgitInit2: OnRecvCastlesc01: - FlagEmblem GetCastleData("schg_cas01",1); + flagemblem getcastledata("schg_cas01",1); end; } @@ -25,7 +25,7 @@ yuno,110,171,5 script Andlangr GUILD_FLAG,{ OnAgitInit2: OnRecvCastlesc02: - FlagEmblem GetCastleData("schg_cas02",1); + flagemblem getcastledata("schg_cas02",1); end; } @@ -34,7 +34,7 @@ yuno,111,175,5 script Viblainn GUILD_FLAG,{ OnAgitInit2: OnRecvCastlesc03: - FlagEmblem GetCastleData("schg_cas03",1); + flagemblem getcastledata("schg_cas03",1); end; } @@ -43,7 +43,7 @@ yuno,112,179,5 script Hljod GUILD_FLAG,{ OnAgitInit2: OnRecvCastlesc04: - FlagEmblem GetCastleData("schg_cas04",1); + flagemblem getcastledata("schg_cas04",1); end; } @@ -52,7 +52,7 @@ yuno,114,183,5 script Skidbladnir GUILD_FLAG,{ OnAgitInit2: OnRecvCastlesc05: - FlagEmblem GetCastleData("schg_cas05",1); + flagemblem getcastledata("schg_cas05",1); end; } @@ -62,7 +62,7 @@ rachel,124,120,3 script Mardol GUILD_FLAG,{ OnAgitInit2: OnRecvCastlear01: - FlagEmblem GetCastleData("arug_cas01",1); + flagemblem getcastledata("arug_cas01",1); end; } @@ -71,7 +71,7 @@ rachel,136,120,5 script Cyr GUILD_FLAG,{ OnAgitInit2: OnRecvCastlear02: - FlagEmblem GetCastleData("arug_cas02",1); + flagemblem getcastledata("arug_cas02",1); end; } @@ -80,7 +80,7 @@ rachel,138,126,6 script Horn GUILD_FLAG,{ OnAgitInit2: OnRecvCastlear03: - FlagEmblem GetCastleData("arug_cas03",1); + flagemblem getcastledata("arug_cas03",1); end; } @@ -89,7 +89,7 @@ rachel,135,131,7 script Gefn GUILD_FLAG,{ OnAgitInit2: OnRecvCastlear04: - FlagEmblem GetCastleData("arug_cas04",1); + flagemblem getcastledata("arug_cas04",1); end; } @@ -98,6 +98,6 @@ rachel,124,130,1 script Banadis GUILD_FLAG,{ OnAgitInit2: OnRecvCastlear05: - FlagEmblem GetCastleData("arug_cas05",1); + flagemblem getcastledata("arug_cas05",1); end; } diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt index ec15ab61d..b7074c68e 100644 --- a/npc/guild2/schg_cas01.txt +++ b/npc/guild2/schg_cas01.txt @@ -46,7 +46,7 @@ schg_cas01,111,46,4 script Himinn#LF_sc01_3::LF_sc01_2 GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastleSc01: - FlagEmblem GetCastleData("schg_cas01",1); + flagemblem getcastledata("schg_cas01",1); end; } schg_cas01,129,46,4 duplicate(LF_sc01_2) Himinn#LF_sc01_4 GUILD_FLAG @@ -66,7 +66,7 @@ sch_gld,290,90,0 script Himinn#flag_sc01_1::Sc01_Flag GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlesc01: - FlagEmblem GetCastleData("schg_cas01",1); + flagemblem getcastledata("schg_cas01",1); end; } -sch_gld,297,90,0 duplicate(Sc01_Flag) Himinn#flag_sc01_2 GUILD_FLAG
\ No newline at end of file +sch_gld,297,90,0 duplicate(Sc01_Flag) Himinn#flag_sc01_2 GUILD_FLAG diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt index a9c8858cd..4d6a73ef1 100644 --- a/npc/guild2/schg_cas02.txt +++ b/npc/guild2/schg_cas02.txt @@ -58,7 +58,7 @@ sch_gld,296,247,4 script Andlangr#flag_sc02_1::Sc02_Flag GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlesc02: - FlagEmblem GetCastleData("schg_cas02",1); + flagemblem getcastledata("schg_cas02",1); end; } -sch_gld,280,247,4 duplicate(Sc02_Flag) Andlangr#flag_sc02_2 GUILD_FLAG
\ No newline at end of file +sch_gld,280,247,4 duplicate(Sc02_Flag) Andlangr#flag_sc02_2 GUILD_FLAG diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt index 803fe1a59..2a5581df3 100644 --- a/npc/guild2/schg_cas03.txt +++ b/npc/guild2/schg_cas03.txt @@ -54,7 +54,7 @@ schg_cas03,283,206,2 script Vidblainn#LF_sc03_11::LF_sc03_2 GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlesc03: - FlagEmblem GetCastleData("schg_cas03",1); + flagemblem getcastledata("schg_cas03",1); end; } schg_cas03,283,197,2 duplicate(LF_sc03_2) Vidblainn#LF_sc03_12 GUILD_FLAG @@ -66,7 +66,7 @@ sch_gld,91,191,0 script Vidblainn#flag_sc03_1::Sc03_Flag GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlesc03: - FlagEmblem GetCastleData("schg_cas03",1); + flagemblem getcastledata("schg_cas03",1); end; } -sch_gld,104,191,0 duplicate(Sc03_Flag) Bidblind#flag_sc03_2 GUILD_FLAG
\ No newline at end of file +sch_gld,104,191,0 duplicate(Sc03_Flag) Bidblind#flag_sc03_2 GUILD_FLAG diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt index b4228d6ce..9905a0f17 100644 --- a/npc/guild2/schg_cas04.txt +++ b/npc/guild2/schg_cas04.txt @@ -46,7 +46,7 @@ schg_cas04,111,46,4 script Hljod#LF_sc04_3::LF_sc04_2 GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlesc04: - FlagEmblem GetCastleData("schg_cas04",1); + flagemblem getcastledata("schg_cas04",1); end; } schg_cas04,129,46,4 duplicate(LF_sc04_2) Hljod#LF_sc04_4 GUILD_FLAG @@ -66,7 +66,7 @@ sch_gld,134,97,4 script Hljod#flag_sc04_1::sc04_Flag GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlesc04: - FlagEmblem GetCastleData("schg_cas04",1); + flagemblem getcastledata("schg_cas04",1); end; } -sch_gld,141,97,4 duplicate(sc04_Flag) Hljod#flag_sc04_2 GUILD_FLAG
\ No newline at end of file +sch_gld,141,97,4 duplicate(sc04_Flag) Hljod#flag_sc04_2 GUILD_FLAG diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt index d3a2a0aac..6ecdff972 100644 --- a/npc/guild2/schg_cas05.txt +++ b/npc/guild2/schg_cas05.txt @@ -46,7 +46,7 @@ schg_cas05,111,46,4 script Skidbladnir#LF_sc05_3::LF_sc05_2 GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlesc05: - FlagEmblem GetCastleData("schg_cas05",1); + flagemblem getcastledata("schg_cas05",1); end; } schg_cas05,129,46,4 duplicate(LF_sc05_2) Skidbladnir#LF_sc05_4 GUILD_FLAG @@ -66,9 +66,9 @@ sch_gld,101,284,4 script Skidbladnir#flag_sc05_1::sc05_Flag GUILD_FLAG,{ end; OnAgitInit2: OnRecvCastlesc05: - FlagEmblem GetCastleData("schg_cas05",1); + flagemblem getcastledata("schg_cas05",1); end; } sch_gld,91,284,4 duplicate(sc05_Flag) Skidbladnir#flag_sc05_2 GUILD_FLAG sch_gld,66,320,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_3 GUILD_FLAG -sch_gld,66,310,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_4 GUILD_FLAG
\ No newline at end of file +sch_gld,66,310,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_4 GUILD_FLAG diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index ba841ea5e..98cb7841c 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -1113,7 +1113,7 @@ OnInit: monster "job_cru",98,80,"Greatest General",1277,1,"Summoner#cr3::OnDead"; monster "job_cru",92,90,"Greatest General",1277,1,"Summoner#cr3::OnDead"; monster "job_cru",104,90,"Greatest General",1277,1,"Summoner#cr3::OnDead"; - Initnpctimer; + initnpctimer; end; OnStart: @@ -1126,7 +1126,7 @@ OnStart: monster "job_cru",98,80,"Greatest General",1277,1,"Summoner#cr3::OnDead"; monster "job_cru",92,90,"Greatest General",1277,1,"Summoner#cr3::OnDead"; monster "job_cru",104,90,"Greatest General",1277,1,"Summoner#cr3::OnDead"; - Initnpctimer; + initnpctimer; end; OnReset: diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 71675c11c..2edf0990b 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -94,7 +94,7 @@ function script F_Kafra { // Guild Castle Kafra message set @GID,getcharid(2); mes "[Kafra Employee]"; - mes "Welcome. ^ff0000" + GetGuildName(@GID) + "^000000 Member."; + mes "Welcome. ^ff0000" + getguildname(@GID) + "^000000 Member."; mes "The Kafra Coporation will stay with you wherever you go."; break; case 3: @@ -638,4 +638,4 @@ function script F_KafSet { setd "@wrpC$["+.@i+"]",getd("@wrpD$["+.@i+"]")+" -> "+getd("@wrpP["+.@i+"]"); setd "@wrpC$["+getarraysize(@wrpC$)+"]","Cancel"; return; -}
\ No newline at end of file +} diff --git a/npc/other/auction.txt b/npc/other/auction.txt index fc9342635..eb4eb7bc4 100644 --- a/npc/other/auction.txt +++ b/npc/other/auction.txt @@ -102,7 +102,7 @@ auction_02,43,17,0 warp auction_enterance_lhz 1,1,lighthalzen,209,169 mes "Please take"; mes "a look, and see"; mes "What's being offered~"; - OpenAuction; + openauction; close; } mes "[Auction Broker]"; diff --git a/npc/pre-re/other/resetskill.txt b/npc/pre-re/other/resetskill.txt index b7af66906..4c8fb4054 100644 --- a/npc/pre-re/other/resetskill.txt +++ b/npc/pre-re/other/resetskill.txt @@ -107,7 +107,7 @@ prontera,146,232,4 script Hypnotist#2 4_F_TELEPORTER,{ mes "services. Oh, and best"; mes "of luck to you on your"; mes "travels, adventurer."; - ResetSkill; + resetskill; close; } mes "[Hypnotist]"; diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index 8242bcc96..28f5e26b0 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -1716,7 +1716,7 @@ prt_castle,45,35,5 script Madeleine Chu#cook 4_COOK,{ mes "of Cooking Kits"; mes "did you need?"; next; - switch(Select("Outdoor Cooking Kit - 500z:Home Cooking Kit - 1,000z:Quit")) { + switch(select("Outdoor Cooking Kit - 500z:Home Cooking Kit - 1,000z:Quit")) { case 1: callsub S_SellSets,12125; close; diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt index cafdade0e..535eb7902 100644 --- a/npc/quests/guildrelay.txt +++ b/npc/quests/guildrelay.txt @@ -24,25 +24,25 @@ set .@name2$,"Lenya"; set .@name3$,"Gealuve"; set .@name4$,"Pariz"; - set .@GID, GetCastleData("aldeg_cas"+strnpcinfo(2),1); + set .@GID, getcastledata("aldeg_cas"+strnpcinfo(2),1); } else if (.@name$ == "Jody") { set .@name2$,"Ron Haware"; set .@name3$,"Vers"; set .@name4$,"Gen Garish"; - set .@GID, GetCastleData("gefg_cas"+strnpcinfo(2),1); + set .@GID, getcastledata("gefg_cas"+strnpcinfo(2),1); } else if (.@name$ == "Chungye") { set .@name2$,"Dosuhlji"; set .@name3$,"Yayula"; set .@name4$,"Ashin"; - set .@GID, GetCastleData("payg_cas"+strnpcinfo(2),1); + set .@GID, getcastledata("payg_cas"+strnpcinfo(2),1); } else if (.@name$ == "Hermod") { set .@name2$,"Atila"; set .@name3$,"Cecil"; set .@name4$,"Diligo"; - set .@GID, GetCastleData("prtg_cas"+strnpcinfo(2),1); + set .@GID, getcastledata("prtg_cas"+strnpcinfo(2),1); } if (checkweight(908,630) == 0) { mes "^3355FFWait a minute! You're"; @@ -1221,7 +1221,7 @@ - script RelayDummy2::GuildRelay2 4_M_SAGE_A,{ set .@name$,strnpcinfo(1); getmapxy(.@m$,.@x,.@x,1); - set .@GID, GetCastleData(.@m$,1); + set .@GID, getcastledata(.@m$,1); if (checkweight(1201,1) == 0) { mes "^3355FFWait a minute! You're"; mes "carrying too many items"; @@ -1730,7 +1730,7 @@ - script RelayDummy3::GuildRelay3 4_M_SAGE_A,{ set .@name$,strnpcinfo(1); getmapxy(.@m$,.@x,.@x,1); - set .@GID, GetCastleData(.@m$,1); + set .@GID, getcastledata(.@m$,1); if (checkweight(1201,1) == 0) { mes "^3355FFWait a minute! You're"; mes "carrying too many items"; @@ -2415,7 +2415,7 @@ - script GuildDummy4::GuildRelay4 4_M_SAGE_A,{ set .@name$,strnpcinfo(1); getmapxy(.@m$,.@x,.@x,1); - set .@GID, GetCastleData(.@m$,1); + set .@GID, getcastledata(.@m$,1); if (checkweight(1201,1) == 0) { mes "^3355FFWait a minute! You're"; mes "carrying too many items"; diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt index 395fda89d..c1e09bfec 100644 --- a/npc/quests/okolnir.txt +++ b/npc/quests/okolnir.txt @@ -21,7 +21,7 @@ function script F_Okolnir { - script Guide#gq_main -1,{ set .@sub$, callfunc("F_Okolnir"); - set .@GID, GetCastleData(strnpcinfo(4),1); + set .@GID, getcastledata(strnpcinfo(4),1); if (getcharid(2) == .@GID) { if (getd("$siz_"+.@sub$+"_on") == 0) { mes "[Guide]"; @@ -58,8 +58,8 @@ function script F_Okolnir { mes "Would you like to try to enter here?"; close; case 2: - set .@Defence,GetCastleData(strnpcinfo(4),3); - set .@Economy,GetCastleData(strnpcinfo(4),2); + set .@Defence,getcastledata(strnpcinfo(4),3); + set .@Economy,getcastledata(strnpcinfo(4),2); if ((.@Economy > 64) && (.@Defence > 29)) { mes "[Guide]"; mes "Great! Economy and Defense are OK."; @@ -169,7 +169,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306 - script Wish Maiden#gq_main -1,{ set .@sub$, callfunc("F_Okolnir"); set .@t$, ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1)); - set .@GID, GetCastleData(.@t$,1); + set .@GID, getcastledata(.@t$,1); if (getcharid(2) == .@GID) { cutin "wish_maiden31",1; if (strcharinfo(0) == getguildmaster(.@GID)) { @@ -236,7 +236,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306 donpcevent "#okolnir_"+.@sub$+"::OnEnable"; disablenpc "Wish Maiden#gq_"+.@sub$; cutin "wish_maiden11",255; - announce "["+ strcharinfo(0) +"], of the guild ["+ GetGuildName(.@GID) +"] has opened the gates to the realm of Okolnir.",bc_all,"0x70dbdb"; + announce "["+ strcharinfo(0) +"], of the guild ["+ getguildname(.@GID) +"] has opened the gates to the realm of Okolnir.",bc_all,"0x70dbdb"; end; } else { @@ -2142,7 +2142,7 @@ que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss 193 - script Wish Maiden#main_gift -1,{ set .@sub$,callfunc("F_Okolnir"); set .@t$, ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1)); - set .@GID, GetCastleData(.@t$,1); + set .@GID, getcastledata(.@t$,1); if (getcharid(2) == .@GID) { if (strcharinfo(0) == getguildmaster(.@GID)) { if (compare(.@sub$,"aru")) { @@ -2180,7 +2180,7 @@ que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss 193 delitem .@n[.@i],.@n[.@i+1]; getitem .@rwd,1; getitem 7840,1; //Valkyrie_Gift - announce "["+ strcharinfo(0) +"], of guild ["+ GetGuildName(.@GID) +"] has brought a "+getitemname(.@rwd)+" into this world.",bc_all,"0x70dbdb"; + announce "["+ strcharinfo(0) +"], of guild ["+ getguildname(.@GID) +"] has brought a "+getitemname(.@rwd)+" into this world.",bc_all,"0x70dbdb"; close2; cutin "wish_maiden11",255; disablenpc "Wish Maiden#"+.@sub$+"_gift"; diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index 59a16deb6..d2a15064c 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -327,7 +327,7 @@ prontera,248,212,3 script Busy Boy#prt 4_M_KID1,3,3,{ mes "You couldn't help it:"; mes "it was a natural reflex!^000000"; next; - Specialeffect EF_HITDARK; + specialeffect EF_HITDARK; emotion e_omg; mes "^3355FF*BAM!*^000000"; next; @@ -449,7 +449,7 @@ OnTouch: callsub S_CheckWeight; //Check Player's weight if (BaseLevel > 59) { if (prt_curse == 0) { - Specialeffect EF_HITDARK; + specialeffect EF_HITDARK; mes "^3355FF*BAM!*^000000"; next; mes "[Busy Looking Boy]"; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index fc96796bb..715cbe7ee 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -3683,7 +3683,7 @@ OnStart: end; OnStartTimer: - Initnpctimer; + initnpctimer; end; OnStopTimer: diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt index 375b47426..9457f431a 100644 --- a/npc/quests/seals/mjolnir_seal.txt +++ b/npc/quests/seals/mjolnir_seal.txt @@ -1968,7 +1968,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 4_M_DWARF,{ mes "Oh, this is excellent! This piece here has been perfectly refined! But this isn't what I want. I can't do any work on this at all."; close; } - if (GetEquipPercentRefinery(.@part) == 100) { + if (getequippercentrefinery(.@part) == 100) { mes "[Vestri]"; mes "This item isn't even a challenge to upgrade. You can get humans to do this kind of beginner's stuff. Get them to refine it first."; next; @@ -2186,7 +2186,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 4_M_DWARF,{ mes "Oh, this is excellent! This piece here has been perfectly refined! But this isn't what I want. I can't do any work on this at all."; close; } - if (GetEquipPercentRefinery(.@part) == 100) { + if (getequippercentrefinery(.@part) == 100) { mes "[Vestri]"; mes "This item isn't even a challenge to upgrade. You can get humans to do this kind of beginner's stuff. Get them to refine it first."; next; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 9375cf27b..c3ecc7f70 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -1521,7 +1521,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 4_HUMAN_GERUTOO,{ mes "As soon as you try to approach Ahat, someone"; mes "pushes down your head to force you to bow."; soundeffect "wander_man_move.wav",0; - SC_Start SC_BLIND,60000,0; + sc_start SC_BLIND,60000,0; next; mes "[Ringing Voice]"; mes "That is fine, Cheshire."; @@ -1534,7 +1534,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 4_HUMAN_GERUTOO,{ cutin (Sex?"ep13_ahat_f":"ep13_ahat_m"),2; mes "You hold up your head at the sound of Ahat's voice"; mes "But you see a human in high-ranking Sapha clothing in front of you."; - SC_End SC_BLIND; + sc_end SC_BLIND; emotion e_omg,1; set ep13_3_secret, 14; erasequest 7198; |