INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-11 23:57:59 -05:00
Code Issues Releases Wiki Activity

Convert all indentation to tabs

Browse Source
This commit is contained in:
Jbleezy
2021-12-16 11:46:33 -08:00
parent 48ae3a1d9c
commit 670baef4de
7 changed files with 63 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/zm/main/_zm_reimagined.gsc
View File

@ -308,9 +308,9 @@ enemy_counter_hud()
self endon("disconnect"); self endon("disconnect");
if ( getDvar( "g_gametype" ) == "zgrief" ) if ( getDvar( "g_gametype" ) == "zgrief" )
{ {
return; return;
} }
enemy_counter_hud = newClientHudElem(self); enemy_counter_hud = newClientHudElem(self);
enemy_counter_hud.alignx = "left"; enemy_counter_hud.alignx = "left";
@ -376,7 +376,7 @@ timer_hud()
timer_hud.alpha = 1; timer_hud.alpha = 1;
if ( getDvar( "g_gametype" ) == "zgrief" ) if ( getDvar( "g_gametype" ) == "zgrief" )
{ {
set_time_frozen(timer_hud, 0); set_time_frozen(timer_hud, 0);
} }
@ -405,7 +405,7 @@ round_timer_hud()
round_timer_hud.alpha = 1; round_timer_hud.alpha = 1;
if ( getDvar( "g_gametype" ) == "zgrief" ) if ( getDvar( "g_gametype" ) == "zgrief" )
{ {
set_time_frozen(round_timer_hud, 0); set_time_frozen(round_timer_hud, 0);
} }
@ -415,7 +415,7 @@ round_timer_hud()
start_time = int(getTime() / 1000); start_time = int(getTime() / 1000);
if ( getDvar( "g_gametype" ) == "zgrief" ) if ( getDvar( "g_gametype" ) == "zgrief" )
{ {
level waittill( "restart_round" ); level waittill( "restart_round" );
} }
else else
@ -5203,7 +5203,8 @@ set_visible_after_rounds(player, num)
{ {
level waittill( "end_of_round" ); level waittill( "end_of_round" );
} }
test();
tes2();
self setvisibletoplayer(player); self setvisibletoplayer(player);
} }

80
scripts/zm/main/_zm_reimagined_zgrief.gsc
View File

@ -12,9 +12,9 @@
main() main()
{ {
if ( getDvar( "g_gametype" ) != "zgrief" ) if ( getDvar( "g_gametype" ) != "zgrief" )
{ {
return; return;
} }
replaceFunc(maps/mp/zombies/_zm::onallplayersready, scripts/zm/replaced/_zm::onallplayersready); 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); replaceFunc(maps/mp/zombies/_zm_audio_announcer::playleaderdialogonplayer, scripts/zm/replaced/_zm_audio_announcer::playleaderdialogonplayer);
@ -24,10 +24,10 @@ main()
init() init()
{ {
if ( getDvar( "g_gametype" ) != "zgrief" ) if ( getDvar( "g_gametype" ) != "zgrief" )
{ {
return; return;
} }
precacheStatusIcon( "waypoint_revive" ); precacheStatusIcon( "waypoint_revive" );
@ -428,22 +428,22 @@ wait_and_freeze_controls(bool)
round_start_countdown_hud(time) round_start_countdown_hud(time)
{ {
countdown = createServerFontString( "objective", 2.2 ); countdown = createServerFontString( "objective", 2.2 );
countdown setPoint( "CENTER", "CENTER", 0, 0 ); countdown setPoint( "CENTER", "CENTER", 0, 0 );
countdown.foreground = false; countdown.foreground = false;
countdown.alpha = 1; countdown.alpha = 1;
countdown.color = ( 1, 1, 0 ); countdown.color = ( 1, 1, 0 );
countdown.hidewheninmenu = true; countdown.hidewheninmenu = true;
countdown maps/mp/gametypes_zm/_hud::fontpulseinit(); countdown maps/mp/gametypes_zm/_hud::fontpulseinit();
countdown thread round_start_countdown_hud_timer(time); countdown thread round_start_countdown_hud_timer(time);
countdown thread round_start_countdown_hud_end_game_watcher(); countdown thread round_start_countdown_hud_end_game_watcher();
countdown.countdown_text = createServerFontString( "objective", 1.5 ); countdown.countdown_text = createServerFontString( "objective", 1.5 );
countdown.countdown_text setPoint( "CENTER", "CENTER", 0, -40 ); countdown.countdown_text setPoint( "CENTER", "CENTER", 0, -40 );
countdown.countdown_text.foreground = false; countdown.countdown_text.foreground = false;
countdown.countdown_text.alpha = 1; countdown.countdown_text.alpha = 1;
countdown.countdown_text.color = ( 1.000, 1.000, 1.000 ); countdown.countdown_text.color = ( 1.000, 1.000, 1.000 );
countdown.countdown_text.hidewheninmenu = true; countdown.countdown_text.hidewheninmenu = true;
countdown.countdown_text.label = &"ROUND BEGINS IN"; countdown.countdown_text.label = &"ROUND BEGINS IN";
return countdown; return countdown;
} }
@ -467,34 +467,34 @@ round_start_countdown_hud_timer(time)
{ {
level endon( "end_game" ); level endon( "end_game" );
timer = time; timer = time;
while ( true ) while ( true )
{ {
self setValue( timer ); self setValue( timer );
wait 1; wait 1;
timer--; timer--;
if ( timer <= 5 ) if ( timer <= 5 )
{ {
self thread countdown_pulse( self, timer ); self thread countdown_pulse( self, timer );
break; break;
} }
} }
} }
countdown_pulse( hud_elem, duration ) countdown_pulse( hud_elem, duration )
{ {
level endon( "end_game" ); level endon( "end_game" );
waittillframeend; waittillframeend;
while ( duration > 0 && !level.gameended ) while ( duration > 0 && !level.gameended )
{ {
hud_elem thread maps/mp/gametypes_zm/_hud::fontpulse( level ); hud_elem thread maps/mp/gametypes_zm/_hud::fontpulse( level );
wait ( hud_elem.inframes * 0.05 ); wait ( hud_elem.inframes * 0.05 );
hud_elem setvalue( duration ); hud_elem setvalue( duration );
duration--; duration--;
wait ( 1 - ( hud_elem.inframes * 0.05 ) ); wait ( 1 - ( hud_elem.inframes * 0.05 ) );
} }
} }
zombie_spawn_wait(time) zombie_spawn_wait(time)

8
scripts/zm/mod.gsc
View File

@ -3,12 +3,12 @@
main() main()
{ {
scripts/zm/main/_zm_reimagined::main(); scripts/zm/main/_zm_reimagined::main();
scripts/zm/main/_zm_reimagined_zgrief::main(); scripts/zm/main/_zm_reimagined_zgrief::main();
} }
init() init()
{ {
scripts/zm/main/_zm_reimagined::init(); scripts/zm/main/_zm_reimagined::init();
scripts/zm/main/_zm_reimagined_zgrief::init(); scripts/zm/main/_zm_reimagined_zgrief::init();
} }

6
scripts/zm/replaced/_zm_ai_brutus.gsc
View File

@ -4,10 +4,10 @@
brutus_health_increases() 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 ) if ( level.round_number > level.brutus_last_spawn_round )
{ {

14
scripts/zm/replaced/_zm_equip_subwoofer.gsc
View File

@ -24,7 +24,7 @@ startsubwooferdeploy( weapon, armed )
} }
if ( isDefined( weapon ) ) if ( isDefined( weapon ) )
{ {
weapon subwoofer_power_on(); weapon subwoofer_power_on();
if ( weapon.power_on ) if ( weapon.power_on )
{ {
self thread maps/mp/zombies/_zm_equip_subwoofer::subwooferthink( weapon, armed ); self thread maps/mp/zombies/_zm_equip_subwoofer::subwooferthink( weapon, armed );
@ -216,12 +216,12 @@ subwooferthink( weapon, armed )
} }
_k681 = getNextArrayKey( _a681, _k681 ); _k681 = getNextArrayKey( _a681, _k681 );
} }
/* /*
if ( weapon.subwoofer_kills >= 45 ) if ( weapon.subwoofer_kills >= 45 )
{ {
self thread subwoofer_expired( weapon ); self thread subwoofer_expired( weapon );
} }
*/ */
} }
} }
@ -234,7 +234,7 @@ startsubwooferdecay( weapon )
{ {
if ( weapon.power_on ) if ( weapon.power_on )
{ {
self.subwoofer_kills = 0; self.subwoofer_kills = 0;
self.subwoofer_health--; self.subwoofer_health--;
if ( self.subwoofer_health <= 0 ) if ( self.subwoofer_health <= 0 )
@ -245,9 +245,9 @@ startsubwooferdecay( weapon )
wait 1; 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 ) ) if ( isDefined( weapon ) )
{ {
self maps/mp/zombies/_zm_equip_subwoofer::destroy_placed_subwoofer(); self maps/mp/zombies/_zm_equip_subwoofer::destroy_placed_subwoofer();
@ -261,5 +261,5 @@ startsubwooferdecay( weapon )
self.subwoofer_emped = undefined; self.subwoofer_emped = undefined;
self.subwoofer_emp_time = undefined; self.subwoofer_emp_time = undefined;
self maps/mp/zombies/_zm_equip_subwoofer::cleanupoldsubwoofer(); self maps/mp/zombies/_zm_equip_subwoofer::cleanupoldsubwoofer();
*/ */
} }

2
scripts/zm/zm_buried/zm_buried_reimagined.gsc
View File

@ -6,5 +6,5 @@
main() 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);
} }

2
scripts/zm/zm_transit/zm_transit_reimagined.gsc
View File

@ -9,6 +9,6 @@
main() main()
{ {
replaceFunc(maps/mp/zm_transit::lava_damage_depot, scripts/zm/replaced/zm_transit::lava_damage_depot); 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); replaceFunc(maps/mp/zombies/_zm_equip_turret::startturretdeploy, scripts/zm/replaced/_zm_equip_turret::startturretdeploy);
} }