Commit Graph
794 Commits
Author SHA1 Message Date
Flugente f5f114e52e - if MERCS_CAN_DO_ADVANCED_REPAIRS is TRUE, mercs with the technician trait can raise an item's damage threshold(by merc05)
- Fix: blade weapons ignored their damage chance

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-10 16:07:08 +00:00
Flugente 94a55654d1 Fix: militia reinforcements tried to take equipemnt from the wrong sector
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5915 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-10 15:23:36 +00:00
Flugente 6c0d94dadd - DIRT_GLOBAL_MODIFIER is a global modifier to dirt generation
- second cleaning button in menu now orders entire team to clean their guns
- global overheating modifier now also multiplies attachment modifiers
- cleaning kits always use up 1% on use


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5913 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-10 01:15:19 +00:00
Flugente 16d0d1ea8a - Fix: crash when checking for muzzleflash
- Fix: under certain conditions, AI-selffeeding could lead to invalid inventory sizes
- information from prisoner interrogation is about new sectors
- no autoriot in a prison sector if militia is present


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5912 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-09 21:24:08 +00:00
Flugente 14113159bd Fix: NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT worked on all animations, which caused explosion victims to not update anims correctly. As a fix, we check for individual animations
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5908 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-08 20:09:36 +00:00
Flugente fe8d572068 Fix: ubGunAmmoItem was not set, which could lead to magazines disappearing during reloading
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5906 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-07 20:43:58 +00:00
Flugente 30a7e22a3d new key combinations:
- SHIFT + K: switch to and from riflesling
- SHIFT + K + ALT: switch to knife, or from knife to gun
- SHIFT + K + CTRL: switch to sidearm, or from sidearm to non-sidearm gun
the switches will search for a valid spot for the replaced hand items, thus a LAW won't go into a holster etc.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5900 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-06 00:36:57 +00:00
Flugente ce0a49e4b4 - added ini option to turn off eating sounds
- morale now influences surrender strength
- placing prisoners now accounts for missing xml values
- damaging a building with eplosives alters loyalty depending on attacker's team

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-05 21:26:58 +00:00
Flugente d5f47fb8a3 Fix: removed test hack
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5896 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-05 01:21:23 +00:00
Flugente 36f7399d3b - Prisoners of war are now spawned in prison sectors. They have fitting dialogue etc. Harming them slightly lowers global loyalty.
- Prisoner system: added ini options that allow display of surrender strength sum, and externalised surrender strength modifier
- Fix: wrong assignment string in strategic view

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-05 01:02:59 +00:00
Flugente 50c4982f91 - prisoners give information only on mobile patrols, not on city sectors
- if using militia equipment, items stolen by militia are dropped after combat if their class is distributed to militia by the player
- Fix: do not delete world items with invalid gridno
- Fix: militia drop gear on valid GridNo

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5892 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-03 23:26:03 +00:00
Flugente 48c66c8662 - added AP & BP cost setting for arming bombs/grenades in inventory
- Fix: blowing up grenades in inventory now correctly costs APs
- a message now shows how many prisoners were taken

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5891 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-03 16:24:34 +00:00
Flugente fc2e10314b - Fix: crash when trying to delete an item with invalid GridNo
- Fix: adjusted squadname when discovering NPCs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5890 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-03 08:57:26 +00:00
Flugente b41653aeea Fix: capturing soldiers who were members of reinforcement groups led to incorrect group size
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-03 00:15:08 +00:00
Flugente 72dbd9e33f - fixed an instance of wrong assignment strings
- prisoner decision messagebox now allows to select a specific prison
- Fix: under certain conditions, calling militia reinforcements with militia equipment selection could get sector items with invalid GridNo to become lost

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5888 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-02 19:14:46 +00:00
Flugente c3462f9163 code improvement: no need to evaluate guns in 1st loop, do total evaluation with ammo in 2nd loop
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5885 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-01 20:19:55 +00:00
Wanne a018e77323 - Bugfix: After starting a new game with high screen resolution (> 1024x768) and reaching the tactical screen the first time, the loadscreen image was still visible in the lower left part of the tactical interface panel
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5881 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-28 09:12:12 +00:00
Flugente 8e909f12fc improvement of militia equipment choosing:
- grenade launchers aren't overlooked anymore if sector sorting is bad
- ammo does not need to be converted to crates anymore
- less ammo deletion and recreation necessary
- added code documentation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5880 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-28 02:08:55 +00:00
Flugente b4f60527cd added squadnames to a few locations
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5879 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-27 23:13:27 +00:00
Flugente 34c87f0507 very minor code optimization
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5875 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-26 22:31:39 +00:00
Wanne 51bc188f0b git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5874 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2013-02-26 14:12:27 +00:00
Flugente 2cfe4bd7fc - externalised squad names
- moved Pockets.xml an PocketPopups.xml
- requires GameDir >= r1608

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-25 22:25:45 +00:00
Flugente ef5fa36536 Fix: decapitating/gutting/stripping/taking a corpse did not cost any APs
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-24 15:56:50 +00:00
Flugente 59b2549bd6 - new feature: we can now equip militia with gear from sectors, see http://www.bears-pit.com/board/ubbthreads.php/topics/315664.html#Post315664 for more information
- increased the object flag size to UINT64, this breaks savegame compatibility

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5869 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-23 18:32:55 +00:00
Flugente f6274eade2 Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-07 22:25:53 +00:00
Flugente e2c1a333fa Fix: regeneration drug effect ended prematurely
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5853 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-07 20:57:29 +00:00
Wanne 303fb661e5 - Fixed AP cursor calculation for melee weapons as no AP add costs incurred for changing targets (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5845 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-05 10:14:49 +00:00
Wanne 6e8136495a - Corrected majority of AP cursor calculation bugs for melee attacks involving stance & direction change (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5837 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-04 10:14:23 +00:00
Wanne 324fa4c5ec Fixed Melee/Blunt weapon AP used (by Buggler)
- Have always wondered, why do attacks with blunt weapons (baton, nightstick, etc) cost the same AP (16) as hand-to-hand attacks? Shouldn't they be using the AP cost like how blades do?


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5834 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-03 19:48:22 +00:00
Wanne 9bed6087b3 - Bugfix: Hopefully fixed problem with RPC/NPC speech in russian version (thx to Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5820 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-28 14:04:44 +00:00
Wanne 3c9b43ebef - Bugfix: WF and DG merc speech was not working
o The file "SoundProfiles.xml" was referenced in the wrong directory
- XML file reference cleanup and check
- Deleted unused files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5814 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-26 18:33:26 +00:00
Wanne 6c91b61e6f Skill Tooltip on Merc Portrait (by Buggler)
- Skills/Traits tooltip over merc portrait in Tactical & Strategic screen
- Fixed Traits tooltip on 'more' popup in personnel screen 
- Increased Energy Bar Color Contrast
- Swapped Mechanical & Explosive Skill in Tactical & Strategic screen to standardize across all screens including AIM, MERC & Personnel screen

Optional Skill Tooltip On Merc Portrait (by Buggler)
- Option to show skill/traits tooltip on merc portrait in AIM/MERC hire screen
- Enhanced merc inventory tooltip to show full BR info in AIM/MERC hire screen
- Fixed BR heavy weapon AP tooltip display bug
- Fixed MERC Exp Lv statistic color

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5802 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-22 13:21:01 +00:00
Flugente fb3d410dd9 - a few dialogue box button texts can now be easily changed
- Fix: improved bomb defusal

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5795 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-20 05:12:19 +00:00
Flugente 8c60796982 code improvement: added a much easier way to add items in cheat mode. 'ALT' + '.' allows the user to input the item number he wants and spawns the item on the selected merc. 'CTRL' + 'ALT' + '.' spawns the previously selected item. (by IoP)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5794 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-20 05:03:39 +00:00
Flugente d55a57007d When talking to an enemy, we can surrender to him if he hasn't asked us to before.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5793 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-19 20:22:51 +00:00
Wanne f8531461d3 Added ingame option to invert mouse wheel direction (by Iop)
o Howto get synaptic touchpad working with 1.13: http://www.bears-pit.com/board/ubbthreads.php/topics/314276/Synaptic_touchpad_with_JA2_v1_.html#Post314276

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5792 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-19 20:08:11 +00:00
Wanne 56e08dbeae Fixes (by Buggler)
- Fixed allow exception to Dr Q. skill trait code not fully functional
- Swapped Dr Q. skill trait xml order so that when exception disabled, he will still have his night ops minor skill due to code execution order
- Externalized allow_exception ID number for modding

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5791 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-15 20:04:41 +00:00
Wanne 29e432037b - Fixed Ambidextrous being discarded when affected merc has max allowed major traits + ambidextrous due to it being classified as 'TwoStagedTrait'/major trait (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5785 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-14 12:28:20 +00:00
Wanne a10e216c5f Fixes (by Buggler)
- fixed autoplace object getting lost from merc inventory to sector when another sector shown (CTRL+LMB) 
- fixed LBE autoplace from merc inventory
- fixed CTRL/CTRL+SHIFT behavior when autoplace from merc inv
** Autoplace objects to & from between merc inv & map sector should work proper now (even in another sector inventory)
- fixed missing balance & amount during money withdrawal in vanilla classic

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5781 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-13 17:48:12 +00:00
Wanne b08422ec1b BR Info Panel Enhancements (by Buggler)
- Added more info on BR right panel (Melee Weapons AP, Damage & Stun Damage, Protection & Camo etc.)
- Fixed BR Item Info Helptext: AP for Heavy, Binoculars & Melee weapons
- Fixed CTD on using LEFT/Right arrow hotkey when there's only 1 page in AIM Facial Index
- Fix for AIM starting gear kit hotkeys
- Add Heavy Weapon ReadyAP value in InterfaceItem

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5779 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-07 21:35:26 +00:00
Flugente ab2b52b5d8 Fix: forgot to continously check for items
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5778 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-06 04:04:35 +00:00
Flugente 9ea7ebf393 New Feature: Multi-turn actions allow mercs to perform actions intended on a specific gridno over multiple turns. Currently demonstrated on the adding/removing/filling of sandbags.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5777 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-06 03:51:09 +00:00
Wanne 0b9ff22642 - Deleted unused "SenderNameList.xml" references
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5769 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-05 16:37:13 +00:00
Wanne c04898d095 Interface Items & Sector Inv Readability Enhancement (by Buggler)
- Adjusted font colors in Sector Inventory & Interface Panel (increasing dull contrast colors that only shows when activated, highlights & high contrast colors that's always displayed are toned down)
- Changed 'Item Name' font in non-zoomed sector inventory
- Changed 'Ammo Count' font in item description box
- Increased 'Max Bullet' font size in zoomed sector Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5768 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-05 15:20:43 +00:00
Flugente cd35516037 added missing icon for alternate weapon holding (by Sandro)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5765 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-04 23:34:54 +00:00
Flugente 79d6bb46ed - external feeding checks for invalid gridno
- reordered xmls
- new feature: class specific gun and item choices allows finetuning of a soldier's equipment

WARNING! This exe needs GameDir revision >= 1584, as xmls have been reordered!
More info under http://www.bears-pit.com/board/ubbthreads.php/topics/313782/Re_New_feature_Class_specific_.html#Post313782

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5764 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-04 23:25:35 +00:00
Flugente 695a5013c0 if NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT is true, in turnbased combat, mercs do not automatically change animation from 'running' to 'standing' after arriving at target lcoation (same for walking etc.). This saves AP if we decide to immediately continue moving to another location.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5763 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-04 21:45:01 +00:00
Flugente 6239438702 - Fix: moving strategically and then cancelling that order no longer awards stat gains.
- Fix: On rare occasions, huge stat gains were possible when doing surgery after autoresolve.
- pepper spray does not work on soldiers wearing a gas mask

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5760 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-03 18:26:48 +00:00
Flugente 7990b2e09b The enemy now counts disguised spies as 'theirs' when offered surrender option.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5757 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-03 04:10:00 +00:00
Flugente 058ab3b967 - enemy assassin feature is 'off' per default, in order not to freak out unwary new players
- spies are uncovered near corpses only if their uniforms indicate they were allies of the observer
- added helpful comments, should anyone ever want to use pits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5756 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-03 01:33:29 +00:00