Merge branch 'main' of https://github.com/CookieLandProjects/CLP_AI

Author: CookieLandProjects

GeneralsMD/Code/GameEngine/Include/Common/Player.h

@@ -605,6 +605,12 @@ class Player : public Snapshot
 	/// Build base defense on front or flank of base.  Gets passed to aiPlayer.
 	void buildBaseDefense(Bool flank);
 
+  /// @-TanSo-: Build base defense on front or flank of base based on our vector.  Gets passed to aiPlayer.
+	void buildBaseDefenseFromVector(Bool flank, Real rotation, Real percent);
+	void buildBaseDefenseFromVectorAtPlayer(Bool flank, Real rotation, Real percent, const AsciiString& playerName);
+	void addAIBaseDefenseToVector(const AsciiString& objectType);
+	void removeAIBaseDefenseFromVector(const AsciiString& objectType);
+
 	/// Build structure type on front or flank of base.  Gets passed to aiPlayer.
 	void buildBaseDefenseStructure(const AsciiString &thingName, Bool flank);
 

GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h

@@ -104,6 +104,7 @@ class AISideInfo : public MemoryPoolObject
 	{
 		m_side.clear();
 		m_baseDefenseStructure1.clear();
+		m_baseDefenseStructures.clear();
 	}
 
 	AsciiString m_side;						///< Name of the side
@@ -118,7 +119,10 @@ class AISideInfo : public MemoryPoolObject
 	TSkillSet		m_skillSet3;
 	TSkillSet		m_skillSet4;
 	TSkillSet		m_skillSet5;
+	TSkillSet		m_skillSet6;
+	TSkillSet		m_skillSet7;
 	AsciiString m_baseDefenseStructure1;
+  std::vector<AsciiString> m_baseDefenseStructures; // @-TanSo-: why not be able to let the user of the World Builder specify more than one base defense structure?
 	AISideInfo *m_next;
 };
 EMPTY_DTOR(AISideInfo)

GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h

@@ -181,6 +181,10 @@ class AIPlayer : public MemoryPoolObject,
 	virtual void buildSpecificAITeam(TeamPrototype *teamProto, Bool priorityBuild); ///< Builds this team immediately.
 
 	virtual void buildAIBaseDefense(Bool flank); ///< Builds base defense on front or flank of base.
+	virtual void buildAIBaseDefenseFromVector(Bool flank, Real rotation, Real percent); // @-TanSo-: for whatever reason we need to put this into THIS public section...
+	virtual void buildAIBaseDefenseFromVectorAtPlayer(Bool flank, Real rotation, Real percent, const AsciiString& playerName);
+	virtual void addAIBaseDefenseToVector(const AsciiString& objectType);
+	virtual void removeAIBaseDefenseFromVector(const AsciiString& objectType);
 
 	virtual void buildAIBaseDefenseStructure(const AsciiString &thingName, Bool flank); ///< Builds base defense on front or flank of base.
 
@@ -227,11 +231,12 @@ class AIPlayer : public MemoryPoolObject,
 	//---------------------------------- @CLP_AI AIPLAYER ADDITIONS -----------------------------------
 	//-------------------------------------------------------------------------------------------------
 	void buildSpecificBuildingNearestTeamAngle(const AsciiString& thingName, const Team* team, Real bAngle);
-
 	void buildBySuppliesAngle(Int minimumCash, const AsciiString& thingName, Real bAngle);
-
 	void buildSpecificBuildingNearestObjectAngle(const AsciiString& thingName, const Object* bestObj, Real bAngle);
 
+	Coord3D getSkirmishBuildListBaseCenter();
+  Real getSkirmishBuildListBaseRadius();
+
 	//-------------------------------------------------------------------------------------------------
 	//-------------------------------- @CLP_AI AIPLAYER ADDITIONS END ---------------------------------
 	//-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h

@@ -72,6 +72,22 @@ class AISkirmishPlayer : public AIPlayer
 
 	virtual Player *getAiEnemy();	///< Solo AI attacks based on scripting.  Only skirmish auto-acquires an enemy at this point.  jba.
 
+  virtual void buildAIBaseDefenseFromVector(Bool flank, Real rotation, Real percent); ///< Do the same as buildAIBaseDefense, but use the vector and randomize the outcome.
+	virtual void buildAIBaseDefenseFromVectorAtPlayer(Bool flank, Real rotation, Real percent, const AsciiString& playerName);
+	virtual void buildAIBaseDefenseStructureFromVector(const AsciiString& thingName, Bool flank, Real rotation, Real percent);
+	virtual void buildAIBaseDefenseStructureFromVectorAtPlayer(const AsciiString& thingName, Bool flank, Real rotation, Real percent, const AsciiString& playerName);
+	virtual void addAIBaseDefenseToVector(const AsciiString &thingName);
+	virtual void removeAIBaseDefenseFromVector(const AsciiString& thingName);
+
+	Int getCurrentFrontBaseDefense();
+	Int getCurrentFlankBaseDefense();
+  Real getCurrentFrontLeftDefenseAngle();
+  Real getCurrentFrontRightDefenseAngle();
+  Real getCurrentLeftFlankLeftDefenseAngle();
+  Real getCurrentLeftFlankRightDefenseAngle();
+	Real getCurrentRightFlankLeftDefenseAngle();
+	Real getCurrentRightFlankRightDefenseAngle();
+
 protected:
 
 	// snapshot methods

GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h

@@ -450,7 +450,13 @@ class ScriptActions : public ScriptActionsInterface
 	void doPlayerSellAllBuildingsArea(const AsciiString& playerName, const AsciiString& triggerArea);
 	void doPlayerSellAllBuildingsTypeArea(const AsciiString& playerName, const AsciiString& objectType, const AsciiString& triggerArea);
 
-	// @-TanSo-: 53 additions
+	void doAIPlayerBuildDefenseStructureFromVector(Bool flank, Real rotation, Real percent);
+	void doAIPlayerBuildDefenseStructureFromVectorAtPlayer(Bool flank, Real rotation, Real percent, const AsciiString& playerName);
+	void doAIPlayerAddBaseDefenseStructure(const AsciiString& objectType);
+	void doAIPlayerRemoveBaseDefenseStructure(const AsciiString& objectType);
+
+
+	// @-TanSo-: 56 additions
 	//-------------------------------------------------------------------------------------------------
 	//----------------------------- @CLP_AI SCRIPT ACTION ADDITIONS END -------------------------------
 	//-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h

@@ -203,8 +203,10 @@ class ScriptConditions : public ScriptConditionsInterface
 	Bool evaluatePlayerDestroyedEnemyType(Parameter* pPlayerParm, Parameter* pObjectType);
 	Bool evaluatePlayerDestroyedEnemyUnit(Parameter* pPlayerParm);
 	Bool evaluatePointControlled(Player* player, const Coord3D& point, Real radius);				//@-TanSo-: helper method for evaluate(Relation)MapControl.
-	Bool evaluateMapControl(Parameter* pPlayerParm, Parameter* pComparisonParm, Real value);
-	Bool evaluateRelationMapControl(Parameter* pPlayerParm, Int relationType, Parameter* pComparisonParm, Real value);
+	Bool evaluateMapControl(Parameter* pPlayerParm, Parameter* pComparisonParm, Real pValue);
+	Bool evaluateRelationMapControl(Parameter* pPlayerParm, Int relationType, Parameter* pComparisonParm, Real pValue);
+	Bool evaluateMapControlArea(Parameter* pPlayerParm, Parameter* pComparisonParm, Real pValue, Parameter* pTriggerParm);
+	Bool evaluateRelationMapControlArea(Parameter* pPlayerParm, Int relationType, Parameter* pComparisonParm, Real pValue, Parameter* pTriggerParm);
 	Bool evaluateTeamLostType(Parameter* pTeamParm, Parameter* objectType);
 	Bool evaluateTeamLostUnit(Parameter* pTeamParm);
   Bool evaluatePlayerSightedRelationType(Parameter* pPlayerParm, Int relationType, Parameter* pObjectType);
@@ -217,7 +219,7 @@ class ScriptConditions : public ScriptConditionsInterface
 	Bool evaluatePlayerBuildingBeingCapturedArea(Parameter* pPlayerParm, Parameter* pTriggerParm);
 	Bool evaluatePlayerBuildingBeingCapturedTypeArea(Parameter* pPlayerParm, Parameter* objectType, Parameter* pTriggerParm);
 
-	// @-TanSo-: 30 additions, 1 helper method
+	// @-TanSo-: 32 additions, 1 helper method
 	//-------------------------------------------------------------------------------------------------
 	//---------------------------- @CLP_AI SCRIPT CONDITION ADDITIONS END -----------------------------
 	//-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h

@@ -568,12 +568,13 @@ class ScriptAction : public MemoryPoolObject // This is the action class.
 			AI_PLAYER_BUILD_TYPE_NEAREST_KINDOF_ROTATED,	///< AI player builds a structure near a kindOf rotated <Real> degrees.
 			AI_PLAYER_BUILD_TYPE_NEAREST_TEAM_ROTATED,		///< AI player builds a structure near a team rotated <Real> degrees.
 			AI_PLAYER_BUILD_TYPE_NEAREST_SUPPLY_ROTATED,	///< AI player builds a structure near a supply source rotaded <Real> degrees.
-			/*TODO*/AI_PLAYER_BUILD_TYPE_AT_BACKDOOR,							///< AI player builds a structure at the back door path.
-			/*TODO*/AT_PLAYER_BUILD_TYPE_AT_SPECIAL,							///< AI player builds a structure at the special path.
-			/*TODO*/AI_PLAYER_BUILD_TYPE_AT_PERCENT_FRONT,				///< AI player builds a structure at <Real> percent distance between spot and outskirts at the center path.
-			/*TODO*/AI_PLAYER_BUILD_TYPE_AT_PERCENT_FLANK,				///< AI player builds a structure at <Real> percent distance between spot and outskirts at the flank path.
-			/*TODO*/AI_PLAYER_BUILD_TYPE_AT_PERCENT_BACKDOOR,			///< AI player builds a structure at <Real> percent distance between spot and outskirts at the back door path.
-			/*TODO*/AI_PLAYER_BUILD_TYPE_AT_PERCENT_SPECIAL,			///< AI player builds a structure at <Real> percent distance between spot and outskirts at the special path.
+			AI_PLAYER_BUILD_DEFENSE_FRONT_FROM_VECTOR_ROTATED_PERCENT, ///< AI player builds a defensive structure on the front from our vector, rotated <Real> degrees, and at a distance of <Real> percent of our actual base boundaries.
+			AI_PLAYER_BUILD_DEFENSE_FLANK_FROM_VECTOR_ROTATED_PERCENT, ///< AI player builds a defensive structure on the flank from our vector, rotated <Real> degrees, and at a distance of <Real> percent of our actual base boundaries.
+
+      AI_PLAYER_ADD_DEFENSE_TO_VECTOR,							///< add a defensive structure to m_baseDefenseStructures.
+			AI_PLAYER_REMOVE_DEFENSE_FROM_VECTOR,					///< remove a defensive structure from m_baseDefenseStructures.
+			AI_PLAYER_BUILD_DEFENSE_FRONT_FROM_VECTOR_ROTATED_PERCENT_AT_PLAYER,///< AI player builds a defensive structure on the front from our vector, rotated <Real> degrees, and at a distance of <Real> percent of a player's actual base boundaries.
+			AI_PLAYER_BUILD_DEFENSE_FLANK_FROM_VECTOR_ROTATED_PERCENT_AT_PLAYER,///< AI player builds a defensive structure on the flank from our vector, rotated <Real> degrees, and at a distance of <Real> percent of a player's actual base boundaries.
 
 			PLAYER_SURRENDER,															///< The player surrenders, provided that other allied players are alive; otherwise quit.
 			PLAYER_MERGE_KINDOF,													///< The player merges all units with <kindOf> into another team.
@@ -1121,6 +1122,8 @@ class Condition : public MemoryPoolObject  // This is the conditional class.
 
 		PLAYER_MAPCONTROL,											// True if a player's map control is <comparison> <Real>.
 		PLAYER_RELATION_MAPCONTROL,							// True if all <relation> player's map control is <comparison> <Real>.
+    PLAYER_MAPCONTROL_AREA,									// True if a player's map control in an area is <comparison> <Real>.
+    PLAYER_RELATION_MAPCONTROL_AREA, 				// True if all <relation> player's map control in an area is <comparison> <Real>.
 
     PLAYER_SIGHTED_RELATION_TYPE,						// True if a player has sighted a <relation> unit of <type>.
     RELATION_PLAYER_SIGHTED_RELATION_TYPE,	// True if a <relation> player has sighted a <relation> unit of <type>.

GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp

@@ -4614,6 +4614,43 @@ void Player::buildSpecificBuildingNearestObjectAngle(const AsciiString& thingNam
 	}
 }
 
+//-------------------------------------------------------------------------------------------------
+void Player::buildBaseDefenseFromVector(Bool flank, Real rotation, Real percent)
+{
+	if (m_ai)
+	{
+		// Do a priority build.
+		m_ai->buildAIBaseDefenseFromVector(flank, rotation, percent);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void Player::buildBaseDefenseFromVectorAtPlayer(Bool flank, Real rotation, Real percent, const AsciiString& playerName)
+{
+	if (m_ai)
+	{
+		// Do a priority build.
+		m_ai->buildAIBaseDefenseFromVectorAtPlayer(flank, rotation, percent, playerName);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void Player::addAIBaseDefenseToVector(const AsciiString& objectType)
+{
+	if (m_ai)
+	{
+		m_ai->addAIBaseDefenseToVector(objectType);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+void Player::removeAIBaseDefenseFromVector(const AsciiString& objectType)
+{
+	if (m_ai)
+	{
+		m_ai->removeAIBaseDefenseFromVector(objectType);
+	}
+}
 
 //-------------------------------------------------------------------------------------------------
 //--------------------------------- @CLP_AI PLAYER ADDITIONS END ----------------------------------

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPlayer.cpp

@@ -3062,6 +3062,12 @@ void AIPlayer::doUpgradesAndSkills()
 					limit = 3;
 					if (sideInfo->m_skillSet5.m_numSkills>0) {
 						limit = 4;
+						if (sideInfo->m_skillSet6.m_numSkills > 0) {
+							limit = 5;
+							if (sideInfo->m_skillSet7.m_numSkills > 0) {
+								limit = 6;
+							}
+						}
 					}
 				}
 			}
@@ -3083,6 +3089,8 @@ void AIPlayer::doUpgradesAndSkills()
 			case 2: skillset = &sideInfo->m_skillSet3; break;
 			case 3: skillset = &sideInfo->m_skillSet4; break;
 			case 4: skillset = &sideInfo->m_skillSet5; break;
+			case 5: skillset = &sideInfo->m_skillSet6; break;
+			case 6: skillset = &sideInfo->m_skillSet7; break;
 		}
 		Int i;
 		for (i=0; i<skillset->m_numSkills; i++) {
@@ -4527,6 +4535,40 @@ void AIPlayer::buildSpecificBuildingNearestObjectAngle(const AsciiString& thingN
 	TheTerrainVisual->removeAllBibs();	// isLocationLegalToBuild adds bib feedback, turn it off.  jba.
 }
 
+//-------------------------------------------------------------------------------------------------
+void AIPlayer::buildAIBaseDefenseFromVector(Bool flank, Real rotation, Real percent)
+{
+	//
+	AsciiString teamStr = "Error : Solo ai doesn't support buildAIBaseDefense. '";
+	TheScriptEngine->AppendDebugMessage(teamStr, false);
+}
+
+//-------------------------------------------------------------------------------------------------
+void AIPlayer::buildAIBaseDefenseFromVectorAtPlayer(Bool flank, Real rotation, Real percent, const AsciiString& playerName)
+{
+	//
+	AsciiString teamStr = "Error : Solo ai doesn't support buildAIBaseDefense. '";
+	TheScriptEngine->AppendDebugMessage(teamStr, false);
+}
+
+//-------------------------------------------------------------------------------------------------
+void AIPlayer::addAIBaseDefenseToVector(const AsciiString& objectType)
+{
+	//
+	AsciiString teamStr = "Error : Solo ai doesn't support addBaseDefenseFromVector. '";
+	TheScriptEngine->AppendDebugMessage(teamStr, false);
+}
+
+//-------------------------------------------------------------------------------------------------
+void AIPlayer::removeAIBaseDefenseFromVector(const AsciiString& objectType)
+{
+	//
+	AsciiString teamStr = "Error : Solo ai doesn't support removeBaseDefenseFromVector. '";
+	TheScriptEngine->AppendDebugMessage(teamStr, false);
+}
+
+Coord3D AIPlayer::getSkirmishBuildListBaseCenter() { return m_baseCenter; }
+Real AIPlayer::getSkirmishBuildListBaseRadius() { return m_baseRadius; }
 //-------------------------------------------------------------------------------------------------
 //-------------------------------- @CLP_AI AIPLAYER ADDITIONS END ---------------------------------
 //-------------------------------------------------------------------------------------------------