Skip to content

bugfix(experience): Prevent ranking of riders that are not trainable #1970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 11 commits into from
Dec 17, 2025
Merged

bugfix(experience): Prevent ranking of riders that are not trainable #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eb7e130
refactor: Reduce debug veterancy message nesting
Stubbjax Dec 10, 2025
7d61b07
unify: Apply single-player condition to veterancy debug messages in G…
Stubbjax Dec 10, 2025
0413b62
refactor: Further reduce debug veterancy message nesting
Stubbjax Dec 10, 2025
daf7f87
bugfix: Prevent ranking of riders that are not trainable
Stubbjax Dec 10, 2025
0d63627
docs: Add comments
Stubbjax Dec 10, 2025
fce6f1d
refactor: Abstract conditions into an object function
Stubbjax Dec 10, 2025
fca2191
docs: Streamline comment style
Stubbjax Dec 13, 2025
1c9bef0
tweak: Minor optimisation
Stubbjax Dec 13, 2025
baa7a1f
refactor: Transfer trainable flag on rider change
Stubbjax Dec 13, 2025
0eb2e40
refactor: Revert previous solution
Stubbjax Dec 13, 2025
26e4def
docs: Add comments
Stubbjax Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot
Int getExperienceValue( const Object* killer ) const; ///< How much do give for being killed
Int getCurrentExperience( void ) const { return m_currentExperience; }; ///< How much experience do I have at the moment?
Bool isTrainable() const; ///< Can I gain experience?
void setTrainable(Bool trainable); ///< Set whether I can gain experience
void resetTrainable(); ///< Set to default trainable state from template
Bool isAcceptingExperiencePoints() const; ///< Either I am trainable, or I have a Sink set up

void setVeterancyLevel( VeterancyLevel newLevel, Bool provideFeedback = TRUE ); ///< Set Level to this
Expand All @@ -71,4 +73,5 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot
Int m_currentExperience; ///< Number of experience points
ObjectID m_experienceSink; ///< ID of object I have pledged my experience point gains to
Real m_experienceScalar; ///< Scales any experience gained by this multiplier.
Bool m_isTrainable; ///< Can I gain experience?
};
57 changes: 30 additions & 27 deletions Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4113,42 +4113,45 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
case GameMessage::MSG_META_DEBUG_GIVE_VETERANCY:
case GameMessage::MSG_META_DEBUG_TAKE_VETERANCY:
{
if (TheGameLogic->isInMultiplayerGame())
break;

const DrawableList *list = TheInGameUI->getAllSelectedDrawables();
for (DrawableListCIt it = list->begin(); it != list->end(); ++it)
{
Drawable *pDraw = *it;
if (pDraw)
if (!pDraw)
continue;

Object *pObject = pDraw->getObject();
if (!pObject)
continue;

ExperienceTracker *et = pObject->getExperienceTracker();
if (!et || !et->isTrainable())
continue;

VeterancyLevel oldVet = et->getVeterancyLevel();
VeterancyLevel newVet = oldVet;

if (t == GameMessage::MSG_META_DEBUG_GIVE_VETERANCY)
{
Object *pObject = pDraw->getObject();
if (pObject)
if (oldVet < LEVEL_LAST)
{
ExperienceTracker *et = pObject->getExperienceTracker();
if (et)
{
if (et->isTrainable())
{
VeterancyLevel oldVet = et->getVeterancyLevel();
VeterancyLevel newVet = oldVet;
if (t == GameMessage::MSG_META_DEBUG_GIVE_VETERANCY)
{
if (oldVet < LEVEL_LAST)
{
newVet = (VeterancyLevel)((Int)oldVet + 1);
}
}
else
{
if (oldVet > LEVEL_FIRST)
{
newVet = (VeterancyLevel)((Int)oldVet - 1);
}
}
et->setVeterancyLevel(newVet);
}
}
newVet = (VeterancyLevel)((Int)oldVet + 1);
}
}
else
{
if (oldVet > LEVEL_FIRST)
{
newVet = (VeterancyLevel)((Int)oldVet - 1);
}
}

et->setVeterancyLevel(newVet);
}

disp = DESTROY_MESSAGE;
break;
}
Expand Down
25 changes: 24 additions & 1 deletion Generals/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ ExperienceTracker::ExperienceTracker(Object *parent) :
m_experienceScalar( 1.0f ),
m_currentExperience(0)
{
resetTrainable();
}

//-------------------------------------------------------------------------------------------------
Expand All @@ -65,7 +66,19 @@ Int ExperienceTracker::getExperienceValue( const Object* killer ) const
//-------------------------------------------------------------------------------------------------
Bool ExperienceTracker::isTrainable() const
{
return m_parent->getTemplate()->isTrainable();
return m_isTrainable;
}

//-------------------------------------------------------------------------------------------------
void ExperienceTracker::setTrainable(Bool trainable)
{
m_isTrainable = trainable;
}

//-------------------------------------------------------------------------------------------------
void ExperienceTracker::resetTrainable()
{
m_isTrainable = m_parent->getTemplate()->isTrainable();
}

//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -236,19 +249,27 @@ void ExperienceTracker::crc( Xfer *xfer )
{
xfer->xferInt( &m_currentExperience );
xfer->xferUser( &m_currentLevel, sizeof( VeterancyLevel ) );
#if !RETAIL_COMPATIBLE_CRC
xfer->xferBool(&m_isTrainable);
#endif
}

//-----------------------------------------------------------------------------
/** Xfer method
* Version Info:
* 1: Initial version
* 2: TheSuperHackers @tweak Serialize m_isTrainable
*/
// ----------------------------------------------------------------------------
void ExperienceTracker::xfer( Xfer *xfer )
{

// version
#if RETAIL_COMPATIBLE_XFER_SAVE
XferVersion currentVersion = 1;
#else
XferVersion currentVersion = 2;
#endif
XferVersion version = currentVersion;
xfer->xferVersion( &version, currentVersion );

Expand All @@ -267,6 +288,8 @@ void ExperienceTracker::xfer( Xfer *xfer )
// experience scalar
xfer->xferReal( &m_experienceScalar );

if (version >= 2)
xfer->xferBool(&m_isTrainable);
}

//-----------------------------------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot
Int getExperienceValue( const Object* killer ) const; ///< How much do give for being killed
Int getCurrentExperience( void ) const { return m_currentExperience; }; ///< How much experience do I have at the moment?
Bool isTrainable() const; ///< Can I gain experience?
void setTrainable(Bool trainable); ///< Set whether I can gain experience
void resetTrainable(); ///< Set to default trainable state from template
Bool isAcceptingExperiencePoints() const; ///< Either I am trainable, or I have a Sink set up

void setVeterancyLevel( VeterancyLevel newLevel, Bool provideFeedback = TRUE ); ///< Set Level to this
Expand All @@ -71,4 +73,5 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot
Int m_currentExperience; ///< Number of experience points
ObjectID m_experienceSink; ///< ID of object I have pledged my experience point gains to
Real m_experienceScalar; ///< Scales any experience gained by this multiplier.
Bool m_isTrainable; ///< Can I gain experience?
};
67 changes: 33 additions & 34 deletions GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4499,47 +4499,46 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
case GameMessage::MSG_META_DEBUG_GIVE_VETERANCY:
case GameMessage::MSG_META_DEBUG_TAKE_VETERANCY:
{
if ( !TheGameLogic->isInMultiplayerGame() )
if (TheGameLogic->isInMultiplayerGame())
break;

const DrawableList *list = TheInGameUI->getAllSelectedDrawables();
for (DrawableListCIt it = list->begin(); it != list->end(); ++it)
{
Drawable *pDraw = *it;
if (!pDraw)
continue;

const DrawableList *list = TheInGameUI->getAllSelectedDrawables();
for (DrawableListCIt it = list->begin(); it != list->end(); ++it)
Object *pObject = pDraw->getObject();
if (!pObject)
continue;

ExperienceTracker *et = pObject->getExperienceTracker();
if (!et || !et->isTrainable())
continue;

VeterancyLevel oldVet = et->getVeterancyLevel();
VeterancyLevel newVet = oldVet;

if (t == GameMessage::MSG_META_DEBUG_GIVE_VETERANCY)
{
Drawable *pDraw = *it;
if (pDraw)
if (oldVet < LEVEL_LAST)
{
Object *pObject = pDraw->getObject();
if (pObject)
{
ExperienceTracker *et = pObject->getExperienceTracker();
if (et)
{
if (et->isTrainable())
{
VeterancyLevel oldVet = et->getVeterancyLevel();
VeterancyLevel newVet = oldVet;
if (t == GameMessage::MSG_META_DEBUG_GIVE_VETERANCY)
{
if (oldVet < LEVEL_LAST)
{
newVet = (VeterancyLevel)((Int)oldVet + 1);
}
}
else
{
if (oldVet > LEVEL_FIRST)
{
newVet = (VeterancyLevel)((Int)oldVet - 1);
}
}
et->setVeterancyLevel(newVet);
}
}
}
newVet = (VeterancyLevel)((Int)oldVet + 1);
}
}
disp = DESTROY_MESSAGE;
else
{
if (oldVet > LEVEL_FIRST)
{
newVet = (VeterancyLevel)((Int)oldVet - 1);
}
}

et->setVeterancyLevel(newVet);
}

disp = DESTROY_MESSAGE;
break;
}

Expand Down
6 changes: 6 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RiderChangeContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ void RiderChangeContain::onContaining( Object *rider, Bool wasSelected )
//Transfer experience from the rider to the bike.
ExperienceTracker *riderTracker = rider->getExperienceTracker();
ExperienceTracker *bikeTracker = obj->getExperienceTracker();
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix Stubbjax 15/12/2025 Copy trainable flag from the rider to prevent
// Workers and other untrainable riders from ranking up via the bike's experience tracker.
bikeTracker->setTrainable(riderTracker->isTrainable());
#endif
bikeTracker->setVeterancyLevel( riderTracker->getVeterancyLevel(), FALSE );
riderTracker->setExperienceAndLevel( 0, FALSE );

Expand Down Expand Up @@ -301,6 +306,7 @@ void RiderChangeContain::onRemoving( Object *rider )
//Transfer experience from the bike to the rider.
ExperienceTracker *riderTracker = rider->getExperienceTracker();
ExperienceTracker *bikeTracker = bike->getExperienceTracker();
bikeTracker->resetTrainable();
riderTracker->setVeterancyLevel( bikeTracker->getVeterancyLevel(), FALSE );
bikeTracker->setExperienceAndLevel( 0, FALSE );
}
Expand Down
25 changes: 24 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ ExperienceTracker::ExperienceTracker(Object *parent) :
m_experienceScalar( 1.0f ),
m_currentExperience(0)
{
resetTrainable();
}

//-------------------------------------------------------------------------------------------------
Expand All @@ -65,7 +66,19 @@ Int ExperienceTracker::getExperienceValue( const Object* killer ) const
//-------------------------------------------------------------------------------------------------
Bool ExperienceTracker::isTrainable() const
{
return m_parent->getTemplate()->isTrainable();
return m_isTrainable;
}

//-------------------------------------------------------------------------------------------------
void ExperienceTracker::setTrainable(Bool trainable)
{
m_isTrainable = trainable;
}

//-------------------------------------------------------------------------------------------------
void ExperienceTracker::resetTrainable()
{
m_isTrainable = m_parent->getTemplate()->isTrainable();
}

//-------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -236,19 +249,27 @@ void ExperienceTracker::crc( Xfer *xfer )
{
xfer->xferInt( &m_currentExperience );
xfer->xferUser( &m_currentLevel, sizeof( VeterancyLevel ) );
#if !RETAIL_COMPATIBLE_CRC
xfer->xferBool(&m_isTrainable);
#endif
}

//-----------------------------------------------------------------------------
/** Xfer method
* Version Info:
* 1: Initial version
* 2: TheSuperHackers @tweak Serialize m_isTrainable
*/
// ----------------------------------------------------------------------------
void ExperienceTracker::xfer( Xfer *xfer )
{

// version
#if RETAIL_COMPATIBLE_XFER_SAVE
XferVersion currentVersion = 1;
#else
XferVersion currentVersion = 2;
#endif
XferVersion version = currentVersion;
xfer->xferVersion( &version, currentVersion );

Expand All @@ -267,6 +288,8 @@ void ExperienceTracker::xfer( Xfer *xfer )
// experience scalar
xfer->xferReal( &m_experienceScalar );

if (version >= 2)
xfer->xferBool(&m_isTrainable);
}

//-----------------------------------------------------------------------------
Expand Down
Loading