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
4,805 Commits 9 Branches 6 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MaddMugsy e98c1ce83c -Added check in CONSIDERED_NEUTRAL macro for SOLDIER_COVERT_CIV and SOLDIER_COVERT_SOLDIER flags. This should prevent enemies from targeting a disguised merc with sniper and spread fire. 
-Added screen messages when disguise changes to indicate civilian or soldier disguise
-Enabled mercs disguised as soldiers to carry >2 guns, if the additional guns are covert or hidden


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-09 08:10:23 +00:00
MaddMugsy 2c342000c4 1. Fixed victory music playing prematurely when zombies were present 
2. Zombies should now moan randomly (same as enemy taunts)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5337 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-06-08 20:14:43 +00:00
MaddMugsy e84edc47d1 1. Added zombie battle sounds 
2. Made creepy music play when zombies rise

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5335 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-06-08 19:56:14 +00:00
MaddMugsy abed2ed6c5 Bugfix (from Flugente): fixed an issue that could cause an overflow during a merc's training 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-06-07 18:18:59 +00:00
MaddMugsy 3651ef29e7 Guns attaching to tripwire feature has been moved from an xml-enabled feature to a hardcoded feature. This is because there are so many guns in the game (esp. in various mods) that the required xml changes are huge. Not to mention things like this -- http://i50.tinypic.com/zjxoat.jpg ATTACHING_DETONATOR skill check is used and the usual gun attachment sound is played instead of the detonator beep. 
Additionally, this resolves the issue with being able to attach lasers, etc to tripwire.  Instead, guns retain their attachments, as would be expected.

Transformations on attached guns have also been disabled.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5332 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-06-06 18:20:03 +00:00
MaddMugsy defef00330 Bugfix: P_Items were only allowed up to 10 in the ini file - now corrected to 20. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-06-01 17:47:51 +00:00
MaddMugsy 9f9e42a004 1. Feature - Spooky creature music now plays when zombies are present 
2. Bugfix - CheckForFullStruct in Soldier Control.cpp was referencing NUMBEROFTILES instead of new global variable


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-31 19:55:48 +00:00
MaddMugsy 49a590ed34 1. PItems are now variable, from 3-20 and can be set in JA2Options.ini via NUM_P_ITEMS 
2. USE_XML_TILESETS moved from JA2.ini to JA2Options.ini
3. New Feature - Ctrl+Click on an item with an item in hand to auto-attach/merge them.  Attach works with stacks.  Merge only works on single items, for now at least.
4. New Feature - To accompany Quiet Training, there are now Quiet Repairing and Quiet Doctoring options.
5. Bugfix - inseparable attachments of attachments were getting lost again when using ctrl+f/the map screen button to remove attachments
6. Bugfix - INT8 overflow error causing vehicle repair to actually lower its status
7. GasMask tag in items.xml can now be applied to helmets as well as face items.
8. Bugfix - AI code was referencing hard coded GASMASK item number instead of looking for the tag
9. Bugfix - "break;" was removed in Explosion Control.cpp, thereby causing mustard gas to deal out fire damage. (Not sure if this was deliberate?  But the new implementation differs from the JA2 standard, so it should be added to JA2Options.ini at least)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-30 10:19:53 +00:00
MaddMugsy 744ce2ee9c Bugfix - BR setting text in start up screen not showing up when compiled in VS2005 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5304 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-26 01:36:21 +00:00
MaddMugsy 21024ed557 Some minor features added: 
1. Ja2Options.ini option to override chance of items appearing in maps (MAP_ITEM_CHANCE_OVERRIDE).  Useful for debugging maps.  Not including this one in the ini file for everyone to mess with though.  Value range = 0-100%, where 0 (default) = use map settings.
2. AttachmentComboMerges is underused, so it's been extended to use up to 20 attachments to make it more useful.  Build your own guns, anyone?
3. New merge types:  Easy Explosive (existing one renamed to Hard), Easy Mechanical, Hard Mechanical.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5300 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-25 06:15:30 +00:00
MaddMugsy 00ac266521 Feature change - Bobby Ray Selection on New Game screen split into two items: Quality and Quantity. Selectors allow for full 1-10 range of quality (coolness) / quantity multipliers, instead of just 1,2,4,10. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-24 19:41:11 +00:00
MaddMugsy bd45bf26b2 1. Bugfix - ammo crates will no longer create boxes instead of mags 
2. Bugfix - ammo boxes of 100 rounds will now correctly generate C-Mags
3. Bugfix - reduced NAS looping while highlighting items in map screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-24 00:38:34 +00:00
MaddMugsy da2e6f10c1 1. Bugfix - one more pSoldier->bScopeMode != NULL check added 
2. Bugfix - removing attachments which created new slots and had attachments in those slots which were also able to go into existing slots in the base item was resulting in duplication of the base attachment and loss of the attached attachment.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-22 03:43:16 +00:00
MaddMugsy 1d714e117d New in-game option: Quiet Training -- when on, mercs will not say quotes while training 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5293 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-21 19:39:53 +00:00
MaddMugsy 3c494af736 1. Bugfix: Scope modes could cause crashes if the soldier's bScopeMode was no longer valid in the ObjList object. This happened mostly due to scopes being attached to other scopes. Now checks that the list item is not null, and defaults to iron sights if need be. 
2. ReInitMergedItem now returns a list of attachments that were unable to be reattached or dropped onto the ground (ie: non-default inseparable ones).  These were previously just being tossed into oblivion.  
3. Item transformations now try to attach any inseparable attachments that couldn't be attached to the first result to the other results.
4. Item merges will now try to attach any attachments on the second item in the merge to the first result.  This was already  happening for the first item in the merge.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5292 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-20 18:31:32 +00:00
MaddMugsy 2691c22397 "Side/Bot." text on BR misc filter button changed to "Grip/LAM". 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-18 22:31:32 +00:00
MaddMugsy 78ad9111e4 New Misc filter buttons for Bobby Rays, by attachmentClass: 
(attachment tag must also be 1)
BR_MISC_FILTER_OPTICS (AC_SCOPE | AC_SIGHT)
BR_MISC_FILTER_SIDE_BOTTOM (AC_LASER | AC_FOREGRIP | AC_BIPOD)
BR_MISC_FILTER_MUZZLE (AC_SUPPRESSOR | AC_EXTENDER)
BR_MISC_FILTER_STOCK AC_STOCK
BR_MISC_FILTER_INTERNAL (AC_MAGWELL | AC_INTERNAL | AC_EXTERNAL)
BR_MISC_FILTER_OTHER_ATTACHMENTS for all other attachment classes
BR_MISC_FILTER_NO_ATTACHMENTS for the original button; it no longer displays any attachments

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5285 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-18 04:36:52 +00:00
MaddMugsy f6ed981a21 Fix: Global attachment removal was separating attachments with their own inseparable attachments 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-18 04:31:49 +00:00
MaddMugsy 5930c90585 Fix - after merging or transforming an item, any attachments on the base item which themselves had default inseparable attachments, would see those attachments lost upon the result of the merge/transformation. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5283 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-05-17 17:14:21 +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
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
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
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 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 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
MaddMugsy 83c4ebc8c6 Fixed a bug in TeamTurns.cpp -- sometimes it would look for the LATEST_INTERRUPT_GUY, but he wouldn't actually exist and it would crash. 
New TripWire tags pascal cased in xml file (only).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5201 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-04-12 18:42:41 +00:00
MaddMugsy 0e64603c9a Fixed item_transformations.xml not loading in properly. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5194 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-04-11 22:51:23 +00:00
MaddMugsy b6b6e4e927 Fixed key input not always working on map screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5182 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-04-11 04:47:14 +00:00
MaddMugsy c845f9f117 HAM5.5b2 merged in! 
Notes:
-There may still be bugs!! (In fact, I almost guarantee it -- there's
-Ammo box code added to HR's crate code
-Splitting a crate/box also automatically refills half empty magazines
-new pathing arrows for map screen not included
-code for scouts to know where enemies are going doesn't appear to work... but i'm not sure it was completed.
-lots of gobledy gook (chinese?) comments turned back to english
-also added Bob's popups
-other languages besides english still need to have there language.cpp files updated with array changes
-AI enhancements by Warmsteel (reloading, suppression, roaming, avoiding gas, and other fixes)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5181 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-04-10 23:45:46 +00:00
MaddMugsy ab3412e5ed 1. Removed hardcoding of face items in the code for the face icons / graphics 
2. Fixed potential infinite loop bug if no ammo crate or box is present and (ctrl+)shift+a is pressed.
3. Changed Ctrl click on mapscreen from Delete to auto-place item in selected merc or vehicle inventory.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-04-10 20:41:04 +00:00
MaddMugsy 9786f78da4 Fixed a bug that was potentially introduced with the underbarrel weapons. Now checks for pSoldier != NULL when removing attachments, so Ctrl+Shift+F doesn't break. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5152 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-04-03 22:41:17 +00:00
MaddMugsy cb36b3db6d -updated game version 
-suppressed soldier action data messages in cheat mode
-enabled enemy / militia ammo choosing to be limited by coolness

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1853 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-02-26 02:37:23 +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
MaddMugsy a9059e3570 New build (728) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-02-22 22:38:14 +00:00
MaddMugsy ff2aa4f8e1 -increased inventory capacity for IMP items doled out in ImpItemChoices.xml 
-changed ammo given to IMPs so they have at least two clips for their main gun

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-02-17 06:13:52 +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
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 3b12d8241c -fixed typo in GameSettings.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-08-28 18:03:48 +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
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
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 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
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
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
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
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 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
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 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
MaddMugsy d18502accb -fixed mercs complaining about equipment when it's really good 
-fixed BR not getting new stock for items with indexes > 1000
-reduced re-ordering times for awesome BR's


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@357 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-20 03:36:19 +00:00
MaddMugsy 8c19632c28 -spreadsheet update 
-minor BR restock formula change (probably won't matter)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-19 16:39:36 +00:00
MaddMugsy c4c5ddeec1 -fixed BR's not restocking 
-fixed 90210 not working
-fixed 8 character IMP names not working

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-18 04:29:26 +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
MaddMugsy e1c79b21c3 -updated version number for new exe 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-15 00:48:34 +00:00
MaddMugsy 7731b74109 -added callahan's fix for HE ammo not exploding 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-10 02:51:15 +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