*Fix previous commit where taking a center will lead to all centers s…

…hifting to conquering faction
tldmod · May 13, 2017 · 9a12ddc · 9a12ddc
1 parent 45138d8
commit 9a12ddc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -8284,14 +8284,13 @@ def set_item_score():
         (call_script, "script_update_troop_notes", ":old_town_lord"),
       (try_end),
 
-      (try_for_range, ":other_center", centers_begin, centers_end),
-        (party_is_active, ":other_center"), #TLD
-        (store_faction_of_party, ":other_faction", ":other_center"),
-        (neq, ":other_faction", ":faction_no"),
-		(party_slot_eq, ":other_center", slot_center_destroyed, 0), # TLD
-        #(party_slot_eq, ":other_center", slot_village_bound_center, ":center_no"), #TLD - Removed (kham)
-        (call_script, "script_give_center_to_faction_aux", ":other_center", ":faction_no"),
-      (try_end),
+      #(try_for_range, ":other_center", centers_begin, centers_end),
+      #  (party_is_active, ":other_center"), #TLD
+      #  (neq, ":other_center", ":center_no"),
+	  #	 (party_slot_eq, ":other_center", slot_center_destroyed, 0), # TLD
+      #  (party_slot_eq, ":other_center", slot_village_bound_center, ":center_no"), #TLD - Removed (kham)
+      #  (call_script, "script_give_center_to_faction_aux", ":other_center", ":faction_no"),
+      #(try_end),
 ]),
 
 # script_give_center_to_lord  # in TLD, used only at inital setup

diff --git a/_wb/scripts.txt b/_wb/scripts.txt
@@ -289,7 +289,7 @@ get_heroes_attached_to_center_as_prisoner -1
 give_center_to_faction -1
  27 21 1 1224979098644774912 22 1 1224979098644774913 4 0 200 1 26 546 3 26 1 1224979098644774912 1 3 199 26 0 522 3 1224979098644774914 144115188075855993 7 2341 2 9 1224979098644774914 1290 1 23 2320 2 2 1585267068834414810 1 3 256 23 1224979098644774914 3 0 2204 2 1224979098644774915 1224979098644774912 1 3 144 1224979098644774912 1224979098644774913 4 0 31 2 1224979098644774912 31 31 2 1224979098644774915 5 542 3 5 154 31 2204 2 1224979098644774916 33 31 2 1224979098644774916 5 502 3 5 154 33 1106 1 1585267068834414811 3 0 6 3 1224979098644774917 3 21 1 2 417 1224979098644774917 3 0 2133 2 144115188075855925 1 
 give_center_to_faction_aux -1
- 90 21 1 1224979098644774912 22 1 1224979098644774913 2204 2 1224979098644774914 1224979098644774912 501 3 1224979098644774912 62 1224979098644774914 1620 2 1224979098644774912 1224979098644774913 521 3 1224979098644774915 1224979098644774912 7 522 3 1224979098644774916 1224979098644774913 10 501 3 1224979098644774912 7 1224979098644774916 522 3 1224979098644774917 1224979098644774913 151 1677 2 1224979098644774912 1224979098644774917 522 3 1224979098644774918 1224979098644774913 154 521 3 1224979098644774919 1224979098644774918 25 501 3 1224979098644774912 25 1224979098644774919 521 3 1224979098644774919 1224979098644774918 20 501 3 1224979098644774912 20 1224979098644774919 521 3 1224979098644774919 1224979098644774918 21 501 3 1224979098644774912 21 1224979098644774919 521 3 1224979098644774919 1224979098644774918 23 501 3 1224979098644774912 23 1224979098644774919 521 3 1224979098644774919 1224979098644774918 60 501 3 1224979098644774912 60 1224979098644774919 521 3 1224979098644774919 1224979098644774918 160 501 3 1224979098644774912 160 1224979098644774919 521 3 1224979098644774919 1224979098644774918 161 501 3 1224979098644774912 161 1224979098644774919 521 3 1224979098644774919 1224979098644774918 162 501 3 1224979098644774912 162 1224979098644774919 521 3 1224979098644774919 1224979098644774918 163 501 3 1224979098644774912 163 1224979098644774919 521 3 1224979098644774919 1224979098644774918 164 501 3 1224979098644774912 164 1224979098644774919 521 3 1224979098644774919 1224979098644774918 165 501 3 1224979098644774912 165 1224979098644774919 521 3 1224979098644774919 1224979098644774918 166 501 3 1224979098644774912 166 1224979098644774919 521 3 1224979098644774919 1224979098644774918 167 501 3 1224979098644774912 167 1224979098644774919 521 3 1224979098644774919 1224979098644774918 168 501 3 1224979098644774912 168 1224979098644774919 521 3 1224979098644774919 1224979098644774918 169 501 3 1224979098644774912 169 1224979098644774919 522 3 1224979098644774919 1224979098644774913 49 501 3 1224979098644774912 250 1224979098644774919 522 3 1224979098644774919 1224979098644774913 51 501 3 1224979098644774912 251 1224979098644774919 522 3 1224979098644774919 1224979098644774913 52 501 3 1224979098644774912 252 1224979098644774919 522 3 1224979098644774920 1224979098644774913 161 4 0 521 3 1224979098644774921 1224979098644774912 265 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 265 501 3 1224979098644774912 265 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 266 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 266 501 3 1224979098644774912 266 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 267 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 267 501 3 1224979098644774912 267 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 268 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 268 501 3 1224979098644774912 268 1224979098644774919 3 0 521 3 1224979098644774922 1224979098644774912 256 2110 2 1224979098644774922 5 501 3 1224979098644774912 256 1224979098644774922 1 2 263 1224979098644774914 1 2 263 1224979098644774913 1 2 267 1224979098644774912 1 2 265 1224979098644774916 4 0 30 2 1224979098644774915 0 1 2 265 1224979098644774915 3 0 6 3 1224979098644774923 18 96 132 1 1224979098644774923 2204 2 1224979098644774924 1224979098644774923 2147483679 2 1224979098644774924 1224979098644774913 541 3 1224979098644774923 260 0 1 3 144 1224979098644774923 1224979098644774913 3 0 
+ 83 21 1 1224979098644774912 22 1 1224979098644774913 2204 2 1224979098644774914 1224979098644774912 501 3 1224979098644774912 62 1224979098644774914 1620 2 1224979098644774912 1224979098644774913 521 3 1224979098644774915 1224979098644774912 7 522 3 1224979098644774916 1224979098644774913 10 501 3 1224979098644774912 7 1224979098644774916 522 3 1224979098644774917 1224979098644774913 151 1677 2 1224979098644774912 1224979098644774917 522 3 1224979098644774918 1224979098644774913 154 521 3 1224979098644774919 1224979098644774918 25 501 3 1224979098644774912 25 1224979098644774919 521 3 1224979098644774919 1224979098644774918 20 501 3 1224979098644774912 20 1224979098644774919 521 3 1224979098644774919 1224979098644774918 21 501 3 1224979098644774912 21 1224979098644774919 521 3 1224979098644774919 1224979098644774918 23 501 3 1224979098644774912 23 1224979098644774919 521 3 1224979098644774919 1224979098644774918 60 501 3 1224979098644774912 60 1224979098644774919 521 3 1224979098644774919 1224979098644774918 160 501 3 1224979098644774912 160 1224979098644774919 521 3 1224979098644774919 1224979098644774918 161 501 3 1224979098644774912 161 1224979098644774919 521 3 1224979098644774919 1224979098644774918 162 501 3 1224979098644774912 162 1224979098644774919 521 3 1224979098644774919 1224979098644774918 163 501 3 1224979098644774912 163 1224979098644774919 521 3 1224979098644774919 1224979098644774918 164 501 3 1224979098644774912 164 1224979098644774919 521 3 1224979098644774919 1224979098644774918 165 501 3 1224979098644774912 165 1224979098644774919 521 3 1224979098644774919 1224979098644774918 166 501 3 1224979098644774912 166 1224979098644774919 521 3 1224979098644774919 1224979098644774918 167 501 3 1224979098644774912 167 1224979098644774919 521 3 1224979098644774919 1224979098644774918 168 501 3 1224979098644774912 168 1224979098644774919 521 3 1224979098644774919 1224979098644774918 169 501 3 1224979098644774912 169 1224979098644774919 522 3 1224979098644774919 1224979098644774913 49 501 3 1224979098644774912 250 1224979098644774919 522 3 1224979098644774919 1224979098644774913 51 501 3 1224979098644774912 251 1224979098644774919 522 3 1224979098644774919 1224979098644774913 52 501 3 1224979098644774912 252 1224979098644774919 522 3 1224979098644774920 1224979098644774913 161 4 0 521 3 1224979098644774921 1224979098644774912 265 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 265 501 3 1224979098644774912 265 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 266 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 266 501 3 1224979098644774912 266 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 267 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 267 501 3 1224979098644774912 267 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 268 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 268 501 3 1224979098644774912 268 1224979098644774919 3 0 521 3 1224979098644774922 1224979098644774912 256 2110 2 1224979098644774922 5 501 3 1224979098644774912 256 1224979098644774922 1 2 263 1224979098644774914 1 2 263 1224979098644774913 1 2 267 1224979098644774912 1 2 265 1224979098644774916 4 0 30 2 1224979098644774915 0 1 2 265 1224979098644774915 3 0 
 give_center_to_lord -1
  33 23 2 1224979098644774912 1 23 2 1224979098644774913 2 23 2 1224979098644774914 3 521 3 1224979098644774915 1224979098644774912 7 2173 2 1224979098644774916 1224979098644774913 1620 2 1224979098644774912 1224979098644774916 501 3 1224979098644774912 7 1224979098644774913 1 2 265 1224979098644774913 1 2 267 1224979098644774912 1 2 263 1224979098644774916 4 0 30 2 1224979098644774915 0 1 2 265 1224979098644774915 2173 2 1224979098644774917 1224979098644774915 1 2 263 1224979098644774917 3 0 4 0 31 2 1224979098644774914 1 1073742365 3 1224979098644774912 0 3 541 3 1224979098644774912 0 2 2133 2 1224979098644774918 3 4 0 541 3 1224979098644774912 0 3 2133 2 1224979098644774918 9 3 0 6 3 1224979098644774919 0 1224979098644774918 1 2 149 1224979098644774912 3 0 6 3 1224979098644774919 0 7 2136 3 1224979098644774920 1500 2000 1673 3 1224979098644774912 1224979098644774920 0 3 0 3 0 
 cf_get_random_enemy_center -1

diff --git a/scripts.txt b/scripts.txt
@@ -289,7 +289,7 @@ get_heroes_attached_to_center_as_prisoner -1
 give_center_to_faction -1
  27 21 1 1224979098644774912 22 1 1224979098644774913 4 0 200 1 26 546 3 26 1 1224979098644774912 1 3 199 26 0 522 3 1224979098644774914 144115188075855993 7 2341 2 9 1224979098644774914 1290 1 23 2320 2 2 1585267068834414797 1 3 256 23 1224979098644774914 3 0 2204 2 1224979098644774915 1224979098644774912 1 3 144 1224979098644774912 1224979098644774913 4 0 31 2 1224979098644774912 31 31 2 1224979098644774915 5 542 3 5 154 31 2204 2 1224979098644774916 33 31 2 1224979098644774916 5 502 3 5 154 33 1106 1 1585267068834414798 3 0 6 3 1224979098644774917 3 21 1 2 417 1224979098644774917 3 0 2133 2 144115188075855925 1 
 give_center_to_faction_aux -1
- 90 21 1 1224979098644774912 22 1 1224979098644774913 2204 2 1224979098644774914 1224979098644774912 501 3 1224979098644774912 62 1224979098644774914 1620 2 1224979098644774912 1224979098644774913 521 3 1224979098644774915 1224979098644774912 7 522 3 1224979098644774916 1224979098644774913 10 501 3 1224979098644774912 7 1224979098644774916 522 3 1224979098644774917 1224979098644774913 151 1677 2 1224979098644774912 1224979098644774917 522 3 1224979098644774918 1224979098644774913 154 521 3 1224979098644774919 1224979098644774918 25 501 3 1224979098644774912 25 1224979098644774919 521 3 1224979098644774919 1224979098644774918 20 501 3 1224979098644774912 20 1224979098644774919 521 3 1224979098644774919 1224979098644774918 21 501 3 1224979098644774912 21 1224979098644774919 521 3 1224979098644774919 1224979098644774918 23 501 3 1224979098644774912 23 1224979098644774919 521 3 1224979098644774919 1224979098644774918 60 501 3 1224979098644774912 60 1224979098644774919 521 3 1224979098644774919 1224979098644774918 160 501 3 1224979098644774912 160 1224979098644774919 521 3 1224979098644774919 1224979098644774918 161 501 3 1224979098644774912 161 1224979098644774919 521 3 1224979098644774919 1224979098644774918 162 501 3 1224979098644774912 162 1224979098644774919 521 3 1224979098644774919 1224979098644774918 163 501 3 1224979098644774912 163 1224979098644774919 521 3 1224979098644774919 1224979098644774918 164 501 3 1224979098644774912 164 1224979098644774919 521 3 1224979098644774919 1224979098644774918 165 501 3 1224979098644774912 165 1224979098644774919 521 3 1224979098644774919 1224979098644774918 166 501 3 1224979098644774912 166 1224979098644774919 521 3 1224979098644774919 1224979098644774918 167 501 3 1224979098644774912 167 1224979098644774919 521 3 1224979098644774919 1224979098644774918 168 501 3 1224979098644774912 168 1224979098644774919 521 3 1224979098644774919 1224979098644774918 169 501 3 1224979098644774912 169 1224979098644774919 522 3 1224979098644774919 1224979098644774913 49 501 3 1224979098644774912 250 1224979098644774919 522 3 1224979098644774919 1224979098644774913 51 501 3 1224979098644774912 251 1224979098644774919 522 3 1224979098644774919 1224979098644774913 52 501 3 1224979098644774912 252 1224979098644774919 522 3 1224979098644774920 1224979098644774913 161 4 0 521 3 1224979098644774921 1224979098644774912 265 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 265 501 3 1224979098644774912 265 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 266 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 266 501 3 1224979098644774912 266 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 267 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 267 501 3 1224979098644774912 267 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 268 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 268 501 3 1224979098644774912 268 1224979098644774919 3 0 521 3 1224979098644774922 1224979098644774912 256 2110 2 1224979098644774922 5 501 3 1224979098644774912 256 1224979098644774922 1 2 263 1224979098644774914 1 2 263 1224979098644774913 1 2 267 1224979098644774912 1 2 265 1224979098644774916 4 0 30 2 1224979098644774915 0 1 2 265 1224979098644774915 3 0 6 3 1224979098644774923 18 96 132 1 1224979098644774923 2204 2 1224979098644774924 1224979098644774923 2147483679 2 1224979098644774924 1224979098644774913 541 3 1224979098644774923 260 0 1 3 144 1224979098644774923 1224979098644774913 3 0 
+ 83 21 1 1224979098644774912 22 1 1224979098644774913 2204 2 1224979098644774914 1224979098644774912 501 3 1224979098644774912 62 1224979098644774914 1620 2 1224979098644774912 1224979098644774913 521 3 1224979098644774915 1224979098644774912 7 522 3 1224979098644774916 1224979098644774913 10 501 3 1224979098644774912 7 1224979098644774916 522 3 1224979098644774917 1224979098644774913 151 1677 2 1224979098644774912 1224979098644774917 522 3 1224979098644774918 1224979098644774913 154 521 3 1224979098644774919 1224979098644774918 25 501 3 1224979098644774912 25 1224979098644774919 521 3 1224979098644774919 1224979098644774918 20 501 3 1224979098644774912 20 1224979098644774919 521 3 1224979098644774919 1224979098644774918 21 501 3 1224979098644774912 21 1224979098644774919 521 3 1224979098644774919 1224979098644774918 23 501 3 1224979098644774912 23 1224979098644774919 521 3 1224979098644774919 1224979098644774918 60 501 3 1224979098644774912 60 1224979098644774919 521 3 1224979098644774919 1224979098644774918 160 501 3 1224979098644774912 160 1224979098644774919 521 3 1224979098644774919 1224979098644774918 161 501 3 1224979098644774912 161 1224979098644774919 521 3 1224979098644774919 1224979098644774918 162 501 3 1224979098644774912 162 1224979098644774919 521 3 1224979098644774919 1224979098644774918 163 501 3 1224979098644774912 163 1224979098644774919 521 3 1224979098644774919 1224979098644774918 164 501 3 1224979098644774912 164 1224979098644774919 521 3 1224979098644774919 1224979098644774918 165 501 3 1224979098644774912 165 1224979098644774919 521 3 1224979098644774919 1224979098644774918 166 501 3 1224979098644774912 166 1224979098644774919 521 3 1224979098644774919 1224979098644774918 167 501 3 1224979098644774912 167 1224979098644774919 521 3 1224979098644774919 1224979098644774918 168 501 3 1224979098644774912 168 1224979098644774919 521 3 1224979098644774919 1224979098644774918 169 501 3 1224979098644774912 169 1224979098644774919 522 3 1224979098644774919 1224979098644774913 49 501 3 1224979098644774912 250 1224979098644774919 522 3 1224979098644774919 1224979098644774913 51 501 3 1224979098644774912 251 1224979098644774919 522 3 1224979098644774919 1224979098644774913 52 501 3 1224979098644774912 252 1224979098644774919 522 3 1224979098644774920 1224979098644774913 161 4 0 521 3 1224979098644774921 1224979098644774912 265 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 265 501 3 1224979098644774912 265 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 266 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 266 501 3 1224979098644774912 266 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 267 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 267 501 3 1224979098644774912 267 1224979098644774919 3 0 4 0 521 3 1224979098644774921 1224979098644774912 268 32 2 1224979098644774921 0 521 3 1224979098644774919 1224979098644774920 268 501 3 1224979098644774912 268 1224979098644774919 3 0 521 3 1224979098644774922 1224979098644774912 256 2110 2 1224979098644774922 5 501 3 1224979098644774912 256 1224979098644774922 1 2 263 1224979098644774914 1 2 263 1224979098644774913 1 2 267 1224979098644774912 1 2 265 1224979098644774916 4 0 30 2 1224979098644774915 0 1 2 265 1224979098644774915 3 0 
 give_center_to_lord -1
  33 23 2 1224979098644774912 1 23 2 1224979098644774913 2 23 2 1224979098644774914 3 521 3 1224979098644774915 1224979098644774912 7 2173 2 1224979098644774916 1224979098644774913 1620 2 1224979098644774912 1224979098644774916 501 3 1224979098644774912 7 1224979098644774913 1 2 265 1224979098644774913 1 2 267 1224979098644774912 1 2 263 1224979098644774916 4 0 30 2 1224979098644774915 0 1 2 265 1224979098644774915 2173 2 1224979098644774917 1224979098644774915 1 2 263 1224979098644774917 3 0 4 0 31 2 1224979098644774914 1 1073742365 3 1224979098644774912 0 3 541 3 1224979098644774912 0 2 2133 2 1224979098644774918 3 4 0 541 3 1224979098644774912 0 3 2133 2 1224979098644774918 9 3 0 6 3 1224979098644774919 0 1224979098644774918 1 2 149 1224979098644774912 3 0 6 3 1224979098644774919 0 7 2136 3 1224979098644774920 1500 2000 1673 3 1224979098644774912 1224979098644774920 0 3 0 3 0 
 cf_get_random_enemy_center -1