*New Trait: Butcher (Evil Only)

- This trait is obtained by slaughtering X amount of prisoners for meat. - Modified dialogues, scripts, constants, and strings.
tldmod · Mar 28, 2017 · cf8154f · cf8154f
1 parent 3306da5
commit cf8154f
Show file tree

Hide file tree

Showing 25 changed files with 236 additions and 195 deletions.
diff --git a/ModuleSystem/ID/ID_scripts_mb.py b/ModuleSystem/ID/ID_scripts_mb.py
@@ -509,5 +509,6 @@
 script_accompany_marshall_aux_ai = 508
 script_find_theater = 509
 script_find_closest_enemy_town_or_host_only = 510
+script_cf_gain_trait_butcher = 511
 
 
diff --git a/ModuleSystem/ID/ID_scripts_wb.py b/ModuleSystem/ID/ID_scripts_wb.py
@@ -509,14 +509,15 @@
 script_accompany_marshall_aux_ai = 508
 script_find_theater = 509
 script_find_closest_enemy_town_or_host_only = 510
-script_game_get_upgrade_cost = 511
-script_game_get_morale_of_troops_from_faction = 512
-script_troop_tree_recursive_backtracking = 513
-script_troop_tree_recursive_detect_max_tier = 514
-script_prsnt_line = 515
-script_get_page_no_of_troop_tree_for_troop_on = 516
-script_init_camera = 517
-script_dmod_cycle_forwards = 518
-script_dmod_cycle_backwards = 519
+script_cf_gain_trait_butcher = 511
+script_game_get_upgrade_cost = 512
+script_game_get_morale_of_troops_from_faction = 513
+script_troop_tree_recursive_backtracking = 514
+script_troop_tree_recursive_detect_max_tier = 515
+script_prsnt_line = 516
+script_get_page_no_of_troop_tree_for_troop_on = 517
+script_init_camera = 518
+script_dmod_cycle_forwards = 519
+script_dmod_cycle_backwards = 520
 
 
diff --git a/ModuleSystem/ID/ID_strings.py b/ModuleSystem/ID/ID_strings.py
@@ -2093,101 +2093,103 @@
 str_trait_desc_battle_scarred = 2092
 str_trait_title_fell_beast = 2093
 str_trait_desc_fell_beast = 2094
-str_wound_head = 2095
-str_wound_chest = 2096
-str_wound_arm = 2097
-str_wound_leg = 2098
-str_gondor_gift0 = 2099
-str_gondor_gift1 = 2100
-str_gondor_gift2 = 2101
-str_gondor_gift3 = 2102
-str_gondor_gift4 = 2103
-str_dwarf_gift0 = 2104
-str_dwarf_gift1 = 2105
-str_dwarf_gift2 = 2106
-str_dwarf_gift3 = 2107
-str_dwarf_gift4 = 2108
-str_rohan_gift0 = 2109
-str_rohan_gift1 = 2110
-str_rohan_gift2 = 2111
-str_rohan_gift3 = 2112
-str_rohan_gift4 = 2113
-str_mordor_gift0 = 2114
-str_mordor_gift1 = 2115
-str_mordor_gift2 = 2116
-str_mordor_gift3 = 2117
-str_mordor_gift4 = 2118
-str_isengard_gift0 = 2119
-str_isengard_gift1 = 2120
-str_isengard_gift2 = 2121
-str_isengard_gift3 = 2122
-str_isengard_gift4 = 2123
-str_lorien_gift0 = 2124
-str_lorien_gift1 = 2125
-str_lorien_gift2 = 2126
-str_lorien_gift3 = 2127
-str_lorien_gift4 = 2128
-str_imladris_gift0 = 2129
-str_imladris_gift1 = 2130
-str_imladris_gift2 = 2131
-str_imladris_gift3 = 2132
-str_imladris_gift4 = 2133
-str_woodelf_gift0 = 2134
-str_woodelf_gift1 = 2135
-str_woodelf_gift2 = 2136
-str_woodelf_gift3 = 2137
-str_woodelf_gift4 = 2138
-str_dale_gift0 = 2139
-str_dale_gift1 = 2140
-str_dale_gift2 = 2141
-str_dale_gift3 = 2142
-str_dale_gift4 = 2143
-str_harad_gift0 = 2144
-str_harad_gift1 = 2145
-str_harad_gift2 = 2146
-str_harad_gift3 = 2147
-str_harad_gift4 = 2148
-str_rhun_gift0 = 2149
-str_rhun_gift1 = 2150
-str_rhun_gift2 = 2151
-str_rhun_gift3 = 2152
-str_rhun_gift4 = 2153
-str_khand_gift0 = 2154
-str_khand_gift1 = 2155
-str_khand_gift2 = 2156
-str_khand_gift3 = 2157
-str_khand_gift4 = 2158
-str_umbar_gift0 = 2159
-str_umbar_gift1 = 2160
-str_umbar_gift2 = 2161
-str_umbar_gift3 = 2162
-str_umbar_gift4 = 2163
-str_moria_gift0 = 2164
-str_moria_gift1 = 2165
-str_moria_gift2 = 2166
-str_moria_gift3 = 2167
-str_moria_gift4 = 2168
-str_guldur_gift0 = 2169
-str_guldur_gift1 = 2170
-str_guldur_gift2 = 2171
-str_guldur_gift3 = 2172
-str_guldur_gift4 = 2173
-str_gundabad_gift0 = 2174
-str_gundabad_gift1 = 2175
-str_gundabad_gift2 = 2176
-str_gundabad_gift3 = 2177
-str_gundabad_gift4 = 2178
-str_dunland_gift0 = 2179
-str_dunland_gift1 = 2180
-str_dunland_gift2 = 2181
-str_dunland_gift3 = 2182
-str_dunland_gift4 = 2183
-str_beorn_gift0 = 2184
-str_beorn_gift1 = 2185
-str_beorn_gift2 = 2186
-str_beorn_gift3 = 2187
-str_beorn_gift4 = 2188
-str_cmenu_follow = 2189
-str_fake_party = 2190
+str_trait_title_butcher = 2095
+str_trait_desc_butcher = 2096
+str_wound_head = 2097
+str_wound_chest = 2098
+str_wound_arm = 2099
+str_wound_leg = 2100
+str_gondor_gift0 = 2101
+str_gondor_gift1 = 2102
+str_gondor_gift2 = 2103
+str_gondor_gift3 = 2104
+str_gondor_gift4 = 2105
+str_dwarf_gift0 = 2106
+str_dwarf_gift1 = 2107
+str_dwarf_gift2 = 2108
+str_dwarf_gift3 = 2109
+str_dwarf_gift4 = 2110
+str_rohan_gift0 = 2111
+str_rohan_gift1 = 2112
+str_rohan_gift2 = 2113
+str_rohan_gift3 = 2114
+str_rohan_gift4 = 2115
+str_mordor_gift0 = 2116
+str_mordor_gift1 = 2117
+str_mordor_gift2 = 2118
+str_mordor_gift3 = 2119
+str_mordor_gift4 = 2120
+str_isengard_gift0 = 2121
+str_isengard_gift1 = 2122
+str_isengard_gift2 = 2123
+str_isengard_gift3 = 2124
+str_isengard_gift4 = 2125
+str_lorien_gift0 = 2126
+str_lorien_gift1 = 2127
+str_lorien_gift2 = 2128
+str_lorien_gift3 = 2129
+str_lorien_gift4 = 2130
+str_imladris_gift0 = 2131
+str_imladris_gift1 = 2132
+str_imladris_gift2 = 2133
+str_imladris_gift3 = 2134
+str_imladris_gift4 = 2135
+str_woodelf_gift0 = 2136
+str_woodelf_gift1 = 2137
+str_woodelf_gift2 = 2138
+str_woodelf_gift3 = 2139
+str_woodelf_gift4 = 2140
+str_dale_gift0 = 2141
+str_dale_gift1 = 2142
+str_dale_gift2 = 2143
+str_dale_gift3 = 2144
+str_dale_gift4 = 2145
+str_harad_gift0 = 2146
+str_harad_gift1 = 2147
+str_harad_gift2 = 2148
+str_harad_gift3 = 2149
+str_harad_gift4 = 2150
+str_rhun_gift0 = 2151
+str_rhun_gift1 = 2152
+str_rhun_gift2 = 2153
+str_rhun_gift3 = 2154
+str_rhun_gift4 = 2155
+str_khand_gift0 = 2156
+str_khand_gift1 = 2157
+str_khand_gift2 = 2158
+str_khand_gift3 = 2159
+str_khand_gift4 = 2160
+str_umbar_gift0 = 2161
+str_umbar_gift1 = 2162
+str_umbar_gift2 = 2163
+str_umbar_gift3 = 2164
+str_umbar_gift4 = 2165
+str_moria_gift0 = 2166
+str_moria_gift1 = 2167
+str_moria_gift2 = 2168
+str_moria_gift3 = 2169
+str_moria_gift4 = 2170
+str_guldur_gift0 = 2171
+str_guldur_gift1 = 2172
+str_guldur_gift2 = 2173
+str_guldur_gift3 = 2174
+str_guldur_gift4 = 2175
+str_gundabad_gift0 = 2176
+str_gundabad_gift1 = 2177
+str_gundabad_gift2 = 2178
+str_gundabad_gift3 = 2179
+str_gundabad_gift4 = 2180
+str_dunland_gift0 = 2181
+str_dunland_gift1 = 2182
+str_dunland_gift2 = 2183
+str_dunland_gift3 = 2184
+str_dunland_gift4 = 2185
+str_beorn_gift0 = 2186
+str_beorn_gift1 = 2187
+str_beorn_gift2 = 2188
+str_beorn_gift3 = 2189
+str_beorn_gift4 = 2190
+str_cmenu_follow = 2191
+str_fake_party = 2192
 
 
diff --git a/ModuleSystem/module_constants.py b/ModuleSystem/module_constants.py
@@ -884,8 +884,9 @@
 slot_trait_foe_hammer        = 20
 slot_trait_battle_scarred    = 21
 slot_trait_fell_beast        = 22
+slot_trait_butcher			 = 23 #Kham
 slot_trait_first             = slot_trait_elf_friend
-slot_trait_last              = slot_trait_fell_beast
+slot_trait_last              = slot_trait_butcher
 
 
 ########################################################

diff --git a/ModuleSystem/module_dialogs.py b/ModuleSystem/module_dialogs.py
@@ -10116,7 +10116,20 @@
 		#(agent_deliver_damage_to_agent, reg1, ":agent"),
 	(try_end),
 	(party_remove_prisoners, "p_main_party", "$g_talk_troop", 1),
-	(troop_add_item,"trp_player", "itm_human_meat",imod_fresh)]],
+  (try_begin),
+    (lt, "$butcher_trait_kills",35),
+    (val_add, "$butcher_trait_kills",1),
+  (else_try),
+    (eq, "$butcher_trait_kills", 35),
+    (call_script, "script_cf_gain_trait_butcher"),
+  (try_end),
+  (try_begin),
+    (troop_slot_eq, "trp_traits",  slot_trait_butcher,1),
+	  (troop_add_item,"trp_player", "itm_human_meat",imod_fresh),
+    (troop_add_item,"trp_player", "itm_human_meat",imod_fresh),
+  (else_try),
+    (troop_add_item,"trp_player", "itm_human_meat",imod_fresh),
+  (try_end)]],
 
 [anyone,"start", [(this_or_next|is_between,"$g_talk_troop",weapon_merchants_begin,weapon_merchants_end),
                     #(this_or_next|is_between,"$g_talk_troop",armor_merchants_begin, armor_merchants_end),

diff --git a/ModuleSystem/module_scripts.py b/ModuleSystem/module_scripts.py
@@ -1827,6 +1827,7 @@ def set_item_faction():
 	(assign, "$formations_tutorial", 0), #Kham - Formations Tutorial.
 	(assign, "$total_kills",0), #Kham - Kill Counter
 	(assign, "$player_allowed_siege",0), #Kham - Player Initiated Sieges
+	(assign, "$butcher_trait_kills", 0), #Kham - Butcher Trait
 
 	] + (is_a_wb_script==1 and [
 	(call_script, "script_init_camera"),	 #Custom Camera Initialize
@@ -20701,6 +20702,12 @@ def set_item_faction():
 	 (assign, reg1, ":dist"),
 ]),
 
+#script_cf_gain_trait_butcher
+("cf_gain_trait_butcher",[
+    (troop_slot_eq, "trp_traits", slot_trait_butcher, 0),
+    (call_script, "script_gain_trait", slot_trait_butcher),
+]),
+
 ]
 
 scripts = scripts + ai_scripts + formAI_scripts + morale_scripts + command_cursor_scripts

diff --git a/ModuleSystem/module_strings.py b/ModuleSystem/module_strings.py
@@ -2945,6 +2945,8 @@
 ("trait_title_fell_beast", "Fell_Beast"),
 ("trait_desc_fell_beast", "Your_hide_is_riven_with_the_knotted_scars_of_countless_battles_and_your_evil_will_is_likewise_hard_and_unyielding._Even_by_the_standards_of_orc,_uruk_and_troll-kind_you_are_judged_a_fell_and_dangerous_beast._Those_who_serve_you_cry_your_name_in_joy_when_you_take_to_the_field._You_are_an_avatar_of_war_itself_and_there_is_little_you_fear."),
 
+("trait_title_butcher", "Butcher"),
+("trait_desc_butcher", "Experience_has_honed_your_skill_in_extracting_more_meat_from_the_flesh_of_your_enemies._You_gain_an_extra_pound_of_flesh_every_time_you_slaughter_one_of_your_prisoners_for_meat."),
 # END Traits
 
 # BEGIN Wound Strings

diff --git a/ModuleSystem/variables.txt b/ModuleSystem/variables.txt
@@ -673,3 +673,4 @@ gondor_reinforcement_event_menu
 oath_kills
 total_kills
 player_allowed_siege
+butcher_trait_kills
diff --git a/ModuleSystem/variables_wb.txt b/ModuleSystem/variables_wb.txt
@@ -697,3 +697,4 @@ gondor_reinforcement_event_menu
 oath_kills
 total_kills
 player_allowed_siege
+butcher_trait_kills