Hid some debug messages / cheat options behind cheat switch, removed …

…others that were useless: - "Debug: Using Scene ID XX" and "TEST: Sneak into town" now only show up when cheat/development mode is active. - removed cheat options "Go to alley", "Center reports", "Sail from port" from town menus because they didn't serve any purpose in TLD.
tldmod · Oct 14, 2017 · 469e787 · 469e787
1 parent 55ccbd4
commit 469e787
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 29 deletions.
diff --git a/ModuleSystem/module_game_menus.py b/ModuleSystem/module_game_menus.py
@@ -6332,6 +6332,7 @@
                                                    # ]),
  ]+concatenate_scripts([[	  
       ("town_sneak",[(eq, cheat_switch, 1),
+					(eq, "$cheat_mode", 1),
 					 (party_slot_eq,"$g_encountered_party", slot_party_type,spt_town),
                      (eq,"$entry_to_town_forbidden",1),
                      (eq,"$cant_sneak_into_town",0)],
@@ -7798,11 +7799,11 @@
 
 #      ("siege_leave",[(eq, "$g_defending_against_siege", 1)],"Try to break out...",[(jump_to_menu,"mnu_siege_break_out")]),#TODO: Go to Menu here.
  ]+concatenate_scripts([[ 
-     ("town_cheat_alley",[(eq, cheat_switch, 1),(party_slot_eq,"$current_town",slot_party_type, spt_town),(eq, "$cheat_mode", 1)], "CHEAT: Go to the alley.",[
-							(party_get_slot, reg(11), "$current_town", slot_town_alley),
-							(set_jump_mission,"mt_ai_training"),
-							(jump_to_scene,reg(11)),
-							(change_screen_mission)]),
+ #    ("town_cheat_alley",[(eq, cheat_switch, 1),(party_slot_eq,"$current_town",slot_party_type, spt_town),(eq, "$cheat_mode", 1)], "CHEAT: Go to the alley.",[
+#							(party_get_slot, reg(11), "$current_town", slot_town_alley),
+#							(set_jump_mission,"mt_ai_training"),
+#							(jump_to_scene,reg(11)),
+#							(change_screen_mission)]),
       ("castle_cheat_interior",[(eq, cheat_switch, 1),(eq, "$cheat_mode", 1)], "CHEAT! Interior.",[
 							(set_jump_mission,"mt_ai_training"),
 							(party_get_slot, ":castle_scene", "$current_town", slot_town_castle),
@@ -7843,17 +7844,17 @@
 				   [   (assign,"$g_player_besiege_town","$g_encountered_party"),
 					   (jump_to_menu, "mnu_castle_besiege"),
 					   ]),
-      ("center_reports",[(eq, "$cheat_mode", 1),], "CHEAT: Show reports.",
-						[(jump_to_menu,"mnu_center_reports")]),
-      ("sail_from_port",[(eq, cheat_switch, 1),(party_slot_eq,"$current_town",slot_party_type, spt_town),(eq, "$cheat_mode", 1),#(party_slot_eq,"$current_town",slot_town_near_shore, 1),
-                        ], "CHEAT: Sail from port.",
-						[(assign, "$g_player_icon_state", pis_ship),
-						(party_set_flags, "p_main_party", pf_is_ship, 1),
-						(party_get_position, pos1, "p_main_party"),
-						(map_get_water_position_around_position, pos2, pos1, 6),
-						(party_set_position, "p_main_party", pos2),
-						(assign, "$g_main_ship_party", -1),
-						(change_screen_return)]),
+#      ("center_reports",[(eq, "$cheat_mode", 1),], "CHEAT: Show reports.",
+#						[(jump_to_menu,"mnu_center_reports")]),
+#    ("sail_from_port",[(eq, cheat_switch, 1),(party_slot_eq,"$current_town",slot_party_type, spt_town),(eq, "$cheat_mode", 1),#(party_slot_eq,"$current_town",slot_town_near_shore, 1),
+#                       ], "CHEAT: Sail from port.",
+#						[(assign, "$g_player_icon_state", pis_ship),
+#						(party_set_flags, "p_main_party", pf_is_ship, 1),
+#						(party_get_position, pos1, "p_main_party"),
+#						(map_get_water_position_around_position, pos2, pos1, 6),
+#						(party_set_position, "p_main_party", pos2),
+#						(assign, "$g_main_ship_party", -1),
+#						(change_screen_return)]),
  ] for ct in range(cheat_switch)])+[
 
  ]+concatenate_scripts([[ 

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -10630,7 +10630,10 @@ def set_item_score():
 			(try_end),
 		(try_end),
 	(try_end),
-	(assign, reg10,":scene_to_use"), (display_message,"@debug: using scene ID N. {reg10}"),
+	(try_begin),
+		(eq, "$cheat_mode", 1),
+		(assign, reg10,":scene_to_use"), (display_message,"@debug: using scene ID N. {reg10}"),
+	(try_end),
 	(jump_to_scene,":scene_to_use"),
 
 ]),

diff --git a/_wb/menus.txt b/_wb/menus.txt
diff --git a/_wb/scripts.txt b/_wb/scripts.txt
@@ -367,7 +367,7 @@ tld_party_relocate_near_party -1
 region_get_faction -1
  53 21 1 1224979098644774912 22 1 1224979098644774913 4 0 31 2 1224979098644774912 20 30 2 1224979098644774913 1 2133 2 72057594037927937 19 5 0 33 3 1224979098644774912 7 9 30 2 1224979098644774913 1 2133 2 72057594037927937 6 5 0 31 2 1224979098644774912 9 30 2 1224979098644774913 1 2133 2 72057594037927937 12 5 0 31 2 1224979098644774912 2 30 2 1224979098644774913 1 2133 2 72057594037927937 15 5 0 33 3 1224979098644774912 0 13 2133 2 72057594037927937 3 5 0 33 3 1224979098644774912 13 21 2133 2 72057594037927937 5 5 0 31 2 1224979098644774912 24 2133 2 72057594037927937 7 5 0 31 2 1224979098644774912 32 2133 2 72057594037927937 8 5 0 31 2 1224979098644774912 34 2133 2 72057594037927937 10 5 0 31 2 1224979098644774912 26 2133 2 72057594037927937 14 5 0 31 2 1224979098644774912 35 2133 2 72057594037927937 17 5 0 31 2 1224979098644774912 39 2133 2 72057594037927937 16 5 0 31 2 1224979098644774912 40 2133 2 72057594037927937 11 5 0 1073741855 2 1224979098644774912 38 1073741855 2 1224979098644774912 27 31 2 1224979098644774912 30 2133 2 72057594037927937 6 5 0 2133 2 72057594037927937 -1 3 0 
 jump_to_random_scene -1
- 276 23 2 1224979098644774912 1 23 2 1224979098644774913 2 23 2 1224979098644774914 3 2133 2 1224979098644774915 0 4 0 2147483678 2 144115188075855980 70 2133 2 1224979098644774915 1 5 0 2147483678 2 144115188075856313 30 2133 2 1224979098644774915 1 3 0 2133 2 1224979098644774916 -1 2133 2 1224979098644774917 -1 2133 2 144115188075856058 221 2133 2 144115188075856059 221 4 0 31 2 1224979098644774914 76 2133 2 1224979098644774917 253 5 0 31 2 1224979098644774914 18 2133 2 1224979098644774917 251 5 0 31 2 1224979098644774914 31 2136 3 1224979098644774917 319 321 5 0 31 2 1224979098644774914 33 2133 2 1224979098644774917 339 5 0 31 2 1224979098644774912 18 2136 3 1224979098644774917 321 323 5 0 31 2 1224979098644774914 21 2133 2 1224979098644774916 3 2136 3 1224979098644774917 323 325 5 0 31 2 1224979098644774914 38 2136 3 1224979098644774917 325 327 2133 2 144115188075856058 225 2133 2 144115188075856059 225 5 0 31 2 1224979098644774914 65 2136 3 1224979098644774917 327 329 2133 2 144115188075856058 217 2133 2 144115188075856059 217 5 0 31 2 1224979098644774914 55 2136 3 1224979098644774917 329 331 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 56 2136 3 1224979098644774917 331 333 5 0 31 2 1224979098644774912 39 2133 2 1224979098644774916 9 2133 2 1224979098644774917 333 5 0 31 2 1224979098644774914 59 2133 2 1224979098644774916 2 2136 3 1224979098644774917 336 338 5 0 31 2 1224979098644774912 40 2133 2 1224979098644774916 2 2133 2 1224979098644774917 338 5 0 1073741855 2 1224979098644774914 27 31 2 1224979098644774914 41 2136 3 1224979098644774918 0 4 4 0 31 2 1224979098644774918 0 2133 2 1224979098644774917 287 5 0 31 2 1224979098644774918 1 2133 2 1224979098644774917 316 5 0 31 2 1224979098644774918 2 2133 2 1224979098644774917 317 5 0 2133 2 1224979098644774917 318 3 0 5 0 1073741855 2 1224979098644774914 20 1073741855 2 1224979098644774914 24 31 2 1224979098644774914 63 2136 3 1224979098644774918 0 4 4 0 31 2 1224979098644774918 0 2133 2 1224979098644774917 344 5 0 31 2 1224979098644774918 1 2133 2 1224979098644774917 345 5 0 31 2 1224979098644774918 2 2133 2 1224979098644774916 3 2133 2 1224979098644774917 346 5 0 2133 2 1224979098644774916 3 2133 2 1224979098644774917 346 3 0 5 0 31 2 1224979098644774912 1 2136 3 1224979098644774918 1 100 4 0 33 3 1224979098644774918 1 10 2133 2 1224979098644774917 340 5 0 33 3 1224979098644774918 10 20 2133 2 1224979098644774917 341 5 0 33 3 1224979098644774918 20 30 2133 2 1224979098644774917 342 5 0 33 3 1224979098644774918 30 40 2133 2 1224979098644774917 343 5 0 33 3 1224979098644774918 40 45 2133 2 1224979098644774917 350 5 0 33 3 1224979098644774918 45 50 2133 2 1224979098644774917 351 5 0 33 3 1224979098644774918 50 55 2133 2 1224979098644774917 352 5 0 33 3 1224979098644774918 55 60 2133 2 1224979098644774917 353 5 0 2133 2 1224979098644774916 3 3 0 5 0 31 2 1224979098644774912 0 2136 3 1224979098644774917 348 350 5 0 31 2 1224979098644774914 43 2133 2 1224979098644774916 2 2133 2 1224979098644774917 252 5 0 31 2 1224979098644774914 99 2133 2 1224979098644774917 17 5 0 33 3 1224979098644774914 102 109 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 237 1224979098644774919 2133 2 144115188075856059 231 5 0 33 3 1224979098644774914 109 119 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 240 1224979098644774919 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 1001 2133 2 1224979098644774916 2 2133 2 1224979098644774917 255 5 0 31 2 1224979098644774914 1002 2133 2 1224979098644774917 254 5 0 31 2 1224979098644774912 23 2133 2 1224979098644774917 161 2133 2 144115188075856058 230 2133 2 144115188075856059 230 5 0 1073741855 2 1224979098644774912 11 31 2 1224979098644774912 10 2136 3 1224979098644774917 225 228 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 32 2136 3 1224979098644774917 215 220 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 25 2136 3 1224979098644774917 205 210 2133 2 144115188075856058 233 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 34 36 2136 3 1224979098644774917 220 225 2133 2 144115188075856058 217 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 7 10 2136 3 72057594037927937 0 5 4 0 2147483678 2 72057594037927937 3 2136 3 1224979098644774917 210 215 5 0 2133 2 1224979098644774916 10 3 0 2133 2 144115188075856059 231 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 0 13 2133 2 1224979098644774916 11 2133 2 1224979098644774917 13 2133 2 144115188075856058 232 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 13 18 2133 2 1224979098644774916 11 2133 2 1224979098644774917 12 2133 2 144115188075856058 232 5 0 33 3 1224979098644774913 9 14 2133 2 1224979098644774916 11 2133 2 1224979098644774917 15 2133 2 144115188075856058 232 5 0 33 3 1224979098644774912 0 13 2136 3 1224979098644774918 1 100 4 0 33 3 1224979098644774918 0 5 2133 2 1224979098644774917 350 5 0 33 3 1224979098644774918 5 10 2133 2 1224979098644774917 351 5 0 33 3 1224979098644774918 10 15 2133 2 1224979098644774917 352 5 0 33 3 1224979098644774918 15 20 2133 2 1224979098644774917 353 5 0 2133 2 1224979098644774916 3 3 0 5 0 1073741857 3 1224979098644774912 28 30 1073741855 2 1224979098644774912 27 31 2 1224979098644774912 26 2133 2 1224979098644774916 5 5 0 1073741855 2 1224979098644774912 19 1073741855 2 1224979098644774912 30 33 3 1224979098644774912 13 21 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 31 31 2 1224979098644774912 37 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 21 31 2 1224979098644774912 22 2133 2 1224979098644774916 4 5 0 2133 2 1224979098644774916 2 3 0 4 0 32 2 1224979098644774916 -1 4 0 32 2 1224979098644774916 5 2106 2 1224979098644774916 4 3 0 4 0 2147483679 2 144115188075856318 1 2133 2 144115188075856318 1 1623 3 170 0 0 3 0 2136 3 1224979098644774920 1 5 2120 3 72057594037927946 171 1224979098644774916 1623 3 0 72057594037927946 1224979098644774920 4 0 31 2 1224979098644774917 -1 2120 3 1224979098644774917 1224979098644774916 2 2106 2 1224979098644774917 2 4 0 31 2 1224979098644774915 1 2147483680 2 1224979098644774916 5 2105 2 1224979098644774917 12 2106 2 1224979098644774917 2 3 0 3 0 3 0 2133 2 72057594037927946 1224979098644774917 1106 1 1585267068834414926 1910 1 1224979098644774917 
+ 279 23 2 1224979098644774912 1 23 2 1224979098644774913 2 23 2 1224979098644774914 3 2133 2 1224979098644774915 0 4 0 2147483678 2 144115188075855980 70 2133 2 1224979098644774915 1 5 0 2147483678 2 144115188075856313 30 2133 2 1224979098644774915 1 3 0 2133 2 1224979098644774916 -1 2133 2 1224979098644774917 -1 2133 2 144115188075856058 221 2133 2 144115188075856059 221 4 0 31 2 1224979098644774914 76 2133 2 1224979098644774917 253 5 0 31 2 1224979098644774914 18 2133 2 1224979098644774917 251 5 0 31 2 1224979098644774914 31 2136 3 1224979098644774917 319 321 5 0 31 2 1224979098644774914 33 2133 2 1224979098644774917 339 5 0 31 2 1224979098644774912 18 2136 3 1224979098644774917 321 323 5 0 31 2 1224979098644774914 21 2133 2 1224979098644774916 3 2136 3 1224979098644774917 323 325 5 0 31 2 1224979098644774914 38 2136 3 1224979098644774917 325 327 2133 2 144115188075856058 225 2133 2 144115188075856059 225 5 0 31 2 1224979098644774914 65 2136 3 1224979098644774917 327 329 2133 2 144115188075856058 217 2133 2 144115188075856059 217 5 0 31 2 1224979098644774914 55 2136 3 1224979098644774917 329 331 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 56 2136 3 1224979098644774917 331 333 5 0 31 2 1224979098644774912 39 2133 2 1224979098644774916 9 2133 2 1224979098644774917 333 5 0 31 2 1224979098644774914 59 2133 2 1224979098644774916 2 2136 3 1224979098644774917 336 338 5 0 31 2 1224979098644774912 40 2133 2 1224979098644774916 2 2133 2 1224979098644774917 338 5 0 1073741855 2 1224979098644774914 27 31 2 1224979098644774914 41 2136 3 1224979098644774918 0 4 4 0 31 2 1224979098644774918 0 2133 2 1224979098644774917 287 5 0 31 2 1224979098644774918 1 2133 2 1224979098644774917 316 5 0 31 2 1224979098644774918 2 2133 2 1224979098644774917 317 5 0 2133 2 1224979098644774917 318 3 0 5 0 1073741855 2 1224979098644774914 20 1073741855 2 1224979098644774914 24 31 2 1224979098644774914 63 2136 3 1224979098644774918 0 4 4 0 31 2 1224979098644774918 0 2133 2 1224979098644774917 344 5 0 31 2 1224979098644774918 1 2133 2 1224979098644774917 345 5 0 31 2 1224979098644774918 2 2133 2 1224979098644774916 3 2133 2 1224979098644774917 346 5 0 2133 2 1224979098644774916 3 2133 2 1224979098644774917 346 3 0 5 0 31 2 1224979098644774912 1 2136 3 1224979098644774918 1 100 4 0 33 3 1224979098644774918 1 10 2133 2 1224979098644774917 340 5 0 33 3 1224979098644774918 10 20 2133 2 1224979098644774917 341 5 0 33 3 1224979098644774918 20 30 2133 2 1224979098644774917 342 5 0 33 3 1224979098644774918 30 40 2133 2 1224979098644774917 343 5 0 33 3 1224979098644774918 40 45 2133 2 1224979098644774917 350 5 0 33 3 1224979098644774918 45 50 2133 2 1224979098644774917 351 5 0 33 3 1224979098644774918 50 55 2133 2 1224979098644774917 352 5 0 33 3 1224979098644774918 55 60 2133 2 1224979098644774917 353 5 0 2133 2 1224979098644774916 3 3 0 5 0 31 2 1224979098644774912 0 2136 3 1224979098644774917 348 350 5 0 31 2 1224979098644774914 43 2133 2 1224979098644774916 2 2133 2 1224979098644774917 252 5 0 31 2 1224979098644774914 99 2133 2 1224979098644774917 17 5 0 33 3 1224979098644774914 102 109 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 237 1224979098644774919 2133 2 144115188075856059 231 5 0 33 3 1224979098644774914 109 119 2119 3 1224979098644774919 1224979098644774914 3 2120 3 1224979098644774917 240 1224979098644774919 2133 2 144115188075856059 231 5 0 31 2 1224979098644774914 1001 2133 2 1224979098644774916 2 2133 2 1224979098644774917 255 5 0 31 2 1224979098644774914 1002 2133 2 1224979098644774917 254 5 0 31 2 1224979098644774912 23 2133 2 1224979098644774917 161 2133 2 144115188075856058 230 2133 2 144115188075856059 230 5 0 1073741855 2 1224979098644774912 11 31 2 1224979098644774912 10 2136 3 1224979098644774917 225 228 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 32 2136 3 1224979098644774917 215 220 2133 2 144115188075856058 232 2133 2 144115188075856059 231 5 0 31 2 1224979098644774912 25 2136 3 1224979098644774917 205 210 2133 2 144115188075856058 233 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 34 36 2136 3 1224979098644774917 220 225 2133 2 144115188075856058 217 2133 2 144115188075856059 231 5 0 33 3 1224979098644774912 7 10 2136 3 72057594037927937 0 5 4 0 2147483678 2 72057594037927937 3 2136 3 1224979098644774917 210 215 5 0 2133 2 1224979098644774916 10 3 0 2133 2 144115188075856059 231 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 0 13 2133 2 1224979098644774916 11 2133 2 1224979098644774917 13 2133 2 144115188075856058 232 5 0 33 3 1224979098644774913 9 14 33 3 1224979098644774912 13 18 2133 2 1224979098644774916 11 2133 2 1224979098644774917 12 2133 2 144115188075856058 232 5 0 33 3 1224979098644774913 9 14 2133 2 1224979098644774916 11 2133 2 1224979098644774917 15 2133 2 144115188075856058 232 5 0 33 3 1224979098644774912 0 13 2136 3 1224979098644774918 1 100 4 0 33 3 1224979098644774918 0 5 2133 2 1224979098644774917 350 5 0 33 3 1224979098644774918 5 10 2133 2 1224979098644774917 351 5 0 33 3 1224979098644774918 10 15 2133 2 1224979098644774917 352 5 0 33 3 1224979098644774918 15 20 2133 2 1224979098644774917 353 5 0 2133 2 1224979098644774916 3 3 0 5 0 1073741857 3 1224979098644774912 28 30 1073741855 2 1224979098644774912 27 31 2 1224979098644774912 26 2133 2 1224979098644774916 5 5 0 1073741855 2 1224979098644774912 19 1073741855 2 1224979098644774912 30 33 3 1224979098644774912 13 21 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 31 31 2 1224979098644774912 37 2133 2 1224979098644774916 2 5 0 1073741855 2 1224979098644774912 21 31 2 1224979098644774912 22 2133 2 1224979098644774916 4 5 0 2133 2 1224979098644774916 2 3 0 4 0 32 2 1224979098644774916 -1 4 0 32 2 1224979098644774916 5 2106 2 1224979098644774916 4 3 0 4 0 2147483679 2 144115188075856318 1 2133 2 144115188075856318 1 1623 3 170 0 0 3 0 2136 3 1224979098644774920 1 5 2120 3 72057594037927946 171 1224979098644774916 1623 3 0 72057594037927946 1224979098644774920 4 0 31 2 1224979098644774917 -1 2120 3 1224979098644774917 1224979098644774916 2 2106 2 1224979098644774917 2 4 0 31 2 1224979098644774915 1 2147483680 2 1224979098644774916 5 2105 2 1224979098644774917 12 2106 2 1224979098644774917 2 3 0 3 0 3 0 4 0 31 2 144115188075855982 1 2133 2 72057594037927946 1224979098644774917 1106 1 1585267068834414926 3 0 1910 1 1224979098644774917 
 maybe_relocate_player_from_z0 -1
  5 4 0 31 2 144115188075856318 1 2133 2 144115188075856318 0 1623 3 0 170 0 3 0 
 enter_dungeon -1

diff --git a/_wb/variable_uses.txt b/_wb/variable_uses.txt
@@ -108,7 +108,7 @@
 10
 1
 1
-92
+91
 19
 5
 6
@@ -155,7 +155,7 @@
 5
 6
 2
-215
+212
 14
 13
 8