Commit Graph
7637 Commits
Author SHA1 Message Date
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
Wanne 6795455635 - Bugfix: Fixed bug, that items get lost in the sector when switching between tactical sectors
o This bug was a result of a "fix" from revision 4571 (2011-07-14)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-27 20:18:34 +00:00
Wanne 8e856bd3f0 New feature: new drug system (by Flugente)
- Added a few new drugs



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5226 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-27 13:36:12 +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 fc88abaa5b 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 "Druggist" 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

WARNING! This will break savegame compatibility!


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-27 13:22:35 +00:00
Wanne 4f120f152f - Bugfix: Fixed crash when showing attachment slots in EDB (strategy) and left clicking on a attachment slot (for non weapons)
o This bug was introduced when merging HAM 5

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5224 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-24 14:42:59 +00:00
Wanne 24982ba1d1 - Fixed uninitialized variable
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5223 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-24 09:14:30 +00:00
Wanne aadd29b320 - Bugfix: One shot LAWs do not explode on a direct target hit
o This bug was introduced when merging HAM 5

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5222 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-24 09:05:23 +00:00
Wanne 090eb6b27c - Chinese GameDir Updates (by zwwooooo & TBS)
o New AIM, NPC...edt files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-23 21:22:58 +00:00
Wanne c32ccdfa74 - Bugfix: Fixed CTD, when trying to show "Adv" or "Gen" Tab on the EDB for non weapon items
o This bug was introduced in revision 5181 when HAM 5 was merged

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5220 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-23 21:02:31 +00:00
MaddMugsy 78ea5ac18e XML Editor updated to .86
- allows use of Directional, ubHorizontalDegree, ubVerticalDegree tags
XML files updated after running through the editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1410 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-20 21:30:09 +00:00
Wanne 9a234b9f50 - Tripwire / Claymore / Makeshift Mines update (by Flugente)
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/trunk/GameData@5218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-20 10:45:14 +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
Wanne 20d677c519 New Feature: Layered hierarchical tripwire networks (by Flugente)
- allows creating of complex tripwire networks, that behave differently depending on where they are activated. Different networks can overlap, allowing a wide range of trap network designs
- added network-specific view methods (ALT + Shift + C)
- added new dialogues when planting tripwire

New feature: remote defusing of mines (by Flugente)
- the new items Remote Defuse and Remote Combo allow to remotely defuse a bomb that has been planted. Simply select a frequency for defusing upon planting the mine. This frequency is of course treated differently than a detonation frequency.

New feature: directional frag explosions (by Flugente)
- 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.
- the tags <ubHorizontalDegree> and <ubVerticalDegree> in Explosives.xml determine the arc in which the frags will fly.

New feature: makeshift mines (by Flugente)
- you can now create mines out of grenades: simply merge tripwire with them. You can then use them like regular mines. They can also be activated by your tripwire networks.
- With a simple item transformation in the UDB, you can transform a makeshift mine back to a grenade and a piece of tripwire.

Minor changes (by Flugente)
- metal detector now only works if used in hands
- wire cutters give a bonus if in hands while defusing tripwire or tripwire-activatable mines/bombs
- added new message boxes with 8 and 16 buttons
- increased the maximum number of bullets that can be on screen from 200 to 1000 (necessary for mass claymore explosions)
- 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.

WARNING! This will break savegame compatibility!

More infos on those features:
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/trunk/GameSource/ja2_v1.13/Build@5217 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-20 10:40:16 +00:00
Wanne ee2196ebb4 - Bugfix: Cap total tunnelvision bonus at 100 to avoid too high values effectively canceling each other (by DepressivesBrot)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-19 07:46:23 +00:00
Wanne c6bc250632 - Make Gameloop exceptions behave more like previous code (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5213 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-15 23:46:44 +00:00
Wanne b150bd172c - Temporary disabled the Encyclopedia, because it seems it takes up a huge amount of virtual/committed memory (~ 2 GB) (by tazpn)
o A define ENABLE_ENCYCLOPEDIA defines, if the encyclopedia code should be compiled
o What is happening here is encyclopedia has a lot of really big structures (ENCYCLOPEDIA_LOCATION) and then a lot of arrays of size NUM_SECTOR, NUM_PROFILES, NUMITEMS which are fairly sizable themselves.
o What the problem with doing this is when you need to allocate memory it typically needs to go to virtual memory to get large blocks of memory (malloc and related routines all do this) but you only have 2GB worth of virtual space as a pointer is 32 bits and user mode gets half of that 00000000-7FFFFFFF for addressing. This statically allocated space is taking up 7/8ths of the virtual address space. When animations or maps need to be loaded there might not be enough virtual space left due to fragmentation.
o To see the amount of committed memory, open TaskManager and add the "Committed Memory" column to the view

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-15 23:45:41 +00:00
MaddMugsy 6a24e04bbc Fixed a potential crash when a merc dies.
Finally fixed CalcMaxTossRange so that it pulls the correct grenade launcher item instead of just the first one, thereby allowing more than one range value per set of launcher items that launch the same grenades.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5211 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-14 21:11:25 +00:00
Wanne 83c9fa163f - Updated Cover Display & Mines Display Hotkeys.txt with additional Mines hotkeys
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1407 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-14 17:05:38 +00:00
Wanne b0b1ad9ef0 - New Feature: Display - mines/bombs/tripwires (by Flugente)
- Display bombs/mines/tripwires planted by your team
  Red is for bomb/mine, yellow is for tripwire and orange is for both at the same tile.
o ALT + END:		only display as long as the hotkey is pressed
o ALT + SHIFT + V:	toggle permanent display on/off

- Display ALL (also enemy) planted BOMBS / MINES / TRIPWIRE when the selected merc has a metal detector in his hand
o ALT + DEL 		only display as long as the hotkey is pressed
o ALT + Shift + C 	toggle permanent display on/off


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5210 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-14 16:29:54 +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