Diffusion 0 A.D. Public Repository rP23843

Allow Modifiers to affect tokens.
AuditedrP23843
Actions

Tags

None

Subscribers

Description

Allow Modifiers to affect tokens.

This adds a new mode to modifications called "tokens" which allows clever token parsing.
Technologies, auras and modifiers in general can use this to switch out, add or delete tokens dynamically.

Currently implemented are production and builder queue tokens.

Reviewed By: Freagarach

Differential Revision: https://code.wildfiregames.com/D270

Details

Auditors

Silier
Freagarach

Committed

Jul 17 2020, 10:23 AM

Reviewer

Differential Revision

D270: Allow Modifiers to affect tokens.

Parents

rP23842: [i18n] Updated POT and PO files.

Branches

Unknown

Tags

Unknown

Build Status

Buildable 12447
Build 23827: Post-Commit Build	Jenkins
Build 23826: Post-Commit Build (macOS)	Jenkins

Event Timeline

wraitii committed rP23843: Allow Modifiers to affect tokens..Jul 17 2020, 10:23 AM

wraitii added an edge: D270: Allow Modifiers to affect tokens..

Harbormaster completed building B12447: rP23843: Allow Modifiers to affect tokens..Jul 17 2020, 10:30 AM

@wraitii I believe you forgot to close https://trac.wildfiregames.com/ticket/4332

In rP23843#43243, @asterix wrote:

@wraitii I believe you forgot to close https://trac.wildfiregames.com/ticket/4332

You're right, thanks :)

https://wildfiregames.com/forum/index.php?/topic/28520-allow-modifiers-to-affect-tokens/&tab=comments#comment-401037

This commit now has outstanding concerns.Jul 18 2020, 10:58 AM

Silier added inline comments.Jul 18 2020, 7:18 PM

/ps/trunk/binaries/data/mods/public/simulation/components/ProductionQueue.js
141	token is NaN

Silier added inline comments.Jul 19 2020, 12:36 PM

/ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
682	msg.player does not have to exists. Start game with empty slot. WARNING: JavaScript warning: simulation/components/GuiInterface.js line 682 reference to undefined property msg.player

wraitii mentioned this in D2894: Fix GetTechModifiedProperty for string values when the modifications do not apply..Jul 20 2020, 10:46 AM

wraitii mentioned this in rP23862: Fix GetTechModifiedProperty mistake in rP23843 & allow multiple token modifiers..Jul 21 2020, 10:16 AM

wraitii requested verification of this commit.Jul 21 2020, 10:22 AM

This commit now requires verification by auditors.Jul 21 2020, 10:22 AM

Silier accepted this commit.Jul 21 2020, 10:23 AM

All concerns with this commit have now been addressed.Jul 21 2020, 10:23 AM

wraitii mentioned this in D2904: Fix warning with disabled templates in rP23843.Jul 25 2020, 9:07 AM

wraitii mentioned this in rP23910: Fix warning with disabled templates in rP23843..Jul 29 2020, 11:46 AM

This commit now has outstanding concerns.Nov 5 2020, 9:13 AM

wraitii mentioned this in D3062: Fix Athenian Long Walls technology following rP23843.Nov 5 2020, 10:16 AM

wraitii mentioned this in rP24135: Fix Athenian Long Walls technology following rP23843..Nov 6 2020, 9:16 AM

Fixed in rP24135.

All concerns with this commit have now been addressed.Nov 12 2020, 7:02 AM

wraitii mentioned this in D3597: allow training starting units at any civic centre.Mar 15 2021, 11:13 AM

Changes (12)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

globalscripts/

Technologies.js

gui/

session/

simulation/

ai/

common-api/

petra/

buildManager.js

components/

GuiInterface.js

ProductionQueue.js

tests/

test_Builder.js

test_ProductionQueue.js

rP23843

ps/trunk/binaries/data/mods/public/globalscripts/Technologies.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/messages.js

Loading...

ps/trunk/binaries/data/mods/public/gui/session/session.js

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...