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
MaddMugsy
7a50c7acda
-spreadsheet update
...
-fixed lock buster damage rolling over
-doubled chance for lockbuster ammo to hit locks
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@386 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-01 06:02:06 +00:00
MaddMugsy
87691b311c
-re-added equipment bonus application code removed earlier. Turned out the new code isn't called in the strategic map.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@384 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-31 23:40:36 +00:00
lalien
7a9ea3dbe4
- bug fix: invisible enemies
...
- bug fix: manual reload for two weapons
- bug fix: barrel extender falls off while none is attached
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@382 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-31 19:53:58 +00:00
MaddMugsy
9dc17723fc
-fixed steath.col -> stealth.col typo in Animation Control.cpp
...
-changed when equipment bonuses are applied to better handle dropping / throwing items
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@377 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-28 19:38:57 +00:00
MaddMugsy
3c88da4e03
-stealth colouring added to code - shows up when stealthbonus is >= 50 - stealth colour has priority over camo colour
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@375 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-28 15:11:07 +00:00
MaddMugsy
bc412304e5
-un-nerfed semi-auto sniper rifles
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@370 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-25 19:50:22 +00:00
MaddMugsy
1bb241f084
-spreadsheet update
...
-nerfed semi-auto sniper rifles:
From Starwalker:
>Bolt-action sniper rifles are still not used by players, so I would
>propose (again) that the number of aiming actions be tied to rifle
>type, not scope type (but still only if a scope [of any type] is
>mounted):
>Autoloaders: max 6 Aim-AP
>Bolt-action: max 8 Aim-AP
>
>It is the only way I can think of to make the bolt-action rifles
>worthwhile compared to the autoloaders (the added accuracy of the
>bolt-action rifles seems to be of no interest to the players...).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-25 16:21:04 +00:00
lalien
4d73230b89
- bug fix: visual range was very big (should be 0) when VISUAL_DISTANCE_DECREASE_PER_RAIN_INTENSITY was set to > 50%
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@368 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-25 00:27:31 +00:00
lalien
404b1ff4da
- fixed the bug fix from build 365: Smoke grenade has the same effect as mustard gas grenade (need to run in gas cloud to reproduce)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-22 20:10:55 +00:00
lalien
822f29ad76
- bug fix: Smoke grenade has the same effect as mustard gas grenade (need to run in gas cloud to reproduce)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@365 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-21 23:33:57 +00:00
MaddMugsy
37162fc413
-added StealthBonus tag to Items
...
-stealth works like extra camouflage, but is not terrain dependent and also conceals noise
-fixed armour attachments getting destroyed when armour is destroyed
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@361 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-20 23:27:23 +00:00
Wanne
e96c84cf55
Fix: Correct offsets in laptop zoom in/out animation in all 3 resolutions
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-20 17:54:52 +00:00
MaddMugsy
da13c44578
-quick fix for throwing knives degrading due to difficulty modifier when enemies die after being hit by them
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-17 18:57:46 +00:00
lalien
1c5b7f7a4b
- fix for HE ammo
...
- fix for militia reinforcements not working in cities
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@349 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-17 16:39:48 +00:00
lalien
43b6e98496
- added menu option to enable tracer effect for single shots
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-10 18:53:19 +00:00
MaddMugsy
185f154aa8
-tweaked ai turning in green a little bit to make them look for noises in green (mostly for snipers)
...
-enabled tunnel vision attribute on readied weapons (previously only worked on attachments, and non-weapon items)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@338 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-09 19:43:24 +00:00
MaddMugsy
f673236935
-fixed guns never jamming
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@336 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-08 16:31:01 +00:00
Lesh
92b7bd8417
-CTD fix in Tixa in function FindBestPath in PathaAi.cpp
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-07 20:37:08 +00:00
MaddMugsy
a5a0dfd11a
-fixed guns being chosen from too high a level in "Normal Guns" mode
...
-fixed AI not firing guns when able - this should reduce the amount of running back and forth and also the running up to your guys and crouching
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@332 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-07 05:40:20 +00:00
Wanne
36db236079
- Enabled some useful Assert-Messages, so we get notifications about errors in DEBUG Mode.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-06 05:47:28 +00:00