1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,547 Commits 9 Branches 6 Tags
73c22c45eecb98bc884e87daa794eed01bdc4407
Commit Graph
2547 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 73c22c45ee Changed a few dynamic dialogue texts. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7839 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-01 15:02:41 +00:00
Flugente bbc11afd4f Change: Vehicles now generate AP_VEHICLE_MAXIMUM AP each turn. The previous calculation was based on stats, which is nonsense for a car, and did not allow more than 100 AP. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7838 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-01 15:02:08 +00:00
Flugente 700073aa62 Items can now be applied on mercs in Strategic AI.patch(food/camo/drugs/...) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7833 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-23 20:58:05 +00:00
Flugente 8dbb142926 To speed up heli insertions, up to 3 mercs can rope down from the heli at the same time 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7832 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-22 19:58:56 +00:00
Flugente a5754a5428 made unclaimed airspace a bit brigher in the map, as it was hard to see anything 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7831 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-22 19:13:28 +00:00
Flugente 89b6f6aa81 Fix: dynamic opinions: mercs complain about a thief stealing, even if he fails 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7830 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-22 18:57:25 +00:00
Flugente ad5f3e933c - Fix: Launchers launch things that aren't supposed to be launched, like attached scopes 
- Fix: mercs complain about non-useable structure construction items, even though these don't care about the useability threshold

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7829 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-22 18:46:09 +00:00
Flugente 7a163e8a3e Simplified ImprovedAutoFastForward feature (allows to accelerate only invisible enemies) (by sevenfm) 
Now single option IMPROVED_AUTO_FAST_FORWARD=TRUE by default
Removed options:
AUTO_FAST_FORWARD_ENEMIES
AUTO_FAST_FORWARD_MILITIA
AUTO_FAST_FORWARD_CIVS
AUTO_FAST_FORWARD_CREATURES
ENEMY_CLOCK_SPEED_PERCENT

Also a small fix (additional update of AutoFastForward status when soldier arrives at new gridno)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7828 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-21 21:50:47 +00:00
Flugente ab3eec17c6 Fix: gentle(wo)men do not judge on the appearance of the opposite gender 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7827 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-21 21:16:40 +00:00
Flugente b8d8e9b4a8 Change: replaced all <usPrisonRoomNumberXX>-tags with <usPrisonRoomNumber>, now 65535 prison rooms are supported 
Requires GameDir >= r2234

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7826 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-21 20:34:06 +00:00
Flugente cc7d52c901 Fix: dynamic opinion: mercs treat killing of crows and cows as if a civilian has been killed 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7824 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-19 10:13:43 +00:00
Flugente 1547effbf7 Change: Strategic AI: during each strategic evaluation, the queen can send out 1 new group as reinforcements/patrol. Which one is selected somewhat randomly. If, however, closer inspection reveals that the group shouldn't be created, evaluation ends. 
This has now been changed. If a group cannot be sent, the queen will try to send the next possible group and stop evaluation once successful.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7823 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-19 09:48:02 +00:00
Flugente 1bed3bcfad Fix: during strategic AI evaluation, player strength isn't properly evaluated and possibly given bogus values. As a result, the AI is stopped from attacking sectors it should normally attack. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7822 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-19 09:33:34 +00:00
Flugente d464d493e9 Change: dynamic opinion: the event OPINIONEVENT_BESTCOMMANDEREVER is only called if 
- we won the battle battle,
- the enemy outnumbered us at least 2:1,
- the enemy had at least 4 times our losses and
- the enemy patrol numbered at least MAX_STRATEGIC_ENEMY_GROUP_SIZE people

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7821 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-19 09:28:13 +00:00
Flugente c5c57c7976 Change: dynamic opionion: mercs only complain about retreat if the enemy was aware of them - otherwise they assume it was a sneaky operation, which won't be punished 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7820 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-19 09:24:27 +00:00
Flugente 8fe526b0e5 Fix: crash when entering a sector if currently selected merc is in the helicopter 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7819 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-19 09:22:43 +00:00
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 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
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 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 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 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
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
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 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 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 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 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 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