Commit Graph
269 Commits
Author SHA1 Message Date
Wanne 2ca650e0e4 - Added a minimal version of "Food.xml" for the "Data" folder, so the game can start
o Later, we should disable the food system in the start new game screen for the "Data" folder, like it was done for New Inventory. Then we can delete this minimal Food.xml file
- Added missing INI food properties for the "Data\Ja2_Options.INI" file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1472 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-23 13:14:04 +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
MaddMugsy f1c1fd448a Swapped zombie hit sounds.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1466 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-03 18:44:08 +00:00
Wanne eaacef7221 Externalized some hardcoded grid numbers to "Mod_options.ini" (by DepressivesBrot)
- There is a new "Mod_options.ini" file located in the "Data" MOD folder
- Only modders should make changes to the file.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1464 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-19 07:54:10 +00:00
Wanne 0a8c395c3e ja2_options.ini update (by Flugente)
- added a new option under [Tactical Fortification Settings] in the ini that governs wether any fortification options can be used while enemies are in the sector

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1462 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-16 22:58:52 +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 a2f598799c - Added missing ini properties to the Data/APBPConstants.ini and Data/Ja2_Options.INI file
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1456 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-11 08:48:38 +00:00
MaddMugsy 191761bdd2 Added Zombie battle sounds
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1453 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-08 19:55:42 +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
Wanne ad5791151f - Added descriptions for the 2 new properties (USE_XML_TILESETS, NUM_P_ITEMS) to the INI Editor "INIEditorJA2Options.xml" file
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1447 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-01 12:04:50 +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 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 735dbb57ec - Fixed "OldAIMArchive.xml" for "Data" folder (added missing veterans)
- Removed unused WF merc entries from AIMBIOS.EDT ("Data") folder
- Added missing "TOPTION_QUIET_TRAINIG" to Ja2_Settings.INI

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1440 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-29 20:25:57 +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
Wanne ab69dcdcb5 - Fixed missing <AttachmentClass> tag in "Data\TableData\Items.xml"
- Added comment block for "Data\TableData\Drugs.xml"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1437 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-25 22:21:02 +00:00
Wanne 5b2f9de954 - Bugfix: Fixed the problem when playing with vanilla ("Data" folder), that you cannot train any militia (the training action was always disabled)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1433 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-18 13:06:14 +00:00
Wanne 50afd7b191 - Fixed wrong entries Data/TableData/Magazines.xml which resulted in wrong items after hiring a merc
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1432 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-18 11:54:33 +00:00
Wanne e23da51717 - Fixed wrong comment for jump through window property (CAN_JUMP_THROUGH_WINDOWS)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1428 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-18 10:27:25 +00:00
Wanne efd0dc05b6 - Added new example and usage of a new LUA Method called "HireMerc()" where we can hire a specific merc by the LUA method call
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1427 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-18 10:05:05 +00:00
Wanne 43b93740c8 - Added new prone bandaging animations (by PasHancock)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1421 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-06 14:47:32 +00:00
Wanne fb837c7b10 UB:
- Deleted unused "TableData/Text" folder
Updated ja2_options.ini
- Added missing properties
- Reworked wrong comment style
- Enabled the "USE_SCOPE_MODES" feature for Data-1.13


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1415 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-30 08:17:12 +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
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 ecca400704 - Removed the additional P4-P9 items from the Ja2Set.dat.xml file
- Re-Added the USE_XML_TILESETS property to ja2.ini
- Now you can start a game with USE_XML_TILESETS = TRUE (using Data-1.13\Ja2Set.dat.xml) or USE_XML_TILESETS = FALSE (using Data-1.13\BinaryData\Ja2Set.dat), because both files should contain identical data

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1402 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 20:56:58 +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 364fac8d0b Replaced vanilla Item_Transformations.xml with an empty one, since there are no rags (or any transformations) in vanilla ja2
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1396 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 08:01:45 +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 5d86fa4434 Changes for HAM 5
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1389 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 23:16:43 +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
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
MaddMugsy 963b3b9e5a 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 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
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 298c33d36c - 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 2a3f2f97cb - 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 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
Wanne 431a7011a3 - 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 467b91e355 - 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 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
Wanne f647e94f49 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