*Fixes to Reinforce Center Quest

tldmod · Nov 1, 2017 · d9a6d85 · d9a6d85
1 parent e40612b
commit d9a6d85
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/ModuleSystem/module_dialogs.py b/ModuleSystem/module_dialogs.py
@@ -10108,10 +10108,12 @@
     (gt, reg10, 0),
     (is_between, reg10, 1, 16),
     (troop_add_items, "trp_player", "itm_metal_scraps_good", 2),
+    (call_script, "script_increase_rank", "$g_talk_troop_faction", 12),
   (else_try),
     (gt, reg10, 0),
     (gt, reg10, 16),
     (troop_add_items, "trp_player", "itm_metal_scraps_good",4),
+    (call_script, "script_increase_rank", "$g_talk_troop_faction", 18),
   (try_end),]],
 
 #Kham - Reinforce Center Completion END
@@ -10365,7 +10367,12 @@
      (assign, "$random_merchant_quest_no", reg0),
      (assign,"$merchant_offered_quest","$random_merchant_quest_no")]],
 
-[anyone|plyr,"mayor_talk", [(store_partner_quest, ":partner_quest"),
+[anyone|plyr,"mayor_talk", [
+                              (store_partner_quest, ":partner_quest"),
+                              (try_begin), #Reinforce Center Exception
+                                (check_quest_active, "qst_blank_quest_16"),
+                                (assign, ":partner_quest", 1),
+                              (try_end),
                               (lt, ":partner_quest", 0),
                               (eq,"$merchant_quest_last_offerer", "$g_talk_troop"),
                               (ge,"$merchant_offered_quest",0)],

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -23186,7 +23186,12 @@ def set_item_score():
       (party_is_active, ":centers"),
       (store_faction_of_party, ":fac", ":centers"),
 
-      (eq, ":fac", "$g_talk_troop_faction"),
+      #(eq, ":fac", "$g_talk_troop_faction"), #Uncomment this if you want to limit to your own faction only.
+
+      (call_script, "script_get_faction_rank", "$g_talk_troop_faction"), 
+      (assign, ":rank", reg0), #rank points to rank number 0-9
+      (lt, ":rank", 1), #Must be at least known to the faction
+
 
       (str_store_party_name, s10, ":centers"),
       #(display_message, "@DEBUG: Center - {s10}", color_item_text_bonus),

diff --git a/_wb/conversation.txt b/_wb/conversation.txt
@@ -922,7 +922,7 @@ dlga_mayor_talk:mayor_deliver_iron.2 69631 482  12 200 1 35 546 3 35 1 144115188
 dlga_mayor_deliver_iron:mayor_deliver_iron_completed 4095 484  0 Very_nice_work,_{playername}._Our_smiths_will_find_ways_to_put_everything_they_are_given_to_good_use.  485  4 526 3 1224979098644774912 35 14 526 3 1224979098644774913 35 10 1536 3 0 1224979098644774912 1224979098644774913 1 3 172 35 100 
 dlga_mayor_deliver_iron_completed:close_window 69631 485  0 I_do_what_I_can.  6  1 1 1 402 
 dlga_mayor_talk:mayor_reinforced_center_finished 69631 482  5 200 1 58 546 3 58 7 144115188075855998 526 3 1224979098644774912 58 1 2330 2 3 1224979098644774912 202 1 58 I_have_reinforced_{s3}_as_you_have_asked_me_to.  486  0 
-dlga_mayor_reinforced_center_finished:close_window 4095 486  10 526 3 1224979098644774912 58 11 2107 2 1224979098644774912 -1 4 0 32 2 1224979098644774912 0 2133 2 72057594037927946 1224979098644774912 2320 2 4 1585267068834416000 5 0 2133 2 72057594037927946 0 2320 2 4 1585267068834416001 3 0 {s4}  6  19 1 3 172 58 100 526 3 1224979098644774912 58 1 2330 2 1 1224979098644774912 2204 2 1224979098644774913 1224979098644774912 2335 2 2 1224979098644774913 522 3 1224979098644774914 1224979098644774913 153 2105 2 1224979098644774914 80 2133 2 72057594037927986 80 1106 2 1585267068834416002 5308240 502 3 1224979098644774913 153 1224979098644774914 4 0 32 2 72057594037927946 0 33 3 72057594037927946 1 16 1535 3 0 21 2 5 0 32 2 72057594037927946 0 32 2 72057594037927946 16 1535 3 0 21 4 3 0 
+dlga_mayor_reinforced_center_finished:close_window 4095 486  10 526 3 1224979098644774912 58 11 2107 2 1224979098644774912 -1 4 0 32 2 1224979098644774912 0 2133 2 72057594037927946 1224979098644774912 2320 2 4 1585267068834416000 5 0 2133 2 72057594037927946 0 2320 2 4 1585267068834416001 3 0 {s4}  6  21 1 3 172 58 100 526 3 1224979098644774912 58 1 2330 2 1 1224979098644774912 2204 2 1224979098644774913 1224979098644774912 2335 2 2 1224979098644774913 522 3 1224979098644774914 1224979098644774913 153 2105 2 1224979098644774914 80 2133 2 72057594037927986 80 1106 2 1585267068834416002 5308240 502 3 1224979098644774913 153 1224979098644774914 4 0 32 2 72057594037927946 0 33 3 72057594037927946 1 16 1535 3 0 21 2 1 3 14 144115188075855893 12 5 0 32 2 72057594037927946 0 32 2 72057594037927946 16 1535 3 0 21 4 1 3 14 144115188075855893 18 3 0 
 dlga_mayor_talk:mayor_deliver_food 69631 482  11 200 1 34 546 3 34 1 144115188075855998 526 3 1224979098644774912 34 10 2133 2 1224979098644774913 0 6 3 1224979098644774914 7 14 2147483679 2 1224979098644774914 10 2165 2 1224979098644774915 1224979098644774914 2105 2 1224979098644774913 1224979098644774915 3 0 30 2 1224979098644774913 1224979098644774912 2133 2 72057594037927945 1224979098644774912 Here's_your_food,_{reg9}_units.  487  0 
 dlga_mayor_deliver_food:mayor_deliver_food_completed 4095 487  0 Very_nice_work,_{playername},_our_food_stores_are_full_again_and_nobody_will_starve_for_now.  488  10 526 3 1224979098644774912 34 10 6 3 1224979098644774913 7 14 30 2 1224979098644774912 0 2147483679 2 1224979098644774913 10 2165 2 1224979098644774914 1224979098644774913 2110 2 1224979098644774914 1224979098644774912 1536 3 0 1224979098644774913 1224979098644774914 2106 2 1224979098644774912 1224979098644774914 3 0 1 3 172 34 100 
 dlga_mayor_deliver_food_completed:close_window 69631 488  0 I_do_what_I_can.  6  1 1 1 402 
@@ -943,7 +943,7 @@ dlga_mayor_friendly_pretalk:mayor_talk 4095 494  0 Now..._What_else_may_I_do_for
 dlga_mayor_pretalk:mayor_talk 4095 452  0 Yes?  482  0 
 dlga_mayor_talk:mayor_info_begin 69631 482  0 Can_you_tell_me_about_what_you_do?  495  0 
 dlga_mayor_talk:merchant_quest_requested 69631 482  3 2240 1 1224979098644774912 2147483678 2 1224979098644774912 0 2147483679 2 144115188075855944 144115188075855891 How_can_I_serve_our_cause?  496  4 2133 2 144115188075855944 144115188075855891 1 2 123 144115188075855891 2133 2 144115188075855945 72057594037927936 2133 2 144115188075855946 144115188075855945 
-dlga_mayor_talk:merchant_quest_last_offered_job 69631 482  4 2240 1 1224979098644774912 2147483678 2 1224979098644774912 0 31 2 144115188075855944 144115188075855891 30 2 144115188075855946 0 About_that_task_you_needed_me_to_do...  497  0 
+dlga_mayor_talk:merchant_quest_last_offered_job 69631 482  8 2240 1 1224979098644774912 4 0 200 1 58 2133 2 1224979098644774912 1 3 0 2147483678 2 1224979098644774912 0 31 2 144115188075855944 144115188075855891 30 2 144115188075855946 0 About_that_task_you_needed_me_to_do...  497  0 
 dlga_mayor_talk:merchant_quest_about_job 69631 482  2 2240 1 72057594037927938 30 2 72057594037927938 0 About_the_task_you_gave_me...  498  0 
 dlga_mayor_talk:close_window 69631 482  0 [Leave]  6  1 1 1 402 
 dlga_mayor_info_begin:mayor_info_talk 4095 495  1 2330 2 9 144115188075856029 I_am_the_local_authority_here_in_{s9}._You_can_say_I_am_in_charge_of_everyday_tasks._There_is_always_something_to_do,_so_if_you_want_to_help_let_me_know.  499  1 2133 2 144115188075855947 0 

diff --git a/_wb/scripts.txt b/_wb/scripts.txt
@@ -1101,7 +1101,7 @@ cf_init_quest_hunt_refugees -1
 cf_quest_hunt_refugees_party_creation -1
  80 526 3 1224979098644774912 144115188075855929 1 526 3 1224979098644774913 144115188075855929 9 2133 2 144115188075856593 0 2133 2 144115188075856592 0 2133 2 144115188075856601 0 2133 2 144115188075856602 0 2133 2 144115188075856603 0 2133 2 144115188075856609 0 2133 2 144115188075856610 0 2133 2 144115188075856611 0 2133 2 144115188075856612 -1 1 2 515 0 2133 2 1224979098644774914 72057594037927936 2133 2 1224979098644774915 29 4 0 31 2 1224979098644774914 1 2133 2 1224979098644774915 29 5 0 31 2 1224979098644774914 2 2133 2 1224979098644774915 35 5 0 31 2 1224979098644774914 4 2133 2 1224979098644774915 42 5 0 2133 2 1224979098644774915 39 3 0 4 0 1073741855 2 1224979098644774912 53 1073741855 2 1224979098644774912 54 31 2 1224979098644774912 55 2133 2 1224979098644774915 42 3 0 2136 3 1224979098644774916 25 35 1103 1 1224979098644774916 2171 2 1224979098644774917 0 1100 2 1224979098644774912 1224979098644774913 2133 2 144115188075856594 72057594037927936 1675 2 144115188075856594 1224979098644774915 1675 2 144115188075856594 1224979098644774915 4 0 33 3 1224979098644774917 12 17 1675 2 144115188075856594 1224979098644774915 5 0 30 2 1224979098644774917 17 1675 2 144115188075856594 1224979098644774915 1675 2 144115188075856594 1224979098644774915 3 0 1640 2 144115188075856594 1 1641 2 144115188075856594 1224979098644774912 1603 3 144115188075856594 65536 0 1100 2 1224979098644774912 1224979098644774913 2133 2 144115188075856595 72057594037927936 1675 2 144115188075856595 1224979098644774915 1675 2 144115188075856595 1224979098644774915 4 0 33 3 1224979098644774917 12 17 1675 2 144115188075856595 1224979098644774915 5 0 30 2 1224979098644774917 17 1675 2 144115188075856595 1224979098644774915 1675 2 144115188075856595 1224979098644774915 3 0 1640 2 144115188075856595 1 1641 2 144115188075856595 1224979098644774912 1603 3 144115188075856595 65536 0 1100 2 1224979098644774912 1224979098644774913 2133 2 144115188075856596 72057594037927936 1675 2 144115188075856596 1224979098644774915 1675 2 144115188075856596 1224979098644774915 4 0 33 3 1224979098644774917 12 17 1675 2 144115188075856596 1224979098644774915 5 0 30 2 1224979098644774917 17 1675 2 144115188075856596 1224979098644774915 1675 2 144115188075856596 1224979098644774915 3 0 1640 2 144115188075856596 1 1641 2 144115188075856596 1224979098644774912 1603 3 144115188075856596 65536 0 
 cf_init_quest_reinforce_center -1
- 49 31 2 144115188075855893 144115188075855993 2171 2 1224979098644774912 0 30 2 1224979098644774912 12 2136 3 1224979098644774913 45 76 2133 2 1224979098644774914 -1 2133 2 1224979098644774915 100 6 3 1224979098644774916 0 1224979098644774915 2136 3 1224979098644774917 18 96 31 2 1224979098644774914 -1 132 1 1224979098644774917 2204 2 1224979098644774918 1224979098644774917 31 2 1224979098644774918 144115188075855893 2330 2 10 1224979098644774917 1601 2 1224979098644774919 1224979098644774917 4 0 1073741855 2 1224979098644774918 6 1073741855 2 1224979098644774918 7 1073741855 2 1224979098644774918 16 1073741855 2 1224979098644774918 17 31 2 1224979098644774918 18 2147483680 2 1224979098644774919 300 2136 3 1224979098644774913 85 111 2133 2 1224979098644774914 1224979098644774917 2133 2 1224979098644774915 0 5 0 1073741857 3 1224979098644774917 47 53 1073741857 3 1224979098644774917 76 78 31 2 1224979098644774917 64 2147483680 2 1224979098644774919 120 2136 3 1224979098644774913 40 56 2133 2 1224979098644774914 1224979098644774917 2133 2 1224979098644774915 0 5 0 2147483680 2 1224979098644774919 200 2133 2 1224979098644774914 1224979098644774917 2133 2 1224979098644774915 0 3 0 3 0 2147483679 2 1224979098644774914 -1 2133 2 1224979098644774920 1224979098644774914 2133 2 72057594037927991 144115188075855998 2133 2 72057594037927992 1224979098644774913 2133 2 72057594037927993 1224979098644774920 2133 2 72057594037927994 5 2133 2 72057594037927995 200 2133 2 72057594037927996 300 2133 2 72057594037927997 12 2133 2 72057594037927998 30 2133 2 72057594037927999 8 
+ 51 31 2 144115188075855893 144115188075855993 2171 2 1224979098644774912 0 30 2 1224979098644774912 12 2136 3 1224979098644774913 45 76 2133 2 1224979098644774914 -1 2133 2 1224979098644774915 100 6 3 1224979098644774916 0 1224979098644774915 2136 3 1224979098644774917 18 96 31 2 1224979098644774914 -1 132 1 1224979098644774917 2204 2 1224979098644774918 1224979098644774917 1 2 15 144115188075855893 2133 2 1224979098644774919 72057594037927936 2147483678 2 1224979098644774919 1 2330 2 10 1224979098644774917 1601 2 1224979098644774920 1224979098644774917 4 0 1073741855 2 1224979098644774918 6 1073741855 2 1224979098644774918 7 1073741855 2 1224979098644774918 16 1073741855 2 1224979098644774918 17 31 2 1224979098644774918 18 2147483680 2 1224979098644774920 300 2136 3 1224979098644774913 85 111 2133 2 1224979098644774914 1224979098644774917 2133 2 1224979098644774915 0 5 0 1073741857 3 1224979098644774917 47 53 1073741857 3 1224979098644774917 76 78 31 2 1224979098644774917 64 2147483680 2 1224979098644774920 120 2136 3 1224979098644774913 40 56 2133 2 1224979098644774914 1224979098644774917 2133 2 1224979098644774915 0 5 0 2147483680 2 1224979098644774920 200 2133 2 1224979098644774914 1224979098644774917 2133 2 1224979098644774915 0 3 0 3 0 2147483679 2 1224979098644774914 -1 2133 2 1224979098644774921 1224979098644774914 2133 2 72057594037927991 144115188075855998 2133 2 72057594037927992 1224979098644774913 2133 2 72057594037927993 1224979098644774921 2133 2 72057594037927994 5 2133 2 72057594037927995 200 2133 2 72057594037927996 300 2133 2 72057594037927997 12 2133 2 72057594037927998 30 2133 2 72057594037927999 8 
 troop_talk_presentation -1
  13 23 2 1224979098644774912 1 23 2 1224979098644774913 2 23 2 1224979098644774914 3 2107 2 1224979098644774913 100 2133 2 144115188075856605 1224979098644774913 4 0 31 2 1224979098644774914 0 2133 2 144115188075856606 1224979098644774912 900 1 17 5 0 2133 2 144115188075856607 1224979098644774912 900 1 18 3 0 
 warp_array_create -1

diff --git a/_wb/variable_uses.txt b/_wb/variable_uses.txt
@@ -19,7 +19,7 @@
 2
 595
 23
-259
+261
 73
 39
 27

diff --git a/conversation.txt b/conversation.txt
@@ -922,7 +922,7 @@ dlga_mayor_talk:mayor_deliver_iron.2 69631 482  12 200 1 35 546 3 35 1 144115188
 dlga_mayor_deliver_iron:mayor_deliver_iron_completed 4095 484  0 Very_nice_work,_{playername}._Our_smiths_will_find_ways_to_put_everything_they_are_given_to_good_use.  485  4 526 3 1224979098644774912 35 14 526 3 1224979098644774913 35 10 1536 3 0 1224979098644774912 1224979098644774913 1 3 172 35 100 
 dlga_mayor_deliver_iron_completed:close_window 69631 485  0 I_do_what_I_can.  6  1 1 1 402 
 dlga_mayor_talk:mayor_reinforced_center_finished 69631 482  5 200 1 58 546 3 58 7 144115188075855998 526 3 1224979098644774912 58 1 2330 2 3 1224979098644774912 202 1 58 I_have_reinforced_{s3}_as_you_have_asked_me_to.  486  0 
-dlga_mayor_reinforced_center_finished:close_window 4095 486  10 526 3 1224979098644774912 58 11 2107 2 1224979098644774912 -1 4 0 32 2 1224979098644774912 0 2133 2 72057594037927946 1224979098644774912 2320 2 4 1585267068834415957 5 0 2133 2 72057594037927946 0 2320 2 4 1585267068834415958 3 0 {s4}  6  19 1 3 172 58 100 526 3 1224979098644774912 58 1 2330 2 1 1224979098644774912 2204 2 1224979098644774913 1224979098644774912 2335 2 2 1224979098644774913 522 3 1224979098644774914 1224979098644774913 153 2105 2 1224979098644774914 80 2133 2 72057594037927986 80 1106 2 1585267068834415959 5308240 502 3 1224979098644774913 153 1224979098644774914 4 0 32 2 72057594037927946 0 33 3 72057594037927946 1 16 1535 3 0 21 2 5 0 32 2 72057594037927946 0 32 2 72057594037927946 16 1535 3 0 21 4 3 0 
+dlga_mayor_reinforced_center_finished:close_window 4095 486  10 526 3 1224979098644774912 58 11 2107 2 1224979098644774912 -1 4 0 32 2 1224979098644774912 0 2133 2 72057594037927946 1224979098644774912 2320 2 4 1585267068834415957 5 0 2133 2 72057594037927946 0 2320 2 4 1585267068834415958 3 0 {s4}  6  21 1 3 172 58 100 526 3 1224979098644774912 58 1 2330 2 1 1224979098644774912 2204 2 1224979098644774913 1224979098644774912 2335 2 2 1224979098644774913 522 3 1224979098644774914 1224979098644774913 153 2105 2 1224979098644774914 80 2133 2 72057594037927986 80 1106 2 1585267068834415959 5308240 502 3 1224979098644774913 153 1224979098644774914 4 0 32 2 72057594037927946 0 33 3 72057594037927946 1 16 1535 3 0 21 2 1 3 14 144115188075855893 12 5 0 32 2 72057594037927946 0 32 2 72057594037927946 16 1535 3 0 21 4 1 3 14 144115188075855893 18 3 0 
 dlga_mayor_talk:mayor_deliver_food 69631 482  11 200 1 34 546 3 34 1 144115188075855998 526 3 1224979098644774912 34 10 2133 2 1224979098644774913 0 6 3 1224979098644774914 7 14 2147483679 2 1224979098644774914 10 2165 2 1224979098644774915 1224979098644774914 2105 2 1224979098644774913 1224979098644774915 3 0 30 2 1224979098644774913 1224979098644774912 2133 2 72057594037927945 1224979098644774912 Here's_your_food,_{reg9}_units.  487  0 
 dlga_mayor_deliver_food:mayor_deliver_food_completed 4095 487  0 Very_nice_work,_{playername},_our_food_stores_are_full_again_and_nobody_will_starve_for_now.  488  10 526 3 1224979098644774912 34 10 6 3 1224979098644774913 7 14 30 2 1224979098644774912 0 2147483679 2 1224979098644774913 10 2165 2 1224979098644774914 1224979098644774913 2110 2 1224979098644774914 1224979098644774912 1536 3 0 1224979098644774913 1224979098644774914 2106 2 1224979098644774912 1224979098644774914 3 0 1 3 172 34 100 
 dlga_mayor_deliver_food_completed:close_window 69631 488  0 I_do_what_I_can.  6  1 1 1 402 
@@ -943,7 +943,7 @@ dlga_mayor_friendly_pretalk:mayor_talk 4095 494  0 Now..._What_else_may_I_do_for
 dlga_mayor_pretalk:mayor_talk 4095 452  0 Yes?  482  0 
 dlga_mayor_talk:mayor_info_begin 69631 482  0 Can_you_tell_me_about_what_you_do?  495  0 
 dlga_mayor_talk:merchant_quest_requested 69631 482  3 2240 1 1224979098644774912 2147483678 2 1224979098644774912 0 2147483679 2 144115188075855944 144115188075855891 How_can_I_serve_our_cause?  496  4 2133 2 144115188075855944 144115188075855891 1 2 123 144115188075855891 2133 2 144115188075855945 72057594037927936 2133 2 144115188075855946 144115188075855945 
-dlga_mayor_talk:merchant_quest_last_offered_job 69631 482  4 2240 1 1224979098644774912 2147483678 2 1224979098644774912 0 31 2 144115188075855944 144115188075855891 30 2 144115188075855946 0 About_that_task_you_needed_me_to_do...  497  0 
+dlga_mayor_talk:merchant_quest_last_offered_job 69631 482  8 2240 1 1224979098644774912 4 0 200 1 58 2133 2 1224979098644774912 1 3 0 2147483678 2 1224979098644774912 0 31 2 144115188075855944 144115188075855891 30 2 144115188075855946 0 About_that_task_you_needed_me_to_do...  497  0 
 dlga_mayor_talk:merchant_quest_about_job 69631 482  2 2240 1 72057594037927938 30 2 72057594037927938 0 About_the_task_you_gave_me...  498  0 
 dlga_mayor_talk:close_window 69631 482  0 [Leave]  6  1 1 1 402 
 dlga_mayor_info_begin:mayor_info_talk 4095 495  1 2330 2 9 144115188075856029 I_am_the_local_authority_here_in_{s9}._You_can_say_I_am_in_charge_of_everyday_tasks._There_is_always_something_to_do,_so_if_you_want_to_help_let_me_know.  499  1 2133 2 144115188075855947 0