Commit Graph
1861 Commits
Author SHA1 Message Date
Sevenfm d02a4ddd7d Implemented some of the merc05's fixes (http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24256):
- fix for stopping snitches from preventing misbehavior
- fix for stopping snitches reports
- improved code for refused handcuffing
- fixed item bug with items dropping from backpack after using transformation in turnbased mode
- improved code for dart ammotype effect
- removed assert in AddCharacterToAnySquad to prevent crash when selecting merc in vehicle and plotting travel route
- added EXPLOSV_CREATUREGAS effect in UpdateAniTiles()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8720 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-12-22 06:22:23 +00:00
Sevenfm 3efe899526 HandleItemPointerClick(): use correct target level.
CalcPreRecoilOffset(), CalcRecoilOffset(): fix counterforce calculation for weapon resting feature.
SOLDIERTYPE::GetAPBonus(): use THROUGH_STRATEGIC_MOVE instead of soldier's facing direction to determine sector type.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-12-22 05:57:52 +00:00
Sevenfm 0e8c086a9a NCTH: improved laser bonus code.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8716 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-12-05 08:48:26 +00:00
Sevenfm b367fad899 Switch scope mode to default for suppressed soldier if he uses alt weapon holding.
Improved AI path tweaks.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8715 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-12-04 13:27:24 +00:00
Sevenfm 92b6f40a17 Improved AI path tweaks.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8714 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-12-04 12:05:11 +00:00
Sevenfm 219a1c76e2 Experimental path AI tweaks:
- avoid light at night
- avoid corpses
- avoid deep water
- avoid gas/fire

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8713 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-12-03 21:52:36 +00:00
Flugente c92290155f Character lines can be replaced before playing via HandleReplaceQuote(...) in Overhead.lua.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8712 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-12-02 22:02:04 +00:00
Flugente 8ace6a2954 Added dialogue events for using a lockbomb (ADE_LOCKBOMB) and sniper warning (ADE_SNIPERWARNING)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-12-01 20:34:46 +00:00
Flugente 61c6972efa Complaints about sexual harassment now use separate voice lines
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8710 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-11-28 22:24:49 +00:00
Flugente c9025796aa improved comments
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-11-27 23:31:16 +00:00
Flugente c8207018e3 Added Battlesounds for melee attacks.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=358569&#msg_358569

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8708 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-11-27 21:46:49 +00:00
Flugente 32cdfc18cd Change: Backpacks no longer automatically break civilian disguise.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=358568&#msg_358568

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8707 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-11-27 21:33:55 +00:00
Flugente 8b698f0633 Fix: inventory button to change firemodes was greyed out for guns with one base fire mode, even if it had several barrel configurations
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-10-23 22:07:58 +00:00
Flugente cd87c4f9cc Fix: inventory button to change firemodes was greyed out for guns with one base fire mode, even if a bayonet granted them a second fire mode
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8700 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-10-23 21:28:05 +00:00
Flugente 14619a22cc Revamped <scrounging>-tag of Backgrounds.xml: instead of hoarding items, mercs steal small amounts of money from the locals, which can lower loyalty.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=21308&goto=358321&#msg_358321

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-10-22 21:46:53 +00:00
Sevenfm e1657cefb7 Improved movement noise calculation.
Fixed max array size bugs.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8698 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-10-22 20:45:43 +00:00
Sevenfm ef46feb9b1 Fixed bug introduced in r8695.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8696 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-10-06 18:44:19 +00:00
Sevenfm 30df6c350a CalcTargetMovementOffset: better integer calculation for max tiles penalty.
SOLDIERTYPE::initialize: initialize additional data.
EVENT_FireSoldierWeapon: if shooting soldier is invisible, locate screen to target spot.
CancelAIAction: reset next AI action.
FindBestPath: improved gas avoiding code.
InGas: improved code, also check the spot itself.
LegalNPCDestination: disabled additional checks to prevent AI deadlock.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8695 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-10-03 16:49:04 +00:00
Sevenfm 54e7c1e24d DrawCTHIndicator: bAimTime -> bShownAimTime fix.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8694 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-09-25 18:40:51 +00:00
silversurfer a181d7c061 Fix: RaiseZombies function ignored sector levels and modified wrong sector info counters
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8692 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-08-24 19:11:26 +00:00
Sevenfm 7342e39858 Fixed incorrect attacker's extra strength calculation in CalcChanceHTH()
Fix: don't allow opening inventory panel if soldier is not available during interrupt.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8691 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-08-23 20:23:44 +00:00
silversurfer 6a1fd17026 Fix: Items that were placed by function AutoPlaceObjectToWorld() had incorrect sGridNo so they could end up in inaccessible places.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8690 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-08-20 17:41:56 +00:00
silversurfer 837709a448 Fix: Mercs that entered a vehicle on the strategic map while standing on a roof would appear at roof level after arriving in another sector and exiting the vehicle in strategic after loading the map. Now all mercs entering vehicles are reset to ground level.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8689 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-08-14 15:20:10 +00:00
Sevenfm afb0c368b9 Disabled auto fast forwarding for talking faces.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8688 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-08-13 22:00:49 +00:00
silversurfer 037e877013 Fix (by Asdow): Enemy cover display performance improved.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8685 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-08-11 07:49:47 +00:00
silversurfer 01b540184d Fix (by Asdow): several animation scripts had incorrect values for action (mercs got up after cowering while prone, problems with first aid and bayonet stab)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-07-28 13:08:14 +00:00
silversurfer 548d85319e Fix: Civ Group popups in map editor weren't working correctly and debugger showed incorrect data for popups
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8683 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-07-27 12:38:39 +00:00
silversurfer 706c6378c2 Fix: Shift + R didn't work anymore to reload the weapons of all mercs
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8681 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-06-29 16:35:28 +00:00
silversurfer e650ea8733 Fix: mercs with average refinement and extreme care level would dislike even other average mercs
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-06-27 18:04:58 +00:00
silversurfer e39652f6e2 Feature enhancement: Drop All now allows to use the following settings:
0 = Drop All is off and drop chances are used
1 = Drop All is on and everything is dropped
2 = Mild Drop All which means that everything is dropped (like 1) but items that are usually not dropped (like 0) are severely damaged.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8675 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-04-22 11:12:13 +00:00
Flugente dfc69812b4 Updated quote descriptions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8674 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-04-08 22:30:24 +00:00
Flugente 4c0b3264c8 Fix: bombs cannot be planted diagonally
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8670 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-02-22 21:10:34 +00:00
Flugente a87707b36b If LOWER_VISION_WHILE_RUNNING in JA2_Options.ini is set to 1 (default 0), vision range is lowered by 25% while running (2: only for player team)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-02-17 19:46:53 +00:00
Flugente 47a89e3725 New feature: mercs on administration assignment boost the effectivity of other mercs
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=356696&#msg_356696

Requires GameDir >= r2472

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8665 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-02-14 20:48:07 +00:00
Flugente de8bf8a7d6 Armour and its attachements can now alter the fire damage received by setting a value in the <sFireResistance>-tag. This is affected by item status.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8664 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-02-10 20:42:39 +00:00
Flugente 0f558da7e4 Fix: wrong case marker
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-02-10 16:27:14 +00:00
Flugente 84d08a8821 A paramedic can use empty bloodbags (<emptybloodbag>-tag, item #1756) to create blood bags (<bloodbag>-tag, item #1757) from other mercs. These can then boost the health returned by surgery by ONTOP_PERCENT_SURGERY_HEAL_BLOODBAG percent.
Requires GameDir >= r2467.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8662 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-02-10 16:26:48 +00:00
Flugente be7005c3f8 - Fix: messagebox flagmask is UINT32, not UINT16 or UINT8
- added flag to display messagebox buttons horizontally instead of vertically

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8661 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-02-10 14:03:28 +00:00
Flugente a97425a321 Additional dialogue event ADE_ZOMBIESRISE is called when new zombies are created from corpses
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8660 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-02-04 20:06:12 +00:00
Flugente 72c9e94cc2 Skinning a bloodcat yields a bloodcat pelt
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8659 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-02-04 20:05:12 +00:00
Flugente e7e268d957 If a gun has a magazine size < 5, the 'out of ammo' soundfile is only displayed with a chance of CHANCE_SAY_ANNOYING_PHRASE (JA2_Options.ini). This should make using guns with tiny magazine sizes less annoying.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8658 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-02-03 14:11:56 +00:00
Flugente f4800dbacc Show scope mode on launchers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8656 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-01-28 22:32:25 +00:00
Flugente e7f098c2f2 If DELAYED_GRENADE_EXPLOSION = TRUE in JA2_Options.ini, toggling fire modes on a grenade launcher toggles whether the grenades explode on impact or with a 1-turn delay.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8653 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-01-27 23:53:11 +00:00
Flugente a5e5ff6bd8 The new <BarrelConfiguration>-tag specifies how many bullets a gun shoots at once. Several values can be used. If no value is set, 1 will be used.
Toggling fire modes cycles between barrel configurations if several have been set.

Requires GameDir >= r2461

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8652 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-01-27 19:48:18 +00:00
Flugente 61553feb57 If CAN_FAN_THE_HAMMER is set for Gunslingers in Skills_Settings.ini, they can use burst fire if using revolvers with fBurstOnlyByFanTheHammer set to 1 and burst data set in Weapons.xml if they are in hipfire mode.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8651 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-01-24 21:48:44 +00:00
Flugente 08ed5cf378 - New mergetype 15: works like mergetype 6 but lowers status of firstItemIndex by 10%
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8650 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-01-24 21:38:42 +00:00
Flugente 253db89460 - Drug effects on first aid kits can be applied during bandaging
- Drug consumption opinion event, Larry personality change and increase of 'drugs taken' counter only occur if a drug if genuine drug effects were applied. As a result purely disease-causing items no longer cause these events.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8649 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-01-24 21:38:08 +00:00
Flugente 0ab562c29e - Added new additional dialogue events for commenting upon other merc's skill/kills, comment during bandaging
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23604&goto=356522&#msg_356522
- renamed dialogue enum for clarity

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-01-21 19:39:07 +00:00
silversurfer 98cab67624 Fix: Errors in UB code
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-01-02 13:22:24 +00:00
Sevenfm 9aa6618910 InitSoldierStruct: initialize additional data used to display suppression effects
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8644 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-12-09 03:56:57 +00:00