Details

Reviewers

elexis
fatherbushido

Commits

rP19436: Make some wooden structures give a wood loot instead of a stone one. Patch by…

Summary

loot changed from stone to a reduced amount of wood

Test Plan

wooden walls are made of wood for definition.
Mauryan walls seems to be made of wood.
Roman Siege Wall is made of wood.

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Grugnas created this revision.Mar 27 2017, 2:31 AM

Owners added a subscriber: Restricted Owners Package.Mar 27 2017, 2:31 AM

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK!

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

Harbormaster completed remote builds in B903: Diff 960.Mar 27 2017, 5:11 AM

Yes makes more sense.
Check the other element too and the roman siege wall.

roman Siege Wall and Mauryan wall loot component changed. (is the Mauryan wall supposed to cost wood? it looks like that.)

Grugnas retitled this revision from Palisades loot component should have wood to Palisades, mauryan wall and rome siege wall loot component should have wood.Mar 27 2017, 12:32 PM

Grugnas edited the test plan for this revision. (Show Details)

In D265#10095, @Grugnas wrote:

roman Siege Wall and Mauryan wall loot component changed. (is the Mauryan wall supposed to cost wood? it looks like that.)

(Yes, it's their civ bonus. They lived in jungle)

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK!

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

Harbormaster completed remote builds in B907: Diff 964.Mar 27 2017, 1:18 PM

In D265#10070, @fatherbushido wrote:

Check the other element too

fatherbushido requested changes to this revision.Mar 28 2017, 10:11 PM

This revision now requires changes to proceed.Mar 28 2017, 10:11 PM

In D265#10306, @fatherbushido wrote:

Check the other element too

Guess that means wall parts (rephrasing can help if one wasn't understood before), indeed there might be some maps that come with palisade spikes or things like that.

binaries/data/mods/public/simulation/templates/structures/maur_wall.xml
12 ↗	(On Diff #964)	This template doesn't appear to have any legitimacy to exist. Deleting it didn't bug with the tech tree nor ingame. Same goes for all the other civ_wall.xml files then. If that is true and if we can nuke all of those, the patch would become much more useful.

included:
palisades_tall_spikes.xml

		 _small_spikes.xml
		 _angle_spike.xml
		 _rocks_overwatch.xml

i think that's all about wooden walls.

Build is green

Updating workspaces.
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (305 tests).................................................................................................................................................................................................................................................................................................................OK!

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

Harbormaster completed remote builds in B933: Diff 991.Mar 29 2017, 1:43 PM

check all

binaries/data/mods/public/simulation/templates/structures/maur_wall.xml
12 ↗	(On Diff #964)	Yes we considered that someday iirc.

This revision now requires changes to proceed.Mar 30 2017, 11:10 AM

Removed all the {civ}_wall.xml files from the ../structures folder as suggested by elexis.
Now the Max and Min TowerOverlap entry is moved from the cart_wall.xml file to the cart_wallset_short.xml.
I also checked all the files in the ../other folder.
The patch should be complete now

Grugnas updated this revision to Diff 1283.Apr 16 2017, 4:12 PM

Grugnas retitled this revision from Palisades, mauryan wall and rome siege wall loot component should have wood to Palisades, mauryan wall and rome siege wall loot component shall be wood instead of stone.

fatherbushido accepted this revision.Apr 20 2017, 7:57 AM

This revision is now accepted and ready to land.Apr 20 2017, 7:57 AM

Closed by commit rP19436: Make some wooden structures give a wood loot instead of a stone one. Patch by… (authored by fatherbushido). · Explain WhyApr 20 2017, 8:13 AM

This revision was automatically updated to reflect the committed changes.

Palisades, mauryan wall and rome siege wall loot component shall be wood instead of stone
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 1372

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_gate.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_tower.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml

Palisades, mauryan wall and rome siege wall loot component shall be wood instead of stoneClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 1372

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_angle_spike.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_curve.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_rocks_watchtower.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_small_spikes.xml

ps/trunk/binaries/data/mods/public/simulation/templates/other/palisades_tall_spikes.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_gate.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_long.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_medium.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_short.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/maur_wall_tower.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_short.xml

ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_tower.xml

Palisades, mauryan wall and rome siege wall loot component shall be wood instead of stone
ClosedPublic
Actions

Revision Contents
Changeset List