Commit Graph
3086 Commits
Author SHA1 Message Date
Flugente 51c21c625a Fix: release exes could crash when hovering in the save screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8586 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-07-24 20:45:46 +00:00
Flugente cd5441d875 Added additional dialogue call for death of a character (ADE_NPC_DEATH = 16)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8585 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-07-22 19:06:48 +00:00
Flugente a59d799e03 Change: Suppression now works in realtime outside of combat
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8584 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-07-22 15:40:35 +00:00
Flugente 9f940cd5a5 - Fix: when Larry changes profiles, several stats are not properly copied
- Fix: when Larry changes profiles, Goodguy is always copied over

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8583 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-07-22 15:35:14 +00:00
Flugente 29772b45de - Fix: face gear was not shown for non-IMP mercs if their face index wasn't their profile number
- Fix: missing credits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8582 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-07-22 15:23:45 +00:00
Flugente a1763f9169 Fix: deleting a face with invalid pointer leads to first mercs having Skyrider's face
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8581 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-07-21 21:49:22 +00:00
Flugente d66bdad9e3 - Added a wrapper that takes care of determining the file type of audio files.
- Fix: 'hit' sounds of non-profile NPCs were not played correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8580 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-07-21 15:02:44 +00:00
Flugente 69aeea0679 New Feature: mp3 audio format is now supported in addition to .wav and .ogg
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8579 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-07-19 21:42:07 +00:00
Flugente c96bed1110 Changed version number display (so that we don't have to alter 8 lines to change the revision number)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8578 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-07-14 22:03:43 +00:00
Flugente b6d6e4f627 Fix: using a riot shield in a box fight disqualifies the boxer.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8577 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-07-14 20:05:51 +00:00
Flugente 0762a04501 When setting up autobandage, use first aid kits before using medkits.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8576 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-07-14 19:41:51 +00:00
Flugente 8a82dae027 Minor code simplification
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8575 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-06-20 20:08:42 +00:00
Flugente 8469d4398a Fix: IMP creation with HP < OKLIFE possible
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8574 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-06-19 18:04:37 +00:00
Flugente a3caed7178 Fix: As redisguise happens instantly and not timed as advertised, COVERT_STRIPIFUNCOVERED is now set to TRUE until further notice, the ini value is ignored.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8573 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-06-13 18:14:25 +00:00
Flugente 374d6aa3fc Fix: it was possible to set a merc on an intel assignment even though condition should have forbidden it
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8572 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-06-13 18:10:00 +00:00
Flugente ef2fb4dda6 Change: only deactivate facial animations if all 4 offsets are 0
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-06-11 18:16:13 +00:00
Flugente e7de185669 In order to prevent conflicts, Facts set by stock NPC conversations are now noted in the facts-enum
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8570 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-06-09 19:13:33 +00:00
Flugente 0f31a8616a Fix: face sti files were not found for profiles >= 100 using ubFaceIndex < 100
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8569 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-06-05 20:56:08 +00:00
Flugente 9161863f6a If FOOD_EATING_SOUNDS is FALSE, don't play the 'cool' sounds when applying items to soldiers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8568 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-06-04 19:11:49 +00:00
Flugente 87bd1118d0 Fix: NPCs with profile > 170 have missing approach values, making it imposssible to fulfil opinion checks
Fore more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=353657&#msg_353657

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-06-02 01:23:59 +00:00
Flugente 2d31145d06 Manuel's .npc script uses flag 430, so take note of that.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-06-02 01:00:26 +00:00
Flugente 492790cbf0 Fix: lua function CheckMiscFlags1 checks the wrong flags
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-06-02 00:56:15 +00:00
Flugente f945d164af Fix: Make sure MILITIA_VOLUNTEER_POOL_MULTIPLIER_FARM is not applied to farms inside towns
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8563 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-05-16 21:54:16 +00:00
Flugente 52b7de54e1 If a gun's currently used ammotype has <numberOfBullets> > 1, display the gun damage in EDB in 'bullet damage X bullets fired' format, taking <multipleBulletDamageMultiplier> / <multipleBulletDamageDivisor> into account.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=353533&#msg_353533

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8562 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-05-16 21:15:37 +00:00
Flugente e15a61a5cc Fix: in OCTH, damage modifiers for guns are only displayed correctly if the gun fits into a small pocket
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8561 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-05-15 23:19:23 +00:00
Flugente 100eea196b New feature: quest & intel map overlay
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23742&goto=353499&#msg_353499

Requires GameDir >= r2424

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8560 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-05-14 21:26:37 +00:00
Flugente 70ad3387a8 - Fix: creature attack variables are not always cleaned up properly
- Fix: game remains in pause state after using cheat to avoid creature attack in strategic

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8559 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-05-14 19:08:17 +00:00
Flugente 9e71b31a30 - Fix: missing individual profiles for militia arriving in currently loaded sector
- reduce number of warnings if no individual militia profiles are found

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8558 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-04-19 19:23:08 +00:00
Flugente 150b05e0b5 Fix: sound for drinking water played twice
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8557 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-04-18 23:12:33 +00:00
Flugente d6d283ca00 Fix: fixed raid attack times
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8555 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-04-15 17:56:33 +00:00
Flugente 80674249cc New feature: bloodcat/zombie/bandit raids on player-controlled sectors
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23711&goto=353154&#msg_353154

Requires GameDir >= r2420

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8554 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-04-15 14:42:01 +00:00
Flugente 1ea69989ed Fix: bad radar/overhead map colours for creature team.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22776&goto=353150&#msg_353150

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8553 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-04-15 13:35:06 +00:00
Flugente f8e1fd1e74 Fix: zombies do not move due to low morale
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8552 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-04-14 18:34:49 +00:00
Flugente 140e377d1e Fix: interrogation intel gains are wrong
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8551 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-04-09 19:21:06 +00:00
Flugente 65c99e02a3 Fix: healing update relied on first merc
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8550 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-04-03 19:40:22 +00:00
Flugente 64a971edec If MILITIA_STRATEGIC_COMMAND_REQUIRES_MERC is FALSE, militia can be controlled everywhere even without staffing a HQ
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8548 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-14 20:20:13 +00:00
Flugente 56f9864441 - Fix: wrong print format in militia battlereports
- Added flag for militia desertion

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-14 19:46:43 +00:00
Flugente 524fc502f8 Fix: clean up email functions (WIP)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-12 22:57:13 +00:00
Flugente c8a01e613f Fix: if militia groups arrive in combat alongside the player, it is possible they are interpreted as being already present, thus spawning in the sector instead of at the edges.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8545 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-11 12:50:04 +00:00
Flugente b20c9a9de9 Fix: If 'forced turn mode' is active, sometimes enemy groups already present in an enemy-occupied sector are interpreted as pending reinforcements, causing them to spawn at the sector edges instead of inside the sector.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8544 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-11 12:36:27 +00:00
Flugente 6b040c0eba Fix: deleted outdated setting
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-10 17:59:52 +00:00
Flugente c0d77f79c7 Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23649&goto=352592&#msg_352592

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-10 15:31:11 +00:00
Flugente d6db35f000 - Fix: possible crash if enemy forces arrive via non-group (enemy heli)
- Fix: possible crash when ordering militia to move if previous path was not properly cleared

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-08 21:49:26 +00:00
Flugente 1e38e07ad9 Fix: if a militia group in movement is attacked and flees from autoresolve, they remain in the sector
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8540 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-07 21:09:27 +00:00
Flugente 88f6f8cc06 Make a note in a militia's history if they were promoted due to drill
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8539 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-06 22:38:27 +00:00
Flugente 2080e787dd - added translations
- militia menu is always present so that the player has an easier time figuring out why he cannot do something

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8538 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-05 18:23:24 +00:00
Flugente 82a2b6c2db Added new assignments for training existing militia and doctoring them.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23044&goto=352617&#msg_352617

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8537 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-04 21:20:38 +00:00
Flugente a95c4fd614 Fix: UB compilation
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-04 17:11:56 +00:00
Flugente f45c0a3544 Fix: UB compilation
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-04 17:08:00 +00:00
Flugente 62f8b7d3e8 Cleaned up assignment menu code (WIP)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8534 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-03-03 16:04:47 +00:00