*Add temp siege scenes for evil camps + fix to morale rallies

- Added temp siege scenes - Added siege scene constants - Fix morale rally issue - Add player initiated siege menu (dev only).
tldmod · Mar 20, 2017 · 30c99ce · 30c99ce
1 parent d025d42
commit 30c99ce
Show file tree

Hide file tree

Showing 37 changed files with 899 additions and 567 deletions.
diff --git a/ModuleSystem/ID/ID_menus_mb.py b/ModuleSystem/ID/ID_menus_mb.py
@@ -118,94 +118,96 @@
 menu_town_brawl_won = 117
 menu_close = 118
 menu_town = 119
-menu_disembark = 120
-menu_ship_reembark = 121
-menu_center_reports = 122
-menu_sneak_into_town_suceeded = 123
-menu_sneak_into_town_caught = 124
-menu_sneak_into_town_caught_dispersed_guards = 125
-menu_sneak_into_town_caught_ran_away = 126
-menu_auto_training_ground_trainer = 127
-menu_tld_player_defeated = 128
-menu_recover_after_death_fangorn = 129
-menu_recover_after_death_moria = 130
-menu_recover_after_death_default = 131
-menu_recover_after_death_town = 132
-menu_recover_after_death_town_alone = 133
-menu_notification_center_under_siege = 134
-menu_notification_one_side_left = 135
-menu_notification_total_defeat = 136
-menu_notification_your_faction_collapsed = 137
-menu_notification_faction_defeated = 138
-menu_ruins = 139
-menu_legendary_place = 140
-menu_ring_hunter_lair = 141
-menu_ring_hunter_lair_destroyed = 142
-menu_raftmen = 143
-menu_ride_to_dorwinion = 144
-menu_amath_dollen_fortress = 145
-menu_gondor_reinforcement_event = 146
-menu_auto_return_to_map = 147
-menu_auto_player_garrison = 148
-menu_auto_player_garrison_2 = 149
-menu_auto_town_brawl = 150
-menu_auto_intro_rohan = 151
-menu_auto_intro_gondor = 152
-menu_auto_intro_mordor = 153
-menu_auto_intro_joke = 154
-menu_auto_convo = 155
-menu_auto_conversation_cutscene = 156
-menu_unified_start_quest = 157
-menu_starting_quest_victory_good = 158
-menu_starting_quest_victory_evil = 159
-menu_starting_quest_victory_evil_no_duel = 160
-menu_start_quest_duel_won = 161
-menu_starting_quest_victory_elves = 162
-menu_starting_quest_victory_easterlings = 163
-menu_start_quest_duel = 164
-menu_village_quest = 165
-menu_village_quest_result = 166
-menu_scout_camp_quest = 167
-menu_destroy_scout_camp_quest_result = 168
-menu_custom_battle_choose_faction1 = 169
-menu_custom_battle_choose_faction2 = 170
-menu_custom_battle_choose_faction3 = 171
-menu_ancient_ruins = 172
-menu_pick_troops = 173
-menu_burial_mound = 174
-menu_burial_mound_respects = 175
-menu_burial_mound_oath = 176
-menu_burial_mound_despoil = 177
-menu_funeral_pyre = 178
-menu_town_ruins = 179
-menu_premutiny = 180
-menu_mutiny = 181
-menu_death = 182
-menu_animal_ambush = 183
-menu_animal_ambush_success = 184
-menu_animal_ambush_fail = 185
-menu_build_your_scene = 186
-menu_choose_scenes_0 = 187
-menu_choose_scenes_13 = 188
-menu_choose_scenes_26 = 189
-menu_choose_scenes_39 = 190
-menu_choose_scenes_52 = 191
-menu_choose_scenes_65 = 192
-menu_choose_scenes_78 = 193
-menu_choose_scenes_91 = 194
-menu_choose_scenes_104 = 195
-menu_choose_scenes_117 = 196
-menu_choose_scenes_130 = 197
-menu_choose_scenes_143 = 198
-menu_choose_scenes_156 = 199
-menu_choose_scenes_169 = 200
-menu_choose_scenes_182 = 201
-menu_choose_scenes_195 = 202
-menu_choose_scenes_208 = 203
-menu_choose_scenes_221 = 204
-menu_choose_scenes_234 = 205
-menu_choose_scenes_247 = 206
-menu_choose_scenes_260 = 207
-menu_choose_scenes_273 = 208
-menu_choose_scenes_286 = 209
-menu_choose_scenes_299 = 210
+menu_player_initiated_siege_result = 120
+menu_disembark = 121
+menu_ship_reembark = 122
+menu_center_reports = 123
+menu_sneak_into_town_suceeded = 124
+menu_sneak_into_town_caught = 125
+menu_sneak_into_town_caught_dispersed_guards = 126
+menu_sneak_into_town_caught_ran_away = 127
+menu_auto_training_ground_trainer = 128
+menu_tld_player_defeated = 129
+menu_recover_after_death_fangorn = 130
+menu_recover_after_death_moria = 131
+menu_recover_after_death_default = 132
+menu_recover_after_death_town = 133
+menu_recover_after_death_town_alone = 134
+menu_notification_center_under_siege = 135
+menu_notification_one_side_left = 136
+menu_notification_total_defeat = 137
+menu_notification_your_faction_collapsed = 138
+menu_notification_faction_defeated = 139
+menu_ruins = 140
+menu_legendary_place = 141
+menu_ring_hunter_lair = 142
+menu_ring_hunter_lair_destroyed = 143
+menu_raftmen = 144
+menu_ride_to_dorwinion = 145
+menu_amath_dollen_fortress = 146
+menu_gondor_reinforcement_event = 147
+menu_auto_return_to_map = 148
+menu_auto_player_garrison = 149
+menu_auto_player_garrison_2 = 150
+menu_auto_town_brawl = 151
+menu_auto_intro_rohan = 152
+menu_auto_intro_gondor = 153
+menu_auto_intro_mordor = 154
+menu_auto_intro_joke = 155
+menu_auto_convo = 156
+menu_auto_conversation_cutscene = 157
+menu_unified_start_quest = 158
+menu_starting_quest_victory_good = 159
+menu_starting_quest_victory_evil = 160
+menu_starting_quest_victory_evil_no_duel = 161
+menu_start_quest_duel_won = 162
+menu_starting_quest_victory_elves = 163
+menu_starting_quest_victory_easterlings = 164
+menu_start_quest_duel = 165
+menu_village_quest = 166
+menu_village_quest_result = 167
+menu_scout_camp_quest = 168
+menu_destroy_scout_camp_quest_result = 169
+menu_custom_battle_choose_faction1 = 170
+menu_custom_battle_choose_faction2 = 171
+menu_custom_battle_choose_faction3 = 172
+menu_ancient_ruins = 173
+menu_pick_troops = 174
+menu_burial_mound = 175
+menu_burial_mound_respects = 176
+menu_burial_mound_oath = 177
+menu_burial_mound_despoil = 178
+menu_funeral_pyre = 179
+menu_town_ruins = 180
+menu_premutiny = 181
+menu_mutiny = 182
+menu_death = 183
+menu_animal_ambush = 184
+menu_animal_ambush_success = 185
+menu_animal_ambush_fail = 186
+menu_build_your_scene = 187
+menu_choose_scenes_0 = 188
+menu_choose_scenes_13 = 189
+menu_choose_scenes_26 = 190
+menu_choose_scenes_39 = 191
+menu_choose_scenes_52 = 192
+menu_choose_scenes_65 = 193
+menu_choose_scenes_78 = 194
+menu_choose_scenes_91 = 195
+menu_choose_scenes_104 = 196
+menu_choose_scenes_117 = 197
+menu_choose_scenes_130 = 198
+menu_choose_scenes_143 = 199
+menu_choose_scenes_156 = 200
+menu_choose_scenes_169 = 201
+menu_choose_scenes_182 = 202
+menu_choose_scenes_195 = 203
+menu_choose_scenes_208 = 204
+menu_choose_scenes_221 = 205
+menu_choose_scenes_234 = 206
+menu_choose_scenes_247 = 207
+menu_choose_scenes_260 = 208
+menu_choose_scenes_273 = 209
+menu_choose_scenes_286 = 210
+menu_choose_scenes_299 = 211
+menu_choose_scenes_312 = 212
diff --git a/ModuleSystem/ID/ID_menus_wb.py b/ModuleSystem/ID/ID_menus_wb.py
@@ -118,94 +118,96 @@
 menu_town_brawl_won = 117
 menu_close = 118
 menu_town = 119
-menu_disembark = 120
-menu_ship_reembark = 121
-menu_center_reports = 122
-menu_sneak_into_town_suceeded = 123
-menu_sneak_into_town_caught = 124
-menu_sneak_into_town_caught_dispersed_guards = 125
-menu_sneak_into_town_caught_ran_away = 126
-menu_auto_training_ground_trainer = 127
-menu_tld_player_defeated = 128
-menu_recover_after_death_fangorn = 129
-menu_recover_after_death_moria = 130
-menu_recover_after_death_default = 131
-menu_recover_after_death_town = 132
-menu_recover_after_death_town_alone = 133
-menu_notification_center_under_siege = 134
-menu_notification_one_side_left = 135
-menu_notification_total_defeat = 136
-menu_notification_your_faction_collapsed = 137
-menu_notification_faction_defeated = 138
-menu_ruins = 139
-menu_legendary_place = 140
-menu_ring_hunter_lair = 141
-menu_ring_hunter_lair_destroyed = 142
-menu_raftmen = 143
-menu_ride_to_dorwinion = 144
-menu_amath_dollen_fortress = 145
-menu_gondor_reinforcement_event = 146
-menu_auto_return_to_map = 147
-menu_auto_player_garrison = 148
-menu_auto_player_garrison_2 = 149
-menu_auto_town_brawl = 150
-menu_auto_intro_rohan = 151
-menu_auto_intro_gondor = 152
-menu_auto_intro_mordor = 153
-menu_auto_intro_joke = 154
-menu_auto_convo = 155
-menu_auto_conversation_cutscene = 156
-menu_unified_start_quest = 157
-menu_starting_quest_victory_good = 158
-menu_starting_quest_victory_evil = 159
-menu_starting_quest_victory_evil_no_duel = 160
-menu_start_quest_duel_won = 161
-menu_starting_quest_victory_elves = 162
-menu_starting_quest_victory_easterlings = 163
-menu_start_quest_duel = 164
-menu_village_quest = 165
-menu_village_quest_result = 166
-menu_scout_camp_quest = 167
-menu_destroy_scout_camp_quest_result = 168
-menu_custom_battle_choose_faction1 = 169
-menu_custom_battle_choose_faction2 = 170
-menu_custom_battle_choose_faction3 = 171
-menu_ancient_ruins = 172
-menu_pick_troops = 173
-menu_burial_mound = 174
-menu_burial_mound_respects = 175
-menu_burial_mound_oath = 176
-menu_burial_mound_despoil = 177
-menu_funeral_pyre = 178
-menu_town_ruins = 179
-menu_premutiny = 180
-menu_mutiny = 181
-menu_death = 182
-menu_animal_ambush = 183
-menu_animal_ambush_success = 184
-menu_animal_ambush_fail = 185
-menu_build_your_scene = 186
-menu_choose_scenes_0 = 187
-menu_choose_scenes_13 = 188
-menu_choose_scenes_26 = 189
-menu_choose_scenes_39 = 190
-menu_choose_scenes_52 = 191
-menu_choose_scenes_65 = 192
-menu_choose_scenes_78 = 193
-menu_choose_scenes_91 = 194
-menu_choose_scenes_104 = 195
-menu_choose_scenes_117 = 196
-menu_choose_scenes_130 = 197
-menu_choose_scenes_143 = 198
-menu_choose_scenes_156 = 199
-menu_choose_scenes_169 = 200
-menu_choose_scenes_182 = 201
-menu_choose_scenes_195 = 202
-menu_choose_scenes_208 = 203
-menu_choose_scenes_221 = 204
-menu_choose_scenes_234 = 205
-menu_choose_scenes_247 = 206
-menu_choose_scenes_260 = 207
-menu_choose_scenes_273 = 208
-menu_choose_scenes_286 = 209
-menu_choose_scenes_299 = 210
+menu_player_initiated_siege_result = 120
+menu_disembark = 121
+menu_ship_reembark = 122
+menu_center_reports = 123
+menu_sneak_into_town_suceeded = 124
+menu_sneak_into_town_caught = 125
+menu_sneak_into_town_caught_dispersed_guards = 126
+menu_sneak_into_town_caught_ran_away = 127
+menu_auto_training_ground_trainer = 128
+menu_tld_player_defeated = 129
+menu_recover_after_death_fangorn = 130
+menu_recover_after_death_moria = 131
+menu_recover_after_death_default = 132
+menu_recover_after_death_town = 133
+menu_recover_after_death_town_alone = 134
+menu_notification_center_under_siege = 135
+menu_notification_one_side_left = 136
+menu_notification_total_defeat = 137
+menu_notification_your_faction_collapsed = 138
+menu_notification_faction_defeated = 139
+menu_ruins = 140
+menu_legendary_place = 141
+menu_ring_hunter_lair = 142
+menu_ring_hunter_lair_destroyed = 143
+menu_raftmen = 144
+menu_ride_to_dorwinion = 145
+menu_amath_dollen_fortress = 146
+menu_gondor_reinforcement_event = 147
+menu_auto_return_to_map = 148
+menu_auto_player_garrison = 149
+menu_auto_player_garrison_2 = 150
+menu_auto_town_brawl = 151
+menu_auto_intro_rohan = 152
+menu_auto_intro_gondor = 153
+menu_auto_intro_mordor = 154
+menu_auto_intro_joke = 155
+menu_auto_convo = 156
+menu_auto_conversation_cutscene = 157
+menu_unified_start_quest = 158
+menu_starting_quest_victory_good = 159
+menu_starting_quest_victory_evil = 160
+menu_starting_quest_victory_evil_no_duel = 161
+menu_start_quest_duel_won = 162
+menu_starting_quest_victory_elves = 163
+menu_starting_quest_victory_easterlings = 164
+menu_start_quest_duel = 165
+menu_village_quest = 166
+menu_village_quest_result = 167
+menu_scout_camp_quest = 168
+menu_destroy_scout_camp_quest_result = 169
+menu_custom_battle_choose_faction1 = 170
+menu_custom_battle_choose_faction2 = 171
+menu_custom_battle_choose_faction3 = 172
+menu_ancient_ruins = 173
+menu_pick_troops = 174
+menu_burial_mound = 175
+menu_burial_mound_respects = 176
+menu_burial_mound_oath = 177
+menu_burial_mound_despoil = 178
+menu_funeral_pyre = 179
+menu_town_ruins = 180
+menu_premutiny = 181
+menu_mutiny = 182
+menu_death = 183
+menu_animal_ambush = 184
+menu_animal_ambush_success = 185
+menu_animal_ambush_fail = 186
+menu_build_your_scene = 187
+menu_choose_scenes_0 = 188
+menu_choose_scenes_13 = 189
+menu_choose_scenes_26 = 190
+menu_choose_scenes_39 = 191
+menu_choose_scenes_52 = 192
+menu_choose_scenes_65 = 193
+menu_choose_scenes_78 = 194
+menu_choose_scenes_91 = 195
+menu_choose_scenes_104 = 196
+menu_choose_scenes_117 = 197
+menu_choose_scenes_130 = 198
+menu_choose_scenes_143 = 199
+menu_choose_scenes_156 = 200
+menu_choose_scenes_169 = 201
+menu_choose_scenes_182 = 202
+menu_choose_scenes_195 = 203
+menu_choose_scenes_208 = 204
+menu_choose_scenes_221 = 205
+menu_choose_scenes_234 = 206
+menu_choose_scenes_247 = 207
+menu_choose_scenes_260 = 208
+menu_choose_scenes_273 = 209
+menu_choose_scenes_286 = 210
+menu_choose_scenes_299 = 211
+menu_choose_scenes_312 = 212