Merge pull request #492 from GoogleFrog/stopToAttack

Added stopToAttack
spring · May 9, 2020 · a22b2eb · a22b2eb
2 parents ff4e66d + 36249ce
commit a22b2eb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/rts/Lua/LuaUnitDefs.cpp b/rts/Lua/LuaUnitDefs.cpp
@@ -865,6 +865,7 @@ ADD_BOOL("canAttackWater",  canAttackWater); // CUSTOM
 
 	ADD_BOOL("levelGround", ud.levelGround);
 	ADD_BOOL("strafeToAttack", ud.strafeToAttack);
+	ADD_BOOL("stopToAttack", ud.stopToAttack);
 
 	ADD_BOOL( "useBuildingGroundDecal",  ud.decalDef.useGroundDecal);
 	ADD_INT(  "buildingDecalType",       ud.decalDef.groundDecalType);

diff --git a/rts/Sim/Units/CommandAI/MobileCAI.cpp b/rts/Sim/Units/CommandAI/MobileCAI.cpp
@@ -710,7 +710,7 @@ void CMobileCAI::ExecuteObjectAttack(Command& c)
 	// also make sure that we're not locked in close-in/in-range state
 	// loop due to rotates invoked by in-range or out-of-range states
 	if (tryTargetRotate) {
-		const bool canChaseTarget = (owner->moveState != MOVESTATE_HOLDPOS);
+		const bool canChaseTarget = (!owner->unitDef->stopToAttack) && (owner->moveState != MOVESTATE_HOLDPOS);
 		const bool targetBehind = (targetMidPosVec.dot(orderTarget->speed) < 0.0f);
 
 		if (canChaseTarget && tryTargetHeading && targetBehind && !owner->unitDef->IsHoveringAirUnit()) {

diff --git a/rts/Sim/Units/UnitDef.cpp b/rts/Sim/Units/UnitDef.cpp
@@ -110,6 +110,7 @@ UnitDef::UnitDef()
 	, floatOnWater(false)
 	, pushResistant(false)
 	, strafeToAttack(false)
+	, stopToAttack(false)
 	, minCollisionSpeed(0.0f)
 	, slideTolerance(0.0f)
 	, maxHeightDif(0.0f)
@@ -599,6 +600,7 @@ UnitDef::UnitDef(const LuaTable& udTable, const std::string& unitName, int id)
 	canLoopbackAttack = udTable.GetBool("canLoopbackAttack", false);
 	levelGround = udTable.GetBool("levelGround", true);
 	strafeToAttack = udTable.GetBool("strafeToAttack", false);
+	stopToAttack = udTable.GetBool("stopToAttack", false);
 
 
 	// initialize the (per-unitdef) collision-volume

diff --git a/rts/Sim/Units/UnitDef.h b/rts/Sim/Units/UnitDef.h
@@ -177,6 +177,7 @@ struct UnitDef: public SolidObjectDef
 	bool floatOnWater;
 	bool pushResistant;
 	bool strafeToAttack;  /// should the unit move sideways when it can't shoot?
+	bool stopToAttack;
 	float minCollisionSpeed;
 	float slideTolerance;
 	float maxHeightDif;   /// maximum terraform height this building allows