thepeacockproject / Peacock

The Peacock Project is a HITMAN™ World of Assassination trilogy server replacement.
https://thepeacockproject.org
GNU Affero General Public License v3.0
387 stars 60 forks source link

Fix peacock escalations' incomplete displayed killing tips #358

Closed suanjiansalt closed 10 months ago

suanjiansalt commented 11 months ago

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:

suanjiansalt commented 11 months ago

Decide to localize all killing tip strings. Sorry for the wavering.

grappigegovert commented 10 months ago

All of these "Eliminate \" 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 UI_PEACOCK_SOUTHERN_COMFORT_OBJ1 to UI_PEACOCK_SOUTHERN_COMFORT_XMASGIFT, but in doing so changed the text for all languages to the english translation.

I'll do some more testing later

suanjiansalt commented 10 months ago

All of these "Eliminate " 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

  1. I did this because in H3, almost official escalations really localized all strings like "Eliminate ". For example, in the Jinzhen Incident: Screenshot 2024-01-02 110035 Just eliminating Shihong Luo and Hui Hou in any conditions are both localized. Again, as I said earlier, if it's not necessary, just delete it. 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.
  2. Oh YES, it is my fault. Not understand why I did it, but it clearly a fault I made on purpose. It also looks like you changed the locr key UI_PEACOCK_SOUTHERN_COMFORT_OBJ1 to UI_PEACOCK_SOUTHERN_COMFORT_XMASGIFT, but in doing so changed the text for all languages to the english translation.
  3. Well, I'm not merely replace the whole line with new key UI_PEACOCK_SOUTHERN_COMFORT_XMASGIFT. All I did in fact is change the keys' names, so I also give the right value to the keys if you look into it. This happens to some complications of The Jeffery Confession too.
grappigegovert commented 10 months ago

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.

RDIL commented 10 months ago

Thanks @suanjiansalt!