Commit Graph
1371 Commits
Author SHA1 Message Date
MaddMugsy d2ba98aa1f 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 531f4134c3 - 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 72af0a6819 Added p4-p9items to Data folder to fix vanilla JA2
Updated comments in JA2.ini and Ja2_UB.ini.  XML Tilesets are now REQUIRED, unless someone changes the way they work in the exe somehow.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1379 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-31 08:35:44 +00:00
Wanne 07504db812 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 46d642022b 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 4a03d5a417 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
Wanne 4f18f32a6a - Updated ja2_ub.ini
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1375 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-25 22:29:50 +00:00
Wanne 2981d0b74d - Updated ja2.ini & ja2_ub.ini
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1374 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-25 22:28:47 +00:00
MaddMugsy e97a00e725 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 967891046c -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 135d25808e - 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 b2caea497a 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 2b382449a5 - Added additional version of the JA2LOGO.sti (JA2LOGO_2.STI) (by Lejardo)
o If you want to use this logo, you just have to set in the file "Data-1.13\TableData\Layout\LayoutMainMenu.xml"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1364 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-23 10:04:05 +00:00
Wanne fdbed817ed - Added alternate shooting animation for big merc (M_SR_AM2.sti) (by Sandro)
- Added alternate shooting animation for big merc when standing in water (MW_SR_AM.sti) (by Sandro)
- Added and renamed the original animations with a *.original" suffix

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1363 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-15 09:23:06 +00:00
Wanne 03cdd81071 - Fixed Terry's 064_099 sound files ( by Buggler)
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=301454#Post301454


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1362 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-15 08:58:51 +00:00
Wanne b58c8150ec - 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 5ed8d45ad0 - 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 9ccbf056fe - 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
Wanne 9b70a7a0bc - Updated comments for the 3 new item size properties
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1358 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-01 16:31:21 +00:00
Wanne 3af9ae7b4f - New Externalization: Item size and weapon limits (by JMich)
o 3 new ja2_options.ini properties: MAX_ITEM_SIZE, MAX_WEAPON_SIZE, OLD_INVENTORY_ITEM_NUMBER
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=276115&page=1

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1357 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-01 16:16:55 +00:00
Wanne be4169c4f3 - Changed a few default starting / settings options:
o Set default IMP charaters to 1 in the start new game screen
o Set default game style to "SCI-FI" in the start new game screen
o Disabled "NCTH" in the default ingame options

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1356 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-31 10:21:06 +00:00
Wanne 1c78675d13 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
Wanne e67213c2d6 - GameDir fixes (by Buggler)
o Removed error entries for GM-94 launchable attachments
o Corrected Hitman Kit 2 Ammo


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1354 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-27 11:52:10 +00:00
Wanne 84d990e7fb MERGED GameDir files from the development GameDir folder from revision 4545 up to 4882
Development GameDir folder: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP/GameDir




git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1353 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-18 11:58:16 +00:00
inshy 70047c7156 -Added 2 letters for French (Ligatures Æ, æ, Œ, œ). Now we have support for all French alphabet
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1352 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-07 21:02:31 +00:00
Wanne 11d47c5ed5 - Updated alternate shooting pistol animation for small merc (by PasHancock)
o To use this new animation, just rename it to "S_N_SHOT.sti"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1351 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-02 10:40:44 +00:00
Wanne b1399421ef - Added new official 2011 Release Version: 4870
- Added new official XML Editor Version: 0.60

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1350 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-12-28 10:53:47 +00:00
Wanne 855cbb9dce New XML Editor v0.59
- Bugfix: allow the XML Editor to parse top level comments (same tag level as <ITEM> and <MERCGEAR>) (by JMich)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1349 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-12-27 14:53:23 +00:00
Wanne ac74dca8b2 - New Externalization: Mute when item spotted in turn based mode
ja2_options.ini: ITEMS_SPOTTED_NO_TALK

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1348 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-12-11 20:28:39 +00:00
Wanne 2c468beee5 - Added 2 handed alternative single pistol shooting animation for small male merc (not used yet) (by PasHancock)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1347 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-12-11 16:33:34 +00:00
Wanne ff4e5072e6 - New XML Editor (Version: 0.58)
o Fixed invalid XML file, when saving MercStartingGear (fix by JMich)
o Output the current used MOD folder (from XMLEditorInit.xml) on the splash screen

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1346 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-11-30 23:55:55 +00:00
Wanne ac60e06bf6 - Fixed wrong possible location for Micky from D14 to D13
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1345 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-11-28 11:00:42 +00:00
Wanne b49efc47de - Added 3 INI-Properties (DISABLE_STRATEGIC_TRANSITION, DISABLE_LAPTOP_TRANSITION, FAST_WWW_SITES_LOADING) for fast loading and skipping transitions
o The source code changes are in revision: 4806

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1344 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-11-18 10:16:13 +00:00
Wanne c478292797 - Bugfix: Chitzena Mine (B2-1) was missing
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1343 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-11-14 13:39:22 +00:00
Wanne 9929567e88 - Fixed "Nada" item in Monk's Gearkit #5
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1342 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-26 12:43:50 +00:00
Wanne 2ff1ef726c - Deleted old, unused files
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1341 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-22 07:49:51 +00:00
Wanne 9e769cf0ed - Moved vanilla reworked animations from "Data-1.13/Anims" to "Data/Anims"
o Renamed the reworked Animation "M_SR_AM2.sti" to "M_SR_AM2.sti.bak" so it will not be used ingame currently

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1340 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-17 20:14:54 +00:00
Wanne e483747a20 - Moved vanilla reworked animations from "Data-1.13/Anims" to "Data/Anims"
o Renamed the reworked Animation "M_SR_AM2.sti" to "M_SR_AM2.sti.bak" so it will not be used ingame currently

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1339 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-17 20:14:18 +00:00
Wanne 55dc27d356 - Externalized a 3 properties where the user can set how the AI reacts when shooting. This should fix the bug, that AI acts strange when playing with NCTH system (by tazpn)
o MAX_EFFECTIVE_RANGE_MULTIPLIER, MAX_EFFECTIVE_RANGE_REDUCTION, MAX_EFFECTIVE_USE_GRADIENT
o Bears Pit discussion: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=291742&page=3


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1338 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-15 20:01:05 +00:00
Wanne 512e17c07c - Added missing "TOPTION_DISABLE_CURSOR_SWAP" to Ja2_Settings.INI
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1337 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-04 22:21:24 +00:00
Wanne 2adff9abf2 - Added the tool "ja2export.exe", which allows converting ja2 data (sti, jsd, ...) to new structure (png, xml, ..)
o Added help for ja2export.exe and option ja2.ini properties, for loading the new structure files generated with ja2export.exe

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1336 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-02 19:55:27 +00:00
Wanne 87bcbdebde - Heli ETA Box
o Graphical Fix on the Heli ETA Box for 1024x768 by correcting e coordinates due to larger font used


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1335 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-02 19:00:21 +00:00
Wanne cb96c7e351 - Added new running with pistol animation (by PasHancock)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1334 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-02 14:27:08 +00:00
Wanne 620d126391 - New big mercs with either Throwing trait or Show-Off personality use a slightly more fancy animation for throwing knives. (by PasHancock)
o INFO: it needs at least an official source EXE from revision 4661 or a development source EXE from revision 4660 to work

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1333 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-09-25 18:15:33 +00:00
Wanne 9d47dc91cb - New remote detonator animations (by PasHancock)
o INFO: it needs at least an official source EXE from revision 4675 or a development source EXE from revision 4656 to work

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1332 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-09-25 07:47:53 +00:00
Wanne 15f5315f46 - Fixed the wrong INI-Comments style "//" with the correct ones ";" and applied proper JA2 section formating style
o With this fix, the VFS.log should not report the "WARNING : could not extract key-value pair" anymore 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1331 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-09-21 08:01:36 +00:00
Wanne 3c04394283 - Moved 4 animations from "Data\Anims" to "Data-1.13\Anims", because they are replacements of existing animations and should only be in the "Data-1.13" folder to keep the originals in the "Data" folder
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1330 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-26 18:08:12 +00:00
Wanne 17fc4594db - Added new gun and pistol shooting animation for big male (by PasHancock)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1329 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-25 18:44:09 +00:00
Wanne bc7068ba3f - Added new SMACKW32.DLL (from UC), which should allow to play custom smacker videos (e.g. UC videos, ...)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1328 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-18 17:36:22 +00:00
Wanne b558a56309 - Finished the reworking of the Sun Goggles face gear
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1327 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-16 15:12:13 +00:00