More upscaled textures (orc weapons, arnor helms, some corsair helms)…

…; Fixed DG rewards; gave Dain a red axe
tldmod · Mar 17, 2019 · 4b37585 · 4b37585
1 parent 2ba83b8
commit 4b37585
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 9 deletions.
diff --git a/ModuleSystem/module_constants.py b/ModuleSystem/module_constants.py
@@ -1999,7 +1999,7 @@ def concatenate_scripts(block_list):
 #fac_moria
 [(2,itm_cooking_cauldron,0),(3,itm_orc_brew      ,0),(4,itm_moria_orc_shield_c, imod_reinforced), (5, itm_warg_reward, imod_reinforced), (6, itm_ring_b_reward, 0), (7, itm_dwarf_great_pick, imod_old), (8, itm_moria_armor_e, imod_lordly), (9, itm_moria_arrow_reward, 0)],
 #fac_guldur
-[(2,itm_cooking_cauldron,0),(3,itm_orc_brew      ,0),(4,itm_mordor_banner      ,imod_balanced), (7, itm_angmar_whip_reward, 0), (9, itm_spider, 0), (8, itm_guldur_arrows_reward, 0), (9, itm_nazgul_sword, 0)],
+[(2,itm_cooking_cauldron,0),(3,itm_orc_brew      ,0),(4,itm_mordor_banner      ,imod_balanced), (6, itm_angmar_whip_reward, 0), (7, itm_spider, 0), (8, itm_guldur_arrows_reward, 0), (9, itm_nazgul_sword, 0)],
 #fac_gundabad
 [(2,itm_cooking_cauldron,0),(3,itm_orc_brew      ,0),(4, itm_orc_throwing_axes_reward, 0), (5, itm_warg_reward, imod_champion), (6, itm_angmar_whip_reward, 0), (7, itm_gundabad_helm_e, imod_lordly), (8, itm_gundabad_armor_e, imod_lordly), (9, itm_angmar_shield, imod_reinforced)],
 #fac_dunland

diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
@@ -1467,7 +1467,7 @@ def heraldic(item_tableau):
 ["orc_throwing_axes_reward","Gundabad_Flying_Axes",[("orc_throwing_axe",0)],itp_type_thrown|itp_unique|itp_primary|itp_bonus_against_shield,itcf_throw_axe,150,weight(4)|difficulty(0)|shoot_speed(30)|spd_rtng(103)|weapon_length(33)|thrust_damage(46,cut)|max_ammo(5),imodbits_thrown],
 ["corsair_throwing_dagger_reward","Poisoned_Throwing_Daggers",[("corsair_throwing_dagger",0)],itp_type_thrown|itp_unique|itp_primary|0,itcf_throw_knife,200,weight(3.5)|difficulty(0)|shoot_speed(24)|spd_rtng(110)|weapon_length(0)|thrust_damage(50,cut)|max_ammo(10),imodbits_thrown],
 ["dwarf_shield_reward","Shield_of_Kheled-zaram",[("mithril_shield",0)],itp_type_shield|itp_wooden_parry|itp_unique,itcf_carry_kite_shield,400,weight(3)|hit_points(800)|body_armor(28)|spd_rtng(82)|weapon_length(70),imodbits_none,],
-["dwarf_great_axe_reward","Dwarf_Sharp_Axe",[("dwarf_great_axe_2",0)],itp_type_polearm|itp_unique|itp_primary|itp_two_handed|itp_bonus_against_shield|itp_wooden_parry|itp_cant_use_on_horseback|itp_crush_through|itp_can_knock_down,itc_nodachi|itcf_carry_axe_back,700,weight(6)|difficulty(18)|spd_rtng(90)|weapon_length(110)|swing_damage(55,pierce)|thrust_damage(0,pierce),imodbits_none],
+["dwarf_great_axe_reward","Dwarf_Sharp_Axe",[("dwarf_great_axe_2",0),("dwarf_great_axe_2_dain",imodbit_rotten)],itp_type_polearm|itp_unique|itp_primary|itp_two_handed|itp_bonus_against_shield|itp_wooden_parry|itp_cant_use_on_horseback|itp_crush_through|itp_can_knock_down,itc_nodachi|itcf_carry_axe_back,700,weight(6)|difficulty(18)|spd_rtng(90)|weapon_length(110)|swing_damage(55,pierce)|thrust_damage(0,pierce),imodbits_none],
 ["isen_uruk_heavy_reward","Uruk-hai_General_Armor",[("urukhai_isen_h",0)],itp_type_body_armor|itp_covers_legs|itp_unique,0,3000,weight(30)|head_armor(0)|body_armor(38)|leg_armor(17)|difficulty(0),imodbits_none,],
 ["lorien_bow_reward","Noldorin_Bow",[("Vyrn_bow_1_shortened",0),("Vyrn_bow_1_shortened",ixmesh_carry)],itp_type_bow|itp_primary|itp_two_handed|itp_unique,itcf_shoot_bow|itcf_carry_bowcase_left,3000,weight(1.5)|difficulty(5)|shoot_speed(54)|spd_rtng(99)|thrust_damage(24,pierce)|accuracy(90),0,[] ],
 ["elven_cloak","Elven_Cloak",[("elven_cloak",0)],itp_unique|itp_type_goods,0,1000,weight(0.2)|abundance(0)|0,imodbits_none],

diff --git a/ModuleSystem/module_troops.py b/ModuleSystem/module_troops.py
@@ -1923,7 +1923,7 @@ def wp_melee(x):
    [itm_dale_warhorse,itm_dale_armor_reward,itm_leather_boots,itm_mail_mittens,itm_dale_helmet_f,itm_dale_sword_reward,itm_dwarf_shield_c_good,itm_lance,],
       attr_tier_6,wp_tier_6,knight_skills_5|knows_trainer_5,0x0000000e3f00018436db75b79b6eb6db00000000001db6eb0000000000000000],
 ["dwarf_lord","King_Dain_II_Ironfoot","King",tf_hero| tf_dwarf| tfg_shield| tfg_armor| tfg_helm| tfg_boots,0,0,fac_dwarf,
-   [itm_dwarf_armor_c,itm_dwarf_scale_boots,itm_mail_mittens,itm_dwarf_helm_king_NPC,itm_dwarf_throwing_axe,itm_dwarf_great_axe,],
+   [itm_dwarf_armor_c,itm_dwarf_scale_boots,itm_mail_mittens,itm_dwarf_helm_king_NPC,itm_dwarf_throwing_axe,(itm_dwarf_great_axe,imod_rotten)],
       attr_dwarf_tier_6,wp_dwarf_tier_6,knight_skills_5|knows_riding_10|knows_persuasion_3|knows_trainer_4,0x0000000e7f00210133c16e7bb1fffdff00000000001f56f30000000000000000],
 ["dunland_lord","Chief_Daeglaf_the_Black","Chief",tf_hero| tf_dunland| tf_mounted| tfg_shield| tfg_armor| tfg_helm| tfg_horse| tfg_boots,0,0,fac_dunland,
    [itm_saddle_horse,itm_dunland_armor_k,itm_dunland_wolfboots,itm_evil_gauntlets_a,itm_dun_helm_e,itm_dun_berserker,itm_dun_shield_b,itm_dunland_javelin,],

diff --git a/Resource/materials.brf b/Resource/materials.brf
diff --git a/Resource/troll.brf b/Resource/troll.brf
diff --git a/Textures/_unused/weapons_orc.dds b/Textures/_unused/weapons_orc.dds
diff --git a/Textures/arnorhelm.dds b/Textures/arnorhelm.dds
diff --git a/Textures/helmets_corsair.dds b/Textures/helmets_corsair.dds
diff --git a/Textures/weapons_orc.dds b/Textures/weapons_orc.dds
diff --git a/_wb/conversation.txt b/_wb/conversation.txt
diff --git a/_wb/item_kinds1.txt b/_wb/item_kinds1.txt
@@ -2679,7 +2679,7 @@ itemsfile version 2
  itm_dwarf_shield_reward Shield_of_Kheled-zaram Shield_of_Kheled-zaram 1  mithril_shield 0  266247 4831838208 400 0 3 100 0 28 0 0 800 82 0 70 0 0 0
 0
 
- itm_dwarf_great_axe_reward Dwarf_Sharp_Axe Dwarf_Sharp_Axe 1  dwarf_great_axe_2 0  279514976260 9223635923965575392 700 0 6 100 0 0 0 18 56320 90 0 110 0 256 311
+ itm_dwarf_great_axe_reward Dwarf_Sharp_Axe Dwarf_Sharp_Axe 2  dwarf_great_axe_2 0  dwarf_great_axe_2_dain 2199023255552  279514976260 9223635923965575392 700 0 6 100 0 0 0 18 56320 90 0 110 0 256 311
 0
 
  itm_isen_uruk_heavy_reward Uruk-hai_General_Armor Uruk-hai_General_Armor 1  urukhai_isen_h 0  16781325 0 3000 0 30 100 0 38 17 0 0 0 0 0 0 0 0

diff --git a/_wb/troops.txt b/_wb/troops.txt
@@ -3816,7 +3816,7 @@ trp_dale_lord King_Brand King 57672720 0 0 11 0 0
   61186507140 3952882529394931419 1947371 0 0 0 0 0 
 
 trp_dwarf_lord King_Dain_II_Ironfoot King 40894489 0 0 4 0 0
-  819 0 824 0 102 0 904 134217728 796 0 790 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
+  819 0 824 0 102 0 904 134217728 796 0 790 687865856 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
   24 18 4 4 48
  350 350 350 350 0 350 0
 805307280 1610612736 64 94 421888 0 

diff --git a/conversation.txt b/conversation.txt
diff --git a/item_kinds1.txt b/item_kinds1.txt
@@ -2679,7 +2679,7 @@ itemsfile version 2
  itm_dwarf_shield_reward Shield_of_Kheled-zaram Shield_of_Kheled-zaram 1  mithril_shield 0  266247 4831838208 400 0 3 100 0 28 0 0 800 82 0 70 0 0 0
 0
 
- itm_dwarf_great_axe_reward Dwarf_Sharp_Axe Dwarf_Sharp_Axe 1  dwarf_great_axe_2 0  279514976260 9223635923965575392 700 0 6 100 0 0 0 18 56320 90 0 110 0 256 311
+ itm_dwarf_great_axe_reward Dwarf_Sharp_Axe Dwarf_Sharp_Axe 2  dwarf_great_axe_2 0  dwarf_great_axe_2_dain 2199023255552  279514976260 9223635923965575392 700 0 6 100 0 0 0 18 56320 90 0 110 0 256 311
 0
 
  itm_isen_uruk_heavy_reward Uruk-hai_General_Armor Uruk-hai_General_Armor 1  urukhai_isen_h 0  16781325 0 3000 0 30 100 0 38 17 0 0 0 0 0 0 0 0

diff --git a/troops.txt b/troops.txt
@@ -3816,7 +3816,7 @@ trp_dale_lord King_Brand King 57672720 0 0 11 0 0
   61186507140 3952882529394931419 1947371 0 0 0 0 0 
 
 trp_dwarf_lord King_Dain_II_Ironfoot King 40894489 0 0 4 0 0
-  819 0 824 0 102 0 904 134217728 796 0 790 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
+  819 0 824 0 102 0 904 134217728 796 0 790 687865856 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 -1 0 
   24 18 4 4 48
  350 350 350 350 0 350 0
 805307280 1610612736 64 94 421888 0