Skip to content

Commit

Permalink
*Changes to Siege Battles + WIP Quests
Browse files Browse the repository at this point in the history 
- Allow player to choose between Advanced Siege AI or Native Siege AI
- Add code to allow attacker teams to charge once they have taken hold of a choke point
- Minor changes to radius for determining if there are attackers / defenders in choke points.
- Add WIP quests and relevent changes to files.
  • Loading branch information
@khamukkamu
khamukkamu committed Oct 13, 2017
1 parent 2008e80 commit 9882864
Show file tree
Hide file tree
Showing 47 changed files with 4,900 additions and 3,631 deletions.
93 changes: 47 additions & 46 deletions ModuleSystem/ID/ID_menus_mb.py
View file
Expand Up @@ -180,49 +180,50 @@
menu_auto_field_ai = 179
menu_hungry_orc = 180
menu_leaving_elf = 181
menu_custom_battle_choose_faction1 = 182
menu_custom_battle_choose_faction2 = 183
menu_custom_battle_choose_faction3 = 184
menu_ancient_ruins = 185
menu_pick_troops = 186
menu_burial_mound = 187
menu_burial_mound_respects = 188
menu_burial_mound_oath = 189
menu_burial_mound_despoil = 190
menu_funeral_pyre = 191
menu_town_ruins = 192
menu_premutiny = 193
menu_mutiny = 194
menu_death = 195
menu_animal_ambush = 196
menu_animal_ambush_success = 197
menu_animal_ambush_fail = 198
menu_build_your_scene = 199
menu_choose_scenes_0 = 200
menu_choose_scenes_13 = 201
menu_choose_scenes_26 = 202
menu_choose_scenes_39 = 203
menu_choose_scenes_52 = 204
menu_choose_scenes_65 = 205
menu_choose_scenes_78 = 206
menu_choose_scenes_91 = 207
menu_choose_scenes_104 = 208
menu_choose_scenes_117 = 209
menu_choose_scenes_130 = 210
menu_choose_scenes_143 = 211
menu_choose_scenes_156 = 212
menu_choose_scenes_169 = 213
menu_choose_scenes_182 = 214
menu_choose_scenes_195 = 215
menu_choose_scenes_208 = 216
menu_choose_scenes_221 = 217
menu_choose_scenes_234 = 218
menu_choose_scenes_247 = 219
menu_choose_scenes_260 = 220
menu_choose_scenes_273 = 221
menu_choose_scenes_286 = 222
menu_choose_scenes_299 = 223
menu_choose_scenes_312 = 224
menu_choose_scenes_325 = 225
menu_choose_scenes_338 = 226
menu_choose_scenes_351 = 227
menu_refugees_quest = 182
menu_custom_battle_choose_faction1 = 183
menu_custom_battle_choose_faction2 = 184
menu_custom_battle_choose_faction3 = 185
menu_ancient_ruins = 186
menu_pick_troops = 187
menu_burial_mound = 188
menu_burial_mound_respects = 189
menu_burial_mound_oath = 190
menu_burial_mound_despoil = 191
menu_funeral_pyre = 192
menu_town_ruins = 193
menu_premutiny = 194
menu_mutiny = 195
menu_death = 196
menu_animal_ambush = 197
menu_animal_ambush_success = 198
menu_animal_ambush_fail = 199
menu_build_your_scene = 200
menu_choose_scenes_0 = 201
menu_choose_scenes_13 = 202
menu_choose_scenes_26 = 203
menu_choose_scenes_39 = 204
menu_choose_scenes_52 = 205
menu_choose_scenes_65 = 206
menu_choose_scenes_78 = 207
menu_choose_scenes_91 = 208
menu_choose_scenes_104 = 209
menu_choose_scenes_117 = 210
menu_choose_scenes_130 = 211
menu_choose_scenes_143 = 212
menu_choose_scenes_156 = 213
menu_choose_scenes_169 = 214
menu_choose_scenes_182 = 215
menu_choose_scenes_195 = 216
menu_choose_scenes_208 = 217
menu_choose_scenes_221 = 218
menu_choose_scenes_234 = 219
menu_choose_scenes_247 = 220
menu_choose_scenes_260 = 221
menu_choose_scenes_273 = 222
menu_choose_scenes_286 = 223
menu_choose_scenes_299 = 224
menu_choose_scenes_312 = 225
menu_choose_scenes_325 = 226
menu_choose_scenes_338 = 227
menu_choose_scenes_351 = 228
93 changes: 47 additions & 46 deletions ModuleSystem/ID/ID_menus_wb.py
View file
Expand Up @@ -180,49 +180,50 @@
menu_auto_field_ai = 179
menu_hungry_orc = 180
menu_leaving_elf = 181
menu_custom_battle_choose_faction1 = 182
menu_custom_battle_choose_faction2 = 183
menu_custom_battle_choose_faction3 = 184
menu_ancient_ruins = 185
menu_pick_troops = 186
menu_burial_mound = 187
menu_burial_mound_respects = 188
menu_burial_mound_oath = 189
menu_burial_mound_despoil = 190
menu_funeral_pyre = 191
menu_town_ruins = 192
menu_premutiny = 193
menu_mutiny = 194
menu_death = 195
menu_animal_ambush = 196
menu_animal_ambush_success = 197
menu_animal_ambush_fail = 198
menu_build_your_scene = 199
menu_choose_scenes_0 = 200
menu_choose_scenes_13 = 201
menu_choose_scenes_26 = 202
menu_choose_scenes_39 = 203
menu_choose_scenes_52 = 204
menu_choose_scenes_65 = 205
menu_choose_scenes_78 = 206
menu_choose_scenes_91 = 207
menu_choose_scenes_104 = 208
menu_choose_scenes_117 = 209
menu_choose_scenes_130 = 210
menu_choose_scenes_143 = 211
menu_choose_scenes_156 = 212
menu_choose_scenes_169 = 213
menu_choose_scenes_182 = 214
menu_choose_scenes_195 = 215
menu_choose_scenes_208 = 216
menu_choose_scenes_221 = 217
menu_choose_scenes_234 = 218
menu_choose_scenes_247 = 219
menu_choose_scenes_260 = 220
menu_choose_scenes_273 = 221
menu_choose_scenes_286 = 222
menu_choose_scenes_299 = 223
menu_choose_scenes_312 = 224
menu_choose_scenes_325 = 225
menu_choose_scenes_338 = 226
menu_choose_scenes_351 = 227
menu_refugees_quest = 182
menu_custom_battle_choose_faction1 = 183
menu_custom_battle_choose_faction2 = 184
menu_custom_battle_choose_faction3 = 185
menu_ancient_ruins = 186
menu_pick_troops = 187
menu_burial_mound = 188
menu_burial_mound_respects = 189
menu_burial_mound_oath = 190
menu_burial_mound_despoil = 191
menu_funeral_pyre = 192
menu_town_ruins = 193
menu_premutiny = 194
menu_mutiny = 195
menu_death = 196
menu_animal_ambush = 197
menu_animal_ambush_success = 198
menu_animal_ambush_fail = 199
menu_build_your_scene = 200
menu_choose_scenes_0 = 201
menu_choose_scenes_13 = 202
menu_choose_scenes_26 = 203
menu_choose_scenes_39 = 204
menu_choose_scenes_52 = 205
menu_choose_scenes_65 = 206
menu_choose_scenes_78 = 207
menu_choose_scenes_91 = 208
menu_choose_scenes_104 = 209
menu_choose_scenes_117 = 210
menu_choose_scenes_130 = 211
menu_choose_scenes_143 = 212
menu_choose_scenes_156 = 213
menu_choose_scenes_169 = 214
menu_choose_scenes_182 = 215
menu_choose_scenes_195 = 216
menu_choose_scenes_208 = 217
menu_choose_scenes_221 = 218
menu_choose_scenes_234 = 219
menu_choose_scenes_247 = 220
menu_choose_scenes_260 = 221
menu_choose_scenes_273 = 222
menu_choose_scenes_286 = 223
menu_choose_scenes_299 = 224
menu_choose_scenes_312 = 225
menu_choose_scenes_325 = 226
menu_choose_scenes_338 = 227
menu_choose_scenes_351 = 228
71 changes: 36 additions & 35 deletions ModuleSystem/ID/ID_mission_templates.py
View file
Expand Up @@ -22,38 +22,39 @@
mst_amath_dollen_spirit = 21
mst_castle_attack_walls_defenders_sally = 22
mst_castle_attack_walls_ladder = 23
mst_besiege_inner_battle_castle = 24
mst_besiege_inner_battle_town_center = 25
mst_sneak_caught_fight = 26
mst_training_ground_training = 27
mst_training_ground_trainer_talk = 28
mst_arena_melee_fight = 29
mst_arena_challenge_fight = 30
mst_custom_battle = 31
mst_custom_battle_siege = 32
mst_custom_battle_form_test = 33
mst_custom_battle_5 = 34
mst_custom_battle_HD = 35
mst_custom_battle_dynamic_scene = 36
mst_custom_battle_parade = 37
mst_camera_test = 38
mst_ai_training = 39
mst_legendary_place_visit = 40
mst_tld_erebor_dungeon = 41
mst_tld_dwarven_warehouse = 42
mst_aw_tomb = 43
mst_scene_chooser = 44
mst_dungeon_crawl_moria_entrance = 45
mst_dungeon_crawl_moria_hall = 46
mst_dungeon_crawl_moria_deep = 47
mst_infiltration_stealth_mission = 48
mst_infiltration_combat_mission = 49
mst_sorcerer_mission = 50
mst_battle_wall_mission = 51
mst_animal_ambush = 52
mst_intro_rohan = 53
mst_intro_gondor = 54
mst_intro_mordor = 55
mst_intro_joke = 56
mst_test_gandalf = 57
mst_conversation_cutscene = 58
mst_castle_attack_walls_ladder_native = 24
mst_besiege_inner_battle_castle = 25
mst_besiege_inner_battle_town_center = 26
mst_sneak_caught_fight = 27
mst_training_ground_training = 28
mst_training_ground_trainer_talk = 29
mst_arena_melee_fight = 30
mst_arena_challenge_fight = 31
mst_custom_battle = 32
mst_custom_battle_siege = 33
mst_custom_battle_form_test = 34
mst_custom_battle_5 = 35
mst_custom_battle_HD = 36
mst_custom_battle_dynamic_scene = 37
mst_custom_battle_parade = 38
mst_camera_test = 39
mst_ai_training = 40
mst_legendary_place_visit = 41
mst_tld_erebor_dungeon = 42
mst_tld_dwarven_warehouse = 43
mst_aw_tomb = 44
mst_scene_chooser = 45
mst_dungeon_crawl_moria_entrance = 46
mst_dungeon_crawl_moria_hall = 47
mst_dungeon_crawl_moria_deep = 48
mst_infiltration_stealth_mission = 49
mst_infiltration_combat_mission = 50
mst_sorcerer_mission = 51
mst_battle_wall_mission = 52
mst_animal_ambush = 53
mst_intro_rohan = 54
mst_intro_gondor = 55
mst_intro_mordor = 56
mst_intro_joke = 57
mst_test_gandalf = 58
mst_conversation_cutscene = 59
5 changes: 3 additions & 2 deletions ModuleSystem/ID/ID_party_templates.py
View file
Expand Up @@ -254,5 +254,6 @@
pt_orc_horde = 253
pt_vet_archer = 254
pt_volunteers = 255
pt_warp_array = 256
pt_warp_temp_array = 257
pt_refugees = 256
pt_warp_array = 257
pt_warp_temp_array = 258
2 changes: 2 additions & 0 deletions ModuleSystem/ID/ID_presentations_mb.py
View file
Expand Up @@ -15,3 +15,5 @@
prsnt_intro_titles = 14
prsnt_conversation_titles = 15
prsnt_customize_defilement = 16
prsnt_troop_talk_hero = 17
prsnt_troop_talk_enemy = 18
11 changes: 6 additions & 5 deletions ModuleSystem/ID/ID_presentations_wb.py
View file
Expand Up @@ -15,8 +15,9 @@
prsnt_intro_titles = 14
prsnt_conversation_titles = 15
prsnt_customize_defilement = 16
prsnt_game_start = 17
prsnt_game_custom_battle_designer = 18
prsnt_game_escape = 19
prsnt_faction_troop_trees = 20
prsnt_battle_map = 21
prsnt_troop_talk_hero = 17
prsnt_troop_talk_enemy = 18
prsnt_game_start = 19
prsnt_game_custom_battle_designer = 20
prsnt_game_escape = 21
prsnt_faction_troop_trees = 22
81 changes: 43 additions & 38 deletions ModuleSystem/ID/ID_scripts_mb.py
View file
Expand Up @@ -541,43 +541,48 @@
script_remove_highest_or_lowest_level_troop = 540
script_cf_check_if_only_capital_left = 541
script_find_troop_of_faction = 542
script_warp_array_create = 543
script_warp_temp_array_create = 544
script_warp_array_delete = 545
script_warp_get_quick_array = 546
script_warp_array_clear = 547
script_warp_array_length = 548
script_warp_array_init_value = 549
script_warp_array_init_range = 550
script_warp_array_init_random = 551
script_warp_array_push = 552
script_cf_warp_array_pop = 553
script_warp_array_remove_last = 554
script_cf_warp_array_last = 555
script_cf_warp_array_set = 556
script_cf_warp_array_get = 557
script_warp_array_copy = 558
script_cf_warp_array_copy_range = 559
script_warp_array_reverse = 560
script_warp_array_filter = 561
script_warp_array_map = 562
script_warp_array_unique = 563
script_warp_array_sort = 564
script_warp_array_sort_range = 565
script_warp_array_sort_range_aux = 566
script_warp_array_merge_range_aux = 567
script_warp_array_shuffle = 568
script_warp_array_shuffle_range = 569
script_cf_warp_get_random = 570
script_warp_array_truncate = 571
script_warp_print_array = 572
script_warp_print_array_comma = 573
script_warp_print_array_and = 574
script_warp_number = 575
script_warp_troop_name = 576
script_warp_party_name = 577
script_warp_item_name = 578
script_cf_ascending = 579
script_cf_descending = 580
script_cf_init_quest_defend_refugees = 543
script_cf_quest_defend_refugees_party_creation = 544
script_cf_init_quest_hunt_refugees = 545
script_cf_quest_hunt_refugees_party_creation = 546
script_troop_talk_presentation = 547
script_warp_array_create = 548
script_warp_temp_array_create = 549
script_warp_array_delete = 550
script_warp_get_quick_array = 551
script_warp_array_clear = 552
script_warp_array_length = 553
script_warp_array_init_value = 554
script_warp_array_init_range = 555
script_warp_array_init_random = 556
script_warp_array_push = 557
script_cf_warp_array_pop = 558
script_warp_array_remove_last = 559
script_cf_warp_array_last = 560
script_cf_warp_array_set = 561
script_cf_warp_array_get = 562
script_warp_array_copy = 563
script_cf_warp_array_copy_range = 564
script_warp_array_reverse = 565
script_warp_array_filter = 566
script_warp_array_map = 567
script_warp_array_unique = 568
script_warp_array_sort = 569
script_warp_array_sort_range = 570
script_warp_array_sort_range_aux = 571
script_warp_array_merge_range_aux = 572
script_warp_array_shuffle = 573
script_warp_array_shuffle_range = 574
script_cf_warp_get_random = 575
script_warp_array_truncate = 576
script_warp_print_array = 577
script_warp_print_array_comma = 578
script_warp_print_array_and = 579
script_warp_number = 580
script_warp_troop_name = 581
script_warp_party_name = 582
script_warp_item_name = 583
script_cf_ascending = 584
script_cf_descending = 585


0 comments on commit 9882864

Please sign in to comment.