2481 Commits
Author SHA1 Message Date
Lesh 902200d39f - bugfix: Gas mask was always worn in low-level tooltips. Fixed
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@515 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-08 18:17:18 +00:00
Wanne 8ff617d08c bugfix: New drop item system (XML Drop system)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-08 13:51:19 +00:00
Wanne 32f6cb949e bugfix: Not all Face-Items (Goggles, NVGs, ...) are dropped, when "Drop all items" is selected
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@511 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-07 17:54:20 +00:00
AcyForsythe e0253c2e64 Adding opplist changes by pulmu, previously tested by me
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@509 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-06 23:13:23 +00:00
Lesh 6df124efd7 - code cleanup mostly from Brent Johnson (Nonomori), a very few from me
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-06 19:10:08 +00:00
Wanne f205c1f620 bugfix: Jeep & Eldorado have the same animation like the Hummer
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@505 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-03 19:03:10 +00:00
Wanne 732a5e497a git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@502 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2006-09-01 11:43:29 +00:00
MaddMugsy 1f084ac8ba -switched tooltips to work when ALT is held instead of CTRL
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@493 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-29 18:45:06 +00:00
MaddMugsy d5fd1fa13d -added tooltip source from ShadoWarrior
The strings need to be localized for German and Russian versions.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@492 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-29 18:35:42 +00:00
MaddMugsy 52eaaf4fcd -quick fix: enemies don't wear sun goggles at night anymore
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-29 16:41:10 +00:00
MaddMugsy c8a395fa21 -fixed percentstatusdrainreduction usage in UseKitPoints
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-29 07:03:26 +00:00
MaddMugsy 891f687107 -quick fix: enemies don't use NVGs during the daytime
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@488 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-29 06:52:35 +00:00
MaddMugsy 7720f5a560 -made mercs say quote when blinded by flashbang
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@487 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-29 06:27:46 +00:00
MaddMugsy 56314f07ba --updated pickarandomlaunchable to only pick legal items
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@486 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-29 04:38:39 +00:00
MaddMugsy 0038d2abc1 -updated pickarandomlaunchable to only pick legal items
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-29 04:32:15 +00:00
MaddMugsy f2d401b769 -minor fix: PickARandomLaunchable now looks at the HighestPlayerProgress percentage, so early enemy GLs won't use thermobarics
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@482 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-28 17:46:44 +00:00
MaddMugsy 97d1204b9f -bugfix: merges not working
-bugfix: attachments not costing APs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-27 04:37:05 +00:00
Wanne fce528e1a4 - added a militia drop rate to the xml-drop files.obj
- added drop rates for knives, laws, mortars, launchers (see EnemyWeaponDrops.xml, EnemyMiscDrops.xml)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@478 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-26 12:28:27 +00:00
MaddMugsy 691b69b183 -attachments bugfix
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@477 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-25 23:57:03 +00:00
MaddMugsy d2c2963bfb -externalized AP costs for attachments or an attachment-by-attachment basis
-added APCost to Attachments.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@475 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-25 22:54:52 +00:00
MaddMugsy ace3863569 -quick bug fix reading in merges.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-25 22:09:28 +00:00
MaddMugsy bb1dae2a25 Merges.xml changes:
-added APCost
-added secondResultingItemIndex
-renamed resultingItemIndex to secondResultingItemIndex

(see notes on wiki for usage)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@472 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-25 21:41:00 +00:00
Wanne c4c355f4b6 - Added Kaiden's Vehicle Inventory code
-> VEHICLE_INVENTORY = TRUE (Ja2_Options.ini)
- Bug fix: Vehicles sharing same animations
- Added additional enemy item drop system
    -> New XML-Drop files (EnemyWeaponDrops.xml, ...)
    -> Set ENEMIES_ITEM_DROP = 1 (Ja2_Options.ini) to use the new drop system
    -> Disable "Enemies drop all items" to use the new drop system


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@466 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-25 08:06:11 +00:00
Lesh 944df34a9e - main flashbang code added
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@462 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-23 15:28:55 +00:00
Lesh 5acef85aee - mercs increase their stats more actively while at home or at non-player job. as a result - stats gain and even experience level sometimes.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@459 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-22 17:25:28 +00:00
MaddMugsy 56c6f4d9eb -additional code for item merges:
--prohibited attachments are removed from the new item 
--guns used as a merge target have their ammo removed if the magazine size or caliber don't match, or if the resulting item is no longer a gun

This code change should allow for conversion kits for weapons (ie: Steyr Aug 5.56mm conversion kit to 9mm Steyr Aug Para)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@455 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-18 18:16:38 +00:00
Lesh f157b64392 - fixed freeze after loading any saved game at a second time
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@454 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-18 15:37:52 +00:00
Lesh f82ad0c521 - dying soldiers don't fallback into obstacles anymore. but they still fallback through wall
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@451 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-17 16:54:13 +00:00
MaddMugsy 0d9a0e0b9c -fixed camo not working on enemy soldiers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@449 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-16 17:27:20 +00:00
Lesh 4afc299b60 - this patch allow proper loading map versions of 5.0, 5.25 and 6.0. existing mods friendly.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-16 13:40:20 +00:00
MaddMugsy 7349c3f664 -fixed integral bipods not working properly
-changed "bipod" tag in items.xml from a boolean to an integer.  It is now the to-hit bonus for the bipod.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@439 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-14 15:58:56 +00:00
MaddMugsy b105138b2e -fixed negative ammo prices
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@438 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-14 03:04:43 +00:00
MaddMugsy 150d999dc1 -increased chance of damage from gas by 5%
-fire always damages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@435 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-13 23:04:39 +00:00
MaddMugsy 9d484e219c -externalized assignment (repair, doctor, training) constants to ja2_options.ini, and added a few for good measure ;)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@432 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-13 17:03:12 +00:00
MaddMugsy f135291973 -added ENABLE_ALL_WEAPON_CACHES and ENABLE_ALL_TERRORIST flags (requires new game to use)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@428 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-12 00:56:26 +00:00
MaddMugsy 367f4e88fd -added ENABLE_CREPITUS flag to options ini file to enable/disable crepitus even in sci-fi mode
-fixed BR's not stocking things later in game if they were illegal when game started

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@425 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-11 19:29:50 +00:00
MaddMugsy f3bbd1c4a4 -small change to autofire spread bursts to enable selection of # of rounds fired
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@422 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-11 04:44:21 +00:00
MaddMugsy 1c1b50fc77 -added some limited auto-aim to spread fire to make it actually useful
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@420 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-11 04:02:32 +00:00
MaddMugsy 5b47f6fa2d -added scifi tag to items.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@418 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-10 22:39:13 +00:00
MaddMugsy 3460c7bca5 -fixed camo not working after a merge until the item was removed and replaced
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@413 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-09 16:02:51 +00:00
MaddMugsy 6c284a1862 -ammo weight calculation changes from pulmu
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@408 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-08 17:10:10 +00:00
MaddMugsy 0fedfb8c7d -madlab no longer allowed to set fingerprintid on rocket rifles
-ctrl+enter deadlock abort keys no longer require cheat mode to be active

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@407 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-05 00:05:24 +00:00
MaddMugsy d8c1e4d015 -fixed camo kit attachments contributing to overall camo % for mercs
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@406 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-04 20:35:53 +00:00
MaddMugsy 5d028b3bb8 -item tooltips now display combined weight of items in a stack
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@405 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-04 19:38:02 +00:00
MaddMugsy a04970b980 -fixed camo kit only adding 50% camo
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-04 17:40:18 +00:00
MaddMugsy 67811ac431 -added ammo weight fixes from Pulmu, including dynamic ammo weight option in ini file
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@401 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-04 15:48:16 +00:00
MaddMugsy d7ea36a736 -tested and fixed new camouflage types and ammo weights
-fixed localization to read in XML file

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@400 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-04 05:21:14 +00:00
MaddMugsy 13a8319fbb -ammo weights affected by # bullets remaining
-added code to support urban, desert and snow camo

2 issues:

1. Need to test this to make sure it works, since I'm at work.  I'll test it all out tonight.

2. There is no Snow terrain type.  Anyone have any great ideas on how to test for it?

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-03 23:55:44 +00:00
MaddMugsy 99fc73ae55 -added localization code for German and Russian ammo strings and item names and descriptions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@395 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-03 17:33:50 +00:00
MaddMugsy c3f12c6f25 -upsized loop variable in FindReplacementMagazine in Items.xml from a UINT8 to a UINT16
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@389 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-01 21:27:02 +00:00