Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
*Implement a potential fix to crashes
- Reimplemented setting volunteer party to 0 when depleted. (Thanks to Rafael Casanova Morera again)
  • Loading branch information
khamukkamu committed May 14, 2017
1 parent 9a12ddc commit 3313ad0
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 16 deletions.
12 changes: 6 additions & 6 deletions ModuleSystem/module_dialogs.py
Expand Up @@ -1563,12 +1563,12 @@
# check if first time or depleted, and initialize
(troop_get_slot, ":reserve_party", "trp_player", slot_troop_player_reserve_party),

## Kham - Remove this code, as we are trying to create the volunteer party ONLY ONCE, then just keep refilling it, instead of recreating it.
#(try_begin),
# (gt, ":reserve_party", 0),
# (neg|party_is_active, ":reserve_party"), # depleted
# (assign, ":reserve_party", 0),
#(try_end),

(try_begin),
(gt, ":reserve_party", 0),
(neg|party_is_active, ":reserve_party"), # depleted
(assign, ":reserve_party", 0),
(try_end),

(try_begin),
(eq, ":reserve_party", 0), #first time or depleted
Expand Down
11 changes: 5 additions & 6 deletions ModuleSystem/module_scripts.py
Expand Up @@ -1934,13 +1934,12 @@ def set_item_score():
(store_relation, ":rel", ":fac", "$players_kingdom"), #MV fixed
(ge, ":rel", 0),

## Kham - Remove this code, as we are trying to create the volunteer party ONLY ONCE, then just keep refilling it, instead of recreating it.
#(try_begin),
#( gt, ":volunteers", 0),
#(neg|party_is_active, ":volunteers" ), # depleted
(try_begin),
( gt, ":volunteers", 0),
(neg|party_is_active, ":volunteers" ), # depleted
# --
#(assign, ":volunteers", 0),
# (try_end),
(assign, ":volunteers", 0),
(try_end),

(try_begin),
(eq, ":volunteers", 0),
Expand Down
2 changes: 1 addition & 1 deletion _wb/conversation.txt
Expand Up @@ -190,7 +190,7 @@ dlga_companion_home_description_3:close_window 4095 105 2 520 3 122497909864477
dlga_start:player_hire_troop 4095 0 31 31 2 144115188075855951 16 2330 2 21 144115188075855998 2335 2 22 144115188075856308 2335 2 14 144115188075856308 2322 2 23 144115188075855970 1 2 11 144115188075855993 2321 2 29 24 1 2 11 144115188075856308 2335 2 25 144115188075855993 2133 2 72057594037927962 0 4 0 31 2 144115188075855993 144115188075856308 2133 2 72057594037927962 1 3 0 1601 2 72057594037927963 0 1 2 15 144115188075856308 2133 2 1224979098644774912 72057594037927936 4 0 31 2 72057594037927962 1 2320 2 33 1585267068834415693 5 0 30 2 1224979098644774912 4 2320 2 33 1585267068834415693 5 0 30 2 1224979098644774912 1 2320 2 33 1585267068834415694 5 0 2320 2 33 1585267068834415695 3 0 1 3 96 9 0 1 4 58 9 1 144115188075856308 {s33}^^I_am_in_charge_of_the_forces_garrisoned_here_at_{s21}._Did_you_want_to_see_me? 106 0
dlga_player_hire_troop:player_hire_troop_take 69631 106 8 1633 2 72057594037927946 0 32 2 72057594037927946 0 4 0 542 3 144115188075855893 158 0 2320 2 4 1585267068834415696 5 0 2320 2 4 1585267068834415697 3 0 {s4} 107 10 521 3 144115188075855913 144115188075856029 66 2133 2 144115188075855914 0 4 0 32 2 144115188075855913 0 132 1 144115188075855913 2156 2 144115188075855914 144115188075855913 1320 1 144115188075855913 1 2 56 144115188075855913 2133 2 144115188075855915 72057594037927936 3 0
dlga_player_hire_troop:player_hire_troop_give 69631 106 2 1601 2 72057594037927947 9 32 2 72057594037927947 1 Some_of_the_soldiers_in_my_group_would_be_more_useful_here,_to_defend_{s21}. 108 6 1617 1 9 2133 2 144115188075855907 0 1 3 91 9 0 1601 2 72057594037927964 0 1 3 21 0 1 2133 2 144115188075856502 72057594037927936
dlga_player_hire_troop:close_window 69631 106 12 542 3 144115188075855993 154 144115188075855998 520 3 1224979098644774912 0 50 4 0 31 2 1224979098644774912 0 1100 2 144115188075855998 255 2133 2 1224979098644774912 72057594037927936 500 3 0 50 1224979098644774912 1660 2 1224979098644774912 144115188075855998 1669 2 1224979098644774912 1585267068834415698 1603 2 1224979098644774912 524288 1640 2 1224979098644774912 0 3 0 I_want_to_review_my_soldiers_stationed_here. 6 2 1 1 402 2060 1 151
dlga_player_hire_troop:close_window 69631 106 17 542 3 144115188075855993 154 144115188075855998 520 3 1224979098644774912 0 50 4 0 32 2 1224979098644774912 0 2147483780 1 1224979098644774912 2133 2 1224979098644774912 0 3 0 4 0 31 2 1224979098644774912 0 1100 2 144115188075855998 255 2133 2 1224979098644774912 72057594037927936 500 3 0 50 1224979098644774912 1660 2 1224979098644774912 144115188075855998 1669 2 1224979098644774912 1585267068834415698 1603 2 1224979098644774912 524288 1640 2 1224979098644774912 0 3 0 I_want_to_review_my_soldiers_stationed_here. 6 2 1 1 402 2060 1 151
dlga_player_hire_troop:close_window.1 69631 106 1 2147484189 3 144115188075855998 16 -1 I_need_some_training. 6 2 1 1 402 2060 1 128
dlga_player_hire_troop:tld_sell_prisoners 69631 106 2 2159 1 72057594037927941 30 2 72057594037927941 1 I_have_brought_you_some_prisoners. 109 0
dlga_tld_sell_prisoners:tld_sell_prisoners_check 4095 109 15 4 0 30 2 72057594037927941 30 2320 2 33 1585267068834415699 5 0 30 2 72057594037927941 20 2320 2 33 1585267068834415700 5 0 30 2 72057594037927941 10 2320 2 33 1585267068834415701 5 0 30 2 72057594037927941 5 2320 2 33 1585267068834415702 5 0 2320 2 33 1585267068834415703 3 0 {s33}_Let's_see_the_wretched_scum. 110 1 2044 0
Expand Down
2 changes: 1 addition & 1 deletion _wb/scripts.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion conversation.txt
Expand Up @@ -190,7 +190,7 @@ dlga_companion_home_description_3:close_window 4095 105 2 520 3 122497909864477
dlga_start:player_hire_troop 4095 0 31 31 2 144115188075855951 16 2330 2 21 144115188075855998 2335 2 22 144115188075856308 2335 2 14 144115188075856308 2322 2 23 144115188075855970 1 2 11 144115188075855993 2321 2 29 24 1 2 11 144115188075856308 2335 2 25 144115188075855993 2133 2 72057594037927962 0 4 0 31 2 144115188075855993 144115188075856308 2133 2 72057594037927962 1 3 0 1601 2 72057594037927963 0 1 2 15 144115188075856308 2133 2 1224979098644774912 72057594037927936 4 0 31 2 72057594037927962 1 2320 2 33 1585267068834415659 5 0 30 2 1224979098644774912 4 2320 2 33 1585267068834415659 5 0 30 2 1224979098644774912 1 2320 2 33 1585267068834415660 5 0 2320 2 33 1585267068834415661 3 0 1 3 96 9 0 1 4 58 9 1 144115188075856308 {s33}^^I_am_in_charge_of_the_forces_garrisoned_here_at_{s21}._Did_you_want_to_see_me? 106 0
dlga_player_hire_troop:player_hire_troop_take 69631 106 8 1633 2 72057594037927946 0 32 2 72057594037927946 0 4 0 542 3 144115188075855893 158 0 2320 2 4 1585267068834415662 5 0 2320 2 4 1585267068834415663 3 0 {s4} 107 10 521 3 144115188075855913 144115188075856029 66 2133 2 144115188075855914 0 4 0 32 2 144115188075855913 0 132 1 144115188075855913 2156 2 144115188075855914 144115188075855913 1320 1 144115188075855913 1 2 56 144115188075855913 2133 2 144115188075855915 72057594037927936 3 0
dlga_player_hire_troop:player_hire_troop_give 69631 106 2 1601 2 72057594037927947 9 32 2 72057594037927947 1 Some_of_the_soldiers_in_my_group_would_be_more_useful_here,_to_defend_{s21}. 108 6 1617 1 9 2133 2 144115188075855907 0 1 3 91 9 0 1601 2 72057594037927964 0 1 3 21 0 1 2133 2 144115188075856502 72057594037927936
dlga_player_hire_troop:close_window 69631 106 12 542 3 144115188075855993 154 144115188075855998 520 3 1224979098644774912 0 50 4 0 31 2 1224979098644774912 0 1100 2 144115188075855998 255 2133 2 1224979098644774912 72057594037927936 500 3 0 50 1224979098644774912 1660 2 1224979098644774912 144115188075855998 1669 2 1224979098644774912 1585267068834415664 1603 2 1224979098644774912 524288 1640 2 1224979098644774912 0 3 0 I_want_to_review_my_soldiers_stationed_here. 6 2 1 1 402 2060 1 151
dlga_player_hire_troop:close_window 69631 106 17 542 3 144115188075855993 154 144115188075855998 520 3 1224979098644774912 0 50 4 0 32 2 1224979098644774912 0 2147483780 1 1224979098644774912 2133 2 1224979098644774912 0 3 0 4 0 31 2 1224979098644774912 0 1100 2 144115188075855998 255 2133 2 1224979098644774912 72057594037927936 500 3 0 50 1224979098644774912 1660 2 1224979098644774912 144115188075855998 1669 2 1224979098644774912 1585267068834415664 1603 2 1224979098644774912 524288 1640 2 1224979098644774912 0 3 0 I_want_to_review_my_soldiers_stationed_here. 6 2 1 1 402 2060 1 151
dlga_player_hire_troop:close_window.1 69631 106 1 2147484189 3 144115188075855998 16 -1 I_need_some_training. 6 2 1 1 402 2060 1 128
dlga_player_hire_troop:tld_sell_prisoners 69631 106 2 2159 1 72057594037927941 30 2 72057594037927941 1 I_have_brought_you_some_prisoners. 109 0
dlga_tld_sell_prisoners:tld_sell_prisoners_check 4095 109 15 4 0 30 2 72057594037927941 30 2320 2 33 1585267068834415665 5 0 30 2 72057594037927941 20 2320 2 33 1585267068834415666 5 0 30 2 72057594037927941 10 2320 2 33 1585267068834415667 5 0 30 2 72057594037927941 5 2320 2 33 1585267068834415668 5 0 2320 2 33 1585267068834415669 3 0 {s33}_Let's_see_the_wretched_scum. 110 1 2044 0
Expand Down
2 changes: 1 addition & 1 deletion scripts.txt

Large diffs are not rendered by default.

0 comments on commit 3313ad0

Please sign in to comment.