* Squelch compiler warnings cause I was publicly shamed on TW modding…

… discord
tldmod · Oct 9, 2018 · 646cc75 · 646cc75
1 parent de81c87
commit 646cc75
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 19 deletions.
diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -1896,7 +1896,17 @@ def set_item_score():
 	(assign, "$FormAI_AI_no_defense",0), #Kham - FormAI - don't allow AI Defensive
 	(party_set_slot, "p_main_party", slot_party_number_following_player, 0),
 
+	#Kham - Squelch compiler warnings
+	(assign, "$battle_renown_total", 0), 
+	(assign, "$hold_f1", 0),  
+	(assign, "$dormant_spawn_radius", 0), 
 
+	(val_mul, "$battle_renown_total", "$hold_f1"),
+	(val_mul, "$battle_renown_total", "$dormant_spawn_radius"),
+	(val_mul, "$hold_f1", "$battle_renown_total"),
+
+	#Kham - Squelch compiler warnings END
+
 	#(try_for_range, ":beacon", "p_amon_din", "p_spawn_points_end"),
 	#	(set_position_delta, -3.0,6.0,65.0),
 	#	(party_add_particle_system, ":beacon", "psys_lamp_fire"),
@@ -2013,6 +2023,22 @@ def set_item_score():
    	(assign, "$g_wp_ai_hr_active", 1),       	  # Set to 0 to prevent AI regeneration.  1 to activate.
 
 	] or []) + [
+
+	#Squelch MB 1.011 Compiler Warnings
+	] + ((not is_a_wb_script==1) and [
+
+	(assign, "$bright_nights", 1),
+	(assign, "$show_key_binds_toggle", 0),
+	(assign, "$g_last_archery_point_earned", 0),
+	(assign, "$tutorial_num_total_dummies_destroyed", 0),
+
+	(val_add, "$bright_nights", "$show_key_binds_toggle"),
+	(val_add, "$g_last_archery_point_earned", "$show_key_binds_toggle"),
+	(val_add, "$show_key_binds_toggle", "$bright_nights"),
+	(val_add, "$tutorial_num_total_dummies_destroyed", "$g_last_archery_point_earned"),
+
+	] or []) + [
+	#Squelch MB 1.011 Compiler Warnings END
 ]),    
 
 # script_refresh_volunteers_in_town (mtarini and others)
@@ -26158,7 +26184,8 @@ def set_item_score():
       (cur_tableau_clear_override_items),
       #(troop_get_inventory_slot, ":armor", ":troop_no", ek_body),
       (assign, ":flags", 0),
-
+      (assign, ":troop_no", ":troop_no"),
+
       #(try_begin),
       #  (gt, ":armor", itm_no_item),
       #  (item_has_property, ":armor", itp_replaces_helm),

diff --git a/ModuleSystem/module_scripts_form.py b/ModuleSystem/module_scripts_form.py
@@ -5850,6 +5850,9 @@
     [
       	(store_script_param, ":order_no", 1),
       	(store_script_param, ":agent_no", 2),
+
+      	(assign, ":agent_no", ":agent_no"),
+
 	(try_begin),
 		(eq|this_or_next, ":order_no", mordr_dismount),
 		(eq|this_or_next, ":order_no", mordr_charge),

diff --git a/ModuleSystem/variables.txt b/ModuleSystem/variables.txt
@@ -740,3 +740,6 @@ mouse_coordinates
 intro_presentation_stage
 g_presentation_obj_item_select_2
 g_presentation_obj_item_select_3
+hold_f1
+g_last_archery_point_earned
+tutorial_num_total_dummies_destroyed
diff --git a/_wb/scripts.txt b/_wb/scripts.txt
diff --git a/_wb/variable_uses.txt b/_wb/variable_uses.txt
@@ -633,7 +633,7 @@
 1
 2
 11
-0
+1
 5
 1
 4
@@ -659,7 +659,7 @@
 15
 15
 30
-0
+1
 1
 5
 5
@@ -705,7 +705,7 @@
 3
 10
 114
-0
+1
 11
 3
 3

diff --git a/scene_props.txt b/scene_props.txt
@@ -503,11 +503,11 @@ spr_archery_butt_a 0 0 archery_butt bo_archery_butt 1
 
 
 spr_archery_target_with_hit_a 0 0 arena_archery_target_a bo_arena_archery_target_a 1
--42  24 2071 1 1224979098644774912 1850 2 2 1224979098644774912 1700 1 1224979098644774913 1710 2 3 1224979098644774913 710 3 1224979098644774914 3 2 716 3 4 2 1 730 2 4 0 729 2 2 0 730 2 2 0 731 2 2 0 710 3 1224979098644774915 4 2 2133 2 1224979098644774916 43 2106 2 1224979098644774916 1224979098644774915 2107 2 1224979098644774916 1299 2108 2 1224979098644774916 4300 4 0 2147483678 2 1224979098644774916 0 2133 2 1224979098644774916 0 3 0 2108 2 1224979098644774914 91 2133 2 144115188075856614 1224979098644774916 2133 2 72057594037927996 1224979098644774916 2133 2 72057594037927997 1224979098644774914 1106 1 216172782113783920 
+-42  24 2071 1 1224979098644774912 1850 2 2 1224979098644774912 1700 1 1224979098644774913 1710 2 3 1224979098644774913 710 3 1224979098644774914 3 2 716 3 4 2 1 730 2 4 0 729 2 2 0 730 2 2 0 731 2 2 0 710 3 1224979098644774915 4 2 2133 2 1224979098644774916 43 2106 2 1224979098644774916 1224979098644774915 2107 2 1224979098644774916 1299 2108 2 1224979098644774916 4300 4 0 2147483678 2 1224979098644774916 0 2133 2 1224979098644774916 0 3 0 2108 2 1224979098644774914 91 2133 2 144115188075856615 1224979098644774916 2133 2 72057594037927996 1224979098644774916 2133 2 72057594037927997 1224979098644774914 1106 1 216172782113783920 
 
 
 spr_dummy_a 98304 0 arena_archery_target_b bo_arena_archery_target_b 2
--43  13 2071 1 1224979098644774912 1851 2 1 1224979098644774912 1700 1 1224979098644774913 1710 2 2 1224979098644774913 2133 2 1224979098644774914 80 4 0 713 2 2 1 2107 2 1224979098644774914 -1 3 0 723 2 1 1224979098644774914 1860 3 1224979098644774912 1 70 2105 2 144115188075856615 1 600 1 142 
+-43  13 2071 1 1224979098644774912 1851 2 1 1224979098644774912 1700 1 1224979098644774913 1710 2 2 1224979098644774913 2133 2 1224979098644774914 80 4 0 713 2 2 1 2107 2 1224979098644774914 -1 3 0 723 2 1 1224979098644774914 1860 3 1224979098644774912 1 70 2105 2 144115188075856616 1 600 1 142 
 -42  17 2071 1 1224979098644774912 2072 1 1224979098644774913 2133 2 72057594037927996 1224979098644774913 2108 2 1224979098644774913 8 1850 2 2 1224979098644774912 1700 1 1224979098644774914 1710 2 3 1224979098644774914 4 0 713 2 3 2 2107 2 1224979098644774913 -1 3 0 723 2 2 1224979098644774913 1106 1 216172782113783919 1860 3 1224979098644774912 2 30 600 1 141 1969 3 29 1 3 1969 3 30 1 10 
 
 

diff --git a/scripts.txt b/scripts.txt
diff --git a/variable_uses.txt b/variable_uses.txt
@@ -633,7 +633,7 @@
 1
 2
 11
-0
+1
 4
 1
 4
@@ -679,12 +679,12 @@
 3
 10
 3
-0
+1
 10
 3
 2
 7
-0
+1
 3
 3
 3
@@ -730,7 +730,7 @@
 2
 3
 3
-0
+2
 25
 33
 25
@@ -740,5 +740,6 @@
 8
 15
 21
-0
-0
+1
+2
+1
diff --git a/variables.txt b/variables.txt
@@ -740,5 +740,6 @@ mouse_coordinates
 intro_presentation_stage
 g_presentation_obj_item_select_2
 g_presentation_obj_item_select_3
-$g_last_archery_point_earned
-$tutorial_num_total_dummies_destroyed
+hold_f1
+g_last_archery_point_earned
+tutorial_num_total_dummies_destroyed