HomeWildfire Games
Diffusion 0 A.D. Public Repository rP22866

Generalise attack tooltips after D2092/rP22754.
rP22866
Actions

Description

Generalise attack tooltips after D2092/rP22754.

This allows attacks with both capture and damage effects to show both, and centralises display between regular attack and Splash.
It also reverts a change from r14954 which incorrectly switched 'Interval' and 'Rate'.

Patch By: Freagarach

Reviewed By: wraitii

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

Details

Committed
wraitiiSep 7 2019, 4:47 PM
Reviewer
wraitii
Differential Revision
D2138: Generalised Attack effects tooltips after D2092/rP22754.
Parents
rP22865: Check only that the destruction queue contains no non-local entity when…
Branches
Unknown
Tags
Unknown
Build Status
Buildable 9255
Build 15259: Post-Commit BuildJenkins

Event Timeline

wraitii committed rP22866: Generalise attack tooltips after D2092/rP22754..Sep 7 2019, 4:47 PM
wraitii added an edge: D2138: Generalised Attack effects tooltips after D2092/rP22754..
Harbormaster completed building B9255: rP22866: Generalise attack tooltips after D2092/rP22754..Sep 7 2019, 4:52 PM
Freagarach mentioned this in D1707: Generalise hard-counter tooltips..Sep 8 2019, 1:03 PM
elexis mentioned this in D2151: Use "setStringTags"-function more often..Sep 12 2019, 10:14 PM
bb raised a concern with this commit.Jun 20 2020, 12:58 PM
bb added a subscriber: bb.

Working on a fix...

/ps/trunk/binaries/data/mods/public/gui/common/tooltips.js
301–302

These lines have broken translations, since every language will now show "Melee", "Ranged" etc.

This commit now has outstanding concerns.Jun 20 2020, 12:58 PM
wraitii added inline comments.Jun 20 2020, 1:22 PM
/ps/trunk/binaries/data/mods/public/gui/common/tooltips.js
301–302

AH, yeah, similar issues to Damage types and status effects :/

Feel free to suggest a better fix than those, or re-use a similar approach

bb mentioned this in D2995: Introduce translatable attack names.Sep 5 2020, 12:43 AM
wraitii removed an auditor: bb.Dec 28 2020, 10:53 AM

Fixed in rP24209

This commit no longer requires audit.Dec 28 2020, 10:53 AM

Changes (2)

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
gui/
common/

rP22866

View Options

ps/trunk/binaries/data/mods/public/gui/common/setup.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/common/tooltips.js

Loading...
Wildfire Games · Phabricator