diff options
| author | Haru <haru@dotalux.com> | 2013-11-10 04:28:03 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-11-10 04:31:28 +0100 |
| commit | b4f1b3b5c5c009ed4f7635c5349ea97c80c08c25 (patch) | |
| tree | cbd305d3896bdc9f498ed9eb72836dc7b6c32b99 /npc | |
| parent | c9b63614070f7fce81c88cd60e5edad5a7730df0 (diff) | |
| download | hercules-b4f1b3b5c5c009ed4f7635c5349ea97c80c08c25.tar.gz hercules-b4f1b3b5c5c009ed4f7635c5349ea97c80c08c25.tar.bz2 hercules-b4f1b3b5c5c009ed4f7635c5349ea97c80c08c25.tar.xz hercules-b4f1b3b5c5c009ed4f7635c5349ea97c80c08c25.zip | |
Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4
- Consolidated case in variables, labels, constants.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc')
79 files changed, 448 insertions, 448 deletions
diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt index 2c286e8f5..81d41513e 100644 --- a/npc/battleground/bg_common.txt +++ b/npc/battleground/bg_common.txt @@ -477,10 +477,10 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ next; switch(select("Garments / Shoes:Armor")) { case 1: - setarray .@Items[0],2538,50,2539,50,2540,50,2435,50,2436,50,2437,50; + setarray .@items[0],2538,50,2539,50,2540,50,2435,50,2436,50,2437,50; break; case 2: - setarray .@Items[0],2376,80,2377,80,2378,80,2379,80,2380,80,2381,80,2382,80; + setarray .@items[0],2376,80,2377,80,2378,80,2379,80,2380,80,2381,80,2382,80; break; } break; @@ -489,7 +489,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ mes "You chose ^3131FFAccessory^000000."; mes "You can exchange the Medal of Honors with your Badges according to the job classes, as follows:"; next; - setarray .@Items[0],2733,500,2720,500,2721,500,2722,500,2723,500,2724,500,2725,500; + setarray .@items[0],2733,500,2720,500,2721,500,2722,500,2723,500,2724,500,2725,500; set .@menu1$,"Gunslinger:Swordman/Taekwon Master:Thief:Acolyte:Magician:Archer:Merchant"; break; case 4: @@ -497,7 +497,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ mes "You chose ^3131FFConsumable^000000."; mes "The following consumable items are available for exchange with the battlefield badges:"; next; - setarray .@Items[0],12269,10,12270,10,12271,5,12272,10,12273,10; + setarray .@items[0],12269,10,12270,10,12271,5,12272,10,12273,10; break; } break; @@ -510,12 +510,12 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ } set .@menu$,""; if (.@menu1$ != "") set .@menu$, .@menu1$; - else for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+2) - set .@menu$, .@menu$+getitemname(.@Items[.@i])+":"; + else for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+2) + set .@menu$, .@menu$+getitemname(.@items[.@i])+":"; set .@i, (select(.@menu$)-1)*2; mes "[Erundek]"; - mes "You chose ^3131FF"+getitemname(.@Items[.@i])+"^000000."; - switch(.@Items[.@i]) { + mes "You chose ^3131FF"+getitemname(.@items[.@i])+"^000000."; + switch(.@items[.@i]) { case 2720: mes "This item is for Swordman and Taekwon Master Class only."; break; case 2721: mes "This item is for Thief Class only."; break; case 2722: mes "This item is for Acolyte Class only."; break; @@ -525,7 +525,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ case 2733: mes "This item is for Gunslinger only."; break; default: break; } - mes "You can exchange for this item with ^FF0000"+.@Items[.@i+1]+" "+getitemname(7828)+" or "+.@Items[.@i+1]+" "+getitemname(7829)+"^000000."; + mes "You can exchange for this item with ^FF0000"+.@items[.@i+1]+" "+getitemname(7828)+" or "+.@items[.@i+1]+" "+getitemname(7829)+"^000000."; mes "Would you like to exchange?"; next; switch(select("Do not exchange:Exchange")) { @@ -536,7 +536,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ case 2: mes "[Erundek]"; mes "Which Badge do you want to exchange?"; - mes "You need ^3131FF"+.@Items[.@i+1]+" Badges^000000 to exchange."; + mes "You need ^3131FF"+.@items[.@i+1]+" Badges^000000 to exchange."; next; if (.@item[0] < 12269 || .@item[0] > 12273 ) { mes "[Erundek]"; @@ -550,10 +550,10 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ break; } set .@cost, ((.@j==1)?7828:7829); - if (countitem(.@cost) >= .@Items[.@i+1]) { + if (countitem(.@cost) >= .@items[.@i+1]) { mes "Thank you for exchanging."; - delitem .@cost, .@Items[.@i+1]; - getitem .@Items[.@i],1; + delitem .@cost, .@items[.@i+1]; + getitem .@items[.@i],1; } else mes "You do not have enough "+getitemname(.@cost)+"s."; break; diff --git a/npc/battleground/flavius/flavius_enter.txt b/npc/battleground/flavius/flavius_enter.txt index 026b4402f..d63130007 100644 --- a/npc/battleground/flavius/flavius_enter.txt +++ b/npc/battleground/flavius/flavius_enter.txt @@ -27,7 +27,7 @@ bat_room,133,178,5 script Flavius Officer#01a 4_M_KY_KNT,{ next; switch(select("I want to join your army!:End Conversation")) { case 1: - if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) { + if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; } @@ -94,7 +94,7 @@ bat_room,133,121,1 script Flavius Officer#01b 4_M_CRU_KNT,{ next; switch(select("I want to join your army!:End Conversation")) { case 1: - if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) { + if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; } @@ -251,7 +251,7 @@ bat_room,148,178,5 script Flavius Officer#02a 4_M_KY_KNT,{ next; switch(select("I want to join your army!:End Conversation")) { case 1: - if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) { + if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; } @@ -318,7 +318,7 @@ bat_room,148,121,1 script Flavius Officer#02b 4_M_CRU_KNT,{ next; switch(select("I want to join your army!:End Conversation")) { case 1: - if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) { + if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; } diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt index 9089017a0..e68058247 100644 --- a/npc/battleground/tierra/tierra_enter.txt +++ b/npc/battleground/tierra/tierra_enter.txt @@ -28,7 +28,7 @@ bat_room,124,178,5 script Tierra Gorge Officer#01a 4_M_KY_KNT,{ next; switch(select("I want to join your army!:End Conversation")) { case 1: - if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) { + if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; } @@ -95,7 +95,7 @@ bat_room,140,178,5 script Tierra Gorge Officer#02a 4_M_KY_KNT,{ next; switch(select("I want to join your army!:End Conversation")) { case 1: - if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) { + if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; } @@ -260,7 +260,7 @@ bat_room,125,121,1 script Tierra Gorge Officer#01b 4_M_CRU_KNT,{ next; switch(select("I want to join your army!:End Conversation")) { case 1: - if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) { + if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; } @@ -327,7 +327,7 @@ bat_room,140,121,1 script Tierra Gorge Officer#02b 4_M_CRU_KNT,{ next; switch(select("I want to join your army!:End Conversation")) { case 1: - if ((Class == Job_Novice) || (BaseClass == Job_Supernovice)) { + if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; } diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt index 7355205a0..000b0893e 100644 --- a/npc/cities/izlude.txt +++ b/npc/cities/izlude.txt @@ -102,7 +102,7 @@ mes "[Charfri]"; mes "You'll have to board on a ship at the port to get to Byalan Island. There are dangerous dungeons on that island, so don't go snooping around just anywhere."; close; - Default: + default: mes "Though it is very beautiful, Byalan Island has a mysterious dungeon that extends deep under the sea."; next; mes "[Charfri]"; @@ -133,7 +133,7 @@ mes "[Cuskoal]"; mes "So, whaddya say?"; close; - Default: + default: mes "The pubs in Prontera are always full of people from local areas and from out-of-town. It can get pretty busy."; next; mes "[Cuskoal]"; @@ -167,7 +167,7 @@ mes "[Dega]"; mes "If you try to cast magic near it, it will notice and saunter over to smash you. So you better watch out for Golem."; close; - Default: + default: mes "There's a very delightful place where you can find every"; mes "type of Poring."; next; diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index eecb76888..501e0f336 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -970,7 +970,7 @@ jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{ percentheal -20,0; next; break; - Default: + default: mes "[Bartender]"; mes "I see..."; mes "Let me think"; diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt index ff5851452..792ddc972 100644 --- a/npc/cities/prontera.txt +++ b/npc/cities/prontera.txt @@ -444,7 +444,7 @@ prt_in,177,20,2 script TenSue#pront 4W_M_01,{ mes "[TenSue]"; mes "The headquarters of Kafra Corporation is also located in Al de Baran. You should really stop by and check it out for yourself."; close; - Default: + default: mes "[TenSue]"; mes "The kingdom of"; mes "Rune-Midgarts is ruled"; @@ -631,7 +631,7 @@ prt_church,103,76,0 script Garnet#pront 1_F_02,{ mes "Alright, I've"; mes "heard enough."; close2; - set .@SkilLChat,0; + set .@SkillChat,0; break; } } @@ -649,7 +649,7 @@ prt_church,103,71,0 script Henson#pront 2_M_PHARMACIST,{ mes "Did you have any questions about Acolyte and Priest skills?"; next; set .@SkillChat,1; - while(.@Skillchat) { + while(.@SkillChat) { switch(select("About Divine Protection:About Demon Bane:About Decrease AGI:About Signum Crusis :About Pneuma:About Ruwach:About Teleport:End conversation.")) { case 1: mes "[Henson]"; @@ -729,7 +729,7 @@ prt_church,103,71,0 script Henson#pront 2_M_PHARMACIST,{ mes "[Henson]"; mes "If you wish to understand more about an Acolyte or Priest skill, you are welcome to visit me at any time."; close2; - set .@SkilLChat,0; + set .@SkillChat,0; break; } } diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt index 8886921f2..f24e1e5a8 100644 --- a/npc/custom/battleground/bg_common.txt +++ b/npc/custom/battleground/bg_common.txt @@ -1293,8 +1293,8 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ next; set .@Menu$, ""; - set .@Count, getarraysize(.@Item_DB); - for( set .@i, 0; .@i < .@Count; set .@i, .@i + 1 ) + set .@count, getarraysize(.@Item_DB); + for( set .@i, 0; .@i < .@count; set .@i, .@i + 1 ) set .@Menu$, .@Menu$ + getitemname(.@Item_DB[.@i]) + ":"; set .@Item_ID, .@Item_DB[select(.@Menu$) - 1]; diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt index 778feb55d..bcfe32322 100644 --- a/npc/custom/bgqueue/flavius.txt +++ b/npc/custom/bgqueue/flavius.txt @@ -126,16 +126,16 @@ OnPlayerListReady: bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1; - donpcevent "OBJ#bat_b01_a::Onkill"; + donpcevent "OBJ#bat_b01_a::OnKill"; donpcevent "OBJ#bat_b01_a::OnEnable"; - donpcevent "OBJ#bat_b01_b::Onkill"; + donpcevent "OBJ#bat_b01_b::OnKill"; donpcevent "OBJ#bat_b01_b::OnEnable"; - donpcevent "guardian#bat_b01_a::Onkill"; - donpcevent "guardian#bat_b01_b::Onkill"; + donpcevent "guardian#bat_b01_a::OnKill"; + donpcevent "guardian#bat_b01_b::OnKill"; donpcevent "guardian#bat_b01_a::OnEnable"; donpcevent "guardian#bat_b01_b::OnEnable"; - donpcevent "cell#bat_b01_a::Onred"; - donpcevent "cell#bat_b01_b::Onred"; + donpcevent "cell#bat_b01_a::OnRed"; + donpcevent "cell#bat_b01_b::OnRed"; donpcevent "time#bat_b01::OnEnable"; disablenpc "Guillaume Vintenar#b01_a"; disablenpc "Croix Vintenar#b01_b"; @@ -152,16 +152,16 @@ OnPlayerListReady: end; OnReset: - donpcevent "OBJ#bat_b01_a::Onkill"; + donpcevent "OBJ#bat_b01_a::OnKill"; donpcevent "OBJ#bat_b01_a::OnEnable"; - donpcevent "OBJ#bat_b01_b::Onkill"; + donpcevent "OBJ#bat_b01_b::OnKill"; donpcevent "OBJ#bat_b01_b::OnEnable"; - donpcevent "guardian#bat_b01_a::Onkill"; - donpcevent "guardian#bat_b01_b::Onkill"; + donpcevent "guardian#bat_b01_a::OnKill"; + donpcevent "guardian#bat_b01_b::OnKill"; donpcevent "guardian#bat_b01_a::OnEnable"; donpcevent "guardian#bat_b01_b::OnEnable"; - donpcevent "cell#bat_b01_a::Onred"; - donpcevent "cell#bat_b01_b::Onred"; + donpcevent "cell#bat_b01_a::OnRed"; + donpcevent "cell#bat_b01_b::OnRed"; donpcevent "time#bat_b01::OnEnable"; disablenpc "Guillaume Vintenar#b01_a"; disablenpc "Croix Vintenar#b01_b"; @@ -204,7 +204,7 @@ OnEnable: bg_monster $@FlaviusBG1_id1,"bat_b01",61,150,"Pink Crystal",1915,"OBJ#bat_b01_a::OnMyMobDead"; end; -Onkill: +OnKill: killmonster "bat_b01","OBJ#bat_b01_a::OnMyMobDead"; end; @@ -216,7 +216,7 @@ OnMyMobDead: set $@Croix_ScoreBG1,$@Croix_ScoreBG1+1; enablenpc "Guillaume Vintenar#b01_a"; enablenpc "Croix Vintenar#b01_b"; - donpcevent "time#bat_b01::Onstop"; + donpcevent "time#bat_b01::OnStop"; donpcevent "start#bat_b01::OnMatchOver"; } else { @@ -235,7 +235,7 @@ OnEnable: bg_monster $@FlaviusBG1_id2,"bat_b01",328,150,"Blue Crystal",1914,"OBJ#bat_b01_b::OnMyMobDead"; end; -Onkill: +OnKill: killmonster "bat_b01","OBJ#bat_b01_b::OnMyMobDead"; end; @@ -247,7 +247,7 @@ OnMyMobDead: set $@Guill_ScoreBG1,$@Guill_ScoreBG1+1; enablenpc "Guillaume Vintenar#b01_a"; enablenpc "Croix Vintenar#b01_b"; - donpcevent "time#bat_b01::Onstop"; + donpcevent "time#bat_b01::OnStop"; donpcevent "start#bat_b01::OnMatchOver"; } else { @@ -268,13 +268,13 @@ OnEnable: bg_monster $@FlaviusBG1_id1,"bat_b01",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead"; end; -Onkill: +OnKill: killmonster "bat_b01","guardian#bat_b01_a::OnMyMobDead"; end; OnMyMobDead: if (mobcount("bat_b01","guardian#bat_b01_a::OnMyMobDead") < 1) { - donpcevent "cell#bat_b01_a::Ongreen"; + donpcevent "cell#bat_b01_a::OnGreen"; mapannounce "bat_b01", "The Guardian protecting Guillaume's Crystal has been slain.",bc_map,"0xFFCE00"; } end; @@ -286,37 +286,37 @@ OnEnable: bg_monster $@FlaviusBG1_id2,"bat_b01",307,138,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead"; end; -Onkill: +OnKill: killmonster "bat_b01","guardian#bat_b01_b::OnMyMobDead"; end; OnMyMobDead: if (mobcount("bat_b01","guardian#bat_b01_b::OnMyMobDead") < 1) { - donpcevent "cell#bat_b01_b::Ongreen"; + donpcevent "cell#bat_b01_b::OnGreen"; mapannounce "bat_b01", "The Guardian protecting Croix's Crystal has been slain.",bc_map,"0xFFCE00"; } end; } bat_b01,1,4,3 script cell#bat_b01_a CLEAR_NPC,{ -Onred: +OnRed: setcell "bat_b01",62,149,60,151,cell_basilica,1; setcell "bat_b01",62,149,60,151,cell_walkable,0; end; -Ongreen: +OnGreen: setcell "bat_b01",62,149,60,151,cell_basilica,0; setcell "bat_b01",62,149,60,151,cell_walkable,1; end; } bat_b01,1,5,3 script cell#bat_b01_b CLEAR_NPC,{ -Onred: +OnRed: setcell "bat_b01",327,151,329,149,cell_basilica,1; setcell "bat_b01",327,151,329,149,cell_walkable,0; end; -Ongreen: +OnGreen: setcell "bat_b01",327,151,329,149,cell_basilica,0; setcell "bat_b01",327,151,329,149,cell_walkable,1; end; @@ -328,7 +328,7 @@ OnEnable: donpcevent "Battle Therapist#b01_b::OnEnable"; end; -Onstop: +OnStop: donpcevent "Battle Therapist#b01_a::OnStop"; donpcevent "Battle Therapist#b01_b::OnStop"; end; @@ -361,7 +361,7 @@ OnEnable: enablenpc "Battle Therapist#b01_a"; end; -Onstop: +OnStop: disablenpc "bat_b01_rp1_a_warp"; disablenpc "Battle Therapist#b01_a"; stopnpctimer; @@ -406,7 +406,7 @@ OnEnable: enablenpc "Battle Therapist#b01_b"; end; -Onstop: +OnStop: disablenpc "bat_b01_rp1_b_warp"; disablenpc "Battle Therapist#b01_b"; stopnpctimer; @@ -552,7 +552,7 @@ OnEnable: initnpctimer; end; -Onstop: +OnStop: stopnpctimer; end; @@ -585,7 +585,7 @@ OnTimer1825000: end; OnTimer1830000: - donpcevent "time#bat_b01::Onstop"; + donpcevent "time#bat_b01::OnStop"; bg_warp $@FlaviusBG1_id1,"bat_b01",10,290; bg_warp $@FlaviusBG1_id2,"bat_b01",390,10; enablenpc "Vintenar#bat_b01_aover"; @@ -594,7 +594,7 @@ OnTimer1830000: OnTimer1900000: mapwarp "bat_b01","bat_room",154,150; - donpcevent "countdown#bat_b01::Onstop"; + donpcevent "countdown#bat_b01::OnStop"; donpcevent "start#bat_b01::OnMatchOver"; end; } diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt index 6c8a1b8b5..887e03404 100644 --- a/npc/custom/card_remover.txt +++ b/npc/custom/card_remover.txt @@ -67,7 +67,7 @@ prt_in,28,73,4 script Wise Old Woman#eAcustom 1_F_ORIENT_04,{ mes "Very well. Return at once if you seek my services."; close; } - if((zeny < (.zenycost+(.@cardcount * .percardcost))) || (countitem(1000) < 1) || (countitem(715) < 1)) { + if((Zeny < (.zenycost+(.@cardcount * .percardcost))) || (countitem(1000) < 1) || (countitem(715) < 1)) { mes "[Wise Old Woman]"; mes "You do not have all the items I require to work my magic, child. Come again when you do."; close; @@ -88,7 +88,7 @@ prt_in,28,73,4 script Wise Old Woman#eAcustom 1_F_ORIENT_04,{ } mes "[Wise Old Woman]"; mes "Very well. I shall begin."; - set zeny,zeny - (.zenycost+(.@cardcount * .percardcost)); + set Zeny,Zeny - (.zenycost+(.@cardcount * .percardcost)); delitem 1000,1; delitem 715,1; diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt index ebf626b98..a5796fccd 100644 --- a/npc/custom/etc/airplane.txt +++ b/npc/custom/etc/airplane.txt @@ -252,8 +252,8 @@ L_Nope: Notime: mes "^FF0000[Porter]^000000"; - if(sex==0) mes "Sorry, ma'am, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary."; - if(sex==1) mes "Sorry, sir, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary."; + if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary."; + if(Sex==1) mes "Sorry, sir, but the plane currently isn't ported. However, you can view the airplane's hourly itinerary."; next; menu "Yes, please.",Itin,"No thanks.",L_Nope; close; @@ -363,8 +363,8 @@ Lnope: Notime: mes "^FF0000[Airplane Attendant]^000000"; - if(sex==0) mes "Sorry, ma'am, but the plane currently isn't docked. Please wait."; - if(sex==1) mes "Sorry, sir, but the plane currently isn't docked. Please wait."; + if(Sex==0) mes "Sorry, ma'am, but the plane currently isn't docked. Please wait."; + if(Sex==1) mes "Sorry, sir, but the plane currently isn't docked. Please wait."; close; Nowhere: diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt index e2020155f..48086abbd 100644 --- a/npc/custom/etc/bank_kafra.txt +++ b/npc/custom/etc/bank_kafra.txt @@ -47,8 +47,8 @@ L_NoIncomeToday: if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT; if(@kafrabank<1000) goto L_LESS_1000; - if(@kafrabank>zeny) goto L_NOT_ENOUGH; - set zeny,zeny-@kafrabank; + if(@kafrabank>Zeny) goto L_NOT_ENOUGH; + set Zeny,Zeny-@kafrabank; set #kafrabank,#kafrabank+@kafrabank; mes"[Maniss]"; mes "You've made a deposit of ^135445" + @kafrabank + "z^000000."; @@ -67,7 +67,7 @@ M_WITHDRAW: if(@kafrabank<1) goto B_EXIT2; if(@kafrabank>#kafrabank) goto L_NOT_ENOUGH; set #kafrabank,#kafrabank-@kafrabank; - set zeny,zeny+@kafrabank; + set Zeny,Zeny+@kafrabank; mes"[Maniss]"; mes "Here is your ^135445" + @kafrabank + "z^000000, put your sign here..."; //we log these zeny operations into the log db diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt index ef169c190..26c4afa9f 100644 --- a/npc/custom/etc/lottery.txt +++ b/npc/custom/etc/lottery.txt @@ -106,8 +106,8 @@ L_Buy: mes "The Jackpot is ^FF0000" + $L_Prize_Money + "z^000000."; next; menu "Buy Ticket",-,"Cancel",L_Cancel; - if (zeny < $L_TicketPrice) goto L_NoZeny; - set zeny,zeny-$L_TicketPrice; + if (Zeny < $L_TicketPrice) goto L_NoZeny; + set Zeny,Zeny-$L_TicketPrice; mes "[Lottery]"; mes "Would you like your numbers hand picked or computer generated?"; next; @@ -292,7 +292,7 @@ LWinBig: mes "You have matched all six numbers!"; mes "Jackpot!"; mes "You've won ^0000FF" + $L_Prize_Money + "z^000000."; - set zeny,zeny+$L_Prize_Money; + set Zeny,Zeny+$L_Prize_Money; announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8; set #LID,0; close; @@ -302,7 +302,7 @@ LWinSmall: mes "[Lottery]"; 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; + set Zeny,Zeny+$L_Prize_Money_Small; announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8; set #LID,0; close; diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt index 0549502cd..f0ec34f0a 100644 --- a/npc/custom/etc/marriage.txt +++ b/npc/custom/etc/marriage.txt @@ -392,19 +392,19 @@ OnTimer55000: //Subfunction: Checks that the groom/bride is still wearing their stuff. function SF_equip_check { - if (sex && getequipid(2) != 7170) { + if (Sex && getequipid(2) != 7170) { mes "["+@name$+"]"; mes "Child, what did you do with your "+getitemname(7170)+"?"; emotion e_dots; return 0; } - if (sex == 0 && getequipid(2) != 2338) { + if (Sex == 0 && getequipid(2) != 2338) { mes "["+@name$+"]"; mes "Child, you are supposed to wear a "+getitemname(2338)+" at all times during the ceremony..."; emotion e_dots; return 0; } - if (sex == 0 && $@wed_veil && getequipid(1) != 2206) { + if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) { mes "["+@name$+"]"; mes "Child, you can't take off your "+getitemname(2206)+" yet...."; emotion e_dots; @@ -487,7 +487,7 @@ function SF_Register { mes "Very well, whom would you like to register as?"; next; set @submenu, select("Groom","Bride","Cancel"); - } else if (sex) { //Groom + } else if (Sex) { //Groom mes "["+@name$+"]"; mes "Very well, will you register as the Groom?"; next; @@ -547,7 +547,7 @@ function SF_WedProgress { mes "Tell your groom to register, what is taking so long? Time is running out."; close; } - if (($wed_groom_progress == 0) && (sex == 1 || $@wed_allow == 1)) { + if (($wed_groom_progress == 0) && (Sex == 1 || $@wed_allow == 1)) { mes "["+@name$+"]"; mes $wed_bride$+" is waiting for the groom to register. Are you the one who came to register as groom?"; next; @@ -569,7 +569,7 @@ function SF_WedProgress { } } - if (($wed_bride_progress == 0) && (sex == 0 || $@wed_allow == 1)) { + if (($wed_bride_progress == 0) && (Sex == 0 || $@wed_allow == 1)) { mes "["+@name$+"]"; mes $wed_groom$+" is waiting for the bride to register. Are you the one who came to register as the bride?"; next; @@ -685,7 +685,7 @@ function SF_TryRegister { emotion e_gasp; close; } - if (sex) + if (Sex) set @item, 7170; else set @item, 2338; @@ -695,7 +695,7 @@ function SF_TryRegister { mes "You should be wearing a "+getitemname(@item)+" if you want to get married."; close; } - if (sex == 0 && $@wed_veil && getequipid(1) != 2206) { + if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) { mes "["+@name$+"]"; mes "Where is your "+getitemname(2206)+"? It's a necessary complement to your dress."; close; @@ -717,17 +717,17 @@ function SF_TryRegister { close; } set Zeny,Zeny-@cost; - sc_start SC_Wedding,3600000,1; //Start Wedding Effect (SC_WEDDING) + sc_start SC_WEDDING,3600000,1; //Start Wedding Effect (SC_WEDDING) if (@bride) { set $wed_bride_progress,1; set $wed_bride$,strcharinfo(0); - set $wed_bride_sex, sex; + set $wed_bride_sex, Sex; if ($@wedding_effect == 1) //Store account id for effect. set $wedding_effect_id, getcharid(3); } else { set $wed_groom_progress,1; set $wed_groom$,strcharinfo(0); - set $wed_groom_sex, sex; + set $wed_groom_sex, Sex; if ($@wedding_effect == 2) //Store account id for effect. set $wedding_effect_id, getcharid(3); } diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt index 51304c1a0..90fd500f6 100644 --- a/npc/custom/etc/monster_arena.txt +++ b/npc/custom/etc/monster_arena.txt @@ -288,8 +288,8 @@ gon_test,52,103,6 script Monster Trainer 4_M_BARBER,{ next; menu "Yes",-,"No",L_Exit; - if (zeny < 1000) goto L_NoZeny; - set zeny,zeny-1000; + if (Zeny < 1000) goto L_NoZeny; + set Zeny,Zeny-1000; set #monster,10; mes "[Monster Trainer]"; mes "Congratulations!"; @@ -327,7 +327,7 @@ L_Sell: if (@sellexp > #monpoints) goto L_NoExp; set #monpoints,#monpoints-@sellexp; set @sellearn,100*@sellexp; // Price of exp - set zeny,zeny+@sellearn; + set Zeny,Zeny+@sellearn; mes "[Monster Trainer]"; mes "You earned ^0000FF" + @sellearn + "^000000z."; close; diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt index 61dd80676..d86c9dc94 100644 --- a/npc/custom/etc/penal_servitude.txt +++ b/npc/custom/etc/penal_servitude.txt @@ -17,7 +17,7 @@ sec_pri,36,58,1 script Chief Warder 8W_SOLDIER,{ mes "[Saddeus]"; emotion 1; - if(sex) { + if(Sex) { mes "Mr. Prisoner #"+BaseLevel+JobLevel+","; } else { mes "Ms. Prisoner #"+BaseLevel+JobLevel+","; diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt index 4a4f7338d..29b8384fe 100644 --- a/npc/custom/etc/shifty_assassin.txt +++ b/npc/custom/etc/shifty_assassin.txt @@ -48,14 +48,14 @@ M_Buy: if ($ninja_avail < 1) goto NoNinjas; if ($ninja_avail < @buy) goto NotEnoughNinjas; set @price,@buy*$ninja_price; - if (zeny < @price ) goto NoZeny; + if (Zeny < @price ) goto NoZeny; mes "[Shifty Assassin]"; mes "That will cost you ^0000FF" + @price + " zeny^000000."; next; menu "Continue",-,"Cancel",M_Exit; - set zeny,zeny-@price; + set Zeny,Zeny-@price; set #ninjas,#ninjas+@buy; set $ninja_avail,$ninja_avail-@buy; diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt index b805d7895..7cd284ef9 100644 --- a/npc/custom/etc/stock_market.txt +++ b/npc/custom/etc/stock_market.txt @@ -277,15 +277,15 @@ S_Sell: set @sellamount,0; input @sellamount; if (@sellamount < 1) goto S_SellInv; - if (zeny < $S_Trans) goto S_NoZeny; - set zeny,zeny-$S_Trans; + if (Zeny < $S_Trans) goto S_NoZeny; + set Zeny,Zeny-$S_Trans; SELLS1: if (@sellname$ != $S1N$) goto SELLS2; if (@sellamount > #S1) goto S_SellTooHigh; set @price,@sellamount*$S1; set #S1,#S1-@sellamount; - set zeny,zeny+@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S1N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -297,7 +297,7 @@ SELLS2: if (@sellamount > #S2) goto S_SellTooHigh; set @price,@sellamount*$S2; set #S2,#S2-@sellamount; - set zeny,zeny+@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S2N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -309,7 +309,7 @@ SELLS3: if (@sellamount > #S3) goto S_SellTooHigh; set @price,@sellamount*$S3; set #S3,#S3-@sellamount; - set zeny,zeny+@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S3N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -321,7 +321,7 @@ SELLS4: if (@sellamount > #S4) goto S_SellTooHigh; set @price,@sellamount*$S4; set #S4,#S4-@sellamount; - set zeny,zeny+@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S4N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -333,7 +333,7 @@ SELLS5: if (@sellamount > #S5) goto S_SellTooHigh; set @price,@sellamount*$S5; set #S5,#S5-@sellamount; - set zeny,zeny+@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S5N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -345,7 +345,7 @@ SELLS6: if (@sellamount > #S6) goto S_SellTooHigh; set @price,@sellamount*$S6; set #S6,#S6-@sellamount; - set zeny,zeny+@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S6N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -357,7 +357,7 @@ SELLS7: if (@sellamount > #S7) goto S_SellTooHigh; set @price,@sellamount*$S7; set #S7,#S7-@sellamount; - set zeny,zeny+@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S7N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -369,7 +369,7 @@ SELLS8: if (@sellamount > #S8) goto S_SellTooHigh; set @price,@sellamount*$S8; set #S8,#S8-@sellamount; - set zeny,zeny+@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S8N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -381,7 +381,7 @@ SELLS9: if (@sellamount > #S9) goto S_SellTooHigh; set @price,@sellamount*$S9; set #S9,#S9-@sellamount; - set zeny,zeny+@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S9N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -393,7 +393,7 @@ SELLS10: if (@sellamount > #S10) goto S_SellTooHigh; set @price,@sellamount*$S10; set #S10,#S10-@sellamount; - set zeny,zeny+@price; + set Zeny,Zeny+@price; next; mes "Sold " + @sellamount + " " + $S10N$ + " shares."; mes "Earned ^0000FF"+@price+"z^000000."; @@ -442,18 +442,18 @@ S_Buy: // Checks valid number // if (@buyamount < $S_BuyMin) goto S_TooLow; if (@buyamount > $S_BuyMax) goto S_TooHigh; - if (zeny < $S_Trans) goto S_NoZeny; - set zeny,zeny-$S_Trans; + if (Zeny < $S_Trans) goto S_NoZeny; + set Zeny,Zeny-$S_Trans; // Purchases the shares // PURS1: if (@buyname$ != $S1N$) goto PURS2; set @price,@buyamount*$S1; - if (zeny < @price) goto S_NoZeny; + if (Zeny < @price) goto S_NoZeny; set #S1,#S1+@buyamount; set @price,@buyamount*$S1; - set zeny,zeny-@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S1N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -462,9 +462,9 @@ PURS1: PURS2: if (@buyname$ != $S2N$) goto PURS3; set @price,@buyamount*$S2; - if (zeny < @price) goto S_NoZeny; + if (Zeny < @price) goto S_NoZeny; set #S2,#S2+@buyamount; - set zeny,zeny-@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S2N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -473,9 +473,9 @@ PURS2: PURS3: if (@buyname$ != $S3N$) goto PURS4; set @price,@buyamount*$S3; - if (zeny < @price) goto S_NoZeny; + if (Zeny < @price) goto S_NoZeny; set #S3,#S3+@buyamount; - set zeny,zeny-@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S3N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -484,9 +484,9 @@ PURS3: PURS4: if (@buyname$ != $S4N$) goto PURS5; set @price,@buyamount*$S4; - if (zeny < @price) goto S_NoZeny; + if (Zeny < @price) goto S_NoZeny; set #S4,#S4+@buyamount; - set zeny,zeny-@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S4N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -495,9 +495,9 @@ PURS4: PURS5: if (@buyname$ != $S5N$) goto PURS6; set @price,@buyamount*$S5; - if (zeny < @price) goto S_NoZeny; + if (Zeny < @price) goto S_NoZeny; set #S5,#S5+@buyamount; - set zeny,zeny-@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S5N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -506,9 +506,9 @@ PURS5: PURS6: if (@buyname$ != $S6N$) goto PURS7; set @price,@buyamount*$S6; - if (zeny < @price) goto S_NoZeny; + if (Zeny < @price) goto S_NoZeny; set #S6,#S6+@buyamount; - set zeny,zeny-@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S6N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -517,9 +517,9 @@ PURS6: PURS7: if (@buyname$ != $S7N$) goto PURS8; set @price,@buyamount*$S7; - if (zeny < @price) goto S_NoZeny; + if (Zeny < @price) goto S_NoZeny; set #S7,#S7+@buyamount; - set zeny,zeny-@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S7N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -528,9 +528,9 @@ PURS7: PURS8: if (@buyname$ != $S8N$) goto PURS9; set @price,@buyamount*$S8; - if (zeny < @price) goto S_NoZeny; + if (Zeny < @price) goto S_NoZeny; set #S8,#S8+@buyamount; - set zeny,zeny-@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S8N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -539,9 +539,9 @@ PURS8: PURS9: if (@buyname$ != $S9N$) goto PURS10; set @price,@buyamount*$S9; - if (zeny < @price) goto S_NoZeny; + if (Zeny < @price) goto S_NoZeny; set #S9,#S9+@buyamount; - set zeny,zeny-@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S9N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; @@ -550,9 +550,9 @@ PURS9: PURS10: if (@buyname$ != $S10N$) goto PURS11; set @price,@buyamount*$S10; - if (zeny < @price) goto S_NoZeny; + if (Zeny < @price) goto S_NoZeny; set #S10,#S10+@buyamount; - set zeny,zeny-@price; + set Zeny,Zeny-@price; mes "Bought " + @buyamount + " " + $S10N$ + " shares."; mes "Lost ^0000FF"+@price+"z^000000."; next; diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt index c60c6f3a6..c0c7ddb66 100644 --- a/npc/custom/events/valentinesdayexp.txt +++ b/npc/custom/events/valentinesdayexp.txt @@ -18,7 +18,7 @@ prontera,156,172,4 script Tine 1_M_MERCHANT,{ // Debug info for item effects and tricky conditions 8) // mes "@dsv: "+@dsv; // mes "ispartneron()=="+ispartneron(); -// mes "sex == "+sex; +// mes "sex == "+Sex; // if(@dsv == gettime(3)+1) mes "@dsv == gettime(3)+1"; mes "[Tine]"; @@ -60,9 +60,9 @@ M_INFO: OnInit: //559,Hand-made_Chocolate - setitemscript 559,"{ itemheal 50,50; if(sex==0 || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }"; + setitemscript 559,"{ itemheal 50,50; if(Sex==0 || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }"; //560,Hand-made_White_Chocolate - setitemscript 560,"{ itemheal 50,50; if(sex || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }"; + setitemscript 560,"{ itemheal 50,50; if(Sex || @dsv == gettime(3)+1 || ispartneron()==0)end; set @dsv,gettime(3)+1; misceffect 113; }"; //2634,Wedding_Ring_M,Wedding Ring,5,,10,0,,0,,0,127918079,7,1,136,,0,0,0,{ skill 334,1; skill 335,1; skill 336,1; } setitemscript 2634,"{ skill 334,1; skill 335,1; skill 336,1; if(@dsv == gettime(3)+1 && ispartneron()){ bonus2 bExpAddRace,5,50; bonus2 bExpAddRace,6,50; bonus2 bExpAddRace,7,50; bonus2 bExpAddRace,8,50; bonus2 bExpAddRace,1,50; } }"; diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt index fad2f92f9..dfc93fb85 100644 --- a/npc/custom/item_signer.txt +++ b/npc/custom/item_signer.txt @@ -13,7 +13,7 @@ prt_in,24,61,7 script Perchik 1_M_01,{ - setarray .@Item[0],644,3; // Item requirements: <ID>,<Count>{,...} (0 to disable) + setarray .@item[0],644,3; // Item requirements: <ID>,<Count>{,...} (0 to disable) setarray .@Cost[0],0,5000; // Zeny requirements: <base price>,<price per refine> disable_items; @@ -26,10 +26,10 @@ prt_in,24,61,7 script Perchik 1_M_01,{ emotion e_ic; next; mes "[Perchik]"; - if (getarraysize(.@Item) || getarraysize(.@Cost)) { + if (getarraysize(.@item) || getarraysize(.@Cost)) { mes "For my work I accept:"; - if (getarraysize(.@Item)) for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2) - mes " ~ "+.@Item[.@i+1]+"x "+getitemname(.@Item[.@i]); + if (getarraysize(.@item)) for(set .@i,0; .@i<getarraysize(.@item); set .@i,.@i+2) + mes " ~ "+.@item[.@i+1]+"x "+getitemname(.@item[.@i]); if (.@Cost[0]) mes " ~ "+.@Cost[0]+" Zeny"; if (.@Cost[1]) mes " ~ "+.@Cost[1]+" Zeny per refine"; } @@ -92,11 +92,11 @@ prt_in,24,61,7 script Perchik 1_M_01,{ close; } set .@price, .@Cost[0]+(.@Cost[1]*.@ref); - if (getarraysize(.@Item) || .@price) { + if (getarraysize(.@item) || .@price) { mes "I will need:"; - if (getarraysize(.@Item)) for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2) { - mes " ~ "+.@Item[.@i+1]+"x "+getitemname(.@Item[.@i]); - if (countitem(.@Item[.@i]) < .@Item[.@i+1]) set .@nr,1; + if (getarraysize(.@item)) for(set .@i,0; .@i<getarraysize(.@item); set .@i,.@i+2) { + mes " ~ "+.@item[.@i+1]+"x "+getitemname(.@item[.@i]); + if (countitem(.@item[.@i]) < .@item[.@i+1]) set .@nr,1; } if (.@price) mes " ~ "+.@price+" Zeny"; } @@ -122,8 +122,8 @@ prt_in,24,61,7 script Perchik 1_M_01,{ close; } if (.@price) set Zeny, Zeny-.@price; - if (getarraysize(.@Item)) for(set .@i,0; .@i<getarraysize(.@Item); set .@i,.@i+2) - delitem .@Item[.@i], .@Item[.@i+1]; + if (getarraysize(.@item)) for(set .@i,0; .@i<getarraysize(.@item); set .@i,.@i+2) + delitem .@item[.@i], .@item[.@i+1]; delitem2 .@id,1,1,.@ref,0,.@slot[0],.@slot[1],.@slot[2],.@slot[3]; mes "Done!"; emotion e_proud; diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt index a95de3577..f30455123 100644 --- a/npc/custom/itembind.txt +++ b/npc/custom/itembind.txt @@ -19,7 +19,7 @@ prontera,144,174,4 script Bound Items 429,{ next; mes "What would you like to do?"; if(select("Bind:Unbind") == 1) { - if(zeny < .bindprice) { + if(Zeny < .bindprice) { mes "You don't have enough zeny to bind an item."; close; } @@ -55,7 +55,7 @@ prontera,144,174,4 script Bound Items 429,{ next; mes "Are you sure you'd like to bind your "+ getitemname(@inventorylist_id[.@item]) +" to your "+.boundtypes$[.@boundtype]+"?"; if(select("Yes:No") == 1) { - zeny -= .bindprice; + Zeny -= .bindprice; delitem2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item]; getitembound2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item],.@boundtype; mes "All done!"; @@ -70,7 +70,7 @@ prontera,144,174,4 script Bound Items 429,{ countbound(2); if(.unbindprice) { mes "Unbinding an item has a fee of ^0000FF"+.unbindprice+"^000000 zeny."; - if(zeny < .unbindprice) { + if(Zeny < .unbindprice) { mes "You don't have enough to unbind an item."; close; } @@ -102,7 +102,7 @@ prontera,144,174,4 script Bound Items 429,{ next; mes "Are you sure you'd like to unbind your "+ getitemname(@inventorylist_id[.@item]) +"?"; if(select("Yes:No") == 1) { - zeny -= .unbindprice; + Zeny -= .unbindprice; delitem2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item]; getitem2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item]; mes "All done!"; @@ -130,4 +130,4 @@ OnInit: .boundtypes$[2] = "guild"; .boundtypes$[4] = "character"; end; -}
\ No newline at end of file +} diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt index 8827329d9..8a57d4f3e 100644 --- a/npc/custom/quests/berzebub.txt +++ b/npc/custom/quests/berzebub.txt @@ -13,7 +13,7 @@ prontera,165,178,8 script Old Woman 8_F_GRANDMOTHER,{ - setarray .@Items[0],714,25,1061,100,1095,200,618,10,1551,2,1614,1,727,20; + setarray .@items[0],714,25,1061,100,1095,200,618,10,1551,2,1614,1,727,20; set .@n$,"[Old Woman]"; mes .@n$; @@ -37,9 +37,9 @@ prontera,165,178,8 script Old Woman 8_F_GRANDMOTHER,{ next; mes .@n$; mes "I need all of the following items:"; - for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+2) { - mes " ~ "+.@Items[.@i+1]+"x "+getitemname(.@Items[.@i]); - if (countitem(.@Items[.@i]) < .@Items[.@i+1]) set .@nr,1; } + for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+2) { + mes " ~ "+.@items[.@i+1]+"x "+getitemname(.@items[.@i]); + if (countitem(.@items[.@i]) < .@items[.@i+1]) set .@nr,1; } next; if(select("I have all of that!:I'll get those ASAP")==2) goto M_Leave; @@ -47,8 +47,8 @@ prontera,165,178,8 script Old Woman 8_F_GRANDMOTHER,{ if (.@nr) { mes "You lie! Get out of here and get those items, you sorry excuse for a rock star."; close; } - for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+2) - delitem .@Items[.@i], .@Items[.@i+1]; + for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+2) + delitem .@items[.@i], .@items[.@i+1]; getitem 4145,1; set BerzQuest, 1; mes "Congratulations! You have all the items. Here is your ^FF0000Berzebub Card^000000, as promised."; diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt index ea1916e50..882728925 100644 --- a/npc/custom/quests/kahohorn.txt +++ b/npc/custom/quests/kahohorn.txt @@ -12,7 +12,7 @@ geffen,115,107,5 script Lord Kaho's Servant 1_M_PUBMASTER,{ - setarray .@Items[0],7005, 968, 923, 734, 724,2268,7036,7020,5053,7018,741,742,743,750,751,752,753,754; + setarray .@items[0],7005, 968, 923, 734, 724,2268,7036,7020,5053,7018,741,742,743,750,751,752,753,754; setarray .@Drops[0],1272,1087,1039,1260,1046,1115,1252,1147,1038,1059; set .@n$, "[Lord Kaho's Servant]"; @@ -30,13 +30,13 @@ geffen,115,107,5 script Lord Kaho's Servant 1_M_PUBMASTER,{ next; mes .@n$; for(set .@i,0; .@i<10; set .@i,.@i+1) - mes "1x ^0055FF"+getitemname(.@Items[.@i])+"^000000 (from "+strmobinfo(1,.@Drops[.@i])+")"; + mes "1x ^0055FF"+getitemname(.@items[.@i])+"^000000 (from "+strmobinfo(1,.@Drops[.@i])+")"; next; mes .@n$; mes "We're not done yet, sweetie..."; mes "I'm a big fan of dolls, so you need to bring me these cuties!"; for(set .@i,10; .@i<18; set .@i,.@i+1) - mes "1x ^0055FF"+getitemname(.@Items[.@i])+"^000000"; + mes "1x ^0055FF"+getitemname(.@items[.@i])+"^000000"; next; mes .@n$; mes "Finally, I've worked hard to make these horns for my master with all the items mentioned above..."; @@ -52,12 +52,12 @@ geffen,115,107,5 script Lord Kaho's Servant 1_M_PUBMASTER,{ close; } mes .@n$; for(set .@i,0; .@i<18; set .@i,.@i+1) - if (!countitem(.@Items[.@i])) { set .@nr,1; break; } + if (!countitem(.@items[.@i])) { set .@nr,1; break; } if (.@nr || countitem(714) < 3 || Zeny < 5000000) { mes "I can't afford to make this if you don't bring all materials needed. Please understand this is to benefit heroes such as yourself!"; close; } for(set .@i,0; .@i<18; set .@i,.@i+1) - delitem .@Items[.@i],1; + delitem .@items[.@i],1; delitem 714,3; set Zeny, Zeny-5000000; mes "Wow! You are brave indeed!"; diff --git a/npc/custom/quests/kings_items.txt b/npc/custom/quests/kings_items.txt index b8c7a5538..345f8b051 100644 --- a/npc/custom/quests/kings_items.txt +++ b/npc/custom/quests/kings_items.txt @@ -24,15 +24,15 @@ prt_castle,80,170,4 script King of Prontera 1_M_PRON_KING,{ mes "If you get her these items I'm sure she'll calm down."; mes "I'll give you my crown or my sword as a reward."; next; - setarray .@Items1[0],5007,742,30,741,50,753,20,732,1,710,20,629,20; - setarray .@Items2[0],1137,2254,1,2282,1,714,1; + setarray .@items1[0],5007,742,30,741,50,753,20,732,1,710,20,629,20; + setarray .@items2[0],1137,2254,1,2282,1,714,1; switch(select("What do you need?:I have the items!:Forget it.")) { case 1: for(set .@i,1; .@i<3; set .@i,.@i+1) { mes "[King of Prontera]"; mes "If you could get me:"; - for(set .@j,1; .@j<getarraysize(getd(".@Items"+.@i)); set .@j,.@j+2) - mes " ~ ^0055FF"+getd(".@Items"+.@i+"["+(.@j+1)+"]")+"^000000x "+getitemname(getd(".@Items"+.@i+"["+.@j+"]")); + for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2) + mes " ~ ^0055FF"+getd(".@items"+.@i+"["+(.@j+1)+"]")+"^000000x "+getitemname(getd(".@items"+.@i+"["+.@j+"]")); mes "I'll give my "+((.@i)?"sword.":"crown."); if (.@i==2) close; next; } @@ -41,16 +41,16 @@ prt_castle,80,170,4 script King of Prontera 1_M_PRON_KING,{ mes "What item do you want?"; next; set .@i, select("Crown:Sword"); - for(set .@j,1; .@j<getarraysize(getd(".@Items"+.@i)); set .@j,.@j+2) - if (countitem(getd(".@Items"+.@i+"["+.@j+"]")) < getd(".@Items"+.@i+"["+(.@j+1)+"]")) set .@nr,1; + for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2) + if (countitem(getd(".@items"+.@i+"["+.@j+"]")) < getd(".@items"+.@i+"["+(.@j+1)+"]")) set .@nr,1; mes "[King of Prontera]"; if (.@nr) { mes "You're missing something."; mes "Come back after you get ALL the items."; close; } - for(set .@j,1; .@j<getarraysize(getd(".@Items"+.@i)); set .@j,.@j+2) - delitem getd(".@Items"+.@i+"["+.@j+"]"), getd(".@Items"+.@i+"["+(.@j+1)+"]"); - getitem getd(".@Items"+.@i+"[0]"),1; + for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2) + delitem getd(".@items"+.@i+"["+.@j+"]"), getd(".@items"+.@i+"["+(.@j+1)+"]"); + getitem getd(".@items"+.@i+"[0]"),1; mes "THANK YOU SOO MUCH!!"; mes "This will surely calm her down."; mes "As promised, here is my "+((.@i==1)?"crown.":"sword."); diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt index a49c92ed3..3e0723781 100644 --- a/npc/custom/quests/thq/THQS_GuildNPC.txt +++ b/npc/custom/quests/thq/THQS_GuildNPC.txt @@ -25,7 +25,7 @@ yuno_in01,124,164,6 script Guild Leader 1_M_PRON_KING,{ mes "Umm... Well that is all you need to do. Hahaha."; next; menu "Pay ^FF000025,000z^000000.",-,"Thats way to high!!",N_HighPrice; - if (zeny < 25000) goto N_NoZeny; + if (Zeny < 25000) goto N_NoZeny; set Zeny,Zeny-25000; //getitem 7950, 1; //getitem 7951, 1; diff --git a/npc/custom/quests/thq/THQS_TTShop.txt b/npc/custom/quests/thq/THQS_TTShop.txt index c764de852..25e080a8e 100644 --- a/npc/custom/quests/thq/THQS_TTShop.txt +++ b/npc/custom/quests/thq/THQS_TTShop.txt @@ -51,7 +51,7 @@ N_Shop: close; N_GetZeny1k: set #Treasure_Token,#Treasure_Token-1; - set zeny,zeny+1000; + set Zeny,Zeny+1000; close; N_10T: if (#Treasure_Token > 9) goto N_GetZeny10k; @@ -59,7 +59,7 @@ N_10T: close; N_GetZeny10k: set #Treasure_Token,#Treasure_Token-10; - set zeny,zeny+10000; + set Zeny,Zeny+10000; close; N_100T: if (#Treasure_Token > 99) goto N_GetZeny100k; @@ -67,7 +67,7 @@ N_100T: close; N_GetZeny100k: set #Treasure_Token,#Treasure_Token-100; - set zeny,zeny+100000; + set Zeny,Zeny+100000; close; N_BuyWeps: diff --git a/npc/custom/quests/valhallen.txt b/npc/custom/quests/valhallen.txt index bb84e73e5..c70de008b 100644 --- a/npc/custom/quests/valhallen.txt +++ b/npc/custom/quests/valhallen.txt @@ -21,46 +21,46 @@ prontera,147,171,5 script Lenneth 4_F_VALKYRIE,{ case 1: mes "[Lenneth]"; mes "^3355FFMjolnir^000000 is the mighty Hammer of Thor."; - setarray .@Items[0],1530,1531,2,984,20,985,5,969,40,7074,2,7075,4,7078,5,7087,5,7089,5; + setarray .@items[0],1530,1531,2,984,20,985,5,969,40,7074,2,7075,4,7078,5,7087,5,7089,5; break; case 2: mes "[Lenneth]"; mes "^3355FFSleipnir^000000 are boots made after Odin's War Horse."; - setarray .@Items[0],2410,2406,2,984,1,969,20,985,10,7076,3,7079,5,7083,3,7086,3; + setarray .@items[0],2410,2406,2,984,1,969,20,985,10,7076,3,7079,5,7083,3,7086,3; break; case 3: mes "[Lenneth]"; mes "^3355FFBrisingammen^000000 is the magical Necklace of Freyja, goddess of Beauty."; - setarray .@Items[0],2630,2603,1,726,2,722,3,727,10,723,5,969,20,7073,4,7077,4,7088,3,7090,3,7092,3; + setarray .@items[0],2630,2603,1,726,2,722,3,727,10,723,5,969,20,7073,4,7077,4,7088,3,7090,3,7092,3; break; case 4: mes "[Lenneth]"; mes "The ^3355FFGleipnir^000000 is a light yet strong rope required to make ^3355FFMegingjard^000000"; - setarray .@Items[0],7058,7080,4,7081,5,7082,4,7084,3,7085,3; + setarray .@items[0],7058,7080,4,7081,5,7082,4,7084,3,7085,3; break; case 5: mes "[Lenneth]"; mes "The ^3355FFMegingjard^000000 is the powerful Belt of Thor."; - setarray .@Items[0],2629,7058,1,2627,1,969,10,726,10,984,5; + setarray .@items[0],2629,7058,1,2627,1,969,10,726,10,984,5; break; } mes "^FF0000The items I need are as follows:^000000"; - for(set .@i,1; .@i<getarraysize(.@Items[0]); set .@i,.@i+2) { - mes " ~ "+.@Items[.@i+1]+"x ^3355FF"+getitemname(.@Items[.@i])+"^000000"; - if (countitem(.@Items[.@i]) < .@Items[.@i+1]) set .@nr,1; } + for(set .@i,1; .@i<getarraysize(.@items[0]); set .@i,.@i+2) { + mes " ~ "+.@items[.@i+1]+"x ^3355FF"+getitemname(.@items[.@i])+"^000000"; + if (countitem(.@items[.@i]) < .@items[.@i+1]) set .@nr,1; } if (.@nr) close; next; mes "[Lenneth]"; - mes "Do you desire ^3355FF"+getitemname(.@Items[0])+"^000000?"; + mes "Do you desire ^3355FF"+getitemname(.@items[0])+"^000000?"; next; if(select("Yes:No")==2) { mes "[Lenneth]"; mes "Please return if you change your mind."; close; } mes "[Lenneth]"; - mes "Here is your ^3355FF"+getitemname(.@Items[0])+"^000000."; + mes "Here is your ^3355FF"+getitemname(.@items[0])+"^000000."; mes "May it serve you well."; - for(set .@i,1; .@i<getarraysize(.@Items); set .@i,.@i+2) - delitem .@Items[.@i], .@Items[.@i+1]; - getitem .@Items[0],1; + for(set .@i,1; .@i<getarraysize(.@items); set .@i,.@i+2) + delitem .@items[.@i], .@items[.@i+1]; + getitem .@items[0],1; close; } diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index 9f1a9617a..1578127f9 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -660,7 +660,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "Let the game.. Begin!"; mapannounce "arug_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00"; set $@gdeventv_a2,1; - donpcevent "Controller#gdevent_a::Ongame_start"; + donpcevent "Controller#gdevent_a::OnGame_start"; erasequest 2143; close; } @@ -677,7 +677,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ if (countitem(6031) > 0) { donpcevent "Controller#gdevent_a::OnStop"; set $@gdeventv_a2,3; - donpcevent "eff_mvp#aru_gd::Onmvp"; + donpcevent "eff_mvp#aru_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; mes "Success~!!"; @@ -762,7 +762,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "Let the game.. Begin!"; mapannounce "arug_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00"; set $@gdeventv_a2,10; - donpcevent "Controller#gdevent_a::Ongame_start"; + donpcevent "Controller#gdevent_a::OnGame_start"; close; } } @@ -784,7 +784,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "You've completeled an unbelievable task, I will give you the wonderful gift master has prepared!! Ha!"; mapannounce "arug_que01", "Pierrot Pier: You've completeled an unbelievable task, I will give you the wonderful gift my master has prepared!! Ha!",bc_map,"0x99CC00"; mapannounce "arug_que01", "Pierrot Pier: Here, take Pierre's Treasure Boxes.",bc_map,"0x99CC00"; - donpcevent "eff_mvp#aru_gd::Onmvp"; + donpcevent "eff_mvp#aru_gd::OnMVP"; set $@gdeventv_a2,5; getitem 14596,10; //Pierre_Treasurebox close; @@ -819,7 +819,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ if (countitem(6031) > 0) { donpcevent "Controller#gdevent_a::OnStop"; set $@gdeventv_a2,3; - donpcevent "eff_mvp#aru_gd::Onmvp"; + donpcevent "eff_mvp#aru_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; mes "Success~!!"; @@ -929,7 +929,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ if (countitem(6031) > 0) { donpcevent "Controller#gdevent_a::OnStop"; set $@gdeventv_a2,3; - donpcevent "eff_mvp#aru_gd::Onmvp"; + donpcevent "eff_mvp#aru_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; mes "Success~!!"; @@ -993,7 +993,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ if (countitem(6031) > 0) { donpcevent "Controller#gdevent_a::OnStop"; set $@gdeventv_a2,3; - donpcevent "eff_mvp#aru_gd::Onmvp"; + donpcevent "eff_mvp#aru_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; mes "Success~!!"; @@ -1024,11 +1024,11 @@ OnInit: set $@gdeventv_a2,0; end; -Onwin: +OnWin: donpcevent "treg#aru_gd::OnEnable"; end; -Ongame_start: +OnGame_start: initnpctimer; donpcevent "paper_sp_1_a::OnEnable"; donpcevent "paper_sp_2_a::OnEnable"; @@ -1334,7 +1334,7 @@ OnTouch2: arug_que01,6,6,1 script eff_mvp#aru_gd CLEAR_NPC,{ end; -Onmvp: +OnMVP: initnpctimer; end; diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index 343c21ead..536b37b79 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -659,7 +659,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ mes "Let the game.. Begin!"; mapannounce "schg_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00"; set $@gdeventv_s2,1; - donpcevent "Controller#gdevent_s::Ongame_start"; + donpcevent "Controller#gdevent_s::OnGame_start"; erasequest 2143; close; } @@ -676,7 +676,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ if (countitem(6031) > 0) { donpcevent "Controller#gdevent_s::OnStop"; set $@gdeventv_s2,3; - donpcevent "eff_mvp#sch_gd::Onmvp"; + donpcevent "eff_mvp#sch_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; mes "Success~!!"; @@ -761,7 +761,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ mes "Let the game.. Begin!"; mapannounce "schg_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00"; set $@gdeventv_s2,10; - donpcevent "Controller#gdevent_s::Ongame_start"; + donpcevent "Controller#gdevent_s::OnGame_start"; close; } } @@ -783,7 +783,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ mes "You've completeled an unbelievable task, I will give you the wonderful gift master has prepared!! Ha!"; mapannounce "schg_que01", "Pierrot Pier: You've completeled an unbelievable task, I will give you the wonderful gift my master has prepared!! Ha!",bc_map,"0x99CC00"; mapannounce "schg_que01", "Pierrot Pier: Here, take Pierre's Treasure Boxes.",bc_map,"0x99CC00"; - donpcevent "eff_mvp#sch_gd::Onmvp"; + donpcevent "eff_mvp#sch_gd::OnMVP"; set $@gdeventv_s2,5; getitem 14596,10; //Pierre_Treasurebox close; @@ -818,7 +818,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ if (countitem(6031) > 0) { donpcevent "Controller#gdevent_s::OnStop"; set $@gdeventv_s2,3; - donpcevent "eff_mvp#sch_gd::Onmvp"; + donpcevent "eff_mvp#sch_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; mes "Success~!!"; @@ -928,7 +928,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ if (countitem(6031) > 0) { donpcevent "Controller#gdevent_s::OnStop"; set $@gdeventv_s2,3; - donpcevent "eff_mvp#sch_gd::Onmvp"; + donpcevent "eff_mvp#sch_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; mes "Success~!!"; @@ -992,7 +992,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ if (countitem(6031) > 0) { donpcevent "Controller#gdevent_s::OnStop"; set $@gdeventv_s2,3; - donpcevent "eff_mvp#sch_gd::Onmvp"; + donpcevent "eff_mvp#sch_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; mes "Success~!!"; @@ -1023,11 +1023,11 @@ OnInit: set $@gdeventv_s2,0; end; -Onwin: +OnWin: donpcevent "treg#sch_gd::OnEnable"; end; -Ongame_start: +OnGame_start: initnpctimer; donpcevent "paper_sp_1_s::OnEnable"; donpcevent "paper_sp_2_s::OnEnable"; @@ -1333,7 +1333,7 @@ OnTouch2: schg_que01,6,6,1 script eff_mvp#sch_gd CLEAR_NPC,{ end; -Onmvp: +OnMVP: initnpctimer; end; diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index 01d9734d5..6fc2bb660 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -32,13 +32,13 @@ yuno,1,1,0 script Festival Manager#gq_fes0 4_F_HUGIRL,{ case 1: mes "[Festival Manager]"; mes "Ending festivals and disabling NPCs."; - donpcevent "Rmimi Ravies#gq_fes01::Onover"; - donpcevent "Rmimi Ravies#gq_fes01::Onover"; + donpcevent "Rmimi Ravies#gq_fes01::OnOver"; + donpcevent "Rmimi Ravies#gq_fes01::OnOver"; close; case 2: mes "[Festival Manager]"; mes "Resetting festivals and enabling NPCs."; - donpcevent "Rmimi Ravies#gq_fes01::Onover"; + donpcevent "Rmimi Ravies#gq_fes01::OnOver"; donpcevent "Rmimi Ravies#gq_fes01::OnEnable"; close; } @@ -169,7 +169,7 @@ OnStart: set $@gqse_festival,1; end; -Oncall: +OnCall: if (mobcount("yuno","Rmimi Ravies#gq_fes01::OnMyMobDead") < 31) { monster "yuno",0,0,"Valkyrie's Blessing",1083,100,"Rmimi Ravies#gq_fes01::OnMyMobDead"; monster "yuno",0,0,"Valkyrie's Gift",1951,25,"Rmimi Ravies#gq_fes01::OnMyMobDead"; @@ -195,7 +195,7 @@ Oncall: } end; -Onover: +OnOver: killmonster "yuno","Rmimi Ravies#gq_fes01::OnMyMobDead"; set $@gqse_festival,0; stopnpctimer; @@ -230,7 +230,7 @@ OnTimer243000: OnTimer300000: announce "The first 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Oncall"; + donpcevent "Rmimi Ravies#gq_fes01::OnCall"; end; OnTimer303000: @@ -256,7 +256,7 @@ OnTimer608000: OnTimer900000: announce "The third 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Oncall"; + donpcevent "Rmimi Ravies#gq_fes01::OnCall"; end; OnTimer903000: @@ -269,7 +269,7 @@ OnTimer908000: OnTimer1200000: announce "The fourth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Oncall"; + donpcevent "Rmimi Ravies#gq_fes01::OnCall"; end; OnTimer1203000: @@ -282,7 +282,7 @@ OnTimer1208000: OnTimer1500000: announce "The fifth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Oncall"; + donpcevent "Rmimi Ravies#gq_fes01::OnCall"; end; OnTimer1503000: @@ -295,7 +295,7 @@ OnTimer1508000: OnTimer1800000: announce "The sixth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Oncall"; + donpcevent "Rmimi Ravies#gq_fes01::OnCall"; end; OnTimer1803000: @@ -308,7 +308,7 @@ OnTimer1808000: OnTimer2100000: announce "The seventh 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Oncall"; + donpcevent "Rmimi Ravies#gq_fes01::OnCall"; end; OnTimer2103000: @@ -321,7 +321,7 @@ OnTimer2108000: OnTimer2400000: announce "The eighth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Oncall"; + donpcevent "Rmimi Ravies#gq_fes01::OnCall"; end; OnTimer2403000: @@ -334,7 +334,7 @@ OnTimer2408000: OnTimer2700000: announce "The ninth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Oncall"; + donpcevent "Rmimi Ravies#gq_fes01::OnCall"; end; OnTimer2703000: @@ -347,7 +347,7 @@ OnTimer2708000: OnTimer3000000: announce "The first0 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Oncall"; + donpcevent "Rmimi Ravies#gq_fes01::OnCall"; end; OnTimer3003000: @@ -360,7 +360,7 @@ OnTimer3008000: OnTimer3300000: announce "The eleventh 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Oncall"; + donpcevent "Rmimi Ravies#gq_fes01::OnCall"; end; OnTimer3303000: @@ -373,7 +373,7 @@ OnTimer3308000: OnTimer3600000: announce "The twelfth 'Valkyrie's Present' has been summoned here in Juno by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Oncall"; + donpcevent "Rmimi Ravies#gq_fes01::OnCall"; end; OnTimer3603000: @@ -386,7 +386,7 @@ OnTimer3608000: OnTimer3900000: announce "The entire ceremony is over now, I am sure all of you had fun.",bc_all,"0x70dbdb"; - donpcevent "Rmimi Ravies#gq_fes01::Onover"; + donpcevent "Rmimi Ravies#gq_fes01::OnOver"; end; } @@ -410,13 +410,13 @@ rachel,1,1,0 script Festival Manager#gq_fes2 4_F_HUGIRL,{ case 1: mes "[Festival Manager]"; mes "Ending festivals and disabling NPCs."; - donpcevent "Rhehe Ravies#gq_fes03::Onover"; - donpcevent "Rhehe Ravies#gq_fes03::Ondisable"; + donpcevent "Rhehe Ravies#gq_fes03::OnOver"; + donpcevent "Rhehe Ravies#gq_fes03::OnDisable"; close; case 2: mes "[Festival Manager]"; mes "Resetting festivals and enabling NPCs."; - donpcevent "Rhehe Ravies#gq_fes03::Onover"; + donpcevent "Rhehe Ravies#gq_fes03::OnOver"; donpcevent "Rhehe Ravies#gq_fes03::OnEnable"; close; } @@ -551,7 +551,7 @@ OnStart: set $@gqse_festival,1; end; -Oncall: +OnCall: if (mobcount("rachel","Rhehe Ravies#gq_fes03::OnMyMobDead") < 31) { monster "rachel",0,0,"Valkyrie's Blessing",1083,100,"Rhehe Ravies#gq_fes03::OnMyMobDead"; monster "rachel",0,0,"Valkyrie's Gift",1951,25,"Rhehe Ravies#gq_fes03::OnMyMobDead"; @@ -577,7 +577,7 @@ Oncall: } end; -Onover: +OnOver: killmonster "rachel","Rhehe Ravies#gq_fes03::OnMyMobDead"; set $@gqse_festival,0; stopnpctimer; @@ -612,7 +612,7 @@ OnTimer243000: OnTimer300000: announce "The first 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer303000: @@ -625,7 +625,7 @@ OnTimer308000: OnTimer600000: announce "The second 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer603000: @@ -638,7 +638,7 @@ OnTimer608000: OnTimer900000: announce "The third 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer903000: @@ -651,7 +651,7 @@ OnTimer908000: OnTimer1200000: announce "The fourth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer1203000: @@ -664,7 +664,7 @@ OnTimer1208000: OnTimer1500000: announce "The fifth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer1503000: @@ -677,7 +677,7 @@ OnTimer1508000: OnTimer1800000: announce "The sixth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer1803000: @@ -690,7 +690,7 @@ OnTimer1808000: OnTimer2100000: announce "The seventh 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer2103000: @@ -703,7 +703,7 @@ OnTimer2108000: OnTimer2400000: announce "The eighth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer2403000: @@ -716,7 +716,7 @@ OnTimer2408000: OnTimer2700000: announce "The ninth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer2703000: @@ -729,7 +729,7 @@ OnTimer2708000: OnTimer3000000: announce "The tenth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer3003000: @@ -742,7 +742,7 @@ OnTimer3008000: OnTimer3300000: announce "The eleventh 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer3303000: @@ -755,7 +755,7 @@ OnTimer3308000: OnTimer3600000: announce "The twelfth 'Valkyrie's Present' has been summoned here in Rachel by the Wish maiden.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Oncall"; + donpcevent "Rhehe Ravies#gq_fes03::OnCall"; end; OnTimer3603000: @@ -768,6 +768,6 @@ OnTimer3608000: OnTimer3900000: announce "The entire ceremony is over now, I am sure all of you had fun.",bc_all,"0x70dbdb"; - donpcevent "Rhehe Ravies#gq_fes03::Onover"; + donpcevent "Rhehe Ravies#gq_fes03::OnOver"; end; } diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt index f35903828..097abb53c 100644 --- a/npc/events/nguild/nguild_ev_agit.txt +++ b/npc/events/nguild/nguild_ev_agit.txt @@ -54,9 +54,9 @@ function script F_AgitBreak { if (.@Economy < 0) set .@Economy, 0; setcastledata .@map$, 2, .@Economy; - set .@Defence,getcastledata(.@map$,3) - 5; - if (.@Defence < 0) set .@Defence, 0; - setcastledata .@map$, 3, .@Defence; + set .@defence,getcastledata(.@map$,3) - 5; + if (.@defence < 0) set .@defence, 0; + setcastledata .@map$, 3, .@defence; setcastledata .@map$,1, .@GID; mapannounce .@map$,"The emperium has been destroyed.",bc_map,0x00CCFF; diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt index 9438174ac..f47beaf33 100644 --- a/npc/guild/agit_main.txt +++ b/npc/guild/agit_main.txt @@ -111,9 +111,9 @@ OnAgitBreak: if (.@Economy < 0) set .@Economy, 0; setcastledata strnpcinfo(2), 2, .@Economy; // Adjust Defense Invest Level for Castle - set .@Defence,getcastledata(strnpcinfo(2),3) - 5; - if (.@Defence < 0) set .@Defence, 0; - setcastledata strnpcinfo(2), 3, .@Defence; + set .@defence,getcastledata(strnpcinfo(2),3) - 5; + if (.@defence < 0) set .@defence, 0; + setcastledata strnpcinfo(2), 3, .@defence; // Set new Castle Occupant setcastledata strnpcinfo(2),1, .@GID; @@ -700,27 +700,27 @@ OnRecvCastle: close; } case 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; } - else if ((.@Defence >= 16) && (.@Defence <= 20)) { set .@def_invest,70000; } - else if ((.@Defence >= 21) && (.@Defence <= 25)) { set .@def_invest,110000; } - else if ((.@Defence >= 26) && (.@Defence <= 30)) { set .@def_invest,160000; } - else if ((.@Defence >= 31) && (.@Defence <= 35)) { set .@def_invest,220000; } - else if ((.@Defence >= 36) && (.@Defence <= 40)) { set .@def_invest,290000; } - else if ((.@Defence >= 41) && (.@Defence <= 45)) { set .@def_invest,370000; } - else if ((.@Defence >= 46) && (.@Defence <= 50)) { set .@def_invest,460000; } - else if ((.@Defence >= 51) && (.@Defence <= 55)) { set .@def_invest,560000; } - else if ((.@Defence >= 56) && (.@Defence <= 60)) { set .@def_invest,670000; } - else if ((.@Defence >= 61) && (.@Defence <= 65)) { set .@def_invest,790000; } - else if ((.@Defence >= 66) && (.@Defence <= 70)) { set .@def_invest,920000; } - else if ((.@Defence >= 71) && (.@Defence <= 75)) { set .@def_invest,1060000; } - else if ((.@Defence >= 76) && (.@Defence <= 80)) { set .@def_invest,1210000; } - else if ((.@Defence >= 81) && (.@Defence <= 85)) { set .@def_invest,1370000; } - else if ((.@Defence >= 86) && (.@Defence <= 90)) { set .@def_invest,1540000; } - else if ((.@Defence >= 91) && (.@Defence <= 95)) { set .@def_invest,1720000; } - else if ((.@Defence >= 96) && (.@Defence <= 100)) { set .@def_invest,1910000; } + 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; } + else if ((.@defence >= 16) && (.@defence <= 20)) { set .@def_invest,70000; } + else if ((.@defence >= 21) && (.@defence <= 25)) { set .@def_invest,110000; } + else if ((.@defence >= 26) && (.@defence <= 30)) { set .@def_invest,160000; } + else if ((.@defence >= 31) && (.@defence <= 35)) { set .@def_invest,220000; } + else if ((.@defence >= 36) && (.@defence <= 40)) { set .@def_invest,290000; } + else if ((.@defence >= 41) && (.@defence <= 45)) { set .@def_invest,370000; } + else if ((.@defence >= 46) && (.@defence <= 50)) { set .@def_invest,460000; } + else if ((.@defence >= 51) && (.@defence <= 55)) { set .@def_invest,560000; } + else if ((.@defence >= 56) && (.@defence <= 60)) { set .@def_invest,670000; } + else if ((.@defence >= 61) && (.@defence <= 65)) { set .@def_invest,790000; } + else if ((.@defence >= 66) && (.@defence <= 70)) { set .@def_invest,920000; } + else if ((.@defence >= 71) && (.@defence <= 75)) { set .@def_invest,1060000; } + else if ((.@defence >= 76) && (.@defence <= 80)) { set .@def_invest,1210000; } + else if ((.@defence >= 81) && (.@defence <= 85)) { set .@def_invest,1370000; } + else if ((.@defence >= 86) && (.@defence <= 90)) { set .@def_invest,1540000; } + 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)) { set .@def_invest,.@def_invest*4; @@ -729,7 +729,7 @@ OnRecvCastle: mes "If you raise Castle Defenses, the durability of Guardians and the Emperium will increase. Therefore, if you consider our coming battles, some investment in this area will be required."; mes " "; mes "Originally you can invest just once but if you pay more money, you can invest twice."; - if (.@Defence >= 100) { + if (.@defence >= 100) { mes " "; 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; @@ -1253,8 +1253,8 @@ OnClock0001: 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); + 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. diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index 580fb2944..685900792 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -143,8 +143,8 @@ OnClock0001: setcastledata strnpcinfo(2),4,0; } if (getcastledata(strnpcinfo(2),5)) { - set .@Defence,getcastledata(strnpcinfo(2),3); - setcastledata strnpcinfo(2),3,.@Defence+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; setcastledata strnpcinfo(2),5,0; } @@ -344,11 +344,11 @@ OnTreasureDied: close; } case 3: - set .@Defence,getcastledata(strnpcinfo(4),3); + set .@defence,getcastledata(strnpcinfo(4),3); setarray .@cost[0],10000,20000,40000,70000,110000,160000,220000,290000,370000,460000,560000,670000,790000,920000,1060000,1210000,1370000,1540000,1720000,1910000; set .@j,0; for(set .@i,6; .@i<101; set .@i,.@i+5) { - if (.@Defence < .@i) { + if (.@defence < .@i) { set .@def_invest,.@cost[.@j]; break; } @@ -607,9 +607,9 @@ OnStartArena: if (.@Economy < 0) set .@Economy, 0; setcastledata strnpcinfo(4),2,.@Economy; // Lower Castle Defence - set .@Defence,getcastledata(strnpcinfo(4),3)-5; - if (.@Defence < 0) set .@Defence, 0; - setcastledata strnpcinfo(4),3,.@Defence; + set .@defence,getcastledata(strnpcinfo(4),3)-5; + if (.@defence < 0) set .@defence, 0; + setcastledata strnpcinfo(4),3,.@defence; // Set new owner setcastledata strnpcinfo(4),1,.@GID; // Clear castle's data. diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt index 5ff71a806..e6d734684 100644 --- a/npc/guild2/arug_cas04.txt +++ b/npc/guild2/arug_cas04.txt @@ -53,7 +53,7 @@ arug_cas04,148,103,4 script Gefn#LF_ar04_10::LF_ar04_02 GUILD_FLAG,{ callfunc "LinkFlag","Emperium Center",121,318; end; OnAgitInit2: -OnRecvCastlear04: +OnRecvCastleAr04: flagemblem getcastledata("arug_cas04",1); end; } @@ -65,7 +65,7 @@ aru_gld,306,359,6 script Gefn#flag_ar04_1::ar04_Flag GUILD_FLAG,{ callfunc "ReturnFlag","arug_cas04",1; end; OnAgitInit2: -OnRecvCastlear04: +OnRecvCastleAr04: flagemblem getcastledata("arug_cas04",1); end; } @@ -74,7 +74,7 @@ aru_gld,301,318,4 script Gefn#flag_ar04_3::ar04_Flag2 GUILD_FLAG,{ callfunc "ReturnFlag","arug_cas04",0; end; OnAgitInit2: -OnRecvCastlear04: +OnRecvCastleAr04: flagemblem getcastledata("arug_cas04",1); end; } diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt index e32f4e4db..e4848b346 100644 --- a/npc/guild2/arug_cas05.txt +++ b/npc/guild2/arug_cas05.txt @@ -53,7 +53,7 @@ arug_cas05,148,103,4 script Banadis#LF_ar05_10::LF_ar05_02 GUILD_FLAG,{ callfunc "LinkFlag","Emperium Center",121,318; end; OnAgitInit2: -OnRecvCastlear05: +OnRecvCastleAr05: flagemblem getcastledata("arug_cas05",1); end; } @@ -65,7 +65,7 @@ aru_gld,289,103,6 script Banadis#flag_ar05_1::ar05_Flag GUILD_FLAG,{ callfunc "ReturnFlag","arug_cas05",1; end; OnAgitInit2: -OnRecvCastlear05: +OnRecvCastleAr05: flagemblem getcastledata("arug_cas05",1); end; } @@ -74,7 +74,7 @@ aru_gld,350,98,6 script Banadis#flag_ar05_3::ar05_Flag2 GUILD_FLAG,{ callfunc "ReturnFlag","arug_cas05",0; end; OnAgitInit2: -OnRecvCastlear05: +OnRecvCastleAr05: flagemblem getcastledata("arug_cas05",1); end; } diff --git a/npc/guild2/guild_flags.txt b/npc/guild2/guild_flags.txt index c5bbd1d08..bfbca227d 100644 --- a/npc/guild2/guild_flags.txt +++ b/npc/guild2/guild_flags.txt @@ -15,7 +15,7 @@ yuno,109,167,5 script Himinn GUILD_FLAG,{ end; OnAgitInit2: -OnRecvCastlesc01: +OnRecvCastleSc01: flagemblem getcastledata("schg_cas01",1); end; } @@ -24,7 +24,7 @@ yuno,110,171,5 script Andlangr GUILD_FLAG,{ end; OnAgitInit2: -OnRecvCastlesc02: +OnRecvCastleSc02: flagemblem getcastledata("schg_cas02",1); end; } @@ -33,7 +33,7 @@ yuno,111,175,5 script Viblainn GUILD_FLAG,{ end; OnAgitInit2: -OnRecvCastlesc03: +OnRecvCastleSc03: flagemblem getcastledata("schg_cas03",1); end; } @@ -42,7 +42,7 @@ yuno,112,179,5 script Hljod GUILD_FLAG,{ end; OnAgitInit2: -OnRecvCastlesc04: +OnRecvCastleSc04: flagemblem getcastledata("schg_cas04",1); end; } @@ -51,7 +51,7 @@ yuno,114,183,5 script Skidbladnir GUILD_FLAG,{ end; OnAgitInit2: -OnRecvCastlesc05: +OnRecvCastleSc05: flagemblem getcastledata("schg_cas05",1); end; } @@ -61,7 +61,7 @@ rachel,124,120,3 script Mardol GUILD_FLAG,{ end; OnAgitInit2: -OnRecvCastlear01: +OnRecvCastleAr01: flagemblem getcastledata("arug_cas01",1); end; } @@ -70,7 +70,7 @@ rachel,136,120,5 script Cyr GUILD_FLAG,{ end; OnAgitInit2: -OnRecvCastlear02: +OnRecvCastleAr02: flagemblem getcastledata("arug_cas02",1); end; } @@ -79,7 +79,7 @@ rachel,138,126,6 script Horn GUILD_FLAG,{ end; OnAgitInit2: -OnRecvCastlear03: +OnRecvCastleAr03: flagemblem getcastledata("arug_cas03",1); end; } @@ -88,7 +88,7 @@ rachel,135,131,7 script Gefn GUILD_FLAG,{ end; OnAgitInit2: -OnRecvCastlear04: +OnRecvCastleAr04: flagemblem getcastledata("arug_cas04",1); end; } @@ -97,7 +97,7 @@ rachel,124,130,1 script Banadis GUILD_FLAG,{ end; OnAgitInit2: -OnRecvCastlear05: +OnRecvCastleAr05: flagemblem getcastledata("arug_cas05",1); end; } diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt index b7074c68e..ba9da886b 100644 --- a/npc/guild2/schg_cas01.txt +++ b/npc/guild2/schg_cas01.txt @@ -65,7 +65,7 @@ sch_gld,290,90,0 script Himinn#flag_sc01_1::Sc01_Flag GUILD_FLAG,{ callfunc "ReturnFlag","schg_cas01",1; end; OnAgitInit2: -OnRecvCastlesc01: +OnRecvCastleSc01: flagemblem getcastledata("schg_cas01",1); end; } diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt index 4d6a73ef1..798fb9c8b 100644 --- a/npc/guild2/schg_cas02.txt +++ b/npc/guild2/schg_cas02.txt @@ -57,7 +57,7 @@ sch_gld,296,247,4 script Andlangr#flag_sc02_1::Sc02_Flag GUILD_FLAG,{ callfunc "ReturnFlag","schg_cas02",1; end; OnAgitInit2: -OnRecvCastlesc02: +OnRecvCastleSc02: flagemblem getcastledata("schg_cas02",1); end; } diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt index 2a5581df3..77d50195e 100644 --- a/npc/guild2/schg_cas03.txt +++ b/npc/guild2/schg_cas03.txt @@ -53,7 +53,7 @@ schg_cas03,283,206,2 script Vidblainn#LF_sc03_11::LF_sc03_2 GUILD_FLAG,{ callfunc "LinkFlag","Emperium Center",308,202; end; OnAgitInit2: -OnRecvCastlesc03: +OnRecvCastleSc03: flagemblem getcastledata("schg_cas03",1); end; } @@ -65,7 +65,7 @@ sch_gld,91,191,0 script Vidblainn#flag_sc03_1::Sc03_Flag GUILD_FLAG,{ callfunc "ReturnFlag","schg_cas03",1; end; OnAgitInit2: -OnRecvCastlesc03: +OnRecvCastleSc03: flagemblem getcastledata("schg_cas03",1); end; } diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt index 9905a0f17..dd81e16c6 100644 --- a/npc/guild2/schg_cas04.txt +++ b/npc/guild2/schg_cas04.txt @@ -45,7 +45,7 @@ schg_cas04,111,46,4 script Hljod#LF_sc04_3::LF_sc04_2 GUILD_FLAG,{ callfunc "LinkFlag","Emperium Center",120,290; end; OnAgitInit2: -OnRecvCastlesc04: +OnRecvCastleSc04: flagemblem getcastledata("schg_cas04",1); end; } @@ -65,7 +65,7 @@ sch_gld,134,97,4 script Hljod#flag_sc04_1::sc04_Flag GUILD_FLAG,{ callfunc "ReturnFlag","schg_cas04",1; end; OnAgitInit2: -OnRecvCastlesc04: +OnRecvCastleSc04: flagemblem getcastledata("schg_cas04",1); end; } diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt index 6ecdff972..ca69a2dd6 100644 --- a/npc/guild2/schg_cas05.txt +++ b/npc/guild2/schg_cas05.txt @@ -45,7 +45,7 @@ schg_cas05,111,46,4 script Skidbladnir#LF_sc05_3::LF_sc05_2 GUILD_FLAG,{ callfunc "LinkFlag","Emperium Center",120,290; end; OnAgitInit2: -OnRecvCastlesc05: +OnRecvCastleSc05: flagemblem getcastledata("schg_cas05",1); end; } @@ -65,7 +65,7 @@ sch_gld,101,284,4 script Skidbladnir#flag_sc05_1::sc05_Flag GUILD_FLAG,{ callfunc "ReturnFlag","schg_cas05",1; end; OnAgitInit2: -OnRecvCastlesc05: +OnRecvCastleSc05: flagemblem getcastledata("schg_cas05",1); end; } diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt index 82e0b7a70..9ccdade10 100644 --- a/npc/instances/NydhoggsNest.txt +++ b/npc/instances/NydhoggsNest.txt @@ -1865,7 +1865,7 @@ OnEnable: set .@map$, instance_mapname("2@nyd"); monster .@map$,199,327,"Nidhoggur's Shadow",2022,1,instance_npcname("nyd_2f_boss_enter_call")+"::OnMyMobDead"; mapannounce .@map$, "Nidhoggur's Shadow : I will devour all of you... you and the World Tree Yggdrasil.",bc_map,"0x00ff99"; - //donpcevent instance_npcname("nyd_2f_boss_enter_call")+"::Ongo"; + //donpcevent instance_npcname("nyd_2f_boss_enter_call")+"::OnGo"; initnpctimer; end; diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index c565b182c..ffa2d979d 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -1313,7 +1313,7 @@ OnInstanceInit: OnEnable: enablenpc instance_npcname("2f_callmon_pattern_c"); initnpctimer; - donpcevent instance_npcname("2f_callmon_pattern_c")+"::Ongo"; + donpcevent instance_npcname("2f_callmon_pattern_c")+"::OnGo"; end; OnDisable: @@ -1321,7 +1321,7 @@ OnDisable: disablenpc instance_npcname("2f_callmon_pattern_c"); end; -Ongo: +OnGo: donpcevent instance_npcname("2f_callmon_pattern")+"::OnEnable"; end; @@ -1350,7 +1350,7 @@ OnTimer300000: enablenpc instance_npcname("slave_down"); enablenpc instance_npcname("slave_left"); enablenpc instance_npcname("slave_right"); - donpcevent instance_npcname("2f_callmon_pattern_c")+"::Ongo"; + donpcevent instance_npcname("2f_callmon_pattern_c")+"::OnGo"; end; } @@ -1362,10 +1362,10 @@ OnInstanceInit: OnEnable: enablenpc instance_npcname("ins_2f_hero_pattern_c"); initnpctimer; - donpcevent instance_npcname("ins_2f_hero_pattern_c")+"::Ongo"; + donpcevent instance_npcname("ins_2f_hero_pattern_c")+"::OnGo"; end; -Ongo: +OnGo: donpcevent instance_npcname("ins_2f_hero_pattern")+"::OnEnable"; end; @@ -1448,7 +1448,7 @@ OnTimer70000: enablenpc instance_npcname("Magical Seal#10"); } stopnpctimer; - donpcevent instance_npcname("ins_2f_hero_pattern_c")+"::Ongo"; + donpcevent instance_npcname("ins_2f_hero_pattern_c")+"::OnGo"; end; } diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index db88bc934..a06af96a1 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -1099,30 +1099,30 @@ OnEnable: initnpctimer; end; -Onm1: +OnM1: set .MyMobs,13; monster "job_prist",24,52,"Theft",1015,1,"Z_C#prst::OnMyMobDead"; monster "job_prist",18,52,"Want of Virtue",1015,1,"Z_C#prst::OnMyMobDead"; monster "job_prist",30,52,"Jealousy",1015,1,"Z_C#prst::OnMyMobDead"; end; -Onm2: +OnM2: monster "job_prist",21,62,"Fury",1015,1,"Z_C#prst::OnMyMobDead"; monster "job_prist",27,62,"Envy",1015,1,"Z_C#prst::OnMyMobDead"; end; -Onm3: +OnM3: monster "job_prist",24,72,"Arrogance",1015,1,"Z_C#prst::OnMyMobDead"; monster "job_prist",18,72,"Lewdness",1015,1,"Z_C#prst::OnMyMobDead"; monster "job_prist",30,72,"Sloth",1015,1,"Z_C#prst::OnMyMobDead"; end; -Onm4: +OnM4: monster "job_prist",21,82,"Gluttony",1015,1,"Z_C#prst::OnMyMobDead"; monster "job_prist",27,82,"Greed",1015,1,"Z_C#prst::OnMyMobDead"; end; -Onm5: +OnM5: monster "job_prist",24,92,"Despair",1015,1,"Z_C#prst::OnMyMobDead"; monster "job_prist",18,92,"Distrust",1015,1,"Z_C#prst::OnMyMobDead"; monster "job_prist",30,92,"Fear",1015,1,"Z_C#prst::OnMyMobDead"; @@ -1194,7 +1194,7 @@ OnInit: OnTouch: if (BaseJob == Job_Acolyte) { - donpcevent "Zombie_Generator#prst::Onm1"; + donpcevent "Zombie_Generator#prst::OnM1"; donpcevent "Zombie1_1::OnDisable"; } end; @@ -1215,7 +1215,7 @@ OnInit: OnTouch: if (BaseJob == Job_Acolyte) { - donpcevent "Zombie_Generator#prst::Onm2"; + donpcevent "Zombie_Generator#prst::OnM2"; donpcevent "Zombie2_1::OnDisable"; } end; @@ -1236,7 +1236,7 @@ OnInit: OnTouch: if (BaseJob == Job_Acolyte) { - donpcevent "Zombie_Generator#prst::Onm3"; + donpcevent "Zombie_Generator#prst::OnM3"; donpcevent "Zombie3_1::OnDisable"; } end; @@ -1257,7 +1257,7 @@ OnInit: OnTouch: if (BaseJob == Job_Acolyte) { - donpcevent "Zombie_Generator#prst::Onm4"; + donpcevent "Zombie_Generator#prst::OnM4"; donpcevent "Zombie4_1::OnDisable"; } end; @@ -1277,7 +1277,7 @@ OnInit: OnTouch: if (BaseJob == Job_Acolyte) { - donpcevent "Zombie_Generator#prst::Onm5"; + donpcevent "Zombie_Generator#prst::OnM5"; donpcevent "Zombie5_1::OnDisable"; } end; @@ -1618,17 +1618,17 @@ OnEnable: donpcevent "Mummy3_1::OnEnable"; end; -Onm1: +OnM1: monster "job_prist",90,55,"Khamoz",1041,1; monster "job_prist",105,55,"Amocsis",1041,1; end; -Onm2: +OnM2: monster "job_prist",90,70,"Mentuhoteph",1041,1; monster "job_prist",105,70,"Akenaten",1041,1; end; -Onm3: +OnM3: monster "job_prist",90,85,"Mehnes",1041,1; monster "job_prist",105,85,"Snepheru",1041,1; end; @@ -1646,7 +1646,7 @@ OnInit: OnTouch: if (BaseJob == Job_Acolyte) { - donpcevent "Mummy_Generator::Onm1"; + donpcevent "Mummy_Generator::OnM1"; donpcevent "Mummy1_1::OnDisable"; } end; @@ -1667,7 +1667,7 @@ OnInit: OnTouch: if (BaseJob == Job_Acolyte) { - donpcevent "Mummy_Generator::Onm2"; + donpcevent "Mummy_Generator::OnM2"; donpcevent "Mummy2_1::OnDisable"; } end; @@ -1688,7 +1688,7 @@ OnInit: OnTouch: if (BaseJob == Job_Acolyte) { - donpcevent "Mummy_Generator::Onm3"; + donpcevent "Mummy_Generator::OnM3"; donpcevent "Mummy3_1::OnDisable"; } end; diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt index 12517e04c..ab5dc6424 100644 --- a/npc/jobs/2-1a/HighWizard.txt +++ b/npc/jobs/2-1a/HighWizard.txt @@ -60,7 +60,7 @@ valkyrie,44,47,5 script High Wizard#Valkyrie 4_M_JOB_WIZARD,{ mes "all of your remaining Skill Points before returning to me."; close; } - jobchange Job_high_Wizard; + jobchange Job_High_Wizard; set ADVJOB,0; mes "[High Wizard]"; mes "Congratulations."; diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt index d917d3988..590f68143 100644 --- a/npc/jobs/2-1a/WhiteSmith.txt +++ b/npc/jobs/2-1a/WhiteSmith.txt @@ -38,7 +38,7 @@ valkyrie,44,50,5 script MasterSmith#Valkyrie 4_M_JOB_BLACKSMITH,{ mes "crafting..."; close; } - else if (ADVJOB == Job_WhiteSmith && Class == Job_Merchant_High && JobLevel > 39) { + else if (ADVJOB == Job_Whitesmith && Class == Job_Merchant_High && JobLevel > 39) { mes "[MasterSmith]"; mes "The time has come!"; mes "Our world needs brave,"; diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index 98cb7841c..e7d938a4a 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -296,7 +296,7 @@ prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{ if (Sex) mes "...Brother."; else mes "...Comrade."; next; - if(.@JobLevel != 50) getitem 504, 6; + if(.@Joblevel != 50) getitem 504, 6; else getitem 504, 12; mes "[Michael Halig]"; mes "And use this in times of dire peril. It will give you strength when your wounds are most grievous."; diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt index e105c2e4b..42c27551c 100644 --- a/npc/jobs/valkyrie.txt +++ b/npc/jobs/valkyrie.txt @@ -385,7 +385,7 @@ valkyrie,44,33,5 script Teleporter 4_F_TELEPORTER,{ case 9: callsub S_Warpchar,"yuno",328,101; } } -S_WarpChar: +S_Warpchar: mes "[Teleporter]"; mes "Have a nice trip."; close2; diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt index 024cdf33e..b2c65f966 100644 --- a/npc/merchants/coin_exchange.txt +++ b/npc/merchants/coin_exchange.txt @@ -28,15 +28,15 @@ mes "What are you looking for?"; next; if (strnpcinfo(1) == "Merchant of Manuk") { - setarray .@Items[2],12342,12343,12348; + setarray .@items[2],12342,12343,12348; set .@Book,11019; //Manuk_Selling_Item - set .@Coin,6080; //Manuk_Coin + set .@coin,6080; //Manuk_Coin set .@i, select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel"); } else { - setarray .@Items[2],12344,12345,12349; + setarray .@items[2],12344,12345,12349; set .@Book,11018; //Splendide_Selling_Item - set .@Coin,6081; //Splendide_Coin + set .@coin,6081; //Splendide_Coin set .@i, select("View item description:Buy Pinguicula's Fruit Jam:Buy Luciola's Honey Jam:Buy Cornus' Tears:Do nothing"); } mes .@n$; @@ -47,11 +47,11 @@ end; } else if (.@i < 5) { - mes "I can sell you 3 "+getitemname(.@Items[.@i])+" for ^3131FF1 coin^000000."; + mes "I can sell you 3 "+getitemname(.@items[.@i])+" for ^3131FF1 coin^000000."; next; switch(select("Purchase:Do not purchase")) { case 1: - if (countitem(.@Coin)) { + if (countitem(.@coin)) { mes .@n$; mes "Thank you for coming."; delitem .@Coin,1; @@ -84,4 +84,4 @@ } } man_in01,286,16,1 duplicate(merchant_13_2) Merchant of Manuk 4_MAN_PIOM -spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 4_F_FAIRYKID4
\ No newline at end of file +spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 4_F_FAIRYKID4 diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt index 518f782a9..a1f255743 100644 --- a/npc/merchants/elemental_trader.txt +++ b/npc/merchants/elemental_trader.txt @@ -79,8 +79,8 @@ ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{ mes "[Laspuchin Gregory]"; mes "Uh-huh, what did you bring?"; next; - setarray .@Items[1],995,997,994,996; - set .@i, .@Items[select("Mystic Frozen:Great Nature:Flame Heart:Rough Wind")]; + setarray .@items[1],995,997,994,996; + set .@i, .@items[select("Mystic Frozen:Great Nature:Flame Heart:Rough Wind")]; mes "[Laspuchin Gregory]"; if (countitem(.@i) > 7) { mes "I will take 8 of them and"; @@ -93,7 +93,7 @@ ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{ next; set .@menu$, ""; for(set .@j,1; .@j<5; set .@j,.@j+1) { - if (.@Items[.@j] != .@i) set .@menu$, .@menu$+getitemname(.@Items[.@j]); + if (.@items[.@j] != .@i) set .@menu$, .@menu$+getitemname(.@items[.@j]); set .@menu$, .@menu$+":"; } set .@menu$, .@menu$+"Cancel the trade"; @@ -130,7 +130,7 @@ ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{ } else { delitem .@i,8; - getitem .@Items[.@j],1; + getitem .@items[.@j],1; mes "Keheheh! You've chosen a good one!"; mes "Use it well..."; mes "Bring me other stones if you have them!"; diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt index a236722fe..2de5a6fe5 100644 --- a/npc/merchants/enchan_arm.txt +++ b/npc/merchants/enchan_arm.txt @@ -35,16 +35,16 @@ prontera,165,60,2 script Apprentice Craftsman 1_F_MERCHANT_01,{ next; switch(select("Non Slotted Armor.:Slotted Armor.:High Grade Armor.:Maybe next time.")) { case 1: - setarray .@Items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396; + setarray .@items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396; set .@j,50; break; case 2: - setarray .@Items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351; + setarray .@items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351; set .@j,55; set .@k,1; break; case 3: - setarray .@Items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390; + setarray .@items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390; set .@j,60; break; case 4: @@ -53,9 +53,9 @@ prontera,165,60,2 script Apprentice Craftsman 1_F_MERCHANT_01,{ close; } set .@menu$,""; - for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+1) - set .@menu$, .@menu$+getitemname(.@Items[.@i])+((.@k)?" [1]":"")+":"; - callsub S_EnchantArmor, .@Items[select(.@menu$)-1], .@j; + for(set .@i,0; .@i<getarraysize(.@items); set .@i,.@i+1) + set .@menu$, .@menu$+getitemname(.@items[.@i])+((.@k)?" [1]":"")+":"; + callsub S_EnchantArmor, .@items[select(.@menu$)-1], .@j; end; } mes "I am in charge of Enchanting Armors. Simply put, I've been studying ways to power-up armor."; diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt index 23d144231..0fabb9876 100644 --- a/npc/merchants/milk_trader.txt +++ b/npc/merchants/milk_trader.txt @@ -49,7 +49,7 @@ prontera,73,140,0 script Milk Vendor 4_M_04,{ set .@bottles,countitem(713); set .@total_weight,.@bottles * 50; set .@total_cost,.@bottles * 15; - if (Zeny < .@Total_cost) { + if (Zeny < .@total_cost) { mes "[Milk Vendor]"; mes "Oh, whoa~!"; mes "You don't have enough"; diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index 9d90e31aa..d76562783 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -18,7 +18,7 @@ //= 1.2 Fixed some typos and a nasty bug. [SinSloth] //= 1.3 Fixed a wrong item ID with Sphinx Hat. [SinSloth] //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//= 1.5 Removed Ontouch trigger area from NPCs. [L0ne_W0lf] +//= 1.5 Removed OnTouch trigger area from NPCs. [L0ne_W0lf] //= 1.6 Replaced effect numerics with constants. [Samuray22] //= 1.7 Adjusted prices on some armor and weapons. [L0ne_W0lf] //= 1.8 Added missing Gae Bolg and Dragon Slayer. [Kisuka] diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt index 163f531eb..3c4504d39 100644 --- a/npc/other/arena/arena_room.txt +++ b/npc/other/arena/arena_room.txt @@ -384,7 +384,7 @@ arena_room,158,82,1 script Helper Lonik 4_M_ROGUE,{ mes "[Lonik]"; mes "You'd better wait a little bit longer!"; } else { - emotion e_x,0; + emotion e_X,0; mes "No!"; mes "Go for it, good luck!"; } diff --git a/npc/other/books.txt b/npc/other/books.txt index 2b6df3654..6f83ace1b 100644 --- a/npc/other/books.txt +++ b/npc/other/books.txt @@ -23,7 +23,7 @@ prt_in,168,56,4 script Monster Encyclopedia#prt HIDDEN_NPC,{ set .@loop2,1; switch(select("Water Property Monsters:Wind Property Monsters:Spritual Property Monsters:Cancel")) { case 1: - while(.@Loop2) { + while(.@loop2) { switch(select("Small Sized Monsters:Medium Sized Monsters:Great Sized Monsters:Cancel")) { case 1: mes "^FF0000[Vol. 1: Small Water Monsters]^000000"; diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt index 8b865577c..b0274f620 100644 --- a/npc/other/fortune.txt +++ b/npc/other/fortune.txt @@ -37,7 +37,7 @@ payon_in03,117,128,5 script Fortune Teller 4_M_BIBI,{ mes "You have angered the monster spirits!"; close; } - else if (.@input > zeny) { + else if (.@input > Zeny) { mes "[Lhimetorra]"; mes "There's no need to overdo it. Just give with all your heart... *Tsk tsk*"; close; diff --git a/npc/other/guildpvp.txt b/npc/other/guildpvp.txt index 33ba49e47..debb96de9 100644 --- a/npc/other/guildpvp.txt +++ b/npc/other/guildpvp.txt @@ -14,9 +14,9 @@ pvp_y_room,77,85,4 script Guild Battle Guide 8W_SOLDIER,{ - setarray .@map1X[1],7,9,16,8,20; - setarray .@map2X[1],91,90,83,91,79; - setarray .@mapY[1],49,49,50,49,50; + setarray .@map1x[1],7,9,16,8,20; + setarray .@map2x[1],91,90,83,91,79; + setarray .@mapy[1],49,49,50,49,50; mes "[Guild Battle Guide]"; mes "How are you doing?"; @@ -49,6 +49,6 @@ pvp_y_room,77,85,4 script Guild Battle Guide 8W_SOLDIER,{ mes "[Guild Battle Guide]"; mes "Great! Have a good time~"; close2; - warp "guild_vs"+.@i,getd(".@map"+.@j+"X["+.@i+"]"),.@mapY[.@i]; + warp "guild_vs"+.@i,getd(".@map"+.@j+"x["+.@i+"]"),.@mapy[.@i]; end; } diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index c8ffb0a5d..0cfc8c8a6 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -681,11 +681,11 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ //Call Wedding effect wedding; //Give ring to Bride, and change to wedding sprite. - sc_start SC_Wedding,3600000,1; + sc_start SC_WEDDING,3600000,1; getitem 2635,1; //Bride_Ring //Give ring to Groom, and change to wedding sprite. attachrid(getcharid(3,$@wed_groom$)); - sc_start SC_Wedding,3600000,1; + sc_start SC_WEDDING,3600000,1; getitem 2634,1; //Bridegroom_Ring detachrid; //Switch Script progression back to Bride diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index 58db2edcf..507efe85d 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -1171,7 +1171,7 @@ OnMyMobDead: OnTimer120000: set $@wop_deadcount_d,$@wop_deadcount_d - 1; - donpcevent "#wop_devillium1::OndevilingSpawn"; + donpcevent "#wop_devillium1::OnDevilingSpawn"; mapannounce "poring_w02","Mr. Doppel: The Deviling on the 1st base has been revived! 1 point gained!!",0,0x00ff00; stopnpctimer; end; @@ -1185,7 +1185,7 @@ OnReset: stopnpctimer; end; -OndevilingSpawn: +OnDevilingSpawn: monster "poring_w02",98,124,"Deviling",1767,1,"#wop_devillium2::OnMyMobDead"; end; @@ -1206,7 +1206,7 @@ OnMyMobDead: OnTimer120000: set $@wop_deadcount_d,$@wop_deadcount_d - 1; - donpcevent "#wop_devillium2::OndevilingSpawn"; + donpcevent "#wop_devillium2::OnDevilingSpawn"; mapannounce "poring_w02","Mr. Doppel: The deviling on the 2nd base has been revived! 1 point gained!!",0,0x00ff00; stopnpctimer; } diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 22e5698a6..bf98fb55a 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -292,25 +292,25 @@ function script F_PVP_FSRS { } if (strnpcinfo(4) == "pvp_y_room") { set .@base$, "pvp_y_"+strnpcinfo(2); - setarray .@Maps$[0], .@base$+"-1", .@base$+"-2", .@base$+"-3", .@base$+"-4", .@base$+"-5"; - setarray .@Name$[0], "Prontera", "Izlude", "Payon", "Alberta", "Morroc"; + setarray .@maps$[0], .@base$+"-1", .@base$+"-2", .@base$+"-3", .@base$+"-4", .@base$+"-5"; + setarray .@name$[0], "Prontera", "Izlude", "Payon", "Alberta", "Morroc"; setarray .@Limit[0], 128, 128, 128, 128, 128; } else { - setarray .@Maps$[0], "pvp_n_8-1", "pvp_n_8-2", "pvp_n_8-3", "pvp_n_8-4", "pvp_n_8-5"; - setarray .@Name$[0], "Sandwich", "Lock on", "Four Room", "Under cross", "Compass Room"; + setarray .@maps$[0], "pvp_n_8-1", "pvp_n_8-2", "pvp_n_8-3", "pvp_n_8-4", "pvp_n_8-5"; + setarray .@name$[0], "Sandwich", "Lock on", "Four Room", "Under cross", "Compass Room"; setarray .@Limit[0], 64, 32, 32, 32, 32; } for(set .@i,0; .@i<5; set .@i,.@i+1) - set .@menu$, .@menu$+.@Name$[.@i]+" ["+getmapusers(.@Maps$[.@i])+" / "+.@Limit[.@i]+"]:"; + set .@menu$, .@menu$+.@name$[.@i]+" ["+getmapusers(.@maps$[.@i])+" / "+.@Limit[.@i]+"]:"; set .@menu$, .@menu$+"Cancel."; set .@i, select(.@menu$)-1; if (.@i == 5) close; - if (getmapusers(.@Maps$[.@i]) >= .@Limit[.@i]) { + if (getmapusers(.@maps$[.@i]) >= .@Limit[.@i]) { mes "[PVP Fight Square Reception Staff]"; mes "This map is currently full."; close; } - warp .@Maps$[.@i],0,0; + warp .@maps$[.@i],0,0; end; } diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index d8bb041f9..710580054 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -50,7 +50,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ mes "I know you'll make a great Archer..."; next; skill 143,0,0; - jobchange Job_Archer_high; + jobchange Job_Archer_High; skill 147,1,0; skill 148,1,0; mes "[Archer Guildsman]"; diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt index f429e46e6..630b15196 100644 --- a/npc/quests/bard_quest.txt +++ b/npc/quests/bard_quest.txt @@ -28,7 +28,7 @@ //============================================================ geffen,132,38,3 script Bard#2 1_M_BARD,{ - if (bard_q > 5) set gef_bard_q,bard_q; + if (BARD_Q > 5) set gef_bard_q,BARD_Q; set @name$,strcharinfo(0); if (gef_bard_q > 29) { cutin "bard_eland02",2; diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt index 5effd046a..8eb89773a 100644 --- a/npc/quests/bunnyband.txt +++ b/npc/quests/bunnyband.txt @@ -31,14 +31,14 @@ alberta,26,229,0 script Kafra Employee#bunny 4_M_01,{ mes "see if you brought"; mes "all the items..."; next; - setarray .@Items[0],949,100,706,1,722,1,2213,1; + setarray .@items[0],949,100,706,1,722,1,2213,1; for(set .@i,0; .@i<8; set .@i,.@i+2) - if (countitem(.@Items[.@i]) < .@Items[.@i+1]) { + if (countitem(.@items[.@i]) < .@items[.@i+1]) { mes "[Kafra Employee]"; mes "Ooh, I'm sorry"; mes "but you need to"; mes "bring at least"; - mes .@Items[.@i+1]+" "+getitemname(.@Items[.@i])+((!.@i)?"s.":"."); + mes .@items[.@i+1]+" "+getitemname(.@items[.@i])+((!.@i)?"s.":"."); close; } mes "[Kafra Employee]"; @@ -50,12 +50,12 @@ alberta,26,229,0 script Kafra Employee#bunny 4_M_01,{ mes "while I put it together..."; next; for(set .@i,0; .@i<8; set .@i,.@i+2) - if (countitem(.@Items[.@i]) < .@Items[.@i+1]) { + if (countitem(.@items[.@i]) < .@items[.@i+1]) { mes "[Kafra Employee]"; mes "Hm? I'm sorry,"; mes "but I actually can't"; mes "make this right now. You"; - mes "need "+.@Items[.@i+1]+" "+getitemname(.@Items[.@i])+((!.@i)?"s":""); + mes "need "+.@items[.@i+1]+" "+getitemname(.@items[.@i])+((!.@i)?"s":""); mes "in order for me to put this"; mes "Bunny Band together..."; close; diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt index c1e09bfec..78d4e6b0e 100644 --- a/npc/quests/okolnir.txt +++ b/npc/quests/okolnir.txt @@ -58,9 +58,9 @@ function script F_Okolnir { mes "Would you like to try to enter here?"; close; case 2: - set .@Defence,getcastledata(strnpcinfo(4),3); + set .@defence,getcastledata(strnpcinfo(4),3); set .@Economy,getcastledata(strnpcinfo(4),2); - if ((.@Economy > 64) && (.@Defence > 29)) { + if ((.@Economy > 64) && (.@defence > 29)) { mes "[Guide]"; mes "Great! Economy and Defense are OK."; mes "You can enter Okolnir now...."; @@ -425,7 +425,7 @@ OnTouch: case 4: set .@m, 1661; break; case 5: set .@m, 1660; break; case 6: set .@m, 1659; break; - Default: set .@m, 1652; break; + default: set .@m, 1652; break; } monster "que_q"+getarg(0),getarg(1),getarg(2),strcharinfo(0),.@m,1,"#Gate_manager_"+getarg(0)+"::OnMyMobDead"; return; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index a928466c9..b176b4081 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -9838,7 +9838,7 @@ mid_camp,206,286,3 script Expedition Messenger 4_M_MOCASS1,{ mes "[Expedition Messenger]"; mes "Guys, it's time to go."; next; - donpcevent "Expedition Messenger#2::Ongo"; + donpcevent "Expedition Messenger#2::OnGo"; mes "[Expedition Messenger]"; mes "You, head to Schwaltzval Republic."; mes "And you, take Arunafeltz. I'll visit Prontera Palace."; @@ -10041,7 +10041,7 @@ OnEnable: enablenpc "Expedition Messenger#2"; end; -Ongo: +OnGo: enablenpc "Expedition Messenger#2"; enablenpc "Expedition Messenger#3"; end; diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index 3cf920833..16a4a6aa6 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -4821,11 +4821,11 @@ man_in01,372,221,5 script Scientist#lifeguard 4_MAN_BENKUNI,{ function script find_13_2 { switch (getarg(0)) { - case 0: setarray .@Check[0],2,10; set .@str$,"Mt. Mjolnir"; break; - case 1: setarray .@Check[0],3,5; set .@str$,"Abyss Lake"; break; - case 2: setarray .@Check[0],4,5; set .@str$,"Thor Volcano"; break; + case 0: setarray .@check[0],2,10; set .@str$,"Mt. Mjolnir"; break; + case 1: setarray .@check[0],3,5; set .@str$,"Abyss Lake"; break; + case 2: setarray .@check[0],4,5; set .@str$,"Thor Volcano"; break; } - if (ep13_2_tre != .@Check[0] || countitem(6076) != 1 || countitem(6077) >= .@Check[1]) end; + if (ep13_2_tre != .@check[0] || countitem(6076) != 1 || countitem(6077) >= .@check[1]) end; mes "- Just arrived at "+.@str$+". I think I can find the mineral by using the Mineral Detector in the Portable Toolbox. -"; next; switch(select("Check current location.:Do nothing.")) { diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt index 8036e9471..9fe31ec59 100644 --- a/npc/quests/quests_lutie.txt +++ b/npc/quests/quests_lutie.txt @@ -169,7 +169,7 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{ delitem 1036,20; //Dragon_Scale delitem 7012,200; //Tough_Scalelike_Stem delitem 7065,300; //Sea_Otter_Leather - emotion e_Oh; + emotion e_oh; mes "^3355FF*Vroooooom~~*"; mes "*Bzzzzzt*"; mes "*choogachooga*"; @@ -344,7 +344,7 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{ mes "Items.^000000"; close; } - emotion e_x; + emotion e_X; mes "[Audi]"; mes "^555555Error Error!"; mes "Incorrect items!^000000"; diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt index 9457f431a..08cb2e030 100644 --- a/npc/quests/seals/mjolnir_seal.txt +++ b/npc/quests/seals/mjolnir_seal.txt @@ -60,7 +60,7 @@ prontera,124,297,3 script Tialfi 4_M_KID1,{ else if (BaseJob == Job_Blacksmith){ set .@gift,4; } - else if (BaseJob == Job_hunter){ + else if (BaseJob == Job_Hunter){ set .@gift,5; } else if (BaseJob == Job_Assassin){ diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt index 0074a5a79..ccafb4b2a 100644 --- a/npc/quests/skills/bard_skills.txt +++ b/npc/quests/skills/bard_skills.txt @@ -19,7 +19,7 @@ //= 1.3a Tixed an item ID typo. Thanks, 2Spiritual Kid //= 1.3b Split into different files [DracoRPG] //= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] -//= 1.4a Checks the proper variable now. (bard_q -> gef_bard_q) [L0ne_W0lf] +//= 1.4a Checks the proper variable now. (BARD_Q -> gef_bard_q) [L0ne_W0lf] //= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 1.6 Added missing checkweights. [L0ne_W0lf] //= 1.6 Replaced effect numerics with constants. [L0ne_W0lf] diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt index 5fdc38741..2bcda5082 100644 --- a/npc/quests/skills/sage_skills.txt +++ b/npc/quests/skills/sage_skills.txt @@ -80,15 +80,15 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ next; setarray .@ReqSkill[0],280,283,282,281; setarray .@ReqSkill$[0],"Blaze","Quake","Tornado","Tsunami"; - setarray .@Skill[0],1018,1017,1019,1008; - setarray .@Skill$[0],"Fire","Earth","Wind","Water"; + setarray .@skill[0],1018,1017,1019,1008; + setarray .@skill$[0],"Fire","Earth","Wind","Water"; while(1) { set .@i, select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")-1; if(getskilllv(.@ReqSkill[.@i]) == 0) { mes "[Mishuna]"; mes "I'm sorry, but you haven't"; mes "learned ^FF0000Endow "+.@ReqSkill$[.@i]+"^000000, the skill"; - mes "required for ^FF0000"+.@Skill$[.@i]+" Elemental"; + mes "required for ^FF0000"+.@skill$[.@i]+" Elemental"; mes "Change^000000. You'll need to learn"; mes "Endow "+.@ReqSkill$[.@i]+" or select another"; mes "Elemental Change skill."; @@ -97,7 +97,7 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ else { mes "[Mishuna]"; mes "Very well, I shall"; - mes "teach you the ^FF0000"+.@Skill$[.@i]; + mes "teach you the ^FF0000"+.@skill$[.@i]; mes "Elemental Change^000000 skill"; mes "and the ^FF0000Elemental Converter"; mes "Creation skill^000000. Please remain"; @@ -112,10 +112,10 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ specialeffect2 EF_BRANDISHSPEAR; next; mes "^3355FFYou've successfully"; - mes "learned the "+.@Skill$[.@i]+" Elemental"; + mes "learned the "+.@skill$[.@i]+" Elemental"; mes "Change skill and the Elemental"; mes "Converter Creation skill.^000000"; - skill .@Skill[.@i],1,0; + skill .@skill[.@i],1,0; if(.@Convert == 0) skill "SA_CREATECON",1,0; next; @@ -356,14 +356,14 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ setarray .@ReqSkill[0],280,283,282,281; setarray .@ReqSkill$[0],"Blaze","Quake","Tornado","Tsunami"; setarray .@ReqItem$[0],"Red Bloods","Green Lives","Wind of Verdure","Crystal Blues"; - setarray .@Skill$[0],"Fire","Earth","Wind","Water"; + setarray .@skill$[0],"Fire","Earth","Wind","Water"; while(1) { set .@i, select("Fire Elemental Change:Earth Elemental Change:Wind Elemental Change:Water Elemental Change")-1; if(getskilllv(.@ReqSkill[.@i]) == 0) { mes "[Mishuna]"; mes "I'm sorry, but you have not"; mes "learned ^FF0000Endow "+.@ReqSkill$[.@i]+"^000000, the skill"; - mes "required for the "+.@Skill$[.@i]+" Elemental Change skill. Please learn Endow"; + mes "required for the "+.@skill$[.@i]+" Elemental Change skill. Please learn Endow"; mes .@ReqSkill$[.@i]+" or select another Elemental Change skill for me to teach you."; next; } @@ -372,7 +372,7 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ mes "Very well, then. Please"; mes "bring the following items"; mes "so that you can learn the"; - mes .@Skill$[.@i]+" Elemental Change skill."; + mes .@skill$[.@i]+" Elemental Change skill."; next; mes "[Mishuna]"; mes "^FF000020 "+.@ReqItem$[.@i]+"^000000,"; @@ -394,15 +394,15 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ set .@i, (SAG_SK/10) - 1; setarray .@ReqItem[0],990,993,992,991; setarray .@ReqItem$[0],"Red Bloods","Green Lives","Wind of Verdure","Crystal Blues"; - setarray .@Skill[0],1018,1017,1019,1008; - setarray .@Skill$[0],"Fire","Earth","Wind","Water"; + setarray .@skill[0],1018,1017,1019,1008; + setarray .@skill$[0],"Fire","Earth","Wind","Water"; if (countitem(.@ReqItem[.@i]) < 20 || countitem(1089) < 1 || countitem(1088) < 1) { mes "[Mishuna]"; mes "Are you having trouble"; mes "gathering all the required"; mes "items? Just in case, let me"; mes "remind you of what you need"; - mes "to bring me to learn the "+.@Skill$[.@i]; + mes "to bring me to learn the "+.@skill$[.@i]; mes "Elemental Change skill."; next; mes "[Mishuna]"; @@ -417,10 +417,10 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ mes "[Mishuna]"; mes "Ah, you're back. I can now"; mes "finally teach you about the"; - mes .@Skill$[.@i]+" Elemental Change skill."; + mes .@skill$[.@i]+" Elemental Change skill."; mes "This skill has the chance to"; mes "permanently change a targeted"; - mes "monster's attribute to "+.@Skill$[.@i]+"."; + mes "monster's attribute to "+.@skill$[.@i]+"."; next; mes "[Mishuna]"; mes "Remember that you must"; @@ -433,7 +433,7 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ mes "Now, "+strcharinfo(0)+","; mes "I'm going to cast a spell"; mes "that will help you memorize"; - mes "the "+.@Skill$[.@i]+" Elemental Change"; + mes "the "+.@skill$[.@i]+" Elemental Change"; mes "skill. Try to stay still..."; next; mes "^3355FFMishuna begins to chant"; @@ -450,13 +450,13 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ delitem 1089,1; // Payon Potion delitem 1088,1; // Morocc Potion set SAG_SK,100; - skill .@Skill[.@i],1,0; + skill .@skill[.@i],1,0; next; mes "[Mishuna]"; mes strcharinfo(0)+"..."; mes "I'm happy to say that you've"; mes "successfully memorized the"; - mes .@Skill$[.@i]+" Elemental Change skill."; + mes .@skill$[.@i]+" Elemental Change skill."; mes "I hope that it serves you well"; mes "in battle. Farewell for now~"; close; diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index e1bcb79da..634b50308 100644 --- a/npc/quests/thana_quest.txt +++ b/npc/quests/thana_quest.txt @@ -455,12 +455,12 @@ tha_t01,140,78,4 script Guide#reward 4_F_ZONDAGIRL,{ mes "you please tell me what kind"; mes "of mission proof you brought?"; next; - setarray .@Items[1],7435,7440,7441,7442; + setarray .@items[1],7435,7440,7441,7442; set .@i, select("Golden Ornament:Red Feather:Blue Feather:Cursed Seal"); mes "[Liei]"; - if (!countitem(.@Items[.@i])) { + if (!countitem(.@items[.@i])) { mes "I'm sorry, but you are not"; - mes "carrying any "+getitemname(.@Items[.@i])+"s."; + mes "carrying any "+getitemname(.@items[.@i])+"s."; mes "Please check your inventory"; mes "one more time, and then come"; mes "to me to redeem your items"; @@ -468,15 +468,15 @@ tha_t01,140,78,4 script Guide#reward 4_F_ZONDAGIRL,{ close; } mes "The reward for each"; - mes getitemname(.@Items[.@i])+" is..."; + mes getitemname(.@items[.@i])+" is..."; mes " "; mes "1,000 zeny"; //mes "2,000 EXP"; next; - set .@zeny_tt,(countitem(.@Items[.@i]) * 1000); - //set .@exp_tt,(countitem(.@Items[.@i]) * 2000); + set .@zeny_tt,(countitem(.@items[.@i]) * 1000); + //set .@exp_tt,(countitem(.@items[.@i]) * 2000); mes "[Liei]"; - mes countitem(.@Items[.@i])+" "+getitemname(.@Items[.@i])+"s, then"; + mes countitem(.@items[.@i])+" "+getitemname(.@items[.@i])+"s, then"; mes "you will receive a total of..."; mes " "; mes ""+.@zeny_tt+" zeny"; @@ -484,7 +484,7 @@ tha_t01,140,78,4 script Guide#reward 4_F_ZONDAGIRL,{ next; mes "[Liei]"; mes "Would you like to exchange"; - mes "all of your "+getitemname(.@Items[.@i])+"s"; + mes "all of your "+getitemname(.@items[.@i])+"s"; mes "for your reward right now?"; next; switch(select("Yes:No")) { @@ -495,7 +495,7 @@ tha_t01,140,78,4 script Guide#reward 4_F_ZONDAGIRL,{ //mes .@exp_tt+" EXP. Thank you,"; mes "and please keep up"; mes "the good work~"; - delitem .@Items[.@i], countitem(.@Items[.@i]); + delitem .@items[.@i], countitem(.@items[.@i]); set Zeny, Zeny + .@zeny_tt; //getexp .@exp_tt,0; close; diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index 95421cd2d..4c97821aa 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -8525,7 +8525,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{ set sign_q,134; donpcevent "Serin#serin::OnDisable"; donpcevent "Dark Lord#serin::OnDisable"; - donpcevent "CallMonster#serin::Oncall"; + donpcevent "CallMonster#serin::OnCall"; close; case 2: mes "[Serin]"; @@ -8559,7 +8559,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{ set sign_q,134; donpcevent "Serin#serin::OnDisable"; donpcevent "Dark Lord#serin::OnDisable"; - donpcevent "CallMonster#serin::Oncall"; + donpcevent "CallMonster#serin::OnCall"; close; } } @@ -8657,7 +8657,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{ set sign_q,134; donpcevent "Serin#serin::OnDisable"; donpcevent "Dark Lord#serin::OnDisable"; - donpcevent "CallMonster#serin::Oncall"; + donpcevent "CallMonster#serin::OnCall"; end; } } @@ -8696,7 +8696,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{ set sign_q,134; donpcevent "Serin#serin::OnDisable"; donpcevent "Dark Lord#serin::OnDisable"; - donpcevent "CallMonster#serin::Oncall"; + donpcevent "CallMonster#serin::OnCall"; end; } } @@ -8857,7 +8857,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ mes "now! We'll have to battle!"; close2; set sign_q,126; - donpcevent "CallMonster#witch::Oncall"; + donpcevent "CallMonster#witch::OnCall"; donpcevent "Serin#witch::OnDisable"; end; } @@ -8898,7 +8898,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ mes "now! We'll have to battle!"; close2; set sign_q,126; - donpcevent "CallMonster#witch::Oncall"; + donpcevent "CallMonster#witch::OnCall"; donpcevent "Serin#witch::OnDisable"; end; } @@ -9006,7 +9006,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ close2; set sign_q,126; donpcevent "Serin#witch::OnDisable"; - donpcevent "CallMonster#witch::Oncall"; + donpcevent "CallMonster#witch::OnCall"; end; } } @@ -9053,7 +9053,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ close2; set sign_q,126; donpcevent "Serin#witch::OnDisable"; - donpcevent "CallMonster#witch::Oncall"; + donpcevent "CallMonster#witch::OnCall"; end; } } @@ -12348,7 +12348,7 @@ OnTimer620000: } que_sign01,50,1,0 script CallMonster#serin -1,{ -Oncall: +OnCall: monster "que_sign01",196,44,"Dark Lord Incarnation",1605,1,"CallMonster#serin::OnMyMobDead"; end; @@ -12407,7 +12407,7 @@ OnTouch: } que_sign01,1,2,0 script CallMonster#witch -1,{ -Oncall: +OnCall: monster "que_sign01",196,195,"Dark Lord Incarnation",1605,1,"CallMonster#witch::OnMyMobDead"; monster "que_sign01",180,180,"Ancient Mummy",1522,1,"CallMonster#witch::OnMyMobDead"; monster "que_sign01",210,210,"Ancient Mummy",1522,1,"CallMonster#witch::OnMyMobDead"; diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index ddc261e4f..ae746e7d2 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -686,7 +686,7 @@ malaya,63,185,4 script Woman#ma08 4_F_MALAYA,{ // Jeepneys //============================================================ function script F_Malaya_Jeepney { - .@mapName$ = getarg(0); + .@mapname$ = getarg(0); .@passengers = getarg(1); // set the other messages of varying amount) @@ -707,9 +707,9 @@ function script F_Malaya_Jeepney { mes getarg(4); next; } - switch(select("Board [Passenger " + getmapusers(.@mapName$) + "/" + .@passengers +"]:Jeepney?:Are there any other Jeepneys?:Ah... Yes...")) { + switch(select("Board [Passenger " + getmapusers(.@mapname$) + "/" + .@passengers +"]:Jeepney?:Are there any other Jeepneys?:Ah... Yes...")) { case 1: - if (getmapusers(.@mapName$) >= .@passengers) { + if (getmapusers(.@mapname$) >= .@passengers) { mes "[Jeepney Driver]"; mes "I'm afraid the Jeepney is full."; mes "I'm sorry but how about some other Jeepney?"; @@ -718,7 +718,7 @@ function script F_Malaya_Jeepney { mes "[Jeepney Driver]"; mes "Have a nice day."; close2; - warp .@mapName$,29,24; + warp .@mapname$,29,24; end; } case 2: @@ -929,4 +929,4 @@ malaya,257,58,6 script Jeepney Driver#09 4_M_MALAYA,{ "Since everybody have different tastes, you can see those with cool and elaborate decorations.", "Of course you don't need to drive them yourselves, but you can ride them so please feel free to do so." ); -}
\ No newline at end of file +} diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 47e9e8000..18fdfa4e3 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -433,10 +433,10 @@ OnTalk4: OnTalk5: npctalk "Not coveting the king's throne, you're such a stupid man, only waiting for his return. Your innocence is true, I love it."; end; -Ontalk6: +OnTalk6: npctalk "You make me wish we hadn't met in this situation. Too bad we did."; end; -Ontalk7: +OnTalk7: npctalk "Well~ Today, with such a busy commandant, I won't be able to talk as much as I'd love for you to contemplate my explanation~"; end; OnTalk8: diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index 71df65889..c18d60c5c 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -39,7 +39,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ mes "I know you'll make a great Archer..."; next; skill 143,0,0; - jobchange Job_Archer_high; + jobchange Job_Archer_High; skill 147,1,0; skill 148,1,0; mes "[Archer Guildsman]"; diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt index c42888a66..4b04f9efa 100644 --- a/npc/re/jobs/1-1/thief.txt +++ b/npc/re/jobs/1-1/thief.txt @@ -40,7 +40,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 1_F_04,{ close; }else{ mes "[Thief Guide]"; - if (sex) + if (Sex) mes "Hey, dude."; else mes "Hey, baby~"; @@ -48,7 +48,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 1_F_04,{ } }else{ mes "[Thief Guide]"; - if (sex) + if (Sex) mes "Hey, dude."; else mes "Hey, baby."; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index 201a7fb4f..772570cca 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -1996,7 +1996,7 @@ job3_sha01,25,28,0 script ????#keybox02 CLEAR_NPC,{ close; } setarray .@Words$[0],"SEED","FOOT","COLD"; - setarray .@Numbers[0],24,25,20; + setarray .@numbers[0],24,25,20; set .@i,job_sha-14; if (job_sha > 13 && job_sha < 17) { mes "There are lots of boxes."; @@ -2023,8 +2023,8 @@ job3_sha01,25,28,0 script ????#keybox02 CLEAR_NPC,{ switch(select("Input the answer.:I can't get it.")) { case 1: input .@input; - if (.@input == .@Numbers[.@i]) { - mes "You put 2 and "+(.@Numbers[.@i]-20)+"."; + if (.@input == .@numbers[.@i]) { + mes "You put 2 and "+(.@numbers[.@i]-20)+"."; mes "The box opens and you get one key."; next; mes "You got the Key of Illusion."; @@ -2501,4 +2501,4 @@ OnTouch: //============================================================ tur_dun03,0,0,0,0 monster Shadow of Deception 2076,1,1000,0,0 ice_dun02,0,0,0,0 monster Shadow of Illusion 2077,1,1000,0,0 -niflheim,0,0,0,0 monster Shadow of Pleasure 2078,1,1000,0,0
\ No newline at end of file +niflheim,0,0,0,0 monster Shadow of Pleasure 2078,1,1000,0,0 diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index 45c5ee876..eb1c22e42 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -54,7 +54,7 @@ moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{ } end; } - setarray .@Exp[0],9600,7200,15750,7875,11100,8550,17100,9000,12300,9900,20250,10350,13800,11025,22500,11250; + setarray .@exp[0],9600,7200,15750,7875,11100,8550,17100,9000,12300,9900,20250,10350,13800,11025,22500,11250; for(set .@i,0; .@i<16; set .@i,.@i+1) if (checkquest(12072+.@i,HUNTING) == 2) { mes "[Mission Board]"; @@ -63,7 +63,7 @@ moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{ erasequest 12088; erasequest 12072+.@i; specialeffect2 EF_STEAL; - getexp .@Exp[.@i],0; + getexp .@exp[.@i],0; close; } if ((checkquest(12072,HUNTING) == 0) && (checkquest(12073,HUNTING) == 0) && (checkquest(12074,HUNTING) == 0) && (checkquest(12075,HUNTING) == 0) && (checkquest(12076,HUNTING) == 0) && (checkquest(12077,HUNTING) == 0) && (checkquest(12078,HUNTING) == 0) && (checkquest(12079,HUNTING) == 0) && (checkquest(12080,HUNTING) == 0) && (checkquest(12081,HUNTING) == 0) && (checkquest(12082,HUNTING) == 0) && (checkquest(12083,HUNTING) == 0) && (checkquest(12084,HUNTING) == 0) && (checkquest(12085,HUNTING) == 0) && (checkquest(12086,HUNTING) == 0) && (checkquest(12087,HUNTING) == 0)) { diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index bdd6eb4c2..c96d5a049 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -4560,12 +4560,12 @@ moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{ close; } if (para_suv02 == 14) { - setarray .@Check[0],18514,2571,2473,15031; - setarray .@Item$[0],"Hat","Mantle","Boots","Uniform"; + setarray .@check[0],18514,2571,2473,15031; + setarray .@item$[0],"Hat","Mantle","Boots","Uniform"; for(set .@i,0; .@i<4; set .@i,.@i+1) - if (countitem(.@Check[.@i]) < 1) { + if (countitem(.@check[.@i]) < 1) { mes "[Toren]"; - mes "Where is the Paradise "+.@Item$[.@i]+" I gave you?"; + mes "Where is the Paradise "+.@item$[.@i]+" I gave you?"; next; mes "[Toren]"; mes "...Fine, I will sell you another one for ^FF0000250,000 Zeny^000000. Don't lose it this time."; @@ -4581,7 +4581,7 @@ moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{ close; } set Zeny, Zeny - 250000; - getitem .@Check[.@i],1; + getitem .@check[.@i],1; mes "[Toren]"; mes "These advanced gears are not easy to make, please take better care of this one."; close; @@ -4659,14 +4659,14 @@ moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{ mes "[Toren]"; mes "Now pick which gear you would like me to enchant."; next; - setarray .@Item[0],2571,2473,15031; + setarray .@item[0],2571,2473,15031; set .@i, select("Paradise Mantle II.:Paradise Boots IV.:Paradise Uniform IV.")-1; - if (countitem(.@Item[.@i]) < 1) { + if (countitem(.@item[.@i]) < 1) { mes "[Toren]"; mes "Bring one and I'll enchant it."; close; } - set .@paragearcount, .@Item[.@i]; + set .@paragearcount, .@item[.@i]; mes "[Toren]"; mes "Here we go!"; close2; diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 62b356c23..dbf405542 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -5434,7 +5434,7 @@ malangdo,212,204,0 script Beginning Compass#nya_02 CLEAR_NPC,{ L_Viewpoint: switch(getarg(0)) { case 1: // Order 1: Red, Blue, Yellow, Green, White - setarray .@Colors$[1],"^FF0000","^0000FF","^FFFF00","^00FF00","^cccccc"; + setarray .@colors$[1],"^FF0000","^0000FF","^FFFF00","^00FF00","^cccccc"; setarray .@Text$[1],"Red","Blue","Yellow","Green","White"; if (getarg(1) <= 1) viewpoint 1,213,89,0,0xFF0000; @@ -5447,7 +5447,7 @@ L_Viewpoint: viewpoint 1,111,178,4,0xcccccc; break; case 2: // Order 2: Yellow, Blue, White, Green, Red - setarray .@Colors$[1],"^FFFF00","^0000FF","^cccccc","^00FF00","^FF0000"; + setarray .@colors$[1],"^FFFF00","^0000FF","^cccccc","^00FF00","^FF0000"; setarray .@Text$[1],"Yellow","Blue","White","Green","Red"; if (getarg(1) <= 1) viewpoint 1,73,253,0,0xFFFF00; @@ -5461,7 +5461,7 @@ L_Viewpoint: break; } for(set .@i,1; .@i<=5; set .@i,.@i+1) - set .@str$, .@str$+((.@i >= getarg(1))?.@Colors$[.@i]:"")+.@Text$[.@i]+" "; + set .@str$, .@str$+((.@i >= getarg(1))?.@colors$[.@i]:"")+.@Text$[.@i]+" "; if (getarg(1) > 1) mes "After inserting the card and pressing the red button, the path to the destination lit up."; mes "The order will be "+.@str$+"^000000."; @@ -6226,12 +6226,12 @@ L_ShowLights: mes "In that order."; next; mes "Luminous"; - setarray .@Color$[0],"Red","Blue","Yellow","Green"; + setarray .@color$[0],"Red","Blue","Yellow","Green"; setarray .@Cutin$[0],"nya_red","nya_blue","nya_yellow","nya_green"; for(set .@i,0; .@i<getarg(0); set .@i,.@i+1) { set .@rand, rand(4); set .@Lamp[.@i],.@rand; - mes .@Color$[.@rand]; + mes .@color$[.@rand]; if (.@i+1 == getarg(0)) mes "Shines according to this order."; cutin .@Cutin$[.@rand],4; @@ -6242,9 +6242,9 @@ L_ShowLights: mes "Stop the machine by pressing the right button within time."; next; set .@pass,0; - setarray .@Count$[0],"first","second","third","fourth","fifth","sixth","seventh","eighth"; + setarray .@count$[0],"first","second","third","fourth","fifth","sixth","seventh","eighth"; for(set .@i,0; .@i<getarg(0); set .@i,.@i+1) { - mes "Which color button do you want to press "+.@Count$[.@i]+"?"; + mes "Which color button do you want to press "+.@count$[.@i]+"?"; next; // Red <-> Green, Blue <-> Yellow set .@j, select("Red:Blue:Yellow:Green"); |