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/kvm02.txt | 72 ++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 37 deletions(-) (limited to 'npc/battleground/kvm/kvm02.txt') diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt index 06f3a2dcf..bf41528cc 100644 --- a/npc/battleground/kvm/kvm02.txt +++ b/npc/battleground/kvm/kvm02.txt @@ -29,7 +29,7 @@ OnInit: end; OnEnterBG: - set $@KvM02BG_id1, waitingroom2bg("bat_c02",52,129,"KvM02_BG::OnGuillaumeQuit","KvM02_BG::OnGuillaumeDie"); + $@KvM02BG_id1 = waitingroom2bg("bat_c02",52,129,"KvM02_BG::OnGuillaumeQuit","KvM02_BG::OnGuillaumeDie"); end; } @@ -43,7 +43,7 @@ OnInit: end; OnEnterBG: - set $@KvM02BG_id2, waitingroom2bg("bat_c02",147,55,"KvM02_BG::OnCroixQuit","KvM02_BG::OnCroixDie"); + $@KvM02BG_id2 = waitingroom2bg("bat_c02",147,55,"KvM02_BG::OnCroixQuit","KvM02_BG::OnCroixDie"); end; } @@ -95,7 +95,7 @@ OnDisable: end; OnTouch: - set Bat_Team,1; + Bat_Team = 1; setquest 6025; end; } @@ -116,7 +116,7 @@ OnDisable: end; OnTouch: - set Bat_Team,2; + Bat_Team = 2; setquest 6025; end; } @@ -141,11 +141,10 @@ OnCroixJoin: end; OnGuillaumeQuit: - //set BG_Delay_Tick, gettimetick(2) + 1200; + //BG_Delay_Tick = gettimetick(2) + 1200; OnGuillaumeDie: - if( $@KvM02BG == 2 ) - { - set .Guillaume_Count, .Guillaume_Count - 1; + if ($@KvM02BG == 2) { + --.Guillaume_Count; bg_updatescore "bat_c02",.Guillaume_Count,.Croix_Count; if( .Guillaume_Count < 1 ) donpcevent "KvM02_BG::OnCroixWin"; else { @@ -156,11 +155,10 @@ OnGuillaumeDie: end; OnCroixQuit: - //set BG_Delay_Tick, gettimetick(2) + 1200; + //BG_Delay_Tick = gettimetick(2) + 1200; OnCroixDie: - if( $@KvM02BG == 2 ) - { - set .Croix_Count, .Croix_Count - 1; + if ($@KvM02BG == 2) { + --.Croix_Count; bg_updatescore "bat_c02",.Guillaume_Count,.Croix_Count; if( .Croix_Count < 1 ) donpcevent "KvM02_BG::OnGuillaumeWin"; else { @@ -173,13 +171,13 @@ OnCroixDie: OnReadyCheck: if( $@KvM02BG ) end; - set .@Guillaume, getwaitingroomstate(0,"KvM02R_Guillaume"); - set .@Croix, getwaitingroomstate(0,"KvM02R_Croix"); + .@Guillaume = getwaitingroomstate(0,"KvM02R_Guillaume"); + .@Croix = getwaitingroomstate(0,"KvM02R_Croix"); if( .@Guillaume < 5 || .@Croix < 5 ) end; - set $@KvM02BG, 1; // Starting + $@KvM02BG = 1; // Starting donpcevent "KvM02R_Croix::OnEnterBG"; donpcevent "KvM02R_Guillaume::OnEnterBG"; donpcevent "KvM02_BG::OnStart"; @@ -188,7 +186,7 @@ OnReadyCheck: OnStart: disablenpc "KVM Officer#KVM02A"; disablenpc "KVM Officer#KVM02B"; - set $@KvM02BG_Victory, 0; + $@KvM02BG_Victory = 0; // Warp Teams bg_warp $@KvM02BG_id1,"bat_c02",53,128; bg_warp $@KvM02BG_id2,"bat_c02",146,55; @@ -241,18 +239,18 @@ OnTimer59000: OnTimer61000: // Team Members - set .Guillaume_Count, bg_get_data($@KvM02BG_id1, 0); - set .Croix_Count, bg_get_data($@KvM02BG_id2, 0); + .Guillaume_Count = bg_get_data($@KvM02BG_id1, 0); + .Croix_Count = bg_get_data($@KvM02BG_id2, 0); if( .Guillaume_Count < 5 || .Croix_Count < 5 ) { - set $@KvM02BG_Victory, 3; - set $@KvM02BG, 3; + $@KvM02BG_Victory = 3; + $@KvM02BG = 3; mapannounce "bat_c02","There are not enough players to start the battle",1,0x808080; stopnpctimer; donpcevent "KvM02_BG::OnStop"; end; } - set $@KvM02BG, 2; // Playing + $@KvM02BG = 2; // Playing bg_warp $@KvM02BG_id1,"bat_c02",62,119; bg_warp $@KvM02BG_id2,"bat_c02",137,64; end; @@ -285,8 +283,8 @@ OnTimer360000: donpcevent "KvM02_BG::OnGuillaumeWin"; else { // Draw Game - set $@KvM02BG, 3; - set $@KvM02BG_Victory, 3; + $@KvM02BG = 3; + $@KvM02BG_Victory = 3; mapannounce "bat_c02", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00"; mapannounce "bat_c02", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00"; mapannounce "bat_c02", "This battle has ended in a draw.",bc_map,"0x00ff00"; @@ -295,8 +293,8 @@ OnTimer360000: end; OnGuillaumeWin: - set $@KvM02BG, 3; - set $@KvM02BG_Victory, 1; + $@KvM02BG = 3; + $@KvM02BG_Victory = 1; mapannounce "bat_c02", "Guillaume wins!",bc_map,"0x00ff00"; mapannounce "bat_c02", "Congratulations to Guillaume members.",bc_map,"0x00ff00"; mapannounce "bat_c02", "Everyone will be moved to the start point.",bc_map,"0x00ff00"; @@ -304,8 +302,8 @@ OnGuillaumeWin: end; OnCroixWin: - set $@KvM02BG, 3; - set $@KvM02BG_Victory, 2; + $@KvM02BG = 3; + $@KvM02BG_Victory = 2; mapannounce "bat_c02", "Croix wins!",bc_map,"0x00ff00"; mapannounce "bat_c02", "Congratulations to Croix members.",bc_map,"0x00ff00"; mapannounce "bat_c02", "Everyone will be moved to the start point.",bc_map,"0x00ff00"; @@ -323,17 +321,17 @@ OnStop: end; OnReset: - set .Croix_Count, 0; - set .Guillaume_Count, 0; - set $@KvM02BG_Victory, 0; - if( $@KvM02BG_id1 ) { bg_destroy $@KvM02BG_id1; set $@KvM02BG_id1, 0; } - if( $@KvM02BG_id2 ) { bg_destroy $@KvM02BG_id2; set $@KvM02BG_id2, 0; } + .Croix_Count = 0; + .Guillaume_Count = 0; + $@KvM02BG_Victory = 0; + if( $@KvM02BG_id1 ) { bg_destroy $@KvM02BG_id1; $@KvM02BG_id1 = 0; } + if( $@KvM02BG_id2 ) { bg_destroy $@KvM02BG_id2; $@KvM02BG_id2 = 0; } disablenpc "KVM Officer#KVM02A"; disablenpc "KVM Officer#KVM02B"; mapwarp "bat_c02","bat_room",154,150; maprespawnguildid "bat_c02",0,3; // Just in case someone else bg_updatescore "bat_c02",5,5; - set $@KvM02BG, 0; + $@KvM02BG = 0; donpcevent "KvM02_BG::OnReadyCheck"; // Maybe a game is ready to start end; } @@ -376,7 +374,7 @@ bat_c02,51,130,5 script KVM Officer#KVM02A 4_M_KY_HEAD,{ { if( $@KvM02BG_Victory == Bat_Team ) { // Victory - set kvm_point,kvm_point + 1; + ++kvm_point; mes "[KVM Officer]"; mes "Good Game."; mes "May the glory of KVM be with you."; @@ -390,7 +388,7 @@ bat_c02,51,130,5 script KVM Officer#KVM02A 4_M_KY_HEAD,{ close2; } bg_leave; - set Bat_Team,0; + Bat_Team = 0; warp "bat_room",154,150; end; } @@ -402,7 +400,7 @@ bat_c02,148,53,1 script KVM Officer#KVM02B 4_M_CRU_HEAD,{ { if( $@KvM02BG_Victory == Bat_Team ) { // Victory - set kvm_point,kvm_point + 1; + ++kvm_point; mes "[KVM Officer]"; mes "Good Game."; mes "May the glory of KVM be with you."; @@ -416,7 +414,7 @@ bat_c02,148,53,1 script KVM Officer#KVM02B 4_M_CRU_HEAD,{ close2; } bg_leave; - set Bat_Team,0; + Bat_Team = 0; warp "bat_room",154,150; end; } -- cgit v1.2.3-60-g2f50