-
-
Notifications
You must be signed in to change notification settings - Fork 988
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
DW 5 Tirigaz - Changes to orc leader death event #3103
Conversation
Just advising that I think spaces are preferred to tabs. |
speaker=second_unit | ||
message= _ "It seems that orc was rich! He has a chest here with over 100 pieces of gold!" | ||
speaker=Kai Krellis | ||
message= _ "Now we must defeat the undead." |
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.
This is a string change - meaning this can not go into 1.14.2 and must wait for 1.14.3. However, you could exclude this message for now, and add it in a new PR when 1.14.2 is out.
To update this PR, you can use
git commit --amend after your changes
git push -f
That said, I do not know when 1.14.2 will be tagged, and if there is enough time until then.
[gold_carryover] | ||
carryover_percentage=40 | ||
[/gold_carryover] | ||
[/objectives] |
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 would prefer if you could instead of a new [objectives] block edit the first one like it is done here:
https://github.com/wesnoth/wesnoth/blob/1.14/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg#L299-L309
As we have no variable here, the condition could be
[show_if]
[have_unit]
side=number of the side
canrecruit=yes
[/have_unit]
[/show_if]
This second [objectives] tag could be replaced by
[show_objectives][/show_objectives]
then
[/have_unit] | ||
|
||
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.
consider using wmlindent - all you need is a working python3 installation
It's hard to tell from the diff on mobile, but can you still get the gold if undead kill the orcs? |
Not any more. That was the point of the PR. |
So do the undead get the gold instead? If the undead aren't interested I think it'd make sense to drop the gold on the ground where you can later swoop in and grab it. |
Currently the gold never comes into existence if the ghosts kill the orc, and if that happens then the player never discovers that they could potentially have gotten it. Personally I prefer it this way, as the gold acts as a bonus for killing the orc. I could make it pickupable, but personally I like that less than the current arrangement. |
*shrug* Was just an idea, I'm not especially attached to it or anything. |
This no longer needs to be marked posponed since we're past the string freeze now. |
Duh, we're in string freeze again \o/ |
Just an idea about #2940's tidy up of "mermen" vs "merfolk", I'd like to add a translation tip to the orc's last-breath event. I'm happy to open a separate PR for this.
|
Is this meant for 1.14.x? I'm confused because it's targetting master, but it's affected by the 1.14 string freeze. (I'm in favour of putting it in 1.14.x too) |
It could have gone into master before it goes into 1.14, that's true. I'm in favour of the translation hint. |
DW 5 Tirigaz - Changes to orc leader death event Fixes wesnoth#3092 - Updates objectives if orc leader is killed first, and gives additional dialogue Fixes wesnoth#3903 - Gold event doesn't fire if ghosts kill the orc leader
DW 5 Tirigaz - Changes to orc leader death event Fixes wesnoth#3092 - Updates objectives if orc leader is killed first, and gives additional dialogue Fixes wesnoth#3903 - Gold event doesn't fire if ghosts kill the orc leader (cherry-picked from commit b3c4049)
Fixes #3092 - Now updates objectives if orc leader is killed first, and gives additional dialogue
Fixes #3093 - Gold event now won't fire if ghosts kill the orc leader