Fixed inconsistencies.

This commit is contained in:
JezuzLizard
2021-12-07 22:03:12 -08:00
parent ad26d49f84
commit 7a990cd59f
10 changed files with 37 additions and 38 deletions

View File

@ -75,6 +75,7 @@ onstartgametype() //checked changed to match cerberus output
level.overrideteamscore = 1; level.overrideteamscore = 1;
level.rankenabled = 0; level.rankenabled = 0;
level.medalsenabled = 0; level.medalsenabled = 0;
allowed = [];
allowed[ 0 ] = "dm"; allowed[ 0 ] = "dm";
maps/mp/gametypes/_gameobjects::main( allowed ); maps/mp/gametypes/_gameobjects::main( allowed );
maps/mp/gametypes/_spawning::create_map_placed_influencers(); maps/mp/gametypes/_spawning::create_map_placed_influencers();
@ -212,13 +213,15 @@ pregamemain() //checked did not reference cerberus output used beta dump _pregam
level.pregameplayercount.color = yellow; level.pregameplayercount.color = yellow;
level.pregameplayercount maps/mp/gametypes/_hud::fontpulseinit(); level.pregameplayercount maps/mp/gametypes/_hud::fontpulseinit();
oldcount = -1; oldcount = -1;
minplayers = getDvarInt( "party_minplayers" );
for(;;) for(;;)
{ {
wait( 1 ); wait( 1 );
count = GetPlayersNeededCount(); //count = GetPlayersNeededCount();
cur_playercount = getPlayers().size;
if ( 0 >= count ) amount_needed = minplayers - cur_playercount;
if ( amount_needed <= 0 )
{ {
break; break;
} }
@ -231,11 +234,11 @@ pregamemain() //checked did not reference cerberus output used beta dump _pregam
} }
#/ #/
*/ */
if ( oldcount != count ) if ( oldcount != amount_needed )
{ {
level.pregamePlayerCount setValue( count ); level.pregamePlayerCount setValue( amount_needed );
level.pregamePlayerCount thread maps\mp\gametypes\_hud::fontPulse( level ); level.pregamePlayerCount thread maps\mp\gametypes\_hud::fontPulse( level );
oldcount = count; oldcount = amount_needed;
} }
} }
level.pregameplayercount settext( "" ); level.pregameplayercount settext( "" );
@ -250,7 +253,7 @@ pregamemain() //checked did not reference cerberus output used beta dump _pregam
visionsetnaked( "mpIntro", 3 ); visionsetnaked( "mpIntro", 3 );
wait 4; wait 4;
endpregame(); endpregame();
pregamestartgame(); //pregamestartgame();
saveplayerspregameinfo(); saveplayerspregameinfo();
map_restart( 0 ); map_restart( 0 );
} }

View File

@ -277,7 +277,7 @@ hqmainloop() //checked changed to match cerberus output
timerdisplay = []; timerdisplay = [];
foreach ( team in level.teams ) foreach ( team in level.teams )
{ {
timerdisplay[ team ] = createservertimer( "objective", 1,4, team ); timerdisplay[ team ] = createservertimer( "objective", 1.4, team );
timerdisplay[ team ] setgamemodeinfopoint(); timerdisplay[ team ] setgamemodeinfopoint();
timerdisplay[ team ].label = hqspawninginstr; timerdisplay[ team ].label = hqspawninginstr;
timerdisplay[ team ].font = "small"; timerdisplay[ team ].font = "small";

View File

@ -102,7 +102,7 @@ onstartgametype() //checked matches cerberus output
maps/mp/gametypes/_wager::addpowerup( "specialty_fallheight", "perk", &"PERKS_LIGHTWEIGHT", "perk_lightweight" ); maps/mp/gametypes/_wager::addpowerup( "specialty_fallheight", "perk", &"PERKS_LIGHTWEIGHT", "perk_lightweight" );
maps/mp/gametypes/_wager::addpowerup( "specialty_longersprint", "perk", &"PERKS_EXTREME_CONDITIONING", "perk_marathon" ); maps/mp/gametypes/_wager::addpowerup( "specialty_longersprint", "perk", &"PERKS_EXTREME_CONDITIONING", "perk_marathon" );
maps/mp/gametypes/_wager::addpowerup( 2, "score_multiplier", &"PERKS_SCORE_MULTIPLIER", "perk_times_two" ); maps/mp/gametypes/_wager::addpowerup( 2, "score_multiplier", &"PERKS_SCORE_MULTIPLIER", "perk_times_two" );
level.guncycletimer = createservertimer( "extrasmall", 1,2 ); level.guncycletimer = createservertimer( "extrasmall", 1.2 );
level.guncycletimer.horzalign = "user_left"; level.guncycletimer.horzalign = "user_left";
level.guncycletimer.vertalign = "user_top"; level.guncycletimer.vertalign = "user_top";
level.guncycletimer.x = 10; level.guncycletimer.x = 10;

View File

@ -605,7 +605,7 @@ end_rounds_early( winner ) //checked matches cerberus output
set_gamemode_var( "ZM_roundLimit", cur_round ); set_gamemode_var( "ZM_roundLimit", cur_round );
if ( isDefined( winner ) ) if ( isDefined( winner ) )
{ {
level notify( "game_module_ended" ); level notify( "game_module_ended", winner );
} }
else else
{ {
@ -1985,9 +1985,22 @@ blank()
main()
{
replaceFunc( maps/mp/gametypes/dem::isscoreboosting, ::always_false );
replaceFunc( maps/mp/gametypes/dom::isscoreboosting, ::always_false );
replaceFunc( maps/mp/gametypes/koth::isscoreboosting, ::always_false );
}
init()
{
level.isKillBoosting = ::always_false;
}
always_false()
{
return false;
}

View File

@ -219,8 +219,6 @@ chugabud_save_loadout() //checked changed to match cerberus output
index = 0; index = 0;
foreach ( weapon in primaries ) foreach ( weapon in primaries )
{ {
logline1 = "weapon: " + weapon + "\n";
logprint( logline1 );
self.loadout.weapons[ index ] = maps/mp/zombies/_zm_weapons::get_player_weapondata( self, weapon ); self.loadout.weapons[ index ] = maps/mp/zombies/_zm_weapons::get_player_weapondata( self, weapon );
if ( weapon == currentweapon || self.loadout.weapons[ index ][ "alt_name" ] == currentweapon ) if ( weapon == currentweapon || self.loadout.weapons[ index ][ "alt_name" ] == currentweapon )
{ {
@ -281,8 +279,6 @@ chugabud_give_loadout() //checked partially changed to match cerberus output con
i = 0; i = 0;
while ( i < loadout.weapons.size ) while ( i < loadout.weapons.size )
{ {
logline1 = "loadout.weapons[ " + i + " ][ name ] " + loadout.weapons[ i ][ "name" ] + "\n";
logprint( logline1 );
if ( !isDefined( loadout.weapons[ i ] ) ) if ( !isDefined( loadout.weapons[ i ] ) )
{ {
i++; i++;

View File

@ -531,13 +531,13 @@ powerup_drop( drop_point ) //checked partially changed to match cerberus output
powerup thread powerup_move(); powerup thread powerup_move();
powerup thread powerup_emp(); powerup thread powerup_emp();
level.zombie_vars[ "zombie_drop_item" ] = 0; level.zombie_vars[ "zombie_drop_item" ] = 0;
level notify( "powerup_dropped" ); level notify( "powerup_dropped", powerup );
} }
specific_powerup_drop( powerup_name, drop_spot, powerup_team, powerup_location ) //checked partially changed to match cerberus output specific_powerup_drop( powerup_name, drop_spot, powerup_team, powerup_location ) //checked partially changed to match cerberus output
{ {
powerup = maps/mp/zombies/_zm_net::network_safe_spawn( "powerup", 1, "script_model", drop_spot + vectorScale( ( 0, 0, 1 ), 40 ) ); powerup = maps/mp/zombies/_zm_net::network_safe_spawn( "powerup", 1, "script_model", drop_spot + vectorScale( ( 0, 0, 1 ), 40 ) );
level notify( "powerup_dropped" ); level notify( "powerup_dropped", powerup );
if ( isDefined( powerup ) ) if ( isDefined( powerup ) )
{ {
powerup powerup_setup( powerup_name, powerup_team, powerup_location ); powerup powerup_setup( powerup_name, powerup_team, powerup_location );
@ -1413,7 +1413,7 @@ powerup_timeout() //checked partially changed to match cerberus output
i++; i++;
continue; continue;
} }
else if ( i < 25 ) if ( i < 25 )
{ {
wait 0.25; wait 0.25;
i++; i++;

View File

@ -19,14 +19,6 @@
init() //checked matches cerberus output init() //checked matches cerberus output
{ {
//begin debug
level.custom_zm_weapons_loaded = 1;
maps/mp/zombies/_zm_bot::init();
if ( !isDefined( level.debugLogging_zm_weapons ) )
{
level.debugLogging_zm_weapons = 0;
}
//end debug
init_weapons(); init_weapons();
init_weapon_upgrade(); init_weapon_upgrade();
init_weapon_toggle(); init_weapon_toggle();

View File

@ -13,7 +13,6 @@ init() //checked matches cerberus output
{ {
return; return;
} }
level.start_weapon = "slowgun_zm";
registerclientfield( "actor", "slowgun_fx", 12000, 3, "int" ); registerclientfield( "actor", "slowgun_fx", 12000, 3, "int" );
registerclientfield( "actor", "anim_rate", 7000, 5, "float" ); registerclientfield( "actor", "anim_rate", 7000, 5, "float" );
registerclientfield( "allplayers", "anim_rate", 7000, 5, "float" ); registerclientfield( "allplayers", "anim_rate", 7000, 5, "float" );
@ -137,10 +136,6 @@ slowgun_get_enemies_in_range( upgraded, position, forward, possible_targets ) //
i = 0; i = 0;
while ( i < possible_targets.size ) while ( i < possible_targets.size )
{ {
logline1 = "the value of i is: " + i + "\n";
logPrint( logline1 );
logline2 = "the possible targets are: " + possible_targets.size + "\n";
logPrint( logline2 );
if ( !isdefined( possible_targets[ i ] ) || !isalive( possible_targets[ i ] ) ) if ( !isdefined( possible_targets[ i ] ) || !isalive( possible_targets[ i ] ) )
{ {
i++; i++;

View File

@ -631,13 +631,13 @@ grief_laststand_weapons_return() //checked changed to match cerberus output
continue; continue;
} }
self giveweapon( self.grief_savedweapon_weapons[ i ], 0, self maps/mp/zombies/_zm_weapons::get_pack_a_punch_weapon_options( self.grief_savedweapon_weapons[ i ] ) ); self giveweapon( self.grief_savedweapon_weapons[ i ], 0, self maps/mp/zombies/_zm_weapons::get_pack_a_punch_weapon_options( self.grief_savedweapon_weapons[ i ] ) );
if ( isdefined( self.grief_savedweapon_weaponsammo_clip[ index ] ) ) if ( isdefined( self.grief_savedweapon_weaponsammo_clip[ i ] ) )
{ {
self setweaponammoclip( self.grief_savedweapon_weapons[ i ], self.grief_savedweapon_weaponsammo_clip[ index ] ); self setweaponammoclip( self.grief_savedweapon_weapons[ i ], self.grief_savedweapon_weaponsammo_clip[ i ] );
} }
if ( isdefined( self.grief_savedweapon_weaponsammo_stock[ index ] ) ) if ( isdefined( self.grief_savedweapon_weaponsammo_stock[ i ] ) )
{ {
self setweaponammostock( self.grief_savedweapon_weapons[ i ], self.grief_savedweapon_weaponsammo_stock[ index ] ); self setweaponammostock( self.grief_savedweapon_weapons[ i ], self.grief_savedweapon_weaponsammo_stock[ i ] );
} }
i++; i++;
} }

View File

@ -427,7 +427,7 @@ wait_for_team_death( team )
{ {
winning_team = "B"; winning_team = "B";
} }
level notify( "meat_end" ); level notify( "meat_end", winning_team );
} }
check_should_save_player( team ) check_should_save_player( team )