*Fixes to WIP Quest

tldmod · Dec 14, 2017 · 77d0cb5 · 77d0cb5
1 parent 032df08
commit 77d0cb5
Show file tree

Hide file tree

Showing 8 changed files with 1,164 additions and 1,162 deletions.
diff --git a/ModuleSystem/module_dialogs.py b/ModuleSystem/module_dialogs.py
@@ -5472,7 +5472,7 @@
       (str_store_string, s5, "@The soft weaklings of Esgaroth are no match for our swift horsemen and ferocious warriors, {playername}. This is known. The Lake-men believe themselves safe, across the water from us, but we shall soon show them otherwise!^^ We have made boats, and rafts, good enough to carry our warriors straight across the lake. They won't be expecting us! ^^Go to the Main Camp, and speak to the camp commander if you wish to join the assault."),
     (try_end),
   (try_end)],
- "{s5}", "lord_mission_told",[
+ "{s5}", "lord_mission_told_sea_battle",[
     (quest_get_slot, ":quest_target_center", "$random_quest_no", slot_quest_target_center),
     (quest_get_slot, ":quest_object_center", "$random_quest_no", slot_quest_object_center),
     (str_store_troop_name_link, s9, "$g_talk_troop"),
@@ -5497,7 +5497,7 @@
     (setup_quest_text,"$random_quest_no"),
     (str_store_string, s2, "@{s7}")]],
 
-[anyone|plyr,"lord_mission_told", [
+[anyone|plyr,"lord_mission_told_sea_battle", [
 (eq,"$random_quest_no","qst_blank_quest_03"),
 (try_begin),
     (faction_slot_eq, "$g_talk_troop_faction", slot_faction_side, faction_side_good),
@@ -5517,7 +5517,7 @@
   (try_end)],
 "{s5}", "lord_mission_accepted",[]],
 
-[anyone|plyr,"lord_mission_told", [
+[anyone|plyr,"lord_mission_told_sea_battle", [
 (eq,"$random_quest_no","qst_blank_quest_03"),
 (try_begin),
     (faction_slot_eq, "$g_talk_troop_faction", slot_faction_side, faction_side_good),

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -23423,17 +23423,6 @@ def set_item_score():
 	(eq, ":continue", 1),
 
 	(assign, ":cur_target_center", "p_town_edhellond"), #Default to Edhellond
-	(try_begin),
-		(eq, "$g_talk_troop_faction", "fac_umbar"),
-		(assign, ":cur_object_center", "p_town_umbar_camp"), #If Umbar, Talk to Umbar Guild Master
-	(else_try),
-		(eq, "$g_talk_troop_faction", "fac_rhun"),
-		(assign, ":cur_object_center", "p_town_rhun_main_camp"), #If Rhun, Talk to Rhun Main Camp GM.
-	(else_try),
-		(this_or_next|eq, "$g_talk_troop_faction", "fac_gondor"),
-		(			  eq, "$g_talk_troop_faction", "fac_dale"),
-		(assign, ":cur_object_center", ":cur_target_center"), #if Good, Target is Object
-	(try_end),
 	(store_random_in_range, ":rand", 0,100),
 	(try_begin),
 		(this_or_next|eq, "$g_talk_troop_faction", "fac_gondor"),
@@ -23447,6 +23436,17 @@ def set_item_score():
 		(eq, "$g_talk_troop_faction", "fac_rhun"),
 		(assign, ":cur_target_center", "p_town_esgaroth"),
 	(try_end),
+		(try_begin),
+		(eq, "$g_talk_troop_faction", "fac_umbar"),
+		(assign, ":cur_object_center", "p_town_umbar_camp"), #If Umbar, Talk to Umbar Guild Master
+	(else_try),
+		(eq, "$g_talk_troop_faction", "fac_rhun"),
+		(assign, ":cur_object_center", "p_town_rhun_main_camp"), #If Rhun, Talk to Rhun Main Camp GM.
+	(else_try),
+		(this_or_next|eq, "$g_talk_troop_faction", "fac_gondor"),
+		(			  eq, "$g_talk_troop_faction", "fac_dale"),
+		(assign, ":cur_object_center", ":cur_target_center"), #if Good, Target is Object
+	(try_end),
 
 	(party_slot_eq, ":cur_target_center", slot_center_destroyed, 0), #Cant be destroyed / captured.
 

diff --git a/_wb/conversation.txt b/_wb/conversation.txt
diff --git a/_wb/dialog_states.txt b/_wb/dialog_states.txt
@@ -265,7 +265,7 @@ lord_talk_ask_location_3
 lord_talk_ask_about_war_2
 lord_talk_ask_about_war_details
 party_encounter_lord_hostile_ultimatum_surrender
-lord_mission_told
+lord_mission_told_sea_battle
 lord_mission_accepted
 lord_mission_rejected
 lord_mission_destroy_scout_camp_a
@@ -304,6 +304,7 @@ lord_mission_capture_troll_infoc
 lord_mission_capture_troll_accepted
 lord_mission_capture_troll_rejected
 lord_tell_mission_kill_troll
+lord_mission_told
 lord_mission_kill_troll_info_a
 lord_mission_kill_troll_info_b
 lord_mission_investigate_fangorn_0

diff --git a/_wb/scripts.txt b/_wb/scripts.txt
@@ -1107,7 +1107,7 @@ cf_quest_hunt_refugees_party_creation -1
 cf_init_quest_reinforce_center -1
  52 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 541 3 1224979098644774921 260 0 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 
 cf_init_quest_sea_battle -1
- 61 2171 2 1224979098644774912 0 30 2 1224979098644774912 15 4 0 522 3 1224979098644774913 144115188075855893 158 2147483679 2 1224979098644774913 0 2133 2 1224979098644774914 1 5 0 2133 2 1224979098644774914 0 3 0 2133 2 1224979098644774915 0 4 0 31 2 1224979098644774914 0 1073741855 2 144115188075855891 555 1073741855 2 144115188075855891 530 1073741855 2 144115188075855891 556 1073741855 2 144115188075855891 544 33 3 144115188075855891 606 609 2133 2 1224979098644774915 1 5 0 1073741855 2 144115188075855891 537 1073741855 2 144115188075855891 535 1073741857 3 144115188075855891 587 590 33 3 144115188075855891 582 585 2133 2 1224979098644774915 1 3 0 31 2 1224979098644774915 1 2133 2 1224979098644774916 22 4 0 31 2 144115188075855893 15 2133 2 1224979098644774917 63 5 0 31 2 144115188075855893 13 2133 2 1224979098644774917 67 5 0 1073741855 2 144115188075855893 3 31 2 144115188075855893 11 2133 2 1224979098644774917 1224979098644774916 3 0 2136 3 1224979098644774918 0 100 4 0 1073741855 2 144115188075855893 3 31 2 144115188075855893 15 4 0 30 2 1224979098644774918 50 2133 2 1224979098644774916 21 3 0 5 0 1073741855 2 144115188075855893 11 31 2 144115188075855893 13 2133 2 1224979098644774916 59 3 0 541 3 1224979098644774916 260 0 2133 2 72057594037927991 144115188075855891 2133 2 72057594037927992 1224979098644774917 2133 2 72057594037927993 1224979098644774916 2133 2 72057594037927994 10 2133 2 72057594037927995 500 2133 2 72057594037927996 800 2133 2 72057594037927997 15 2133 2 72057594037927998 20 2133 2 72057594037927999 15 
+ 61 2171 2 1224979098644774912 0 30 2 1224979098644774912 15 4 0 522 3 1224979098644774913 144115188075855893 158 2147483679 2 1224979098644774913 0 2133 2 1224979098644774914 1 5 0 2133 2 1224979098644774914 0 3 0 2133 2 1224979098644774915 0 4 0 31 2 1224979098644774914 0 1073741855 2 144115188075855891 555 1073741855 2 144115188075855891 530 1073741855 2 144115188075855891 556 1073741855 2 144115188075855891 544 33 3 144115188075855891 606 609 2133 2 1224979098644774915 1 5 0 1073741855 2 144115188075855891 537 1073741855 2 144115188075855891 535 1073741857 3 144115188075855891 587 590 33 3 144115188075855891 582 585 2133 2 1224979098644774915 1 3 0 31 2 1224979098644774915 1 2133 2 1224979098644774916 22 2136 3 1224979098644774917 0 100 4 0 1073741855 2 144115188075855893 3 31 2 144115188075855893 15 4 0 30 2 1224979098644774917 50 2133 2 1224979098644774916 21 3 0 5 0 1073741855 2 144115188075855893 11 31 2 144115188075855893 13 2133 2 1224979098644774916 59 3 0 4 0 31 2 144115188075855893 15 2133 2 1224979098644774918 63 5 0 31 2 144115188075855893 13 2133 2 1224979098644774918 67 5 0 1073741855 2 144115188075855893 3 31 2 144115188075855893 11 2133 2 1224979098644774918 1224979098644774916 3 0 541 3 1224979098644774916 260 0 2133 2 72057594037927991 144115188075855891 2133 2 72057594037927992 1224979098644774918 2133 2 72057594037927993 1224979098644774916 2133 2 72057594037927994 10 2133 2 72057594037927995 500 2133 2 72057594037927996 800 2133 2 72057594037927997 15 2133 2 72057594037927998 20 2133 2 72057594037927999 15 
 quest_sea_battle_consequences -1
  50 21 1 1224979098644774912 2319 1 10 2319 1 14 2319 1 11 2319 1 13 4 0 31 2 1224979098644774912 0 2320 2 10 1585267068834415204 2320 2 14 1585267068834415205 2133 2 1224979098644774913 16732240 5 0 2320 2 10 1585267068834415206 2320 2 14 1585267068834415207 2133 2 1224979098644774913 5308240 3 0 526 3 1224979098644774914 45 4 2173 2 1224979098644774915 1224979098644774914 4 0 31 2 1224979098644774915 3 2133 2 1224979098644774916 15 5 0 2133 2 1224979098644774916 13 3 0 2335 2 11 1224979098644774916 2335 2 13 1224979098644774915 1106 2 1585267068834415208 1224979098644774913 1106 2 1585267068834415209 1224979098644774913 522 3 1224979098644774917 1224979098644774916 153 522 3 1224979098644774918 1224979098644774915 153 2171 2 1224979098644774919 0 2111 2 1224979098644774919 15 2110 2 1224979098644774919 99 4 0 4 0 31 2 1224979098644774912 0 2107 2 1224979098644774919 7 2105 2 1224979098644774919 80 2105 2 1224979098644774917 1224979098644774919 2105 2 1224979098644774919 80 2106 2 1224979098644774918 1224979098644774919 5 0 2107 2 1224979098644774919 10 2105 2 1224979098644774919 60 2106 2 1224979098644774917 1224979098644774919 2105 2 1224979098644774919 55 2105 2 1224979098644774918 1224979098644774919 3 0 3 0 502 3 1224979098644774915 153 1224979098644774918 502 3 1224979098644774916 153 1224979098644774917 
 troop_talk_presentation -1