* Allow lancers to be commanded to use side-arms + Add DM's Nazgul Mesh

tldmod · Mar 16, 2018 · 6e0c534 · 6e0c534
1 parent 6ba6144
commit 6e0c534
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 17 deletions.
diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
@@ -1265,7 +1265,11 @@ def heraldic(item_tableau):
 ["far_harad_shield_paint","Wicker_Shield",[("far_harad_c_giles",0)],itp_type_shield|itp_wooden_parry|itp_shop,itcf_carry_kite_shield,200,weight(2.5)|hit_points(480)|body_armor(1)|spd_rtng(82)|weapon_length(90),imodbits_shield,[(ti_on_init_item,[(cur_item_set_tableau_material, "tableau_far_harad_shield",0),])]],
 #["rohan_shield_a"        , "Rohan Shield" ,[("rohan_shield_green",0)],itp_shop|itp_type_shield|itp_wooden_parry, itcf_carry_round_shield, 80  , weight(2.5)|hit_points(310)|body_armor(8)|spd_rtng(96)|weapon_length(40),imodbits_shield,[(ti_on_init_item,[(cur_item_set_tableau_material, "tableau_rohan_plain_shield",0)])]],
 #free, Jan 2017, -> rohan_armor_th:
+] + (is_a_wb_item==1 and [
+["nazgulrobe","Nazgul_Robe",[("dm_nazgulrobe",0),("old_nazgulrobe",imodbit_old)],itp_type_body_armor|itp_covers_legs|itp_covers_head|itp_replaces_helm|itp_civilian,0,1,weight(5)|head_armor(60)|body_armor(70)|leg_armor(70)|difficulty(0),0,],
+] or [
 ["nazgulrobe","Nazgul_Robe",[("nazgulrobe",0),("old_nazgulrobe",imodbit_old)],itp_type_body_armor|itp_covers_legs|itp_covers_head|itp_replaces_helm|itp_civilian,0,1,weight(5)|head_armor(60)|body_armor(70)|leg_armor(70)|difficulty(0),0,],
+]) + [
 ["free_whiterobe","White_Robe",[("whiterobe",0)],itp_type_body_armor|itp_covers_legs|itp_civilian,0,1,weight(5)|head_armor(60)|body_armor(70)|leg_armor(70)|difficulty(0),0,], #unused since Jan 2018, =itm_nazgulrobe
 #BANNERS 
 # TODO: PLEASE DO NOT CHANGE BANNER ORDER, THIS IS A PLANNED FEATURE FOR THE MORALE SYSTEM. -CC #

diff --git a/ModuleSystem/module_mission_templates_TLD_wb.py b/ModuleSystem/module_mission_templates_TLD_wb.py
@@ -316,6 +316,7 @@
                     (call_script, "script_weapon_use_backup_weapon", ":agent", ":inc_two_handers"), # Then equip a close weapon
                 (else_try),
                     (neq, ":wielded", ":lance"), # Enemies farther than 5 meters and/or not fighting, and not using lance?
+                     (neg|agent_slot_eq, ":agent", slot_team_shield_order, 2), #Not commanded to use side-arms
                     (agent_set_wielded_item, ":agent", ":lance"), # Then equip it!
                 (try_end),
              (try_end),

diff --git a/_wb/Resource/darthmongol_meshes.brf b/_wb/Resource/darthmongol_meshes.brf
diff --git a/_wb/Textures/moria_goblin_armor_black.dds b/_wb/Textures/moria_goblin_armor_black.dds
diff --git a/_wb/Textures/moria_goblin_armor_new.dds b/_wb/Textures/moria_goblin_armor_new.dds
diff --git a/_wb/Textures/moria_goblin_armor_new_bump.dds b/_wb/Textures/moria_goblin_armor_new_bump.dds
diff --git a/_wb/Textures/moria_goblin_armor_new_spec.dds b/_wb/Textures/moria_goblin_armor_new_spec.dds
diff --git a/_wb/Textures/nazgul_robe_new.dds b/_wb/Textures/nazgul_robe_new.dds
diff --git a/_wb/Textures/nazgul_robe_new_bump.dds b/_wb/Textures/nazgul_robe_new_bump.dds
diff --git a/_wb/Textures/orc_leather_NORM.dds b/_wb/Textures/orc_leather_NORM.dds
diff --git a/_wb/game_variables.txt b/_wb/game_variables.txt
@@ -824,6 +824,7 @@ party_b_talk_h = 0.04
 party_b_release_h = 0.035
 party_b_move_up_h = 0.03
 party_b_move_down_h = 0.03
+party_b_troop_upgrades_h = 0.033
 party_b_upgrade1_h = 0.029
 party_b_upgrade2_h = 0.029
 party_b_member_h = 0.0262

diff --git a/_wb/item_kinds1.txt b/_wb/item_kinds1.txt
@@ -2495,7 +2495,7 @@ itemsfile version 2
 1
 -50  1 1981 2 43 0 
 
- itm_nazgulrobe Nazgul_Robe Nazgul_Robe 2  nazgulrobe 0  old_nazgulrobe 256  2705326093 0 1 0 5 100 60 70 70 0 0 0 0 0 0 0 0
+ itm_nazgulrobe Nazgul_Robe Nazgul_Robe 2  dm_nazgulrobe 0  old_nazgulrobe 256  2705326093 0 1 0 5 100 60 70 70 0 0 0 0 0 0 0 0
 0
 
  itm_free_whiterobe White_Robe White_Robe 1  whiterobe 0  553648141 0 1 0 5 100 60 70 70 0 0 0 0 0 0 0 0

diff --git a/_wb/mission_templates.txt b/_wb/mission_templates.txt
diff --git a/_wb/module.ini b/_wb/module.ini
@@ -67,7 +67,7 @@ disable_force_leaving_conversations = 1 #no TAB end in conversations.
 maximum_number_of_notification_messages = 4 #msg in battle. Common 10
 ai_decide_direction_according_to_damage = 1
 #scenes
-far_plane_distance = 2000 #Default is 1250 cm
+far_plane_distance = 10000 #Default is 1250 cm
 consider_weapon_length_for_weapon_quality = 1 #weapon selection
 has_singleplayer = 1
 has_multiplayer = 0
@@ -439,6 +439,7 @@ load_mod_resource = CWE_sa_flora_c
 
 load_mod_resource = shield_bear
 load_mod_resource = mbg_pastebin_anims
+load_mod_resource = darthmongol_meshes