Page MenuHomeWildfire Games
Differential D1551

slaugther → slaughter
ClosedPublic
Actions

Authored by Gallaecio on Jun 2 2018, 11:59 AM.

Details

Reviewers
elexis
Stan
Commits
rP21971: Fix a typo slaugther → slaughter
Summary

Reported by Shamann on Transifex

Test Plan

It affects a user-visible string, which should cause no issue.

But it also affects an animation name attribute. @Stan Do you know if the name change is OK as long as both names are the same, or if the change could break things?

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

Gallaecio created this revision.Jun 2 2018, 11:59 AM
Vulcan added a subscriber: Vulcan.Jun 2 2018, 12:01 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/differential/615/display/redirect

Harbormaster completed remote builds in B6201: Diff 6702.Jun 2 2018, 12:01 PM
elexis accepted this revision.Jun 2 2018, 12:03 PM
elexis added a subscriber: elexis.

auraNames are independent of animations, don't worry.

The animation name ought to be fixed too, but by an artist though.
Didn't check for completeness, i.e. if the same typo occurs elsewhere.

This revision is now accepted and ready to land.Jun 2 2018, 12:03 PM
elexis added a comment.Jun 2 2018, 12:14 PM

Actually did check for completeness now, those are the only occurrences of slaugther in art/.
(Not sure why the jav cavs still play that animation properly.)

Gallaecio added a reviewer: Stan.Jun 2 2018, 12:15 PM
Stan accepted this revision.EditedJun 2 2018, 12:25 PM

Yeah it's fine. It wouldn't be if in was in the file name. It might actually fix a bug nobody reported. Thanks for the patch.
It might work because of that id. So while the game can't find an animal for slaughter it can actually sync the rein with the rest. Or maybe it's not visible

Stan added a comment.Dec 26 2018, 1:01 PM

Now that the commit freeze is lifted you can go ahead and commit it @Gallaecio

Stan added a comment.Dec 28 2018, 1:21 PM

@Gallaecio Do you want me to commit this, or will you do it ?

Gallaecio added a comment.Dec 28 2018, 7:10 PM
In D1551#67522, @Stan wrote:

@Gallaecio Do you want me to commit this, or will you do it ?

I have lots of language-related patches pending to apply, and I will get to it eventually, but right now I have a few priorities outside 0 A.D. Feel free to apply any of my patches that you wish included in the short term.

Stan added a comment.Dec 28 2018, 7:12 PM

Sure I'm really sorry I forgot I already commented on it :/ And when I realized it it was too late.

Nescio added a subscriber: Nescio.Dec 28 2018, 7:28 PM

While at it, could you also correct "healrate" into "healing rate" in the aura description?

Closed by commit rP21971: Fix a typo slaugther → slaughter (authored by Stan). · Explain WhyDec 29 2018, 11:45 AM
This revision was automatically updated to reflect the committed changes.
Owners added a subscriber: Restricted Owners Package.Dec 29 2018, 11:45 AM
Stan mentioned this in rP21972: Fix another typo noticed by Nescio on D1551.Dec 29 2018, 11:49 AM

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
art/
variants/
others/
horse_rein/
4 lines
simulation/
data/
auras/
units/
heroes/
2 lines

Diff 7105

View Options

ps/trunk/binaries/data/mods/public/art/variants/others/horse_rein/base_javelin.xml

Loading...
View Options

ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_arakamani_3.json

Loading...
Wildfire Games · Phabricator