Commit Graph
549 Commits
Author SHA1 Message Date
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 8596981e9e XML Editor .96:
-Added PoisonPercentage tag to items.xml and ammotypes.xml (Called Poison Power in the editor)
-Added Cure Drug Type

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1446 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-30 10:48:22 +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
Wanne f3598da61c - Removed (hide) Spooky from M.E.R.C website
o If you want to have him back on M.E.R.C, just remove the comment block at the end of the MercAvailability.xml file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1441 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-29 20:47:24 +00:00
Wanne 9d42876b8b - Updated JA/DG Merc MOD (by Dimitri)
o Edited some lines for Spooky to make them better sounding and compressed too big ones, example 069. Made the GAP files.
o Edited Spooky's stats. Shadow is now Hated1 instead of Hated3. 033 line is now for HeadShot. No Meddeposit and weekly salaries. 
o Spooky moved to MERC. Edited his BIO files. From 63 AIM to 18 MERC. Edited his StartingGear because only one Kit is availible at MERC.
o Added a very old mini mod - "Dynamo and Shank cured faces".
o Added and fixed over 20 new lines for Reuban, Kelly and others.



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1439 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-29 10:19:47 +00:00
MaddMugsy 22f0f89b33 Updated Lookup table xmls
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1436 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-25 17:07:58 +00:00
MaddMugsy 82ad2e599e Vince's starting medkit and first aid kit no longer have 1% status
Temp file deleted
ACOG reference in INI file changed from saying it's a 10x scope to a 4x scope

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1426 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-17 17:30:28 +00:00
Wanne 765c6221dc JA/DG Merc MOD v3.0 (by Dimitri)
- Fixed a lot of speech files
- Added some new speeches from JA1 series. (Spike, Snake, Vinny and many others)
- Fixed Ivan's quotes
- Organized merc's salaries
- Edited merc's stats and traits
- Gary moved to A.I.M. from M.E.R.C

see here: http://www.bears-pit.com/board/ubbthreads.php/topics/298288/1.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1424 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-15 22:00:38 +00:00
Wanne 17abf4f558 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1420 4f8fa57e-7814-0410-bad4-adc449f26b7c 2012-05-05 21:16:48 +00:00
MaddMugsy 1ba2086b74 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 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 5e2088ddd4 - 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 d7f803fd62 - 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 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 e1e2aee686 - 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 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
Wanne 0259412dac - 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 0b72ef854b 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 7e74e2d2da 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 c031dce02a - 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 021df752fa 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 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
MaddMugsy ef220e65c1 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 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
Wanne e59a5621a6 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 fa20e1fdec 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 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
MaddMugsy 0f8bf8090e -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 c7a191542e - 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 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
Wanne d1b02dd028 - 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 82c708445d - 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 b7b61f917d - 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