From bf4b0a281207e46a9b21a9c9f779aeafaa739b62 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 26 Oct 2014 02:06:46 +0100 Subject: Replaced 'set' with direct assignment where applicable (common folder) Signed-off-by: Haru --- npc/battleground/tierra/tierra01.txt | 60 ++++++++++++++++++------------------ npc/battleground/tierra/tierra02.txt | 60 ++++++++++++++++++------------------ 2 files changed, 60 insertions(+), 60 deletions(-) (limited to 'npc/battleground/tierra') diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt index 2a6d5991a..20f0fe096 100644 --- a/npc/battleground/tierra/tierra01.txt +++ b/npc/battleground/tierra/tierra01.txt @@ -28,7 +28,7 @@ OnInit: end; OnEnterBG: - set $@TierraBG1_id1, waitingroom2bg("bat_a01",50,374,"start#bat_a01::OnGuillaumeQuit",""); + $@TierraBG1_id1 = waitingroom2bg("bat_a01",50,374,"start#bat_a01::OnGuillaumeQuit",""); end; } @@ -40,7 +40,7 @@ OnInit: end; OnEnterBG: - set $@TierraBG1_id2, waitingroom2bg("bat_a01",42,16,"start#bat_a01::OnCroixQuit",""); + $@TierraBG1_id2 = waitingroom2bg("bat_a01",42,16,"start#bat_a01::OnCroixQuit",""); end; } @@ -59,11 +59,11 @@ OnStop: OnTimer1000: stopnpctimer; initnpctimer; - set .@chk_bat_a01,getmapusers("bat_a01"); + .@chk_bat_a01 = getmapusers("bat_a01"); if (.@chk_bat_a01 < 1) { - set $@TierraBG1,0; set $@TierraBG1_Victory, 0; - if( $@TierraBG1_id1 ) { bg_destroy $@TierraBG1_id1; set $@TierraBG1_id1, 0; } - if( $@TierraBG1_id2 ) { bg_destroy $@TierraBG1_id2; set $@TierraBG1_id2, 0; } + $@TierraBG1 = 0; $@TierraBG1_Victory = 0; + if( $@TierraBG1_id1 ) { bg_destroy $@TierraBG1_id1; $@TierraBG1_id1 = 0; } + if( $@TierraBG1_id2 ) { bg_destroy $@TierraBG1_id2; $@TierraBG1_id2 = 0; } donpcevent "start#bat_a01::OnReadyCheck"; } end; @@ -127,15 +127,15 @@ OnCroixQuit: OnReadyCheck: if( $@TierraBG1 ) end; - set .@Guillaume, getwaitingroomstate(0,"Lieutenant Kalos"); - set .@Croix, getwaitingroomstate(0,"Lieutenant Eyor"); + .@Guillaume = getwaitingroomstate(0,"Lieutenant Kalos"); + .@Croix = getwaitingroomstate(0,"Lieutenant Eyor"); if( !.@Guillaume && !.@Croix ) { donpcevent "#bat_a01_timer::OnStop"; end; } else if( .@Guillaume < 10 || .@Croix < 10 ) end; - set $@TierraBG1,1; + $@TierraBG1 = 1; donpcevent "Lieutenant Kalos::OnEnterBG"; donpcevent "Lieutenant Eyor::OnEnterBG"; donpcevent "start#bat_a01::OnEnable"; @@ -163,7 +163,7 @@ OnMyMobDead: if (mobcount("bat_a01","OBJ#bat_a01_a::OnMyMobDead") < 1) { donpcevent "Battle Therapist#a01_a::OnStop"; donpcevent "Battle Therapist#a01_b::OnStop"; - set $@TierraBG1_Victory, 2; + $@TierraBG1_Victory = 2; enablenpc "Guillaume Vintenar#a01_a"; enablenpc "Croix Vintenar#a01_b"; mapannounce "bat_a01", "Croix Vintenar Swandery: We destroyed Guillaume's Food Storage. We won that! Wow!",bc_map,"0xFFCE00"; @@ -186,7 +186,7 @@ OnMyMobDead: if (mobcount("bat_a01","OBJ#bat_a01_b::OnMyMobDead") < 1) { donpcevent "Battle Therapist#a01_a::OnStop"; donpcevent "Battle Therapist#a01_b::OnStop"; - set $@TierraBG1_Victory, 1; + $@TierraBG1_Victory = 1; enablenpc "Guillaume Vintenar#a01_a"; enablenpc "Croix Vintenar#a01_b"; mapannounce "bat_a01", "Guillaume Vintenar Axl Rose : We destroyed Croix's Food Storage. We won that! Wow!",bc_map,"0xFFCE00"; @@ -198,7 +198,7 @@ OnMyMobDead: bat_a01,15,18,3 script barricade#bat_a01_a CLEAR_NPC,{ OnEnable: - for( set .@i,185; .@i < 202; set .@i,.@i+1 ) + for (.@i = 185; .@i < 202; ++.@i) bg_monster $@TierraBG1_id1,"bat_a01",.@i,266,"Barricade",1906,"barricade#bat_a01_a::OnMyMobDead"; setwall "bat_a01",186,266,16,6,1,"bat_a01_c1"; end; @@ -220,7 +220,7 @@ OnMyMobDead: bat_a01,15,19,3 script barricade#bat_a01_b CLEAR_NPC,{ OnEnable: - for( set .@i,169; .@i < 186; set .@i,.@i+1 ) + for (.@i = 169; .@i < 186; ++.@i) bg_monster $@TierraBG1_id2,"bat_a01",.@i,129,"Barricade",1906,"barricade#bat_a01_b::OnMyMobDead"; setwall "bat_a01",170,129,16,6,1,"bat_a01_g1"; end; @@ -681,8 +681,8 @@ bat_a01,348,74,3 script Croix Camp#flag9 1_FLAG_EAGLE,{ end; } bat_a01,53,377,3 script Guillaume Vintenar#a01_a 4_M_KY_HEAD,{ if (getcharid(4) == $@TierraBG1_id1) { if ($@TierraBG1_Victory == 1) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -701,8 +701,8 @@ bat_a01,53,377,3 script Guillaume Vintenar#a01_a 4_M_KY_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -723,8 +723,8 @@ bat_a01,53,377,3 script Guillaume Vintenar#a01_a 4_M_KY_HEAD,{ } else { if ($@TierraBG1_Victory == 2) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -743,8 +743,8 @@ bat_a01,53,377,3 script Guillaume Vintenar#a01_a 4_M_KY_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -775,8 +775,8 @@ OnInit: bat_a01,45,19,3 script Croix Vintenar#a01_b 4_M_CRU_HEAD,{ if (getcharid(4) == $@TierraBG1_id2) { if ($@TierraBG1_Victory == 2) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -795,8 +795,8 @@ bat_a01,45,19,3 script Croix Vintenar#a01_b 4_M_CRU_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+" Don't be sad."; @@ -817,8 +817,8 @@ bat_a01,45,19,3 script Croix Vintenar#a01_b 4_M_CRU_HEAD,{ } else { if ($@TierraBG1_Victory == 1) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+" Don't be sad."; @@ -837,8 +837,8 @@ bat_a01,45,19,3 script Croix Vintenar#a01_b 4_M_CRU_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -922,7 +922,7 @@ bat_a01,356,326,3 script Guillaume Camp Soldier#bat_a01_guide 4_M_RASWORD,{ */ bat_a01,1,1,3 script Release all#a01 4_DOG01,{ - set .@i, callfunc("F_GM_NPC",1854,0); + .@i = callfunc("F_GM_NPC",1854,0); if (.@i == -1) { mes "Cancelled."; close; diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt index 129d0ee3e..c79b20845 100644 --- a/npc/battleground/tierra/tierra02.txt +++ b/npc/battleground/tierra/tierra02.txt @@ -27,7 +27,7 @@ OnInit: end; OnEnterBG: - set $@TierraBG2_id1, waitingroom2bg("bat_a02",50,374,"start#bat_a02::OnGuillaumeQuit",""); + $@TierraBG2_id1 = waitingroom2bg("bat_a02",50,374,"start#bat_a02::OnGuillaumeQuit",""); end; } @@ -39,7 +39,7 @@ OnInit: end; OnEnterBG: - set $@TierraBG2_id2, waitingroom2bg("bat_a02",42,16,"start#bat_a02::OnCroixQuit",""); + $@TierraBG2_id2 = waitingroom2bg("bat_a02",42,16,"start#bat_a02::OnCroixQuit",""); end; } @@ -58,11 +58,11 @@ OnStop: OnTimer1000: stopnpctimer; initnpctimer; - set .@chk_bat_a02,getmapusers("bat_a02"); + .@chk_bat_a02 = getmapusers("bat_a02"); if (.@chk_bat_a02 < 1) { - set $@TierraBG2,0; set $@TierraBG2_Victory, 0; - if( $@TierraBG2_id1 ) { bg_destroy $@TierraBG2_id1; set $@TierraBG2_id1, 0; } - if( $@TierraBG2_id2 ) { bg_destroy $@TierraBG2_id2; set $@TierraBG2_id2, 0; } + $@TierraBG2 = 0; $@TierraBG2_Victory = 0; + if( $@TierraBG2_id1 ) { bg_destroy $@TierraBG2_id1; $@TierraBG2_id1 = 0; } + if( $@TierraBG2_id2 ) { bg_destroy $@TierraBG2_id2; $@TierraBG2_id2 = 0; } donpcevent "start#bat_a02::OnReadyCheck"; } end; @@ -126,15 +126,15 @@ OnCroixQuit: OnReadyCheck: if( $@TierraBG2 ) end; - set .@Guillaume, getwaitingroomstate(0,"Lieutenant Rundel"); - set .@Croix, getwaitingroomstate(0,"Lieutenant Guerrit"); + .@Guillaume = getwaitingroomstate(0,"Lieutenant Rundel"); + .@Croix = getwaitingroomstate(0,"Lieutenant Guerrit"); if( !.@Guillaume && !.@Croix ) { donpcevent "#bat_a02_timer::OnStop"; end; } else if( .@Guillaume < 10 || .@Croix < 10 ) end; - set $@TierraBG2,1; + $@TierraBG2 = 1; donpcevent "Lieutenant Rundel::OnEnterBG"; donpcevent "Lieutenant Guerrit::OnEnterBG"; donpcevent "start#bat_a02::OnEnable"; @@ -162,7 +162,7 @@ OnMyMobDead: if (mobcount("bat_a02","OBJ#bat_a02_a::OnMyMobDead") < 1) { donpcevent "Battle Therapist#a02_a::OnStop"; donpcevent "Battle Therapist#a02_b::OnStop"; - set $@TierraBG2_Victory, 2; + $@TierraBG2_Victory = 2; enablenpc "Guillaume Vintenar#a02_a"; enablenpc "Croix Vintenar#a02_b"; mapannounce "bat_a02", "Croix Vintenar Swandery: We destroyed Guillaume's Food Storage. We won that! Wow!",bc_map,"0xFFCE00"; @@ -185,7 +185,7 @@ OnMyMobDead: if (mobcount("bat_a02","OBJ#bat_a02_b::OnMyMobDead") < 1) { donpcevent "Battle Therapist#a02_a::OnStop"; donpcevent "Battle Therapist#a02_b::OnStop"; - set $@TierraBG2_Victory, 1; + $@TierraBG2_Victory = 1; enablenpc "Guillaume Vintenar#a02_a"; enablenpc "Croix Vintenar#a02_b"; mapannounce "bat_a02", "Guillaume Vintenar Axl Rose : We destroyed Croix's Food Storage. We won that! Wow!",bc_map,"0xFFCE00"; @@ -197,7 +197,7 @@ OnMyMobDead: bat_a02,15,18,3 script barricade#bat_a02_a CLEAR_NPC,{ OnEnable: - for( set .@i,185; .@i < 202; set .@i,.@i+1 ) + for (.@i = 185; .@i < 202; ++.@i) bg_monster $@TierraBG2_id1,"bat_a02",.@i,266,"Barricade",1906,"barricade#bat_a02_a::OnMyMobDead"; setwall "bat_a02",186,266,16,6,1,"bat_a02_c1"; end; @@ -219,7 +219,7 @@ OnMyMobDead: bat_a02,15,19,3 script barricade#bat_a02_b CLEAR_NPC,{ OnEnable: - for( set .@i,169; .@i < 186; set .@i,.@i+1 ) + for (.@i = 169; .@i < 186; ++.@i) bg_monster $@TierraBG2_id2,"bat_a02",.@i,129,"Barricade",1906,"barricade#bat_a02_b::OnMyMobDead"; setwall "bat_a02",170,129,16,6,1,"bat_a02_g1"; end; @@ -680,8 +680,8 @@ bat_a02,348,74,3 script Croix Camp#flag19 1_FLAG_EAGLE,{ end; } bat_a02,53,377,3 script Guillaume Vintenar#a02_a 4_M_KY_HEAD,{ if (getcharid(4) == $@TierraBG2_id1) { if ($@TierraBG2_Victory == 1) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -700,8 +700,8 @@ bat_a02,53,377,3 script Guillaume Vintenar#a02_a 4_M_KY_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -722,8 +722,8 @@ bat_a02,53,377,3 script Guillaume Vintenar#a02_a 4_M_KY_HEAD,{ } else { if ($@TierraBG2_Victory == 2) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -742,8 +742,8 @@ bat_a02,53,377,3 script Guillaume Vintenar#a02_a 4_M_KY_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -774,8 +774,8 @@ OnInit: bat_a02,45,19,3 script Croix Vintenar#a02_b 4_M_CRU_HEAD,{ if (getcharid(4) == $@TierraBG2_id2) { if ($@TierraBG2_Victory == 2) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -794,8 +794,8 @@ bat_a02,45,19,3 script Croix Vintenar#a02_b 4_M_CRU_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+" Don't be sad."; @@ -816,8 +816,8 @@ bat_a02,45,19,3 script Croix Vintenar#a02_b 4_M_CRU_HEAD,{ } else { if ($@TierraBG2_Victory == 1) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+" Don't be sad."; @@ -836,8 +836,8 @@ bat_a02,45,19,3 script Croix Vintenar#a02_b 4_M_CRU_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -921,7 +921,7 @@ bat_a02,356,326,3 script Guillaume Camp Soldier#bat_a02_guide 4_M_RASWORD,{ */ bat_a02,1,1,3 script Release all#a02 4_DOG01,{ - set .@i, callfunc("F_GM_NPC",1854,0); + .@i = callfunc("F_GM_NPC",1854,0); if (.@i == -1) { mes "Cancelled."; close; -- cgit v1.2.3-60-g2f50