diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI index 1a11e4c5f..4f054ec56 100644 --- a/Data-1.13/Ja2_Options.INI +++ b/Data-1.13/Ja2_Options.INI @@ -490,9 +490,6 @@ MILITIA_COST_MULTIPLIER_REGULAR = 1 ; ALLOW_TRAINING_ELITE_MILITIA must be set to TRUE, otherwise this promotion is impossible. MILITIA_COST_MULTIPLIER_ELITE = 2 -; Multiplier for the price of training Mobile Militia. -MILITIA_COST_MULTIPLIER_MOBILE = 3 - ;------------------------------------------------------------------------------------------------------------------------------ ; Daily prices for maintaining one militiaman of each type. ; @@ -505,10 +502,6 @@ MILITIA_COST_MULTIPLIER_MOBILE = 3 DAILY_MILITIA_UPKEEP_TOWN_GREEN = 10 DAILY_MILITIA_UPKEEP_TOWN_REGULAR = 20 DAILY_MILITIA_UPKEEP_TOWN_ELITE = 30 -DAILY_MILITIA_UPKEEP_MOBILE_GREEN = 15 -DAILY_MILITIA_UPKEEP_MOBILE_REGULAR = 30 -DAILY_MILITIA_UPKEEP_MOBILE_ELITE = 45 - ;------------------------------------------------------------------------------------------------------------------------------ ; Change the cost of helicopter movement PER SECTOR. @@ -3957,195 +3950,6 @@ MILITIA_VOLUNTEER_POOL_GAINFACTOR_HOURLY = 0.002 ;****************************************************************************************************************************** ;****************************************************************************************************************************** -[Mobile Militia Training Settings] - -;****************************************************************************************************************************** -; These settings control the training of Mobile Militia. -;****************************************************************************************************************************** - -; Allows training militia that move around on the Strategy Map. -; If FALSE, all other settings in this category are disabled automatically. -ALLOW_MOBILE_MILITIA = TRUE - -; Delay ability to train Mobile Militia till this day -MOBILE_MILITIA_TRAINING_DELAY = 1 - -; This is the number of Mobile Militia created when you finish a training session (or, every N hours. see below). -NUM_MOBILE_MILITIA_TRAINED_PER_SESSION = 10 - -;------------------------------------------------------------------------------------------------------------------------------ -; These settings determine if training of additional mobile militia is allowed when a certain number is allready active. -; You can still train mobiles if you are just below maximum. -; Base modes available: -; 0 = No maximum. -; 2 = Maximum calculated by town sectors you have currently under control. -; 4 = Maximum calculated by town sectors you have liberated at least one time. -; 8 = Maximum calculated by towns under player control. -; 16 = Maximum calculated by current progress. -; 32 = Maximum calculated by best progress. -; 64 = Maximum calculated by number of rebels in your team. -; Any combination of base modes is possible by adding the base modes you want to use (e.g. 8 + 64 = 72). -; -; Advanced modes: -; 0 = If more then one base mode is chosen the lowest one is used. -; 128 = If more then one base mode is chosen the highest one is used. -; For our example above (mode = 72) this means if your town limit dictates 30 militia are allowed and -; rebel limit dictates 60 are allowed the final maximum becomes 30. -; You can also use the highest one by adding 128 to your base mode(s) (e.g. 72 + 128 = 200) -; -; Deserting modes: -; 0 = no deserters -; 1 = deserters are generated when mobile militia is going to attack an enemy and the maximum is reached. -; You can also choose to let some of them desert if they attack an enemy. To do so add +1 to the mode(s) you are going to use. -; The number of deserters is randomly chosen but depends on the ratio active/maximum. -; For example if you want to use modes 8 and 64 and also want deserters your final mode becomes 73 (8 + 64 + 1). -; -; MOBILE_MILITIA_MAX_ACTIVE_MODE 0 .. 255 (default = 0) -; MOBILE_MILITIA_MAX_ACTIVE_MODIFIER 0.01 .. 10.0 (default = 0.5) -;------------------------------------------------------------------------------------------------------------------------------ -MOBILE_MILITIA_MAX_ACTIVE_MODE = 195 -MOBILE_MILITIA_MAX_ACTIVE_MODIFIER = 0.5 - -;------------------------------------------------------------------------------------------------------------------------------ -; Training method options. -; -; There are two methods: -; One is Manual Training - you pay money to train Mobile Militia whenever you desire. -; The second method is to have them created automatically (for free!) every N hours. -;------------------------------------------------------------------------------------------------------------------------------ - -; Determines which method of training is used. -; If set to FALSE, will generate a group of Mobile Militia at each conquered city every N hours. This also disables all -; "Leadership and Mobile Militia Training settings", below. -MUST_TRAIN_MOBILE_MILITIA = TRUE - -; If MUST_TRAIN_MOBILE_MILITIA is set to FALSE, this determines the interval between the creation of each new Mobile -; Militia group. -; Valid values are: 1, 2, 3, 4, 6, 8, 12, 24. All other values are invalid. -CREATE_MOBILE_MILITIA_SQUAD_EACH_N_HOURS = 24 - -;------------------------------------------------------------------------------------------------------------------------------ -; Leadership and Mobile Militia training -;------------------------------------------------------------------------------------------------------------------------------ - -; Minimum required leadership skill to train Mobile Militia -MIN_LEADERSHIP_TO_TRAIN_MOBILE_MILITIA = 40 - -; If set to TRUE, the trainer's leadership score determines how many militia are created in each "session", up to the -; value dictated by DIV_OF_ORIGINAL_MILITIA. -; If set to FALSE, all trainers will train the maximum number of Mobile Militia allowed. -LEADERSHIP_AFFECTS_MOBILE_MILITIA_QUANTITY = TRUE - -; Required leadership score to train the maximum number of Mobile Militia allowed. -; (LEADERSHIP_AFFECTS_MOBILE_MILITIA_QUANTITY must be set to TRUE for this to work) -REQ_LEADERSHIP_FOR_MAX_MOBILE_MILITIA = 80 - -; If set to TRUE, the trainer's leadership score determines what type of Mobile Militia are created (ROOKIE/REGULAR/ELITE). -LEADERSHIP_AFFECTS_MOBILE_MILITIA_QUALITY = TRUE - -; If LEADERSHIP_AFFECTS_MOBILE_MILITIA_QUALITY is set to FALSE, this determines the composition of all Mobile Militia groups -; you create. If these values don't add up to 100%, the remainder will be ROOKIE (green) militia. -PERCENT_MOBILE_MILITIA_ELITES = 20 -PERCENT_MOBILE_MILITIA_REGULARS = 30 - -;****************************************************************************************************************************** -;****************************************************************************************************************************** - -[Mobile Militia Movement Settings] - -;****************************************************************************************************************************** -; These settings control how Mobile Militia move around the strategy map. -;****************************************************************************************************************************** - -;------------------------------------------------------------------------------------------------------------------------------ -; If set to FALSE, Mobile Militia can move anywhere they want. -; If set to TRUE, Mobile Militia movement is restricted, based on one of the two rules below (EXPLORATION / CONQUEST) -;------------------------------------------------------------------------------------------------------------------------------ - -RESTRICT_ROAMING = TRUE - -;------------------------------------------------------------------------------------------------------------------------------ -; EXPLORATION-based restrictions -; -; Allow Mobile Militia to move through any EXPLORED sectors. -; RESTRICT_ROAMING must be set to TRUE. -;------------------------------------------------------------------------------------------------------------------------------ - -ALLOW_MILITIA_MOVEMENT_THROUGH_EXPLORED_SECTORS = TRUE - -;------------------------------------------------------------------------------------------------------------------------------ -; CONQUEST-based restrictions -; -; Allow Mobile Militia to use an optimized restriction system that's based on which cities you've liberated so far. -; This utilizes the rules laid down in the file "DynamicRestrictions.XML". -; RESTRICT_ROAMING must be set to TRUE. -;------------------------------------------------------------------------------------------------------------------------------ - -ALLOW_DYNAMIC_RESTRICTED_ROAMING = TRUE - -;------------------------------------------------------------------------------------------------------------------------------ -; This setting controls whether Mobile Militia can move through "minor cities", I.E. any sector that contains a -; city square where militia cannot be trained (for instance, San Mona). Militia can only attack enemies in such sectors if they -; have already been liberated once in the past. -; -; In the JA2 campaign, this allows travel through: -; San Mona, Tixa, Orta, Estoni, and Omerta. -; -; For this feature to work, "RESTRICT_ROAMING" and at least one of the other movement-restriction options must be set to TRUE. -;------------------------------------------------------------------------------------------------------------------------------ - -ALLOW_MILITIA_MOVEMENT_THROUGH_MINOR_CITIES = TRUE - -;------------------------------------------------------------------------------------------------------------------------------ -; These settings determine whether Mobile Militia can move into Major Cities / SAM Sites to reinforce the local garrison. -; This only happens if the city/SAM sector is liberated of enemies, and only if it has room for more militia. -; Once the mobiles move into the city, they will turn into normal "Town Militia" and will not move anymore. -; -; For this feature to work, "RESTRICT_ROAMING" and at least one of the other movement-restriction options must be set to TRUE. -;------------------------------------------------------------------------------------------------------------------------------ - -ALLOW_MOBILE_MILITIA_REINFORCE_TOWN_GARRISONS = TRUE -ALLOW_MOBILE_MILITIA_REINFORCE_SAM_GARRISONS = TRUE - -;------------------------------------------------------------------------------------------------------------------------------ -; This setting controls wether militia will follow the player on map in non combat situation. -; If set to TRUE they will more likely move to a sector where a player merc is or is about to arrive and also stay there -; (default behaviour). This overwrites any manual restrictions. -; Set to FALSE if they dont worry about the player. -;------------------------------------------------------------------------------------------------------------------------------ - -ALLOW_MILITIA_FOLLOW_PLAYER = TRUE - -;------------------------------------------------------------------------------------------------------------------------------ -; These settings control the splitting of mobile militia groups. -; When militia is moving they will check the current and the 4 surrounding sectors and the target sector (and -; its 4 neighbour sectors) for enemies and calculate a chance to spread based on the numbers of enemies and number militia. -; Militia will always spread when the target sector can not hold all militia because of MAX_MILITIA_PER_SECTOR. -; Remainder will eventually move along. -; If they decide to spread, the groups will end up equal in size. -; -; There are various chances to spread when there are NO threats: -; - 30% chance if origin sector is full and destination is empty, groups will become equal in size. -; - 50% chance if origin and destination have militia, groups become equal in size. -; - 0% chance if origin sector is not full and target is empty -; - 0% chance when setting the target sector as No-Leave-Area (yellow). This has highest priority and overwrites above. -; For threatened sectors the chances are: -; - If origin sector is threatened but target is not then militia will stay in sector! this behaviour can not be adjusted. -; - 0% chance to spread if origin sector is not threatened but target is. -; - variable chance to spread if both target and source sectors are threatened based on enemy numbers: -; (NumEnemiesNearOrigin * 100) / TotalNumEnemies -; - 100% chance to spread if ALLOW_REINFORCEMENTS=TRUE and ALLOW_REINFORCEMENTS_ONLY_IN_CITY=FALSE, groups become equal. -; And you can overwrite the chances with the settings below: -; - 0% chance to spread when ALLOW_MILITIA_SPREAD_WHEN_FOLLOWING = FALSE and target sector has a player merc. -; - 0% chance to spread when ALLOW_MILITIA_SPREAD = FALSE. -;------------------------------------------------------------------------------------------------------------------------------ - -ALLOW_MILITIA_SPREAD = TRUE -ALLOW_MILITIA_SPREAD_WHEN_FOLLOWING = FALSE - -;****************************************************************************************************************************** -;****************************************************************************************************************************** - [Militia Strategic Movement Settings] ;------------------------------------------------------------------------------------------------------------------------------ diff --git a/Data-1.13/TableData/Map/DynamicRestrictions.xml b/Data-1.13/TableData/Map/DynamicRestrictions.xml deleted file mode 100644 index fbbf0c0e3..000000000 --- a/Data-1.13/TableData/Map/DynamicRestrictions.xml +++ /dev/null @@ -1,798 +0,0 @@ - - - - - A12 - 2 - - - A13 - 2 - - - A14 - 2 - - - B9 - 2 - - - B10 - 2 - - - B11 - 2 - - - B12 - 2 - - - B13 - 2 - - - B14 - 2 - - - C12 - 2 - - - C13 - 2 - - - C14 - 2 - - - D12 - 2 - - - D13 - 2 - - - D14 - 2 - - - D15 - 2 - - - E12 - 2 - - - E13 - 2 - - - E14 - 2 - - - E15 - 2 - - - F12 - 2 - - - F12 - 3 - - - G12 - 3 - - - G13 - 3 - - - G14 - 3 - - - G15 - 3 - - - H12 - 3 - - - H13 - 3 - - - H14 - 3 - - - H15 - 3 - - - I12 - 3 - - - I13 - 3 - - - I14 - 3 - - - I15 - 3 - - - J12 - 3 - - - J13 - 3 - - - J14 - 3 - - - J15 - 3 - - - K14 - 3 - - - K6 - 10 - - - K7 - 10 - - - K8 - 10 - - - K9 - 10 - - - K10 - 10 - - - K11 - 10 - - - K12 - 10 - - - K13 - 10 - - - L10 - 10 - - - L11 - 10 - - - L12 - 10 - - - L13 - 10 - - - M10 - 10 - - - M13 - 10 - - - N8 - 10 - - - N9 - 10 - - - N10 - 10 - - - C9 - 6 - - - D9 - 6 - - - E7 - 6 - - - E8 - 6 - - - E9 - 6 - - - E10 - 6 - - - F7 - 6 - - - F8 - 6 - - - F9 - 6 - - - F10 - 6 - - - G6 - 6 - - - G7 - 6 - - - G8 - 6 - - - G9 - 6 - - - G10 - 6 - - - G11 - 6 - - - H7 - 6 - - - H8 - 6 - - - H9 - 6 - - - H10 - 6 - - - I7 - 6 - - - I8 - 6 - - - I9 - 6 - - - A1 - 12 - - - A2 - 12 - - - A3 - 12 - - - B1 - 12 - - - B2 - 12 - - - B3 - 12 - - - C1 - 12 - - - C2 - 12 - - - C3 - 12 - - - D2 - 12 - - - D3 - 12 - - - E3 - 12 - - - D3 - 4 - - - E3 - 4 - - - F2 - 4 - - - F3 - 4 - - - G1 - 4 - - - G2 - 4 - - - G3 - 4 - - - G4 - 4 - - - G5 - 4 - - - G6 - 4 - - - H1 - 4 - - - H2 - 4 - - - H3 - 4 - - - H4 - 4 - - - I3 - 4 - - - I4 - 4 - - - J2 - 4 - - - J3 - 4 - - - K2 - 4 - - - C7 - 2 - 12 - - - C8 - 2 - 12 - - - C9 - 2 - 12 - - - C5 - 6 - 12 - - - C6 - 6 - 12 - - - C7 - 6 - 12 - - - C8 - 6 - 12 - - - D4 - 6 - 12 - - - D5 - 6 - 12 - - - D6 - 6 - 12 - - - D7 - 6 - 12 - - - C5 - 2 - 6 - - - C6 - 2 - 6 - - - C7 - 2 - 6 - - - C8 - 2 - 6 - - - D4 - 2 - 6 - - - D5 - 2 - 6 - - - D6 - 2 - 6 - - - D7 - 2 - 6 - - - G11 - 2 - 3 - - - J7 - 3 - 6 - - - J8 - 3 - 6 - - - J9 - 3 - 6 - - - H6 - 6 - 10 - - - J6 - 6 - 10 - - - J7 - 6 - 10 - - - J8 - 6 - 10 - - - C5 - 4 - 6 - - - C6 - 4 - 6 - - - C7 - 4 - 6 - - - C8 - 4 - 6 - - - D4 - 4 - 6 - - - D5 - 4 - 6 - - - D6 - 4 - 6 - - - D7 - 4 - 6 - - - H6 - 4 - 6 - - - I6 - 4 - 6 - - - J6 - 4 - 6 - - - J7 - 4 - 6 - - - J8 - 4 - 6 - - - K6 - 4 - 6 - - - C5 - 4 - 12 - - - C6 - 4 - 12 - - - L2 - 2 - 3 - 4 - 6 - 10 - 12 - - - L6 - 2 - 3 - 4 - 6 - 10 - 12 - - - M2 - 2 - 3 - 4 - 6 - 10 - 12 - - - M3 - 2 - 3 - 4 - 6 - 10 - 12 - - - M4 - 2 - 3 - 4 - 6 - 10 - 12 - - - M5 - 2 - 3 - 4 - 6 - 10 - 12 - - - M6 - 2 - 3 - 4 - 6 - 10 - 12 - - - N3 - 2 - 3 - 4 - 6 - 10 - 12 - - - N4 - 2 - 3 - 4 - 6 - 10 - 12 - - - N5 - 2 - 3 - 4 - 6 - 10 - 12 - - - N6 - 2 - 3 - 4 - 6 - 10 - 12 - - - N7 - 2 - 3 - 4 - 6 - 10 - 12 - - - O3 - 2 - 3 - 4 - 6 - 10 - 12 - - - O4 - 2 - 3 - 4 - 6 - 10 - 12 - - - P3 - 2 - 3 - 4 - 6 - 10 - 12 - - \ No newline at end of file diff --git a/Data-1.13/TableData/Map/FacilityTypes.xml b/Data-1.13/TableData/Map/FacilityTypes.xml index 27ca0aaaf..1ea807301 100644 --- a/Data-1.13/TableData/Map/FacilityTypes.xml +++ b/Data-1.13/TableData/Map/FacilityTypes.xml @@ -359,7 +359,6 @@ Legacy Militia Training Facility Legacy 2 - 2 diff --git a/Data-1.13/TableData/Map/RestrictedRoamingMilitia.xml b/Data-1.13/TableData/Map/RestrictedRoamingMilitia.xml deleted file mode 100644 index 9a87f83c9..000000000 --- a/Data-1.13/TableData/Map/RestrictedRoamingMilitia.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - A4 - A5 - A6 - A7 - A8 - A9 - A10 - A11 - A15 - A16 - B4 - B5 - B6 - B7 - B8 - B9 - B10 - B11 - B15 - B16 - C4 - C5 - C6 - C7 - C8 - C9 - C10 - C11 - C15 - C16 - D1 - D2 - D3 - D4 - D5 - D6 - D7 - D8 - D9 - D10 - D11 - D15 - D16 - E1 - E2 - E3 - E4 - E5 - E6 - E11 - E15 - F4 - F5 - F6 - F11 - F12 - F13 - F14 - F15 - G5 - G6 - G11 - G16 - H5 - H6 - H11 - H16 - I5 - I6 - I8 - I10 - I11 - I16 - J1 - J2 - J3 - J4 - J5 - J6 - J7 - J8 - J9 - J10 - J11 - J16 - K1 - K2 - K3 - K4 - K5 - K6 - K7 - K8 - K9 - K14 - K15 - L1 - L2 - L3 - L4 - L5 - L6 - L7 - L8 - L9 - L14 - L15 - M1 - M7 - M8 - M9 - M14 - N7 - N8 - N9 - N10 - O8 - O9 - P8 - P9 - \ No newline at end of file