-
-
Notifications
You must be signed in to change notification settings - Fork 62
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix peacock escalations' incomplete displayed killing tips #358
Conversation
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Maybe it's a way to fix icon error in tedious thievery? (icons for counting stolen golds and burgers are exit icons) Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
@@ -76,7 +80,12 @@ | |||
}, | |||
{ | |||
"$inarray": { | |||
"in": "$.LethalWeapons", | |||
"in": { | |||
"$or": [ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this work?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, but maybe I used too much imagination and creativity here. You may see that all I want to do is to take Christmas explosives into consideration, so maybe there's a more acceptable type exist?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You could just add the two repo ids of the explosives to the LethalWeapons
array. I'm not entirely sure if explosive weapons can be checked like this however, so I suggest testing it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That makes sense... So the final question is, how to test? 🤯
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Play the contract and check if killing a target with your added explosives changes the counter?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean which folder to place this JSON in
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can either follow the steps in the Readme.md under "Installation", and just run a dev version of Peacock with your modified files, or if you want you could copy the contract json into the "contracts" folder of your release version of Peacock, and then access the contract through "My contracts" in game.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
RSLGTM for l10n. A note: some lines that were previously translated to Chinese are no longer translated.
Chinese version. Signed-off-by: suanjiansalt <[email protected]>
Decide to localize all killing tip strings. Sorry for the wavering. |
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
Signed-off-by: suanjiansalt <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume it all works and has been verified.
All of these "Eliminate <name>" lines without any condition don't really need dedicated localization and create unnecessary work for the translators, the generic UI_CONTRACT_GENERAL_OBJ_KILL should work fine I've only really looked at the the first contract in the list, MENDIE1, and that one already was wrong: your new edit says that the kill needs to be an explosion accident, where any kill method is sufficient. It also looks like you changed the locr key I'll do some more testing later |
Signed-off-by: suanjiansalt <[email protected]>
Alright, did a quick test with an xmax explosive, seems to work nicely. The tileimage for the christmas calamity is broken with this change however, it would need to be updated in the image pack. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks all good to me :)
Thanks @suanjiansalt! |
Improvement program for issue #353 , huge thanks to @grappigegovert .
A dumb try, so please treat this as a pupil's homework, after all it's my first time doing this...
Note:
The Christmas Calamity
gameplay.If it's broken, I'm appreciated to receive your kind advice.This time I fixed it correctly. If it's unnecessary, I will rollback it in no time.HUDTemplate
line looks improper inThe Tedious Thievery
. Before you collect all items (7 golds and 2 burgers) the icon is exactly the 'Exit' icon, but after completion the icon is what we want (a blue 'objective' icon).I deletedI changed theOnActive
line but this could be ridiculous. Please inform me before I look too stupid.iconType
to16
and it looks good now.