Commit Graph
1407 Commits
Author SHA1 Message Date
MaddMugsy d1560062ab XML Editor .93:
-Changed ItemClasses from a lookup grid to an editable grid, so ppl can add their own item combinations (ie: for pockets.xml)
-In GridUtility, when creating a combobox column w/an extra blank entry, the decimal data type would screw up the grid. Changed it so that the data types of the rebuilt table columns are set to the same as the source columns.
-Added "Ammo/Grenade" and "Grenade/Misc" to the ItemClass lookup table values (again for pockets.xml)
-Added Separability lookup table
-Changed inseparable tag to integer
-Fixed issue with ItemDataForm text losing data set name
-# of item images is now determined by looking at the Interface folder for mdpXitem.sti files
-Added new options to grid context menus:
-- Remove Filter - to remove any applied filters
-- Filter by Selected Value - only works if grid is editable
-- Apply Value to Selected Column - only works if grid is editable - Add, Multiply and Set operations included

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1418 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-04 20:17:30 +00:00
MaddMugsy 64aa85f0d3 XML Editor .93
-Changed inseparable tag to integer, with values: 0-removable, 1-inseparable, 2-replaceable
-Added Separability lookup table
-Fixed issue with ItemDataForm text losing data set name

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1417 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-01 19:03:55 +00:00
MaddMugsy eaeacc7f7c XML Editor 0.92
-Fixed a bug where a few of the item grid columns would cause an error to be displayed.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1416 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-30 17:39:53 +00:00
Wanne 3a034641d4 UB:
- Deleted unused "TableData/Text" folder
Updated ja2_options.ini
- Added missing properties
- Reworked wrong comment style
- Enabled the "USE_SCOPE_MODES" feature for Data-1.13


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1415 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-30 08:17:12 +00:00
MaddMugsy 17deb41b59 Corrected numbering on Drugs.xml files
XML Editor 0.91
- Reduced DefaultAttachment to 10 fields from 20
- Enabled AvailableAttachmentPoint to go up to 10 fields

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1414 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-30 05:02:51 +00:00
MaddMugsy bdeb2ef516 Added AttachmentPoint.xml
Set DrugType tags in Data\Items.xml
Removed extra type #18 from Drugs.xml

XML Editor v.90
- ja2data.xsd moved to XmlWorkingData folder
- Added DrugType field, Drug table, DrugType table, Drug Item filter
- Added AttachmentPoint table and related fields:  AttachmentPoint, AvailableAttachmentPoint, AttachToPointAPCost
- Updated ItemDataForm - moved all attachment related fields to attachment tabs


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1413 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-28 00:21:10 +00:00
Wanne 6f8e261ea3 New feature: new drug system (by Flugente)
- added many new drug effects. A drug can now have several effects, these can be set via the <DrugType>-tag in Items.xml. 
- Control effect magnitude in Drugs.xml. Added new drugs in Items.xml.
- gave Buns drugs in Kit 5 for demonstration reasons, added drugs to Howard's inventory.
- see also first post in http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303950#Post303950


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1412 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-27 13:28:35 +00:00
MaddMugsy 92fd56dde7 XML Editor v0.87
- removed detonator and remotedetonator tags from items.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1411 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-22 02:25:32 +00:00
MaddMugsy 1bd8b34ca3 XML Editor updated to .86
- allows use of Directional, ubHorizontalDegree, ubVerticalDegree tags
XML files updated after running through the editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1410 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-20 21:30:09 +00:00
Wanne ed025ce5da - Tripwire / Claymore / Makeshift Mines update (by Flugente)
o Items.xml: the tag <Directional>1</Directional> in Items.xml allows an explosive to be directional. Frags caused by its explosion will fly in the direction determined by the merc planting them.
o Items.xml: the tags <Detonator> and <RemoteDetonator> are not used anymore, as those properties can be set via flags in <AttachmentClass>. For now, they still remain in the xmls though.
o Explosives.xml: the tags <ubHorizontalDegree> and <ubVerticalDegree> in Explosives.xml determine the arc in which the frags will fly
o see 1st post: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303556&#Post303556



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1409 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-20 10:44:46 +00:00
MaddMugsy d3364143e3 New version of XML Editor (.84)
-displays error messages when row copying fails - messages from child rows are suppressed (for now anyway)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1408 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-16 17:22:15 +00:00
Wanne c3d38741f1 - Updated Cover Display & Mines Display Hotkeys.txt with additional Mines hotkeys
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1407 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-14 17:05:38 +00:00
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
MaddMugsy 6e199cb65a XML Editor updated with new attachment classes - sling, remote detonator, "defuse" (defuser?)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1405 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-14 07:45:19 +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 e37410ff9b XML Editor - Made attachment classes sort by name in dropdowns
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1401 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 19:53:36 +00:00
MaddMugsy abe8c84546 New version of editor with some extra bitwise attachment class combos
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1400 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 19:14:27 +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 22c2692cf4 Replaced vanilla Item_Transformations.xml with an empty one, since there are no rags (or any transformations) in vanilla ja2
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1396 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 08:01:45 +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 b7539ac692 xml editor working dir fix
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1392 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-11 05:32:33 +00:00
MaddMugsy 641a32c505 minor xml editor update to allow copying inventory table rows directly
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1391 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-11 02:08:16 +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
Wanne ef9833bc8f - New Map Editor: Build: 5178
o Fixed error when playing / loading maps then where saved after Revision 5064 when the Overheated Weapon feature was included!
--> The gMapInformation struct (Version, Edgepoints, ...) was not read correctly from the map file
o Use this map editor together with the latest SCI (Build: 5171)
--> http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=301591&page=1


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1386 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 17:41:28 +00:00
Wanne c02df2eb2f - Added a special JA2 1.13 executable, where you can create the "ja2Set.dat.xml" file from the "ja2set.dat" file
o Developer note: It is "special", because it is the latest version of the source, but does not have the P4-P9 items included in the exe (which is needed to generate the xml file from the dat file)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1385 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 14:10:01 +00:00
Wanne 2b08c1000f - Removed the "USE_XML_TILESETS" from ja2.ini and ALWAYS set it to enabled (1) in the game, so the game always uses the ja2set.dat.xml file, because with the old way (USE_XML_TILESETS = 0) it will not work anymore.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1384 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 13:34:53 +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
MaddMugsy 72af0a6819 Added p4-p9items to Data folder to fix vanilla JA2
Updated comments in JA2.ini and Ja2_UB.ini.  XML Tilesets are now REQUIRED, unless someone changes the way they work in the exe somehow.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1379 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-31 08:35:44 +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
Wanne 4f18f32a6a - Updated ja2_ub.ini
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1375 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-25 22:29:50 +00:00
Wanne 2981d0b74d - Updated ja2.ini & ja2_ub.ini
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1374 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-25 22:28:47 +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 2b382449a5 - Added additional version of the JA2LOGO.sti (JA2LOGO_2.STI) (by Lejardo)
o If you want to use this logo, you just have to set in the file "Data-1.13\TableData\Layout\LayoutMainMenu.xml"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1364 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-23 10:04:05 +00:00
Wanne fdbed817ed - Added alternate shooting animation for big merc (M_SR_AM2.sti) (by Sandro)
- Added alternate shooting animation for big merc when standing in water (MW_SR_AM.sti) (by Sandro)
- Added and renamed the original animations with a *.original" suffix

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1363 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-15 09:23:06 +00:00