HomeWildfire Games
Diffusion 0 A.D. Public Repository rP24953

Unify UnitAI and AnimalAI.
rP24953
Actions

Description

Unify UnitAI and AnimalAI.

r8995 / rP8995 (#563) introduced an ANIMAL-state from a separate AnimalAI-component (introduced in r7763 / rP7763).
This patch merges that separate state and brings the ROAMING and FEEDING (renamed to LINGERING) under the INDIVIDUAL.IDLE-state.

This enables e.g. city-building mods to have human units that linger and roam or animals that behave like humans.

The specific values for animals might need tweaking after this.

Differential revision: D2646
Fixes: #1832, #5593
Comments by: @Angen, @Langbart, @Nescio, @Stan, @wraitii
Refs.: #3919

Details

Committed
FreagarachFeb 27 2021, 9:13 PM
Differential Revision
D2646: Remove special Animal state.
Parents
rP24952: Netcode: Identify controller client via a secret key
Branches
Unknown
Tags
Unknown
Build Status
Buildable 15826
Build 35012: Post-Commit BuildJenkins
Build 35011: Post-Commit Build (macOS)Jenkins

Event Timeline

Freagarach committed rP24953: Unify UnitAI and AnimalAI..Feb 27 2021, 9:13 PM
Freagarach added an edge: D2646: Remove special Animal state..
Freagarach added subscribers: Langbart, Nescio, Silier and 2 others.
Harbormaster completed building B15826: rP24953: Unify UnitAI and AnimalAI..Feb 27 2021, 10:15 PM
Nescio mentioned this in D1880: Enable vision range for skittish animals to fix behaviour depending on their los.Mar 23 2021, 11:54 AM
Freagarach added inline comments.May 8 2022, 8:45 AM
/ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
139

How about reactive? That seems to cover the stance?

Changes (22)

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
simulation/
ai/
common-api/
components/
tests/
templates/
gaia/

rP24953

View Options

ps/trunk/binaries/data/mods/public/simulation/ai/common-api/entity.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/components/tests/test_UnitAI.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel_trainable.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse_trainable.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic_violent.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_bird.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_breed_passive.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_passive.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml

Loading...
Wildfire Games ยท Phabricator