*attempt fix to horse archer ai

tldmod · Sep 18, 2017 · 509e084 · 509e084
1 parent f46cca9
commit 509e084
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 69 deletions.
diff --git a/ModuleSystem/module_mission_templates.py b/ModuleSystem/module_mission_templates.py
@@ -501,13 +501,19 @@
       (store_trigger_param_1, ":agent"),
 
       (agent_get_troop_id, ":agent_trp",":agent"),
-      (eq, ":agent_trp", "trp_dunnish_wolf_guard"),
+      (this_or_next|eq, ":agent_trp", "trp_dunnish_wolf_guard"),
+      (eq, ":agent_trp", "trp_npc17"),
 
       (set_fixed_point_multiplier, 100),
       (agent_get_position, pos1, ":agent"),
       (position_move_x, pos1, 150),
       (set_spawn_position, pos1),
-      (spawn_agent, "trp_wolf"),
+      (try_begin),
+        (eq, ":agent_trp", "trp_npc17"),
+        (spawn_agent, "trp_bear"),
+      (else_try),
+        (spawn_agent, "trp_wolf"),
+      (try_end),
       (assign, ":animal", reg0),
       (assign, "$animal_is_present", 1),
       (agent_add_relation_with_agent, ":agent", ":animal", 0),
@@ -528,7 +534,8 @@
     [
       (try_for_agents, ":agent"),
         (agent_get_troop_id, ":agent_trp",":agent"),
-        (eq, ":agent_trp", "trp_wolf"),
+        (this_or_next|eq, ":agent_trp", "trp_wolf"),
+        (eq, ":agent_trp", "trp_bear"),
         (agent_is_active, ":agent_trp"),
         (agent_is_alive,  ":agent_trp"),
         (get_player_agent_no, ":player_agent"),

diff --git a/ModuleSystem/module_mission_templates_TLD_wb.py b/ModuleSystem/module_mission_templates_TLD_wb.py
@@ -1306,6 +1306,7 @@
             (agent_is_alive, ":agent_no"),
             (agent_is_human, ":agent_no"),
             (agent_is_non_player, ":agent_no"),
+            (agent_slot_ge, ":agent_no", slot_agent_horsebow, 1),
             (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
@@ -7463,6 +7463,7 @@ def set_item_score():
       (assign, ":dist", 0),
       (store_faction_of_party, ":faction_no", ":party_no"),
       (try_for_range, ":cur_center", centers_begin, centers_end),
+      	(neq, ":cur_center", "p_town_henneth_annun"), #Don't allow Henneth Annun to be a target of quests - Kham
         (party_is_active, ":cur_center"), #TLD
 		(party_slot_eq, ":cur_center", slot_center_destroyed, 0), # TLD
         (store_faction_of_party, ":cur_faction", ":cur_center"),

diff --git a/_wb/mission_templates.txt b/_wb/mission_templates.txt
diff --git a/_wb/module.ini b/_wb/module.ini
@@ -74,7 +74,6 @@ has_singleplayer = 1
 has_multiplayer = 0
 can_run_faster_with_skills = 1 # should agility/skill affect running speed
 can_crouch = 1
-use_advanced_formation = 0
 ##Kham Changes End (VC)
 
 ########this section modified for Realistic Combat Model

diff --git a/_wb/scene_props.txt b/_wb/scene_props.txt
@@ -4991,6 +4991,9 @@ spr_orc_gate_destructible 32768 1500 orc_gate_destructible bo_orc_gate_destructi
 -42  5 600 1 141 1969 3 29 1 3 1969 3 30 1 10 1780 2 1 39 1711 2 144115188075856128 1 
 
 
+spr_rope_bridge 0 0 rope_bridge_new bo_rope_bridge_new 0
+
+
 spr_tree_shelter 0 0 tree_shelter_a bo_tree_shelter_a 0
 
 
@@ -5003,9 +5006,6 @@ spr_rock_bridge 0 0 rock_bridge_a bo_rock_bridge_a 0
 spr_suspension_bridge 0 0 suspension_bridge_a bo_suspension_bridge_a 0
 
 
-spr_rope_bridge 0 0 rope_bridge_15m bo_rope_bridge_15m 0
-
-
 spr_arabian_tent_umbar 0 0 arabian_tent_umbar bo_arabian_tent 0
 
 

diff --git a/_wb/scripts.txt b/_wb/scripts.txt
diff --git a/scripts.txt b/scripts.txt