V0.1 and part of V1.0

CookieLandProjects · CookieLandProjects · commit 4fdff2706a31 · 2026-04-08T01:14:13.000+02:00
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Player.h b/GeneralsMD/Code/GameEngine/Include/Common/Player.h
@@ -236,7 +236,7 @@ class Player : public Snapshot
 	const Money *getMoney() const { return &m_money; }
 
 	UnsignedInt getSupplyBoxValue();///< Many things can affect the alue of a crate, but at heart it is a GlobalData ratio.
-
+	AIPlayer* getAIPlayer() { return m_ai; }
 	Energy *getEnergy() { return &m_energy; }
 	const Energy *getEnergy() const { return &m_energy; }
 
@@ -535,8 +535,11 @@ class Player : public Snapshot
 	const Team *getDefaultTeam() const { DEBUG_ASSERTCRASH(m_defaultTeam!=nullptr,("default team is null")); return m_defaultTeam; }
 
 	void setBuildList(BuildListInfo *pBuildList);			///< sets the build list.
+	void clearBuildList();
 	BuildListInfo *getBuildList( void ) { return m_pBuildList; }		///< returns the build list. (build list might be modified by the solo AI)
 	void addToBuildList(Object *obj);			///< Adds this to the build list.	 Used for factories placed instead of in build list.
+	void addToBuildListAdvancedEPO(const ThingTemplate* tmpl, const Coord3D& location, Real bAngle, INT rebuildTimes, BOOLEAN exactPositionOnly);
+	void addToBuildListAdvanced(Object* obj, INT rebuildTimes, BOOLEAN exactPositionOnly);
 	void addToPriorityBuildList(AsciiString templateName, Coord3D *pos, Real angle);			///< Adds this to the build list.	 Used for factories placed instead of in build list.
 
 	/// get the relationship between this->that.
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h
@@ -209,6 +209,7 @@ class AIPlayer : public MemoryPoolObject,
 
 	/// Calculates the closest construction zone location based on a template.
 	Bool calcClosestConstructionZoneLocation( const ThingTemplate *constructTemplate, Coord3D *location );
+	virtual Bool startTraining(WorkOrder* order, Bool busyOK, AsciiString teamName);	///< find a production building that can handle the order, and start building
 
 protected:
 
@@ -226,7 +227,6 @@ class AIPlayer : public MemoryPoolObject,
 	virtual void queueDozer(void);
 	virtual Bool selectTeamToBuild( void );			///< determine the next team to build
 	virtual Bool selectTeamToReinforce( Int minPriority );			///< determine the next team to reinforce
-	virtual Bool startTraining( WorkOrder *order, Bool busyOK, AsciiString teamName);	///< find a production building that can handle the order, and start building
 	virtual Bool isAGoodIdeaToBuildTeam( TeamPrototype *proto );		///< return true if team should be built
 	virtual void processBaseBuilding( void );		///< do base-building behaviors
 	virtual void processTeamBuilding( void );		///< do team-building behaviors
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h
@@ -44,6 +44,7 @@ class CreateObjectDieModuleData : public DieModuleData
 public:
 
 	const ObjectCreationList* m_ocl;			///< object creaton list to make
+	const ObjectCreationList* m_waterOcl;
 	Bool m_transferPreviousHealth; ///< Transfers previous health before death to the new object created.
 	Bool m_transferSelection;      ///< Transfers selection state before death to the new object created.
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h
@@ -45,6 +45,7 @@ class FXListDieModuleData : public DieModuleData
 {
 public:
 	const FXList					*m_defaultDeathFX;								///< default fx to make
+	const FXList          *m_defaultDeathWaterFX;
 	UpgradeMuxData				m_upgradeMuxData;
 	Bool									m_orientToObject;
 	Bool									m_initiallyActive;
@@ -64,6 +65,7 @@ class FXListDieModuleData : public DieModuleData
 		{
 			{ "StartsActive",					INI::parseBool, nullptr, offsetof( FXListDieModuleData, m_initiallyActive ) },
 			{ "DeathFX",							INI::parseFXList,		nullptr, offsetof( FXListDieModuleData, m_defaultDeathFX ) },
+			{ "WaterDeathFX",				INI::parseFXList,		nullptr, offsetof(FXListDieModuleData, m_defaultDeathWaterFX) },
 			{ "OrientToObject",				INI::parseBool,		nullptr, offsetof( FXListDieModuleData, m_orientToObject ) },
 			{ 0, 0, 0, 0 }
 		};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h
@@ -47,6 +47,8 @@ class InstantDeathBehaviorModuleData : public DieModuleData
 public:
 	FXListVec					m_fx;
 	OCLVec						m_ocls;
+	FXListVec					m_waterFx;
+	OCLVec						m_waterOcls;
 	WeaponTemplateVec	m_weapons;
 
 	InstantDeathBehaviorModuleData();
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h
@@ -82,6 +82,8 @@ class SlowDeathBehaviorModuleData : public UpdateModuleData
 	UnsignedInt				m_destructionDelayVariance;
 	FXListVec					m_fx[SD_PHASE_COUNT];
 	OCLVec						m_ocls[SD_PHASE_COUNT];
+	FXListVec					m_waterFx[SD_PHASE_COUNT];
+	OCLVec						m_waterOcls[SD_PHASE_COUNT];
 	WeaponTemplateVec	m_weapons[SD_PHASE_COUNT];
 	Real							m_flingForce;
 	Real							m_flingForceVariance;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h
@@ -387,4 +387,8 @@ class ScriptActions : public ScriptActionsInterface
 	void doNamedSetTrainHeld( const AsciiString &locoName, const Bool set );
   void doEnableObjectSound(const AsciiString& objectName, Bool enable);
 
+	void doAIClearBuildList(const AsciiString& player);
+	void doAIAddToBuildList(const AsciiString& player, const AsciiString& object, Coord3D* coords, Real angle, BOOLEAN initbuilt, INT rebuildTimes, BOOLEAN exactPositionOnly);
+	void doPlayerBuildUnit(const AsciiString& unitName, const AsciiString& playerName);
+
 };
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h
@@ -543,6 +543,10 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 		TEAM_SET_BOOBYTRAPPED,										///< Add boobytrap to all units on team.
 		SHOW_WEATHER,															///< show map defined weather.
 		AI_PLAYER_BUILD_TYPE_NEAREST_TEAM,				///< Tell the ai player to build an object nearest team.
+		AI_CLEAR_BUILDLIST,
+    AI_ADD_TO_BUILDLIST,
+		AI_ADD_TO_BUILDLIST_ADVANCED,
+		AI_PLAYER_BUILDS_UNNAMED,
 		// add new items here, please
 		NUM_ITEMS
 	};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h
@@ -287,6 +287,7 @@ class BuildListInfo : public MemoryPoolObject, public Snapshot
 	Bool			m_unsellable;
 	Bool			m_repairable;
 	Bool			m_automaticallyBuild;			///< If true, the ai will build.  If false, script has to enable this.
+	Bool      m_exactPositionOnly;
 
 
 	// For WorldBuilder use only:
@@ -317,6 +318,8 @@ class BuildListInfo : public MemoryPoolObject, public Snapshot
 	void setWhiner(Bool whiner) {m_whiner = whiner;}
 	void setUnsellable(Bool unsellable) {m_unsellable = unsellable;}
 	void setRepairable(Bool repairable) {m_repairable = repairable;}
+	void setExactPositionOnly(Bool b) { m_exactPositionOnly = b; }
+	Bool isExactPositionOnly() const { return m_exactPositionOnly; }
 
 public:
 	BuildListInfo *getNext(void) const {return m_nextBuildList;}
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h
@@ -451,6 +451,7 @@ class WeaponTemplate : public MemoryPoolObject
    const FXList* getWaterProjectileDetonateFX(VeterancyLevel v) const { return m_projectileWaterDetonateFXs[v]; }
 	const ObjectCreationList* getFireOCL(VeterancyLevel v) const { return m_fireOCLs[v]; }
 	const ObjectCreationList* getProjectileDetonationOCL(VeterancyLevel v) const { return m_projectileDetonationOCLs[v]; }
+	const ObjectCreationList* getProjectileWaterDetonationOCL(VeterancyLevel v) const { return m_projectileWaterDetonationOCLs[v]; }
 	const ParticleSystemTemplate* getProjectileExhaust(VeterancyLevel v) const { return m_projectileExhausts[v]; }
 
 	const AudioEventRTS& getFireSound() const { return m_fireSound; }
@@ -525,9 +526,11 @@ class WeaponTemplate : public MemoryPoolObject
 	const ThingTemplate* m_projectileTmpl;														///< direct access to projectile object type to "fire"
 	AsciiString m_fireOCLNames[LEVEL_COUNT];														///< Name of OCL to create at firing
 	AsciiString m_projectileDetonationOCLNames[LEVEL_COUNT];						///< Name of OCL to create at firing at missile's end
+	AsciiString m_projectileWaterDetonationOCLNames[LEVEL_COUNT];						///< Name of OCL to create at firing at missile's end
 	const ParticleSystemTemplate* m_projectileExhausts[LEVEL_COUNT];			///< Templates of particle systems for projectile exhaust
 	const ObjectCreationList* m_fireOCLs[LEVEL_COUNT];									///< Post-loaded lookup of name string for ease and speed
 	const ObjectCreationList* m_projectileDetonationOCLs[LEVEL_COUNT];	///< Post-loaded lookup of name string for ease and speed (and subsystem init order)
+	const ObjectCreationList* m_projectileWaterDetonationOCLs[LEVEL_COUNT];
 	const FXList* m_fireFXs[LEVEL_COUNT];															///< weapon is fired fx
 	const FXList* m_projectileDetonateFXs[LEVEL_COUNT];								///< if we have a projectile, fx for projectile blowing up
 	const FXList* m_projectileWaterDetonateFXs[LEVEL_COUNT];                           ///< water-specific detonation fx
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
@@ -79,6 +79,7 @@
 
 #include "GameLogic/AI.h"
 #include "GameLogic/AIPathfind.h"
+#include "GameLogic/AIPlayer.h"
 #include "GameLogic/AISkirmishPlayer.h"
 #include "GameLogic/ExperienceTracker.h"
 #include "GameLogic/Object.h"
@@ -639,6 +640,13 @@ void Player::setBuildList(BuildListInfo *pBuildList)
 
 }
 
+//=============================================================================
+void Player::clearBuildList()
+{
+	deleteInstance(m_pBuildList);
+	m_pBuildList = nullptr;
+}
+
 //=============================================================================
 void Player::addToBuildList(Object *obj)
 {
@@ -652,6 +660,33 @@ void Player::addToBuildList(Object *obj)
 	m_pBuildList = newInfo;
 }
 
+//=============================================================================
+void Player::addToBuildListAdvancedEPO(const ThingTemplate* tmpl, const Coord3D& location, Real bAngle, INT rebuildTimes, BOOLEAN exactPositionOnly)
+{
+	BuildListInfo* newInfo = newInstance(BuildListInfo);
+	newInfo->setTemplateName(tmpl->getName());
+	newInfo->setLocation(location);
+	newInfo->setAngle(bAngle);
+	newInfo->setExactPositionOnly(exactPositionOnly);
+	newInfo->setNumRebuilds(rebuildTimes);
+	newInfo->setNextBuildList(m_pBuildList);
+	m_pBuildList = newInfo;
+}
+
+//=============================================================================
+void Player::addToBuildListAdvanced(Object* obj, INT rebuildTimes, BOOLEAN exactPositionOnly)
+{
+	BuildListInfo* newInfo = newInstance(BuildListInfo);
+	newInfo->setObjectID(obj->getID());
+	newInfo->setTemplateName(obj->getTemplate()->getName());
+	newInfo->setLocation(*obj->getPosition());
+	newInfo->setAngle(obj->getOrientation());
+	newInfo->setExactPositionOnly(exactPositionOnly);
+	newInfo->setNumRebuilds(rebuildTimes);
+	newInfo->setNextBuildList(m_pBuildList);
+	m_pBuildList = newInfo;
+}
+
 //=============================================================================
 void Player::addToPriorityBuildList(AsciiString templateName, Coord3D *pos, Real angle)
 {
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
@@ -467,11 +467,11 @@ static MessageBoxReturnType cancelStartBecauseOfNoCD( void *userData )
 
 Bool IsFirstCDPresent(void)
 {
-#if !defined(RTS_DEBUG)
-	return TheFileSystem->areMusicFilesOnCD();
-#else
+//#if !defined(RTS_DEBUG)
+//	return TheFileSystem->areMusicFilesOnCD();
+//#else
 	return TRUE;
-#endif
+//#endif
 }
 
 static MessageBoxReturnType checkCDCallback( void *userData )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp
@@ -541,6 +541,11 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 																								 BuildAssistant::TERRAIN_RESTRICTIONS |
 																								 BuildAssistant::NO_OBJECT_OVERLAP,
 																								 dozer, m_player ) != LBC_OK ) {
+		if (info->isExactPositionOnly())
+		{
+          // We dont want to adjust the position.
+		} else {
+
 			// Warn.
 			AsciiString bldgName = bldgPlan->getName();
 			bldgName.concat(" - Dozer unable to place.  Attempting to adjust position.");
@@ -566,17 +571,17 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 					newPos.x = xPos;
 					newPos.y = yPos;
 					valid = TheBuildAssistant->isLocationLegalToBuild( &newPos, bldgPlan, angle,
-																							 BuildAssistant::CLEAR_PATH |
-																							 BuildAssistant::TERRAIN_RESTRICTIONS |
-																							 BuildAssistant::NO_OBJECT_OVERLAP,
-																							 dozer, m_player ) == LBC_OK;
+						BuildAssistant::CLEAR_PATH |
+						BuildAssistant::TERRAIN_RESTRICTIONS |
+						BuildAssistant::NO_OBJECT_OVERLAP,
+						dozer, m_player ) == LBC_OK;
 					if (valid) break;
 					newPos.y = yPos+posOffset;
 					valid = TheBuildAssistant->isLocationLegalToBuild( &newPos, bldgPlan, angle,
-																							 BuildAssistant::CLEAR_PATH |
-																							 BuildAssistant::TERRAIN_RESTRICTIONS |
-																							 BuildAssistant::NO_OBJECT_OVERLAP,
-																							 dozer, m_player ) == LBC_OK;
+						BuildAssistant::CLEAR_PATH |
+						BuildAssistant::TERRAIN_RESTRICTIONS |
+						BuildAssistant::NO_OBJECT_OVERLAP,
+						dozer, m_player ) == LBC_OK;
 				}
 				if (valid) break;
 				xPos = pos.x-offset;
@@ -585,30 +590,30 @@ Object *AIPlayer::buildStructureWithDozer(const ThingTemplate *bldgPlan, BuildLi
 					newPos.x = xPos;
 					newPos.y = yPos;
 					valid = TheBuildAssistant->isLocationLegalToBuild( &newPos, bldgPlan, angle,
-																							 BuildAssistant::CLEAR_PATH |
-																							 BuildAssistant::TERRAIN_RESTRICTIONS |
-																							 BuildAssistant::NO_OBJECT_OVERLAP,
-																							 dozer, m_player ) == LBC_OK;
+						BuildAssistant::CLEAR_PATH |
+						BuildAssistant::TERRAIN_RESTRICTIONS |
+						BuildAssistant::NO_OBJECT_OVERLAP,
+						dozer, m_player ) == LBC_OK;
 					if (valid) break;
 					newPos.x = xPos+posOffset;
 					valid = TheBuildAssistant->isLocationLegalToBuild( &newPos, bldgPlan, angle,
-																							 BuildAssistant::CLEAR_PATH |
-																							 BuildAssistant::TERRAIN_RESTRICTIONS |
-																							 BuildAssistant::NO_OBJECT_OVERLAP,
-																							 dozer, m_player ) == LBC_OK;
+						BuildAssistant::CLEAR_PATH |
+						BuildAssistant::TERRAIN_RESTRICTIONS |
+						BuildAssistant::NO_OBJECT_OVERLAP,
+						dozer, m_player ) == LBC_OK;
 				}
 				if (valid) break;
 			}
 			if (valid) pos = newPos;
 			if (!valid) {
 				valid = TheBuildAssistant->isLocationLegalToBuild( &pos, bldgPlan, angle,
-																						 BuildAssistant::NO_ENEMY_OBJECT_OVERLAP,
-																						 dozer, m_player ) == LBC_OK;
+					BuildAssistant::NO_ENEMY_OBJECT_OVERLAP,
+					dozer, m_player ) == LBC_OK;
 				if (!valid) {
 					return nullptr;
 				}
 			}
-
+		}
 	}
 
 	TheTerrainVisual->removeAllBibs();	// isLocationLegalToBuild adds bib feedback, turn it off.  jba.
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp
@@ -924,6 +924,7 @@ m_isSupplyBuilding(false),
 m_desiredGatherers(0),
 m_currentGatherers(0),
 m_automaticallyBuild(true),
+m_exactPositionOnly(false),
 m_priorityBuild(false),
 m_buildingName(AsciiString::TheEmptyString)
 {
@@ -1036,6 +1037,7 @@ void BuildListInfo::xfer( Xfer *xfer )
 	xfer->xferBool( &m_unsellable );
 	xfer->xferBool( &m_repairable );
 	xfer->xferBool( &m_automaticallyBuild );
+	xfer->xferBool( &m_exactPositionOnly );
 	// m_renderObj we don't need to xfer this, its for the editor only
 	// m_shadowObj we don't need to xfer this, its for the editor only
 	// m_selected we don't need to xfer this, its for the editor only
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/InstantDeathBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/InstantDeathBehavior.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/SlowDeathBehavior.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateObjectDie.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/FXListDie.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/FXListDie.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptActions.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/ScriptEngine.cpp
