diff --git a/Multiplayer Core/patch_mp/maps/mp/gametypes/_pregame.gsc b/Multiplayer Core/patch_mp/maps/mp/gametypes/_pregame.gsc index 2ade502..5673fb1 100644 --- a/Multiplayer Core/patch_mp/maps/mp/gametypes/_pregame.gsc +++ b/Multiplayer Core/patch_mp/maps/mp/gametypes/_pregame.gsc @@ -75,6 +75,7 @@ onstartgametype() //checked changed to match cerberus output level.overrideteamscore = 1; level.rankenabled = 0; level.medalsenabled = 0; + allowed = []; allowed[ 0 ] = "dm"; maps/mp/gametypes/_gameobjects::main( allowed ); 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 maps/mp/gametypes/_hud::fontpulseinit(); oldcount = -1; + minplayers = getDvarInt( "party_minplayers" ); for(;;) { wait( 1 ); - count = GetPlayersNeededCount(); - - if ( 0 >= count ) + //count = GetPlayersNeededCount(); + cur_playercount = getPlayers().size; + amount_needed = minplayers - cur_playercount; + if ( amount_needed <= 0 ) { 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 ); - oldcount = count; + oldcount = amount_needed; } } level.pregameplayercount settext( "" ); @@ -250,7 +253,7 @@ pregamemain() //checked did not reference cerberus output used beta dump _pregam visionsetnaked( "mpIntro", 3 ); wait 4; endpregame(); - pregamestartgame(); + //pregamestartgame(); saveplayerspregameinfo(); map_restart( 0 ); } diff --git a/Multiplayer Core/patch_mp/maps/mp/gametypes/hq.gsc b/Multiplayer Core/patch_mp/maps/mp/gametypes/hq.gsc index c984799..8cd3e20 100644 --- a/Multiplayer Core/patch_mp/maps/mp/gametypes/hq.gsc +++ b/Multiplayer Core/patch_mp/maps/mp/gametypes/hq.gsc @@ -277,7 +277,7 @@ hqmainloop() //checked changed to match cerberus output timerdisplay = []; foreach ( team in level.teams ) { - timerdisplay[ team ] = createservertimer( "objective", 1,4, team ); + timerdisplay[ team ] = createservertimer( "objective", 1.4, team ); timerdisplay[ team ] setgamemodeinfopoint(); timerdisplay[ team ].label = hqspawninginstr; timerdisplay[ team ].font = "small"; diff --git a/Multiplayer Core/patch_mp/maps/mp/gametypes/shrp.gsc b/Multiplayer Core/patch_mp/maps/mp/gametypes/shrp.gsc index eb33e3d..d1c97f1 100644 --- a/Multiplayer Core/patch_mp/maps/mp/gametypes/shrp.gsc +++ b/Multiplayer Core/patch_mp/maps/mp/gametypes/shrp.gsc @@ -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_longersprint", "perk", &"PERKS_EXTREME_CONDITIONING", "perk_marathon" ); 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.vertalign = "user_top"; level.guncycletimer.x = 10; diff --git a/Zombie Core/patch_zm/maps/mp/gametypes_zm/_zm_gametype.gsc b/Zombie Core/patch_zm/maps/mp/gametypes_zm/_zm_gametype.gsc index 40b63af..f2f6fb0 100644 --- a/Zombie Core/patch_zm/maps/mp/gametypes_zm/_zm_gametype.gsc +++ b/Zombie Core/patch_zm/maps/mp/gametypes_zm/_zm_gametype.gsc @@ -605,7 +605,7 @@ end_rounds_early( winner ) //checked matches cerberus output set_gamemode_var( "ZM_roundLimit", cur_round ); if ( isDefined( winner ) ) { - level notify( "game_module_ended" ); + level notify( "game_module_ended", winner ); } 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; +} diff --git a/Zombie Core/patch_zm/maps/mp/zombies/_zm_chugabud.gsc b/Zombie Core/patch_zm/maps/mp/zombies/_zm_chugabud.gsc index 1cf928d..cb9a6dd 100644 --- a/Zombie Core/patch_zm/maps/mp/zombies/_zm_chugabud.gsc +++ b/Zombie Core/patch_zm/maps/mp/zombies/_zm_chugabud.gsc @@ -219,8 +219,6 @@ chugabud_save_loadout() //checked changed to match cerberus output index = 0; foreach ( weapon in primaries ) { - logline1 = "weapon: " + weapon + "\n"; - logprint( logline1 ); self.loadout.weapons[ index ] = maps/mp/zombies/_zm_weapons::get_player_weapondata( self, weapon ); 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; while ( i < loadout.weapons.size ) { - logline1 = "loadout.weapons[ " + i + " ][ name ] " + loadout.weapons[ i ][ "name" ] + "\n"; - logprint( logline1 ); if ( !isDefined( loadout.weapons[ i ] ) ) { i++; diff --git a/Zombie Core/patch_zm/maps/mp/zombies/_zm_powerups.gsc b/Zombie Core/patch_zm/maps/mp/zombies/_zm_powerups.gsc index dda66fe..ba88958 100644 --- a/Zombie Core/patch_zm/maps/mp/zombies/_zm_powerups.gsc +++ b/Zombie Core/patch_zm/maps/mp/zombies/_zm_powerups.gsc @@ -531,13 +531,13 @@ powerup_drop( drop_point ) //checked partially changed to match cerberus output powerup thread powerup_move(); powerup thread powerup_emp(); 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 { 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 ) ) { powerup powerup_setup( powerup_name, powerup_team, powerup_location ); @@ -1413,7 +1413,7 @@ powerup_timeout() //checked partially changed to match cerberus output i++; continue; } - else if ( i < 25 ) + if ( i < 25 ) { wait 0.25; i++; diff --git a/Zombie Core/patch_zm/maps/mp/zombies/_zm_weapons.gsc b/Zombie Core/patch_zm/maps/mp/zombies/_zm_weapons.gsc index 6f62d73..a4476cf 100644 --- a/Zombie Core/patch_zm/maps/mp/zombies/_zm_weapons.gsc +++ b/Zombie Core/patch_zm/maps/mp/zombies/_zm_weapons.gsc @@ -19,14 +19,6 @@ 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_weapon_upgrade(); init_weapon_toggle(); diff --git a/Zombie Maps/Buried/zm_buried_patch/maps/mp/zombies/_zm_weap_slowgun.gsc b/Zombie Maps/Buried/zm_buried_patch/maps/mp/zombies/_zm_weap_slowgun.gsc index 41dbbbc..b478a44 100644 --- a/Zombie Maps/Buried/zm_buried_patch/maps/mp/zombies/_zm_weap_slowgun.gsc +++ b/Zombie Maps/Buried/zm_buried_patch/maps/mp/zombies/_zm_weap_slowgun.gsc @@ -13,7 +13,6 @@ init() //checked matches cerberus output { return; } - level.start_weapon = "slowgun_zm"; registerclientfield( "actor", "slowgun_fx", 12000, 3, "int" ); registerclientfield( "actor", "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; 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 ] ) ) { i++; diff --git a/Zombie Maps/Tranzit/zm_transit_patch/maps/mp/gametypes_zm/zgrief.gsc b/Zombie Maps/Tranzit/zm_transit_patch/maps/mp/gametypes_zm/zgrief.gsc index 0bd0408..0970c3b 100644 --- a/Zombie Maps/Tranzit/zm_transit_patch/maps/mp/gametypes_zm/zgrief.gsc +++ b/Zombie Maps/Tranzit/zm_transit_patch/maps/mp/gametypes_zm/zgrief.gsc @@ -631,13 +631,13 @@ grief_laststand_weapons_return() //checked changed to match cerberus output 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 ] ) ); - 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++; } diff --git a/Zombie Maps/Tranzit/zm_transit_patch/maps/mp/zombies/_zm_game_module_meat_utility.gsc b/Zombie Maps/Tranzit/zm_transit_patch/maps/mp/zombies/_zm_game_module_meat_utility.gsc index 101f026..3f365b9 100644 --- a/Zombie Maps/Tranzit/zm_transit_patch/maps/mp/zombies/_zm_game_module_meat_utility.gsc +++ b/Zombie Maps/Tranzit/zm_transit_patch/maps/mp/zombies/_zm_game_module_meat_utility.gsc @@ -427,7 +427,7 @@ wait_for_team_death( team ) { winning_team = "B"; } - level notify( "meat_end" ); + level notify( "meat_end", winning_team ); } check_should_save_player( team )