funny engineer changes for the day

Author: mastercoms

src/game/client/tf/c_baseobject.h

@@ -177,7 +177,12 @@ class C_BaseObject : public C_BaseCombatCharacter, public IHasBuildPoints, publi
 	// Build points
 	CUtlVector<BuildPoint_t>	m_BuildPoints;
 
-	bool				IsDisabled( void ) { return m_bDisabled || m_bCarried; }
+	bool				ShouldBeActiveWhileCarried() const
+	{
+		// Dispenser active while carried
+		return m_iObjectType == OBJ_DISPENSER;
+	}
+	bool				IsDisabled( void ) { return m_bDisabled || m_bCarried && !ShouldBeActiveWhileCarried(); }
 
 	// Shared placement
 	bool 				VerifyCorner( const Vector &vBottomCenter, float xOffset, float yOffset );

src/game/client/tf/c_obj_teleporter.cpp

@@ -28,6 +28,8 @@ using namespace vgui;
 IMPLEMENT_CLIENTCLASS_DT(C_ObjectTeleporter, DT_ObjectTeleporter, CObjectTeleporter)
 	RecvPropInt( RECVINFO(m_iState) ),
 	RecvPropTime( RECVINFO(m_flRechargeTime) ),
+	RecvPropInt(RECVINFO(m_iTeleportCooldownUsers)),
+	RecvPropTime(RECVINFO(m_flTeleportCooldownTime)),
 	RecvPropTime( RECVINFO(m_flCurrentRechargeDuration) ),
 	RecvPropInt( RECVINFO(m_iTimesUsed) ),
 	RecvPropFloat( RECVINFO(m_flYawToExit) ),
@@ -99,7 +101,7 @@ void C_ObjectTeleporter::StartChargedEffects()
 	char szEffect[128];
 
 	Q_snprintf( szEffect, sizeof(szEffect), "teleporter_%s_charged_level%d", 
-		( GetTeamNumber() == TF_TEAM_RED ) ? "red" : "blue", GetUpgradeLevel() );
+		( GetTeamNumber() == TF_TEAM_RED ) ? "red" : "blue", MIN(GetUpgradeLevel(), 3) );
 
 	Assert( m_hChargedEffect.m_pObject == NULL );
 	m_hChargedEffect = ParticleProp()->Create( szEffect, PATTACH_ABSORIGIN );
@@ -110,10 +112,11 @@ void C_ObjectTeleporter::StartActiveEffects()
 	StopActiveEffects();
 	char szEffect[128];
 
+	int iBaseUpgradeLevel = MIN(GetUpgradeLevel(), 3);
 	Q_snprintf( szEffect, sizeof(szEffect), "teleporter_%s_%s_level%d", 
 		( GetTeamNumber() == TF_TEAM_RED ) ? "red" : "blue",
 		GetObjectMode() == MODE_TELEPORTER_ENTRANCE ? "entrance" : "exit",
-		GetUpgradeLevel() );
+		iBaseUpgradeLevel );
 
 	Assert( m_hDirectionEffect.m_pObject == NULL );
 	m_hDirectionEffect = ParticleProp()->Create( szEffect, PATTACH_ABSORIGIN );
@@ -136,7 +139,7 @@ void C_ObjectTeleporter::StartActiveEffects()
 		m_pSpinSound = NULL;
 	}
 	char szSound[128];
-	Q_snprintf( szSound, sizeof(szSound), "Building_Teleporter.SpinLevel%d", GetUpgradeLevel());
+	Q_snprintf( szSound, sizeof(szSound), "Building_Teleporter.SpinLevel%d", iBaseUpgradeLevel);
 
 	CLocalPlayerFilter filter;
 	m_pSpinSound = controller.SoundCreate( filter, entindex(), szSound );

src/game/client/tf/c_obj_teleporter.h

@@ -68,6 +68,8 @@ class C_ObjectTeleporter : public C_BaseObject
 	int m_iState;
 	int m_iOldState;
 	float m_flRechargeTime;
+	int m_iTeleportCooldownUsers;
+	float m_flTeleportCooldownTime;
 	float m_flCurrentRechargeDuration;
 	int m_iTimesUsed;
 	float m_flYawToExit;

src/game/client/tf/tf_hud_building_status.cpp

@@ -204,7 +204,7 @@ void CBuildingStatusItem::PerformLayout( void )
 			m_pBuildingPanel->SetVisible( false );
 			m_pRunningPanel->SetVisible( true );
 
-			int iUpgradeLevel = pObj->GetUpgradeLevel();
+			int iUpgradeLevel = MIN(pObj->GetUpgradeLevel(), 3);
 
 			Assert( iUpgradeLevel >= 1 && iUpgradeLevel <= 3 );
 
@@ -1032,7 +1032,7 @@ void CBuildingStatusItem_TeleporterEntrance::PerformLayout( void )
 	// How many times has this teleporter been used?
 	m_pFullyChargedPanel->SetDialogVariable( "timesused", pTeleporter->GetTimesUsed() );		
 
-	int iUpgradeLevel = pTeleporter->GetUpgradeLevel();
+	int iUpgradeLevel = MIN(pTeleporter->GetUpgradeLevel(), 3);
 
 	Assert( iUpgradeLevel >= 1 && iUpgradeLevel <= 3 );
 
@@ -1071,7 +1071,7 @@ void CBuildingStatusItem_TeleporterExit::PerformLayout( void )
 		return;
 	}
 
-	int iUpgradeLevel = pTeleporter->GetUpgradeLevel();
+	int iUpgradeLevel = MIN(pTeleporter->GetUpgradeLevel(), 3);
 
 	Assert( iUpgradeLevel >= 1 && iUpgradeLevel <= 3 );
 

src/game/client/tf/tf_hud_menu_engy_build.cpp

@@ -468,8 +468,17 @@ void CHudMenuEngyBuild::SendBuildMessage( int iSlot )
 		iBuildDisposableSents = pLocalPlayer->CanBuild( iBuilding, iMode );
 	}
 
+	if (pLocalPlayer->m_Shared.IsCarryingObject())
+	{
+		if (pLocalPlayer->m_Shared.GetCarriedObject()->GetType() != iBuilding || pLocalPlayer->m_Shared.GetCarriedObject()->GetObjectMode() != iMode)
+		{
+			pLocalPlayer->EmitSound("Player.DenyWeaponSelection");
+			return;
+		}
+	}
+
 	// If we don't already have a sentry (NULL), or we're allowed to build multiple, and we can afford it
-	if ( ( pObj == NULL || iBuildDisposableSents == CB_CAN_BUILD ) && pLocalPlayer->GetAmmoCount( TF_AMMO_METAL ) >= iCost )
+	if ( ( pObj == NULL || iBuildDisposableSents == CB_CAN_BUILD ) && pLocalPlayer->GetAmmoCount( TF_AMMO_METAL ) >= iCost || pObj != NULL && pObj->IsCarried() )
 	{
 		char szCmd[128];
 		Q_snprintf( szCmd, sizeof(szCmd), "build %d %d", iBuilding, iMode );

src/game/client/tf/tf_hud_menu_eureka_teleport.cpp

@@ -399,7 +399,7 @@ void CHudEurekaEffectTeleportMenu::OnTick( void )
 					    && !pObj->IsBuilding()
 					    && !pObj->IsPlacing()
 					    && !pObj->IsUpgrading()
-					    && !pObj->IsCarried();
+					    && (!pObj->IsCarried() || pObj->ShouldBeActiveWhileCarried());
 
 	m_pAvilableTargets[ EUREKA_TELEPORT_TELEPORTER_EXIT ]->SetVisible( bTeleAvailable );
 	m_pUnavailableTargets[ EUREKA_TELEPORT_TELEPORTER_EXIT ]->SetVisible( !bTeleAvailable );

src/game/client/tf/tf_hud_spectator_extras.cpp

@@ -308,7 +308,7 @@ void CTFHudSpectatorExtras::OnTick()
 				}
 				else
 				{
-					switch ( pObject->GetUpgradeLevel() )
+					switch ( MIN(pObject->GetUpgradeLevel(), 3) )
 					{
 					case 1:
 						m_vecEntitiesToDraw[nVecIndex].m_nOffset = 50;

src/game/server/tf/bot/behavior/tf_bot_use_teleporter.cpp

@@ -47,7 +47,7 @@ bool CTFBotUseTeleporter::IsTeleporterAvailable( void ) const
 		if ( m_teleporter->GetState() == TELEPORTER_STATE_SENDING ||
 			 m_teleporter->GetState() == TELEPORTER_STATE_RECHARGING )
 		{
-			if ( m_teleporter->GetUpgradeLevel() == 3 )
+			if ( m_teleporter->GetUpgradeLevel() >= 3 )
 			{
 				// we'll wait for level 3 teleporters - they're really fast
 				return true;

src/game/server/tf/tf_obj.cpp

@@ -174,7 +174,7 @@ IMPLEMENT_SERVERCLASS_ST(CBaseObject, DT_BaseObject)
 	SendPropVector( SENDINFO( m_vecBuildMins ), -1, SPROP_COORD ),
 	SendPropInt( SENDINFO( m_iDesiredBuildRotations ), 2, SPROP_UNSIGNED ),
 	SendPropBool( SENDINFO( m_bServerOverridePlacement ) ),
-	SendPropInt( SENDINFO(m_iUpgradeLevel), 3 ),
+	SendPropInt( SENDINFO(m_iUpgradeLevel), 5 ),
 	SendPropInt( SENDINFO(m_iUpgradeMetal), 10 ),
 	SendPropInt( SENDINFO(m_iUpgradeMetalRequired), 10 ),
 	SendPropInt( SENDINFO(m_iHighestUpgradeLevel), 3 ),
@@ -2859,6 +2859,10 @@ bool CBaseObject::CheckUpgradeOnHit( CTFPlayer *pPlayer )
 	{
 		int iPlayerMetal = pPlayer->GetAmmoCount( TF_AMMO_METAL );
 		int nMaxToAdd = GetUpgradeAmountPerHit();
+		if (nMaxToAdd < 1)
+		{
+			return false;
+		}
 		CALL_ATTRIB_HOOK_INT_ON_OTHER( pPlayer, nMaxToAdd, upgrade_rate_mod );
 		int iAmountToAdd = Min( nMaxToAdd, iPlayerMetal );
 
@@ -3031,8 +3035,11 @@ void CBaseObject::StartUpgrading( void )
 	if ( !m_bCarryDeploy && !IsUsingReverseBuild() )
 	{
 		int iMaxHealth = GetMaxHealthForCurrentLevel();
-		SetMaxHealth( iMaxHealth );
-		SetHealth( iMaxHealth );
+		if (GetMaxHealth() != iMaxHealth)
+		{
+			SetMaxHealth(iMaxHealth);
+			SetHealth(iMaxHealth);
+		}
 	}
 
 	const char *pUpgradeSound = GetObjectInfo( ObjectType() )->m_pUpgradeSound;
@@ -3615,6 +3622,8 @@ void CBaseObject::MakeCarriedObject( CTFPlayer *pCarrier )
 {
 	if ( pCarrier )
 	{
+		// MCOMS_BALANCE_PACK
+
 		// Make the object inactive.
 		m_bCarried = true;
 		m_bCarryDeploy = false;
@@ -3819,7 +3828,7 @@ int CBaseObject::GetMaxHealthForCurrentLevel( void )
 
 	if ( !IsMiniBuilding() && ( GetUpgradeLevel() > 1 ) )
 	{
-		float flMultiplier = pow( UPGRADE_LEVEL_HEALTH_MULTIPLIER, GetUpgradeLevel() - 1 );
+		float flMultiplier = pow( UPGRADE_LEVEL_HEALTH_MULTIPLIER, MIN(GetUpgradeLevel(), OBJ_MAX_UPGRADE_LEVEL) - 1 );
 		iMaxHealth = (int)( iMaxHealth * flMultiplier );
 	}
 

src/game/server/tf/tf_obj.h

@@ -211,7 +211,12 @@ class CBaseObject : public CBaseCombatCharacter, public IHasBuildPoints, public
 	virtual void	OnGoInactive( void );
 
 	// Disabling
-	bool			IsDisabled( void ) { return m_bDisabled || m_bCarried; }
+	bool				ShouldBeActiveWhileCarried() const
+	{
+		// Dispenser active while carried
+		return m_iObjectType == OBJ_DISPENSER;
+	}
+	bool			IsDisabled( void ) { return m_bDisabled || m_bCarried && !ShouldBeActiveWhileCarried(); }
 	virtual void	UpdateDisabledState( void );
 	void			SetDisabled( bool bDisabled );
 	virtual void	OnStartDisabled( void );