Commit Graph
870 Commits
Author SHA1 Message Date
Flugente 64e4677ba7 SHOW_HEALTHBARSOVERHEAD allows hiding the health and fatigue bars over your selected mercs
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6098 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-24 16:57:52 +00:00
Flugente 10a0c07822 Fix: scope modes take Aimlevel modifiers on scopes/sights into account
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6095 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-24 15:52:05 +00:00
Flugente 45659c18a3 made sure that faulty xmls don't lead to three major traits
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-24 15:10:27 +00:00
Flugente 2bf92c7301 Vehicle data is no longer saved and loaded into savegames, as it was externalised to xml a long time ago
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6093 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-24 14:25:47 +00:00
Wanne befe76b049 - Fixed 'Unsettled bills' for MercID > 170 on game restart (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-19 10:31:34 +00:00
Flugente 27f18605d9 sope modes no longer uses fixed magnifications, and no longer differs per team
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6084 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-17 20:14:02 +00:00
Flugente 22bd1956f1 Fix: status bar of attached grenades was shown incorrectly
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6083 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-17 18:05:18 +00:00
Flugente 1b00117b7e when using alternate weapon holding under NCTH, still apply projection factor from non-scope/sight attachments
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6079 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-15 23:04:09 +00:00
Flugente cefa9cfcc1 Fix: when using scope modes with NCTH, non-internal projection factor from lasers was ignored.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6078 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-14 21:11:24 +00:00
Flugente 44d9b88042 once again, forgot to add a file...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6072 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-11 13:22:18 +00:00
Flugente ee416f72bc new feature: soldier profiles allows defining individual names/bodytypes/hair/skin/traits of soldiers and militia. The game will choose randomly from this pool.
WARNING: GameDir revision >= 1672 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6071 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-10 23:30:42 +00:00
Wanne 576866b63e Improved Random Stats Feature (by Buggler)
- Added random starting salaries in Ja2_options.ini
- Added more options for random stats & tweaked existing formula


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6070 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-10 20:36:15 +00:00
Flugente c0372cccd1 speed up handling of personal light
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6068 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-07 00:05:24 +00:00
Flugente 59646b9dcd - Fix: crash when switching to bayonet while aimed
- Fix: batteries were drained for inactive flashlights

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6067 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-06 23:35:17 +00:00
Flugente 1c74ca4bf1 new feature: fixed bayonets (still in need of animation)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-05 20:56:00 +00:00
Flugente 9d2da7e440 Fix: VS2008 & VS2005 compatibility
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-05 14:16:36 +00:00
Flugente fadd849359 new feature: dynamic flashlights allows usable flashlights
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6061 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-03 23:31:28 +00:00
Flugente 3bc5ff75cc significantly cleaned up includes (by IoP)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-02 22:42:08 +00:00
Wanne e8f8e8ae5b - Added slower <bEvolution> rates, growth slowdown will be more pronounced on higher stat values. (3 - 0.75x; 4 - 0.5x; 5 - 0.25x) (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6051 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-02 17:12:43 +00:00
Flugente 8fb494ff53 new disabilities:
- 'deaf' reduces hearing ability
- 'shortsighted' reduces sight range

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6049 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-02 00:15:51 +00:00
Flugente 265fd3bc61 Fix: EPC inventory cannot be accessed, and Nails does not allow to take his vest
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6048 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-01 21:23:55 +00:00
Flugente 6cbcc995de replaced a few hardcoded numbers with enums/ini setting
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-01 17:03:31 +00:00
Flugente e508e91cff Fix: when accessing a teammember's inventory, circumstances could cause teammembers to attack the merc accessing
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6046 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-05-01 14:58:51 +00:00
Flugente 2455c2c467 changed hardcoded numbers to enums in preparation for total merc number increase
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-30 21:31:04 +00:00
Wanne 82dec9404c - MP: Moved the FOV (friendly players share same field of view) to a define ENABLE_MP_FRIENDLY_PLAYERS_SHARE_SAME_FOV (currently disabled)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-30 16:26:49 +00:00
Wanne 22a18ec262 - MP: Disabled the Enemy numbers count in the turnbar (because it shows different numbers on the clients)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6040 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-30 16:14:27 +00:00
Flugente c29d55a1f3 Fix: no stealing on oneself
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6038 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-29 22:46:15 +00:00
Wanne 4456539663 - MP: Put the interrupt fix code in a define "INTERRUPT_MP_DEADLOCK_FIX
o It seems the fix does not work 100% and if the fix code is enabled the ALT + E feature does not work correctly (for now, disabled the fix)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-29 19:45:32 +00:00
Wanne cdc3abc694 - Fixed error in project files when trying to open solution (VS 2005 and VS 2008)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6034 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-29 18:41:11 +00:00
Flugente 3b0d8613af Feature improvement: allow accessing other merc inventories when ACCESS_OTHER_MERC_INVENTORIES is TRUE. Even works with dying mercs.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6033 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-28 22:59:09 +00:00
Flugente 7f467f4f80 Fix: militia equipment item fitness function still considered ammo even if MILITIA_USE_SECTOR_EQUIPMENT_AMMO was false, thus possibly ignored guns that had no ammo loaded
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6030 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-28 15:58:58 +00:00
Flugente 54ffaa2624 changed a few hardcoded numbers to enums (better, but still ugly)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-27 22:23:04 +00:00
Flugente 130acec2e8 captured prisoners can now be bandaged even if life >= OKLIFE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6028 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-27 15:57:11 +00:00
Flugente c4aa1da949 Fix: non-green-militia-tabooed objects did not retain their taboo value after inspection
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6027 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-27 02:09:24 +00:00
Flugente bcbe006a4a feature improvement: if MILITIA_USE_SECTOR_EQUIPMENT_CLASS_SPECIFIC_TABOOS is TRUE, one can taboo equipment for specific militia classes
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6026 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-27 00:59:38 +00:00
Flugente 40979fce1c code changes:
- the amount of food points one gets for eating now depends on the current food situation
- food/drink percentage now goes from 0 to 200%, with 100% being the optimal value

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6024 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-26 00:54:22 +00:00
Flugente 3a133955ad added missing parser file
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6023 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-25 20:42:46 +00:00
Flugente 1e69c3a964 - new feature: load screen hints can now be defined in TableData/LoadScreenHints.xml. This feature requires GameDir revision >= 1655
- added safety checks for automatic feeding of POWs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6022 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-24 21:10:36 +00:00
Flugente 79874daf97 - Fix: compilation
- Fix: zombie name generation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6021 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-19 21:20:53 +00:00
Flugente 9cd897cf3c - Fix: picking up corpses restored their head
- Fix: zombies from picked up corpses had gibberish names

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-18 21:32:11 +00:00
feynman 26383d83a8 Further refinement of new ModularizedTacticalAI architecture; added plans for Crows
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6017 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-18 20:02:54 +00:00
Flugente 603a36826f increased number of merc opinions to 255
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6012 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-16 22:34:49 +00:00
Wanne 4f60d29cbf - Minor fix for mouse locking feature in tactical screen (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6011 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-16 22:12:36 +00:00
Flugente 329b1cd878 Fix: savegame compatibility
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6004 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-14 22:09:27 +00:00
feynman 8f3bff764b Forgot to commit the source changes in the last commit. Sorry. So, here they are.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5999 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-14 15:54:56 +00:00
Flugente 25de719d79 Fix: under certain circumstances, militia gear was not dropped correctly (a result of fixing the 'drop gear twice' bug)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5997 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-14 13:32:10 +00:00
Flugente e8d9acba8c - added team-specific modifiers for AI suppression
- Fix: incorrect platoon spawning wehn initializing Cambria counter attack

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-11 21:33:28 +00:00
Flugente 6058a3d3d8 - Fix: calculation of squadleader suppression boni was wrong
- Fix: possible underflow averted

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5993 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-10 23:42:26 +00:00
Flugente 5e5103635a Fix: no bullet when not targetting a soldier
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5992 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-10 22:52:35 +00:00
Flugente 3d0be8101c - new drug: etorphine (DRUG_TYPE_STUNANDKILL) stuns the user for its duration. Warning: Lethal if overdosed (lethal dose depends on boytype)
- show 'drugged' symbol for every drug (apart from alcohol)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5991 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-04-09 21:03:42 +00:00