Paths

Table of Contentst

Diffusion 0 A.D. Public Repository rP22970

Adds a "properties"-property to resources and let mods be able to prevent…
AuditedrP22970
Actions

Tags

None

Subscribers

Description

Adds a "properties"-property to resources and let mods be able to prevent resources from being bartered, traded and/or tributed.

Comments by: elexis, Stan`, Nescio

Reviewed By: wraitii, Angen

Fixes #4370

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

Details

Auditors

Committed

Sep 22 2019, 4:53 PM

Reviewer

Differential Revision

D1846: Adds a "properties"-property to resources and let mods be able to prevent resources from being bartered, traded and/or tributed.

Parents

rP22969: Defragment IGUIButtonBehavior Settings.

Branches

Unknown

Tags

Unknown

Build Status

Buildable 9552
Build 15968: Trigger Windows Autobuild
Build 15967: Post-Commit Build	Jenkins

Event Timeline

wraitii committed rP22970: Adds a "properties"-property to resources and let mods be able to prevent….Sep 22 2019, 4:53 PM

wraitii added an edge: D1846: Adds a "properties"-property to resources and let mods be able to prevent resources from being bartered, traded and/or tributed..

-_- Forgot to write 'Patch By: Freagarach', sorry.

@Itms Any chance Phabricator could be updated to add that to the default diff text?

Harbormaster completed building B9552: rP22970: Adds a "properties"-property to resources and let mods be able to prevent….Sep 22 2019, 5:02 PM

Its okay, if one is interested in who the author is they can look at the diff ;)

bb raised a concern with this commit.Sep 22 2019, 9:41 PM

bb added a subscriber: bb.

bb added inline comments.

/ps/trunk/binaries/data/mods/public/simulation/ai/petra/diplomacyManager.js
83	I suspect this to come from here: WARNING: JavaScript warning: simulation/ai/petra/diplomacyManager.js line 83 reference to undefined property availableResources[res] This replay does not warn on r22969 but does on r22970: commands.txt12 KBDownload

This commit now has outstanding concerns.Sep 22 2019, 9:41 PM

Freagarach mentioned this in D2319: Fix undefined resource in PetraAI diplomacy manager after D1846/rP22970..Sep 22 2019, 10:17 PM

Freagarach added inline comments.

/ps/trunk/binaries/data/mods/public/simulation/ai/petra/diplomacyManager.js
81	`of` D2319.

wraitii mentioned this in rP22980: Fix undefined resource in PetraAI diplomacy manager after D1846/rP22970..Sep 23 2019, 8:47 AM

wraitii requested verification of this commit.Sep 23 2019, 10:45 AM

This commit now requires verification by auditors.Sep 23 2019, 10:45 AM

Freagarach added inline comments.Sep 29 2019, 4:13 PM

/ps/trunk/binaries/data/mods/public/simulation/components/Player.js
824	Should this be `GetCodes()`? Because it would be possible to tribute via a script.

elexis mentioned this in D2365: Refactor diplomacy dialog, diplomacy colors, tribute buttons, spy request buttons, attack request buttons, minimap panel, idle worker button, ceasefire counter to use object orientation paradigm.Oct 10 2019, 3:56 PM

elexis raised a concern with this commit.Feb 27 2020, 10:14 AM

elexis added a subscriber: elexis.

elexis added inline comments.

/ps/trunk/source/simulation2/components/tests/test_scripts.h
62	ricotz reported this errors out when running the tests without public mod: In TestComponentScripts::test_global_scripts: /build/0ad-0.0.24~r23514/source/simulation2/components/tests/test_scripts.h:62: Error: Expected ((vfs::GetPathnames(g_VFS, L"globalscripts/tests/", L"test_*.js", paths)) == INFO::OK), found (-110100 != 0) http://irclogs.wildfiregames.com/2020-02/2020-02-27-QuakeNet-%230ad-dev.log

This commit now has outstanding concerns.Feb 27 2020, 10:14 AM

elexis mentioned this in D2645: Fix tests without public mod following globalscripts tests rP22970 and mapscript tests rP23455.Feb 27 2020, 6:45 PM

elexis mentioned this in rP23598: Skip and warn about globalscripts and random map tests following rP22970 and….Apr 23 2020, 2:07 PM

Since rP23598 skips the globalscripts test if testing without public mod.

elexis mentioned this in D2710: DiskPlacer: avoid scanning whole map.May 1 2020, 12:31 AM

concern appears fixed

All concerns with this commit have now been addressed.May 1 2020, 1:10 PM

Stan mentioned this in D2730: Use correct naming for test_Resources.js.May 12 2020, 5:37 PM

elexis mentioned this in D2715: Fail test suite when map tests throw errors.May 19 2020, 1:09 AM

Changes (19)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

globalscripts/

test_resources.js

gui/

session/

selection_panels.js

trade_window.xml

simulation/

ai/

petra/

diplomacyManager.js

headquarters.js

tradeManager.js

components/

tests/

data/

resources/

source/

simulation2/

components/

tests/

rP22970

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

Loading...

ps/trunk/binaries/data/mods/public/globalscripts/tests/

Loading...

ps/trunk/binaries/data/mods/public/globalscripts/tests/test_resources.js

Loading...

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

Loading...

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

Loading...

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

Loading...

ps/trunk/binaries/data/mods/public/gui/session/trade_window.xml

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

ps/trunk/binaries/data/mods/public/simulation/data/resources/food.json

Loading...

ps/trunk/binaries/data/mods/public/simulation/data/resources/metal.json

Loading...

ps/trunk/binaries/data/mods/public/simulation/data/resources/stone.json

Loading...

ps/trunk/binaries/data/mods/public/simulation/data/resources/wood.json

Loading...

ps/trunk/source/simulation2/components/tests/test_scripts.h

Loading...