Commit Graph
1046 Commits
Author SHA1 Message Date
Wanne 59a9a89edf - Bugfix ActionItems.xml (by Jazz)
o Fixed wrong item indexes for <BombItem>
o Removed UB specific LUA code from the ExplosionControl.lua (Data and Data-1.13)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1406 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-14 13:05:10 +00:00
Wanne 69c8109200 - Added gunsling to Reapers weapon (Gearkit 3) to test the new gun sling feature (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1404 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-13 22:43:32 +00:00
Wanne 2a4a71d0b1 - New Feature: Rifle Sling (by Flugente)
o This attachment fits most ARs, Rifles and SMGs. When attached, moving the gun from the main hand to the rifle sling slot does not cost APs when 'Inventory Manipulation costs AP' is turned on.
o When a merc would drop his gun because of damage taken, it is instead moved to the rifle sling slot if possible.
o A gun in the main hand or rifle sling slot cannot be stolen when a rifle sling is attached.

- Proper picture for Tripwire (by smeagol)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1403 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-13 08:20:12 +00:00
Wanne 4b878d0c6c - Removed the additional P4-P9 items from the Ja2Set.dat.xml file
- Re-Added the USE_XML_TILESETS property to ja2.ini
- Now you can start a game with USE_XML_TILESETS = TRUE (using Data-1.13\Ja2Set.dat.xml) or USE_XML_TILESETS = FALSE (using Data-1.13\BinaryData\Ja2Set.dat), because both files should contain identical data

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1402 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 20:56:58 +00:00
MaddMugsy 92d39c0cbd AttachmentClass.xml changed to NasAttachmentClass.xml. (New AttachmentClass.xml added to Lookup folder instead)
New version of XML Editor with above change, plus TripWire, TripWireActivation and new AttachmentClass tags added.
Cleanup of xml files in Data folder after running them through the editor.
Removed references to non-existant item id 1525.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1399 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 18:43:45 +00:00
Wanne d98484fb7b - Bugfix: Fixed the problem with the klaxon and flare items from ActionItems.xml (by Jazz)
o There was the bad numbering of objects in tag <BombItem>



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1398 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 16:49:02 +00:00
Wanne e8079fccee - New Feature: Toggle scope modes (by Flugente)
o This allows you to toggle between a gun's different scopes via the '.' key. Y
o You get the boni for vison, tunnel vison, sight range, scope magnification etc. only for the scope you use. 
o 2 new ja2_options.ini properties: USE_SCOPE_MODES, DISPLAY_SCOPE_MODES: Allows the display of an icon on your gun, to tell what scope is currently in use. If it is a scope, the magnification factor also gets written. Both options can be found under the  [Tactical Gameplay Settings] section in the ja2_options.ini
o new tag in items.xml (<attachmentclass>) now enables to specifiy what an attachment can do. At the moment used by grenades/rockets/scopes/sights. Items.xml changed accordingly, modders need to add this tag for those items.
o More infos: First post in: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303038&#Post303038
- WARNING: This feature breaks savegame compatibility.

- New Feature: Tripwire-triggered mines (by Flugente)
o This allows creating complex networks of tripwire that can detonate multiple mines attached to them.
o 2 new Items.xml tags: tripwireactivation, tripwire
o More infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303205&#Post303205 

- Overheating addition (by Flugente)
o Severe overheating now temporarily reduces a gun's accuracy. This exact amount is displayed in the UDB.

- Bugfix (by Flugente)
o Removed foregrip as an attachment from the Saiga 12K

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1397 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 08:47:13 +00:00
MaddMugsy 58e67791a8 XML Editor updated
- JMich fixed a possible crash scenario at start.  
- Fragmentation data values are now able to go above 100 in Item Data form.
Added fragments to Fragmentation Rocket and VOG Jumping Grenade
Allowed old Talon GL to be more than a paperweight if/when it is found on the vanilla maps

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1395 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-11 17:00:52 +00:00
Wanne e4e75c2e8a - BUGZILLA #606: Fixed wrong spelling of "Ceramic Armor Insert.wav" sound
o Because of wrong spelling, this sound was never loaded and reported in the "game_log.log" file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1393 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-11 16:39:37 +00:00
MaddMugsy 943f04c012 Added PocketPopups.xml file
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1390 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 23:26:37 +00:00
MaddMugsy 1abfffd2aa Changes for HAM 5
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1389 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 23:16:43 +00:00
MaddMugsy 3d13b63b35 removed boolean tags from AttachmentClass.xml
New version of XML Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1388 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 22:48:44 +00:00
Wanne 08a13e97dd - Updated comment section for ActionItems.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1387 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 18:13:34 +00:00
MaddMugsy 41bd2a0802 1. AttachmentClass and Silhouette xml files moved from Lookup folder to main TableData folder
2. Added and updated some of the required files from HAM5.  Others will be added when the code is ready.  HAM5 XML changes have been included for use with the latest XML Editor code.  These changes will be ignored by the game.
3. AttachmentClass changes by Flugente applied to xml file.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1383 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-09 22:35:54 +00:00
MaddMugsy 2d4e4f76dc reverted tonyin pventory.xml and saminventory.xml to restore zero values
added attachment tag =1 to kac masterkey

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1382 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-08 17:47:18 +00:00
MaddMugsy d2ba98aa1f fixed uiIndex ordering in SamInventory.xml and TonyInventory.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1381 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-02 16:34:39 +00:00
Wanne 531f4134c3 - New Feature: Allow attaching and using underbarrel weapons (by Flugente & JMich, Pics by smeagol)
o Updated XML files and added new KAC masterkey which can be used as an underbarrel weapon
o Raider and Kelly have one in their starting kit 4 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1380 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-01 15:38:40 +00:00
Wanne 07504db812 Fixes: MercProfiles.xml (Vanilla & 1.13) (by Buggler)
- Fixed Gus <LearnToLikeTime> for Scully
- Corrected Scully biweekly salary to original 53000 from 63000
- Reverted Dr. Q to 4 NewSkillTraits
- Changed Buddy/Hated tags to 255 from -1 values (variable was changed to UINT8 from INT8 in SVN4480)
- other small fixes
1.13 only
- Fixed Monk <Buddy> to Laura from Scope
- Fixed Sidney pants colour
- Fixed Cliff Agi to 60 from 59
Vanilla only
- NewSkillTrait & CharacterTrait updated w 1.13 values (from LocknLoaded)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1378 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-29 20:10:38 +00:00
MaddMugsy 46d642022b Trimmed off items with 0 quantities from shopkeeper inventory xmls.
Replaced remaining magazines with ammo boxes in Sam's inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1377 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-26 23:09:26 +00:00
MaddMugsy 4a03d5a417 Added AP to all ammo names for AP ammo. Fixed some ammo box BR descriptions.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1376 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-26 07:28:17 +00:00
MaddMugsy e97a00e725 fixed br name and desc for 12 gauge slug box
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1373 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-25 07:32:06 +00:00
MaddMugsy 967891046c -removed two unused entries from the end of TonyInventory.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1372 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-24 02:32:13 +00:00
Wanne 135d25808e - Replaced wrong Magazines.xml (by Madd Mugsy)
- Added JA2_Map_Editor_Tutorial.pdf

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1371 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-23 21:29:27 +00:00
Wanne b2caea497a MERGED source game dir files from development trunk revision 4890 up to latest current revision 5105
Development Trunk (now obsolete): https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP
A detailed list of all the features (changes) is visible in the history log of the development trunk:

- New JA/DG Merc: Version 2.9
o Up to 20 new characters with complete speech from JA/DG
o see JA2_DG_Merc.txt for more infos

- A few more adjustments to the GameDir files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1365 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-23 20:30:23 +00:00
Wanne b58c8150ec - Translated EncyclopediaQuests.xml to English (by Asthner)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1361 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-29 09:57:28 +00:00
Wanne 5ed8d45ad0 - Reworked the comments block in the Vehicles.xml file
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1360 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-26 16:10:34 +00:00
Wanne 9ccbf056fe - Fixed "Hummer" going hostile when encountered in a sector
o The <neutral> tag was set to 0 (enemy) instead of 1 (neutral, friendly)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1359 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-08 12:11:37 +00:00
Wanne 9b70a7a0bc - Updated comments for the 3 new item size properties
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1358 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-01 16:31:21 +00:00
Wanne 3af9ae7b4f - New Externalization: Item size and weapon limits (by JMich)
o 3 new ja2_options.ini properties: MAX_ITEM_SIZE, MAX_WEAPON_SIZE, OLD_INVENTORY_ITEM_NUMBER
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=276115&page=1

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1357 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-01 16:16:55 +00:00
Wanne 1c78675d13 Fix for NPC Inventory Tabledata (by Buggler)
- NPC Inventory Tabledata IndexNo sort according to ItemID
- Removed double entries for same Item ID


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1355 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-29 19:11:21 +00:00
Wanne e67213c2d6 - GameDir fixes (by Buggler)
o Removed error entries for GM-94 launchable attachments
o Corrected Hitman Kit 2 Ammo


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1354 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-27 11:52:10 +00:00
Wanne 84d990e7fb MERGED GameDir files from the development GameDir folder from revision 4545 up to 4882
Development GameDir folder: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP/GameDir




git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1353 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-18 11:58:16 +00:00
Wanne ac74dca8b2 - New Externalization: Mute when item spotted in turn based mode
ja2_options.ini: ITEMS_SPOTTED_NO_TALK

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1348 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-12-11 20:28:39 +00:00
Wanne ac60e06bf6 - Fixed wrong possible location for Micky from D14 to D13
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1345 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-11-28 11:00:42 +00:00
Wanne b49efc47de - Added 3 INI-Properties (DISABLE_STRATEGIC_TRANSITION, DISABLE_LAPTOP_TRANSITION, FAST_WWW_SITES_LOADING) for fast loading and skipping transitions
o The source code changes are in revision: 4806

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1344 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-11-18 10:16:13 +00:00
Wanne 9929567e88 - Fixed "Nada" item in Monk's Gearkit #5
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1342 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-26 12:43:50 +00:00
Wanne 2ff1ef726c - Deleted old, unused files
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1341 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-22 07:49:51 +00:00
Wanne e483747a20 - Moved vanilla reworked animations from "Data-1.13/Anims" to "Data/Anims"
o Renamed the reworked Animation "M_SR_AM2.sti" to "M_SR_AM2.sti.bak" so it will not be used ingame currently

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1339 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-17 20:14:18 +00:00
Wanne 55dc27d356 - Externalized a 3 properties where the user can set how the AI reacts when shooting. This should fix the bug, that AI acts strange when playing with NCTH system (by tazpn)
o MAX_EFFECTIVE_RANGE_MULTIPLIER, MAX_EFFECTIVE_RANGE_REDUCTION, MAX_EFFECTIVE_USE_GRADIENT
o Bears Pit discussion: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=291742&page=3


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1338 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-15 20:01:05 +00:00
Wanne 15f5315f46 - Fixed the wrong INI-Comments style "//" with the correct ones ";" and applied proper JA2 section formating style
o With this fix, the VFS.log should not report the "WARNING : could not extract key-value pair" anymore 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1331 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-09-21 08:01:36 +00:00
Wanne 3c04394283 - Moved 4 animations from "Data\Anims" to "Data-1.13\Anims", because they are replacements of existing animations and should only be in the "Data-1.13" folder to keep the originals in the "Data" folder
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1330 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-26 18:08:12 +00:00
Wanne b558a56309 - Finished the reworking of the Sun Goggles face gear
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1327 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-16 15:12:13 +00:00
Wanne 0729c215a6 - Disabled the sun goggles, cause not all images in the STI are reworked
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1326 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-16 07:25:55 +00:00
Wanne a21c596aed - Added new face gear: Sun Goggles (by PasHancock)
o Only merc Index 0 - 10 is currently adjusted
o Empty Face_SunGoggles_IMP.sti. We need to add sun goggles for imps

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1324 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-15 14:54:41 +00:00
Wanne f4e09f849a - Updated number of Traits in Skills_Settings.INI (because Dr.Q has 3 major traits)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1321 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-11 20:05:48 +00:00
Wanne 8adfda48a3 - Minor update by Off_topic
o Dr. Q now has all his original traits
o WF mercs repriced according to skill/experience. No longer all bunched together.
o Attitudes tweaked after brainstorming with several Bear'spit members.







git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1320 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-11 14:55:06 +00:00
Wanne 732961eed7 - Added new graphical faces gear: SWAT Helmet (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1318 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-05 05:47:03 +00:00
Wanne 712860a036 - LockNLoad MOD Update (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1317 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-21 08:02:05 +00:00
Wanne 6120597e35 - Changed usMouthY coordinate for Barry back to 28 (thats the original value in prof.dat)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1316 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-20 10:14:58 +00:00
Wanne fa060e0db3 *** LockNLoad MOD v1 (by Off_Topic)
Link: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=286021&page=1

#All Mercs now have their original 1.12 traits.

#STOMP traits revised to match original traits as closely as possible. Some Mercs have extra traits to make use of STOMP.

In some cases i used Demo instead of Throwing as this is how Grenades are linked now.

Raven and Lynx are the only AIM Mercs with Scouting as it is a very powerful trait. There are also 1 Merc & 1 RPC with this trait.

Because some traits have been made minor, a few Mercs like Igor have been given another trait. All STOMP traits have been used.

Electronics is a funny trait to translate into STOMP:

Old Trait: Improves chances (+15) of modifying/assembling electronics, picking electronic locks and disarming electronic traps, and attaching remote detonators.

So for some it means DEMO while for others it means Tech.

#All WF Mercs have been given their proper starting gear, minus the grenades and kevlar leggings etc...

#Every Merc has their 1.12 gear now, select *Kit 2 if you would like to experience how JA was originally released.

*Static,MD, & Spider kept their 1.12 gear, so for them it is Kit 1.

Kit 1 is their 1.13 gear. K2&3 are normally a choice of weapons/equipment etc... K5 is aimed at the Mid-Late game, but that's not to say you can't sacrifice manpower for equipment.

#All the 1.13 added weapons & equipment have had 100% condition replaced with how they would have shipped in 1.12 along with other minor fixes.

E.G. Malice MAT-49 100%->87%

#All Mercs now have 5 Kit to choose from.

#Corrected the Wildfire Mercs Bios.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1315 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-20 10:12:27 +00:00