Skip to content

Commit

Permalink
*Add menu for when faction gets sieged / is sieging (tied to rank) + …
Browse files Browse the repository at this point in the history 
…Fix Troll Crotch shot during dialogues + test: heroes do not patrol unless with host

- When player reaches rank 4 in a faction, they will now get menu prompts that the faction is besieging or is besieged.
- Fix troll dialogue crotch shot
- Test: Do not let lords patrol unless they have a host. Prevent things like Imrahil / Theoden crazy charges.
  • Loading branch information
@khamukkamu
khamukkamu committed Dec 6, 2017
1 parent 53deb55 commit f726fda
Show file tree
Hide file tree
Showing 25 changed files with 524 additions and 422 deletions.
152 changes: 77 additions & 75 deletions ModuleSystem/ID/ID_menus_mb.py
View file
Expand Up @@ -154,78 +154,80 @@
menu_gondor_reinforcement_event = 153
menu_gondor_beacons = 154
menu_player_added_to_war_council = 155
menu_auto_return_to_map = 156
menu_auto_player_garrison = 157
menu_auto_player_garrison_2 = 158
menu_auto_town_brawl = 159
menu_auto_intro_rohan = 160
menu_auto_intro_gondor = 161
menu_auto_intro_mordor = 162
menu_auto_intro_joke = 163
menu_auto_convo = 164
menu_auto_conversation_cutscene = 165
menu_unified_start_quest = 166
menu_starting_quest_victory_good = 167
menu_starting_quest_victory_evil = 168
menu_starting_quest_victory_evil_no_duel = 169
menu_start_quest_duel_won = 170
menu_starting_quest_victory_elves = 171
menu_starting_quest_victory_easterlings = 172
menu_start_quest_duel = 173
menu_village_quest = 174
menu_village_quest_result = 175
menu_scout_camp_quest = 176
menu_destroy_scout_camp_quest_result = 177
menu_sea_battle_quest = 178
menu_sea_battle_quest_results = 179
menu_camp_field_ai = 180
menu_auto_field_ai = 181
menu_hungry_orc = 182
menu_leaving_elf = 183
menu_refugees_quest = 184
menu_custom_battle_choose_faction1 = 185
menu_custom_battle_choose_faction2 = 186
menu_custom_battle_choose_faction3 = 187
menu_ancient_ruins = 188
menu_pick_troops = 189
menu_burial_mound = 190
menu_burial_mound_respects = 191
menu_burial_mound_oath = 192
menu_burial_mound_despoil = 193
menu_funeral_pyre = 194
menu_town_ruins = 195
menu_premutiny = 196
menu_mutiny = 197
menu_death = 198
menu_animal_ambush = 199
menu_animal_ambush_success = 200
menu_animal_ambush_fail = 201
menu_build_your_scene = 202
menu_choose_scenes_0 = 203
menu_choose_scenes_13 = 204
menu_choose_scenes_26 = 205
menu_choose_scenes_39 = 206
menu_choose_scenes_52 = 207
menu_choose_scenes_65 = 208
menu_choose_scenes_78 = 209
menu_choose_scenes_91 = 210
menu_choose_scenes_104 = 211
menu_choose_scenes_117 = 212
menu_choose_scenes_130 = 213
menu_choose_scenes_143 = 214
menu_choose_scenes_156 = 215
menu_choose_scenes_169 = 216
menu_choose_scenes_182 = 217
menu_choose_scenes_195 = 218
menu_choose_scenes_208 = 219
menu_choose_scenes_221 = 220
menu_choose_scenes_234 = 221
menu_choose_scenes_247 = 222
menu_choose_scenes_260 = 223
menu_choose_scenes_273 = 224
menu_choose_scenes_286 = 225
menu_choose_scenes_299 = 226
menu_choose_scenes_312 = 227
menu_choose_scenes_325 = 228
menu_choose_scenes_338 = 229
menu_choose_scenes_351 = 230
menu_player_added_to_siege_reports = 156
menu_center_besieged_event = 157
menu_auto_return_to_map = 158
menu_auto_player_garrison = 159
menu_auto_player_garrison_2 = 160
menu_auto_town_brawl = 161
menu_auto_intro_rohan = 162
menu_auto_intro_gondor = 163
menu_auto_intro_mordor = 164
menu_auto_intro_joke = 165
menu_auto_convo = 166
menu_auto_conversation_cutscene = 167
menu_unified_start_quest = 168
menu_starting_quest_victory_good = 169
menu_starting_quest_victory_evil = 170
menu_starting_quest_victory_evil_no_duel = 171
menu_start_quest_duel_won = 172
menu_starting_quest_victory_elves = 173
menu_starting_quest_victory_easterlings = 174
menu_start_quest_duel = 175
menu_village_quest = 176
menu_village_quest_result = 177
menu_scout_camp_quest = 178
menu_destroy_scout_camp_quest_result = 179
menu_sea_battle_quest = 180
menu_sea_battle_quest_results = 181
menu_camp_field_ai = 182
menu_auto_field_ai = 183
menu_hungry_orc = 184
menu_leaving_elf = 185
menu_refugees_quest = 186
menu_custom_battle_choose_faction1 = 187
menu_custom_battle_choose_faction2 = 188
menu_custom_battle_choose_faction3 = 189
menu_ancient_ruins = 190
menu_pick_troops = 191
menu_burial_mound = 192
menu_burial_mound_respects = 193
menu_burial_mound_oath = 194
menu_burial_mound_despoil = 195
menu_funeral_pyre = 196
menu_town_ruins = 197
menu_premutiny = 198
menu_mutiny = 199
menu_death = 200
menu_animal_ambush = 201
menu_animal_ambush_success = 202
menu_animal_ambush_fail = 203
menu_build_your_scene = 204
menu_choose_scenes_0 = 205
menu_choose_scenes_13 = 206
menu_choose_scenes_26 = 207
menu_choose_scenes_39 = 208
menu_choose_scenes_52 = 209
menu_choose_scenes_65 = 210
menu_choose_scenes_78 = 211
menu_choose_scenes_91 = 212
menu_choose_scenes_104 = 213
menu_choose_scenes_117 = 214
menu_choose_scenes_130 = 215
menu_choose_scenes_143 = 216
menu_choose_scenes_156 = 217
menu_choose_scenes_169 = 218
menu_choose_scenes_182 = 219
menu_choose_scenes_195 = 220
menu_choose_scenes_208 = 221
menu_choose_scenes_221 = 222
menu_choose_scenes_234 = 223
menu_choose_scenes_247 = 224
menu_choose_scenes_260 = 225
menu_choose_scenes_273 = 226
menu_choose_scenes_286 = 227
menu_choose_scenes_299 = 228
menu_choose_scenes_312 = 229
menu_choose_scenes_325 = 230
menu_choose_scenes_338 = 231
menu_choose_scenes_351 = 232
152 changes: 77 additions & 75 deletions ModuleSystem/ID/ID_menus_wb.py
View file
Expand Up @@ -154,78 +154,80 @@
menu_gondor_reinforcement_event = 153
menu_gondor_beacons = 154
menu_player_added_to_war_council = 155
menu_auto_return_to_map = 156
menu_auto_player_garrison = 157
menu_auto_player_garrison_2 = 158
menu_auto_town_brawl = 159
menu_auto_intro_rohan = 160
menu_auto_intro_gondor = 161
menu_auto_intro_mordor = 162
menu_auto_intro_joke = 163
menu_auto_convo = 164
menu_auto_conversation_cutscene = 165
menu_unified_start_quest = 166
menu_starting_quest_victory_good = 167
menu_starting_quest_victory_evil = 168
menu_starting_quest_victory_evil_no_duel = 169
menu_start_quest_duel_won = 170
menu_starting_quest_victory_elves = 171
menu_starting_quest_victory_easterlings = 172
menu_start_quest_duel = 173
menu_village_quest = 174
menu_village_quest_result = 175
menu_scout_camp_quest = 176
menu_destroy_scout_camp_quest_result = 177
menu_sea_battle_quest = 178
menu_sea_battle_quest_results = 179
menu_camp_field_ai = 180
menu_auto_field_ai = 181
menu_hungry_orc = 182
menu_leaving_elf = 183
menu_refugees_quest = 184
menu_custom_battle_choose_faction1 = 185
menu_custom_battle_choose_faction2 = 186
menu_custom_battle_choose_faction3 = 187
menu_ancient_ruins = 188
menu_pick_troops = 189
menu_burial_mound = 190
menu_burial_mound_respects = 191
menu_burial_mound_oath = 192
menu_burial_mound_despoil = 193
menu_funeral_pyre = 194
menu_town_ruins = 195
menu_premutiny = 196
menu_mutiny = 197
menu_death = 198
menu_animal_ambush = 199
menu_animal_ambush_success = 200
menu_animal_ambush_fail = 201
menu_build_your_scene = 202
menu_choose_scenes_0 = 203
menu_choose_scenes_13 = 204
menu_choose_scenes_26 = 205
menu_choose_scenes_39 = 206
menu_choose_scenes_52 = 207
menu_choose_scenes_65 = 208
menu_choose_scenes_78 = 209
menu_choose_scenes_91 = 210
menu_choose_scenes_104 = 211
menu_choose_scenes_117 = 212
menu_choose_scenes_130 = 213
menu_choose_scenes_143 = 214
menu_choose_scenes_156 = 215
menu_choose_scenes_169 = 216
menu_choose_scenes_182 = 217
menu_choose_scenes_195 = 218
menu_choose_scenes_208 = 219
menu_choose_scenes_221 = 220
menu_choose_scenes_234 = 221
menu_choose_scenes_247 = 222
menu_choose_scenes_260 = 223
menu_choose_scenes_273 = 224
menu_choose_scenes_286 = 225
menu_choose_scenes_299 = 226
menu_choose_scenes_312 = 227
menu_choose_scenes_325 = 228
menu_choose_scenes_338 = 229
menu_choose_scenes_351 = 230
menu_player_added_to_siege_reports = 156
menu_center_besieged_event = 157
menu_auto_return_to_map = 158
menu_auto_player_garrison = 159
menu_auto_player_garrison_2 = 160
menu_auto_town_brawl = 161
menu_auto_intro_rohan = 162
menu_auto_intro_gondor = 163
menu_auto_intro_mordor = 164
menu_auto_intro_joke = 165
menu_auto_convo = 166
menu_auto_conversation_cutscene = 167
menu_unified_start_quest = 168
menu_starting_quest_victory_good = 169
menu_starting_quest_victory_evil = 170
menu_starting_quest_victory_evil_no_duel = 171
menu_start_quest_duel_won = 172
menu_starting_quest_victory_elves = 173
menu_starting_quest_victory_easterlings = 174
menu_start_quest_duel = 175
menu_village_quest = 176
menu_village_quest_result = 177
menu_scout_camp_quest = 178
menu_destroy_scout_camp_quest_result = 179
menu_sea_battle_quest = 180
menu_sea_battle_quest_results = 181
menu_camp_field_ai = 182
menu_auto_field_ai = 183
menu_hungry_orc = 184
menu_leaving_elf = 185
menu_refugees_quest = 186
menu_custom_battle_choose_faction1 = 187
menu_custom_battle_choose_faction2 = 188
menu_custom_battle_choose_faction3 = 189
menu_ancient_ruins = 190
menu_pick_troops = 191
menu_burial_mound = 192
menu_burial_mound_respects = 193
menu_burial_mound_oath = 194
menu_burial_mound_despoil = 195
menu_funeral_pyre = 196
menu_town_ruins = 197
menu_premutiny = 198
menu_mutiny = 199
menu_death = 200
menu_animal_ambush = 201
menu_animal_ambush_success = 202
menu_animal_ambush_fail = 203
menu_build_your_scene = 204
menu_choose_scenes_0 = 205
menu_choose_scenes_13 = 206
menu_choose_scenes_26 = 207
menu_choose_scenes_39 = 208
menu_choose_scenes_52 = 209
menu_choose_scenes_65 = 210
menu_choose_scenes_78 = 211
menu_choose_scenes_91 = 212
menu_choose_scenes_104 = 213
menu_choose_scenes_117 = 214
menu_choose_scenes_130 = 215
menu_choose_scenes_143 = 216
menu_choose_scenes_156 = 217
menu_choose_scenes_169 = 218
menu_choose_scenes_182 = 219
menu_choose_scenes_195 = 220
menu_choose_scenes_208 = 221
menu_choose_scenes_221 = 222
menu_choose_scenes_234 = 223
menu_choose_scenes_247 = 224
menu_choose_scenes_260 = 225
menu_choose_scenes_273 = 226
menu_choose_scenes_286 = 227
menu_choose_scenes_299 = 228
menu_choose_scenes_312 = 229
menu_choose_scenes_325 = 230
menu_choose_scenes_338 = 231
menu_choose_scenes_351 = 232
3 changes: 2 additions & 1 deletion ModuleSystem/module_constants.py
View file
Expand Up @@ -2350,8 +2350,9 @@ def concatenate_scripts(block_list):
slot_agent_horse_agent = 303
slot_agent_rider_agent = 304

#War Council Slots
#Rank Trigger Slots
slot_faction_war_council = 305
slot_faction_siege_reports = 306

#New Party Creation/Removal system
slot_party_dormant = 306
Expand Down
12 changes: 7 additions & 5 deletions ModuleSystem/module_dialogs.py
View file
Expand Up @@ -325,8 +325,8 @@
(le, ":int", 12)],
"{s5}", "troll_goodbye",[]],

[trp_easter_egg_troll, "troll_beaten", [(agent_set_animation, "$g_talk_agent", "anim_troll_or_ent_bend_rise")], "I bow to your wisdom, Master Baiter of Trolls!", "troll_talk_1",[]],
[trp_easter_egg_troll, "troll_goodbye", [(agent_set_animation, "$g_talk_agent", "anim_troll_or_ent_bend_rise")], "TROLLOLOLOLOLOLOLOLOLOL!", "close_window",[(call_script,"script_stand_back"),]],
[trp_easter_egg_troll, "troll_beaten", [(agent_set_animation, "$g_talk_agent", "anim_troll_or_ent_bend_continue")], "I bow to your wisdom, Master Baiter of Trolls!", "troll_talk_1",[]],
[trp_easter_egg_troll, "troll_goodbye", [(agent_set_animation, "$g_talk_agent", "anim_troll_or_ent_bend_continue")], "TROLLOLOLOLOLOLOLOLOLOL!", "close_window",[(call_script,"script_stand_back"),]],


#### HOBBITS CHATS... prelimintaries (mtarini)
Expand Down Expand Up @@ -661,7 +661,8 @@
#TLD STUFFF
#####################################################################

[pt_wild_troll|party_tpl, "start", [], "^^GROWL!^^", "close_window",[] ],
[pt_wild_troll|party_tpl, "start", [(agent_set_animation, "$g_talk_agent", "anim_troll_or_ent_bend_continue")], "^^GROWL!^^", "close_window",[] ],
[pt_raging_trolls|party_tpl, "start", [(agent_set_animation, "$g_talk_agent", "anim_troll_or_ent_bend_continue")], "^^GROWL!^^", "close_window",[] ],


### COMPANIONS
Expand Down Expand Up @@ -11022,7 +11023,7 @@
#[anyone|plyr,"prisoner_chat_00", [], "Guards, bring me that one!", "prisoner_chat_2",[]],

# CppCoder bugfix: Trolls go rawr...
[anyone,"prisoner_chat_00", [(store_conversation_troop,reg1),(troop_get_type, ":troll", reg1),(eq, ":troll", tf_troll)], "^^GROWL!^^", "close_window",[]],
[anyone,"prisoner_chat_00", [(store_conversation_troop,reg1),(troop_get_type, ":troll", reg1),(eq, ":troll", tf_troll), (agent_set_animation, "$g_talk_agent", "anim_troll_or_ent_bend_continue")], "^^GROWL!^^", "close_window",[]],

[anyone,"prisoner_chat_00", [], "You put me in chains already, what more do you want?", "prisoner_chat_3",[]],
[anyone|plyr,"prisoner_chat_3", [],"Don't try anything, you scum!", "prisoner_chat_4",[]],
Expand Down Expand Up @@ -11337,7 +11338,7 @@
######################################

# CppCoder bugfix: Trolls go rawr...
[anyone,"member_chat_00", [(troop_get_type, ":troll", "$g_talk_troop"),(eq, ":troll", tf_troll)], "^^GROWL!^^", "close_window",[]],
[anyone,"member_chat_00", [(troop_get_type, ":troll", "$g_talk_troop"),(eq, ":troll", tf_troll), (agent_set_animation, "$g_talk_agent", "anim_troll_or_ent_bend_continue")], "^^GROWL!^^", "close_window",[]],

[anyone,"member_chat_00", [(troop_slot_eq, "$g_talk_troop", slot_troop_upkeep_not_paid,0)], # or else, incipit is different
"Your orders, Commander?", "regular_member_talk",[]],
Expand Down Expand Up @@ -11450,6 +11451,7 @@
(eq, "$g_encountered_party_template", "pt_routed_allies"),
(troop_get_type, ":race", "$g_talk_troop"),
(eq, ":race", tf_troll),
(agent_set_animation, "$g_talk_agent", "anim_troll_or_ent_bend_continue"),
],
"^^GROWL!^^", "routed_allies_talk_troll", [] ],

Expand Down

0 comments on commit f726fda

Please sign in to comment.