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,568 Commits 9 Branches 6 Tags
dfc60c439409b5989ca6d419bf7864d962d6164e
Commit Graph
2568 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
silversurfer dfc60c4394 Using shaped charges, keys or lockpicks on a locked door now only unlocks the door. It doesn't automatically open the door anymore. This solves the problem that a merc manages to pick a lock and after automatically opening the door he is a sitting duck because he has no AP left. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-21 18:26:12 +00:00
Flugente b2217eaab9 Deleted Feature: The poison feature has been made obsolete by the disease feature and has been removed. 
GameDir >= r2245 is recommended.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-20 20:39:51 +00:00
Flugente 62d5dd1854 - If a sector has less placements for militia than militia slots, distribute excess militia to random locations instead of not spawning them. 
- Fix: crash in mine display due to invalid gridno.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-19 20:50:05 +00:00
Flugente c677c462bc In order to keep trait-related settings where traits are defined, moved MERCS_CAN_DO_ADVANCED_REPAIRS from JA2_Options.ini to Skills_Settings.ini under [Technician] settings. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-19 20:47:07 +00:00
Flugente 7d18a1ca7a Fix: incorrect sector options on GETITEM assignment 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7866 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-14 21:20:36 +00:00
silversurfer ca68c2b620 Fix: EDB displayed wrong number of aim levels if OCTH system was used. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7864 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-14 19:51:52 +00:00
Flugente b7a17fd12a Fix: MOVEITEM assignment did not work correctly if sector A1 was part of the selection. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7862 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-14 17:01:25 +00:00
Flugente d163df4c13 - mercs only complain about others' diseases after an outbreak 
- a radio set can function without batteries if the xml states batteries are not required
- changed 'friendly fire' dynamic dialogue to not only fit firearm-related incidents

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7861 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-14 15:28:45 +00:00
silversurfer 51dcf322aa EDB now displays the spread pattern of shotguns on the description tab. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7859 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-13 20:10:08 +00:00
Flugente 33e5443cb7 The effects of lack of food are now displayed in strategic when hovering over the life bar of a merc. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7858 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-12 18:28:36 +00:00
Flugente 230c5f5d88 - Improved Feature: via 'Get Item' assignment it is now possible to also get gear from sectors adjacent to a town. 
- Fix: dynamic opinion text referred to wrong person

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7857 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-11 17:11:13 +00:00
Flugente ad8b2525a9 Fix: crash during item transformation on attached items 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-10 13:10:37 +00:00
Flugente 9149dbe850 Improved Feature: Improved ambushes: 
- Enemy deployment radius depends on your mercs' experience.
- With high enough leadership, your team will be able to deploy before battle.
- Added new background tag <ambush_radius> that increases enemy deployment radius (thereby moving them farther away).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-10 10:14:21 +00:00
Flugente 74bfaaf900 Fix: good guys and pacifists should feel bad about excessive violence, not good. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7853 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-08 19:09:55 +00:00
Flugente 1b8d898226 Disease protection items are no longer required to be worn in a faceslot. The point is that the player should acquire special gear, not inconvenience him to switch gear whenever a merc goes on assignment. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7852 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-08 19:08:54 +00:00
Flugente 25c98dda30 Wirecutters no longer give a bonus to disarm, as there is a separate tag for this. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7851 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-08 19:04:11 +00:00
Flugente 54c6093c0a Diagnosing diseases trains wisdom. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7850 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-08 19:03:01 +00:00
Flugente 7efe3966cf New Feature: Improved ambushes have mercs face the enemy and be somewhat scattered, while the enemy encircles the player but is not at point-blank range. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7846 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-03 20:02:01 +00:00
Flugente 79e7278736 Fix: crash due to missing image 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7845 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-03 19:51:05 +00:00
Flugente 96d0b1d312 Fix: a bomb object could be cloned if unsucessfully apllied to someone else 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7842 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-02 17:19:46 +00:00
Flugente bf077971bc Fix: do not call ambush code if we enter a sector via airdrop 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7841 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-02 17:18:31 +00:00
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