Commit Graph
2014 Commits
Author SHA1 Message Date
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
Wanne e89e1afedc Merged from revision: 2053
- Tweaked sinking icon in EDB (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2054 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-06-05 14:38:27 +00:00
Wanne df7b928e6a Merged from revision: 2051
- Fixed resetting boxes fought (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2052 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-06-03 18:42:57 +00:00
Flugente ea4f49a711 - New Feature: dynamic opinions allows mercs to form opinions about each other depening on actions they/the player take or do not take. These can be viewed in the 'MeLoDY 'website. See also http://www.bears-pit.com/board/ubbthreads.php/topics/333259.html#Post333259
- new background property: <dislikebackground> allows mercs to dislike specific backgrounds

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2050 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-28 22:03:13 +00:00
silversurfer 76a104b951 - changed SHOT_HEAD_DIVISOR to SHOT_HEAD_MULTIPLIER. The old name was misleading
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2048 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-26 16:49:09 +00:00
Wanne 2da7979349 Merged from revision: 2046
- Added first page and last page buttons to history log (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2047 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-23 19:07:52 +00:00
Wanne 0ad234f175 Merged from revision: 2044
- Reworked/improved english texts for LoadScreenHints.xml and CampaignStatsEvents.xml (by John A Smith)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2045 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-22 18:48:55 +00:00
Wanne a0990d6f59 Merged from revision: 2042
- Fixed typo in LoadScreenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2043 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-20 19:00:04 +00:00
Flugente 841951ff62 New: if KNOWN_NPCS_DIFFERENT_MAPCOLOUR is TRUE, friendly NPCs known to the player are displayed in dark blue to easier differentiate them from normal civilians
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2040 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-19 20:48:22 +00:00
Wanne 50053bab7d - Improved NCTH cursor (by Sevenfm)
ja2_options.ini: IMPROVED_NCTH_CURSOR

0 - default cursor
1 - improved cursor: show extended AP info, laser dot, scope mode icon, limit maximum displayed aperture size (100)
2 - compact cursor:  aiming level as numbers, limit displayed autofire bullets (10), limit maximum displayed aperture size (50)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2039 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-18 15:44:02 +00:00
Wanne 0362b874d0 Driveable vehicle Update: Externalized vehicle seats (by anv)
- externalised vehicle seats (TableData\Vehicles.xml) influence position of passenger, field of view, ability to shoot and being hidden,
- seat can chosen by using ctrl+RMB on vehicle (ctrl + LMB just takes the first visible seat)
- seats can be changed or swapped while inside vehicle,
- remade JSD files for cars,
- vehicles aren't transparent anymore,
- vehicles are louder than people, depending how fast they move.
see: http://www.bears-pit.com/board/ubbthreads.php/topics/332790/5.html


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2038 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-18 15:27:09 +00:00
Wanne 2de1911218 Merged from revision: 2036
- Eldorado, hummer, jeep animation cleanup (by rummtata)
- Minor language touchups for CampaignStatsEvents.xml, LoadScreenHints.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2037 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-18 14:44:04 +00:00
Flugente 6bee325c65 - The base chance for gun degradation, BASIC_DEPRECIATE_CHANCE, is now externalised to Item_Settings.ini.
- adjusted radio energy consumption

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2035 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-17 19:19:54 +00:00
Wanne 34f19aa8f8 - Moved some wrong placed INI values in the correct section
- Fixed missing INI properties in Data\Ja2_Options.INI and Data-1.13\Ja2_Options.INI
- Added missing INI properties in Data\Skills_Settings.INI

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2034 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-14 18:49:43 +00:00
Flugente c3a9a37604 Drivable Cars update (by anv):
- Streamlined vehicle controls - no more selecting driver and vehicle separately, switching displayed APs and other esoteric activities. To move vehicle just select its driver and you're good to go. If you click on vehicle in tactical, also its driver will be selected automatically. Besides driving car, driver can perform other actions normally.
- Vehicle's APs, health and fuel are displayed on the steering wheel - thanks to Buggler for idea. Vehicle APs are treated as a resource (so if car changes driver mid-turn, it won't go any further than it would).
- Added option Tactical Interface Settings > ADD_PASSENGER_TO_ANY_SQUAD. If you order passenger to exit vehicle by clicking on the seat belt, he'll be added to new squad, so if you ordered six passengers to exit one by one, you'd end up with six new squads. With ADD_PASSENGER_TO_ANY_SQUAD = TRUE, passenger will be added to any existing squad with empty slot if possible.
- Added option Tactical Interface Settings > PASSENGER_LEAVING_SWITCH_TO_NEW_SQUAD. If you order passenger to exit vehicle by clicking on the seat belt, by default you get switched to his new squad. With PASSENGER_LEAVING_SWITCH_TO_NEW_SQUAD = FALSE you'll switch only if exiting passenger is the selected one.
- Cosmetic fix: changed display above vehicle from "*Merc's name* (VEHICLE)" to "*Merc's name* (*Vehicle's name*)" and colour from yellow to white (since mercs in vehicle are controllable and yellow is reserved for mercs on assignments).
- Fixed passengers rotation. Again.
- Fixed vehicles getting "tired" - lowered APs due to fuel below max. They can move the same as long as they have any fuel.
- Fixed unrelated bug: clicking on any empty slot in team panel would select merc with id 0.
- Fixed unrelated bug: switching to squad with less mercs would cause team panel to still show skill tooltips for mercs from previous squad on empty slots.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2033 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-13 20:40:38 +00:00
Wanne 9c98715cab New Feature: Allow driving vehicles in tactical (by anv)
- To control vehicle, click on it or on the steering wheel in team panel under driver's portrait.
- Vehicles have two gears - slow drive and fast drive, switchable just like walking and running ('S', 'R', double-click).
- Vehicles working: Ice Cream Van, Hummer, Jeep, El Dorado and, potentially, tanks.
- Passengers can be selected and ordered to open fire from the inside
- You can also open inventory screen for passengers, pass or throw items, etc.

Normally vehicle is treated as any other merc and has its own APs. It has obvious disadvantages - it's possible to drive in the middle of the enemy group using vehicle's 100AP,
and then use all your mercs inside vehicle with their still full APs to kill everything that moves at point blank range - with even the driver participating!
- To prevent that you can set Tactical Gameplay Settings > AP_SHARED_AMONG_PASSENGERS_AND_VEHICLE_MODE with following calculation methods

ja2_options.ini: AP_SHARED_AMONG_PASSENGERS_AND_VEHICLE_MODE, AP_SHARED_AMONG_PASSENGERS_AND_VEHICLE_SCALE

more infos: http://www.bears-pit.com/board/ubbthreads.php/topics/332208/1.html


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2032 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-06 08:47:06 +00:00