*Add Camera Preference Menu Option + Hide some WB only Menus

- Was playing as Dwarf the other day, and was annoyed I had to keep changing my camera every battle, so I added a Camera preference option :) - Upped the # of combatants in Custom Battles, cause why not.
tldmod · Nov 13, 2017 · 6c7eba0 · 6c7eba0
1 parent e191a69
commit 6c7eba0
Show file tree

Hide file tree

Showing 17 changed files with 522 additions and 497 deletions.
diff --git a/ModuleSystem/module_game_menus.py b/ModuleSystem/module_game_menus.py
diff --git a/ModuleSystem/module_mission_templates.py b/ModuleSystem/module_mission_templates.py
@@ -84,7 +84,7 @@
     (gt,                  "$cam_current_agent", -1)
   ],
   [
-    (assign, "$cam_mode",   0),
+    (assign, "$cam_mode",   "$pref_cam_mode"),
     (assign, "$shoot_mode", 0),
     (assign, "$cam_free",   0)
   ]),

diff --git a/ModuleSystem/module_mission_templates_TLD_wb.py b/ModuleSystem/module_mission_templates_TLD_wb.py
@@ -1048,7 +1048,10 @@
 
       (agent_get_team, ":agent1_team", ":agent1"),
 
-      (try_for_agents, ":agent2"),
+      (set_fixed_point_multiplier, 100),
+      (agent_get_position, pos19, ":agent1"),
+
+      (try_for_agents, ":agent2", pos19, 100),
         (neq, ":agent1", ":agent2"),
         (agent_is_active, ":agent2"),
         (agent_is_alive, ":agent2"),
@@ -1310,7 +1313,7 @@
             (agent_get_troop_id, ":troop_id", ":agent_no"),
             (store_skill_level, ":horse_archery_level", "skl_horse_archery", ":troop_id"),
             (ge, ":horse_archery_level", 4),
-            
+
             (neg|agent_slot_eq, ":agent_no", 1003, 1),
             (agent_get_horse, ":horse_no", ":agent_no"),
             (assign, ":melee_weapon", -1),

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -1892,12 +1892,6 @@ def set_item_score():
 	(assign, "$show_mount_ko_message",1),#Kham - Show Horse KO Message - Player Damage Only by default
 	(assign, "$dormant_spawn_radius", 1), #Kham - Dormant Spawn Radius initialize
 	(assign, "$tld_player_level_to_begin_war",8), #Kham - Custom Level to Start the War
-	(assign, "$bright_nights",1), #Kham - Brighter Nights
-	(assign, "$field_ai_lord",1), #Kham - Battlefield Lord AI
-	(assign, "$field_ai_horse_archer",1), #Kham - Battlefield Horse Archer AI
-	(assign, "$field_ai_archer_aim",1), #Kham - Battlefield Archer Aim
-	(assign, "$advanced_siege_ai",1), #Kham - Advanced Siege AI - default is ON
-
 
 
 	#(try_for_range, ":beacon", "p_amon_din", "p_spawn_points_end"),
@@ -1915,6 +1909,16 @@ def set_item_score():
 
 	] + (is_a_wb_script==1 and [
 
+	#Init WB Only globals
+
+	(assign, "$bright_nights",1), #Kham - Brighter Nights
+	(assign, "$field_ai_lord",1), #Kham - Battlefield Lord AI
+	(assign, "$field_ai_horse_archer",1), #Kham - Battlefield Horse Archer AI
+	(assign, "$field_ai_archer_aim",1), #Kham - Battlefield Archer Aim
+	(assign, "$advanced_siege_ai",1), #Kham - Advanced Siege AI - default is ON
+	(assign, "$pref_cam_mode", 0), #Kham - Camera Preference - Default is Default
+
+
 	#Custom Camera Initialize	
 	(call_script, "script_init_camera"),	
 
@@ -13522,6 +13526,7 @@ def set_item_score():
     (position_transform_position_to_local, pos3, pos2, pos1),
     (position_get_x, ":agent_x_pos", pos3),
     (position_get_y, ":agent_y_pos", pos3),
+    (val_max, "$g_battle_map_scale", 1), #MV defensive fix to avoid division by zero
     (val_div, ":agent_x_pos", "$g_battle_map_scale"),
     (val_div, ":agent_y_pos", "$g_battle_map_scale"),
     (set_fixed_point_multiplier, 1000),

diff --git a/ModuleSystem/variables_wb.txt b/ModuleSystem/variables_wb.txt
@@ -739,3 +739,4 @@ qst_refugee_party_1_killed
 qst_refugee_party_2_killed
 qst_refugee_party_3_killed
 qst_reinforcement_party
+pref_cam_mode
diff --git a/_wb/conversation.txt b/_wb/conversation.txt
diff --git a/_wb/menus.txt b/_wb/menus.txt
diff --git a/_wb/mission_templates.txt b/_wb/mission_templates.txt
diff --git a/_wb/quick_strings.txt b/_wb/quick_strings.txt
@@ -1,4 +1,4 @@
-1459
+1460
 qstr_Received_{reg0}_dama Received_{reg0}_damage.
 qstr_Siege_Weapon_damaged Siege_Weapon_damaged_{reg10}_agents
 qstr_Gate_is_breached! Gate_is_breached!
@@ -860,6 +860,7 @@ qstr_Native Native
 qstr_All_messages All_messages
 qstr_Player_damage_only Player_damage_only
 qstr_No_Messages No_Messages
+qstr_Fixed_Over_The_Shoul Fixed_Over-The-Shoulder_Camera
 qstr_{reg0}__will_most_li {reg0}_(will_most_likely_cause_save_crashes)
 qstr_{reg0}__could_possib {reg0}_(could_possibly_cause_save_crashes)
 qstr_Normal Normal

diff --git a/_wb/scripts.txt b/_wb/scripts.txt
diff --git a/_wb/simple_triggers.txt b/_wb/simple_triggers.txt
diff --git a/_wb/triggers.txt b/_wb/triggers.txt
diff --git a/_wb/variable_uses.txt b/_wb/variable_uses.txt
@@ -739,3 +739,4 @@
 1
 1
 13
+33
diff --git a/_wb/variables.txt b/_wb/variables.txt
@@ -739,3 +739,4 @@ qst_refugee_party_1_killed
 qst_refugee_party_2_killed
 qst_refugee_party_3_killed
 qst_reinforcement_party
+pref_cam_mode
diff --git a/menus.txt b/menus.txt
diff --git a/scripts.txt b/scripts.txt
diff --git a/variable_uses.txt b/variable_uses.txt
@@ -684,7 +684,7 @@
 3
 2
 5
-3
+0
 3
 3
 3