New reward item for Dunland

tldmod · Aug 21, 2019 · 9171103 · 9171103
1 parent 54d8178
commit 9171103
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 16 deletions.
diff --git a/ModuleSystem/Header/header_item_modifiers.py b/ModuleSystem/Header/header_item_modifiers.py
@@ -6,7 +6,7 @@
 imod_battered    = 5  # .......... -2 armor, -26 hp
 imod_poor        = 6  # --------
 imod_crude       = 7  # -2 damage, -1 armor				= "simple"
-imod_old         = 8  # --------
+imod_old         = 8  # --------						= "ancient"
 imod_cheap       = 9  # --------
 imod_fine        = 10 # +1 damage
 imod_well_made   = 11 # --------

diff --git a/ModuleSystem/module_constants.py b/ModuleSystem/module_constants.py
@@ -2003,7 +2003,7 @@ def concatenate_scripts(block_list):
 #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
-[(2,itm_cooking_cauldron,0),(3,itm_garlic_reward ,0),(4, itm_dun_shield_a, imod_reinforced), (5, itm_torque_reward, 0), (6, itm_dunnish_pike, imod_balanced), (7, itm_dun_helm_e, imod_lordly), (8, itm_dunland_armor_k, imod_lordly), (9, itm_dun_berserker, imod_masterwork)],
+[(2,itm_cooking_cauldron,0),(3,itm_garlic_reward ,0),(4, itm_dun_shield_a, imod_reinforced), (5, itm_wilderness_amulet, 0), (6, itm_dunnish_pike, imod_balanced), (7, itm_dun_helm_e, imod_lordly), (8, itm_dunland_armor_k, imod_lordly), (9, itm_dun_berserker, imod_masterwork)],
 #fac_beorn
 [(2,itm_cooking_cauldron,0),(3,itm_athelas_reward,0),(4, itm_leather_gloves_reward, imod_reinforced), (5, itm_beorn_staff, imod_masterwork), (6, itm_herbarium_reward, 0), (7, itm_beorn_axe_reward, imod_masterwork), (8, itm_beorn_chief, imod_lordly), (9, itm_beorn_shield_reward, imod_reinforced)],
 ]

diff --git a/ModuleSystem/module_items.py b/ModuleSystem/module_items.py
@@ -1477,7 +1477,7 @@ def heraldic(item_tableau):
 ["guldur_arrows_reward","Guldur_Arrows",[("khazad_orc_arrow_2",0),("khazad_orc_arrow_2.lod2",ixmesh_flying_ammo),("khazad_orc_arrow_2_quiver",ixmesh_carry)],itp_type_arrows|itp_can_penetrate_shield|itp_crush_through,itcf_carry_quiver_back_right,2000,weight(3)|thrust_damage(3,cut)|max_ammo(30)|weapon_length(95),imodbits_missile,[]],
 ["sarustaff","Wizards_Staff",[("sarustaff",0)],itp_primary|itp_wooden_parry|itp_type_polearm|itp_spear|itp_penalty_with_shield|itp_wooden_attack,itc_staff,1,weight(2.5)|difficulty(0)|spd_rtng(103)|weapon_length(118)|swing_damage(50,blunt)|thrust_damage(40,blunt),0],
 ["rohan_armor_th","Rohan_Royal_Armor",[("theoden_armour",0),("denethor_robe",imodbit_well_made),("dm_nazgulrobe",imodbit_cheap),("pippin",imodbit_battered),("merry",imodbit_chipped),("whiterobe",imodbit_bent), ("old_nazgulrobe",imodbit_old),("galadriel",imodbit_rusty)],itp_type_body_armor|itp_covers_legs,0,4000,weight(20)|head_armor(0)|body_armor(43)|leg_armor(15)|difficulty(15),imodbits_elf_armor,],
-["wilderness_amulet","Wolf_Teeth_Amulet",[("dunland_wolf_amulet",0)],itp_type_body_armor|itp_covers_legs,0,1000,weight(20)|head_armor(0)|body_armor(44)|leg_armor(15)|difficulty(0),imodbits_elf_armor,],
+["wilderness_amulet","Wilderness_Amulet",[("dunland_amulet",0),("beorning_amulet",imodbit_old)],itp_unique|itp_type_goods,0,1000,weight(0)|difficulty(0),imodbits_elf_armor,],
 ["prisoner_coll_chain","Prisoner_Chains",[("prisoner_coll_chain",0)],itp_type_head_armor|itp_doesnt_cover_hair,0,10,weight(10)|head_armor(2)|difficulty(0),0],
 ["witchking_helmet","Wicked_Helm",[("witchking_helmet",0),("glorfindelhair",imodbit_rotten),("DwarfHelmKingCrown",imodbit_old)],itp_type_head_armor|itp_unique,0,3000,weight(2.5)|head_armor(45)|difficulty(12),0],
 # let   witchking_helmet  be the last item (mtarini)

diff --git a/ModuleSystem/module_scenes.py b/ModuleSystem/module_scenes.py
@@ -152,7 +152,7 @@
   ("minas_tirith_castle",sf_indoors|sf_force_skybox, "throne_room", "bo_throne_room", (-1000,-1000),(1000,1000),-100,"0",["exit"],["player_chest"]),
   ("rohan_castle"       ,sf_indoors, "interior_castle_t", "bo_interior_castle_t", (-100,-100),(100,100),-100,"0",["exit"],["player_chest"]),
   ("elf_castle"         ,sf_indoors, "interior_castle_t", "bo_interior_castle_t", (-100,-100),(100,100),-100,"0",["exit"],[]),
-  ("mordor_castle"      ,sf_indoors, "interior_castle_t", "bo_interior_castle_t", (-100,-100),(100,100),-100,"0",["exit"],[]),
+  ("mordor_castle"      ,sf_indoors, "interior_castle_t", "bo_interior_castle_t", (-100,-100),(100,100),-100,"0",["exit"],["player_chest"]),
   ("edoras_castle"      ,sf_indoors, "rohan_meduseld_int", "bo_rohan_meduseld_int", (-200,-200),(200,200),-100,"0",["exit"],["player_chest"]),
   ("erebor_castle",sf_indoors ,"erebor_throne_room_b", "bo_erebor_throne_room_b", (-40,-40),(40,40),-100,"0",[],["player_chest"]),  
   #("erebor_castle",sf_indoors ,"interior_gondor_training_room_b", "bo_interior_gondor_training_room_b", (-40,-40),(40,40),-100,"0",[],["player_chest"]),

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -3674,6 +3674,9 @@ def set_item_score():
       (else_try),
 		(eq,":item_no","itm_elven_cloak"),
 		(try_begin),(eq, ":extra_text_id", 0),(set_result_string, "@+1 to Wildcraft"),(set_trigger_result, color_item_text_bonus),(try_end),
+      (else_try),
+		(eq,":item_no","itm_wilderness_amulet"),
+		(try_begin),(eq, ":extra_text_id", 0),(set_result_string, "@+1 to Wildcraft"),(set_trigger_result, color_item_text_bonus),(try_end),
       (else_try),
 		(eq,":item_no","itm_elven_amulet_reward"),
 		(try_begin),(eq, ":extra_text_id", 0),(set_result_string, "@+1 to Power Draw"),(set_trigger_result, color_item_text_bonus),(try_end),
@@ -3734,6 +3737,9 @@ def set_item_score():
 		(try_begin),(eq, ":extra_text_id", 2),(set_result_string, "@+1 to Charisma"),(try_end),
 		(try_begin),(eq, ":extra_text_id", 3),(set_result_string, "@when equipped"),(try_end),
         (set_trigger_result, color_item_text_bonus),
+	  (else_try),
+		(eq,":item_no","itm_wheeled_cage"),
+		(try_begin),(eq, ":extra_text_id", 0),(set_result_string, "@+1 to Prisoner Mgmt"),(set_trigger_result, color_item_text_bonus),(try_end),	
       (else_try),
 		(eq,":item_no","itm_explosive_reward"),
 		(try_begin),(eq, ":extra_text_id", 0),(set_result_string, "@+2 to Tactics"),(try_end),
@@ -4089,6 +4095,11 @@ def set_item_score():
         (gt, reg0, 0),
         (val_add, ":modifier_value", 1),
 	  (try_end),
+ 	  (try_begin),
+        (call_script, "script_get_troop_item_amount", ":troop_no", "itm_wilderness_amulet"),
+        (gt, reg0, 0),
+        (val_add, ":modifier_value", 1),
+	  (try_end),
     (else_try), #Ironflesh
   	  (eq, ":skill_no", "skl_ironflesh"),
  	  (try_begin),
@@ -4101,6 +4112,11 @@ def set_item_score():
         (troop_has_item_equipped, ":troop_no", "itm_witchking_helmet"),
         (val_add, ":modifier_value", 1),
 	  (try_end),
+	  (try_begin),
+        (call_script, "script_get_troop_item_amount", ":troop_no", "itm_wheeled_cage"),
+        (gt, reg0, 0),
+        (val_add, ":modifier_value", 1),
+	  (try_end),
     (else_try), #Engineering
   	  (eq, ":skill_no", "skl_engineer"),
 	  #(try_begin),

diff --git a/Resource/dunland.brf b/Resource/dunland.brf
diff --git a/Resource/woodmen.brf b/Resource/woodmen.brf
diff --git a/_wb/conversation.txt b/_wb/conversation.txt
diff --git a/_wb/item_kinds1.txt b/_wb/item_kinds1.txt
@@ -2721,7 +2721,7 @@ itemsfile version 2
  itm_rohan_armor_th Rohan_Royal_Armor Rohan_Royal_Armor 8  theoden_armour 0  denethor_robe 2048  dm_nazgulrobe 512  pippin 32  merry 16  whiterobe 8  old_nazgulrobe 256  galadriel 4  16777229 0 4000 704643072 20 100 0 43 15 15 0 0 0 0 0 0 0
 0
 
- itm_wilderness_amulet Wolf_Teeth_Amulet Wolf_Teeth_Amulet 1  dunland_wolf_amulet 0  16777229 0 1000 704643072 20 100 0 44 15 0 0 0 0 0 0 0 0
+ itm_wilderness_amulet Wilderness_Amulet Wilderness_Amulet 2  dunland_amulet 0  beorning_amulet 256  4107 0 1000 704643072 0 100 0 0 0 0 0 0 0 0 0 0 0
 0
 
  itm_prisoner_coll_chain Prisoner_Chains Prisoner_Chains 1  prisoner_coll_chain 0  16777228 0 10 0 10 100 2 0 0 0 0 0 0 0 0 0 0

diff --git a/_wb/scenes.txt b/_wb/scenes.txt
@@ -346,7 +346,7 @@ scn_elf_castle elf_castle 1 interior_castle_t bo_interior_castle_t -100 -100 100
  0 
 scn_mordor_castle mordor_castle 1 interior_castle_t bo_interior_castle_t -100 -100 100 100 -100 0 
   1  100000 
-  0 
+  1  833 
  0 
 scn_edoras_castle edoras_castle 1 rohan_meduseld_int bo_rohan_meduseld_int -200 -200 200 200 -100 0 
   1  100000