From b4f1b3b5c5c009ed4f7635c5349ea97c80c08c25 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 10 Nov 2013 04:28:03 +0100 Subject: Follow-up to 857bdc4f98be6cd1e185a24565d6b6b54752b9b4 - Consolidated case in variables, labels, constants. Signed-off-by: Haru --- npc/battleground/bg_common.txt | 26 +++++++++++++------------- npc/battleground/flavius/flavius_enter.txt | 8 ++++---- npc/battleground/tierra/tierra_enter.txt | 8 ++++---- 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'npc/battleground') 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 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."; } -- cgit v1.2.3-70-g09d2