Commit Graph
573 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 da401b474a added action items for tripwire grenades
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1539 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-16 01:05:54 +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 99bf161829 typo correction
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1537 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-10 18:47:38 +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
Wanne 79ad0085f8 - Deleted UB loadscreens (800x600 and 1024x768)
- Added UB loadscreens in PNG format
- Updated SectorLoadscreens.xml comments

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1523 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-24 13:11:21 +00:00
Wanne c7343fd2f5 - Updated the "LayoutMainMenu.xml" files to the new format
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1509 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-23 18:22:28 +00:00
lalien e39afabcfd - support for full screen main menu rev. 5498
- added full screen main menu image for all resolutions
- added xml options mor main menu 
	- StretchImage		if 1 the image is stretched to the screen size
	- CenterImage		if 1 the image is centered in X
	- ImagePositionRelative	if 0 the image is displayed on the same place on any resolution, ignored when StretchImage is active
- obsolete xml tags not removed for compatibility with older versions
- only png images are functional




git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1505 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-23 14:16:46 +00:00
Flugente 26df387c86 New feature: The M.E.R.C. website now also has gearkits (by JMich)
- in order have multiple gearkits for mercs, you have to create them

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1503 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-21 20:35:43 +00:00
Flugente d430eb638e added cleaning kits as random loot to enemies
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1500 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-20 20:51:22 +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 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 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
Wanne 7563ebda21 Sandro's feature pack (by Sandro)
- GameDir files for the features
- further infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/308884/A_Small_Compilation_of_New_Fea.html#Post308884

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1490 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-14 12:20:35 +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
Wanne 700fe7e074 - Increased number of action items from 255 up to 501 (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1479 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-29 11:48:54 +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 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