Some small nits
Diff comments:
> === modified file 'data/campaigns/emp04.wmf/scripting/mission_thread.lua'
> --- data/campaigns/emp04.wmf/scripting/mission_thread.lua 2018-05-29
> 20:14:16 +0000
> +++ data/campaigns/emp04.wmf/scripting/mission_thread.lua 2018-08-24
> 22:48:29 +0000
> @@ -411,25 +425,38 @@
> scroll_to_map_pixel(prior_center)
>
> local hq = p1:get_buildings("empire_headquarters")
> - local wh = p3:get_buildings("empire_temple_of_vesta")
> - while not ((hq[1]:get_wares("wheat") > 34 and hq[1]:get_wares("wine") >
> 14) or p3.defeated) do sleep(4000) end
> - if p3.defeated then
> + while sf.immovable.descr.type_name == "warehouse" and
> (hq[1]:get_wares("wheat") < 35 or hq[1]:get_wares("wine") < 15) and not
> p3.defeated do
> + sleep(4000)
> + end
> + if sf.immovable.descr.type_name ~= "warehouse" then
> + if p1.defeated then
> + campaign_message_box(amalea_21)
> + p1.see_all = true
> + else
> + o1.done = true
> + campaign_message_box(amalea_22)
> + end
> + elseif p3.defeated then
> o1.done = true
> julia_conquered = true
> - p1:allow_buildings{"empire_mill", "empire_brewery"}
> + p1:forbid_buildings{"empire_mill1", "empire_brewery1"}
> + p1:allow_buildings{"empire_mill", "empire_brewery", "empire_mill2",
> "empire_brewery2"}
> campaign_message_box(saledus_2)
> campaign_message_box(julia_2)
> campaign_message_box(amalea_11)
> campaign_message_box(saledus_4)
> + run(karma)
> else
> o1.done = true
> - wh[1]:set_workers("empire_carrier", 0)
> - wh[1]:set_workers("empire_recruit", 0)
> + local wh = p3:get_buildings("empire_temple_of_vesta")
> + --wh[1]:set_workers("empire_carrier", 0)
Can these 2 lines go?
> + --wh[1]:set_workers("empire_recruit", 0)
> local wheat = hq[1]:get_wares("wheat") - 35
> local wine = hq[1]:get_wares("wine") - 15
> hq[1]:set_wares("wheat", wheat)
> hq[1]:set_wares("wine", wine)
> - p1:allow_buildings{"empire_mill", "empire_brewery"}
> + p1:forbid_buildings{"empire_mill1", "empire_brewery1"}
> + p1:allow_buildings{"empire_mill", "empire_brewery", "empire_mill2",
> "empire_brewery2"}
> campaign_message_box(julia_1)
>
> --remove all workers from p3 to avoid having them wandering around
>
> === modified file 'data/campaigns/emp04.wmf/scripting/texts.lua'
> --- data/campaigns/emp04.wmf/scripting/texts.lua 2018-02-23 07:06:48
> +0000
> +++ data/campaigns/emp04.wmf/scripting/texts.lua 2018-08-24 22:48:29
> +0000
> @@ -312,13 +312,16 @@
> title=_"Amalea has Bad News",
> body= amalea3(_"Amalea recommends…",
> -- TRANSLATORS: Amalea
> - _([[Brother, I'm really worried that I have to deliver bad news again.
> As you can see, our farms aren’t producing anything and we can’t dismantle
> them. The only option is to destroy them.]])
> + _([[Brother, I'm really worried that I have to deliver bad news again.
> As you can see, our farms aren’t producing anything and we can’t dismantle
> them.]])
> .. paragraphdivider() ..
> -- TRANSLATORS: Amalea
> _([[This situation was caused by the sad fact that our people lost the
> instructions on how to construct and operate farms. Therefore they have zero
> productivity and the constructors don’t know how to dismantle them either.]])
> .. paragraphdivider() ..
> -- TRANSLATORS: Amalea
> - _([[So, we urgently need to recover the plans regarding the
> construction and operation of farms. One older constructor told me that they
> might have been concealed in a cave in the hills east of our border.]]))
> + _([[So, we urgently need to recover the plans regarding the
> construction and operation of farms. One older constructor told me that they
> might have been concealed in a cave in the hills east of our border.]])
> + .. paragraphdivider() ..
> + -- TRANSLATORS: Amalea
> + _([[Until we have found the plans the only option for our farms is to
> dismantle them.]]))
Needs a comma
_([[Until we have found the plans, the only option for our farms is to
dismantle them.]]))
> .. new_objectives(obj_find_farm_plans),
> posy=1,
> h=500,
> @@ -347,7 +350,7 @@
> _([[Praise the gods, Lutius! We have found the plans on how to build
> and operate farms.]])
> .. paragraphdivider() ..
> -- TRANSLATORS: Amalea
> - _([[Now we can start building farms to produce the beer which our
> miners need so desperately.]])
> + _([[Now we can start building farms to produce the beer which our
> miners need so desperately. Furthermore the plans have enabled us to upgrade
> our old farms to get to work again.]])
Furthermore,
> .. paragraphdivider() ..
> -- TRANSLATORS: Amalea
> _([[But I’m afraid that this problem hasn’t been the last in our
> economy.]])),
> @@ -462,7 +465,10 @@
> title=_"Amalea is Very Content",
> body= amalea2(_"Amalea claps her hands…",
> -- TRANSLATORS: Amalea
> - _([[Well done. Now we are able to build more efficient buildings to
> refine our wheat. And, best of all, we have a new ally who just provided us
> with lots of water, flour and beer. Now I really think that nothing can
> prevent us from getting stronger and conquering back our homeland.]])),
> + _([[Well done. Now we are able to build more efficient buildings to
> refine our wheat. Furthermore the plans enable us to upgrade our current mill
> and brewery with the improved technology.]])
Furthermore,
> + .. paragraphdivider() ..
> + -- TRANSLATORS: Amalea
> + _([[And, best of all, we have a new ally who just provided us with
> lots of water, flour and beer. Now I really think that nothing can prevent us
> from getting stronger and conquering back our homeland.]])),
"conquering back" -> "taking back" will sound more natural
> posy=1,
> }
>
> @@ -552,6 +558,32 @@
> posy=1,
> }
>
> +amalea_21 = {
> + title=_"Defeated!",
> + body= amalea2(_"Amalea reports our defeat…",
> + -- TRANSLATORS: Amalea
> + _([[Oh no Lutius, I don't know how this could have happened, but the
> Barbarians have sacked our headquarters. So we have lost this battle and our
> empire!]])),
Run a search and replace over the file:
' -> ’
So, we have
> + posy=1,
> +}
> +
> +amalea_22 = {
> + title=_"Amalea has Bad News",
> + body= amalea2(_"Amalea reports our headquarters lost…",
> + -- TRANSLATORS: Amalea
> + _([[Oh no Lutius, I don't know how this could have happened, but the
> Barbarians have destroyed our headquarters. So we can't deliver the wares to
> Julia anymore.]])
So, we can’t
> + .. paragraphdivider() ..
> + -- TRANSLATORS: Amalea
> + _([[Now we need to try to fulfil our duties without their technology.
> But this will not be an easy task at all.]])),
> + posy=1,
> +}
> +
> +amalea_23 = {
> + title=_"Defeated!",
> + body= amalea2(_"Amalea reports our defeat…",
> + -- TRANSLATORS: Amalea
> + _([[Oh no Lutius, I don't know how this could have happened, but the
> Barbarians have destroyed our last warehouse. So we have lost this battle and
> our empire!]])),
So, we have
> + posy=1,
> +}
>
> -- Saledus
>
--
https://code.launchpad.net/~widelands-dev/widelands/empire04_bug_fix_enhance/+merge/353742
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/empire04_bug_fix_enhance into lp:widelands.
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
