Fixed Gondor helmet distribution, Dale water props, Isengard companio…

…n dialogue
tldmod · Aug 26, 2019 · 9fa0f2f · 9fa0f2f
1 parent 1ee2f39
commit 9fa0f2f
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
@@ -563,17 +563,17 @@ def heraldic(item_tableau):
 ["gondor_heavy_greaves","Gondorian_Mailed_Greaves",[("gondor_heavy_greaves",0)],itp_type_foot_armor|itp_shop|itp_attach_armature,0,1300,weight(3)|leg_armor(25)|difficulty(0),imodbits_armor|imodbit_lordly,[]],
 ####Helms
 ["gondorian_light_helm","Gondorian_Footman_Helm",[("gondor_footman_helm",0)],itp_type_head_armor,0,900,weight(2)|head_armor(29)|difficulty(0),imodbits_armor | imodbit_cracked,[]],
-["gondor_infantry_helm","Gondor_Infantry_Helm",[("gondor_footman_helm",imodbits_armor_bad),("gondor_regular_helm",0),("gondor_regular_helm2",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,1300,weight(2.4)|head_armor(34)|difficulty(0),imodbits_armor|imodbit_lordly,[]],
-["gondor_auxila_helm","Gondorian_Auxilia_Helm",[("gondor_auxila_helm",imodbits_armor_bad),("gondor_auxila_helm2",0),("gondor_auxila_helm3",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,300,weight(1.5)|head_armor(20)|difficulty(0),imodbits_armor|imodbit_lordly,[]],
+["gondor_infantry_helm","Gondor_Infantry_Helm",[("gondor_footman_helm",imodbits_armor_bad),("gondor_regular_helm",imodbit_plain),("gondor_regular_helm",0),("gondor_regular_helm2",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,1300,weight(2.4)|head_armor(34)|difficulty(0),imodbits_armor|imodbit_lordly,[]],
+["gondor_auxila_helm","Gondorian_Auxilia_Helm",[("gondor_auxila_helm",imodbits_armor_bad),("gondor_auxila_helm2",imodbit_plain),("gondor_auxila_helm2",0),("gondor_auxila_helm3",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,300,weight(1.5)|head_armor(20)|difficulty(0),imodbits_armor|imodbit_lordly,[]],
 ["gondorian_light_helm_b","Gondorian_Bowman_Helm",[("gondor_bowman_helm",0)],itp_type_head_armor,0,500,weight(1.5)|head_armor(25)|difficulty(0),imodbits_armor,[]],
-["gondorian_archer_helm","Gondorian_Archer_Helm",[("gondor_bowman_helm",imodbits_armor_bad),("gondor_archer_helm",0),("gondor_archer_helm2",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,800,weight(1.75)|head_armor(27)|difficulty(0),imodbits_armor|imodbit_lordly,[]],
+["gondorian_archer_helm","Gondorian_Archer_Helm",[("gondor_bowman_helm",imodbits_armor_bad),("gondor_archer_helm",imodbit_plain),("gondor_archer_helm",0),("gondor_archer_helm2",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,800,weight(1.75)|head_armor(27)|difficulty(0),imodbits_armor|imodbit_lordly,[]],
 ["tower_archer_helm","Tower_Archer_Helm",[("gondor_tower_archer_helm",0)],itp_type_head_armor|itp_shop,0,1200,weight(1.5)|head_armor(31)|difficulty(0),imodbits_elf_armor,[]],
 ["gondor_leader_helm","Gondor_High_Helmet",[("gondor_leader_helm",0)],itp_type_head_armor|itp_shop,0,3000,weight(2.5)|head_armor(41)|difficulty(0),imodbits_elf_armor,[]],
 ["tower_guard_helm","Tower_Guard_Helm",[("gondor_tower_guard_helm",0)],itp_type_head_armor,0,4000,weight(2.5)|head_armor(46)|difficulty(0),imodbits_elf_armor,[]],
 ["gondor_citadel_knight_helm","Citadel_Knight_Helm",[("gondor_citadel_knight_helm",0)],itp_type_head_armor|itp_shop,0,3000,weight(2.5)|head_armor(40)|difficulty(0),imodbits_elf_armor,[]],
 ["gondor_squire_helm","Gondor_Squire_Helm",[("gondor_squire_helm",itp_type_head_armor)],itp_type_head_armor|itp_shop,0,800,weight(2)|head_armor(29)|difficulty(0),imodbits_elf_armor],
-["gondor_knight_helm","Gondor_Cavalry_Helm",[("gondor_squire_helm",0),("gondor_knight_helm",0),("gondor_knight_helm2",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,1300,weight(2)|head_armor(35)|difficulty(0),imodbits_armor|imodbit_lordly],
-["gondor_dolamroth_helm","Dol_Amroth_Helm",[("gondor_dolamroth_helm_1",imodbits_armor_bad),("gondor_dolamroth_helm_2",0),("gondor_dolamroth_helm_3",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,1300,weight(2.5)|head_armor(35)|difficulty(0),imodbits_armor|imodbit_lordly],
+["gondor_knight_helm","Gondor_Cavalry_Helm",[("gondor_squire_helm",0),("gondor_knight_helm",imodbit_plain),("gondor_knight_helm",0),("gondor_knight_helm2",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,1300,weight(2)|head_armor(35)|difficulty(0),imodbits_armor|imodbit_lordly],
+["gondor_dolamroth_helm","Dol_Amroth_Helm",[("gondor_dolamroth_helm_1",imodbits_armor_bad),("gondor_dolamroth_helm_2",imodbit_plain),("gondor_dolamroth_helm_2",0),("gondor_dolamroth_helm_3",imodbits_elf_armor)],itp_type_head_armor|itp_shop,0,1300,weight(2.5)|head_armor(35)|difficulty(0),imodbits_armor|imodbit_lordly],
 ["swan_knight_helm","Swan_Knight_Helm",[("gondor_dolamroth_knight_helm",0)],itp_type_head_armor|itp_shop,0,1500,weight(3)|head_armor(42)|difficulty(0),imodbits_elf_armor],
 ["gondor_lamedon_helm","Lamedon_Helm",[("gondor_lamedon_helm",0)],itp_type_head_armor|itp_shop,0,1100,weight(2)|head_armor(32)|difficulty(0),imodbits_elf_armor],
 ["gondor_lamedon_leader_helm","Lamedon_High_Helmet",[("gondor_lamedon_leader_helm",0)],itp_type_head_armor|itp_shop,0,1400,weight(2.5)|head_armor(36)|difficulty(0),imodbits_elf_armor],

diff --git a/ModuleSystem/module_scene_props.py b/ModuleSystem/module_scene_props.py
@@ -2469,7 +2469,7 @@
 
 ("osgiliath_far_f",0,"osgiliath_far","0", []),   
 ("hill",0,"hill","bo_hill", []),
-("water_river",0,"JB_water_plane","0", []),
+("water_river",0,"TLD_water_plane","0", []),
 ("water_fall",0,"water_fall","0", []),
 ("distant_street_a",0,"distant_street_a","bo_village_wall_a", []),
 ("distant_street_b",0,"distant_street_b","bo_village_wall_b", []),

diff --git a/ModuleSystem/module_strings.py b/ModuleSystem/module_strings.py
@@ -3779,7 +3779,7 @@
 ("isengard_guildmaster_companion_player_none_ok", "This rabble isn’t what you make it out to be. Stout fellows? Fighting lads? Snagas aplenty, more like. Slavering swine."),
 ("isengard_guildmaster_player_found_ok", "If he kills well, I’ll take him. If not, I’ll gut him like a fish. And if he does turn out to be just another worthless maggot, I’ll come back and pay you for wasting my time!"),
 
-("isengard_main_guildmaster_companion", "A great commander you are, it is plain to see, and wisely do you choose to take only the bravest and most skilled fighters under your banner. And yet, if you will take my counsel - a battle is won not merely with iron and sinew, Commander, but with guile and foreknowledge of the foeman’s doings, his comings and goings. We have a scoutmaster here, an Orc who has sworn allegiance to Saruman the Great. I have heard that he spent many years in the Misty Mountains, catching and taming wargs. A skilled tracker and hunter is Durgash. You will find him a most useful helper, Commander. Look - I see him, standing near the warg pit."),
+("isengard_main_guildmaster_companion", "A great commander you are, it is plain to see, and wisely do you choose to take only the bravest and most skilled fighters under your banner. And yet, if you will take my counsel - a battle is won not merely with iron and sinew, Commander, but with guile and foreknowledge of the foeman’s doings, his comings and goings. We have a scoutmaster here, an Orc who has sworn allegiance to Saruman the Great. I have heard that he spent many years in the Misty Mountains, catching and taming wargs. A skilled tracker and hunter is Durgash. You will find him a most useful helper, Commander. He's usually lurking around the warg pits, down this ramp."),
 ("isengard_hunting_camp_guildmaster_companion", "O ho! So you think our finest lads should humble themselves and take orders from you, do you? You’re a bold one, and no mistake. I know just the fellow for you. Calls himself Gulm, and he’s a proper fierce one, he is. Never seen anyone take so much pleasure in bashing in skulls and breaking bones with that mallet of his. And the more foes he kills, the more savage he seems to get. I don’t rightly know where he is at the moment, though - but he’s in this camp for sure, trying not to attract attention for some reason. Does that sound suitable for you, O Great Commander, taking an Uruk-hai berserker into your camp?"),
 
 ("dunland_guildmaster_companion_player_ask", "So, these are the Men of the hills who serve the White Hand! A sorry-looking lot. Where are your fighters of note?"),

diff --git a/_wb/item_kinds1.txt b/_wb/item_kinds1.txt
@@ -649,16 +649,16 @@ itemsfile version 2
  itm_gondorian_light_helm Gondorian_Footman_Helm Gondorian_Footman_Helm 1  gondor_footman_helm 0  12 0 900 167772294 2 100 29 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_gondor_infantry_helm Gondor_Infantry_Helm Gondor_Infantry_Helm 3  gondor_footman_helm 134  gondor_regular_helm 0  gondor_regular_helm2 704643072  65548 0 1300 704643206 2.25 100 34 0 0 0 0 0 0 0 0 0 0
+ itm_gondor_infantry_helm Gondor_Infantry_Helm Gondor_Infantry_Helm 4  gondor_footman_helm 134  gondor_regular_helm 1  gondor_regular_helm 0  gondor_regular_helm2 704643072  65548 0 1300 704643206 2.25 100 34 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_gondor_auxila_helm Gondorian_Auxilia_Helm Gondorian_Auxilia_Helm 3  gondor_auxila_helm 134  gondor_auxila_helm2 0  gondor_auxila_helm3 704643072  65548 0 300 704643206 1.5 100 20 0 0 0 0 0 0 0 0 0 0
+ itm_gondor_auxila_helm Gondorian_Auxilia_Helm Gondorian_Auxilia_Helm 4  gondor_auxila_helm 134  gondor_auxila_helm2 1  gondor_auxila_helm2 0  gondor_auxila_helm3 704643072  65548 0 300 704643206 1.5 100 20 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_gondorian_light_helm_b Gondorian_Bowman_Helm Gondorian_Bowman_Helm 1  gondor_bowman_helm 0  12 0 500 167772294 1.5 100 25 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_gondorian_archer_helm Gondorian_Archer_Helm Gondorian_Archer_Helm 3  gondor_bowman_helm 134  gondor_archer_helm 0  gondor_archer_helm2 704643072  65548 0 800 704643206 1.75 100 27 0 0 0 0 0 0 0 0 0 0
+ itm_gondorian_archer_helm Gondorian_Archer_Helm Gondorian_Archer_Helm 4  gondor_bowman_helm 134  gondor_archer_helm 1  gondor_archer_helm 0  gondor_archer_helm2 704643072  65548 0 800 704643206 1.75 100 27 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_tower_archer_helm Tower_Archer_Helm Tower_Archer_Helm 1  gondor_tower_archer_helm 0  65548 0 1200 704643072 1.5 100 31 0 0 0 0 0 0 0 0 0 0
@@ -676,10 +676,10 @@ itemsfile version 2
  itm_gondor_squire_helm Gondor_Squire_Helm Gondor_Squire_Helm 1  gondor_squire_helm 12  65548 0 800 704643072 2 100 29 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_gondor_knight_helm Gondor_Cavalry_Helm Gondor_Cavalry_Helm 3  gondor_squire_helm 0  gondor_knight_helm 0  gondor_knight_helm2 704643072  65548 0 1300 704643206 2 100 35 0 0 0 0 0 0 0 0 0 0
+ itm_gondor_knight_helm Gondor_Cavalry_Helm Gondor_Cavalry_Helm 4  gondor_squire_helm 0  gondor_knight_helm 1  gondor_knight_helm 0  gondor_knight_helm2 704643072  65548 0 1300 704643206 2 100 35 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_gondor_dolamroth_helm Dol_Amroth_Helm Dol_Amroth_Helm 3  gondor_dolamroth_helm_1 134  gondor_dolamroth_helm_2 0  gondor_dolamroth_helm_3 704643072  65548 0 1300 704643206 2.5 100 35 0 0 0 0 0 0 0 0 0 0
+ itm_gondor_dolamroth_helm Dol_Amroth_Helm Dol_Amroth_Helm 4  gondor_dolamroth_helm_1 134  gondor_dolamroth_helm_2 1  gondor_dolamroth_helm_2 0  gondor_dolamroth_helm_3 704643072  65548 0 1300 704643206 2.5 100 35 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_swan_knight_helm Swan_Knight_Helm Swan_Knight_Helm 1  gondor_dolamroth_knight_helm 0  65548 0 1500 704643072 3 100 42 0 0 0 0 0 0 0 0 0 0

diff --git a/_wb/scene_props.txt b/_wb/scene_props.txt
@@ -4891,7 +4891,7 @@ spr_osgiliath_far_f 0 0 osgiliath_far 0 0
 spr_hill 0 0 hill bo_hill 0
 
 
-spr_water_river 0 0 JB_water_plane 0 0
+spr_water_river 0 0 TLD_water_plane 0 0
 
 
 spr_water_fall 0 0 water_fall 0 0

diff --git a/_wb/strings.txt b/_wb/strings.txt
@@ -2657,7 +2657,7 @@ str_isengard_guildmaster_companion_player_ask I’ve_heard_about_the_fighting_Ur
 str_isengard_guildmaster_companion_none Leading_patrols_and_armies_of_their_own,_no_doubt_-_why_would_they_lower_themselves_to_fight_under_your_command?_They’ve_got_their_own_Orders_to_follow,_from_Higher_Up._If_you_want_fighting_lads,_go_talk_to_the_garrison_chief!_We’ve_got_stout_fellows_aplenty.
 str_isengard_guildmaster_companion_player_none_ok This_rabble_isn’t_what_you_make_it_out_to_be._Stout_fellows?_Fighting_lads?_Snagas_aplenty,_more_like._Slavering_swine.
 str_isengard_guildmaster_player_found_ok If_he_kills_well,_I’ll_take_him._If_not,_I’ll_gut_him_like_a_fish._And_if_he_does_turn_out_to_be_just_another_worthless_maggot,_I’ll_come_back_and_pay_you_for_wasting_my_time!
-str_isengard_main_guildmaster_companion A_great_commander_you_are,_it_is_plain_to_see,_and_wisely_do_you_choose_to_take_only_the_bravest_and_most_skilled_fighters_under_your_banner._And_yet,_if_you_will_take_my_counsel_-_a_battle_is_won_not_merely_with_iron_and_sinew,_Commander,_but_with_guile_and_foreknowledge_of_the_foeman’s_doings,_his_comings_and_goings._We_have_a_scoutmaster_here,_an_Orc_who_has_sworn_allegiance_to_Saruman_the_Great._I_have_heard_that_he_spent_many_years_in_the_Misty_Mountains,_catching_and_taming_wargs._A_skilled_tracker_and_hunter_is_Durgash._You_will_find_him_a_most_useful_helper,_Commander._Look_-_I_see_him,_standing_near_the_warg_pit.
+str_isengard_main_guildmaster_companion A_great_commander_you_are,_it_is_plain_to_see,_and_wisely_do_you_choose_to_take_only_the_bravest_and_most_skilled_fighters_under_your_banner._And_yet,_if_you_will_take_my_counsel_-_a_battle_is_won_not_merely_with_iron_and_sinew,_Commander,_but_with_guile_and_foreknowledge_of_the_foeman’s_doings,_his_comings_and_goings._We_have_a_scoutmaster_here,_an_Orc_who_has_sworn_allegiance_to_Saruman_the_Great._I_have_heard_that_he_spent_many_years_in_the_Misty_Mountains,_catching_and_taming_wargs._A_skilled_tracker_and_hunter_is_Durgash._You_will_find_him_a_most_useful_helper,_Commander._He's_usually_lurking_around_the_warg_pits,_down_this_ramp.
 str_isengard_hunting_camp_guildmaster_companion O_ho!_So_you_think_our_finest_lads_should_humble_themselves_and_take_orders_from_you,_do_you?_You’re_a_bold_one,_and_no_mistake._I_know_just_the_fellow_for_you._Calls_himself_Gulm,_and_he’s_a_proper_fierce_one,_he_is._Never_seen_anyone_take_so_much_pleasure_in_bashing_in_skulls_and_breaking_bones_with_that_mallet_of_his._And_the_more_foes_he_kills,_the_more_savage_he_seems_to_get._I_don’t_rightly_know_where_he_is_at_the_moment,_though_-_but_he’s_in_this_camp_for_sure,_trying_not_to_attract_attention_for_some_reason._Does_that_sound_suitable_for_you,_O_Great_Commander,_taking_an_Uruk-hai_berserker_into_your_camp?
 str_dunland_guildmaster_companion_player_ask So,_these_are_the_Men_of_the_hills_who_serve_the_White_Hand!_A_sorry-looking_lot._Where_are_your_fighters_of_note?
 str_dunland_guildmaster_companion_none Following_those_greater_than_you,_no_doubt._If_you_want_warriors,_speak_to_the_training_masters._See_for_yourself_if_any_of_our_young_pups_will_follow_you_into_battle.

diff --git a/item_kinds1.txt b/item_kinds1.txt
@@ -649,16 +649,16 @@ itemsfile version 2
  itm_gondorian_light_helm Gondorian_Footman_Helm Gondorian_Footman_Helm 1  gondor_footman_helm 0  12 0 900 167772294 2 100 29 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_gondor_infantry_helm Gondor_Infantry_Helm Gondor_Infantry_Helm 3  gondor_footman_helm 134  gondor_regular_helm 0  gondor_regular_helm2 704643072  65548 0 1300 704643206 2.25 100 34 0 0 0 0 0 0 0 0 0 0
+ itm_gondor_infantry_helm Gondor_Infantry_Helm Gondor_Infantry_Helm 4  gondor_footman_helm 134  gondor_regular_helm 1  gondor_regular_helm 0  gondor_regular_helm2 704643072  65548 0 1300 704643206 2.25 100 34 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_gondor_auxila_helm Gondorian_Auxilia_Helm Gondorian_Auxilia_Helm 3  gondor_auxila_helm 134  gondor_auxila_helm2 0  gondor_auxila_helm3 704643072  65548 0 300 704643206 1.5 100 20 0 0 0 0 0 0 0 0 0 0
+ itm_gondor_auxila_helm Gondorian_Auxilia_Helm Gondorian_Auxilia_Helm 4  gondor_auxila_helm 134  gondor_auxila_helm2 1  gondor_auxila_helm2 0  gondor_auxila_helm3 704643072  65548 0 300 704643206 1.5 100 20 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_gondorian_light_helm_b Gondorian_Bowman_Helm Gondorian_Bowman_Helm 1  gondor_bowman_helm 0  12 0 500 167772294 1.5 100 25 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_gondorian_archer_helm Gondorian_Archer_Helm Gondorian_Archer_Helm 3  gondor_bowman_helm 134  gondor_archer_helm 0  gondor_archer_helm2 704643072  65548 0 800 704643206 1.75 100 27 0 0 0 0 0 0 0 0 0 0
+ itm_gondorian_archer_helm Gondorian_Archer_Helm Gondorian_Archer_Helm 4  gondor_bowman_helm 134  gondor_archer_helm 1  gondor_archer_helm 0  gondor_archer_helm2 704643072  65548 0 800 704643206 1.75 100 27 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_tower_archer_helm Tower_Archer_Helm Tower_Archer_Helm 1  gondor_tower_archer_helm 0  65548 0 1200 704643072 1.5 100 31 0 0 0 0 0 0 0 0 0 0
@@ -676,10 +676,10 @@ itemsfile version 2
  itm_gondor_squire_helm Gondor_Squire_Helm Gondor_Squire_Helm 1  gondor_squire_helm 12  65548 0 800 704643072 2 100 29 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_gondor_knight_helm Gondor_Cavalry_Helm Gondor_Cavalry_Helm 3  gondor_squire_helm 0  gondor_knight_helm 0  gondor_knight_helm2 704643072  65548 0 1300 704643206 2 100 35 0 0 0 0 0 0 0 0 0 0
+ itm_gondor_knight_helm Gondor_Cavalry_Helm Gondor_Cavalry_Helm 4  gondor_squire_helm 0  gondor_knight_helm 1  gondor_knight_helm 0  gondor_knight_helm2 704643072  65548 0 1300 704643206 2 100 35 0 0 0 0 0 0 0 0 0 0
 0
 
- itm_gondor_dolamroth_helm Dol_Amroth_Helm Dol_Amroth_Helm 3  gondor_dolamroth_helm_1 134  gondor_dolamroth_helm_2 0  gondor_dolamroth_helm_3 704643072  65548 0 1300 704643206 2.5 100 35 0 0 0 0 0 0 0 0 0 0
+ itm_gondor_dolamroth_helm Dol_Amroth_Helm Dol_Amroth_Helm 4  gondor_dolamroth_helm_1 134  gondor_dolamroth_helm_2 1  gondor_dolamroth_helm_2 0  gondor_dolamroth_helm_3 704643072  65548 0 1300 704643206 2.5 100 35 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_swan_knight_helm Swan_Knight_Helm Swan_Knight_Helm 1  gondor_dolamroth_knight_helm 0  65548 0 1500 704643072 3 100 42 0 0 0 0 0 0 0 0 0 0

diff --git a/scene_props.txt b/scene_props.txt
@@ -4792,7 +4792,7 @@ spr_osgiliath_far_f 0 0 osgiliath_far 0 0
 spr_hill 0 0 hill bo_hill 0
 
 
-spr_water_river 0 0 JB_water_plane 0 0
+spr_water_river 0 0 TLD_water_plane 0 0
 
 
 spr_water_fall 0 0 water_fall 0 0