1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
268 Commits 9 Branches 6 Tags
56c6f4d9eb093f35e40c4bd63d099d2ee3c51868
Commit Graph
268 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
MaddMugsy b2355272b8 -fixed breaklights not working in Drassen Mine sector 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@453 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-08-18 01:14:49 +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 4967cfc362 -put a stop to enemies and npcs running into gas and fire (hopefully) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@444 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-08-15 17:18:37 +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 78a7d89dad -fixed BR item display error 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-08-13 08:09:59 +00:00
Wanne fa0744a0d9 Bobby Rays: Added "Heavy Weapons" Filter to the Guns and Ammo. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@429 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-08-12 11:41:39 +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 47c26ccdcf -small tweak to BR fix to disable the notbuyable and itemclass = 0 filter on initial inventory setup so we can add new items later 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@427 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-08-11 19:53:06 +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
Wanne c739efc56e Bobby Ray: Filter Guns, Ammo and Used! 
Filters for Armour and Misc will follow

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@423 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-08-11 10:21:36 +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
lalien 86c2197665 - added menu option to allow/disallow crows 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@404 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-08-04 18:44:46 +00:00
MaddMugsy aad2a17a6c -fixed "Crouched/crouched move" appearing in skill descriptions instead of "expert" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@403 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-08-04 17:51:19 +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
lalien bba67c2082 - bug fix: Win 98 CTD 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@381 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-29 22:27:48 +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
Wanne 7e68050d01 Changed the text description of the "Rain noise" in the option screen. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@366 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-22 10:49:27 +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
Wanne 2948f62eb1 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@364 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2006-07-21 21:11:14 +00:00
Wanne b6df04a08a Rain noise can be toggled ON/OFF in the Options Screen 
Added Brightness Level string to the German Version, when pressing "F" in tactical screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-21 21:09:50 +00:00
MaddMugsy e146163d84 -updated version # 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-21 03:14:54 +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 2abefe52a8 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@360 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2006-07-20 17:55:46 +00:00