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
529 Commits 9 Branches 6 Tags
03dfd90060409cdb6610c407c7de6fcb0decce73
Commit Graph
61 Commits
Author SHA1 Message Date
Overhaul e6024e5151 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1017 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2007-06-29 10:40:05 +00:00
Overhaul 7a27e7105d New attack busy system 
Added missing #includes

Added LUA scripting and console

Changed the way tracers are visualized, so they work more like real tracers instead of a light fountain

Fixed signedness of many grid variables used in GetMouseMapPos calls

Fixed enemy weapon choosing:  Sometimes a mortar is chosen but later rejected, but the grenade class was not reset.  Caused assertion failure

Added checks so enemies don't try to chuck RPG grenades with their hands

Now possible to shoot a someone in the head if he's in water

Fixed InitSightArrays to also clear soldier interrupt duel points.  This was causing an assertion failure elsewhere in the code because the interrupt list still had soldiers on it sometimes when this function was called.

Soldiers are much less willing to forfeit their turn over an attempt to use more APs than they have

Removed early setting of muzzle flash.  This would allow enemies to get an interrupt before you even fired.

Fixed item dropping by AI.  If AI tried to drop something while standing it would cause deadlock

Change to greatly speed up closing the sector inventory window in an unloaded sector

Added conditional compile flag to always give robot weapon ready advantage, even for 360 degree sighting


Check builddefines.h for the conditional flags.  Of greatest interest might be LUA_CONSOLE.  This will cause the game to bring up a command console when run.  However this console is severely lacking in many areas.  If anybody knows of an open-source terminal/console that could be used instead, it would be appreciated.  The existing console does bad things when you try to close it, and since it counts as a separate app, it pauses the game while it has focus.

LUA scripting is very limited, basically just proof of concept.  There is one global variable, the Soldiers array.  An array index gives you the soldier in that slot in the currently loaded sector.  The soldier has a few things that can be accessed:  name (short name); fullname (long name); grid (current grid #, can be changed); walkto(grid) (function to walk to another grid); runto(grid) (function to run to another grid)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@924 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-09 09:01:04 +00:00
Sergeant_Kolja 09a26e3155 in ReadInAttachmentComboMergeStats() added a missing fclose plus a missing XML_free 
in Items.cpp added unfriendly code to trace + stop the game when pObj is corrupted.
(the corruption comes from somewhere outside the destructed foo!)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@900 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-05-27 12:34:43 +00:00
lalien 0530b53b9c bug fixes from Overhaul: 
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-05-09 13:16:37 +00:00
lalien a17a3f7cc8 - New feature: Remove attachments and unload all weapons in sector (Shift+F) 
- Fix for grenade launchers (allow reloading with valid ammunition only)
- Fix for stacking items in sector



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-04-19 09:28:28 +00:00
MaddMugsy 682d33da8c -minor fix to allow different types of GL grenades to be attached to the grenade panel and the ALICE pack 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@830 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-04-04 02:38:33 +00:00
lalien 9467b5b6a7 - Added CtH fix from AndroidXP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@804 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-29 11:00:22 +00:00
lalien 3f37673034 - added VS2005 compability fix from Space Viking 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-03-10 18:46:57 +00:00
MaddMugsy c8b4cbe8d9 -skip the CompatibleFaceItem check if either item is Nothing. This will let us trim some lines from compatiblefaceitems.xml that are screwing up the xml-editor. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-02-09 23:54:20 +00:00
lalien 21c2464a43 - AP costs for reloading a GL or RL by attaching an item are taken now from weapons.xml (still buggy, allows cheating) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-26 17:01:03 +00:00
lalien b46f47cb04 - bug fix: no explosion if the rocket launcher was reloaded manually (with attaching a rocket/grenade) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-24 12:07:39 +00:00
lalien e4d8bfa058 - bug fix: when merging an item to a stack of items all of them were converted to a new item 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-01-17 19:42:32 +00:00
Wanne 7a1987665d - bugfix: Ira invisible bug in rebel basement 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@652 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-12-31 12:06:35 +00:00
Wanne 10817d380e - updated most of the editor screens to the high resolution. Editor should now work with high resolution. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@600 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-10-12 10:26:25 +00:00
Wanne b3e4aa8305 - bugfix: CtH calculation (shows up nearly 0% next to an enemy), when mercs spots an enemy after climbing up/down a rooftop 
- bugfix: Added Pulmu's weight calculation fix

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@563 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-09-26 19:17:09 +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
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 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 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 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 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
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
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 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 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 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 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 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 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
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
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 3b38f5dac5 -removed some hard coded item indexes from ArmsDealerInvInit.cpp & items.cpp 
-fixed canteen merging w/ctrl+click


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@306 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-26 17:55:11 +00:00
MaddMugsy 367f70176d -fixed new ammo types not coming out of enemy guns properly 
-minor AI fixes
-reduced minimum default status for bonus depreciation from 100 to 85

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@251 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-17 18:42:57 +00:00
MaddMugsy 52052eb0ca -scaled down tunnel vision for AI to help out the snipers 
-removed limited vision from AI so they're not as easy to sneak up on

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@227 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-13 05:38:52 +00:00
MaddMugsy 7cf7d7db3c - In the vain hopes of finally killing that stupid "Battle Scope" bug, I have changed the inventory creation to do an extra check for attachment validity before creating the attachments w/out displaying any messages. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@205 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-08 22:25:54 +00:00
lalien ce1b1220b7 - new feature: manual reload 
- update readme


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@177 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-05 22:37:34 +00:00
MaddMugsy 07aee0e43f -added code for enemies to carry money items / wallets w/actual deposit-able cash 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@173 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-05 07:06:19 +00:00
lalien 7da7984951 - bug fix: Space selects next squad: next merc was not selected when in interrupt 
- changed scope ranges to be % of base visible range



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@170 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-05 01:03:17 +00:00