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/kvm/kvm01.txt | 76 ++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 39 deletions(-) (limited to 'npc/battleground/kvm/kvm01.txt') diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt index b4888be88..d5ecdfa31 100644 --- a/npc/battleground/kvm/kvm01.txt +++ b/npc/battleground/kvm/kvm01.txt @@ -27,7 +27,7 @@ OnInit: end; OnEnterBG: - set $@KvM01BG_id1, waitingroom2bg("bat_c01",52,129,"KvM01_BG::OnGuillaumeQuit","KvM01_BG::OnGuillaumeDie"); + $@KvM01BG_id1 = waitingroom2bg("bat_c01",52,129,"KvM01_BG::OnGuillaumeQuit","KvM01_BG::OnGuillaumeDie"); end; } @@ -41,7 +41,7 @@ OnInit: end; OnEnterBG: - set $@KvM01BG_id2, waitingroom2bg("bat_c01",147,55,"KvM01_BG::OnCroixQuit","KvM01_BG::OnCroixDie"); + $@KvM01BG_id2 = waitingroom2bg("bat_c01",147,55,"KvM01_BG::OnCroixQuit","KvM01_BG::OnCroixDie"); end; } @@ -93,7 +93,7 @@ OnDisable: end; OnTouch: - set Bat_Team,1; + Bat_Team = 1; setquest 6025; end; } @@ -114,7 +114,7 @@ OnDisable: end; OnTouch: - set Bat_Team,2; + Bat_Team = 2; setquest 6025; end; } @@ -139,11 +139,10 @@ OnCroixJoin: end; OnGuillaumeQuit: - //set BG_Delay_Tick, gettimetick(2) + 1200; + //BG_Delay_Tick = gettimetick(2) + 1200; OnGuillaumeDie: - if( $@KvM01BG == 2 ) - { - set .Guillaume_Count, .Guillaume_Count - 1; + if ($@KvM01BG == 2) { + --.Guillaume_Count; bg_updatescore "bat_c01",.Guillaume_Count,.Croix_Count; if( .Guillaume_Count < 1 ) donpcevent "KvM01_BG::OnCroixWin"; else { @@ -154,11 +153,10 @@ OnGuillaumeDie: end; OnCroixQuit: - //set BG_Delay_Tick, gettimetick(2) + 1200; + //BG_Delay_Tick = gettimetick(2) + 1200; OnCroixDie: - if( $@KvM01BG == 2 ) - { - set .Croix_Count, .Croix_Count - 1; + if ($@KvM01BG == 2) { + --.Croix_Count; bg_updatescore "bat_c01",.Guillaume_Count,.Croix_Count; if( .Croix_Count < 1 ) donpcevent "KvM01_BG::OnGuillaumeWin"; else { @@ -171,13 +169,13 @@ OnCroixDie: OnReadyCheck: if( $@KvM01BG ) end; - set .@Guillaume, getwaitingroomstate(0,"KvM01R_Guillaume"); - set .@Croix, getwaitingroomstate(0,"KvM01R_Croix"); + .@Guillaume = getwaitingroomstate(0,"KvM01R_Guillaume"); + .@Croix = getwaitingroomstate(0,"KvM01R_Croix"); if( .@Guillaume < 5 || .@Croix < 5 ) end; - set $@KvM01BG, 1; // Starting + $@KvM01BG = 1; // Starting donpcevent "KvM01R_Croix::OnEnterBG"; donpcevent "KvM01R_Guillaume::OnEnterBG"; donpcevent "KvM01_BG::OnStart"; @@ -186,7 +184,7 @@ OnReadyCheck: OnStart: disablenpc "KVM Officer#KVM01A"; disablenpc "KVM Officer#KVM01B"; - set $@KvM01BG_Victory, 0; + $@KvM01BG_Victory = 0; // Warp Teams bg_warp $@KvM01BG_id1,"bat_c01",53,128; bg_warp $@KvM01BG_id2,"bat_c01",146,55; @@ -239,18 +237,18 @@ OnTimer59000: OnTimer61000: // Team Members - set .Guillaume_Count, bg_get_data($@KvM01BG_id1, 0); - set .Croix_Count, bg_get_data($@KvM01BG_id2, 0); + .Guillaume_Count = bg_get_data($@KvM01BG_id1, 0); + .Croix_Count = bg_get_data($@KvM01BG_id2, 0); if( .Guillaume_Count < 5 || .Croix_Count < 5 ) { - set $@KvM01BG_Victory, 3; - set $@KvM01BG, 3; + $@KvM01BG_Victory = 3; + $@KvM01BG = 3; mapannounce "bat_c01","There are not enough players to start the battle",1,0x696969; stopnpctimer; donpcevent "KvM01_BG::OnStop"; end; } - set $@KvM01BG, 2; // Playing + $@KvM01BG = 2; // Playing bg_warp $@KvM01BG_id1,"bat_c01",61,120; bg_warp $@KvM01BG_id2,"bat_c01",138,63; end; @@ -283,8 +281,8 @@ OnTimer360000: donpcevent "KvM01_BG::OnGuillaumeWin"; else { // Draw Game - set $@KvM01BG, 3; - set $@KvM01BG_Victory, 3; + $@KvM01BG = 3; + $@KvM01BG_Victory = 3; mapannounce "bat_c01", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00"; mapannounce "bat_c01", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00"; mapannounce "bat_c01", "This battle has ended in a draw.",bc_map,"0x00ff00"; @@ -293,8 +291,8 @@ OnTimer360000: end; OnGuillaumeWin: - set $@KvM01BG, 3; - set $@KvM01BG_Victory, 1; + $@KvM01BG = 3; + $@KvM01BG_Victory = 1; mapannounce "bat_c01", "Guillaume wins!",bc_map,"0x00ff00"; mapannounce "bat_c01", "Congratulations to Guillaume members.",bc_map,"0x00ff00"; mapannounce "bat_c01", "Everyone will be moved to the start point.",bc_map,"0x00ff00"; @@ -302,8 +300,8 @@ OnGuillaumeWin: end; OnCroixWin: - set $@KvM01BG, 3; - set $@KvM01BG_Victory, 2; + $@KvM01BG = 3; + $@KvM01BG_Victory = 2; mapannounce "bat_c01", "Croix wins!",bc_map,"0x00ff00"; mapannounce "bat_c01", "Congratulations to Croix members.",bc_map,"0x00ff00"; mapannounce "bat_c01", "Everyone will be moved to the start point.",bc_map,"0x00ff00"; @@ -321,17 +319,17 @@ OnStop: end; OnReset: - set .Croix_Count, 0; - set .Guillaume_Count, 0; - set $@KvM01BG_Victory, 0; - if( $@KvM01BG_id1 ) { bg_destroy $@KvM01BG_id1; set $@KvM01BG_id1, 0; } - if( $@KvM01BG_id2 ) { bg_destroy $@KvM01BG_id2; set $@KvM01BG_id2, 0; } + .Croix_Count = 0; + .Guillaume_Count = 0; + $@KvM01BG_Victory = 0; + if( $@KvM01BG_id1 ) { bg_destroy $@KvM01BG_id1; $@KvM01BG_id1 = 0; } + if( $@KvM01BG_id2 ) { bg_destroy $@KvM01BG_id2; $@KvM01BG_id2 = 0; } disablenpc "KVM Officer#KVM01A"; disablenpc "KVM Officer#KVM01B"; mapwarp "bat_c01","bat_room",154,150; maprespawnguildid "bat_c01",0,3; // Just in case someone else bg_updatescore "bat_c01",5,5; - set $@KvM01BG, 0; + $@KvM01BG = 0; donpcevent "KvM01_BG::OnReadyCheck"; // Maybe a game is ready to start end; } @@ -374,14 +372,14 @@ bat_c01,51,130,5 script KVM Officer#KVM01A 4_M_KY_HEAD,{ { if( $@KvM01BG_Victory == Bat_Team ) { // Victory - set kvm_point,kvm_point + 5; + kvm_point += 5; mes "[KVM Officer]"; mes "Good Game."; mes "May the glory of KVM be with you."; mes "You aquire the winning points: 5"; close2; } else { - set kvm_point,kvm_point + 1; + ++kvm_point; mes "[KVM Officer]"; mes "I am so sorry."; mes "I wish you better luck next time."; @@ -389,7 +387,7 @@ bat_c01,51,130,5 script KVM Officer#KVM01A 4_M_KY_HEAD,{ close2; } bg_leave; - set Bat_Team,0; + Bat_Team = 0; warp "bat_room",154,150; end; } @@ -401,14 +399,14 @@ bat_c01,148,53,1 script KVM Officer#KVM01B 4_M_CRU_HEAD,{ { if( $@KvM01BG_Victory == Bat_Team ) { // Victory - set kvm_point,kvm_point + 5; + kvm_point += 5; mes "[KVM Officer]"; mes "Good Game."; mes "May the glory of KVM be with you."; mes "You aquire the winning points: 5"; close2; } else { - set kvm_point,kvm_point + 1; + ++kvm_point; mes "[KVM Officer]"; mes "I am so sorry."; mes "I wish you better luck next time."; @@ -416,7 +414,7 @@ bat_c01,148,53,1 script KVM Officer#KVM01B 4_M_CRU_HEAD,{ close2; } bg_leave; - set Bat_Team,0; + Bat_Team = 0; warp "bat_room",154,150; end; } -- cgit v1.2.3-70-g09d2