Commit Graph
7616 Commits
Author SHA1 Message Date
Flugente 17fba036b0 Fix: enemy artillery shells are wrongly attributed to have been fired from Merc 0
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7818 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-19 09:21:33 +00:00
Flugente fa0236d45b Fix: attempting to leave a sector in tactical via vehicle leads crashes the game
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7817 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-19 09:19:47 +00:00
silversurfer 8ca4f49d61 Fix: OBJECT_KNOWN_TO_BE_TRAPPED was never set on player owned bombs so even the person who armed the bomb didn't know what he did. From now on every trap that we create gets this flag set.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7811 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-11 15:49:11 +00:00
silversurfer 46a485b739 Fix (by Sevenfm): Opponent's action points had too much weight when calculating threat.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7810 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-07 15:56:10 +00:00
Flugente 723cb0e2fe Fix: crash when cancelling a group's path
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7809 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-04 20:39:53 +00:00
Flugente 591682d493 Minor change: when aiming a weapon in prone stance, this also counts as 'mounting' the weapon. This allows redefining 'mounting' as 'weapon is readied an leaning on a physical object, which can be a structure, person or floor'
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7808 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-03 20:14:30 +00:00
Flugente 98ff352eb0 - added new dynamic opinion events, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=21961&goto=333259&#msg_333259
- Fix: dynamic opinion events on finishing battle did not occur due to faulty sector coordinates
- Fix: dynamic dialogue boxes were displayed with bad screen coordinates
- Change: dynamic dialogue is also written into tactical log
- Change: in events that require a leader, any merc can be considered leader, not just IMPs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7807 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-03 15:35:52 +00:00
Flugente 4ec2e2b75b added new dynamic opinion events, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=21961&goto=333259&#msg_333259
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2233 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-04-03 15:08:24 +00:00
Flugente afd192cde2 Fix: crash during group movement as GROUP pointer was corrupted
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7805 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-01 19:03:32 +00:00
Flugente 825e240661 Fix: wrong item picture
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2232 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-04-01 16:38:45 +00:00
silversurfer 4ef5b58107 Enhancement for scope mode fix in r7792: It is now allowed to use any scope mode except scopes while dual wielding guns.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7804 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-04-01 09:56:47 +00:00
Flugente 936aaab42d Added 12 gauge rubber slugs to demonstrate the use of <dDamageModifierLife> and <dDamageModifierBreath>
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2231 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-31 20:45:14 +00:00
Flugente e90966eab8 New ammo properties:
- <dDamageModifierLife> alters the life damage a bullet deals. Default 1.0, valied values from 0.0 to 100.0
- <dDamageModifierBreath> alters the breath damage a bullet deals. Default 1.0, valied values from 0.0 to 100.0

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2230 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-31 19:17:31 +00:00
Flugente a572703bf9 New ammo properties:
- <dDamageModifierLife> alters the life damage a bullet deals. Default 1.0, valied values from 0.0 to 100.0
- <dDamageModifierBreath> alters the breath damage a bullet deals. Default 1.0, valied values from 0.0 to 100.0

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7803 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-31 19:16:54 +00:00
Flugente c241c0ea7b Fix: if a map was saved before entry points had been defined, it could not be loaded again.
This has been fixed, and we also print out a warning to that a mapper can fix the map.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7802 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-31 18:36:19 +00:00
Flugente 01bdeb2c7f Merged revision(s) 7798 from branches/ja2_source_official_2014:
Fix: Due to unknown circumstances, a GROUP's waypoints can be corrupted. This will cause incorrect movement and can crash the game. As we have no way of knowing where the group was supposed to move, we instead delete the waypoints and stop moving.

This does NOT fix the initial corruption of waypoints. That is a very troubling error that should be fixed ASAP!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7800 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-29 15:44:26 +00:00
Flugente 6891d102c3 Fix: if a spy is closer to an enemy than COVERT_CLOSE_DETECTION_RANGE tiles, he won't examined as thorough
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7799 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-29 15:40:01 +00:00
silversurfer 37f1ac452a Fix: Any tile that once had a player mine on it forever kept that flag. The map temp file will now be updated with a remove flag tag so that when a map is loaded the player mine flag will be removed.
If your savegame is already bugged you will need to step on each tile that had a mine to remove the player mine flag once.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7796 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-22 13:27:44 +00:00
silversurfer 8ef0c1e353 Fix: It's not allowed to use scope modes other than iron sight and alternative weapon holding anymore when dual wielding guns.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7792 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-20 21:26:28 +00:00
silversurfer a1f1b83952 Enhancement: It is now possible to view detailed camo information on the map screen (mouse-over popup at the camo value).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7791 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-19 13:09:49 +00:00
silversurfer 6e55c159de Changed camo display - now only the highest value is displayed in the camo box instead of a sum of all different types of camo. This also fixes the problem that a laser could drown our camo value because of different types of penalties.
Also camo can no longer take a negative value.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7789 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-18 16:29:57 +00:00
silversurfer d2c3e5a0ed Updated laser camo/stealth penalties for all lasers and built-in lasers
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2229 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-18 16:26:20 +00:00
silversurfer 4b5fc5bc3c Fix:
- large MOLLE pockets didn't display their volume in EDB
- attaching a filled MOLLE pocket didn't show its contents. Now the contents will be removed and put in the soldiers inventory or on the ground if there is no space.

Enhancement:
Detaching filled MOLLE pockets is possible again. The contents will be moved to soldier inventory (if pocket was on the soldier before) or to the ground (in case of sector inventory manipulation).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7788 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-17 18:15:58 +00:00
Flugente a5964191e5 Fix: S.T.R.I.K.E. Vest has AP bonus
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2228 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-16 20:47:13 +00:00
Flugente 38a931ed7a When using a german exe, cheats are no longer activated by 'Alt' + 'IGUANA' but 'Alt' + 'GABBI' instead, like in all other languages.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7786 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-16 20:33:33 +00:00
Flugente f421eb4529 Fix: If the Hicks spot a spy at night, they don't enter combat as often.
The Hicks will still enter combat, as this is hardcoded - the fix merely causes them to do this only once instead of every turn.. Their behaviour of becoming hostile at night is hardcoded, inconsistent with other code behaviour, but should stay in. This poses no threat to a properly disguised spy and is merely a small annoyance.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7785 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-16 20:29:27 +00:00
silversurfer 2afa02c913 Requires GameDir >= 2227 because of new icons!
EDB now displays available volume and pocket volume for MOLLE items.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7784 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-16 09:56:29 +00:00
silversurfer 76689ab99d Enhancement: It is now possible to display attachments and contents of LBE at the same time when game option "Show LBE Content" is active.
http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=340063&#msg_340063

Fixes for MOLLE display and handling:
- MOLLE didn't display attached pockets and their contents when the item was in sector inventory
- MOLLE pockets could be detached although there were still items inside the pocket. This led to items in invalid pockets (MOLLE on soldier) or items vanishing completely (MOLLE in sector inventory). Now it is not possible anymore to detach filled MOLLE pockets. You will have to empty them first.
- MOLLE in a stack displayed the wrong contents as long as their index was not 0.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-15 12:50:30 +00:00
silversurfer db1169ca8d changed MOLLE attachment slot layout to match ingame display of pockets and contents
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2226 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-15 12:46:02 +00:00
Flugente 877f205b92 Fix: When defusing a gun trap, the attached gun vanished
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7782 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-13 22:55:19 +00:00
Flugente b92524da77 Deleted unused code
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7781 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-13 18:31:13 +00:00
Flugente 2a81af05ed - As the sole purpose of the flash suppressor, hiding muzzle flashes, is not affected by status, it's status is irrelevant, making repairs useless. It is thus no longer repairable.
- LBE gear status is useless. It is thus no longer repairable. This is not true for the radio set and the diving bottle, which are LBE but have other purpsoes as well.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2225 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-12 21:40:20 +00:00
Flugente 9df6f67664 added missing xml entries
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2224 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-12 21:19:17 +00:00
Flugente a3b8e7e728 added missing xml entries
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2223 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-12 21:04:13 +00:00
Flugente 0a3c726240 added missing xml entries
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2222 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-12 20:44:31 +00:00
silversurfer 181f6eba63 Fix (by Sevenfm):
- calculation error in sight adjustment for stealth at light level
- calculation error in sight adjustment for movement at light level

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7780 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-11 19:38:47 +00:00
Flugente b3a362978c Fix: On some maps, fragments from explosives travel at the wrong height, thus dealing no damage.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7778 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-10 22:14:28 +00:00
Flugente 8751402f5c Fix: militia cannot be ordered to move in strategic
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7777 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-10 20:13:59 +00:00
Flugente e0d15266ea Fix: mercs on repair assignment continued repairing after running out of repair points, causing extra repairs on items with repair ease > 0
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7776 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-09 21:01:24 +00:00
Flugente 0ddfec95b6 - Change: spotter minimum preparation time lowered to 2 turns (was 3)
- Cahnge: spotter cth bonus now works for rifles and sniper rifles


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2221 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-09 18:21:34 +00:00
Flugente 6e824810ab - Fix: profile id was used instead of profile's face id
- Fix: squad names were not used correctly

- Change: spotter minimum preparation time lowered to 2 turns (was 3)
- Change: spotter ct bonus has been doubled
- Cahnge: spotter cth bonus now works for rifles and sniper rifles


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7774 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-09 18:19:34 +00:00
Flugente 68869f77b2 If ALLOW_BANDAGING_DURING_TRAVEL is set to TRUE, travelling mercs will bandage themselves if they bleed. This behaviour is off by default.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7772 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-07 15:53:25 +00:00
Flugente 0defdd7b78 If ALLOW_BANDAGING_DURING_TRAVEL is set to TRUE, travelling mercs will bandage themselves if they bleed. This behaviour is off by default.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2220 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-07 15:52:55 +00:00
Flugente 62f0461f96 - disease infection chances (percentage) is now read as float, valid numbers between 0.01 an 100.0
- lowered infection chances for swamp/tropical sectors and contact with humans/corpses
- infections on gunshot wounds only happen on severe wounds (damage taken > 20)
- lifeloss by bloodloss no longer leads to traumatic infections

Requires GameDir >= r2219 due to changed xml entries.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7770 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-06 21:42:32 +00:00
Flugente f55d2a5136 - disease infection chances (percentage) is now read as float, valid numbers between 0.01 an 100.0
- lowered infection chances for swamp/tropical sectors and contact with humans/corpses

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2219 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-06 21:39:36 +00:00
Flugente 66d4bc8a33 Added disease resistance and lowered food and drink consumption to survival trait.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7768 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-05 22:43:15 +00:00
Flugente fcb3dfb3cd Added disease resistance and lowered food and drink consumption to survival trait.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2218 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-05 22:42:49 +00:00
Flugente 5b5f24401c If not enough militia can be trained due to a lack of volunteers, excess trainign goes into militia promotions instead.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7767 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-05 22:04:53 +00:00
silversurfer 43d8e07da0 Fix: KCB Knife and Rambo Knife had the wrong item size of 28. I corrected this to 24 like the other large knifes.
I also removed the option to carry size 28 items from the knife pocket index 2. Size 28 is for large items like a discarded LAW or golf clubs and they look stupid in a knife sheet...

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2217 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-03-04 11:21:59 +00:00
silversurfer f3553cf888 Fix: Mercs that have the <druguse> tag in their background spawned a bottle of alcohol anywhere in there inventory at full hour when function HourlyLarryUpdate() was run. The bottle would spawn in invalid slots as well for example the backpack slot. Now the game will only spawn a 25% condition bottle which is consumed right away which solves the inventory problem. This is more or less a hackfix.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-03-04 10:54:28 +00:00