*fix the red error text when opening the troop viewer, as reported by @…

…Fantu. there was some funny stuff with self-referential farmers going on (the first troop in the soldier block), so I added some additional checks and limited the scanned troops to those from non-civil factions.
tldmod · Feb 13, 2017 · f92da44 · f92da44
1 parent 75e2339
commit f92da44
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/ModuleSystem/module_presentations.py b/ModuleSystem/module_presentations.py
@@ -2989,6 +2989,9 @@
         (assign, ":total_max_tier", 1),
         (try_for_range, ":cur_troop", soldiers_begin, soldiers_end),
           (neg|troop_is_hero, ":cur_troop"),
+          # swy: ensure that civil troops don't pass (e.g. farmers, that for some reason have upgrade paths to themselves)
+          (store_troop_faction, ":cur_troop_faction", ":cur_troop"),
+          (is_between,          ":cur_troop_faction", npc_kingdoms_begin, npc_kingdoms_end),
           # can upgrade
           (troop_get_upgrade_troop, ":upgrade_troop", ":cur_troop", 0),
           (gt, ":upgrade_troop", 0), 

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -20401,16 +20401,38 @@ def set_item_faction():
       (store_script_param, ":troop_no", 1),
       (store_script_param, ":cur_tier", 2),
 
+    # (str_store_troop_name, s5, ":troop_no"),
+    # (assign,             reg4, ":cur_tier"),
+    # (display_message, "@TIER {reg4} / {s5}."),
+
       (store_add, ":next_tier", ":cur_tier", 1),
       # upgrade_troop
       (troop_get_upgrade_troop, ":upgrade_troop_1", ":troop_no", 0),
       (troop_get_upgrade_troop, ":upgrade_troop_2", ":troop_no", 1),
       (try_begin),
+        (gt,  ":upgrade_troop_1", 0),
         (gt,  ":upgrade_troop_2", 0),
+        # swy: ensure this it doesn't return a self-reference, don't ask me why this happens
+        #      with farmers (which are at the start of the soldier block)
+        (neq, ":upgrade_troop_1", ":troop_no"),
+        (neq, ":upgrade_troop_2", ":troop_no"),
+
+      # (str_store_troop_name, s5, ":upgrade_troop_1"),
+      # (str_store_troop_name, s6, ":upgrade_troop_2"),
+      # (display_message, "@  [2] {s5} / {s6}."),
+
         (call_script, "script_troop_tree_recursive_detect_max_tier", ":upgrade_troop_2", ":next_tier"),
         (call_script, "script_troop_tree_recursive_detect_max_tier", ":upgrade_troop_1", ":next_tier"),
+
       (else_try),
         (gt,  ":upgrade_troop_1", 0),
+        # swy: ensure this it doesn't return a self-reference, don't ask me why this happens
+        #      with farmers (which are at the start of the soldier block)
+        (neq, ":upgrade_troop_1", ":troop_no"),
+
+      # (str_store_troop_name, s5, ":upgrade_troop_1"),
+      # (display_message, "@  [1] {s5}."),
+
         (call_script, "script_troop_tree_recursive_detect_max_tier", ":upgrade_troop_1", ":next_tier"),
       (try_end),
 

diff --git a/_wb/presentations.txt b/_wb/presentations.txt
@@ -102,7 +102,7 @@ prsnt_game_escape 53 0 1
 
 
 prsnt_faction_troop_trees 0 0 3
--60  276 902 1 999999 2124 1 1000 911 2 72057594037927937 48 729 2 1 0 730 2 1 0 926 2 72057594037927937 1 916 1 144115188075856199 729 2 1 500 730 2 1 690 926 2 144115188075856199 1 2121 3 1224979098644774912 21 3 7 3 1224979098644774913 0 1224979098644774912 2120 3 1224979098644774914 1224979098644774913 3 2335 2 0 1224979098644774914 931 2 144115188075856199 0 3 0 2121 3 1224979098644774915 1224979098644774912 144115188075856542 2106 2 1224979098644774915 1 927 2 144115188075856199 1224979098644774915 940 2 144115188075856204 1585267068834414669 729 2 1 750 730 2 1 685 926 2 144115188075856204 1 910 3 72057594037927937 1585267068834414670 4 729 2 1 800 730 2 1 800 925 2 72057594037927937 1 729 2 1 30 730 2 1 690 926 2 72057594037927937 1 4 0 33 3 144115188075856542 0 1224979098644774912 2120 3 1224979098644774916 354 144115188075856542 911 2 72057594037927937 1224979098644774916 729 2 1 200 730 2 1 110 926 2 72057594037927937 1 729 2 1 300 730 2 1 300 925 2 72057594037927937 1 3 0 2133 2 1224979098644774917 1 6 3 1224979098644774918 25 454 2147485155 1 1224979098644774918 1561 3 1224979098644774919 1224979098644774918 0 32 2 1224979098644774919 0 1 2 505 1224979098644774918 2133 2 1224979098644774920 72057594037927936 31 2 1224979098644774920 144115188075856542 2133 2 72057594037927936 1 1 3 503 1224979098644774918 1 2133 2 1224979098644774921 72057594037927936 4 0 32 2 1224979098644774921 1224979098644774917 2133 2 1224979098644774917 1224979098644774921 3 0 3 0 2106 2 1224979098644774917 1 2111 2 1224979098644774917 1 2123 3 1224979098644774922 700 1224979098644774917 2110 2 1224979098644774922 120 2319 1 0 910 3 72057594037927937 0 8192 729 2 1 15 730 2 1 15 926 2 72057594037927937 1 729 2 1 800 730 2 1 660 929 2 72057594037927937 1 945 1 72057594037927937 2133 2 144115188075856539 0 2133 2 72057594037927938 75 6 3 1224979098644774918 25 454 2147485155 1 1224979098644774918 1561 3 1224979098644774919 1224979098644774918 0 32 2 1224979098644774919 0 1 2 505 1224979098644774918 2133 2 1224979098644774920 72057594037927936 31 2 1224979098644774920 144115188075856542 2133 2 1224979098644774923 1 2133 2 1224979098644774924 454 6 3 1224979098644774925 25 1224979098644774924 2147485155 1 1224979098644774925 1 2 505 1224979098644774925 2133 2 1224979098644774926 72057594037927936 31 2 1224979098644774926 144115188075856542 1561 3 1224979098644774927 1224979098644774925 0 1561 3 1224979098644774928 1224979098644774925 1 1073741855 2 1224979098644774927 1224979098644774918 31 2 1224979098644774928 1224979098644774918 2133 2 1224979098644774923 0 2133 2 1224979098644774924 0 3 0 31 2 1224979098644774923 1 1 5 502 1224979098644774918 50 72057594037927938 1224979098644774922 2105 2 72057594037927938 160 3 0 945 1 -1 4 0 32 2 144115188075856541 0 2122 3 1224979098644774918 144115188075856541 2 938 4 72057594037927937 -1 2 1224979098644774918 729 2 1 450 730 2 1 600 925 2 72057594037927937 1 729 2 1 810 730 2 1 550 926 2 72057594037927937 1 729 2 2 750 730 2 2 750 729 2 3 900 730 2 3 900 2322 2 1 144115188075856541 910 3 72057594037927937 1 16 729 2 1 900 730 2 1 710 926 2 72057594037927937 1 925 2 72057594037927937 2 2171 2 72057594037927939 144115188075856541 2133 2 1224979098644774929 35 2170 3 1224979098644774930 36 144115188075856541 2172 3 1224979098644774931 144115188075856541 0 2107 2 1224979098644774930 2 2105 2 1224979098644774929 1224979098644774930 2105 2 1224979098644774929 1224979098644774931 2133 2 72057594037927940 1224979098644774929 910 3 72057594037927937 1585267068834414671 4 729 2 1 900 730 2 1 665 926 2 72057594037927937 1 925 2 72057594037927937 2 910 3 72057594037927937 1585267068834414672 4 729 2 1 900 730 2 1 630 926 2 72057594037927937 1 925 2 72057594037927937 3 910 3 72057594037927937 1585267068834414673 4 729 2 1 900 730 2 1 570 926 2 72057594037927937 1 925 2 72057594037927937 2 6 3 1224979098644774932 0 4 4 0 31 2 1224979098644774932 0 2172 3 72057594037927938 144115188075856541 1224979098644774932 2320 2 1 1585267068834414674 5 0 2172 3 72057594037927938 144115188075856541 1224979098644774932 2320 2 1 1585267068834414675 3 0 3 0 910 3 72057594037927937 1 8 729 2 1 980 730 2 1 570 926 2 72057594037927937 1 925 2 72057594037927937 2 910 3 72057594037927937 1585267068834414676 4 729 2 1 840 730 2 1 527 926 2 72057594037927937 1 925 2 72057594037927937 3 910 3 72057594037927937 1585267068834414677 4 729 2 1 840 730 2 1 415 926 2 72057594037927937 1 925 2 72057594037927937 2 7 3 1224979098644774933 0 42 4 0 31 2 1224979098644774933 36 2170 3 72057594037927938 1224979098644774933 144115188075856541 2320 2 1 1585267068834414674 5 0 1073741855 2 1224979098644774933 35 1073741855 2 1224979098644774933 34 1073741855 2 1224979098644774933 33 1073741855 2 1224979098644774933 26 1073741855 2 1224979098644774933 25 1073741855 2 1224979098644774933 24 31 2 1224979098644774933 23 2170 3 72057594037927938 1224979098644774933 144115188075856541 2320 2 1 1585267068834414675 3 0 3 0 910 3 72057594037927937 1 8 729 2 1 980 730 2 1 415 926 2 72057594037927937 1 925 2 72057594037927937 2 910 3 72057594037927937 1585267068834414678 4 729 2 1 840 730 2 1 370 926 2 72057594037927937 1 925 2 72057594037927937 3 910 3 72057594037927937 1585267068834414679 4 729 2 1 840 730 2 1 285 926 2 72057594037927937 1 925 2 72057594037927937 2 6 3 1224979098644774934 0 6 4 0 31 2 1224979098644774934 0 2176 3 72057594037927938 144115188075856541 1224979098644774934 2320 2 1 1585267068834414674 5 0 33 3 1224979098644774934 1 6 2176 3 72057594037927938 144115188075856541 1224979098644774934 2320 2 1 1585267068834414675 3 0 3 0 910 3 72057594037927937 1 8 729 2 1 980 730 2 1 285 926 2 72057594037927937 1 925 2 72057594037927937 2 910 3 72057594037927937 1585267068834414680 4 729 2 1 840 730 2 1 235 926 2 72057594037927937 1 925 2 72057594037927937 3 2319 1 0 910 3 144115188075856205 0 8192 729 2 1 840 730 2 1 30 926 2 144115188075856205 1 729 2 1 138 730 2 1 202 929 2 144115188075856205 1 945 1 144115188075856205 1532 1 834 1540 2 1224979098644774935 144115188075856541 6 3 1224979098644774936 0 1224979098644774935 1541 3 1224979098644774937 144115188075856541 1224979098644774936 32 2 1224979098644774937 -1 1542 3 1224979098644774938 144115188075856541 1224979098644774936 1530 3 834 1224979098644774937 1224979098644774938 3 0 2133 2 1224979098644774939 0 2133 2 1224979098644774940 280 2133 2 1224979098644774941 10 6 3 1224979098644774942 0 8 6 3 1224979098644774943 0 3 911 2 72057594037927937 372 729 2 1 320 730 2 1 320 925 2 72057594037927937 1 729 2 1 1224979098644774939 730 2 1 1224979098644774940 926 2 72057594037927937 1 500 3 834 1224979098644774941 72057594037927937 911 2 72057594037927937 373 729 2 1 400 730 2 1 400 925 2 72057594037927937 1 729 2 1 1224979098644774939 730 2 1 1224979098644774940 926 2 72057594037927937 1 1541 3 1224979098644774944 834 1224979098644774941 2111 2 1224979098644774944 0 944 2 72057594037927937 1224979098644774944 729 2 1 400 730 2 1 400 925 2 72057594037927937 1 2120 3 1224979098644774945 1224979098644774939 20 2120 3 1224979098644774946 1224979098644774940 20 729 2 1 1224979098644774945 730 2 1 1224979098644774946 926 2 72057594037927937 1 500 3 835 1224979098644774941 72057594037927937 2105 2 1224979098644774939 40 2105 2 1224979098644774941 1 3 0 2133 2 1224979098644774939 0 2106 2 1224979098644774940 40 3 0 945 1 -1 3 0 
+-60  278 902 1 999999 2124 1 1000 911 2 72057594037927937 48 729 2 1 0 730 2 1 0 926 2 72057594037927937 1 916 1 144115188075856199 729 2 1 500 730 2 1 690 926 2 144115188075856199 1 2121 3 1224979098644774912 21 3 7 3 1224979098644774913 0 1224979098644774912 2120 3 1224979098644774914 1224979098644774913 3 2335 2 0 1224979098644774914 931 2 144115188075856199 0 3 0 2121 3 1224979098644774915 1224979098644774912 144115188075856542 2106 2 1224979098644774915 1 927 2 144115188075856199 1224979098644774915 940 2 144115188075856204 1585267068834414669 729 2 1 750 730 2 1 685 926 2 144115188075856204 1 910 3 72057594037927937 1585267068834414670 4 729 2 1 800 730 2 1 800 925 2 72057594037927937 1 729 2 1 30 730 2 1 690 926 2 72057594037927937 1 4 0 33 3 144115188075856542 0 1224979098644774912 2120 3 1224979098644774916 354 144115188075856542 911 2 72057594037927937 1224979098644774916 729 2 1 200 730 2 1 110 926 2 72057594037927937 1 729 2 1 300 730 2 1 300 925 2 72057594037927937 1 3 0 2133 2 1224979098644774917 1 6 3 1224979098644774918 25 454 2147485155 1 1224979098644774918 2173 2 1224979098644774919 1224979098644774918 33 3 1224979098644774919 3 21 1561 3 1224979098644774920 1224979098644774918 0 32 2 1224979098644774920 0 1 2 505 1224979098644774918 2133 2 1224979098644774921 72057594037927936 31 2 1224979098644774921 144115188075856542 2133 2 72057594037927936 1 1 3 503 1224979098644774918 1 2133 2 1224979098644774922 72057594037927936 4 0 32 2 1224979098644774922 1224979098644774917 2133 2 1224979098644774917 1224979098644774922 3 0 3 0 2106 2 1224979098644774917 1 2111 2 1224979098644774917 1 2123 3 1224979098644774923 700 1224979098644774917 2110 2 1224979098644774923 120 2319 1 0 910 3 72057594037927937 0 8192 729 2 1 15 730 2 1 15 926 2 72057594037927937 1 729 2 1 800 730 2 1 660 929 2 72057594037927937 1 945 1 72057594037927937 2133 2 144115188075856539 0 2133 2 72057594037927938 75 6 3 1224979098644774918 25 454 2147485155 1 1224979098644774918 1561 3 1224979098644774920 1224979098644774918 0 32 2 1224979098644774920 0 1 2 505 1224979098644774918 2133 2 1224979098644774921 72057594037927936 31 2 1224979098644774921 144115188075856542 2133 2 1224979098644774924 1 2133 2 1224979098644774925 454 6 3 1224979098644774926 25 1224979098644774925 2147485155 1 1224979098644774926 1 2 505 1224979098644774926 2133 2 1224979098644774927 72057594037927936 31 2 1224979098644774927 144115188075856542 1561 3 1224979098644774928 1224979098644774926 0 1561 3 1224979098644774929 1224979098644774926 1 1073741855 2 1224979098644774928 1224979098644774918 31 2 1224979098644774929 1224979098644774918 2133 2 1224979098644774924 0 2133 2 1224979098644774925 0 3 0 31 2 1224979098644774924 1 1 5 502 1224979098644774918 50 72057594037927938 1224979098644774923 2105 2 72057594037927938 160 3 0 945 1 -1 4 0 32 2 144115188075856541 0 2122 3 1224979098644774918 144115188075856541 2 938 4 72057594037927937 -1 2 1224979098644774918 729 2 1 450 730 2 1 600 925 2 72057594037927937 1 729 2 1 810 730 2 1 550 926 2 72057594037927937 1 729 2 2 750 730 2 2 750 729 2 3 900 730 2 3 900 2322 2 1 144115188075856541 910 3 72057594037927937 1 16 729 2 1 900 730 2 1 710 926 2 72057594037927937 1 925 2 72057594037927937 2 2171 2 72057594037927939 144115188075856541 2133 2 1224979098644774930 35 2170 3 1224979098644774931 36 144115188075856541 2172 3 1224979098644774932 144115188075856541 0 2107 2 1224979098644774931 2 2105 2 1224979098644774930 1224979098644774931 2105 2 1224979098644774930 1224979098644774932 2133 2 72057594037927940 1224979098644774930 910 3 72057594037927937 1585267068834414671 4 729 2 1 900 730 2 1 665 926 2 72057594037927937 1 925 2 72057594037927937 2 910 3 72057594037927937 1585267068834414672 4 729 2 1 900 730 2 1 630 926 2 72057594037927937 1 925 2 72057594037927937 3 910 3 72057594037927937 1585267068834414673 4 729 2 1 900 730 2 1 570 926 2 72057594037927937 1 925 2 72057594037927937 2 6 3 1224979098644774933 0 4 4 0 31 2 1224979098644774933 0 2172 3 72057594037927938 144115188075856541 1224979098644774933 2320 2 1 1585267068834414674 5 0 2172 3 72057594037927938 144115188075856541 1224979098644774933 2320 2 1 1585267068834414675 3 0 3 0 910 3 72057594037927937 1 8 729 2 1 980 730 2 1 570 926 2 72057594037927937 1 925 2 72057594037927937 2 910 3 72057594037927937 1585267068834414676 4 729 2 1 840 730 2 1 527 926 2 72057594037927937 1 925 2 72057594037927937 3 910 3 72057594037927937 1585267068834414677 4 729 2 1 840 730 2 1 415 926 2 72057594037927937 1 925 2 72057594037927937 2 7 3 1224979098644774934 0 42 4 0 31 2 1224979098644774934 36 2170 3 72057594037927938 1224979098644774934 144115188075856541 2320 2 1 1585267068834414674 5 0 1073741855 2 1224979098644774934 35 1073741855 2 1224979098644774934 34 1073741855 2 1224979098644774934 33 1073741855 2 1224979098644774934 26 1073741855 2 1224979098644774934 25 1073741855 2 1224979098644774934 24 31 2 1224979098644774934 23 2170 3 72057594037927938 1224979098644774934 144115188075856541 2320 2 1 1585267068834414675 3 0 3 0 910 3 72057594037927937 1 8 729 2 1 980 730 2 1 415 926 2 72057594037927937 1 925 2 72057594037927937 2 910 3 72057594037927937 1585267068834414678 4 729 2 1 840 730 2 1 370 926 2 72057594037927937 1 925 2 72057594037927937 3 910 3 72057594037927937 1585267068834414679 4 729 2 1 840 730 2 1 285 926 2 72057594037927937 1 925 2 72057594037927937 2 6 3 1224979098644774935 0 6 4 0 31 2 1224979098644774935 0 2176 3 72057594037927938 144115188075856541 1224979098644774935 2320 2 1 1585267068834414674 5 0 33 3 1224979098644774935 1 6 2176 3 72057594037927938 144115188075856541 1224979098644774935 2320 2 1 1585267068834414675 3 0 3 0 910 3 72057594037927937 1 8 729 2 1 980 730 2 1 285 926 2 72057594037927937 1 925 2 72057594037927937 2 910 3 72057594037927937 1585267068834414680 4 729 2 1 840 730 2 1 235 926 2 72057594037927937 1 925 2 72057594037927937 3 2319 1 0 910 3 144115188075856205 0 8192 729 2 1 840 730 2 1 30 926 2 144115188075856205 1 729 2 1 138 730 2 1 202 929 2 144115188075856205 1 945 1 144115188075856205 1532 1 834 1540 2 1224979098644774936 144115188075856541 6 3 1224979098644774937 0 1224979098644774936 1541 3 1224979098644774938 144115188075856541 1224979098644774937 32 2 1224979098644774938 -1 1542 3 1224979098644774939 144115188075856541 1224979098644774937 1530 3 834 1224979098644774938 1224979098644774939 3 0 2133 2 1224979098644774940 0 2133 2 1224979098644774941 280 2133 2 1224979098644774942 10 6 3 1224979098644774943 0 8 6 3 1224979098644774944 0 3 911 2 72057594037927937 372 729 2 1 320 730 2 1 320 925 2 72057594037927937 1 729 2 1 1224979098644774940 730 2 1 1224979098644774941 926 2 72057594037927937 1 500 3 834 1224979098644774942 72057594037927937 911 2 72057594037927937 373 729 2 1 400 730 2 1 400 925 2 72057594037927937 1 729 2 1 1224979098644774940 730 2 1 1224979098644774941 926 2 72057594037927937 1 1541 3 1224979098644774945 834 1224979098644774942 2111 2 1224979098644774945 0 944 2 72057594037927937 1224979098644774945 729 2 1 400 730 2 1 400 925 2 72057594037927937 1 2120 3 1224979098644774946 1224979098644774940 20 2120 3 1224979098644774947 1224979098644774941 20 729 2 1 1224979098644774946 730 2 1 1224979098644774947 926 2 72057594037927937 1 500 3 835 1224979098644774942 72057594037927937 2105 2 1224979098644774940 40 2105 2 1224979098644774942 1 3 0 2133 2 1224979098644774940 0 2106 2 1224979098644774941 40 3 0 945 1 -1 3 0 
 -63  28 2071 1 1224979098644774912 2072 1 1224979098644774913 4 0 32 2 144115188075856541 0 4 0 31 2 1224979098644774913 0 6 3 1224979098644774914 10 106 540 3 834 1224979098644774914 1224979098644774912 1541 3 1224979098644774915 834 1224979098644774914 1542 3 1224979098644774916 834 1224979098644774914 4 0 32 2 1224979098644774915 -1 520 3 1224979098644774917 835 1224979098644774914 946 2 0 1224979098644774917 972 4 1224979098644774915 1224979098644774916 0 100 2133 2 144115188075856540 1224979098644774914 3 0 3 0 5 0 6 3 1224979098644774914 10 106 540 3 834 1224979098644774914 1224979098644774912 4 0 31 2 144115188075856540 1224979098644774914 971 0 3 0 3 0 3 0 3 0 
 -62  20 2071 1 1224979098644774912 2072 1 1224979098644774913 6 3 1224979098644774914 0 144115188075856539 540 3 837 1224979098644774914 1224979098644774912 520 3 144115188075856541 838 1224979098644774914 900 1 20 3 0 4 0 31 2 1224979098644774912 144115188075856199 2121 3 1224979098644774915 21 3 2121 3 144115188075856542 1224979098644774915 1224979098644774913 2106 2 144115188075856542 1 2133 2 144115188075856541 0 900 1 20 5 0 31 2 1224979098644774912 144115188075856204 2133 2 144115188075856541 0 2133 2 144115188075856542 0 902 1 0 3 0