Aura descriptions were standardized some time ago, but a lot has changed since then. The most notable for these strings was the renaming of armour to resistance. This was corrected in the gui (D2229/rP24001) and in the technology tooltips (D3338/rP24564) already, but not yet in the aura files, hence this patch.
Details
Details
- Reviewers
Freagarach - Group Reviewers
Restricted Owners Package (Owns No Changed Paths) - Commits
- rP24717: Armour -> Resistance in aura descriptions.
Check for correctness and completeness.
Diff Detail
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
Comment Actions
Build is green
builderr-debug-macos.txt /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking. ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking. ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking. ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framewor
See https://jenkins.wildfiregames.com/job/macos-differential/2928/display/redirect for more details.
Comment Actions
Resistance against what? We have three types of resistance, Capture, Damage and Status Effects. So either add damage to the resistance, or something else ;) (I would prefer the former, but am not sure that is clear for the players.)
Comment Actions
Since there are now five damage types (fire and poison have been added), just inserting “damage” would be incorrect, so I guess the proper solution is the more verbose “crush, hack, pierce resistance”.
If that's to be done, then maybe some technologies need to be rephrased too, I'll check.
Comment Actions
Build is green
builderr-debug-macos.txt ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking. ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking. ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking. ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking. ld: warning: text-based stu
See https://jenkins.wildfiregames.com/job/macos-differential/2944/display/redirect for more details.
Comment Actions
@Freagarach I think it's time to introduce a "Resistance/Entity/Damage" that acts as a base modifier.
Comment Actions
Complete.
Most correct would probably be crush, hack, pierce damage resistance but that is not necessary.