Diffusion 0 A.D. Public Repository rP24963

Decay/Regenerate option for resources.
rP24963
Actions

Tags

None

Subscribers

View All 9 Subscribers

Description

Decay/Regenerate option for resources.

Allows entities to change their resource amount over time, possibly with some constraint.

This is a not-so-bare minimum, but can certainly be improved and/or extended later.

Part of: #1973
Original patch by: @smiley
Redone by: @Stan
Standing on the shoulders of giants: @Freagarach
(Revisions: 59; Inlines: 209)
Differential revision: D1718
Comments by: @Angen, @elexis, @Imarok, @Langbart, @nani, @Nescio, @smiley, @Stan, @wraitii

Details

Auditors

Committed

Feb 28 2021, 9:14 PM

Differential Revision

D1718: Decay/regenerate option for resources.

Parents

rP24962: Add an 'Evaluate' RL endpoint, intended for dynamic game balancing

Branches

Unknown

Tags

Unknown

Build Status

Buildable 15859
Build 35121: Post-Commit Build	Jenkins
Build 35120: Post-Commit Build (macOS)	Jenkins

Event Timeline

Freagarach committed rP24963: Decay/Regenerate option for resources..Feb 28 2021, 9:14 PM

Freagarach added an edge: D1718: Decay/regenerate option for resources..

Freagarach added subscribers: Langbart, nani, lyv and 6 others.

Harbormaster failed to build B15859: rP24963: Decay/Regenerate option for resources.!Feb 28 2021, 9:21 PM

wraitii mentioned this in D3614: Check for missing auras in GUI Interface.Feb 28 2021, 10:07 PM

Nescio mentioned this in D3868: [gameplay] fish and fruit regeneration.Apr 17 2021, 7:24 PM

An issue was discovered that was caused by this changeset. See #6317.

This commit now has outstanding concerns.Sep 8 2021, 9:08 AM

Freagarach mentioned this in D4263: Fix renaming fields losing the ability to be gathered..Sep 8 2021, 5:19 PM

Thanks for the report: D4263.

Freagarach mentioned this in rP25912: Fix renaming fields losing the ability to be gathered..Sep 10 2021, 8:23 AM

The problem was fixed in changeset rP25912.

This commit no longer requires audit.Sep 10 2021, 8:26 AM

Changes (160)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

gui/

reference/

common/

TemplateParser.js

simulation/

ai/

common-api/

components/

ResourceSupply.js

tests/

test_ResourceSupply.js

templates/

gaia/

fauna_camel.xml

fauna_cattle_cow.xml

fauna_cattle_sanga.xml

fauna_cattle_zebu.xml

fauna_chicken.xml

fauna_donkey.xml

fauna_elephant_african_bush.xml

fauna_elephant_asian.xml

fauna_elephant_north_african.xml

fauna_giraffe.xml

fauna_giraffe_infant.xml

fauna_hippopotamus.xml

fauna_horse.xml

fauna_muskox.xml

fauna_peacock.xml

fauna_piglet.xml

fauna_rabbit.xml

fauna_rhinoceros_white.xml

fauna_sheep.xml

fauna_walrus.xml

fauna_wildebeest.xml

fauna_zebra.xml

fruit/

ruins/

column_doric.xml

pyramid_great.xml

pyramid_minor.xml

standing_stone.xml

stone_statues_egyptian.xml

stone_statues_kushite.xml

stone_statues_roman.xml

unfinished_greek_temple.xml

treasure/

food_barrel.xml

food_barrels_buried.xml

food_persian_big.xml

food_persian_small.xml

golden_fleece.xml

metal_persian_big.xml

metal_persian_small.xml

shipwreck_debris.xml

shipwreck_ram_bow.xml

shipwreck_sail_boat.xml

shipwreck_sail_boat_cut.xml

standing_stone.xml

tree/

aleppo_pine.xml

bamboo_dragon.xml

bamboo_single.xml

baobab_1_sapling.xml

baobab_2_young.xml

baobab_3_mature.xml

baobab_4_dead.xml

bush_badlands.xml

bush_temperate.xml

bush_temperate_winter.xml

bush_tropic.xml

cedar_atlas_1_sapling.xml

cedar_atlas_2_young.xml

cedar_atlas_3_mature.xml

cedar_atlas_4_dead.xml

cretan_date_palm_patch.xml

cretan_date_palm_short.xml

cretan_date_palm_tall.xml

cypress_wild.xml

cypress_windswept.xml

date_palm_dead.xml

euro_beech_aut.xml

fir_sapling.xml

juniper_prickly.xml

medit_fan_palm.xml

oak_aut_new.xml

oak_hungarian.xml

oak_hungarian_autumn.xml

palm_palmyra.xml

palm_tropic.xml

palm_tropical.xml

pine_black_dead.xml

pine_maritime.xml

pine_maritime_short.xml

poplar_dead.xml

poplar_lombardy.xml

poplar_lombardy_autumn.xml

poplar_lombardy_dead.xml

senegal_date_palm.xml

temperate_autumn.xml

temperate_winter.xml

tropic_rainforest.xml

template_gaia_fish.xml

template_gaia_fruit.xml

template_gaia_ore.xml

template_gaia_ore_large.xml

template_gaia_rock.xml

template_gaia_rock_large.xml

template_gaia_ruins.xml

template_gaia_treasure.xml

template_gaia_tree.xml

template_structure_resource_corral.xml

template_structure_resource_field.xml

template_unit_fauna_herd.xml

template_unit_fauna_hunt.xml

template_unit_fauna_hunt_aggressive_bear.xml

template_unit_fauna_hunt_skittish_elephant_infant.xml

template_unit_fauna_hunt_whale.xml

rP24963

ps/trunk/binaries/data/mods/public/gui/reference/common/TemplateParser.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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