Commit Graph
95 Commits
Author SHA1 Message Date
Flugente 553225197a A paramedic can use empty bloodbags (<emptybloodbag>-tag, item #1756) to create blood bags (<bloodbag>-tag, item #1757) from other mercs. These can then boost the health returned by surgery by ONTOP_PERCENT_SURGERY_HEAL_BLOODBAG percent.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2467 4f8fa57e-7814-0410-bad4-adc449f26b7c
2019-02-10 16:22:27 +00:00
Flugente 4a9405b227 Added camera item (#1751) to Franz' shop inventory and Elroy gear kit #3.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2429 4f8fa57e-7814-0410-bad4-adc449f26b7c
2018-07-14 18:00:55 +00:00
Flugente c6d98dec05 Added painkillers to pharmacy shopkeepers
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2406 4f8fa57e-7814-0410-bad4-adc449f26b7c
2018-02-22 19:18:17 +00:00
Flugente 9cf666a038 New feature: Getting and using intel allows for more spy-related roleplay
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2401 4f8fa57e-7814-0410-bad4-adc449f26b7c
2018-02-18 23:12:21 +00:00
Flugente 6e99ccd766 Rebel basement trader can sell sawed-off shotgun
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2377 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-07-25 15:36:48 +00:00
Flugente 85f3ef511b - slightly tweaked disease effects
- increased disease cure quantity at pharmacy
- lowered militia resource gain modifiers

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2347 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-10-24 18:59:42 +00:00
Flugente 79f964b134 Shopkeeper in San Mona (C6) now buys almost any armour, and sells early to midgame ones
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2322 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-18 18:16:31 +00:00
Flugente d639452893 New feature: We can now create non-profile-based merchants via lua.scripts.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23061&goto=345526&#msg_345526

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2320 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-15 17:09:14 +00:00
Flugente cbc64c3bdc added anti-tank mine (#1735) to Devin's selection
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2260 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-07-15 21:30:49 +00:00
Flugente 036ada1226 New Feature: Drug System Overhaul. The drug system has been completely overhauled.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=341541&#msg_341541

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2257 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-06-28 17:44:55 +00:00
Flugente 397a6091f3 Kyle takes over the San Mona leather shop once his quest is over
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2251 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-06-04 12:55:36 +00:00
Flugente f8f950f765 Deleted Feature: The poison feature has been made obsolelte by the disease feature and has been removed
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2245 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-05-20 20:37:02 +00:00
Flugente a3b8e7e728 added missing xml entries
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2223 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-12 21:04:13 +00:00
Flugente 95a05c2560 Merged revision(s) 2029 from branches/ja2_data_official_2014:
added neurotoxin darts to Howard's inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2030 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-01 22:04:14 +00:00
Flugente 99857261cd Merged revision(s) 1970 from branches/ja2_data_official_2014:
Added sleeping bag item (#1709), as <SleepModifier> was unused.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1971 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-01 22:26:43 +00:00
silversurfer 480321fd2f fixed wrong xml tags
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1808 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 19:18:33 +00:00
silversurfer ae6a97dbe6 added missing .45 drum magazines to Tony's inventory
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1807 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 19:12:22 +00:00
silversurfer d99d74a9f4 added missing items from Tony's inventory
- 1078 "Beretta Cx4 Storm"
- 927 "9x18mm Mag 12 AP"
- 928 "9x18mm Mag 20 AP"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1801 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-02 14:48:28 +00:00
Flugente 69d319810a - Darrel now sells farm products
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1696 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-05 21:48:45 +00:00
Flugente 7b0b11675d new drug: M99 (#1634) uses the Etorphine drug effect (#22). Stuns a target, but can also kill it if overdosed.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1642 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-09 21:11:39 +00:00
Flugente 664eb06bef - bodies are now twohanded
- removed admin shirts from npc inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1625 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-24 18:58:29 +00:00
Flugente 5e848ed633 added missing xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1578 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-20 01:23:11 +00:00
Flugente aea481e5a0 New Feature: The number of merchants has increased, and their values have been externalised.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1577 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-20 00:29:33 +00:00
Flugente 69ffc56b53 - The facility performance tag now determines the effectiveness of the interrogation assignment (100 = standard).
- If you set a handcuff's item to class from MISC (<usItemClass>268435456</usItemClass>)to KIT (<usItemClass>8192</usItemClass>), it will be treated as a stack of binders. Repeated use on enemies consumes the item (see item #1632).
- added 'stack of binders' item to Jake and Sam inventories.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1576 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-17 21:26:03 +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 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 a17266e7b8 added repair kit to a few shopkeeper's inventories
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1497 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-18 00:23:20 +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 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 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
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
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 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
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
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 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 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 425443ab37 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
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 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
Starwalker 71f8bb0027 added 9x18mm Glaser ammo.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1251 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-30 15:46:21 +00:00
Starwalker a8bfd5d906 added .38 Match and HP Solid ammo (including ammo crates).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1245 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-10-28 11:31:51 +00:00
Starwalker 8f2f3002ec added some Unfinished Business items that were requested for modding work.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1237 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-09-15 10:05:58 +00:00
Starwalker f7d5e736d7 added Beretta Cx4 Storm
corrected a few descriptions

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1220 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-04-01 06:46:16 +00:00
Starwalker 03957471b0 - gave a volume of 5 to Tear Gas and Mustard Gas grenades (was 0 before)
- gave built-in bipods to many guns that are depicted with a bipod and cannot have a foregrip anyway (some with depicted bipod may not have this because a foregrip can be attached instead of the bipod).
-  allowed attachment of a bipod to the G36K

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1206 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-02-17 07:41:56 +00:00
Starwalker f9c88ff2c1 added subsonic 7.62x39mm ammo
allowed AR suppressor on some 7.62x39mm assault rifles
corrected a few gun values

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1201 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-10-22 07:50:25 +00:00
Starwalker 963e7c170c activated new G3A3 pic (Kaerar's color adjustment on Coolberg's pic)
activated new AI AWM pic (Kaerar)
activated chokes for shotguns as attachments
added a few new ammo crates
changed 'filled size' of the large backpacks to prevent unrealistic behavior (needs checking...)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1175 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-07-21 07:09:30 +00:00