Commit Graph
291 Commits
Author SHA1 Message Date
Flugente d150a0742e added random items with 2 examples for assault rifles. Note that this is an example, they might change in the future
FIX: item #1581 no longer has two classes

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1544 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-30 22:01:57 +00:00
Flugente 86b72ab0fe - added an example clothes merge
- added clothes to Keith's merchant inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1541 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-16 14:54:27 +00:00
Flugente 92ff3c669c New feature: clothes items allow colouring of your mercs. See http://www.bears-pit.com/board/ubbthreads.php/topics/310208.html#Post310208 for more information.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1540 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-16 02:53:36 +00:00
Flugente 894221c6f7 Feature improvement: tripwire, tripwire mines and directional eplosives can now be planted with the map editor.
- The new Items tag <usActionItemFlag> is necessary for that. Necessary items tripwire and claymore have been added. These new items are intended for the map editor, they will however work like their original ingame.
- The action item system has been repaired for this. It has never worked correctly prior to this, but the errors never occured.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1538 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-15 02:26:12 +00:00
Flugente 3aa4718403 added 2 new food items (pics by Soto) that fit Arulco better
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1536 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-10 18:38:48 +00:00
Flugente a7651e3557 New Attachment: the rifle grenade device (<AttachmentClass>33554432</AttachmentClass>) acts as a GL on the barrel slot, but blocks all other firing modes, and uses up one bullet.
It is strongly advised not to use this in combination with other underbarrel GLs.

Currently allowed for WW2 rifles with 40mm grenades.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1533 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-26 18:48:52 +00:00
Flugente 242faa22a0 added data and new STI's necessary for the new covert ops trait
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1529 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 23:48:48 +00:00
Flugente 63a6fbb279 added pic for cleaning kit (pics by wil473)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1498 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-18 00:58:02 +00:00
Flugente ecc8715b36 - added new icons, xml data and settings for the advanced repair/dirt system
- more under http://www.bears-pit.com/board/ubbthreads.php/topics/308926/New_feature_advanced_repair_di.html#Post308926

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1496 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-18 00:02:57 +00:00
Flugente 1c31f91963 fix: Game did not start because of unknown letter, replaced by simple 'e'
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1495 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-16 22:18:18 +00:00
Wanne 1f1e45d394 - Fixed a typo in Items.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1492 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-14 17:01:38 +00:00
Wanne 3d491cc57d - Added the new <CrowbarModifier> Tag to the Crowbar and Rambo Knife (by JMich)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1491 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-14 17:00:36 +00:00
Flugente ecfbd4de1a - updated food values (by Slax)
- new item flag (CAMO_REMOVAL, 1024) for camo-removing items, added to rag (item 1022)
- added xml with current ItemFlag-values (Lookup/ItemFlag.xml)
- added small and medium pics for the masterkey (by wil473)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1489 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-13 20:20:08 +00:00
Flugente 5b0d1bda8b improved item sizes for food
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1485 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-02 20:52:15 +00:00
Flugente 155ee252f3 added external feeding values for most machineguns and their ammo
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1475 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-23 20:15:24 +00:00
Flugente 4949893c16 New feature: guns can now be fed externally
- added necessary face icons
- added description in ini
- as an example, the MG§ and the FN mag can now be fed externally with any 100-rnd 7.62 NATO mag. Internal feeding is possible from the LRAK vest
- for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307574/New_feature_Externally_fed_mac.html#Post307574

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1474 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-23 19:33:37 +00:00
Flugente 57390e7da3 New feature: food system requires mercs to eat and drink in order to survive
- added food items
- added food items to various mechants, BR and as enemy item choice
- added cantina facility
- canteens can now be refilled in sectors by pressing 'Ctrl' + '.'. Map/SectorNames.xml determines wether this is possible, and wether the water will be poisonous
- added new icons related to the food system

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1471 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-21 16:47:16 +00:00
Wanne 010ff3d5ef Bugfix: Static fortifications (by Flugente)
- Changed Item type for shovel to "Misc-Item" (it cannot be used as a weapon anymore)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1458 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-12 16:08:13 +00:00
Wanne a6f24ac9ce Fortification feature fixes (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1457 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-12 07:46:03 +00:00
Wanne ac173284c4 New Feature: static fortifications can now be built by mercs (by Flugente)
- if the terrain allows it, an empty sandbag (item 1540) can be filled to a full sandbag (item 1541). You need to have a shovel (item 1015) in your second hand. You will notice the new hammer cursor
- by using a full sandbag, you can build a sandbag barrier
- by using a concertina stack, you can build a concertina wire barrier
- this only works if the current map has sandbags/concertina wire in its tileset
- with a shovel in your hand, you can remove a sandbag barrier
- changed the size of shovel so it can actually be put in inventories. It was also necessary to remove its ability to be used as a melee weapon.
- for further info, see this thread: http://www.bears-pit.com/board/ubbthreads.php/topics/305822.html#Post305822
o Fidel will have a shovel and a few sandbags in his kit #3 to test the feature.

- new code: added a new flagmask variable to items. This one is separately from the attachments index, and can be used to determine item properties without adding up to 32 BOOLEAN varaibles


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1455 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-11 08:34:38 +00:00
MaddMugsy de3a74ccda Reverted changes for guns attaching to tripwire. There were way too many potentially breaking xml changes for this feature (and having guns with Attachment=True is probably asking for trouble); it has been moved to the code.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1452 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-06 18:19:55 +00:00
Wanne b9c273c25e New Feature: Traps made out of guns and a piece of tripwire (by Flugente)
- guns can now be attached to tripwire and then be used as tripwire-activatd traps
o To support this feature, some (already existing) xml-tags have been added to the weapons in Data-1.13\TableData\Items.xml (<nasAttachmentClass>, <AttachmentPoint>, <AttachToPointAPCost>, <Attachment>)
o see: http://www.bears-pit.com/board/ubbthreads.php/topics/305634.html#Post305634


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1451 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-06 08:30:54 +00:00
Wanne 7f01c87db8 Zombie Update (by Flugente)
- added soundfiles for zombies rising/attacking
- the antidote drug type was wrong, corrected it
- new ini setting for zombies: ZOMBIE_RISE_WITH_ARMOUR controls wether zombies come equipped with armour that lay at their corpse
- fixed drug-type for antidote (index: 1539)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1448 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-02 15:49:30 +00:00
MaddMugsy a80e4000cd 1. Bugfix - Vince's medkits had their statuses reset to zero with the new version of the JA:DG mercs
2. Bugfix - Dr. Q's 4th trait was removed with the new version of the JA:DG mercs
3. 7.62x51mm ammo box sizes increased to 22.
4. P4-P9Item files removed.
5. USE_XML_TILESETS and NUM_P_ITEMS options added to Ja2Options.ini
6. USE_XML_TILESETS removed from ja2.ini 


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1445 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-30 10:16:15 +00:00
Wanne f64bdf01a1 - Fixed type in Items.xml
- Added new drug comment in Drugs.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1444 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-30 08:00:16 +00:00
Wanne 88dac110a3 - New drug: antidote cures poisoning (by Flugente)
o Item#: 1539


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1443 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-30 07:53:03 +00:00
Wanne 82b6cc2b9e - New Feature: Zombie mod ingame option (by Flugente)
o The Zombie option can be enabled in the ingame option screen
o There are 2 new ini sections with a few ini properties ([Tactical Zombie Settings] and [Tactical Poison Settings])
wo ith the tag <PoisonPercentage>, you can now poison guns (Items.xml) or ammo (AmmoTypes.xml). This is the percentage of damage dealt that will be poisonous
-> New Tag in Items.xml: <PoisonPercentage>
-> New Tag in AmmoTypes.xml: <PoisonPercentage>
o see:  http://www.bears-pit.com/board/ubbthreads.php/topics/295746/Zombies_WH40K_and_more.html#Post295746



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1442 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-29 22:56:00 +00:00
MaddMugsy d563881a4d 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 8004ec9387 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 78ea5ac18e 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 dabb04f324 - 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
Wanne 19fdfb0777 - 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
MaddMugsy e0839a2bdf 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 a598fb3011 - 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 b72b1f9262 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
MaddMugsy 443f1c7a70 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
Wanne 452a247d14 - 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 69106c9bd6 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 4e6881ccb4 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
Wanne ac35024843 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
inshy 483ccd334f -Update price for UB items
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1311 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-02 12:47:21 +00:00
Starwalker b74e3daf9e removed ability to attach a foregrip to the Calico M-900 rifle.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1302 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-06-08 09:56:31 +00:00
Wanne 5c04b9b1e1 ****************************************************************************************
** Merged (English) GameDir files from Development trunk, for the Spring 2011 Release **
****************************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1288 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-26 10:54:58 +00:00
Starwalker 9d2e6426db gave NCTH-values to the HK LMGs with integral bipods where they were missing.
removed NCTH-values from LMGs (and SRs) that no longer have an integral bipod.
FN MAG can mount a Grippod now (found an after-market rail on the web...)
raised the number of 6.8mm SPC ammo at BR's and added a clip to Tony's inventory as well.
made Rifle-LAMs attachable to AICW (it has a rail on top).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1287 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-17 06:49:08 +00:00
Starwalker 91bfd7ae30 changed binoculars back to being one-handed, because ChrisL will implement code that stops the exploit of having one in each hand to get double the bonus...
added a 'Use Item'-merge to get a Fumble Pak out of a Portable TV by using the Utility Knife.
changed Bubba's ammo from magazines to speedloaders (was mentioned on Bugzilla).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1284 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-02 14:00:49 +00:00
Starwalker 68d9514927 corrected some wrong ammo-pointers.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1269 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-15 15:32:23 +00:00
Wanne d232521d00 - Restored and reworked TableData/Items.xml and TableData/Weapons.xml. Both had items and weapons from Data-1.13 and therefore invalid Data!
- Fixed wrong price for 9x39mm Mag

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1263 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-01 10:19:21 +00:00
Starwalker ea2992bff1 corrected some gun and ammo weights
corrected some very wrong MinRangeForAimBonus values that somehow sabotaged some scopes (I have no idea how these crept in, SVN 1256 still had correct values)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1262 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-01 10:01:07 +00:00
Wanne 0a62ebd22b ************************************************************
* Merged GameDir from Development Trunk: Revision 4063 *
************************************************************
- Merged from SVN: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1257 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-01-18 10:24:49 +00:00
Starwalker 826c4a2590 added single 43mm grenades for use with NAS. May not be fully functional at this time and WILL NOT work without NAS. Item descriptions contain warning.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1256 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-12-06 09:54:14 +00:00