Add Trigger Chance to StickyBombCrateCollide

cleanup

Author: Andreas-W

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombCrateCollide.h

@@ -51,13 +51,15 @@ class StickyBombCrateCollideModuleData : public CrateCollideModuleData
 	Bool m_allowMultiCollide;  ///< if we are a crate, allow spawning multiple sticky bombs, or just single use
 	Bool m_showInfiltrationEvent;   ///< show an infiltration map event for the target player
 	AsciiString m_stickyBombObjectName;  ///< the object to create
+	Real m_triggerChance;  ///< chance to create the bomb when triggering the module
 
 	StickyBombCrateCollideModuleData()
 	{
 		m_needsTarget = FALSE;
 		m_allowMultiCollide = FALSE;
 		m_showInfiltrationEvent = FALSE;
 		m_stickyBombObjectName = AsciiString::TheEmptyString;
+		m_triggerChance = 1.0;
 	}
 
 	static void buildFieldParse(MultiIniFieldParse& p) 
@@ -70,6 +72,7 @@ class StickyBombCrateCollideModuleData : public CrateCollideModuleData
 			{ "AllowMultiCollide", INI::parseBool, NULL, offsetof(StickyBombCrateCollideModuleData, m_allowMultiCollide) },
 			{ "ShowInfiltrationEvent", INI::parseBool, NULL, offsetof(StickyBombCrateCollideModuleData, m_showInfiltrationEvent) },
 			{ "StickyBombObject", INI::parseAsciiString, NULL, offsetof(StickyBombCrateCollideModuleData, m_stickyBombObjectName) },
+			{ "ChanceToTriggerPercent", INI::parsePercentToReal, NULL, offsetof(StickyBombCrateCollideModuleData, m_triggerChance) },
 			{ 0, 0, 0, 0 }
 		};
 		p.add( dataFieldParse );
@@ -92,7 +95,7 @@ class StickyBombCrateCollide : public CrateCollide
 protected:
 
 	/// This allows specific vetoes to certain types of crates and their data
-	virtual Bool isValidToExecute( const Object *other ) const;
+	// virtual Bool isValidToExecute( const Object *other ) const;
 
 	/// This is the game logic execution function that all real CrateCollides will implement
 	virtual Bool executeCrateBehavior( Object *other );

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/StickyBombCrateCollide.cpp

@@ -25,43 +25,28 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //	
 // FILE: StickyBombCrateCollide.cpp 
-// Author: Kris Morness, June 2003
-// Desc:   A crate (actually a saboteur - mobile crate) that resets the timer on the target supply dropzone.
+// Author: Andi W - Sept 2025
+// Desc:   Creates a Sticks Bomb on the object we collide with
 //	
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
 
-// #include "Common/GameAudio.h"
-// #include "Common/MiscAudio.h"
 #include "Common/Player.h"
-// #include "Common/PlayerList.h"
 #include "Common/Radar.h"
-// #include "Common/SpecialPower.h"
 #include "Common/ThingFactory.h"
 #include "Common/ThingTemplate.h"
 #include "Common/Xfer.h"
 
-// #include "GameClient/Drawable.h"
 #include "GameClient/Eva.h"
-// #include "GameClient/InGameUI.h"  // useful for printing quick debug strings when we need to
 
-//#include "GameLogic/ExperienceTracker.h"
 #include "GameLogic/Object.h"
-//#include "GameLogic/PartitionManager.h"
-//#include "GameLogic/ScriptEngine.h"
 
 #include "GameLogic/Module/AIUpdate.h"
-//#include "GameLogic/Module/ContainModule.h"
-//#include "GameLogic/Module/DozerAIUpdate.h"
-//#include "GameLogic/Module/HijackerUpdate.h"
-//#include "GameLogic/Module/OCLUpdate.h"
 #include "GameLogic/Module/StickyBombCrateCollide.h"
 #include "GameLogic/Module/StickyBombUpdate.h"
-//#include "GameLogic/Module/SpecialPowerModule.h"
 
 
 
@@ -79,29 +64,29 @@ StickyBombCrateCollide::~StickyBombCrateCollide( void )
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Bool StickyBombCrateCollide::isValidToExecute( const Object *other ) const
-{
-	if( !CrateCollide::isValidToExecute(other) )
-	{
-		if (other != NULL)
-			DEBUG_LOG(("StickyBombCrateCollide::isValidToExecute >>> target '%s' Not Valid.", other->getTemplate()->getName().str()));
-		else
-			DEBUG_LOG(("StickyBombCrateCollide::isValidToExecute >>> collide with ground!"));
-		//Extend functionality.
-		return FALSE;
-	}
-
-	// Do we need anything here?
-	DEBUG_LOG(("StickyBombCrateCollide::isValidToExecute >>> target '%s' Valid!", other->getTemplate()->getName().str()));
-	return TRUE;
-}
+//Bool StickyBombCrateCollide::isValidToExecute( const Object *other ) const
+//{
+//	if( !CrateCollide::isValidToExecute(other) )
+//	{
+//		if (other != NULL)
+//			DEBUG_LOG(("StickyBombCrateCollide::isValidToExecute >>> target '%s' Not Valid.", other->getTemplate()->getName().str()));
+//		else
+//			DEBUG_LOG(("StickyBombCrateCollide::isValidToExecute >>> collide with ground!"));
+//		//Extend functionality.
+//		return FALSE;
+//	}
+//
+//	// Do we need anything here?
+//	DEBUG_LOG(("StickyBombCrateCollide::isValidToExecute >>> target '%s' Valid!", other->getTemplate()->getName().str()));
+//	return TRUE;
+//}
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 Bool StickyBombCrateCollide::executeCrateBehavior( Object *other )
 {
 
-	DEBUG_LOG(("StickyBombCrateCollide::executeCrateBehavior 0"));
+	//DEBUG_LOG(("StickyBombCrateCollide::executeCrateBehavior 0"));
 	const StickyBombCrateCollideModuleData* md = getStickyBombCrateCollideModuleData();
 
 	if (m_hasCollided && !md->m_allowMultiCollide)
@@ -131,6 +116,12 @@ Bool StickyBombCrateCollide::executeCrateBehavior( Object *other )
 
 	}
 
+	Real randomNumber = GameLogicRandomValueReal(0, 1);
+	if (randomNumber > md->m_triggerChance) {
+		m_hasCollided = TRUE;
+		return false;
+	}
+
 	if (md->m_showInfiltrationEvent)
 		TheRadar->tryInfiltrationEvent( other );