diff --git a/scripts/zm/main/_zm_reimagined.gsc b/scripts/zm/main/_zm_reimagined.gsc index a1b289d4..97150f34 100644 --- a/scripts/zm/main/_zm_reimagined.gsc +++ b/scripts/zm/main/_zm_reimagined.gsc @@ -308,9 +308,9 @@ enemy_counter_hud() self endon("disconnect"); if ( getDvar( "g_gametype" ) == "zgrief" ) - { + { return; - } + } enemy_counter_hud = newClientHudElem(self); enemy_counter_hud.alignx = "left"; @@ -376,7 +376,7 @@ timer_hud() timer_hud.alpha = 1; if ( getDvar( "g_gametype" ) == "zgrief" ) - { + { set_time_frozen(timer_hud, 0); } @@ -405,7 +405,7 @@ round_timer_hud() round_timer_hud.alpha = 1; if ( getDvar( "g_gametype" ) == "zgrief" ) - { + { set_time_frozen(round_timer_hud, 0); } @@ -415,7 +415,7 @@ round_timer_hud() start_time = int(getTime() / 1000); if ( getDvar( "g_gametype" ) == "zgrief" ) - { + { level waittill( "restart_round" ); } else @@ -5203,7 +5203,8 @@ set_visible_after_rounds(player, num) { level waittill( "end_of_round" ); } - + test(); + tes2(); self setvisibletoplayer(player); } diff --git a/scripts/zm/main/_zm_reimagined_zgrief.gsc b/scripts/zm/main/_zm_reimagined_zgrief.gsc index 4235132b..1fe9e189 100644 --- a/scripts/zm/main/_zm_reimagined_zgrief.gsc +++ b/scripts/zm/main/_zm_reimagined_zgrief.gsc @@ -12,9 +12,9 @@ main() { if ( getDvar( "g_gametype" ) != "zgrief" ) - { + { return; - } + } replaceFunc(maps/mp/zombies/_zm::onallplayersready, scripts/zm/replaced/_zm::onallplayersready); replaceFunc(maps/mp/zombies/_zm_audio_announcer::playleaderdialogonplayer, scripts/zm/replaced/_zm_audio_announcer::playleaderdialogonplayer); @@ -24,10 +24,10 @@ main() init() { - if ( getDvar( "g_gametype" ) != "zgrief" ) - { + if ( getDvar( "g_gametype" ) != "zgrief" ) + { return; - } + } precacheStatusIcon( "waypoint_revive" ); @@ -428,22 +428,22 @@ wait_and_freeze_controls(bool) round_start_countdown_hud(time) { countdown = createServerFontString( "objective", 2.2 ); - countdown setPoint( "CENTER", "CENTER", 0, 0 ); - countdown.foreground = false; - countdown.alpha = 1; - countdown.color = ( 1, 1, 0 ); - countdown.hidewheninmenu = true; - countdown maps/mp/gametypes_zm/_hud::fontpulseinit(); - countdown thread round_start_countdown_hud_timer(time); + countdown setPoint( "CENTER", "CENTER", 0, 0 ); + countdown.foreground = false; + countdown.alpha = 1; + countdown.color = ( 1, 1, 0 ); + countdown.hidewheninmenu = true; + countdown maps/mp/gametypes_zm/_hud::fontpulseinit(); + countdown thread round_start_countdown_hud_timer(time); countdown thread round_start_countdown_hud_end_game_watcher(); countdown.countdown_text = createServerFontString( "objective", 1.5 ); - countdown.countdown_text setPoint( "CENTER", "CENTER", 0, -40 ); - countdown.countdown_text.foreground = false; - countdown.countdown_text.alpha = 1; - countdown.countdown_text.color = ( 1.000, 1.000, 1.000 ); - countdown.countdown_text.hidewheninmenu = true; - countdown.countdown_text.label = &"ROUND BEGINS IN"; + countdown.countdown_text setPoint( "CENTER", "CENTER", 0, -40 ); + countdown.countdown_text.foreground = false; + countdown.countdown_text.alpha = 1; + countdown.countdown_text.color = ( 1.000, 1.000, 1.000 ); + countdown.countdown_text.hidewheninmenu = true; + countdown.countdown_text.label = &"ROUND BEGINS IN"; return countdown; } @@ -467,34 +467,34 @@ round_start_countdown_hud_timer(time) { level endon( "end_game" ); - timer = time; - while ( true ) - { - self setValue( timer ); - wait 1; - timer--; - if ( timer <= 5 ) - { - self thread countdown_pulse( self, timer ); - break; - } - } + timer = time; + while ( true ) + { + self setValue( timer ); + wait 1; + timer--; + if ( timer <= 5 ) + { + self thread countdown_pulse( self, timer ); + break; + } + } } countdown_pulse( hud_elem, duration ) { - level endon( "end_game" ); + level endon( "end_game" ); - waittillframeend; + waittillframeend; - while ( duration > 0 && !level.gameended ) - { - hud_elem thread maps/mp/gametypes_zm/_hud::fontpulse( level ); - wait ( hud_elem.inframes * 0.05 ); - hud_elem setvalue( duration ); - duration--; - wait ( 1 - ( hud_elem.inframes * 0.05 ) ); - } + while ( duration > 0 && !level.gameended ) + { + hud_elem thread maps/mp/gametypes_zm/_hud::fontpulse( level ); + wait ( hud_elem.inframes * 0.05 ); + hud_elem setvalue( duration ); + duration--; + wait ( 1 - ( hud_elem.inframes * 0.05 ) ); + } } zombie_spawn_wait(time) diff --git a/scripts/zm/mod.gsc b/scripts/zm/mod.gsc index 77897e28..6a99d49a 100644 --- a/scripts/zm/mod.gsc +++ b/scripts/zm/mod.gsc @@ -3,12 +3,12 @@ main() { - scripts/zm/main/_zm_reimagined::main(); - scripts/zm/main/_zm_reimagined_zgrief::main(); + scripts/zm/main/_zm_reimagined::main(); + scripts/zm/main/_zm_reimagined_zgrief::main(); } init() { - scripts/zm/main/_zm_reimagined::init(); - scripts/zm/main/_zm_reimagined_zgrief::init(); + scripts/zm/main/_zm_reimagined::init(); + scripts/zm/main/_zm_reimagined_zgrief::init(); } \ No newline at end of file diff --git a/scripts/zm/replaced/_zm_ai_brutus.gsc b/scripts/zm/replaced/_zm_ai_brutus.gsc index 2ce492b2..722c1e19 100644 --- a/scripts/zm/replaced/_zm_ai_brutus.gsc +++ b/scripts/zm/replaced/_zm_ai_brutus.gsc @@ -4,10 +4,10 @@ brutus_health_increases() { - if(level.scr_zm_ui_gametype == "zgrief") + if(level.scr_zm_ui_gametype == "zgrief") { - return; - } + return; + } if ( level.round_number > level.brutus_last_spawn_round ) { diff --git a/scripts/zm/replaced/_zm_equip_subwoofer.gsc b/scripts/zm/replaced/_zm_equip_subwoofer.gsc index f51babc7..496c2dab 100644 --- a/scripts/zm/replaced/_zm_equip_subwoofer.gsc +++ b/scripts/zm/replaced/_zm_equip_subwoofer.gsc @@ -24,7 +24,7 @@ startsubwooferdeploy( weapon, armed ) } if ( isDefined( weapon ) ) { - weapon subwoofer_power_on(); + weapon subwoofer_power_on(); if ( weapon.power_on ) { self thread maps/mp/zombies/_zm_equip_subwoofer::subwooferthink( weapon, armed ); @@ -216,12 +216,12 @@ subwooferthink( weapon, armed ) } _k681 = getNextArrayKey( _a681, _k681 ); } - /* + /* if ( weapon.subwoofer_kills >= 45 ) { self thread subwoofer_expired( weapon ); } - */ + */ } } @@ -234,7 +234,7 @@ startsubwooferdecay( weapon ) { if ( weapon.power_on ) { - self.subwoofer_kills = 0; + self.subwoofer_kills = 0; self.subwoofer_health--; if ( self.subwoofer_health <= 0 ) @@ -245,9 +245,9 @@ startsubwooferdecay( weapon ) wait 1; } - self thread maps/mp/zombies/_zm_equip_subwoofer::subwoofer_expired( weapon ); + self thread maps/mp/zombies/_zm_equip_subwoofer::subwoofer_expired( weapon ); - /* + /* if ( isDefined( weapon ) ) { self maps/mp/zombies/_zm_equip_subwoofer::destroy_placed_subwoofer(); @@ -261,5 +261,5 @@ startsubwooferdecay( weapon ) self.subwoofer_emped = undefined; self.subwoofer_emp_time = undefined; self maps/mp/zombies/_zm_equip_subwoofer::cleanupoldsubwoofer(); - */ + */ } \ No newline at end of file diff --git a/scripts/zm/zm_buried/zm_buried_reimagined.gsc b/scripts/zm/zm_buried/zm_buried_reimagined.gsc index 23bfbf1d..a489e338 100644 --- a/scripts/zm/zm_buried/zm_buried_reimagined.gsc +++ b/scripts/zm/zm_buried/zm_buried_reimagined.gsc @@ -6,5 +6,5 @@ main() { - //replaceFunc(maps/mp/zombies/_zm_equip_subwoofer::startsubwooferdecay, scripts/zm/replaced/_zm_equip_subwoofer::startsubwooferdecay); + //replaceFunc(maps/mp/zombies/_zm_equip_subwoofer::startsubwooferdecay, scripts/zm/replaced/_zm_equip_subwoofer::startsubwooferdecay); } \ No newline at end of file diff --git a/scripts/zm/zm_transit/zm_transit_reimagined.gsc b/scripts/zm/zm_transit/zm_transit_reimagined.gsc index e8fd0fff..01d32781 100644 --- a/scripts/zm/zm_transit/zm_transit_reimagined.gsc +++ b/scripts/zm/zm_transit/zm_transit_reimagined.gsc @@ -9,6 +9,6 @@ main() { replaceFunc(maps/mp/zm_transit::lava_damage_depot, scripts/zm/replaced/zm_transit::lava_damage_depot); - replaceFunc(maps/mp/zombies/_zm_equip_electrictrap::startelectrictrapdeploy, scripts/zm/replaced/_zm_equip_electrictrap::startelectrictrapdeploy); + replaceFunc(maps/mp/zombies/_zm_equip_electrictrap::startelectrictrapdeploy, scripts/zm/replaced/_zm_equip_electrictrap::startelectrictrapdeploy); replaceFunc(maps/mp/zombies/_zm_equip_turret::startturretdeploy, scripts/zm/replaced/_zm_equip_turret::startturretdeploy); } \ No newline at end of file