Commit Graph
33 Commits
Author SHA1 Message Date
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 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 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
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
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
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 c26f74f444 added some Unfinished Business items that were requested for modding work.
First try did not work properly because someone moved the language files without notifying me :-(

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1236 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-09-15 10:05:14 +00:00
Starwalker 8bbc4b3119 removed combo-merge Gameboy+Wire=Lameboy Display (was nonfunctional)
added use-item-merge Utility Knife+Gameboy=Lameboy Display

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1177 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-07-23 13:50:39 +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
Starwalker d739afed6b added ammo (9x18mm AP and 7.62x54mm Match)
decreased size of Extended Ears
changed Destruction-merges so that the result is a rag, to avoid CTDs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1119 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-22 07:23:04 +00:00
Wanne 7ff17075c1 1.13 Power Update
*** New ja2.exe build (2415) ***
- Enhanced Description Box (by Headrock)
	- Can be toggled on/off in the game settings
	- Can be customized in the ja2_options.ini (USE_ENHANCED_DESCRIPTION_BOX)
	- Further infos: http://www.bookgallery.co.il/JA2PublicPosts/DescBox.asp
- 100 AP System
	- Now the default system
	- Can be changed back to 25 AP System in the Data-1.13\APBPConstants.ini
        - Just change the property AP_MAXIMUM = 25 and you have the 25 AP System back

German and Russian EXE can be found here:
http://ja2.h758491.serverkompetenz.net/Wanne/Build_2415/


*** New XML Editor ***
- Supports the 100 AP system
- Minor adjustments


*** New INI Editor ***
- Also works as a MOD Loader.
- New entry in the ja2.ini (DEFAULT_JA2_EXECUTABLE). Used for starting JA2 v1.13 from the INI Editor
- Supports 100 AP System (APBPConstants.ini)
- Configure and start JA2 v1.13 from the INI Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1049 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-11-13 15:07:24 +00:00
Starwalker 4bacd1e6a2 added M14 EBR (pic by Kaerar)
added M21 EBR (pic by Kaerar)
added EBR stock
added .44 Magnum AET ammo
added 7.62x25mm AET ammo
changed 7.62x25mm coldloaded standard ammo to coldloaded AP/FMJ, to fit the ammo pics

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@981 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-09 06:57:15 +00:00
Starwalker 0d050203b5 added Pipe Wrench as a close combat weapon, but it is nowhere sold at the moment!
added another SL8-version as the result of a merge
changed Shovel to close combat weapon
changed Barret to use new pic
changed standard 7.62x25mm (Tokarev) ammo to AP/FMJ because of its reputation
moved the four NIV default items to lower itemnumbers due to XML-constraints
changed revolvers to have SwapClips=1 to avoid strange results from ChrisL's new reloading code.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@926 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-21 09:43:51 +00:00
Starwalker 345bfec3cf added mssing SCAR barrel merge (WP-version)
changed Russian caliber of UDAR-Revolver
changed/corrected a lot of other Russian stuff (names, weights, descriptions)
increased coolnes of HK G11-PDW and Mauser M-03
added data for a new NewInv LBE-item

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@920 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-12-11 08:57:17 +00:00
Starwalker 39391c3990 added CETME Ameli
Changed HK MG36E to HK MG36 RAS
added HK MG36
added mergability of various G36 rifles with rail-kit or optics-grip to obtain other versions
disallowed Rifle LAM and Rifle LAM/Flashlight combo on Bundeswehr G36 versions as these have no forward rails.
added grippod attachability to G36 RAS versions
corrected price of Match Sights ($1 was much too cheap ;-)
changed vision bonus of attachable scopes to reflect effect of ambient light (or lack thereof)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@895 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-12 06:57:28 +00:00
Starwalker 11b36e793d added a ton of armors: Thanks to ChrisL's work (both XML-work and graphics), we now can treat/coat the advanced armor items.
added a point of accuracy to hi-cap Colt pistol

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@808 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-20 14:47:43 +00:00
Starwalker 6acedece52 added a missing merge with the SCAR-WP SV Barrel
added further merges to exchange the barrel in a SCAR Conversion Kit
added ability to mount Kobra on Bizon SMG
corrected a typo in one of the SCAR-WP Conversion Kit descriptions
changed sound of Steyr ACR, because the sound of falling brass does not go well with synthetic cartridge cases ;-)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@789 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-08 09:39:50 +00:00
Starwalker a86c8d1ac2 added new SCARs in 6.8mm SPC and 7.62x39mm.
added SCAR conversion kits
added 6.8x43mm SPC ammo (HP and AP)
activated Steyr ACR and its ammo
deactivated HK MP5/10SD3 and 10mm DU ammo
added HK MP5/40A3 and SMG ammo
raised ammo capacity of Micro-Uzi to 30
added Thor's Katana, Nunchaku, and Shuriken (also to IMP-Item choices)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@787 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-06 08:22:44 +00:00
Starwalker 25dfe1388c changed Colt Delta Elite to small slot
changed FN EGLM to draw pics from P1ITEM
removed Foregrip attachability from Glock 19 (made no sense on that gun)
added Heavy Throwing Knife to Tony's inventory
added .45 ACP Drums to Tony's inventory
added Steyr ACR, but DEACTIVATED it, because it is not ready yet
added Steyr ACR magazine, but DEACTIVATED it, because it is not ready yet

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@777 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-26 09:41:51 +00:00
Sergeant_Kolja 1af4970bc9 Merges: All Types of T-Shirts now can be cut to Rags (for Molotovs) with any non-throwing Knife. Officers Coat can also be cut. Bloody knifes can be cleaned with a Rag.
German.Items: corrected some Grammar, Corrected U-238 to U-235, squeezed Dyneema descriptions (too long for BR), Improved Text for old Aimpoint.
ATN: I did _NOT_ checked, if U-238 is also wrong in English!
ATN: Gameboy + Copper still don't work. Not found the Bug for now :-(


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@771 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-25 21:14:15 +00:00
MaddMugsy e0e4700eab -Added xml version information to xml files
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@758 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-02 18:30:35 +00:00
Starwalker 1e6e89df08 added SCAR-L and -H sniper variants.
changed SCAR-L to SCAR-L CQC
added replacement barrels for SCAR rifles (CQC and SV versions only)
added Grenade Panel
raised accuracy of the following guns: SKS, SVD, SVDS, Zastava, and Skorpion
corrected description of CAWS

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@745 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-03-22 09:04:49 +00:00
MaddMugsy c5bcb17ea8 -xml files updated to work with xml editor
-fixed some IncompatibleAttachments.xml entries that didn't have corresponding reverse entries (fixed by editor)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@711 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-22 23:43:15 +00:00
Starwalker 2989467de2 added a new scope, it can be merged with Reflex Sight to get a Reflex Scope.
new scope is a default attachment for C7A2 and L85A1.
added the newer calibers to GermanAmmoStrings

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@633 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-01-16 08:07:06 +00:00
MaddMugsy f1733032a3 -Merges.xml tag update:
resultingItemIndex renamed to firstResultingItemIndex

added:

secondResultingItemIndex
APCost

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@434 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-08-25 21:22:21 +00:00
MaddMugsy bd0455ca72 -sorted merges so they'll actually work :p (duh)
-fixed rpgs in EnemyItemChoices.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@315 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-08-09 20:39:41 +00:00
MaddMugsy bcdc16a1d9 -no more merging mustard gas grenades! :p
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@313 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-08-09 16:21:59 +00:00
MaddMugsy 068db305f6 -enabled grenade magazine merging
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@309 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-08-09 15:51:51 +00:00
Lisac2k 82137835b9 -Fixed bug with merging desert camo kits
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@302 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-08-05 12:51:17 +00:00
Lisac2k cd975f717b -Updated images for wood/urban/desert camo kits (big, inventory, ground). Updated Attachments.xml, EnemyItemChoices.xml, FranzInventory.xml, Items.xml, Merges.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@301 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-08-05 12:26:59 +00:00
MaddMugsy d0513c7703 -moved item numbers around into the armours range for new armours and armour upgrade kits
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@259 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-07-27 17:11:08 +00:00
Lisac2k 9bd8676341 - Updated XML files supporting new armors, armors attachments etc.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@257 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-07-26 21:56:35 +00:00
lalien 05e8b50d9d Little Alien
Initial data import 2006.05.23


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-05-23 19:13:46 +00:00