API tools faq
paste
Advertisement
Guest User

Warband_1158_polygamy_for_native

a guest
Dec 2nd, 2014
908
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 58.16 KB | None | 0 0
raw download clone embed print report
  1. diff -rupN 1/module_dialogs.py 2/module_dialogs.py
  2. --- 1/module_dialogs.py 2013-07-23 19:04:22.000000000 -0400
  3. +++ 2/module_dialogs.py 2014-12-02 02:01:15.000000000 -0500
  4. @@ -1398,7 +1398,7 @@ dialogs = [
  5.    
  6.    [trp_nurse_for_lady, "start", [
  7.  #  (eq, "$talk_context", tc_garden),
  8. -  ], "I humbly request that your lordship keeps his hands where I can see them.", "close_window",[]],
  9. +  ], "I humbly request that your {lordship/ladyship} keeps {his/her} hands where I can see them.", "close_window",[]],
  10.  
  11.  ##  [trp_tutorial_trainer, "start", [(eq, "$tutorial_1_state", 1),], "TODO: Watch me.", "tutorial_1_1_1",[]],
  12.  ##  [trp_tutorial_trainer, "tutorial_1_1_1", [], "TODO: This is up.", "tutorial_1_1_2",[(agent_set_attack_action, "$g_talk_agent", 3),]],
  13. @@ -5916,6 +5916,8 @@ dialogs = [
  14.    [anyone ,"start", [(troop_slot_eq,"$g_talk_troop",slot_troop_met, 2),
  15.                       (gt, "$g_talk_troop_relation", 10),
  16.                      (gt, "$g_time_since_last_talk", 3),
  17. +                    (troop_get_type, ":is_female", "$g_talk_troop"),
  18. +                    (eq, ":is_female", 0),
  19.                      (troop_get_type, ":is_female", "trp_player"),
  20.                      (eq, ":is_female", 1),
  21.                      (troop_slot_eq, "trp_player", slot_troop_spouse, -1),
  22. @@ -5961,7 +5963,10 @@ dialogs = [
  23.                       (gt, "$g_talk_troop_relation", 0),
  24.                      (troop_get_type, ":is_female", "trp_player"),
  25.                      (eq, ":is_female", 1),
  26. -                    (troop_slot_eq, "trp_player", slot_troop_spouse, -1),
  27. +                    (troop_get_type, ":is_female", "$g_talk_troop"),
  28. +                    (eq, ":is_female", 0),
  29. +                    
  30. +#                   (troop_slot_eq, "trp_player", slot_troop_spouse, -1),
  31.                      (troop_slot_eq, "trp_player", slot_troop_betrothed, -1),
  32.                      (troop_slot_eq, "$g_talk_troop", slot_troop_spouse, -1),
  33.                      (troop_slot_eq, "$g_talk_troop", slot_troop_betrothed, -1),
  34. @@ -5972,6 +5977,8 @@ dialogs = [
  35.                    
  36.    [anyone ,"start", [(troop_slot_eq,"$g_talk_troop",slot_troop_met, 2),
  37.                       (gt, "$g_talk_troop_relation", 0),
  38. +                     (troop_get_type, ":is_female", "$g_talk_troop"),
  39. +                    (eq, ":is_female", 0),
  40.                      (troop_get_type, ":is_female", "trp_player"),
  41.                      (eq, ":is_female", 1),
  42.                       ],
  43. @@ -7100,10 +7107,29 @@ dialogs = [
  44.                         (eq, "$g_romantic_comment_made", 0),
  45.                         (ge, "$g_talk_troop_relation", 20),
  46.                         (troop_slot_ge, "trp_player", slot_troop_renown, 250),
  47. -                       (neg|troop_slot_ge, "trp_player", slot_troop_spouse, kingdom_ladies_begin),
  48. -                      
  49. -                       (troop_get_type, ":is_female", "trp_player"),
  50. -                       (eq, ":is_female", 0),
  51. +#                      (troop_get_type, ":is_female", "trp_player"),
  52. +                       (assign, ":is_male_spouse", -1),
  53. +                       (try_begin),
  54. +                           (troop_get_slot, ":player_spouse", "trp_player", slot_troop_spouse),
  55. +                           (gt,":player_spouse",0),
  56. +                           (troop_get_type, ":is_female", ":player_spouse"),
  57. +                           (neq, ":is_female", 1),
  58. +                           (assign, ":is_male_spouse", 1),
  59. +                       (try_end),
  60. +                       (eq, ":is_male_spouse", -1),    #If player is not married to a man
  61. +
  62. +                       (assign, ":pushing_self", -1),  #lords are by default straight - lords prefers to marry the player than introduce the girl, unless male player or either lord or player is already married to a lady
  63. +                       (try_begin),
  64. +                           (troop_get_type, ":is_female", "trp_player"),
  65. +                           (eq, ":is_female", 1),
  66. +                           (try_begin),
  67. +                               (assign, ":pushing_self", 1),
  68. +                               (this_or_next|troop_slot_ge, "$g_talk_troop", slot_troop_spouse, kingdom_ladies_begin),
  69. +                               (gt,":player_spouse",0),
  70. +                               (assign, ":pushing_self", -1),
  71. +                           (try_end),
  72. +                       (try_end),
  73. +                       (eq, ":pushing_self", -1),
  74.                        
  75.                         (assign, ":third_party_introduce", 0),
  76.                        
  77. @@ -7111,7 +7137,7 @@ dialogs = [
  78.                             (troop_slot_eq, ":lady", slot_troop_spouse, -1),
  79.                             (troop_slot_eq, ":lady", slot_troop_betrothed, -1),
  80.                             (troop_slot_eq, ":lady", slot_troop_cur_center, "$g_encountered_party"),
  81. -                           (neg|troop_slot_ge, ":lady", slot_troop_met, 4),
  82. +#                          (neg|troop_slot_ge, ":lady", slot_troop_met, 4),
  83.                            
  84.                             (call_script, "script_get_kingdom_lady_social_determinants", ":lady"),
  85.                             (eq, reg0, "$g_talk_troop"),
  86. @@ -7131,6 +7157,10 @@ dialogs = [
  87.     "By the way, I hope you get a chance to meet my {s11}, {s14}.  ", "lord_start",
  88.     [
  89.                         (troop_set_slot, "$g_talk_troop", slot_lord_granted_courtship_permission, 1),
  90. +                       (try_begin),
  91. +                           (troop_slot_eq, "$marriage_candidate", slot_troop_met, 4),
  92. +                           (troop_set_slot, "$marriage_candidate", slot_troop_met, 2),
  93. +                       (try_end),
  94.                         (assign, "$g_romantic_comment_made", 1),
  95.       ]],
  96.  
  97. @@ -7141,15 +7171,37 @@ dialogs = [
  98.                         (troop_slot_ge, "trp_player", slot_troop_renown, 250),
  99.                         (assign, ":third_party_introduce", 0),
  100.                        
  101. -                       (neg|troop_slot_ge, "trp_player", slot_troop_spouse, kingdom_ladies_begin),
  102. -                       (troop_get_type, ":is_female", "trp_player"),
  103. -                       (eq, ":is_female", 0),
  104. +#                      (neg|troop_slot_ge, "trp_player", slot_troop_spouse, kingdom_ladies_begin),
  105. +#                      (troop_get_type, ":is_female", "trp_player"),
  106. +#                      (eq, ":is_female", 0),
  107. +                       (assign, ":is_male_spouse", -1),
  108. +                       (try_begin),
  109. +                           (troop_get_slot, ":player_spouse", "trp_player", slot_troop_spouse),
  110. +                           (gt,":player_spouse",0),
  111. +                           (troop_get_type, ":is_female", ":player_spouse"),
  112. +                           (neq, ":is_female", 1),
  113. +                           (assign, ":is_male_spouse", 1),
  114. +                       (try_end),
  115. +                       (eq, ":is_male_spouse", -1),    #If player is not married to a man
  116. +
  117. +                       (assign, ":pushing_self", -1),  #lords are by default straight - lords prefers to marry the player than introduce the girl, unless male player or either lord or player is already married to a lady
  118. +                       (try_begin),
  119. +                           (troop_get_type, ":is_female", "trp_player"),
  120. +                           (eq, ":is_female", 1),
  121. +                           (try_begin),
  122. +                               (assign, ":pushing_self", 1),
  123. +                               (this_or_next|troop_slot_ge, "$g_talk_troop", slot_troop_spouse, kingdom_ladies_begin),
  124. +                               (gt,":player_spouse",0),
  125. +                               (assign, ":pushing_self", 1),
  126. +                           (try_end),
  127. +                       (try_end),
  128. +                       (eq, ":pushing_self", -1),
  129.                        
  130.                         (try_for_range, ":lady", kingdom_ladies_begin, kingdom_ladies_end),
  131.                             (troop_slot_eq, ":lady", slot_troop_spouse, -1),
  132.                             (troop_slot_eq, ":lady", slot_troop_betrothed, -1),
  133.                             (troop_slot_eq, ":lady", slot_troop_cur_center, "$g_encountered_party"),
  134. -                           (neg|troop_slot_ge, ":lady", slot_troop_met, 4),
  135. +#                          (neg|troop_slot_ge, ":lady", slot_troop_met, 4),
  136.                            
  137.                             (call_script, "script_get_kingdom_lady_social_determinants", ":lady"),
  138.                             (eq, reg0, "$g_talk_troop"),
  139. @@ -7176,6 +7228,10 @@ dialogs = [
  140.     "By the way, I am sure that my {s11}, {s14}, would be delighted were you to pay her a visit. She awaits you in her chambers.", "lord_start",
  141.     [
  142.         (troop_set_slot, "$g_talk_troop", slot_lord_granted_courtship_permission, 1),
  143. +       (try_begin),
  144. +           (troop_slot_eq, "$marriage_candidate", slot_troop_met, 4),
  145. +           (troop_set_slot, "$marriage_candidate", slot_troop_met, 2),
  146. +       (try_end),
  147.         (assign, "$g_romantic_comment_made", 1),
  148.        
  149.       ]],
  150. @@ -11362,7 +11418,7 @@ dialogs = [
  151.     (neg|check_quest_failed, "qst_formal_marriage_proposal"),
  152.     (neg|check_quest_succeeded, "qst_formal_marriage_proposal"),
  153.  
  154. -    (neg|troop_slot_ge, "trp_player", slot_troop_spouse, active_npcs_begin),
  155. +#    (neg|troop_slot_ge, "trp_player", slot_troop_spouse, active_npcs_begin),
  156.    
  157.     (quest_slot_eq, "qst_formal_marriage_proposal", slot_quest_target_troop, "$g_talk_troop"),
  158.     (quest_get_slot, ":bride", "qst_formal_marriage_proposal", slot_quest_giver_troop),
  159. @@ -11445,7 +11501,7 @@ dialogs = [
  160.     (quest_get_slot, ":bride", "qst_formal_marriage_proposal", slot_quest_giver_troop),
  161.     (str_store_troop_name, s11, ":bride"),
  162.    ],
  163. -   "Splendid news, my young man -- I shall be proud to have you in our family. Now, let us talk the terms of the marriage. As per our custom, the two of us must make sure that {s11} has sufficient finances to support herself, in the event of any unforeseen circumstances..", "lord_marriage_permission_endowment",[
  164. +   "Splendid news, my young {man/lady} -- I shall be proud to have you in our family. Now, let us talk the terms of the marriage. As per our custom, the two of us must make sure that {s11} has sufficient finances to support herself, in the event of any unforeseen circumstances..", "lord_marriage_permission_endowment",[
  165.      (troop_get_slot, ":player_renown", "trp_player", slot_troop_renown),
  166.      (troop_get_slot, ":guardian_renown", "$g_talk_troop", slot_troop_renown),
  167.  
  168. @@ -11622,15 +11678,28 @@ dialogs = [
  169.      "{s12}", "lord_pretalk",
  170.  [
  171.     (troop_set_slot, "$g_talk_troop", slot_lord_granted_courtship_permission, 1),
  172. +       (try_begin),
  173. +           (troop_slot_eq, "$marriage_candidate", slot_troop_met, 4),
  174. +           (troop_set_slot, "$marriage_candidate", slot_troop_met, 2),
  175. +       (try_end),
  176.  ]],  
  177.  
  178.  #Ask for marriage, following courtship, both with or against lady's wishes  
  179.    
  180.    [anyone|plyr,"lord_talk_ask_something_2", [
  181.     (neg|troop_slot_eq, "$g_talk_troop", slot_lord_granted_courtship_permission, 1),
  182. -   (neg|troop_slot_ge, "trp_player", slot_troop_spouse, active_npcs_begin),
  183. +#  (neg|troop_slot_ge, "trp_player", slot_troop_spouse, active_npcs_begin),
  184.     (troop_get_type, ":is_female", "$g_talk_troop"),
  185.     (neq, ":is_female", 1),
  186. +   (assign, ":is_male_spouse", -1),
  187. +   (try_begin),
  188. +       (troop_get_slot, ":player_spouse", "trp_player", slot_troop_spouse),
  189. +       (gt,":player_spouse",0),
  190. +       (troop_get_type, ":is_female", ":player_spouse"),
  191. +       (neq, ":is_female", 1),
  192. +       (assign, ":is_male_spouse", 1),
  193. +   (try_end),
  194. +   (eq, ":is_male_spouse", -1),
  195.    ],
  196.     "What would it take to cement a lasting alliance with your house?", "lord_talk_ask_marriage_1",[]],
  197.  
  198. @@ -12479,31 +12548,31 @@ dialogs = [
  199.                                
  200.    
  201.    [anyone,"lord_talk_ask_marriage_1", [
  202. -    (assign, "$marriage_candidate", -1),
  203. +           (assign, "$marriage_candidate", -1),
  204.     (try_begin),
  205.         (troop_get_type, ":is_female", "trp_player"),
  206.         (eq, ":is_female", 1),
  207. -       (troop_slot_eq, "$g_talk_troop", slot_troop_spouse, -1),
  208. -       (assign, "$marriage_candidate", "$g_talk_troop"),
  209. -   (else_try),
  210. -       (troop_get_type, ":is_female", "trp_player"),
  211. -       (eq, ":is_female", 0),
  212. -       (assign, "$marriage_candidate", -1),
  213. +       (try_begin),
  214. +           (troop_slot_eq, "$g_talk_troop", slot_troop_spouse, -1),
  215. +           (troop_slot_eq, "trp_player", slot_troop_spouse, -1),
  216. +           (assign, "$marriage_candidate", "$g_talk_troop"),
  217. +       (try_end),
  218. +   (try_end),
  219. +   (try_begin),
  220. +       (neq, "$marriage_candidate", "$g_talk_troop"),
  221.         (try_for_range, ":lady", kingdom_ladies_begin, kingdom_ladies_end),
  222. +           (eq, "$marriage_candidate", -1),
  223.             (troop_slot_eq, ":lady", slot_troop_spouse, -1),
  224.             (troop_slot_eq, ":lady", slot_troop_betrothed, -1),
  225.             (call_script, "script_get_kingdom_lady_social_determinants", ":lady"),
  226. -          
  227.             (eq, reg0, "$g_talk_troop"),
  228. -          
  229.             (call_script, "script_troop_get_family_relation_to_troop", ":lady", "$g_talk_troop"),
  230.             (assign, "$marriage_candidate", ":lady"),
  231.             (str_store_troop_name, s14, "$marriage_candidate"),
  232. -          
  233.             (str_store_string, s15, "str_it_is_our_custom_to_seal_any_such_alliances_with_marriage_and_in_fact_we_have_been_looking_for_a_suitable_groom_for_my_s11_s14"),
  234. -
  235.         (try_end),
  236.     (try_end),
  237. +
  238.     (eq, "$marriage_candidate", -1),
  239.    ],
  240.     "It is our custom to seal any such alliances with marriage. Unfortunately, no one in my household is eligible to wed.",
  241. @@ -12511,8 +12580,9 @@ dialogs = [
  242.     ]],
  243.                                
  244.    [anyone,"lord_talk_ask_marriage_1", [
  245. -  (troop_get_type, ":type", "trp_player"),
  246. -  (eq, ":type", 0),
  247. +#  (troop_get_type, ":type", "trp_player"),
  248. +#  (eq, ":type", 0),
  249. +  (neq, "$marriage_candidate", "$g_talk_troop"),
  250.    ],
  251.     "{s15}",
  252.     "lord_courtship_pre_permission",[
  253. @@ -12529,11 +12599,11 @@ dialogs = [
  254.  
  255.    
  256.    [anyone|plyr,"lord_courtship_pre_permission", [
  257. -  (neg|troop_slot_ge, "trp_player", slot_troop_spouse, 1),
  258. +  #(neg|troop_slot_ge, "trp_player", slot_troop_spouse, 1),
  259.    (neg|troop_slot_ge, "trp_player", slot_troop_betrothed, 1),
  260.  
  261. -  (troop_get_type, ":is_female", "trp_player"),
  262. -  (eq, ":is_female", 0),
  263. +#  (troop_get_type, ":is_female", "trp_player"),
  264. +#  (eq, ":is_female", 0),
  265.    
  266.    (str_clear, s15),
  267.    (try_begin),
  268. @@ -12572,6 +12642,7 @@ dialogs = [
  269.    
  270.  
  271.    [anyone|plyr,"lord_marriage_proposal_female_pc_confirm", [
  272. +    (troop_slot_eq, "trp_player", slot_troop_spouse, -1),
  273.    ],
  274.     "Yes. That is my proposal.",
  275.     "lord_marriage_proposal_female_pc_reax",[
  276. @@ -14149,6 +14220,27 @@ Hand over my {reg19} denars, if you plea
  277.     "{!}CHEAT: Raid a village.", "lord_suggest_raid_village",[]],
  278.    [anyone|plyr,"lord_suggest_action", [],
  279.     "{!}CHEAT: Like me.", "lord_pretalk",[(call_script,"script_change_player_relation_with_troop","$g_talk_troop",20)]],
  280. +  [anyone|plyr,"lord_suggest_action", [(faction_slot_eq, "$g_talk_troop_faction", slot_faction_leader, "$g_talk_troop"),],
  281. +   "{!}CHEAT: Make peace with me.", "lord_pretalk",[
  282. +     (call_script, "script_diplomacy_start_peace_between_kingdoms", "$g_talk_troop_faction", "$players_kingdom", 1),
  283. +        (store_relation, ":players_kingdom_relation", "$g_talk_troop_faction", "$players_kingdom"),
  284. +    
  285. +     (try_begin),
  286. +       (this_or_next|eq, "$players_kingdom", 0),
  287. +       (ge, ":players_kingdom_relation", 0),
  288. +       (call_script, "script_set_player_relation_with_faction", "$g_talk_troop_faction", 0),
  289. +     (else_try),
  290. +       (call_script, "script_diplomacy_start_peace_between_kingdoms", "$g_talk_troop_faction", "$players_kingdom", 1),
  291. +     (try_end),]],
  292. +  [anyone|plyr,"lord_suggest_action", [(faction_slot_eq, "$g_talk_troop_faction", slot_faction_leader, "$g_talk_troop"),],
  293. +   "{!}CHEAT: Make your faction like me.", "lord_pretalk",[
  294. +     (store_relation, ":players_kingdom_relation", "$g_talk_troop_faction", "$players_kingdom"),
  295. +     (val_add,":players_kingdom_relation",20),
  296. +     (val_min,":players_kingdom_relation",100),
  297. +     (call_script, "script_set_player_relation_with_faction", "$g_talk_troop_faction", ":players_kingdom_relation"),
  298. +     ]],
  299. +
  300. +
  301.  
  302.    [anyone,"lord_suggest_lift_siege", [],
  303.     "{!}As you wish, {playername}.", "close_window",[(call_script, "script_party_set_ai_state", "$g_talk_troop_party", spai_undefined),
  304. @@ -15707,18 +15799,100 @@ I suppose there are plenty of bounty hun
  305.    [anyone,"start",
  306.     [
  307.      (troop_slot_eq, "$g_talk_troop", slot_troop_occupation, slto_kingdom_lady),
  308. -#    (troop_slot_eq, "$g_talk_troop", slot_troop_spouse, "trp_player"),
  309. -    (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),
  310. +    (troop_slot_eq, "$g_talk_troop", slot_troop_spouse, "trp_player"),
  311. +#    (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),
  312. +    (neg|gt, "$g_talk_troop_effective_relation", 5),
  313. +    (eq,"$talk_context", tc_garden),
  314.      ],
  315.     "Yes, my husband?", "spouse_talk",[
  316.   ]],
  317.  
  318. +  [anyone,"start",
  319. +   [
  320. +    (troop_slot_eq, "$g_talk_troop", slot_troop_occupation, slto_kingdom_lady),
  321. +    (troop_slot_eq, "$g_talk_troop", slot_troop_spouse, "trp_player"),
  322. +#    (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),
  323. +    (gt, "$g_talk_troop_effective_relation", 5),
  324. +    (lt, "$g_talk_troop_effective_relation", 20),  
  325. +    (eq,"$talk_context", tc_garden),
  326. +    ],
  327. +   "It is so delightful to have a chance to spend some time together, my husband.  I am so glad you are able to come.", "spouse_talk",[
  328. +    (store_current_hours, ":hours_since_last_visit"),
  329. +    (troop_get_slot, ":last_visit_hours", "$g_talk_troop", slot_troop_last_talk_time),
  330. +    (val_sub, ":hours_since_last_visit", ":last_visit_hours"),
  331. +    (gt,":hours_since_last_visit",96),
  332. +    (call_script, "script_change_player_relation_with_troop", "$g_talk_troop", 2),
  333. + ]],
  334. +  
  335. +  
  336. +  [anyone,"start",
  337. +   [
  338. +    (troop_slot_eq, "$g_talk_troop", slot_troop_occupation, slto_kingdom_lady),
  339. +    (troop_slot_eq, "$g_talk_troop", slot_troop_spouse, "trp_player"),
  340. +#    (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),
  341. +    (eq,"$talk_context", tc_garden),
  342. +    (ge, "$g_talk_troop_effective_relation", 20),  
  343. +    ],
  344. +   "It is so delightful to have a chance to spend some time together, my love.  How much good it does my heart to see you again!", "spouse_talk",[
  345. +    (store_current_hours, ":hours_since_last_visit"),
  346. +    (troop_get_slot, ":last_visit_hours", "$g_talk_troop", slot_troop_last_talk_time),
  347. +    (val_sub, ":hours_since_last_visit", ":last_visit_hours"),
  348. +    (gt,":hours_since_last_visit",96),
  349. +    (call_script, "script_change_player_relation_with_troop", "$g_talk_troop", 2),
  350. +
  351. + ]],
  352. +  
  353. +  [anyone,"start",
  354. +   [
  355. +    (troop_slot_eq, "$g_talk_troop", slot_troop_occupation, slto_kingdom_lady),
  356. +    (troop_slot_eq, "$g_talk_troop", slot_troop_spouse, "trp_player"),
  357. +    (eq,"$talk_context", tc_court_talk),   #keeping postures in formal court settings
  358. +#    (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),
  359. +    ],
  360. +   "Yes, my husband?", "spouse_talk",[
  361. + ]],
  362. +
  363. +  [anyone,"start",
  364. +   [
  365. +    (troop_slot_eq, "$g_talk_troop", slot_troop_occupation, slto_kingdom_lady),
  366. +    (troop_slot_eq, "$g_talk_troop", slot_troop_spouse, "trp_player"),
  367. +    (eq,"$talk_context", tc_back_alley),   #keeping postures in formal court settings
  368. +    ],
  369. +   "I am glad that you have a chance to spend some time with us, my husband.", "spouse_talk",[
  370. +    
  371. +    (store_current_hours, ":hours_since_last_visit"),
  372. +    (troop_get_slot, ":last_visit_hours", "$g_talk_troop", slot_troop_last_talk_time),
  373. +    (val_sub, ":hours_since_last_visit", ":last_visit_hours"),
  374. +    (gt,":hours_since_last_visit",96),
  375. +    (call_script, "script_change_player_relation_with_troop", "$g_talk_troop", 1),
  376. +
  377. + ]],
  378. +
  379. +
  380. +
  381.    [anyone|plyr,"spouse_talk",
  382.     [
  383.     (eq, "$g_player_minister", "$g_talk_troop"),
  384. +   (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),   #only wife can be minister
  385.     ],
  386.     "As you are my chief minister, I wish to speak to about affairs of state", "minister_issues",[
  387.   ]],
  388. +  [anyone|plyr,"spouse_talk",
  389. +   [
  390. +   (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),
  391. +   (eq, "$public_harem",0),
  392. +   ],
  393. +   "I would like my consorts to greet my guests publicly next time I enter my court.", "spouse_pretalk",[
  394. +   (assign, "$public_harem",1),
  395. + ]],
  396. +  [anyone|plyr,"spouse_talk",
  397. +   [
  398. +   (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),
  399. +   (eq, "$public_harem",1),
  400. +   ],
  401. +   "I would like my consorts to wait for me in their chambers in private next time I enter my court.", "spouse_pretalk",[
  402. +   (assign, "$public_harem",0),
  403. + ]],
  404.  
  405.    [anyone|plyr,"spouse_talk", [
  406.     (check_quest_active, "qst_offer_gift"),
  407. @@ -15787,16 +15961,23 @@ I suppose there are plenty of bounty hun
  408.     (assign, "$political_quest_target_troop", reg1),
  409.     (assign, "$political_quest_object_troop", reg2),  
  410.   ]],
  411. +  [anyone|plyr,"spouse_talk",
  412. +   [(troop_slot_eq, "$g_talk_troop", slot_troop_occupation, slto_kingdom_lady),],
  413. +   "I got new clothes for you.", "spouse_pretalk",[
  414. +   (change_screen_equip_other)
  415. + ]],
  416. +
  417.  
  418.    [anyone|plyr, "spouse_talk",
  419.     [
  420.     (neg|check_quest_active, "qst_organize_feast"),
  421. +   (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),   #only wife can be minister
  422.     ],
  423.     "I was thinking that perhaps we could host a feast", "spouse_organize_feast",[
  424.   ]],
  425.  
  426.    [anyone|plyr, "spouse_talk",
  427. -   [
  428. +   [(troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),   #only wife can be minister
  429.     ],
  430.     "Let us take inventory of our household possessions", "spouse_household_possessions",[
  431.     (change_screen_loot, "trp_household_possessions"),
  432. @@ -15810,8 +15991,23 @@ I suppose there are plenty of bounty hun
  433.  
  434.  
  435.    [anyone|plyr,"spouse_talk",
  436. -   [],
  437. -   "We shall speak later, my {wife/husband}", "close_window",[
  438. +   [(troop_get_type, ":is_female", "$g_talk_troop"),
  439. +    (eq, ":is_female", 0),],
  440. +   "We shall speak later, my husband", "close_window",[
  441. +   (assign, "$g_leave_encounter", 1),
  442. + ]],
  443. +  [anyone|plyr,"spouse_talk",
  444. +   [(troop_get_type, ":is_female", "$g_talk_troop"),
  445. +    (eq, ":is_female", 1),
  446. +    (neg|troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),],
  447. +   "We shall speak later, my consort", "close_window",[
  448. +   (assign, "$g_leave_encounter", 1),
  449. + ]],
  450. +  [anyone|plyr,"spouse_talk",
  451. +   [(troop_get_type, ":is_female", "$g_talk_troop"),
  452. +    (eq, ":is_female", 1),
  453. +    (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),],
  454. +   "We shall speak later, my wife", "close_window",[
  455.     (assign, "$g_leave_encounter", 1),
  456.   ]],
  457.  
  458. @@ -15860,10 +16056,16 @@ I suppose there are plenty of bounty hun
  459.   #WEDDING CUTSCENE BEGINS HERE
  460.  
  461.    [anyone, "spouse_pretalk",
  462. -   [],
  463. -   "Is there anything else, my {husband/wife}?", "spouse_talk",[
  464. +   [(troop_get_type, ":is_female", "$g_talk_troop"),
  465. +    (eq, ":is_female", 0),],
  466. +   "Is there anything else, my wife?", "spouse_talk",[
  467.   ]],
  468. -
  469. +  [anyone, "spouse_pretalk",
  470. +   [(troop_get_type, ":is_female", "$g_talk_troop"),
  471. +    (eq, ":is_female", 1),],
  472. +   "Is there anything else, my husband?", "spouse_talk",[
  473. + ]],
  474. +  
  475.  
  476.  
  477.  
  478. @@ -17035,17 +17237,16 @@ I suppose there are plenty of bounty hun
  479.    
  480.     ],
  481.     "{s12}", "lady_pretalk",[]],
  482. -
  483. -  
  484. +  
  485.    [anyone|plyr,"lady_talk",
  486.     [
  487. -    (troop_get_type, ":is_female", "trp_player"),
  488. -   (eq, ":is_female", 0),
  489. +#    (troop_get_type, ":is_female", "trp_player"),
  490. +#  (eq, ":is_female", 0),
  491.      (troop_slot_eq, "$g_talk_troop", slot_troop_met, 1),
  492.     (troop_slot_eq, "$g_talk_troop", slot_troop_spouse, -1),
  493. -    (neg|troop_slot_ge, "trp_player", slot_troop_spouse, active_npcs_begin),
  494. -  
  495. -   (neq, "$lady_flirtation_location", "$g_encountered_party"),
  496. +#    (neg|troop_slot_ge, "trp_player", slot_troop_spouse, active_npcs_begin),
  497. +   (troop_slot_eq, "$g_talk_troop", slot_troop_met, 1),
  498. +#  (neq, "$lady_flirtation_location", "$g_encountered_party"),
  499.     ],
  500.     "My lady, I would like to profess myself your most ardent admirer", "lady_profess_admiration",  
  501.     [
  502. @@ -17122,6 +17323,8 @@ I suppose there are plenty of bounty hun
  503.     "{s9}", "lady_pretalk",
  504.     []],
  505.    
  506. +  [anyone|plyr,"lady_talk", [(ge, "$cheat_mode", 1),],
  507. +   "{!}CHEAT: Like me.", "lady_pretalk",[(call_script,"script_change_player_relation_with_troop","$g_talk_troop",20)]],
  508.    
  509.    
  510.    [anyone,"lady_profess_admiration", [
  511. @@ -17264,7 +17467,7 @@ I suppose there are plenty of bounty hun
  512.      [
  513.     (neg|check_quest_active, "qst_formal_marriage_proposal"),
  514.     (neg|troop_slot_ge, "trp_player", slot_troop_betrothed, active_npcs_begin),
  515. -   (neg|troop_slot_ge, "trp_player", slot_troop_spouse, active_npcs_begin),
  516. +#  (neg|troop_slot_ge, "trp_player", slot_troop_spouse, active_npcs_begin),
  517.  
  518.    
  519.     (troop_slot_eq, "$g_talk_troop", slot_troop_met, 2),
  520. @@ -18567,13 +18770,13 @@ I suppose there are plenty of bounty hun
  521.   [(troop_remove_gold, "trp_player",100),(call_script, "script_enter_dungeon", "$current_town", "mt_visit_town_castle")]],
  522.  
  523.    [anyone|plyr,"prison_guard_visit_prison_4", [],
  524. -   "Give me the keys to the cells -- now!", "prison_guard_visit_break",[
  525. +   "Give me the keys to the cells -- now!", "prison_guard_visit_break",[(assign, "$talk_context", tc_prison_break),
  526. +
  527.     ]],
  528.  
  529.    [anyone,"prison_guard_visit_break", [], "Help! Help! Prison break!", "close_window",[
  530.    (call_script, "script_activate_town_guard"),
  531.    (assign, "$g_main_attacker_agent", "$g_talk_agent"),
  532. -  (assign, "$talk_context", tc_prison_break),
  533.  #  (try_begin),
  534.  #      (store_relation, ":relation", "fac_player_faction", "$g_encountered_party_faction"),
  535.  #  Reduce relation with town
  536. @@ -19463,7 +19666,7 @@ I suppose there are plenty of bounty hun
  537.     []],
  538.    
  539.    [anyone,"political_quests_end", [
  540. -  (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),
  541. +#  (troop_slot_eq, "trp_player", slot_troop_spouse, "$g_talk_troop"),
  542.    ],
  543.     "Very well.", "spouse_pretalk",
  544.     []],
  545. @@ -25820,7 +26023,7 @@ I suppose there are plenty of bounty hun
  546.    #[  
  547.    #]],
  548.  
  549. -  [anyone,"start", [], "Surrender or die. Make your choice", "battle_reason_stated",[]],
  550. +  [anyone,"start", [], "Surrender or die. Make your choice", "battle_reason_stated",[(display_message,"$talk_context"),]],
  551.    [anyone|plyr,"battle_reason_stated", [], "I am not afraid of you. I will fight.", "close_window",[[encounter_attack]]],
  552.  
  553.    [anyone,"start", [], "Hello. What can I do for you?", "free",[]],
  554. diff -rupN 1/module_game_menus.py 2/module_game_menus.py
  555. --- 1/module_game_menus.py  2013-07-23 18:54:34.000000000 -0400
  556. +++ 2/module_game_menus.py  2014-12-01 09:38:11.000000000 -0500
  557. @@ -9517,7 +9517,7 @@ game_menus = [
  558.      ("visit_lady",
  559.     [
  560.    
  561. -   (neg|troop_slot_ge, "trp_player", slot_troop_spouse, kingdom_ladies_begin),
  562. +#  (neg|troop_slot_ge, "trp_player", slot_troop_spouse, kingdom_ladies_begin),  #For polygamy we want to be able to visit ladies even after player is married
  563.    
  564.     (assign, "$love_interest_in_town", 0),
  565.     (assign, "$love_interest_in_town_2", 0),
  566. @@ -9581,6 +9581,34 @@ game_menus = [
  567.         [
  568.          (jump_to_menu, "mnu_lady_visit"),
  569.          ], "Door to the garden."),                                    
  570. +      
  571. +    ("visit_spouse",
  572. +   [
  573. +   (troop_slot_ge, "trp_player", slot_troop_spouse, kingdom_ladies_begin),  #After you get married you should be able to visit your spouse(s) ALONE
  574. +   (assign, "$love_interest_page", 0),
  575. +   ],
  576. +     "Spend some time alone with one of your spouses",
  577. +       [
  578. +        (jump_to_menu, "mnu_spouse_visit"),
  579. +        ], "Door to the garden."),                                    
  580. +    ("visit_harem",
  581. +   [ (eq,"$public_harem",0),
  582. +     (troop_slot_ge, "trp_player", slot_troop_spouse, kingdom_ladies_begin),  #After you get married you should be able to visit your spouse(s) ALONE
  583. +     (assign,":concubine_count",0),
  584. +     (try_for_range, ":lady_no", kingdom_ladies_begin, kingdom_ladies_end),
  585. +         (troop_slot_eq, ":lady_no", slot_troop_spouse, "trp_player"),
  586. +         (neg|troop_slot_eq, "trp_player", slot_troop_spouse, ":lady_no"),
  587. +         (troop_slot_eq, ":lady_no", slot_troop_cur_center, "$current_town"),
  588. +         (val_add,":concubine_count",1),
  589. +     (try_end),
  590. +     (gt,":concubine_count",0),
  591. +#  (assign, "$love_interest_page", 0),
  592. +   ],
  593. +     "Spend some time in your harem",
  594. +       [
  595. +        (call_script, "script_enter_harem", "$current_town"),
  596. +        ], "Door to the garden."),                                    
  597. +
  598.        
  599.        ("trade_with_merchants",
  600.         [
  601. @@ -9971,6 +9999,173 @@ game_menus = [
  602.      ]
  603.     ),
  604.  
  605. +  (
  606. +    "spouse_visit",0,
  607. +    "Whom do you wish to visit?",
  608. +    "none",
  609. +    [  (assign, "$love_interest_in_town", 0),
  610. +   (assign, "$love_interest_in_town_2", 0),
  611. +   (assign, "$love_interest_in_town_3", 0),
  612. +   (assign, "$love_interest_in_town_4", 0),
  613. +   (assign, "$love_interest_in_town_5", 0),
  614. +   (assign, "$love_interest_in_town_6", 0),
  615. +   (assign, "$love_interest_in_town_7", 0),
  616. +   (assign, "$love_interest_in_town_8", 0),
  617. +   (assign, "$lady_count", 0),
  618. +   (try_for_range, ":lady_no", kingdom_ladies_begin, kingdom_ladies_end),
  619. +       (troop_slot_eq, ":lady_no", slot_troop_cur_center, "$current_town"),
  620. +      
  621. +       (troop_slot_eq, ":lady_no", slot_troop_spouse, "trp_player"),
  622. +       (try_begin),
  623. +           (val_add, "$lady_count", 1),
  624. +           (gt, "$lady_count", "$love_interest_page"),
  625. +           (try_begin),
  626. +               (eq, "$love_interest_in_town", 0),
  627. +               (assign, "$love_interest_in_town", ":lady_no"),
  628. +           (else_try),
  629. +               (eq, "$love_interest_in_town_2", 0),
  630. +               (assign, "$love_interest_in_town_2", ":lady_no"),  
  631. +           (else_try),
  632. +               (eq, "$love_interest_in_town_3", 0),
  633. +               (assign, "$love_interest_in_town_3", ":lady_no"),  
  634. +           (else_try),
  635. +               (eq, "$love_interest_in_town_4", 0),
  636. +               (assign, "$love_interest_in_town_4", ":lady_no"),  
  637. +           (else_try),
  638. +               (eq, "$love_interest_in_town_5", 0),
  639. +               (assign, "$love_interest_in_town_5", ":lady_no"),  
  640. +           (else_try),
  641. +               (eq, "$love_interest_in_town_6", 0),
  642. +               (assign, "$love_interest_in_town_6", ":lady_no"),
  643. +           (else_try),
  644. +               (eq, "$love_interest_in_town_7", 0),
  645. +               (assign, "$love_interest_in_town_7", ":lady_no"),      
  646. +           (else_try),
  647. +               (eq, "$love_interest_in_town_8", 0),
  648. +               (assign, "$love_interest_in_town_8", ":lady_no"),      
  649. +           (try_end), 
  650. +       (try_end), 
  651. +   (try_end),],
  652. +    [     
  653. +      
  654. +   ("visit_lady_1", [
  655. +   (gt, "$love_interest_in_town", 0),
  656. +   (str_store_troop_name, s12, "$love_interest_in_town"),
  657. +   (neg|troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town"),
  658. +   ],
  659. +     "Visit {s12}",
  660. +       [
  661. +       (assign, "$love_interest_in_town", "$love_interest_in_town"),
  662. +        (jump_to_menu, "mnu_garden_spouse"),
  663. +        ]),
  664. +      
  665. +   ("visit_lady_1w", [
  666. +   (gt, "$love_interest_in_town", 0),
  667. +   (str_store_troop_name, s12, "$love_interest_in_town"),
  668. +   (troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town"),
  669. +  
  670. +   ],
  671. +     "Visit your wife, {s12}",
  672. +       [
  673. +       (assign, "$love_interest_in_town", "$love_interest_in_town"),
  674. +        (jump_to_menu, "mnu_garden_spouse"),
  675. +        ]),
  676. +
  677. +
  678. +      
  679. +   ("visit_lady_2", [
  680. +   (gt, "$love_interest_in_town_2", 0),
  681. +   (str_store_troop_name, s12, "$love_interest_in_town_2"),
  682. +   (neg|troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_2"),
  683. +   ],
  684. +     "Visit {s12}",
  685. +       [
  686. +       (assign, "$love_interest_in_town", "$love_interest_in_town_2"),
  687. +        (jump_to_menu, "mnu_garden_spouse"),
  688. +        ]),
  689. +
  690. +   ("visit_lady_3", [
  691. +   (gt, "$love_interest_in_town_3", 0),
  692. +   (str_store_troop_name, s12, "$love_interest_in_town_3"),
  693. +   (neg|troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_3"),
  694. +   ],
  695. +     "Visit {s12}",
  696. +       [
  697. +       (assign, "$love_interest_in_town", "$love_interest_in_town_3"),
  698. +        (jump_to_menu, "mnu_garden_spouse")], "Door to the garden."),
  699. +
  700. +      
  701. +   ("visit_lady_4", [(gt, "$love_interest_in_town_4", 0),(str_store_troop_name, s12, "$love_interest_in_town_4"),  (neg|troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_4"),],
  702. +   "Visit {s12}",[(assign, "$love_interest_in_town", "$love_interest_in_town_4"),(jump_to_menu, "mnu_garden_spouse"),]),
  703. +      
  704. +   ("visit_lady_5", [(gt, "$love_interest_in_town_5", 0),(str_store_troop_name, s12, "$love_interest_in_town_5"),  (neg|troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_5"),],
  705. +   "Visit {s12}",[(assign, "$love_interest_in_town", "$love_interest_in_town_5"),(jump_to_menu, "mnu_garden_spouse"),]),
  706. +
  707. +   ("visit_lady_6",[(gt, "$love_interest_in_town_6", 0),(str_store_troop_name, s12, "$love_interest_in_town_6"),   (neg|troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_6"),],
  708. +   "Visit {s12}",[(assign, "$love_interest_in_town", "$love_interest_in_town_6"),(jump_to_menu, "mnu_garden_spouse"),]),
  709. +  
  710. +   ("visit_lady_7",[(gt, "$love_interest_in_town_7", 0),(str_store_troop_name, s12, "$love_interest_in_town_7"),   (neg|troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_7"),],
  711. +   "Visit {s12}",[(assign, "$love_interest_in_town", "$love_interest_in_town_7"),(jump_to_menu, "mnu_garden_spouse"),]),
  712. +
  713. +   ("visit_lady_8",[(gt, "$love_interest_in_town_8", 0),(str_store_troop_name, s12, "$love_interest_in_town_8"),   (neg|troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_8"),],
  714. +   "Visit {s12}",[(assign, "$love_interest_in_town", "$love_interest_in_town_8"),(jump_to_menu, "mnu_garden_spouse"),]),
  715. +
  716. +   ("visit_lady_2w", [
  717. +   (gt, "$love_interest_in_town_2", 0),
  718. +   (str_store_troop_name, s12, "$love_interest_in_town_2"),
  719. +   (troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_2"),
  720. +   ],
  721. +     "Visit your wife, {s12}",
  722. +       [
  723. +       (assign, "$love_interest_in_town", "$love_interest_in_town_2"),
  724. +        (jump_to_menu, "mnu_garden_spouse"),
  725. +        ]),
  726. +
  727. +   ("visit_lady_3w", [
  728. +   (gt, "$love_interest_in_town_3", 0),
  729. +   (str_store_troop_name, s12, "$love_interest_in_town_3"),
  730. +   (troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_3"),
  731. +   ],
  732. +     "Visit your wife, {s12}",
  733. +       [
  734. +       (assign, "$love_interest_in_town", "$love_interest_in_town_3"),
  735. +        (jump_to_menu, "mnu_garden_spouse")], "Door to the garden."),
  736. +
  737. +      
  738. +   ("visit_lady_4w", [(gt, "$love_interest_in_town_4", 0),(str_store_troop_name, s12, "$love_interest_in_town_4"), (troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_4"),],
  739. +   "Visit your wife, {s12}",[(assign, "$love_interest_in_town", "$love_interest_in_town_4"),(jump_to_menu, "mnu_garden_spouse"),]),
  740. +      
  741. +   ("visit_lady_5w", [(gt, "$love_interest_in_town_5", 0),(str_store_troop_name, s12, "$love_interest_in_town_5"), (troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_5"),],
  742. +   "Visit your wife, {s12}",[(assign, "$love_interest_in_town", "$love_interest_in_town_5"),(jump_to_menu, "mnu_garden_spouse"),]),
  743. +
  744. +   ("visit_lady_6w",[(gt, "$love_interest_in_town_6", 0),(str_store_troop_name, s12, "$love_interest_in_town_6"),  (troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_6"),],
  745. +   "Visit your wife, {s12}",[(assign, "$love_interest_in_town", "$love_interest_in_town_6"),(jump_to_menu, "mnu_garden_spouse"),]),
  746. +  
  747. +   ("visit_lady_7w",[(gt, "$love_interest_in_town_7", 0),(str_store_troop_name, s12, "$love_interest_in_town_7"),  (troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_7"),],
  748. +   "Visit your wife, {s12}",[(assign, "$love_interest_in_town", "$love_interest_in_town_7"),(jump_to_menu, "mnu_garden_spouse"),]),
  749. +
  750. +   ("visit_lady_8w",[(gt, "$love_interest_in_town_8", 0),(str_store_troop_name, s12, "$love_interest_in_town_8"),  (troop_slot_eq, "trp_player", slot_troop_spouse, "$love_interest_in_town_8"),],
  751. +   "Visit your wife, {s12}",[(assign, "$love_interest_in_town", "$love_interest_in_town_8"),(jump_to_menu, "mnu_garden_spouse"),]),
  752. +
  753. +
  754. +   ("nextpage",
  755. +     [(store_add,":endofnextpage","$love_interest_page",8),
  756. +      (ge, "$lady_count", ":endofnextpage"),
  757. +         ], "Next Page",[
  758. +     (val_add, "$love_interest_page", 8),
  759. +     (jump_to_menu, "mnu_spouse_visit"),
  760. +     ]),
  761. +   ("prevpage",
  762. +     [(ge, "$love_interest_page",8),
  763. +         ], "Previous Page",[
  764. +     (val_sub, "$love_interest_page", 8),
  765. +     (jump_to_menu, "mnu_spouse_visit"),
  766. +     ]),
  767. +        
  768. +   ("leave",[], "Leave",[(jump_to_menu, "mnu_town")]),
  769. +
  770. +    ]
  771. +   ),
  772.    
  773.    (
  774.      "town_tournament_lost",0,
  775. @@ -13867,10 +14062,29 @@ game_menus = [
  776.     [(jump_to_menu, "mnu_town")]),
  777.  
  778.      ]
  779. -
  780. -    
  781.    ),
  782.    
  783. +  ( #pre lady visit
  784. +    "garden_spouse",0,
  785. +    "The guards open the door to her chambers for you. You might be imagining things, but you think one of them may have given you a wink",
  786. +    "none",
  787. +    [],
  788. +    [
  789. +
  790. +   ("enter",
  791. +   [], "Enter",
  792. +   [
  793. +   (jump_to_menu, "mnu_town"),
  794. +   (call_script, "script_setup_meet_spouse_alone", "$love_interest_in_town", "$g_encountered_party"),
  795. +   ]
  796. +   ),
  797. +    
  798. +   ("leave",
  799. +   [],
  800. +   "Leave",
  801. +   [(jump_to_menu, "mnu_town")]),
  802. +    ]
  803. +  ),
  804.    
  805.      (
  806.      "kill_local_merchant_begin",0,
  807. diff -rupN 1/module_scripts.py 2/module_scripts.py
  808. --- 1/module_scripts.py 2013-08-05 15:23:50.000000000 -0400
  809. +++ 2/module_scripts.py 2014-12-01 14:42:19.000000000 -0500
  810. @@ -1229,8 +1229,8 @@ scripts = [
  811.        (item_set_slot, "itm_club_with_spike_head", slot_item_multiplayer_item_class, multi_item_class_type_war_picks),
  812.      
  813.       #Cleavers
  814. -      (item_set_slot, "itm_falchion", slot_item_multiplayer_item_class, multi_item_class_type_cleavers),
  815. -      (item_set_slot, "itm_military_cleaver_b", slot_item_multiplayer_item_class, multi_item_class_type_cleavers),
  816. +      (item_set_slot, "itm_falchion", slot_item_multiplayer_item_class, multi_item_class_type_cleavers),
  817. +      (item_set_slot, "itm_military_cleaver_b", slot_item_multiplayer_item_class, multi_item_class_type_cleavers),
  818.        (item_set_slot, "itm_military_cleaver_c", slot_item_multiplayer_item_class, multi_item_class_type_cleavers),
  819.        (item_set_slot, "itm_two_handed_cleaver", slot_item_multiplayer_item_class, multi_item_class_type_cleavers),
  820.        (item_set_slot, "itm_hafted_blade_a", slot_item_multiplayer_item_class, multi_item_class_type_cleavers),
  821. @@ -4470,7 +4470,7 @@ scripts = [
  822.          (assign, ":num_relations", 0),
  823.  
  824.          (try_begin),
  825. -          (call_script, "script_troop_get_family_relation_to_troop", "trp_player", ":troop_no"),
  826. +          (call_script, "script_troop_get_family_relation_to_troop", ":troop_no", "trp_player"),
  827.            (gt, reg0, 0),
  828.            (val_add, ":num_relations", 1),
  829.          (try_end),
  830. @@ -25388,14 +25388,26 @@ scripts = [
  831.         (neq, ":cur_troop", "trp_knight_1_1_wife"), #The one who should not appear in game
  832.          #(troop_slot_eq, ":cur_troop", slot_troop_occupation, slto_kingdom_lady),
  833.          (troop_slot_eq, ":cur_troop", slot_troop_cur_center, ":center_no"),
  834. -      
  835. +       (assign, ":on_feast", 0),
  836. +       (try_begin),
  837. +           (faction_slot_eq, ":center_faction", slot_faction_ai_state, sfai_feast),
  838. +           (faction_slot_eq, ":center_faction", slot_faction_ai_object, ":center_no"),
  839. +           (assign, ":on_feast", 1),
  840. +       (try_end),
  841.         (assign, ":lady_meets_visitors", 0),
  842.         (try_begin),
  843. -           (this_or_next|troop_slot_eq, "trp_player", slot_troop_spouse, ":cur_troop"), #player spouse goes in position of honor
  844. -           (this_or_next|troop_slot_eq, "trp_player", slot_troop_betrothed, ":cur_troop"), #player spouse goes in position of honor
  845. -           (this_or_next|troop_slot_eq, ":cur_troop", slot_troop_spouse, "trp_player"), #player spouse goes in position of honor
  846. -               (troop_slot_eq, ":cur_troop", slot_troop_betrothed, "trp_player"),
  847. -              
  848. +           (assign, ":lady_is_wife", 0),  #main spouse:  bidirectional spousal relationships
  849. +           (try_begin),
  850. +               (troop_slot_eq, "trp_player", slot_troop_spouse, ":cur_troop"), #player spouse goes in position of honor
  851. +               (troop_slot_eq, ":cur_troop", slot_troop_spouse, "trp_player"), #player spouse goes in position of honor
  852. +               (assign, ":lady_is_wife", 1),
  853. +           (try_end),
  854. +#          (try_begin),
  855. +#              (troop_slot_eq, "trp_player", slot_troop_betrothed, ":cur_troop"), #player spouse goes in position of honor
  856. +#              (troop_slot_eq, ":cur_troop", slot_troop_betrothed, "trp_player"),
  857. +#              (assign, ":lady_is_wife", 1),
  858. +#          (try_end),
  859. +           (eq, ":lady_is_wife", 1),
  860.             (assign, ":lady_meets_visitors", 0), #She is already in the place of honor
  861.        
  862.             (try_begin),
  863. @@ -25403,7 +25415,18 @@ scripts = [
  864.                 (str_store_troop_name, s4, ":cur_troop"),
  865.                 (display_message, "str_s4_is_present_at_the_center_and_in_place_of_honor"),
  866.             (try_end),
  867. -      
  868. +       (else_try), #lady is concubine - only show if it is not on feast and requested through talking to wife
  869. +           (neg|eq, ":on_feast", 1),
  870. +           (neg|troop_slot_eq, "trp_player", slot_troop_spouse, ":cur_troop"),
  871. +           (troop_slot_eq, ":cur_troop", slot_troop_spouse, "trp_player"),
  872. +           (assign, ":lady_meets_visitors", "$public_harem"),
  873. +          
  874. +           (try_begin),
  875. +               (eq, "$cheat_mode", 1),
  876. +               (str_store_troop_name, s4, ":cur_troop"),
  877. +               (display_message, "str_s4_is_present_at_the_center_and_is_married"),
  878. +           (try_end),
  879. +          
  880.         (else_try), #lady is troop
  881.             (store_faction_of_troop, ":lady_faction", ":cur_troop"),
  882.             (neq, ":lady_faction", ":center_faction"),
  883. @@ -25422,8 +25445,7 @@ scripts = [
  884.            
  885.             (try_begin),
  886.              #married ladies at a feast will not mingle - this is ahistorical, as married women and widows probably had much more freedom than unmarried ones, at least in the West, but the game needs to leave slots for them to show off their unmarried daughters
  887. -               (faction_slot_eq, ":center_faction", slot_faction_ai_state, sfai_feast),
  888. -               (faction_slot_eq, ":center_faction", slot_faction_ai_object, ":center_no"),
  889. +               (eq, ":on_feast", 1),
  890.                 (assign, ":lady_meets_visitors", 0),
  891.                
  892.                 (try_begin),
  893. @@ -25523,7 +25545,62 @@ scripts = [
  894.        (scene_set_slot, ":castle_scene", slot_scene_visited, 1),
  895.        (change_screen_mission),  
  896.     ]),  
  897. -  
  898. +
  899. +   ("setup_meet_spouse_alone",
  900. +    [
  901. +      (store_script_param_1, ":lady_no"),
  902. +      (store_script_param_2, ":center_no"),
  903. +    
  904. +      #(mission_tpl_entry_set_override_flags, "mt_visit_town_castle", 0, af_override_horse),
  905. +#      (troop_set_slot, ":lady_no", slot_lady_last_suitor, "trp_player"),
  906. +    
  907. +      (set_jump_mission,"mt_visit_town_castle"),
  908. +      (party_get_slot, ":castle_scene", ":center_no", slot_town_castle),
  909. +      (modify_visitors_at_site,":castle_scene"),
  910. +      (reset_visitors),
  911. +
  912. +#    (troop_set_age, "trp_nurse_for_lady", 100),
  913. +#      (set_visitor, 7, "trp_nurse_for_lady"),
  914. +
  915. +      (assign, ":cur_pos", 16),
  916. +     (set_visitor, ":cur_pos", ":lady_no"),
  917. +
  918. +      (assign, "$talk_context", tc_garden),
  919. +    
  920. +      (jump_to_scene,":castle_scene"),
  921. +      (scene_set_slot, ":castle_scene", slot_scene_visited, 1),
  922. +      (change_screen_mission),  
  923. +   ]),  
  924. +   ("enter_harem",
  925. +    [
  926. +   (store_script_param_1, ":center_no"),
  927. +   (assign, "$talk_context", tc_garden),
  928. +      #(mission_tpl_entry_set_override_flags, "mt_visit_town_castle", 0, af_override_horse),
  929. +#      (troop_set_slot, ":lady_no", slot_lady_last_suitor, "trp_player"),
  930. +    
  931. +   (set_jump_mission,"mt_visit_town_castle"),
  932. +   (party_get_slot, ":castle_scene", ":center_no", slot_town_castle),
  933. +   (modify_visitors_at_site,":castle_scene"),
  934. +   (reset_visitors),
  935. +   (assign, ":cur_pos", 16), #populate wife
  936. +       (troop_get_slot, ":player_spouse", "trp_player", slot_troop_spouse),
  937. +           (set_visitor, ":cur_pos", ":player_spouse"),
  938. +        (val_add,":cur_pos", 1),
  939. +   (try_for_range, ":cur_troop", kingdom_ladies_begin, kingdom_ladies_end), #populate concubines
  940. +         (troop_slot_eq, ":cur_troop", slot_troop_spouse, "trp_player"),
  941. +         (neg|troop_slot_eq, "trp_player", slot_troop_spouse, ":cur_troop"),
  942. +#    (troop_set_age, "trp_nurse_for_lady", 100),
  943. +#      (set_visitor, 7, "trp_nurse_for_lady"),
  944. +#      (lt, ":cur_pos", 32),  #adding the line to cap spawn locations -- may or may not need
  945. +       (set_visitor, ":cur_pos", ":cur_troop"),
  946. +       (val_add,":cur_pos", 1),
  947. +   (try_end),
  948. +      (assign, "$talk_context", tc_back_alley),  #not adding constants for the talk context used in only 1 place so far - will add to the list if that changes
  949. +      
  950. +      (jump_to_scene,":castle_scene"),
  951. +      (scene_set_slot, ":castle_scene", slot_scene_visited, 1),
  952. +      (change_screen_mission),  
  953. +   ]),  
  954.    # script_find_high_ground_around_pos1
  955.    # Input: pos1 should hold center_position_no
  956.    #        arg1: team_no
  957. @@ -26708,21 +26785,21 @@ scripts = [
  958.            (party_is_active, "$qst_follow_spy_spy_partners_party"),
  959.            (remove_party, "$qst_follow_spy_spy_partners_party"),
  960.          (try_end),
  961. -      (else_try),
  962. -        (eq, ":quest_no", "qst_capture_enemy_hero"),
  963. -        (assign, ":quest_return_penalty", -3),
  964. -        (assign, ":quest_expire_penalty", -4),
  965. -      (else_try),
  966. -        (eq, ":quest_no", "qst_lend_companion"),
  967. -        (quest_get_slot, ":quest_target_troop", "qst_lend_companion", slot_quest_target_troop),
  968. -        (troop_set_slot, ":quest_target_troop", slot_troop_current_mission, npc_mission_rejoin_when_possible),
  969. -       (troop_set_slot, ":quest_target_troop", slot_troop_days_on_mission, 0),
  970. -      (else_try),
  971. -        (eq, ":quest_no", "qst_lend_surgeon"),
  972. -        (quest_get_slot, ":quest_target_troop", "qst_lend_surgeon", slot_quest_target_troop),
  973. -        (troop_set_slot, ":quest_target_troop", slot_troop_current_mission, npc_mission_rejoin_when_possible),
  974. -       (troop_set_slot, ":quest_target_troop", slot_troop_days_on_mission, 0),
  975. -##        (party_add_members, "p_main_party", ":quest_target_troop", 1),
  976. +      (else_try),
  977. +        (eq, ":quest_no", "qst_capture_enemy_hero"),
  978. +        (assign, ":quest_return_penalty", -3),
  979. +        (assign, ":quest_expire_penalty", -4),
  980. +      (else_try),
  981. +        (eq, ":quest_no", "qst_lend_companion"),
  982. +        (quest_get_slot, ":quest_target_troop", "qst_lend_companion", slot_quest_target_troop),
  983. +        (troop_set_slot, ":quest_target_troop", slot_troop_current_mission, npc_mission_rejoin_when_possible),
  984. +       (troop_set_slot, ":quest_target_troop", slot_troop_days_on_mission, 0),
  985. +      (else_try),
  986. +        (eq, ":quest_no", "qst_lend_surgeon"),
  987. +        (quest_get_slot, ":quest_target_troop", "qst_lend_surgeon", slot_quest_target_troop),
  988. +        (troop_set_slot, ":quest_target_troop", slot_troop_current_mission, npc_mission_rejoin_when_possible),
  989. +       (troop_set_slot, ":quest_target_troop", slot_troop_days_on_mission, 0),
  990. +##        (party_add_members, "p_main_party", ":quest_target_troop", 1),
  991.  ##      (else_try),
  992.  ##        (eq, ":quest_no", "qst_capture_conspirators"),
  993.  ##      (else_try),
  994. @@ -27524,12 +27601,27 @@ scripts = [
  995.      [
  996.      (store_script_param_1, ":troop_1"),
  997.      (store_script_param_2, ":troop_2"),
  998. -      
  999. +    (troop_get_type, ":gender_2", ":troop_2"),
  1000.      (troop_get_type, ":gender_1", ":troop_1"),
  1001.     (assign, ":relation_strength", 0),
  1002.    
  1003.      (troop_get_slot, ":spouse_of_1", ":troop_1", slot_troop_spouse),
  1004.      (troop_get_slot, ":spouse_of_2", ":troop_2", slot_troop_spouse),
  1005. +#  (try_begin),
  1006. +#        (eq, "$cheat_mode", 1),
  1007. +#        (try_begin),
  1008. +#      (gt, ":spouse_of_1", -1),
  1009. +#      (str_store_troop_name,s3,":troop_1"),
  1010. +#      (str_store_troop_name,s2,":spouse_of_1"),
  1011. +#      (display_message,"str_s3s_s2"),
  1012. +#        (try_end),
  1013. +#        (try_begin),
  1014. +#      (gt, ":spouse_of_2", -1),
  1015. +#      (str_store_troop_name,s3,":troop_2"),
  1016. +#      (str_store_troop_name,s2,":spouse_of_2"),
  1017. +#        (display_message,"str_s3s_s2"),
  1018. +#        (try_end),
  1019. +#  (try_end),
  1020.    
  1021.     (try_begin),
  1022.         (gt, ":spouse_of_1", -1),
  1023. @@ -27582,13 +27674,35 @@ scripts = [
  1024.       (eq, ":troop_1", ":troop_2"),
  1025.       #self
  1026.     (else_try),
  1027. -     (eq, ":spouse_of_1", ":troop_2"),
  1028. -     (assign, ":relation_strength", 20),
  1029. +     (this_or_next|eq, ":spouse_of_2", ":troop_1"), #if one is married to another (wife/concubine)
  1030. +         (eq, ":spouse_of_1", ":troop_2"),
  1031. +       (assign, ":relation_strength", 20),
  1032.       (try_begin),
  1033. -       (eq, ":gender_1", 1),
  1034. -       (str_store_string, s11, "str_wife"),
  1035. +       (eq, ":spouse_of_1", ":troop_2"),
  1036. +       (eq, ":spouse_of_2", ":troop_1"),  #Checking whether bidirectional, bidirectional = wife, otherwise concubine
  1037. +       (try_begin),
  1038. +       (eq, ":troop_1", "trp_player"),
  1039. +       (try_begin),
  1040. +           (eq, ":gender_2", 1),
  1041. +           (str_store_string, s11, "str_husband"),
  1042. +       (else_try),
  1043. +           (str_store_string, s11, "str_wife"),
  1044. +       (try_end),     
  1045. +       (else_try),
  1046. +       (try_begin),
  1047. +           (eq, ":gender_1", 1),
  1048. +           (str_store_string, s11, "str_wife"),
  1049. +       (else_try),
  1050. +           (str_store_string, s11, "str_husband"),
  1051. +       (try_end),     
  1052. +       (try_end),
  1053.       (else_try),
  1054. -       (str_store_string, s11, "str_husband"),
  1055. +       (try_begin),
  1056. +         (eq, ":troop_2", "trp_player"), #If not both of them are true then only one of them is as checked by the this_or_next
  1057. +           (str_store_string, s11, "str_concubine"),
  1058. +       (else_try),
  1059. +       (str_store_string, s11, "str_husband"),
  1060. +       (try_end),
  1061.       (try_end),
  1062.     (else_try),
  1063.       (eq, ":father_of_2", ":troop_1"),
  1064. @@ -33555,7 +33669,7 @@ scripts = [
  1065.          (troop_set_slot, "trp_npc6", slot_troop_morality_value, 2),  #beheshtur
  1066.          (troop_set_slot, "trp_npc6", slot_troop_2ary_morality_type, tmt_honest),
  1067.          (troop_set_slot, "trp_npc6", slot_troop_2ary_morality_value, 1),
  1068. -        (troop_set_slot, "trp_npc6", slot_troop_personalityclash_object, "trp_npc11"), #firenz
  1069. +        (troop_set_slot, "trp_npc6", slot_troop_personalityclash_object, "trp_npc11"), #firenz - katrin
  1070.          (troop_set_slot, "trp_npc6", slot_troop_personalityclash2_object, "trp_npc13"), #firenz - nizar
  1071.          (troop_set_slot, "trp_npc6", slot_troop_personalitymatch_object, "trp_npc12"),  #firenz - jeremus
  1072.          (troop_set_slot, "trp_npc6", slot_troop_home, "p_town_4"), #Suno
  1073. @@ -33572,7 +33686,7 @@ scripts = [
  1074.          (troop_set_slot, "trp_npc7", slot_troop_morality_value, 3),  #beheshtur
  1075.          (troop_set_slot, "trp_npc7", slot_troop_2ary_morality_type, -1),
  1076.          (troop_set_slot, "trp_npc7", slot_troop_2ary_morality_value, 0),
  1077. -        (troop_set_slot, "trp_npc7", slot_troop_personalityclash_object, "trp_npc1"),  #deshavi
  1078. +        (troop_set_slot, "trp_npc7", slot_troop_personalityclash_object, "trp_npc1"),  #deshavi - borcha
  1079.          (troop_set_slot, "trp_npc7", slot_troop_personalityclash2_object, "trp_npc4"),  #deshavi - rolf
  1080.          (troop_set_slot, "trp_npc7", slot_troop_personalitymatch_object, "trp_npc16"),  #deshavi - klethi
  1081.          (troop_set_slot, "trp_npc7", slot_troop_home, "p_village_5"), #Kulum
  1082. @@ -33589,7 +33703,7 @@ scripts = [
  1083.          (troop_set_slot, "trp_npc8", slot_troop_morality_value, 3),  #beheshtur
  1084.          (troop_set_slot, "trp_npc8", slot_troop_2ary_morality_type, -1),
  1085.          (troop_set_slot, "trp_npc8", slot_troop_2ary_morality_value, 0),
  1086. -        (troop_set_slot, "trp_npc8", slot_troop_personalityclash_object, "trp_npc12"), #matheld
  1087. +        (troop_set_slot, "trp_npc8", slot_troop_personalityclash_object, "trp_npc12"), #matheld - jeremus
  1088.          (troop_set_slot, "trp_npc8", slot_troop_personalityclash2_object, "trp_npc3"), #matheld - ymira
  1089.          (troop_set_slot, "trp_npc8", slot_troop_personalitymatch_object, "trp_npc13"),  #matheld - nizar
  1090.          (troop_set_slot, "trp_npc8", slot_troop_home, "p_sea_raider_spawn_point_2"), #Gundig's Point
  1091. @@ -33654,7 +33768,7 @@ scripts = [
  1092.          (troop_set_slot, "trp_npc12", slot_troop_morality_value, 3),
  1093.          (troop_set_slot, "trp_npc12", slot_troop_2ary_morality_type, -1),
  1094.          (troop_set_slot, "trp_npc12", slot_troop_2ary_morality_value, 0),
  1095. -        (troop_set_slot, "trp_npc12", slot_troop_personalityclash_object, "trp_npc8"), #jerem
  1096. +        (troop_set_slot, "trp_npc12", slot_troop_personalityclash_object, "trp_npc8"), #jeremus - matheld
  1097.          (troop_set_slot, "trp_npc12", slot_troop_personalityclash2_object, "trp_npc15"), #jeremus - artimenner
  1098.          (troop_set_slot, "trp_npc12", slot_troop_personalitymatch_object, "trp_npc6"),  #jeremus - firenz
  1099.          (troop_set_slot, "trp_npc12", slot_troop_home, "p_castle_16"), #undetermined #University
  1100. @@ -33671,7 +33785,7 @@ scripts = [
  1101.          (troop_set_slot, "trp_npc13", slot_troop_morality_value, 3),
  1102.          (troop_set_slot, "trp_npc13", slot_troop_2ary_morality_type, -1),
  1103.          (troop_set_slot, "trp_npc13", slot_troop_2ary_morality_value, 0),
  1104. -        (troop_set_slot, "trp_npc13", slot_troop_personalityclash_object, "trp_npc9"), #nizar
  1105. +        (troop_set_slot, "trp_npc13", slot_troop_personalityclash_object, "trp_npc9"), #nizar - alayen
  1106.          (troop_set_slot, "trp_npc13", slot_troop_personalityclash2_object, "trp_npc6"), #nizar - firenz
  1107.          (troop_set_slot, "trp_npc13", slot_troop_personalitymatch_object, "trp_npc8"), #nizar - matheld
  1108.          (troop_set_slot, "trp_npc13", slot_troop_home, "p_castle_15"), #Ergellon Castle
  1109. @@ -33688,7 +33802,7 @@ scripts = [
  1110.          (troop_set_slot, "trp_npc14", slot_troop_morality_value, 4),
  1111.          (troop_set_slot, "trp_npc14", slot_troop_2ary_morality_type, tmt_egalitarian),
  1112.          (troop_set_slot, "trp_npc14", slot_troop_2ary_morality_value, -1),
  1113. -        (troop_set_slot, "trp_npc14", slot_troop_personalityclash_object, "trp_npc3"), #lezalit
  1114. +        (troop_set_slot, "trp_npc14", slot_troop_personalityclash_object, "trp_npc3"), #lezalit - ymira
  1115.          (troop_set_slot, "trp_npc14", slot_troop_personalityclash2_object, "trp_npc10"), #lezalit - bunduk
  1116.          (troop_set_slot, "trp_npc14", slot_troop_personalitymatch_object, "trp_npc15"), #lezalit - artimenner
  1117.          (troop_set_slot, "trp_npc14", slot_troop_home, "p_castle_18"), #Ismirala Castle
  1118. @@ -33719,7 +33833,7 @@ scripts = [
  1119.          (troop_set_slot, "trp_npc16", slot_troop_morality_value, 4),
  1120.          (troop_set_slot, "trp_npc16", slot_troop_2ary_morality_type, tmt_humanitarian),
  1121.          (troop_set_slot, "trp_npc16", slot_troop_2ary_morality_value, -1),
  1122. -        (troop_set_slot, "trp_npc16", slot_troop_personalityclash_object, "trp_npc15"), #klethi
  1123. +        (troop_set_slot, "trp_npc16", slot_troop_personalityclash_object, "trp_npc15"), #klethi - artimenner
  1124.          (troop_set_slot, "trp_npc16", slot_troop_personalityclash2_object, "trp_npc1"), #klethi - borcha
  1125.          (troop_set_slot, "trp_npc16", slot_troop_personalitymatch_object, "trp_npc7"),  #deshavi - klethi
  1126.          (troop_set_slot, "trp_npc16", slot_troop_home, "p_village_20"), #Uslum
  1127. @@ -40842,14 +40956,22 @@ scripts = [
  1128.         (display_message, "str_s3_marries_s4_at_s5"),
  1129.      (try_end),
  1130.    
  1131. -   (troop_set_slot, ":bride", slot_troop_spouse, ":groom"),
  1132. -   (troop_set_slot, ":groom", slot_troop_spouse, ":bride"),
  1133. -  
  1134. +   (try_begin),
  1135. +       (neg|eq,  ":groom", "trp_player"),
  1136. +       (troop_set_slot, ":bride", slot_troop_spouse, ":groom"),
  1137. +       (troop_set_slot, ":groom", slot_troop_spouse, ":bride"),
  1138. +   (else_try),
  1139. +       (troop_set_slot, ":bride", slot_troop_spouse, "trp_player"),
  1140. +       (neg|troop_slot_ge, "trp_player", slot_troop_spouse, kingdom_ladies_begin),
  1141. +       (troop_set_slot, ":groom", slot_troop_spouse, ":bride"),
  1142. +   (try_end),
  1143.     #Break groom's romantic relations
  1144. -   (try_for_range, ":love_interest_slot", slot_troop_love_interest_1, slot_troop_love_interests_end),
  1145. -       (troop_set_slot, ":groom", ":love_interest_slot", 0),
  1146. +   (try_begin),
  1147. +     (neg|eq, ":groom", "trp_player"),
  1148. +     (try_for_range, ":love_interest_slot", slot_troop_love_interest_1, slot_troop_love_interests_end),
  1149. +         (troop_set_slot, ":groom", ":love_interest_slot", 0),
  1150. +     (try_end),
  1151.     (try_end),
  1152. -
  1153.     #Break bride's romantic relations
  1154.     (try_for_range, ":active_npc", active_npcs_begin, active_npcs_end),
  1155.         (try_for_range, ":love_interest_slot", slot_troop_love_interest_1, slot_troop_love_interests_end),
  1156. @@ -40900,16 +41022,16 @@ scripts = [
  1157.     (try_end),
  1158.  
  1159.    
  1160. -   (try_begin),
  1161. -       (eq, ":groom", "trp_player"),
  1162. -       (check_quest_active, "qst_visit_lady"),
  1163. -       (call_script, "script_abort_quest", "qst_visit_lady", 0),
  1164. -   (try_end), 
  1165. -   (try_begin),
  1166. -       (eq, ":groom", "trp_player"),
  1167. -       (check_quest_active, "qst_duel_courtship_rival"),
  1168. -       (call_script, "script_abort_quest", "qst_duel_courtship_rival", 0),
  1169. -   (try_end), 
  1170. +#  (try_begin),
  1171. +#      (eq, ":groom", "trp_player"),
  1172. +#      (check_quest_active, "qst_visit_lady"),
  1173. +#      (call_script, "script_abort_quest", "qst_visit_lady", 0),
  1174. +#  (try_end), 
  1175. +#  (try_begin),
  1176. +#      (eq, ":groom", "trp_player"),
  1177. +#      (check_quest_active, "qst_duel_courtship_rival"),
  1178. +#      (call_script, "script_abort_quest", "qst_duel_courtship_rival", 0),
  1179. +#  (try_end), 
  1180.    
  1181.    
  1182.     (try_begin),
  1183. @@ -40946,6 +41068,10 @@ scripts = [
  1184.         (try_end),
  1185.      (try_end),
  1186.    
  1187. +    (try_begin),
  1188. +        (eq, ":groom", "trp_player"),
  1189. +        (troop_set_slot, ":bride", slot_troop_cur_center, "$g_player_court"),
  1190. +    (try_end),
  1191.    
  1192.    
  1193.      (try_begin),
  1194. @@ -43634,10 +43760,11 @@ scripts = [
  1195.    
  1196.     (try_begin),
  1197.         (eq, "$cheat_mode", 2),
  1198. -       (gt, ":strongest_kingdom", 1),
  1199. +       (ge, ":strongest_kingdom", 1),
  1200.         (str_store_faction_name, s4, ":strongest_kingdom"),
  1201.         (assign, reg3, ":score_to_beat"),
  1202.         (display_message, "@{!}DEBUG - {s4} strongest kingdom with {reg3} strength"),
  1203. +       (display_message,s18),
  1204.     (try_end),
  1205.    
  1206.    
  1207. diff -rupN 1/module_strings.py 2/module_strings.py
  1208. --- 1/module_strings.py 2013-07-11 23:59:34.000000000 -0400
  1209. +++ 2/module_strings.py 2014-12-01 00:35:27.000000000 -0500
  1210. @@ -3594,7 +3594,7 @@ We apologize sincerely if you contribute
  1211.    ("i_do_so_enjoy_speaking_to_you_but_as_a_daughter_of_good_family_i_must_protect_my_reputation_", "I do so enjoy speaking to you. But as a daughter of good family, I must protect my reputation. "),
  1212.    ("although_it_is_kind_of_you_to_pay_me_such_attentions_i_suspect_that_you_might_find_other_ladies_who_may_be_more_inclined_to_return_your_affection", "Although it is kind of you to pay me such attentions, I suspect that you might find other ladies who may be more inclined to return your affection."),
  1213.    ("as_flattered_as_i_am_by_your_attentions_perhaps_you_should_seek_out_another_lady_of_somewhat_shall_we_say_different_tastes", "As flattered as I am by your attentions, perhaps you should seek out another lady of somewhat... shall we say... different tastes."),
  1214. -  ("as_flattered_as_i_am_by_your_attentions_i_am_a_daughter_of_good_family_and_must_be_aware_of_my_reputation_it_is_not_seemly_that_i_converse_too_much_at_one_time_with_one_man_i_am_sure_you_understand_now_if_you_will_excuse_me", "As flattered as I am by your attentions, I am a daughter of good family and must be aware of my reputation. It is not seemly that I converse too much at one time with one man. I am sure you understand. Now, if you will excuse me..."),
  1215. +  ("as_flattered_as_i_am_by_your_attentions_i_am_a_daughter_of_good_family_and_must_be_aware_of_my_reputation_it_is_not_seemly_that_i_converse_too_much_at_one_time_with_one_man_i_am_sure_you_understand_now_if_you_will_excuse_me", "As flattered as I am by your attentions, I am a daughter of good family and must be aware of my reputation. It is not seemly that I converse too much at one time with one suitor. I am sure you understand. Now, if you will excuse me..."),
  1216.    ("very_well__i_will_let_you_choose_the_time", "Very well -- I will let you choose the time."),
  1217.    ("good_i_am_glad_that_you_have_abandoned_the_notion_of_pushing_me_into_marriage_before_i_was_ready", "Good! I am glad that you have abandoned the notion of pushing me into marriage before I was ready."),
  1218.    ("rival_found_s4_reg0_relation", "{!}DEBUG : Rival found: {s4} ({reg0} relation)"),
  1219. @@ -3611,7 +3611,7 @@ We apologize sincerely if you contribute
  1220.    ("hmm_youre_a_bold_one_but_i_like_that_", "Hmm. You're a bold one, but I like that. "),
  1221.    ("ah_well_they_all_say_that_but_no_matter_a_compliment_well_delivered_is_at_least_a_good_start_", "Ah, well, they all say that. But no matter. A compliment well delivered is at least a good start. "),
  1222.    ("oh_do_you_mean_that_such_a_kind_thing_to_say", "Oh! Do you mean that? Such a kind thing to say!"),
  1223. -  ("you_are_a_most_gallant_young_man_", "You are a most gallant young man. "),
  1224. +  ("you_are_a_most_gallant_young_man_", "You are a most gallant young {man/lady}. "),
  1225.    ("_do_come_and_see_me_again_soon", " Do come and see me again soon."),
  1226.    ("you_intend_to_ask_s12_for_permission_to_marry_s15", "You intend to ask {s12} for permission to marry {s15}."),
  1227.    ("you_intend_to_ask_s12_to_pressure_s10_to_marry_you", "You intend to ask {s12} to pressure {s10} to marry you."),
  1228. @@ -4091,4 +4091,5 @@ We apologize sincerely if you contribute
  1229.    ("ranged_weapons_are_disallowed", "Ranged weapons are disallowed."),
  1230.    ("ranged_weapons_are_allowed", "Ranged weapons are allowed."),
  1231.    ("duel_starts_in_reg0_seconds", "Duel starts in {reg0} seconds..."),
  1232. +  ("concubine", "consort"),
  1233.  ]
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!