Commit Graph
2029 Commits
Author SHA1 Message Date
Flugente 13698b96fd Merged revision(s) 2135 from branches/ja2_data_official_2014:
Fix: vanilla magazine class indizes were wrong

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2136 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-31 14:22:05 +00:00
Wanne 66d7c6d715 Merged from revision: 2133
Deleted Temp file/folders for "Merc Profile Editor 2" (thx to Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2134 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-31 12:12:27 +00:00
Wanne 2010891f22 Merged from revision: 2131
Updated French comments in INIEditorJA2Options.xml (by hrvg & Grim)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2132 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-30 21:22:44 +00:00
Flugente daba2726e8 New Feauture: a private military company allows hiring of advanced militia. For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335279#Post335279
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2130 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-30 17:19:34 +00:00
Wanne bacb6a1c3c Bugfixes: "Carrier Bladder" (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2129 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 22:32:25 +00:00
Wanne d5deb981ac "Carrier Bladder" (by Off_Topic)
1. Added a hydration system, the ArmorBak can be worn as a backpack, which allows you to place a "bladder" inside it. This carries twice as much water as a canteen.
The US ILBE Rucksack has an integral carrier but needs the bladder, it can be attached to certain MOLLE items also.
Created a new attachment point: 4 for the carrier and 7 to include all MOLLE and the hydration carrier. There is also a new food item.
2. There is a Tactical sling now that acts like a backpack pocket which allows you to carry ONE Rifle etc... on your back. (Need to get a different image, will upload soon.)
3. Added a better image for the MOLLE single pistol mag and Sniper Ammo.
4. Added 3 new MOLLE pouches: Speed Loader, Ammo Drum, and Single Rifle.
5 Added silhouettes for above and also for Throwing Knives.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2128 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 21:13:18 +00:00
Wanne 2cda8a371e Merged from revision: 2126
Updated INIEditorAPBPConstants.xml (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2127 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 21:08:42 +00:00
Flugente 190de755e5 New xml: FoodOpinion.xml allows individual opinions on individual food items for each merc, the <bMoraleMod>-tag in Food.xml was removed.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2125 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 20:08:28 +00:00
Wanne 5665662676 Merged from revision: 2122
Added new "Tools" folder which contains additional Editors
- Added new Version of the "Merc Profile Editor 2.0" (by Jazz)
- Moved "Faces Viewer" to Tools folder

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2124 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 11:02:23 +00:00
Wanne 504544ced3 New Feature: Added up to 15 game difficulty settings (by Jazz)
- Externalized the difficulty setings to "TableData\DifficultySettings.xml" file
- Some INI Settings (ja2_options.ini, CTHConstants.ini and Creature_Settings.ini) moved from INI file to this xml file

These parameters were moved to the file DifficultySettings.xml.
** Ja2_Options.INI **
ENEMY_AP_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_KILLS_PER_PROGRESS_POINT_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
INITIAL_GARRISON_PERCENTAGES_NOVICE  , _EXPERIENCED, _EXPERT, _INSANE
MIN_ENEMY_GROUP_SIZE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
UNLIMITED_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEENS_INITIAL_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_STARTING_ALERT_LEVEL_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_ALERT_DECAY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_AWARE_BATTLES_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
BASE_DELAY_IN_MINUTES_BETWEEN_EVALUATIONS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
EVALUATION_DELAY_VARIANCE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_HOURS_AFTER_SECTOR_LIBERATION_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_DAYS_AFTER_PATROL_DESTROYED_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AGGRESSIVE_QUEEN_AI_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
PERCENT_EXTRA_ELITES_EXPERIENCED , _EXPERT, _INSANE
MAX_MERC_DEATHS_EASY , _EXPERIENCED, _EXPERT, _INSANE
		
** Creatures_Settings.INI **
CREATURE_SPREAD_TIME_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BASE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_INIT_BONUS_SPREAD_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_POPULATION_MODIFIER_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_TOWN_AGGRESSIVENESS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
		
** CTHConstants.ini **
BASE_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AIM_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2123 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 10:51:26 +00:00
Flugente e3b1f1fabd Fix: missing disease face and item icons
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2121 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 00:34:52 +00:00
Wanne c4855c7cc1 Merged from revision: 2118
Updated description for AGGRESSIVE_STRATEGIC_AI
- Added the info, that it is currently hardcoded for city sectors

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2119 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-27 07:37:00 +00:00
Wanne 05cb34dbd6 Merged from revision: 2116
INIEditor Bugfix: Fixed MessageBox-Message when trying to click on "START" and no executable file is selected

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2117 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-26 20:39:23 +00:00
Wanne 176c66132e Merged from revision: 2114
Updated Docs\JA2_113_Hotkeys.pdf to 2014 Stable Release spec (by Buggler)
- PDF version from the ODT file located here: https://ja2svn.mooo.com/source/ja2/trunk/Documents/Documents/Hotkeys%201.13.odt


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2115 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-26 08:23:37 +00:00
Wanne 2b771bbbe5 Merged from revision: 2112
Updated INIEditorJA2.xml (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2113 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-25 09:48:10 +00:00
Wanne dd47c9a504 Bugfix: Pockets.xml (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2110 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-25 09:36:39 +00:00
Wanne 81e3271e18 Pocket Fixes (by Off_Topic)
1. Fixed Gen Misc. Pocket.
2. Removed excess pockets from newly added LBE.
3. Added silhouette of small revolver. (Just Aesthetic for R:Holster.
4. Added silhouette for rifle molle.
5. Minor changes to weight of newly added LBE.
6. Adjusted some pocket values to better suit their purpose.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2109 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-24 19:34:05 +00:00
Wanne aac4cc0e86 Merged from revision: 2107
INI Editor V 2.8.0 Bugfixes
Bugfixes
- Relaunching INI Editor does not read the new values in Ja2.ini, defaults to 800x600. They do saved to Ja2.ini.
- Clicking the up/down arrows now increments with value 2 instead of 1

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2108 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-24 19:20:02 +00:00
Wanne ec3fd1cfe6 Merged from revision: 7404
New Version 2.8.0
- Added support for custom resolutions (width, height)
- Added support for FRENCH INI descriptions

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2106 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-22 12:07:09 +00:00
Wanne aafb39445c Merged from revision: 2103
- Added comments to history.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2104 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-20 19:27:45 +00:00
Wanne c9ab23b443 Merged from revision: 2101
Externalized History Log texts (by Jazz)
- see TableData\History.xml
- added support for language specific history (German.History.xml, French.History.xml, ...)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2102 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-20 04:28:38 +00:00
Flugente cab264f9a5 Disease feature is off by default.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2100 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-10 14:40:32 +00:00
Flugente 66fc68ef67 New feature: Diseaes affect your mercenaries. They can be contracted in varíous ways and have varying effects.
For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/334918#Post334918

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2099 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-10 13:05:18 +00:00
Flugente d1936cdba8 Adjusted aim level and gun handling values (by Strohmann)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2098 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-10 12:49:03 +00:00
Wanne a308ec2ec6 Merged from revision: 2096
XML Editor can now work with the "Data" folder
- Fixed "Data\TableData\*.xml" files 
- Added missing BigItems STI files
- Added Lookup XML files for the XML Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2097 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-05 21:46:57 +00:00
Wanne 8bf0168398 Merged from revision: 2094
- Added missing "Lookup/AmmoChoices.xml" file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2095 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-05 18:49:48 +00:00
Wanne 02c4ed3ee1 Merged from revision: 2092
- Removed <GameDir_Taiwanese_Path_1> from XMLEditorInit.xml, because TAIWANESE is not supported anymore

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2093 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-05 18:32:41 +00:00
Wanne 925fa36d01 Merged from revision: 2090
New XML Editor: 0.105
- Added backpack climbing support.
- Fixed bug with individual choices.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2091 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-05 17:13:55 +00:00
Wanne 6266488af4 Merged from revision: 2088
- Added custom game resolution (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2089 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-05 17:04:12 +00:00
Wanne 1bcc07fa84 Merged from revision: 2086
Added new XML Editor: Version 0.104
- Added support for individual item choices xmls

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2087 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-30 18:29:20 +00:00
Wanne c8c5d4fa17 Merged from revision: 2084
- Fixed wrong decimal value instead of int value in GunChoices_*.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2085 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-30 18:04:00 +00:00
Wanne 45849bc5a6 Merged from revision: 2082
XML Editor: Fixed error on startup by switching back to Xml editor revision 161
- Latest revision 162 causes error on startup

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2083 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-30 17:38:17 +00:00
Wanne 4fc4087167 Merged from revision: 2080
- Added latest Version of XML Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2081 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-27 11:00:30 +00:00
Wanne e97f4b54df Merged from revision: 2078
- Fixed of gamestart missing settings and cleanup of Profiles folder INI settings (by Buggler)
- Deleted 'Profiles\UserProfile_UnfinishedBusiness\UB' folder

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2079 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-26 13:01:58 +00:00
silversurfer 44355b6d0b New option in CTHConstants.ini:
IRON_SIGHTS_MAX_APERTURE_USE_GRADIENT = FALSE/TRUE
When activated it will make iron sights more powerful over longer distances. This is an experimental switch. The formula might need to be tweaked.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2077 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-22 09:56:41 +00:00
Wanne 9c758c3b69 Merged from revision: 2075
- Fixed extra spaces in names and nicknames in MercProfiles.xml (by Buggler)

- Changed Ja2Options.ini settings (by Buggler & Sevenfm):
MAX_NUMBER_PLAYER_MERCS = 32
DIRT_SYSTEM = FALSE
AUTO_FAST_FORWARD_ENEMIES = 2
AUTO_FAST_FORWARD_MILITIA = 1
AUTO_FAST_FORWARD_CIVS = 1
AUTO_FAST_FORWARD_CREATURES = 1
CLOCK_SPEED_PERCENT = 120
ENEMY_CLOCK_SPEED_PERCENT = 120

- Removed unused Ja2Options.ini:
MIN_RANGE_FOR_FULL_COWERING_TARGET_PENALTY
STAMINA_HIT

- Updated ReadMe in Windows 8 Fix.zip (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2076 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-21 18:09:59 +00:00
Wanne 1700bfa652 Merged from revision: 2073
Changed default screen resolution to 1024x768

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2074 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-19 13:50:25 +00:00
Flugente 669f982338 Throwing knifes can get bloody again.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2071 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-14 21:02:12 +00:00
Wanne 534f14e457 Merged from revision: 2069
Updates (by Buggler)
- Mercs, militia & enemies are now shown with 10x icons on strategic screen
- Changed militia icon order display in strategic map; elite first 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2070 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-14 19:38:46 +00:00
Wanne b3e5689b46 Merged from revision: 2067
- Added missing email merc availability texts for the new DG mercs (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2068 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-12 20:55:29 +00:00
silversurfer a9a1cff510 New modifier for NCTH to alter the behaviour of the scope penalty:
- AIM_TOO_CLOSE_THRESHOLD = 0.8

This defines the point within scope range where the penalty starts.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2066 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-11 15:17:40 +00:00
Flugente e8f6aaf324 - Generals are now a separate prisoner type. They cannot join militia, but yield an impressive ransom.
- prisoners now require less interrogation points, and mercs have less interrogation points

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2065 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-10 21:20:45 +00:00
Flugente 5b377b42e0 Fix: settings appeared twice
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2064 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-08 20:01:35 +00:00
Flugente 05ada754c1 - Adjusted military headquarter description.
- Extended SquadNames.xml.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2063 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-08 18:58:43 +00:00
Flugente 5607cbf766 Added icons for enemy tanks in strategic map
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2062 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-07 21:55:35 +00:00
Wanne bd782231b2 Merged from revision: 2060
- Added French translation to the INI Editor xml files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2061 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-07 19:38:54 +00:00
Flugente 6dd26aa967 New Feature: dynamic dialogue is played when dynamic opinions are active. Mercs can comment on each others actions, and this can influence their opinions further. IMP character answers can even be chosen by the player.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2059 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-06-27 22:11:13 +00:00
Wanne ee57766780 Vehicle Update: Roadkill with vehicles and ramming (by anv)
- new feature: ramming people - set with Tactical Gameplay Settings > ALLOW_CARS_DRIVING_OVER_PEOPLE and Tactical Gameplay Settings > ALLOW_TANKS_DRIVING_OVER_PEOPLE - when shift is pressed planned vehicle route will go through people. Those who will stay on its path will be hit, causing wounds and knock-outs.
- new feature: ramming structures - when shift is pressed planned vehicle route will go through obstacles. When vehicle hits the structure on its path it will be destroyed, causing small damage to vehicle too (with exception of tank). Tactical Gameplay Settings > CARS_RAMMING_MAX_STRUCTURE_ARMOUR and Tactical Gameplay Settings > TANKS_RAMMING_MAX_STRUCTURE_ARMOUR settings control how well armoured structure can be driven through and amount of potential damage for vehicle.
- see: http://www.ja-galaxy-forum.com/ubbthreads.php/topics/333829/Drivable_Vehicles#Post333829


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2058 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-06-21 10:07:43 +00:00
Wanne 66ce337ad3 Updated APBPConstants.ini comments (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2056 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-06-20 12:34:14 +00:00
Wanne 10d5a056bb Moving Tanks Feature (by anv)
- feature: tanks can move around in tactical. Set with Tactical Gameplay Settings > ENEMY_TANKS_CAN_MOVE.
- feature: tanks can ignore chance to get through and destroy enemy cover even if it probably won't hit anyone behind it. Set with Tactical Gameplay Settings > ENEMY_TANKS_BLOW_OBSTACLES_UP.
- feature: tanks can use cannon even against single mercs and in perfect health. Set with Tactical Gameplay Settings > ENEMY_TANKS_DONT_SPARE_SHELLS.
- feature: tanks can noticed as soon as any part of it is visible. Set with Tactical Gameplay Settings > ENEMY_TANKS_ANY_PART_VISIBLE.
- feature: depending on game difficulty enemy patrols at game start can be randomly reinforced with tank. Set with Strategic Gameplay Settings > ARMY_USES_TANKS_IN_PATROLS.
- feature: depending on game difficulty enemy groups created during offensives can include tanks. Set with trategic Gameplay Settings > ARMY_USES_TANKS_IN_ATTACKS.
- feature: mercs in vehicles automatically rest their guns,
- fix: guns can be rested on vehicles,
- rewritten code to allow putting enemies inside vehicles,
- added missing descriptions for all vehicle options to INIEditorJA2Options.xml.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2055 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-06-18 18:10:27 +00:00