Page MenuHomeWildfire Games
Differential D586

petra: avoid to choose a decaying structure as target
ClosedPublic
Actions

Authored by mimo on Jun 1 2017, 8:17 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Sep 13, 12:33 PM
Unknown Object (File)
Fri, Sep 13, 12:25 PM
Unknown Object (File)
Fri, Sep 13, 11:00 AM
Unknown Object (File)
Sun, Sep 8, 1:37 AM
Unknown Object (File)
Sun, Sep 8, 12:57 AM
Unknown Object (File)
Wed, Aug 28, 5:12 PM
Unknown Object (File)
Wed, Aug 21, 7:12 PM
Subscribers
Vulcan

Details

Reviewers
None
Commits
rP19739: petra: following r19694, avoid to choose a decaying structure as target
Summary

Now that fields do not decay immediately after having captured an enemy cc, the ai can attack them even if they are decaying. Same thing for enemy walls which can now decay and are not worth attacking when decaying.

Test Plan

check that the ai behaviour is as expected

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

mimo created this revision.Jun 1 2017, 8:17 PM
Vulcan added a subscriber: Vulcan.Jun 2 2017, 1:47 AM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (306 tests)..................................................................................................................................................................................................................................................................................................................OK!
Checking XML files...

http://jw:8080/job/phabricator/1439/ for more details.

Vulcan added a comment.Jun 2 2017, 1:48 AM
Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (no-multi-spaces):
|    | Multiple spaces found before '='.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
| 125| 125| 	{
| 126| 126| 		priority = 90;
| 127| 127| 		// basically we want a mix of citizen soldiers so our barracks have a purpose, and champion units.
| 128|    |-		this.unitStat.RangedInfantry    = { "priority": 0.7, "minSize": 5, "targetSize": 20, "batchSize": 5, "classes": ["Infantry", "Ranged", "CitizenSoldier"],
|    | 128|+		this.unitStat.RangedInfantry = { "priority": 0.7, "minSize": 5, "targetSize": 20, "batchSize": 5, "classes": ["Infantry", "Ranged", "CitizenSoldier"],
| 129| 129| 			"interests": [["strength",3], ["cost",1] ] };
| 130| 130| 		this.unitStat.MeleeInfantry     = { "priority": 0.7, "minSize": 5, "targetSize": 20, "batchSize": 5, "classes": ["Infantry", "Melee", "CitizenSoldier"],
| 131| 131| 			"interests": [ ["strength",3], ["cost",1] ] };
|    | [NORMAL] ESLintBear (no-multi-spaces):
|    | Multiple spaces found before '='.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
| 127| 127| 		// basically we want a mix of citizen soldiers so our barracks have a purpose, and champion units.
| 128| 128| 		this.unitStat.RangedInfantry    = { "priority": 0.7, "minSize": 5, "targetSize": 20, "batchSize": 5, "classes": ["Infantry", "Ranged", "CitizenSoldier"],
| 129| 129| 			"interests": [["strength",3], ["cost",1] ] };
| 130|    |-		this.unitStat.MeleeInfantry     = { "priority": 0.7, "minSize": 5, "targetSize": 20, "batchSize": 5, "classes": ["Infantry", "Melee", "CitizenSoldier"],
|    | 130|+		this.unitStat.MeleeInfantry = { "priority": 0.7, "minSize": 5, "targetSize": 20, "batchSize": 5, "classes": ["Infantry", "Melee", "CitizenSoldier"],
| 131| 131| 			"interests": [ ["strength",3], ["cost",1] ] };
| 132| 132| 		this.unitStat.ChampRangedInfantry = { "priority": 1, "minSize": 3, "targetSize": 18, "batchSize": 3, "classes": ["Infantry", "Ranged", "Champion"],
| 133| 133| 			"interests": [["strength",3], ["cost",1] ] };
|    | [NORMAL] ESLintBear (no-multi-spaces):
|    | Multiple spaces found before '='.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
| 131| 131| 			"interests": [ ["strength",3], ["cost",1] ] };
| 132| 132| 		this.unitStat.ChampRangedInfantry = { "priority": 1, "minSize": 3, "targetSize": 18, "batchSize": 3, "classes": ["Infantry", "Ranged", "Champion"],
| 133| 133| 			"interests": [["strength",3], ["cost",1] ] };
| 134|    |-		this.unitStat.ChampMeleeInfantry  = { "priority": 1, "minSize": 3, "targetSize": 18, "batchSize": 3, "classes": ["Infantry", "Melee", "Champion"],
|    | 134|+		this.unitStat.ChampMeleeInfantry = { "priority": 1, "minSize": 3, "targetSize": 18, "batchSize": 3, "classes": ["Infantry", "Melee", "Champion"],
| 135| 135| 			"interests": [ ["strength",3], ["cost",1] ] };
| 136| 136| 		this.unitStat.RangedCavalry     = { "priority": 0.7, "minSize": 4, "targetSize": 20, "batchSize": 4, "classes": ["Cavalry", "Ranged", "CitizenSoldier"],
| 137| 137| 			"interests": [ ["strength",2], ["cost",1] ] };
|    | [NORMAL] ESLintBear (no-multi-spaces):
|    | Multiple spaces found before '='.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
| 133| 133| 			"interests": [["strength",3], ["cost",1] ] };
| 134| 134| 		this.unitStat.ChampMeleeInfantry  = { "priority": 1, "minSize": 3, "targetSize": 18, "batchSize": 3, "classes": ["Infantry", "Melee", "Champion"],
| 135| 135| 			"interests": [ ["strength",3], ["cost",1] ] };
| 136|    |-		this.unitStat.RangedCavalry     = { "priority": 0.7, "minSize": 4, "targetSize": 20, "batchSize": 4, "classes": ["Cavalry", "Ranged", "CitizenSoldier"],
|    | 136|+		this.unitStat.RangedCavalry = { "priority": 0.7, "minSize": 4, "targetSize": 20, "batchSize": 4, "classes": ["Cavalry", "Ranged", "CitizenSoldier"],
| 137| 137| 			"interests": [ ["strength",2], ["cost",1] ] };
| 138| 138| 		this.unitStat.MeleeCavalry      = { "priority": 0.7, "minSize": 4, "targetSize": 20, "batchSize": 4, "classes": ["Cavalry", "Melee", "CitizenSoldier"],
| 139| 139| 			"interests": [ ["strength",2], ["cost",1] ] };
|    | [NORMAL] ESLintBear (no-multi-spaces):
|    | Multiple spaces found before '='.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
| 135| 135| 			"interests": [ ["strength",3], ["cost",1] ] };
| 136| 136| 		this.unitStat.RangedCavalry     = { "priority": 0.7, "minSize": 4, "targetSize": 20, "batchSize": 4, "classes": ["Cavalry", "Ranged", "CitizenSoldier"],
| 137| 137| 			"interests": [ ["strength",2], ["cost",1] ] };
| 138|    |-		this.unitStat.MeleeCavalry      = { "priority": 0.7, "minSize": 4, "targetSize": 20, "batchSize": 4, "classes": ["Cavalry", "Melee", "CitizenSoldier"],
|    | 138|+		this.unitStat.MeleeCavalry = { "priority": 0.7, "minSize": 4, "targetSize": 20, "batchSize": 4, "classes": ["Cavalry", "Melee", "CitizenSoldier"],
| 139| 139| 			"interests": [ ["strength",2], ["cost",1] ] };
| 140| 140| 		this.unitStat.ChampRangedCavalry  = { "priority": 1, "minSize": 3, "targetSize": 15, "batchSize": 3, "classes": ["Cavalry", "Ranged", "Champion"],
| 141| 141| 			"interests": [ ["strength",3], ["cost",1] ] };
|    | [NORMAL] ESLintBear (no-multi-spaces):
|    | Multiple spaces found before '='.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
| 137| 137| 			"interests": [ ["strength",2], ["cost",1] ] };
| 138| 138| 		this.unitStat.MeleeCavalry      = { "priority": 0.7, "minSize": 4, "targetSize": 20, "batchSize": 4, "classes": ["Cavalry", "Melee", "CitizenSoldier"],
| 139| 139| 			"interests": [ ["strength",2], ["cost",1] ] };
| 140|    |-		this.unitStat.ChampRangedCavalry  = { "priority": 1, "minSize": 3, "targetSize": 15, "batchSize": 3, "classes": ["Cavalry", "Ranged", "Champion"],
|    | 140|+		this.unitStat.ChampRangedCavalry = { "priority": 1, "minSize": 3, "targetSize": 15, "batchSize": 3, "classes": ["Cavalry", "Ranged", "Champion"],
| 141| 141| 			"interests": [ ["strength",3], ["cost",1] ] };
| 142| 142| 		this.unitStat.ChampMeleeCavalry   = { "priority": 1, "minSize": 3, "targetSize": 15, "batchSize": 3, "classes": ["Cavalry", "Melee", "Champion"],
| 143| 143| 			"interests": [ ["strength",2], ["cost",1] ] };
|    | [NORMAL] ESLintBear (no-multi-spaces):
|    | Multiple spaces found before '='.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/simulation/ai/petra/attackPlan.js
| 139| 139| 			"interests": [ ["strength",2], ["cost",1] ] };
| 140| 140| 		this.unitStat.ChampRangedCavalry  = { "priority": 1, "minSize": 3, "targetSize": 15, "batchSize": 3, "classes": ["Cavalry", "Ranged", "Champion"],
| 141| 141| 			"interests": [ ["strength",3], ["cost",1] ] };
| 142|    |-		this.unitStat.ChampMeleeCavalry   = { "priority": 1, "minSize

http://jw:8080/job/phabricator_lint/101/ for more details.

Harbormaster failed remote builds in B2099: Diff 2366!Jun 2 2017, 1:48 AM
Closed by commit rP19739: petra: following r19694, avoid to choose a decaying structure as target (authored by mimo). · Explain WhyJun 5 2017, 6:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
simulation/
ai/
petra/
5 lines

Diff 2449

View Options

ps/trunk/binaries/data/mods/public/simulation/ai/petra/attackPlan.js

Loading...
Wildfire Games · Phabricator