Commit Graph
7607 Commits
Author SHA1 Message Date
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
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
Wanne 3a479ccdc5 - Bugfix: The name-tag in Drugs.xml made the drug system not working (by Flugente)
- New drug effect: cyanide damages life as a sideeffect. Currently doesn't kill, but lets you lose consciousness. (by Flugente)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5263 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-05 21:12:15 +00:00
MaddMugsy 8f50018b59 Enabled hiding of NAS attachment slots by making their X or Y position >= 300
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5262 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-05 06:47:26 +00:00
MaddMugsy cc7afa2603 Enabled default attachments to have their own default attachments
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5261 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-05 06:02:19 +00:00
MaddMugsy 021a8fc85f Made it so default attachments are added to items even if they are not present when the map is created in the map editor
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5255 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-03 18:46:36 +00:00
Wanne b02e37d883 - Bugfix: Fixed a bug that would cause the game to crash when calculating reliability (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5254 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-03 17:23:10 +00:00
MaddMugsy 003ada4d4c Fixed soldier tooltips showing attachments when they shouldn't be
Cleaned up PxItems code to not be so messy, and be more flexible later once we can figure out a way to enable P4-P9items again

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-03 03:34:11 +00:00
MaddMugsy c237ca4dff Inseparable boolean field for items changed to UINT8
0 = removable (as before)
1 = inseparable (as before)
2+ = replaceable = inseparable, but can be replaced by a similar item

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5247 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-01 19:08:03 +00:00
MaddMugsy 83c47e0c6b Hide asterisk for attachments when hiddenAttachment tag = 1
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5245 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-01 02:41:11 +00:00
MaddMugsy dbe87b94b1 Fixed San Mona mine crash when trying to leave the sector with Kingpin's money -- CheckForKingpinsMoneyMissing function wasn't defined in the lua call
Fixed threading crash when hovering mouse over stairs in rebel hideout (in WF maps at least) - removed unnecessary temporary SOLDIERTYPE variable

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-30 22:04:14 +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 145c437857 Bugfix from Flugente: enemies collapsing
-during the drug upkeep, the strength value of the soldiers was set to 1, which is why they were exhausted very fast by what little inventory they had

Also - Now we read in (and OR together) a variable number of AvailableAttachmentPoint tags from items.xml. 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5238 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-30 05:11:35 +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 dafc7d8bec Added Common Attachment Framework
-- Known issue -- the BR gun tooltips will double up if an item is using both the old attachment method and the new CAF

& Working files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5234 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-28 10:17:59 +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 11cc056601 - Bugfix: Now it is not possible anymore, that TANKS loose any stats (wisdom, agility, ...) when hit with an explosive weapon (LAW, ...)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-27 20:43:31 +00:00