Fixed player siege dialogue with the marshall, according to a report …

…on TW forums.
tldmod · Jul 8, 2018 · 77675cc · 77675cc
1 parent db8c5b1
commit 77675cc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/ModuleSystem/module_dialogs.py b/ModuleSystem/module_dialogs.py
@@ -4947,12 +4947,12 @@
      (assign, reg15, ":siege_command_cost"),
   (try_begin),
     (eq, "$player_looks_like_an_orc", 1),
-    (str_store_string, s4, "@You need sharp weapons, fresh meat for your troops and wargs, wood to fuel the fires, and draughts to make the weaklings keep up. You also have to keep your scum in line or they’ll all kill each other before you’ve even got to walls. We’re too busy with our own fights to take care of your lot— be prepared to provide what is needed to keep the maggots moving.^[requires {reg3} resources, {reg15} influence]"),
+    (str_store_string, s4, "@You need sharp weapons, fresh meat for your troops and wargs, wood to fuel the fires, and draughts to make the weaklings keep up. You also have to keep your scum in line or they’ll all kill each other before you’ve even got to the walls. We’re too busy with our own fights to take care of your lot — be prepared to provide what is needed to keep the maggots moving.^[requires {reg3} resources, {reg15} influence]"),
   (else_try),
     (neg|faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
-    (str_store_string, s4, "@Firstly, we must think to the hindrances of this task. Steel must be kept sharp, men and horses fed, fires kept burning, water fetched, wounds tended—you and your men are no use to us if you can’t maintain your campaign. As we are spread too thin already to give you what is required, you must be prepared to provide what is needed keep your army operational in a siege.^[requires {reg3} resources, {reg15} influence]"),
+    (str_store_string, s4, "@Steel must be kept sharp, men and horses fed, fires kept burning, water fetched, wounds tended — you and your men are no use to us if you can’t maintain your campaign. As we are spread too thin already to give you what is required, you must be prepared to provide what is needed to keep your army operational in a siege.^[requires {reg3} resources, {reg15} influence]"),
   (else_try),
-    (str_store_string, s4, "@Firstly, we must think to the hindrances of this task. Steel must be kept sharp, soldiers and horses fed, fires kept burning, water fetched, wounds tended—a battle less glorious but no less important than the one you will fight on the ramparts. As we are spread too thin already to give you what is required, you must be prepared to provide what is needed to keep your army operational in a siege.^[requires {reg3} resources, {reg15} influence]"),
+    (str_store_string, s4, "@Steel must be kept sharp, soldiers and horses fed, fires kept burning, water fetched, wounds tended — a battle less glorious but no less important than the one you will fight on the ramparts. As we are spread too thin already to give you what is required, you must be prepared to provide what is needed to keep your army operational in a siege.^[requires {reg3} resources, {reg15} influence]"),
   (try_end),],
   "{s4}", "player_siege_discuss_2",
   []],
@@ -4974,7 +4974,7 @@
     (eq, "$player_looks_like_an_orc", 1),
     (str_store_string, s4, "@Third, {s2} is on its own campaign. We’ll fight with you if the pickings look good, but you better be strong enough to win on your own, or you won’t last long."),
   (else_try),
-    (str_store_string, s4, "@Furthermore, you must know that {s2} is occupied with its own campaign. Our banners will follow you into battle if circumstance permits, but do not trust to hope—you may well be forced to stand alone."),
+    (str_store_string, s4, "@Furthermore, you must know that {s2} is occupied with its own campaign. Our banners will follow you into battle if circumstance permits, but do not trust to hope — you may well be forced to stand alone."),
   (try_end)],
   "{s4}", "player_siege_discuss_4",
   []],
@@ -4985,12 +4985,12 @@
   (str_store_faction_name, s2, ":fac"),
   (try_begin),
     (eq, "$player_looks_like_an_orc", 1),
-    (str_store_string, s4, "@Last, remember that as a {s25} of {s2}, the Master has got no time for failure. You risk much for {s2} when you fight—bring us defeat and we’ll make sure you wish you’d never been born."),
+    (str_store_string, s4, "@Last, remember that as a {s25}, the Master has got no time for failure. You risk much for {s2} when you fight — bring us defeat and we’ll make sure you wish you’d never been born."),
   (else_try),
     (neg|faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
-    (str_store_string, s4, "@Finally, remember that as a {s25} of {s2}, you live and die by your successes and failures. You risk much for {s2} when you march into battle—bring ruin upon it and the consequences will be severe."),
+    (str_store_string, s4, "@Finally, remember that as a {s25}, you live and die by your successes and failures. You risk much for {s2} when you march into battle — bring ruin upon it and the consequences will be severe."),
   (else_try),
-    (str_store_string, s4, "@Finally, remember that as a {s25} of {s2}, you may bask in the glory of a victory hard-won and call that victory your own but all who dwell in {s2} will pay the price of your failure. You carry the fate of {s2} into battle with you—bring ruin upon it and the consequences will be severe."),
+    (str_store_string, s4, "@Finally, remember that as a {s25}, you may bask in the glory of a victory hard-won and call that victory your own but all who dwell in {s2} will pay the price of your failure. You carry the fate of {s2} into battle with you — bring ruin upon it and the consequences will be severe."),
   (try_end),
   ],
   "{s4}", "player_siege_discuss_5",

diff --git a/_wb/quick_strings.txt b/_wb/quick_strings.txt
@@ -1528,16 +1528,16 @@ qstr_Indeed?_That_is_no_s Indeed?_That_is_no_small_undertaking_and_there_are_mat
 qstr_First_sieges_are_onl First,_sieges_are_only_an_option_for_the_strongest!_Here_is_all_that_needs_doing:
 qstr_Here_is_all_that_nee Here_is_all_that_needs_doing:
 qstr_Firstly_we_must_thin Firstly,_we_must_think_to_the_hindrances_of_this_task:
-qstr_You_need_sharp_weapo You_need_sharp_weapons,_fresh_meat_for_your_troops_and_wargs,_wood_to_fuel_the_fires,_and_draughts_to_make_the_weaklings_keep_up._You_also_have_to_keep_your_scum_in_line_or_they’ll_all_kill_each_other_before_you’ve_even_got_to_walls._We’re_too_busy_with_our_own_fights_to_take_care_of_your_lot—_be_prepared_to_provide_what_is_needed_to_keep_the_maggots_moving.^[requires_{reg3}_resources,_{reg15}_influence]
-qstr_Firstly_we_must_think Firstly,_we_must_think_to_the_hindrances_of_this_task._Steel_must_be_kept_sharp,_men_and_horses_fed,_fires_kept_burning,_water_fetched,_wounds_tended—you_and_your_men_are_no_use_to_us_if_you_can’t_maintain_your_campaign._As_we_are_spread_too_thin_already_to_give_you_what_is_required,_you_must_be_prepared_to_provide_what_is_needed_keep_your_army_operational_in_a_siege.^[requires_{reg3}_resources,_{reg15}_influence]
-qstr_Firstly_we_must_think_ Firstly,_we_must_think_to_the_hindrances_of_this_task._Steel_must_be_kept_sharp,_soldiers_and_horses_fed,_fires_kept_burning,_water_fetched,_wounds_tended—a_battle_less_glorious_but_no_less_important_than_the_one_you_will_fight_on_the_ramparts._As_we_are_spread_too_thin_already_to_give_you_what_is_required,_you_must_be_prepared_to_provide_what_is_needed_to_keep_your_army_operational_in_a_siege.^[requires_{reg3}_resources,_{reg15}_influence]
+qstr_You_need_sharp_weapo You_need_sharp_weapons,_fresh_meat_for_your_troops_and_wargs,_wood_to_fuel_the_fires,_and_draughts_to_make_the_weaklings_keep_up._You_also_have_to_keep_your_scum_in_line_or_they’ll_all_kill_each_other_before_you’ve_even_got_to_the_walls._We’re_too_busy_with_our_own_fights_to_take_care_of_your_lot_—_be_prepared_to_provide_what_is_needed_to_keep_the_maggots_moving.^[requires_{reg3}_resources,_{reg15}_influence]
+qstr_Steel_must_be_kept_s Steel_must_be_kept_sharp,_men_and_horses_fed,_fires_kept_burning,_water_fetched,_wounds_tended_—_you_and_your_men_are_no_use_to_us_if_you_can’t_maintain_your_campaign._As_we_are_spread_too_thin_already_to_give_you_what_is_required,_you_must_be_prepared_to_provide_what_is_needed_to_keep_your_army_operational_in_a_siege.^[requires_{reg3}_resources,_{reg15}_influence]
+qstr_Steel_must_be_kept_sh Steel_must_be_kept_sharp,_soldiers_and_horses_fed,_fires_kept_burning,_water_fetched,_wounds_tended_—_a_battle_less_glorious_but_no_less_important_than_the_one_you_will_fight_on_the_ramparts._As_we_are_spread_too_thin_already_to_give_you_what_is_required,_you_must_be_prepared_to_provide_what_is_needed_to_keep_your_army_operational_in_a_siege.^[requires_{reg3}_resources,_{reg15}_influence]
 qstr_Next_if_you_try_to_a Next,_if_you_try_to_attack_an_enemy_capital,_I’ll_stick_you_if_you_ain’t_dead_already.._We_only_march_there_when_the_Master_commands_it._You_go_where_the_enemy_is_weak_and_can_be_beaten.
 qstr_Secondly_you_do_not_ Secondly,_you_do_not_have_permission_to_lead_our_people_against_an_enemy_capital._These_places_can_only_be_overcome_when_the_full_strength_of_our_forces_stands_united._You_are_to_strike_only_where_our_foe_has_been_weakened_sufficiently_that_they_would_be_defeated.
 qstr_Third_{s2}_is_on_its Third,_{s2}_is_on_its_own_campaign._We’ll_fight_with_you_if_the_pickings_look_good,_but_you_better_be_strong_enough_to_win_on_your_own,_or_you_won’t_last_long.
-qstr_Furthermore_you_must Furthermore,_you_must_know_that_{s2}_is_occupied_with_its_own_campaign._Our_banners_will_follow_you_into_battle_if_circumstance_permits,_but_do_not_trust_to_hope—you_may_well_be_forced_to_stand_alone.
-qstr_Last_remember_that_a Last,_remember_that_as_a_{s25}_of_{s2},_the_Master_has_got_no_time_for_failure._You_risk_much_for_{s2}_when_you_fight—bring_us_defeat_and_we’ll_make_sure_you_wish_you’d_never_been_born.
-qstr_Finally_remember_tha Finally,_remember_that_as_a_{s25}_of_{s2},_you_live_and_die_by_your_successes_and_failures._You_risk_much_for_{s2}_when_you_march_into_battle—bring_ruin_upon_it_and_the_consequences_will_be_severe.
-qstr_Finally_remember_that Finally,_remember_that_as_a_{s25}_of_{s2},_you_may_bask_in_the_glory_of_a_victory_hard-won_and_call_that_victory_your_own_but_all_who_dwell_in_{s2}_will_pay_the_price_of_your_failure._You_carry_the_fate_of_{s2}_into_battle_with_you—bring_ruin_upon_it_and_the_consequences_will_be_severe.
+qstr_Furthermore_you_must Furthermore,_you_must_know_that_{s2}_is_occupied_with_its_own_campaign._Our_banners_will_follow_you_into_battle_if_circumstance_permits,_but_do_not_trust_to_hope_—_you_may_well_be_forced_to_stand_alone.
+qstr_Last_remember_that_a Last,_remember_that_as_a_{s25},_the_Master_has_got_no_time_for_failure._You_risk_much_for_{s2}_when_you_fight_—_bring_us_defeat_and_we’ll_make_sure_you_wish_you’d_never_been_born.
+qstr_Finally_remember_tha Finally,_remember_that_as_a_{s25},_you_live_and_die_by_your_successes_and_failures._You_risk_much_for_{s2}_when_you_march_into_battle_—_bring_ruin_upon_it_and_the_consequences_will_be_severe.
+qstr_Finally_remember_that Finally,_remember_that_as_a_{s25},_you_may_bask_in_the_glory_of_a_victory_hard-won_and_call_that_victory_your_own_but_all_who_dwell_in_{s2}_will_pay_the_price_of_your_failure._You_carry_the_fate_of_{s2}_into_battle_with_you_—_bring_ruin_upon_it_and_the_consequences_will_be_severe.
 qstr_Still_think_you_can_ Still_think_you_can_handle_it?
 qstr_Knowing_what_I_have_ Knowing_what_I_have_told_you,_do_you_still_think_yourself_capable?
 qstr_Knowing_what_I_have_t Knowing_what_I_have_told_you,_do_you_still_wish_to_proceed?

diff --git a/quick_strings.txt b/quick_strings.txt
@@ -1331,16 +1331,16 @@ qstr_Indeed?_That_is_no_s Indeed?_That_is_no_small_undertaking_and_there_are_mat
 qstr_First_sieges_are_onl First,_sieges_are_only_an_option_for_the_strongest!_Here_is_all_that_needs_doing:
 qstr_Here_is_all_that_nee Here_is_all_that_needs_doing:
 qstr_Firstly_we_must_thin Firstly,_we_must_think_to_the_hindrances_of_this_task:
-qstr_You_need_sharp_weapo You_need_sharp_weapons,_fresh_meat_for_your_troops_and_wargs,_wood_to_fuel_the_fires,_and_draughts_to_make_the_weaklings_keep_up._You_also_have_to_keep_your_scum_in_line_or_they’ll_all_kill_each_other_before_you’ve_even_got_to_walls._We’re_too_busy_with_our_own_fights_to_take_care_of_your_lot—_be_prepared_to_provide_what_is_needed_to_keep_the_maggots_moving.^[requires_{reg3}_resources,_{reg15}_influence]
-qstr_Firstly_we_must_think Firstly,_we_must_think_to_the_hindrances_of_this_task._Steel_must_be_kept_sharp,_men_and_horses_fed,_fires_kept_burning,_water_fetched,_wounds_tended—you_and_your_men_are_no_use_to_us_if_you_can’t_maintain_your_campaign._As_we_are_spread_too_thin_already_to_give_you_what_is_required,_you_must_be_prepared_to_provide_what_is_needed_keep_your_army_operational_in_a_siege.^[requires_{reg3}_resources,_{reg15}_influence]
-qstr_Firstly_we_must_think_ Firstly,_we_must_think_to_the_hindrances_of_this_task._Steel_must_be_kept_sharp,_soldiers_and_horses_fed,_fires_kept_burning,_water_fetched,_wounds_tended—a_battle_less_glorious_but_no_less_important_than_the_one_you_will_fight_on_the_ramparts._As_we_are_spread_too_thin_already_to_give_you_what_is_required,_you_must_be_prepared_to_provide_what_is_needed_to_keep_your_army_operational_in_a_siege.^[requires_{reg3}_resources,_{reg15}_influence]
+qstr_You_need_sharp_weapo You_need_sharp_weapons,_fresh_meat_for_your_troops_and_wargs,_wood_to_fuel_the_fires,_and_draughts_to_make_the_weaklings_keep_up._You_also_have_to_keep_your_scum_in_line_or_they’ll_all_kill_each_other_before_you’ve_even_got_to_the_walls._We’re_too_busy_with_our_own_fights_to_take_care_of_your_lot_—_be_prepared_to_provide_what_is_needed_to_keep_the_maggots_moving.^[requires_{reg3}_resources,_{reg15}_influence]
+qstr_Steel_must_be_kept_s Steel_must_be_kept_sharp,_men_and_horses_fed,_fires_kept_burning,_water_fetched,_wounds_tended_—_you_and_your_men_are_no_use_to_us_if_you_can’t_maintain_your_campaign._As_we_are_spread_too_thin_already_to_give_you_what_is_required,_you_must_be_prepared_to_provide_what_is_needed_to_keep_your_army_operational_in_a_siege.^[requires_{reg3}_resources,_{reg15}_influence]
+qstr_Steel_must_be_kept_sh Steel_must_be_kept_sharp,_soldiers_and_horses_fed,_fires_kept_burning,_water_fetched,_wounds_tended_—_a_battle_less_glorious_but_no_less_important_than_the_one_you_will_fight_on_the_ramparts._As_we_are_spread_too_thin_already_to_give_you_what_is_required,_you_must_be_prepared_to_provide_what_is_needed_to_keep_your_army_operational_in_a_siege.^[requires_{reg3}_resources,_{reg15}_influence]
 qstr_Next_if_you_try_to_a Next,_if_you_try_to_attack_an_enemy_capital,_I’ll_stick_you_if_you_ain’t_dead_already.._We_only_march_there_when_the_Master_commands_it._You_go_where_the_enemy_is_weak_and_can_be_beaten.
 qstr_Secondly_you_do_not_ Secondly,_you_do_not_have_permission_to_lead_our_people_against_an_enemy_capital._These_places_can_only_be_overcome_when_the_full_strength_of_our_forces_stands_united._You_are_to_strike_only_where_our_foe_has_been_weakened_sufficiently_that_they_would_be_defeated.
 qstr_Third_{s2}_is_on_its Third,_{s2}_is_on_its_own_campaign._We’ll_fight_with_you_if_the_pickings_look_good,_but_you_better_be_strong_enough_to_win_on_your_own,_or_you_won’t_last_long.
-qstr_Furthermore_you_must Furthermore,_you_must_know_that_{s2}_is_occupied_with_its_own_campaign._Our_banners_will_follow_you_into_battle_if_circumstance_permits,_but_do_not_trust_to_hope—you_may_well_be_forced_to_stand_alone.
-qstr_Last_remember_that_a Last,_remember_that_as_a_{s25}_of_{s2},_the_Master_has_got_no_time_for_failure._You_risk_much_for_{s2}_when_you_fight—bring_us_defeat_and_we’ll_make_sure_you_wish_you’d_never_been_born.
-qstr_Finally_remember_tha Finally,_remember_that_as_a_{s25}_of_{s2},_you_live_and_die_by_your_successes_and_failures._You_risk_much_for_{s2}_when_you_march_into_battle—bring_ruin_upon_it_and_the_consequences_will_be_severe.
-qstr_Finally_remember_that Finally,_remember_that_as_a_{s25}_of_{s2},_you_may_bask_in_the_glory_of_a_victory_hard-won_and_call_that_victory_your_own_but_all_who_dwell_in_{s2}_will_pay_the_price_of_your_failure._You_carry_the_fate_of_{s2}_into_battle_with_you—bring_ruin_upon_it_and_the_consequences_will_be_severe.
+qstr_Furthermore_you_must Furthermore,_you_must_know_that_{s2}_is_occupied_with_its_own_campaign._Our_banners_will_follow_you_into_battle_if_circumstance_permits,_but_do_not_trust_to_hope_—_you_may_well_be_forced_to_stand_alone.
+qstr_Last_remember_that_a Last,_remember_that_as_a_{s25},_the_Master_has_got_no_time_for_failure._You_risk_much_for_{s2}_when_you_fight_—_bring_us_defeat_and_we’ll_make_sure_you_wish_you’d_never_been_born.
+qstr_Finally_remember_tha Finally,_remember_that_as_a_{s25},_you_live_and_die_by_your_successes_and_failures._You_risk_much_for_{s2}_when_you_march_into_battle_—_bring_ruin_upon_it_and_the_consequences_will_be_severe.
+qstr_Finally_remember_that Finally,_remember_that_as_a_{s25},_you_may_bask_in_the_glory_of_a_victory_hard-won_and_call_that_victory_your_own_but_all_who_dwell_in_{s2}_will_pay_the_price_of_your_failure._You_carry_the_fate_of_{s2}_into_battle_with_you_—_bring_ruin_upon_it_and_the_consequences_will_be_severe.
 qstr_Still_think_you_can_ Still_think_you_can_handle_it?
 qstr_Knowing_what_I_have_ Knowing_what_I_have_told_you,_do_you_still_think_yourself_capable?
 qstr_Knowing_what_I_have_t Knowing_what_I_have_told_you,_do_you_still_wish_to_proceed?