Permalink
Browse files

Merged TGS V0.2.6 with "Diplomacy 3.3.2+allow fief+PBOD for 1.143". W…

…e should now have a working version that is ready for troubleshooting and bug-fixing. (Module System files are now up to date with 1.143 release of Mount&Blade:Warband.

git-svn-id: http://mountblade.mcr00t.eu/svn@92 fb754800-94af-40f3-9cc2-843f64eaf264
  • Loading branch information...
Mat
Mat committed Sep 11, 2011
1 parent 87fd1ad commit ab3e58bb1f00e73f38f748ac229a8eeb4e5abf2e
Showing with 124,751 additions and 23,140 deletions.
  1. +1 −1 ID_animations.py
  2. +9 −6 ID_info_pages.py
  3. +120 −117 ID_menus.py
  4. +36 −27 ID_meshes.py
  5. +12 −3 ID_presentations.py
  6. +578 −479 ID_scripts.py
  7. +2,266 −2,127 ID_strings.py
  8. +29 −29 build_module.bat
  9. +41 −0 formAI_constants.py
  10. +144 −0 formAI_mission_templates.py
  11. +1,306 −0 formAI_scripts.py
  12. +105 −0 formations_constants.py
  13. +289 −0 formations_mission_templates.py
  14. +113 −0 formations_presentations.py
  15. +2,253 −0 formations_scripts.py
  16. +3 −2 header_common.py
  17. +2 −0 header_items.py
  18. +1 −0 header_mission_templates.py
  19. +4 −0 header_operations.py
  20. +3 −2 header_parties.py
  21. +12 −0 header_terrain_types.py
  22. +4 −2 header_troops.py
  23. +305 −0 modmerger.py
  24. +199 −0 modmerger_header.py
  25. +428 −0 modmerger_installer.py
  26. +53 −0 modmerger_options.py
  27. +7 −1 module_animations.py
  28. +418 −19 module_constants.py
  29. +23,071 −17,509 module_dialogs.py
  30. +8 −7 module_factions.py
  31. +2,681 −274 module_game_menus.py
  32. +10 −5 module_info_pages.py
  33. +75 −77 module_items.py
  34. +5 −5 module_map_icons.py
  35. +35 −9 module_meshes.py
  36. +2,029 −362 module_mission_templates.py
  37. +3 −2 module_particle_systems.py
  38. +19 −10 module_parties.py
  39. +7 −7 module_party_templates.py
  40. +4,645 −93 module_presentations.py
  41. +3 −3 module_quests.py
  42. +9 −5 module_scene_props.py
  43. +11 −4 module_scenes.py
  44. +14,505 −1,353 module_scripts.py
  45. +64,012 −0 module_scripts.py.bak
  46. +1,519 −196 module_simple_triggers.py
  47. +7 −4 module_skins.py
  48. +3 −4 module_sounds.py
  49. +524 −217 module_strings.py
  50. +65 −137 module_triggers.py
  51. +1,668 −0 module_triggers.py.bak
  52. +39 −36 module_troops.py
  53. +3 −1 process_dialogs.py
  54. +28 −1 process_global_variables.py
  55. +33 −1 process_global_variables_unused.py
  56. +2 −0 process_operations.py
  57. +15 −3 process_scripts.py
  58. +99 −0 util_common.py
  59. +20 −0 util_presentations.py
  60. +224 −0 util_scripts.py
  61. +513 −0 util_wrappers.py
  62. +120 −0 variables.txt
View
@@ -464,7 +464,7 @@
anim_wedding_bride_last = 463
anim_equip_bayonet = 464
anim_unequip_bayonet = 465
anim_unused_human_anim_14 = 466
anim_spearwall_hold = 466
anim_unused_human_anim_15 = 467
anim_unused_human_anim_16 = 468
anim_unused_human_anim_17 = 469
View
@@ -1,8 +1,11 @@
ip_morale = 0
ip_economy = 1
ip_courtship = 2
ip_politics = 3
ip_character_backgrounds = 4
ip_military_campaigns = 5
ip_dplmc_info = 0
ip_dplmc_autoloot = 1
ip_dplmc_autosell = 2
ip_morale = 3
ip_economy = 4
ip_courtship = 5
ip_politics = 6
ip_character_backgrounds = 7
ip_military_campaigns = 8
View
@@ -135,120 +135,123 @@
menu_center_reports = 134
menu_price_and_production = 135
menu_town_trade = 136
menu_town_trade_assessment_begin = 137
menu_town_trade_assessment = 138
menu_sneak_into_town_suceeded = 139
menu_sneak_into_town_caught = 140
menu_sneak_into_town_caught_dispersed_guards = 141
menu_sneak_into_town_caught_ran_away = 142
menu_enemy_offer_ransom_for_prisoner = 143
menu_training_ground = 144
menu_training_ground_selection_details_melee_1 = 145
menu_training_ground_selection_details_melee_2 = 146
menu_training_ground_selection_details_mounted = 147
menu_training_ground_selection_details_ranged_1 = 148
menu_training_ground_selection_details_ranged_2 = 149
menu_training_ground_description = 150
menu_training_ground_training_result = 151
menu_marshall_selection_candidate_ask = 152
menu_captivity_avoid_wilderness = 153
menu_captivity_start_wilderness = 154
menu_captivity_start_wilderness_surrender = 155
menu_captivity_start_wilderness_defeat = 156
menu_captivity_start_castle_surrender = 157
menu_captivity_start_castle_defeat = 158
menu_captivity_start_under_siege_defeat = 159
menu_captivity_wilderness_taken_prisoner = 160
menu_captivity_wilderness_check = 161
menu_captivity_end_wilderness_escape = 162
menu_captivity_castle_taken_prisoner = 163
menu_captivity_rescue_lord_taken_prisoner = 164
menu_captivity_castle_check = 165
menu_captivity_end_exchanged_with_prisoner = 166
menu_captivity_end_propose_ransom = 167
menu_captivity_castle_remain = 168
menu_kingdom_army_quest_report_to_army = 169
menu_kingdom_army_quest_messenger = 170
menu_kingdom_army_quest_join_siege_order = 171
menu_kingdom_army_follow_failed = 172
menu_invite_player_to_faction_without_center = 173
menu_invite_player_to_faction = 174
menu_invite_player_to_faction_accepted = 175
menu_question_peace_offer = 176
menu_notification_truce_expired = 177
menu_notification_feast_quest_expired = 178
menu_notification_sortie_possible = 179
menu_notification_casus_belli_expired = 180
menu_notification_lord_defects = 181
menu_notification_treason_indictment = 182
menu_notification_border_incident = 183
menu_notification_player_faction_active = 184
menu_minister_confirm = 185
menu_notification_court_lost = 186
menu_notification_player_faction_deactive = 187
menu_notification_player_wedding_day = 188
menu_notification_player_kingdom_holds_feast = 189
menu_notification_center_under_siege = 190
menu_notification_village_raided = 191
menu_notification_village_raid_started = 192
menu_notification_one_faction_left = 193
menu_notification_oath_renounced_faction_defeated = 194
menu_notification_center_lost = 195
menu_notification_troop_left_players_faction = 196
menu_notification_troop_joined_players_faction = 197
menu_notification_war_declared = 198
menu_notification_peace_declared = 199
menu_notification_faction_defeated = 200
menu_notification_rebels_switched_to_faction = 201
menu_notification_player_should_consult = 202
menu_notification_player_feast_in_progress = 203
menu_notification_lady_requests_visit = 204
menu_garden = 205
menu_kill_local_merchant_begin = 206
menu_debug_alert_from_s65 = 207
menu_auto_return_to_map = 208
menu_bandit_lair = 209
menu_notification_player_faction_political_issue_resolved = 210
menu_notification_player_faction_political_issue_resolved_for_player = 211
menu_start_phase_2_5 = 212
menu_start_phase_3 = 213
menu_start_phase_4 = 214
menu_lost_tavern_duel = 215
menu_establish_court = 216
menu_notification_relieved_as_marshal = 217
menu_dplmc_manage_loot_pool = 218
menu_dplmc_auto_loot = 219
menu_dplmc_notification_alliance_declared = 220
menu_dplmc_notification_defensive_declared = 221
menu_dplmc_notification_trade_declared = 222
menu_dplmc_notification_nonaggression_declared = 223
menu_dplmc_question_alliance_offer = 224
menu_dplmc_question_defensive_offer = 225
menu_dplmc_question_trade_offer = 226
menu_dplmc_question_nonaggression_offer = 227
menu_dplmc_notification_alliance_expired = 228
menu_dplmc_notification_defensive_expired = 229
menu_dplmc_notification_trade_expired = 230
menu_dplmc_dictate_terms = 231
menu_dplmc_deny_terms = 232
menu_dplmc_village_riot_result = 233
menu_dplmc_village_riot_removed = 234
menu_dplmc_town_riot_removed = 235
menu_dplmc_riot_negotiate = 236
menu_dplmc_notification_riot = 237
menu_dplmc_notification_appoint_chamberlain = 238
menu_dplmc_chamberlain_confirm = 239
menu_dplmc_notification_appoint_constable = 240
menu_dplmc_constable_confirm = 241
menu_dplmc_notification_appoint_chancellor = 242
menu_dplmc_chancellor_confirm = 243
menu_dplmc_deserters = 244
menu_dplmc_negotiate_besieger = 245
menu_dplmc_messenger = 246
menu_dplmc_scout = 247
menu_dplmc_domestic_policy = 248
menu_dplmc_affiliate_end = 249
menu_dplmc_preferences = 250
menu_dplmc_affiliated_family_report = 251
menu_dplmc_lord_relations_2 = 252
menu_gateway_menu = 253
menu_dplmc_trade_auto_sell_begin = 137
menu_dplmc_trade_auto_buy_food_begin = 138
menu_town_trade_assessment_begin = 139
menu_town_trade_assessment = 140
menu_sneak_into_town_suceeded = 141
menu_sneak_into_town_caught = 142
menu_sneak_into_town_caught_dispersed_guards = 143
menu_sneak_into_town_caught_ran_away = 144
menu_enemy_offer_ransom_for_prisoner = 145
menu_training_ground = 146
menu_training_ground_selection_details_melee_1 = 147
menu_training_ground_selection_details_melee_2 = 148
menu_training_ground_selection_details_mounted = 149
menu_training_ground_selection_details_ranged_1 = 150
menu_training_ground_selection_details_ranged_2 = 151
menu_training_ground_description = 152
menu_training_ground_training_result = 153
menu_marshall_selection_candidate_ask = 154
menu_captivity_avoid_wilderness = 155
menu_captivity_start_wilderness = 156
menu_captivity_start_wilderness_surrender = 157
menu_captivity_start_wilderness_defeat = 158
menu_captivity_start_castle_surrender = 159
menu_captivity_start_castle_defeat = 160
menu_captivity_start_under_siege_defeat = 161
menu_captivity_wilderness_taken_prisoner = 162
menu_captivity_wilderness_check = 163
menu_captivity_end_wilderness_escape = 164
menu_captivity_castle_taken_prisoner = 165
menu_captivity_rescue_lord_taken_prisoner = 166
menu_captivity_castle_check = 167
menu_captivity_end_exchanged_with_prisoner = 168
menu_captivity_end_propose_ransom = 169
menu_captivity_castle_remain = 170
menu_kingdom_army_quest_report_to_army = 171
menu_kingdom_army_quest_messenger = 172
menu_kingdom_army_quest_join_siege_order = 173
menu_kingdom_army_follow_failed = 174
menu_invite_player_to_faction_without_center = 175
menu_invite_player_to_faction = 176
menu_invite_player_to_faction_accepted = 177
menu_question_peace_offer = 178
menu_notification_truce_expired = 179
menu_notification_feast_quest_expired = 180
menu_notification_sortie_possible = 181
menu_notification_casus_belli_expired = 182
menu_notification_lord_defects = 183
menu_notification_treason_indictment = 184
menu_notification_border_incident = 185
menu_notification_player_faction_active = 186
menu_minister_confirm = 187
menu_notification_court_lost = 188
menu_notification_player_faction_deactive = 189
menu_notification_player_wedding_day = 190
menu_notification_player_kingdom_holds_feast = 191
menu_notification_center_under_siege = 192
menu_notification_village_raided = 193
menu_notification_village_raid_started = 194
menu_notification_one_faction_left = 195
menu_notification_oath_renounced_faction_defeated = 196
menu_notification_center_lost = 197
menu_notification_troop_left_players_faction = 198
menu_notification_troop_joined_players_faction = 199
menu_notification_war_declared = 200
menu_notification_peace_declared = 201
menu_notification_faction_defeated = 202
menu_notification_rebels_switched_to_faction = 203
menu_notification_player_should_consult = 204
menu_notification_player_feast_in_progress = 205
menu_notification_lady_requests_visit = 206
menu_garden = 207
menu_kill_local_merchant_begin = 208
menu_debug_alert_from_s65 = 209
menu_auto_return_to_map = 210
menu_bandit_lair = 211
menu_notification_player_faction_political_issue_resolved = 212
menu_notification_player_faction_political_issue_resolved_for_player = 213
menu_start_phase_2_5 = 214
menu_start_phase_3 = 215
menu_start_phase_4 = 216
menu_lost_tavern_duel = 217
menu_establish_court = 218
menu_notification_relieved_as_marshal = 219
menu_dplmc_manage_loot_pool = 220
menu_dplmc_auto_loot = 221
menu_dplmc_notification_alliance_declared = 222
menu_dplmc_notification_defensive_declared = 223
menu_dplmc_notification_trade_declared = 224
menu_dplmc_notification_nonaggression_declared = 225
menu_dplmc_question_alliance_offer = 226
menu_dplmc_question_defensive_offer = 227
menu_dplmc_question_trade_offer = 228
menu_dplmc_question_nonaggression_offer = 229
menu_dplmc_notification_alliance_expired = 230
menu_dplmc_notification_defensive_expired = 231
menu_dplmc_notification_trade_expired = 232
menu_dplmc_dictate_terms = 233
menu_dplmc_deny_terms = 234
menu_dplmc_village_riot_result = 235
menu_dplmc_village_riot_removed = 236
menu_dplmc_town_riot_removed = 237
menu_dplmc_riot_negotiate = 238
menu_dplmc_notification_riot = 239
menu_dplmc_notification_appoint_chamberlain = 240
menu_dplmc_chamberlain_confirm = 241
menu_dplmc_notification_appoint_constable = 242
menu_dplmc_constable_confirm = 243
menu_dplmc_notification_appoint_chancellor = 244
menu_dplmc_chancellor_confirm = 245
menu_dplmc_deserters = 246
menu_dplmc_negotiate_besieger = 247
menu_dplmc_messenger = 248
menu_dplmc_scout = 249
menu_dplmc_domestic_policy = 250
menu_dplmc_affiliate_end = 251
menu_dplmc_preferences = 252
menu_dplmc_affiliated_family_report = 253
menu_dplmc_lord_relations_2 = 254
menu_dplmc_start_select_prejudice = 255
menu_gateway_menu = 256
View
@@ -712,32 +712,41 @@
mesh_mp_ui_host_maps_16 = 711
mesh_mp_ui_host_maps_17 = 712
mesh_mp_ui_host_maps_18 = 713
mesh_longer_button = 714
mesh_longer_button_down = 715
mesh_message_window = 716
mesh_status_troop_ratio_bar = 717
mesh_status_troop_ratio_bar_button = 718
mesh_status_channeling_stamina_bar = 719
mesh_status_channeling_stamina_bar_button = 720
mesh_channeling_white_plane = 721
mesh_weave_air_blast = 722
mesh_weave_freeze_blast = 723
mesh_weave_heal = 724
mesh_weave_fire_ball = 725
mesh_weave_unravel = 726
mesh_weave_defensive_blast = 727
mesh_weave_ranged_earth_blast = 728
mesh_weave_bind = 729
mesh_weave_chain_lightning = 730
mesh_weave_fire_curtain = 731
mesh_weave_shield = 732
mesh_weave_seeker = 733
mesh_weave_compulsion = 734
mesh_weave_balefire = 735
mesh_weave_select_non_ranged = 736
mesh_weave_select_ranged = 737
mesh_weave_select_support = 738
mesh_weave_select_advanced = 739
mesh_weave_select_all = 740
mesh_note_window_bottom = 714
mesh_longer_button = 715
mesh_longer_button_down = 716
mesh_message_window = 717
mesh_options_window = 718
mesh_note_window = 719
mesh_drop_button = 720
mesh_drop_button_down = 721
mesh_drop_button_hl = 722
mesh_drop_button_child = 723
mesh_drop_button_child_down = 724
mesh_drop_button_child_hl = 725
mesh_status_troop_ratio_bar = 726
mesh_status_troop_ratio_bar_button = 727
mesh_status_channeling_stamina_bar = 728
mesh_status_channeling_stamina_bar_button = 729
mesh_channeling_white_plane = 730
mesh_weave_air_blast = 731
mesh_weave_freeze_blast = 732
mesh_weave_heal = 733
mesh_weave_fire_ball = 734
mesh_weave_unravel = 735
mesh_weave_defensive_blast = 736
mesh_weave_ranged_earth_blast = 737
mesh_weave_bind = 738
mesh_weave_chain_lightning = 739
mesh_weave_fire_curtain = 740
mesh_weave_shield = 741
mesh_weave_seeker = 742
mesh_weave_compulsion = 743
mesh_weave_balefire = 744
mesh_weave_select_non_ranged = 745
mesh_weave_select_ranged = 746
mesh_weave_select_support = 747
mesh_weave_select_advanced = 748
mesh_weave_select_all = 749
View
@@ -47,6 +47,15 @@
prsnt_dplmc_peace_terms = 46
prsnt_jrider_faction_relations_report = 47
prsnt_dplmc_set_vassal_title = 48
prsnt_troop_ratio_bar = 49
prsnt_troop_ratio_bar_multiplayer = 50
prsnt_troop_ratio_bar_multiplayer_2 = 51
prsnt_dplmc_auto_sell_options = 49
prsnt_dplmc_shopping_list_of_food = 50
prsnt_prebattle_custom_deployment = 51
prsnt_prebattle_orders = 52
prsnt_prebattle_record_battle_size = 53
prsnt_pbod_preferences = 54
prsnt_pbod_redefine_keys = 55
prsnt_caba_order_display = 56
prsnt_caba_camera_mode_display = 57
prsnt_troop_ratio_bar = 58
prsnt_troop_ratio_bar_multiplayer = 59
prsnt_troop_ratio_bar_multiplayer_2 = 60
Oops, something went wrong.

0 comments on commit ab3e58b

Please sign in to comment.