7623 Commits
Author SHA1 Message Date
Wanne b5085f45a8 - Removed the unused WF mercs bio entries from "Data\BinaryData\AIMBIOS.EDT" file
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-29 20:38:50 +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
MaddMugsy 744ce2ee9c Bugfix - BR setting text in start up screen not showing up when compiled in VS2005
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5304 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-26 01:36:21 +00:00
Wanne 0cc00b1da0 - Updated/improved "Spooky'" speech and battle sound files (by Dimitri)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1438 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-25 23:17:35 +00:00
Wanne 9601a81f4d - Bugfix: drugs that alter stats do not behave correctly with doctoring. Temporarily commented them out till a solution has been found. (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5303 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-25 22:23:21 +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
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 21024ed557 Some minor features added:
1. Ja2Options.ini option to override chance of items appearing in maps (MAP_ITEM_CHANCE_OVERRIDE).  Useful for debugging maps.  Not including this one in the ini file for everyone to mess with though.  Value range = 0-100%, where 0 (default) = use map settings.
2. AttachmentComboMerges is underused, so it's been extended to use up to 20 attachments to make it more useful.  Build your own guns, anyone?
3. New merge types:  Easy Explosive (existing one renamed to Hard), Easy Mechanical, Hard Mechanical.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5300 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-25 06:15:30 +00:00
MaddMugsy 00ac266521 Feature change - Bobby Ray Selection on New Game screen split into two items: Quality and Quantity. Selectors allow for full 1-10 range of quality (coolness) / quantity multipliers, instead of just 1,2,4,10.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-24 19:41:11 +00:00
MaddMugsy bd45bf26b2 1. Bugfix - ammo crates will no longer create boxes instead of mags
2. Bugfix - ammo boxes of 100 rounds will now correctly generate C-Mags
3. Bugfix - reduced NAS looping while highlighting items in map screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-24 00:38:34 +00:00
Wanne 6fd8d0652a - Translated new "Quit Training" texts for German version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-22 07:58:05 +00:00
MaddMugsy da2e6f10c1 1. Bugfix - one more pSoldier->bScopeMode != NULL check added
2. Bugfix - removing attachments which created new slots and had attachments in those slots which were also able to go into existing slots in the base item was resulting in duplication of the base attachment and loss of the attached attachment.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-22 03:43:16 +00:00
MaddMugsy 1d714e117d New in-game option: Quiet Training -- when on, mercs will not say quotes while training
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5293 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-21 19:39:53 +00:00
MaddMugsy 3c494af736 1. Bugfix: Scope modes could cause crashes if the soldier's bScopeMode was no longer valid in the ObjList object. This happened mostly due to scopes being attached to other scopes. Now checks that the list item is not null, and defaults to iron sights if need be.
2. ReInitMergedItem now returns a list of attachments that were unable to be reattached or dropped onto the ground (ie: non-default inseparable ones).  These were previously just being tossed into oblivion.  
3. Item transformations now try to attach any inseparable attachments that couldn't be attached to the first result to the other results.
4. Item merges will now try to attach any attachments on the second item in the merge to the first result.  This was already  happening for the first item in the merge.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5292 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-20 18:31:32 +00:00
Wanne 93ea315502 - New Feature: Block iron sights (by Flugente)
o if a gun/attachment has the boolean tag <BlockIronSight> in Items.xml, a gun's iron sights wont be selectable while selecting scope modes.
o if using dual weapons, only iron sights can be used
o new attachmentclass: AC_IRONSIGHT (4194304) for attachable iron sights (display on gun is different from reflex sights, no other differences... yet)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5291 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-20 17:18:28 +00:00
Wanne ac5c36aec1 - Fixed double entry (uiIndex = 1524 "Tripwire") in all *.Items.xml files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5290 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-20 17:14:43 +00:00
Wanne eb2ca0ba70 - Small fixes and tweaks (by Sandro)
o Minor feature added: Shift+RMB click on a gun with ammo inside, will now unload its magazine and place it on your cursor (if not holding anything already). You don't have to go to the weapon description box to unload it.
o Added Throwing trait support for NCTH (was left out before) and added a minor tweak to STOMP+NCTH compatibility.
o Fixed a bug in NCTH when aiming levels of very fast-to-aim guns could be lowered below zero during calculation, which resulted in suddenly giving the gun 8 aim levels making it extremely slow to aim instead. This occurs when you use a pistol with reflex sights with a Gunslinger merc. In the "AllowedAimingLevelsNCTH" the value "aimLevels" was defined as UINT8, so when it goes below 0, it becomes 255 and is then capped at 8. Changed it to signed.

- IIS fix (by Sandro)
o Interrupts on hearing now occur only in meaningful situations - either when enemy attacks us or comes very close to us.
o Added some other IIS tweaks and fixes (first of all the top status bar should now work properly).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5289 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-20 16:30:14 +00:00
MaddMugsy 2691c22397 "Side/Bot." text on BR misc filter button changed to "Grip/LAM".
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-18 22:31:32 +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 a5eab5db8b - Updated GameInit.lua (for the Data-JA2Demo MOD)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1431 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-18 11:22:43 +00:00
Wanne d23a94eefc - New Feature: Now it is possible to compile a JA2 1.13 Demo executable with the actual 1.13 source code (by Jazz)
o This JA2 demo executable is as close as possible to the original JA2 demo, but with the 1.13 features!
--> No laptop, disabled strategy actions, auto merc hired, only P1 maps, ...
o To build the 1.13 executable, just enable the "JA113DEMO" define in builddefines.h
o The 1.13 demo executable will read from ja2_Demo.ini instead of ja2.ini
o You also need the "Data-JA2Demo" folder from the official 1.13 SVN GameDir: https://ja2svn.dyndns.org/source/ja2_v1.13_data/GameDir
o Once you start the game with the demo executable, you will notice the "START DEMO" instead of "START NEW GAME" in the main menu
o Multiplayer is disabled in the demo executable

- There is another new define called "JA113NODEMO" (by Jazz)
o See builddefines.h
o If this define is enabled, a special version of 1.13 is build
-> Disable all meanwhiles, emails, blocked quest with queen, alien queen


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5287 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-18 11:20:11 +00:00
Wanne b3dfa960f2 - Added the JA2 Demo as a new 1-13 MOD (by Jazz)
o Now you can play the JA2 Demo (P1 - Demoville) maps with the features of 1.13
o The Demo has to be started with a special compiled 1.13 demo executable
o This demo is as close as possible to the original JA2 Demo
o There is a special "ja2_Demo.ini" file for the demo settings.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1430 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-18 10:57:24 +00:00
Wanne 44ae08e776 - Enabled the "Auto Fast Forward Mode" in the ingame options for the "Data-1.13" folder per default
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1429 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-18 10:53:59 +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 9a2896d72c - Translated new Bobby R MISC filter buttons for German version
- Added "// TODO.Translate" comment to the new Bobby R MISC filter buttons (so translators can easily find the new untranslated text)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5286 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-18 07:53:48 +00:00
MaddMugsy 78ad9111e4 New Misc filter buttons for Bobby Rays, by attachmentClass:
(attachment tag must also be 1)
BR_MISC_FILTER_OPTICS (AC_SCOPE | AC_SIGHT)
BR_MISC_FILTER_SIDE_BOTTOM (AC_LASER | AC_FOREGRIP | AC_BIPOD)
BR_MISC_FILTER_MUZZLE (AC_SUPPRESSOR | AC_EXTENDER)
BR_MISC_FILTER_STOCK AC_STOCK
BR_MISC_FILTER_INTERNAL (AC_MAGWELL | AC_INTERNAL | AC_EXTERNAL)
BR_MISC_FILTER_OTHER_ATTACHMENTS for all other attachment classes
BR_MISC_FILTER_NO_ATTACHMENTS for the original button; it no longer displays any attachments

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5285 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-18 04:36:52 +00:00
MaddMugsy f6ed981a21 Fix: Global attachment removal was separating attachments with their own inseparable attachments
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-18 04:31:49 +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
MaddMugsy 5930c90585 Fix - after merging or transforming an item, any attachments on the base item which themselves had default inseparable attachments, would see those attachments lost upon the result of the merge/transformation.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5283 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-17 17:14:21 +00:00
Wanne defbf8444f - Bugfix: Game was not initializing "TableData\Map\*.SectorNames.xml" when playing in foreign (not English) language
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5282 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-17 13:19:34 +00:00
Wanne 1dcaa587ef - Updated Chinese GameDir files (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-16 15:42:53 +00:00
Wanne b44ae9452c - Translated _GermanText.cpp (// TODO.Translate)
- Removed unassigned and unused local variables

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5278 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-16 14:48:22 +00:00
Wanne ad3321889a - Updated language specific files so they work again with JA/DG v3.0 MOD
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5277 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-16 14:44:41 +00:00
Wanne 3f7e851327 - Fixed wrong character in German.Items.xml which prevented the game from loading german version on startup
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5276 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-16 13:58:21 +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 c4f005d7e7 - Fixed a bug that caused the PercentCapModifier and the TilesMaxPenalty to get bogus values (by Flugente & cnagorneac )
o This bug was re-added when HAM5 was integrated ...
o see here: http://www.bears-pit.com/board/ubbthreads.php/topics/304750.html#Post304750


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-15 21:07:53 +00:00
MaddMugsy 64eb3caf9f Replaceable (not fully inseparable) attachments are removed when transforming/merging an item if they do not also attach to the result.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5273 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-15 17:01:33 +00:00
MaddMugsy d4c26bc4a2 Enabled default attachments to be loaded on soldiers' items, even if the attachments are added after placing the soldiers in the map editor
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5272 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-14 19:44:21 +00:00
Wanne b541d759a8 - Reverted the changes from Revision 5270, because it crashes the map editor on saving
- I hope now, maps saved with a Map Editor Version <= 5216 will now load again and can be saved without problems.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-14 09:25:44 +00:00
Wanne 4f10c38a49 - Reverted the increased map version number (from revision 5217), because it leads to problems when loading maps saved with older versions of Map Editor
o Now maps saved with a map editor version from 1.13 revision <= 5216 should now work AGAIN with a compiled version (ja2.exe and Map Editor.exe) from THIS revision
o INFO: Maps saved with a map editor version between revision 5217 and 5269 will have incorrect data!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5270 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-12 19:24:08 +00:00
Wanne 1ad5b96931 - Inventory Lag Fix for attachments: Just filter out anything that's not an attachment, thereby skipping over the slow parts (by Madd Mugsy)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5269 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-11 09:55:22 +00:00
Wanne b161b73611 - Updated Chinese text files (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5268 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-09 17:46:37 +00:00
Wanne 2f665d7ab4 - Updated Chinese GameDir files (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5267 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-09 17:46:23 +00:00
Wanne 06c734e267 - Updated MercProfileEditorLanguages.xml (Chinese) (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1423 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-09 17:46:06 +00:00
Wanne 062d1dd631 - New Feature: Possibility to pick up items in crouch position (by Sandro)
o Merc can stay crouched while picking up items and when stealing items from prone(/collapsed) enemy, he must crouch (will do automatically). It really feels much more intuitive.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5265 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-06 15:43:59 +00:00
Wanne 4ad4f6c223 - New Animation: Prone bandaging (by Sandro & PasHancock)
o Also available in a multiplayer game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5264 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-06 15:14: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