*Quick fix to Raid Village quest

- Have the village spawn from the quest giver, instead of target faction - Have the region name within the quest notes for Defend/Raid Village & Scout Camps - small fix to region short names
tldmod · Mar 21, 2017 · 91bc173 · 91bc173
1 parent 30c99ce
commit 91bc173
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 34 deletions.
diff --git a/ModuleSystem/module_dialogs.py b/ModuleSystem/module_dialogs.py
@@ -4954,10 +4954,13 @@
         (spawn_around_party,"$g_encountered_party",":quest_target_party_template"),
         (assign, "$qst_destroy_scout_camp_party", reg0),
       (try_end),
-      (quest_get_slot, reg1, "$random_quest_no", slot_quest_expiration_days),
+      (call_script, "script_get_region_of_party", "$qst_destroy_scout_camp_party"),
+      (store_add, reg2, str_shortname_region_begin , reg1),
+      (str_store_string,s1,reg2),
+      (quest_get_slot, reg3, "$random_quest_no", slot_quest_expiration_days),
       (str_store_troop_name_link,s9,"$g_talk_troop"),
       (setup_quest_text,"$random_quest_no"),
-      (str_store_string, s2, "@{s9} asked you to destroy a scout camp nearby."),
+      (str_store_string, s2, "@{s9} asked you to destroy a scout camp near {s1}."),
       (call_script, "script_change_player_relation_with_troop","$g_talk_troop",1),
       (call_script, "script_start_quest", "$random_quest_no", "$g_talk_troop"),
       (call_script, "script_stand_back"),
@@ -5009,11 +5012,14 @@
       (set_spawn_radius, 10),
       (spawn_around_party,":quest_giver_center",":quest_target_party_template"),
       (assign, "$qst_defend_village_party", reg0),
-      (quest_get_slot, reg1, "$random_quest_no", slot_quest_expiration_days),
+      (call_script, "script_get_region_of_party", "$qst_defend_village_party"),
+      (store_add, reg2, str_shortname_region_begin , reg1),
+      (str_store_string,s1,reg2),
+      (quest_get_slot, reg3, "$random_quest_no", slot_quest_expiration_days),
       (str_store_troop_name_link,s9,"$g_talk_troop"),
       (setup_quest_text,"$random_quest_no"),
-      (str_store_party_name, s3, ":quest_giver_center"),
-      (str_store_string, s2, "@{s9} asked you to defend a village under attack near {s3}."),
+      #(str_store_party_name, s3, ":quest_giver_center"),
+      (str_store_string, s2, "@{s9} asked you to defend a village under attack near {s1}."),
       (call_script, "script_start_quest", "$random_quest_no", "$g_talk_troop"),
       (call_script, "script_change_player_relation_with_troop","$g_talk_troop",1),
       (call_script, "script_stand_back"),
@@ -5057,15 +5063,17 @@
   "Then what are you doing standing around here?","close_window",
       [
       (quest_get_slot, ":quest_target_party_template", "$random_quest_no", slot_quest_target_party_template),
-      (quest_get_slot, ":quest_target_center", "$random_quest_no", slot_quest_target_center),
-      (set_spawn_radius, 20),
-      (spawn_around_party,":quest_target_center",":quest_target_party_template"),
+      (quest_get_slot, ":quest_giver_center", "$random_quest_no", slot_quest_giver_center),
+      (set_spawn_radius, 25),
+      (spawn_around_party,":quest_giver_center",":quest_target_party_template"),
       (assign, "$qst_raid_village_party", reg0),
-      (quest_get_slot, reg1, "$random_quest_no", slot_quest_expiration_days),
+      (call_script, "script_get_region_of_party", "$qst_raid_village_party"),
+      (store_add, reg2, str_shortname_region_begin , reg1),
+      (str_store_string,s1,reg2),
+      (quest_get_slot, reg3, "$random_quest_no", slot_quest_expiration_days),
       (str_store_troop_name_link,s9,"$g_talk_troop"),
-      (str_store_party_name, s3, ":quest_target_center"),
       (setup_quest_text,"$random_quest_no"),
-      (str_store_string, s2, "@{s9} asked you to raid a village near {s3}."),
+      (str_store_string, s2, "@{s9} asked you to raid a village near {s1}."),
       (call_script, "script_change_player_relation_with_troop","$g_talk_troop",1),
       (call_script, "script_start_quest", "$random_quest_no", "$g_talk_troop"),
       (call_script, "script_stand_back"),

diff --git a/ModuleSystem/module_strings.py b/ModuleSystem/module_strings.py
@@ -2827,10 +2827,10 @@
 ("shortname_region_unknown", "an unnamed region"), # -1
 
 ("shortname_region_pelennor", "Pelennor Fields"), #0
-("shortname_region_subfac_pelargir", "Fiefdom of Lebennin"), # pelargir
+("shortname_region_subfac_pelargir", "the Fiefdom of Lebennin"), # pelargir
 ("shortname_region_subfac_dol_amroth", "Belfalas"), #subfac_dol_amroth
 ("shortname_region_subfac_ethring", "Ringló Vale"), # subfac_ethring
-("shortname_region_subfac_lossarnach", "Fiefdom of Lossarnach"),
+("shortname_region_subfac_lossarnach", "the Fiefdom of Lossarnach"),
 ("shortname_region_subfac_pinnath_gelin", "the region of Pinnath Gelin"),
 ("shortname_region_subfac_blackroot", "the Fiefdom of Lamedon"), # subfac_blackroot
 ("shortname_region_n_ithilien", "North Ithilien"),

diff --git a/_wb/conversation.txt b/_wb/conversation.txt
@@ -470,19 +470,19 @@ dlga_lord_tell_objective:lord_pretalk.12 4095 235  0 I_don't_know:_{reg1}_{s1}
 dlga_lord_tell_mission:lord_mission_destroy_scout_camp_a 4095 268  3 31 2 144115188075855929 17 526 3 1224979098644774912 17 1 2330 2 3 1224979098644774912 {playername},_we_have_received_word_that_{s3}_has_a_scout_camp_nearby,_Make_sure_you_are_not_seen_and_destroy_it_before_they_learn_about_our_plans.  242  0 
 dlga_lord_mission_destroy_scout_camp_a:lord_mission_destroy_scout_camp_accept 69631 242  0 Consider_it_done.  243  0 
 dlga_lord_mission_destroy_scout_camp_a:lord_mission_destroy_scout_camp_reject 69631 242  0 I_do_not_have_the_time_for_this.  244  0 
-dlga_lord_mission_destroy_scout_camp_accept:close_window 4095 243  0 We_shall_await_news_of_your_success.  6  32 526 3 1224979098644774912 144115188075855929 9 2133 2 1224979098644774913 0 6 3 1224979098644774914 0 10 31 2 1224979098644774913 0 1103 1 15 1100 2 144115188075855998 1224979098644774912 4 0 1608 2 1224979098644774915 72057594037927936 2147483679 2 1224979098644774915 0 2147483679 2 1224979098644774915 1 2147483679 2 1224979098644774915 8 2133 2 144115188075856561 72057594037927936 2133 2 1224979098644774913 1 5 0 1232 1 72057594037927936 3 0 3 0 4 0 132 1 144115188075856561 5 0 1103 1 15 1100 2 144115188075855998 1224979098644774912 2133 2 144115188075856561 72057594037927936 3 0 526 3 72057594037927937 144115188075855929 23 2341 2 9 144115188075855891 1290 1 144115188075855929 2320 2 2 1585267068834415713 1 3 162 144115188075855891 1 1 3 255 144115188075855929 144115188075855891 1 1 401 2133 2 144115188075855906 1 
+dlga_lord_mission_destroy_scout_camp_accept:close_window 4095 243  0 We_shall_await_news_of_your_success.  6  35 526 3 1224979098644774912 144115188075855929 9 2133 2 1224979098644774913 0 6 3 1224979098644774914 0 10 31 2 1224979098644774913 0 1103 1 15 1100 2 144115188075855998 1224979098644774912 4 0 1608 2 1224979098644774915 72057594037927936 2147483679 2 1224979098644774915 0 2147483679 2 1224979098644774915 1 2147483679 2 1224979098644774915 8 2133 2 144115188075856561 72057594037927936 2133 2 1224979098644774913 1 5 0 1232 1 72057594037927936 3 0 3 0 4 0 132 1 144115188075856561 5 0 1103 1 15 1100 2 144115188075855998 1224979098644774912 2133 2 144115188075856561 72057594037927936 3 0 1 2 178 144115188075856561 2120 3 72057594037927938 2012 72057594037927937 2320 2 1 72057594037927938 526 3 72057594037927939 144115188075855929 23 2341 2 9 144115188075855891 1290 1 144115188075855929 2320 2 2 1585267068834415713 1 3 162 144115188075855891 1 1 3 255 144115188075855929 144115188075855891 1 1 401 2133 2 144115188075855906 1 
 dlga_lord_mission_destroy_scout_camp_reject:close_window 4095 244  0 I_see._That_is_disappointing.  6  1 500 3 144115188075855891 20 1 
 dlga_lord_tell_mission:lord_mission_defend_village_a 4095 268  3 31 2 144115188075855929 15 526 3 1224979098644774912 15 7 2330 2 12 1224979098644774912 {playername},_we_have_received_reports_from_our_scouts_that_a_raiding_party_is_on_it's_way_to_a_village_near_{s12}.  245  0 
 dlga_lord_mission_defend_village_a:lord_mission_defend_village_b 69631 245  0 Are_you_able_to_send_men?  246  0 
 dlga_lord_mission_defend_village_b:lord_mission_defend_question 4095 246  0 We_can,_but_it_will_take_time_to_mobilize._We_fear_that_we_may_be_too_late_when_we_do._^^You_and_your_men_seem_able_to_ride_out_quickly._Can_you_defend_this_village?  247  0 
 dlga_lord_mission_defend_question:lord_mission_defend_accept 69631 247  0 My_men_and_I_are_ready._We_shall_ride_out_at_once.  248  0 
 dlga_lord_mission_defend_question:lord_mission_defend_reject 69631 247  0 I_am_afraid_I_cannot_do_this_task.  249  0 
-dlga_lord_mission_defend_accept:close_window 4095 248  0 Thank_you,_{playername}._Now_go,_quickly!  6  14 526 3 1224979098644774912 144115188075855929 12 526 3 1224979098644774913 144115188075855929 9 1103 1 10 1100 2 1224979098644774912 1224979098644774913 2133 2 144115188075856558 72057594037927936 526 3 72057594037927937 144115188075855929 23 2341 2 9 144115188075855891 1290 1 144115188075855929 2330 2 3 1224979098644774912 2320 2 2 1585267068834415714 1 3 255 144115188075855929 144115188075855891 1 3 162 144115188075855891 1 1 1 401 2133 2 144115188075855906 1 
+dlga_lord_mission_defend_accept:close_window 4095 248  0 Thank_you,_{playername}._Now_go,_quickly!  6  16 526 3 1224979098644774912 144115188075855929 12 526 3 1224979098644774913 144115188075855929 9 1103 1 10 1100 2 1224979098644774912 1224979098644774913 2133 2 144115188075856558 72057594037927936 1 2 178 144115188075856558 2120 3 72057594037927938 2012 72057594037927937 2320 2 1 72057594037927938 526 3 72057594037927939 144115188075855929 23 2341 2 9 144115188075855891 1290 1 144115188075855929 2320 2 2 1585267068834415714 1 3 255 144115188075855929 144115188075855891 1 3 162 144115188075855891 1 1 1 401 2133 2 144115188075855906 1 
 dlga_lord_mission_defend_reject:close_window 4095 249  0 I_see._Then_I_will_send_what_troops_I_can._Let_us_hope_we_are_not_too_late.  6  1 500 3 144115188075855891 20 1 
 dlga_lord_tell_mission:lord_mission_raid_village_a 4095 268  10 31 2 144115188075855929 16 526 3 1224979098644774912 16 3 4 0 1073741855 2 1224979098644774912 9 1073741855 2 1224979098644774912 8 1073741855 2 1224979098644774912 10 2147483681 3 1224979098644774912 3 21 2133 2 1224979098644774912 5 3 0 2335 2 3 1224979098644774912 {playername},_there_is_a_village_nearby_that_is_ripe_for_the_picking._Our_scouts_tell_us_that_they_protected_by_{s3},_but_they_are_few_and_can_easily_be_defeated._^^You_happen_to_be_the_first_commander_I_have_told._What_do_you_want_to_do_with_this_information?  250  0 
 dlga_lord_mission_raid_village_a:lord_raid_village_accept 69631 250  0 I_will_raid_that_village,_kill_every_man_we_see,_and_enslave_all_women_and_children!  251  0 
 dlga_lord_mission_raid_village_a:lord_raid_village_reject 69631 250  0 I_do_not_have_the_time_to_raid_puny_villages!  252  0 
-dlga_lord_raid_village_accept:close_window 4095 251  0 Then_what_are_you_doing_standing_around_here?  6  14 526 3 1224979098644774912 144115188075855929 9 526 3 1224979098644774913 144115188075855929 1 1103 1 20 1100 2 1224979098644774913 1224979098644774912 2133 2 144115188075856559 72057594037927936 526 3 72057594037927937 144115188075855929 23 2341 2 9 144115188075855891 2330 2 3 1224979098644774913 1290 1 144115188075855929 2320 2 2 1585267068834415715 1 3 162 144115188075855891 1 1 3 255 144115188075855929 144115188075855891 1 1 401 2133 2 144115188075855906 1 
+dlga_lord_raid_village_accept:close_window 4095 251  0 Then_what_are_you_doing_standing_around_here?  6  16 526 3 1224979098644774912 144115188075855929 9 526 3 1224979098644774913 144115188075855929 12 1103 1 25 1100 2 1224979098644774913 1224979098644774912 2133 2 144115188075856559 72057594037927936 1 2 178 144115188075856559 2120 3 72057594037927938 2012 72057594037927937 2320 2 1 72057594037927938 526 3 72057594037927939 144115188075855929 23 2341 2 9 144115188075855891 1290 1 144115188075855929 2320 2 2 1585267068834415715 1 3 162 144115188075855891 1 1 3 255 144115188075855929 144115188075855891 1 1 401 2133 2 144115188075855906 1 
 dlga_lord_raid_village_reject:close_window 4095 252  0 The_excuses_of_cowards._Go_away,_your_cowardly_stench_is_insulting.  6  1 500 3 144115188075855891 20 1 
 dlga_lord_active_mission_1:lord_mission_sorcerer_completed 69631 167  3 2240 1 1224979098644774912 31 2 1224979098644774912 13 202 1 13 The_sorcerer_of_Mirkwood_has_been_slain,_my_Lady.  253  0 
 dlga_lord_active_mission_1:lord_mission_sorcerer_failed 69631 167  4 2240 1 1224979098644774912 31 2 1224979098644774912 13 203 1 13 546 3 13 11 0 Forgive_me,_my_Lady,_but_urgent_matters_have_prevented_me_from_slaying_the_sorcerer,_and_in_the_meantime_he_has_fled.  254  0 

diff --git a/_wb/quick_strings.txt b/_wb/quick_strings.txt
@@ -1120,9 +1120,9 @@ qstr_We_are_at_war_with_{ We_are_at_war_with_{s12}._However,_we_are_mostly_fight
 qstr_We_are_at_war_with_{s We_are_at_war_with_{s12}._However,_there_are_only_skirmishes_at_the_moment.
 qstr_we_are_not_too_conce we_are_not_too_concerned_with_them_at_the_moment,_since_we_are_fighting_other_enemies_closer_to_home
 qstr__under_your_orders ,_under_your_orders
-qstr_{s9}_asked_you_to_de {s9}_asked_you_to_destroy_a_scout_camp_nearby.
-qstr_{s9}_asked_you_to_def {s9}_asked_you_to_defend_a_village_under_attack_near_{s3}.
-qstr_{s9}_asked_you_to_ra {s9}_asked_you_to_raid_a_village_near_{s3}.
+qstr_{s9}_asked_you_to_de {s9}_asked_you_to_destroy_a_scout_camp_near_{s1}.
+qstr_{s9}_asked_you_to_def {s9}_asked_you_to_defend_a_village_under_attack_near_{s1}.
+qstr_{s9}_asked_you_to_ra {s9}_asked_you_to_raid_a_village_near_{s1}.
 qstr_These_soldiers_may_w These_soldiers_may_well_turn_the_tide_in_my_plans,_{playername}._I_am_confident_you've_trained_them_well._My_thanks_and_my_compliments_to_you.
 qstr_Good_work_in_shaping Good_work_in_shaping_up_those_recruits,_{playername},_you_have_been_most_useful._Hopefully_they'll_last_longer_than_the_last_batch,_but_come_see_me_again_if_they_don't.
 qstr_Well_the_soldiers_ar Well,_the_soldiers_are_at_your_command_now,_sir._I_am_sure_you_will_take_good_care_of_them.

diff --git a/_wb/strings.txt b/_wb/strings.txt
@@ -2013,10 +2013,10 @@ str_fullname_region_grey_mountains the_foothills_of_Grey_Mountains,_where_Dwarve
 str_fullname_region_mordor Mordor,_the_dark_Realm_of_Sauron
 str_shortname_region_unknown an_unnamed_region
 str_shortname_region_pelennor Pelennor_Fields
-str_shortname_region_subfac_pelargir Fiefdom_of_Lebennin
+str_shortname_region_subfac_pelargir the_Fiefdom_of_Lebennin
 str_shortname_region_subfac_dol_amroth Belfalas
 str_shortname_region_subfac_ethring Ringló_Vale
-str_shortname_region_subfac_lossarnach Fiefdom_of_Lossarnach
+str_shortname_region_subfac_lossarnach the_Fiefdom_of_Lossarnach
 str_shortname_region_subfac_pinnath_gelin the_region_of_Pinnath_Gelin
 str_shortname_region_subfac_blackroot the_Fiefdom_of_Lamedon
 str_shortname_region_n_ithilien North_Ithilien

diff --git a/_wb/variable_uses.txt b/_wb/variable_uses.txt
@@ -684,10 +684,10 @@
 30
 3
 37
-4
-4
-60
 5
+5
+60
+6
 7
 2
 1