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/guild2/agit_main_se.txt | 14 +++++++------- npc/guild2/arug_cas04.txt | 6 +++--- npc/guild2/arug_cas05.txt | 6 +++--- npc/guild2/guild_flags.txt | 20 ++++++++++---------- npc/guild2/schg_cas01.txt | 2 +- npc/guild2/schg_cas02.txt | 2 +- npc/guild2/schg_cas03.txt | 4 ++-- npc/guild2/schg_cas04.txt | 4 ++-- npc/guild2/schg_cas05.txt | 4 ++-- 9 files changed, 31 insertions(+), 31 deletions(-) (limited to 'npc/guild2') 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; } -- cgit v1.2.3-70-g09d2