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,587 Commits 9 Branches 6 Tags
ceea35b0e98bc5be8f798cc2c0864915744a3e6e
Commit Graph
2587 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente ceea35b0e9 Fix: if an enemy group is reassigned and ordered to retreat to its sector of creation, have it travel there instead of simply removing it 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-20 16:25:53 +00:00
Flugente 19f61fbb74 Moved start of new quest to code from lua, as otherwise the player can exploit NPC presence and finish quest too easy 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7894 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-19 18:57:28 +00:00
Flugente 806aa458ac If debt to MERC includes gear, tell us so 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7893 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-16 20:09:51 +00:00
Flugente d3082b2f92 If prisoners give info on enemy patrol movements, patrols with tanks are handled first. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7892 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-15 20:58:19 +00:00
Flugente 702e49747c added opinion event OPINIONEVENT_CIV_ATTACKER, used when injuring a non-hostile civilian/militia 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7891 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-15 17:30:57 +00:00
Flugente eff368f099 - New Quest: if Kingpin is unaware Maria escaped with the player's help, he enlists the player to kill the DaSilvas 
- Moved civ factions for mod compatibility (UC)

Does not break savegame compatibility.
Requires GameDir >= r2252.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-13 17:26:16 +00:00
Flugente e77f8f2bd6 Kyle takes over the San Mona leather shop once his quest is over 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7887 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-04 12:56:31 +00:00
Flugente 962393d170 - New Feature: Tactical recruitment allows recruiting civilians as volunteers. 
See http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=341335&#msg_341335

This is fully savegame compatible.
GameDir <= r2250 is recommended.
- Fix: prisoners do not talk.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7886 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-03 21:04:06 +00:00
Flugente 6c9d75480f Added range modifier for throwing knives 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7885 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-01 21:02:07 +00:00
Flugente ec90c52bd2 - Stat losses are now displayed in the laptop 
- Breath regeneration through sleep is now displayed in a tooltip
- If NOTIFY_IF_SLEEP_FAILS is set to FALSE, there is no popup box is ordering a merc to sleep fails

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7884 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-01 20:23:02 +00:00
Wanne 2d5e68a86d - Commented out restricted Scroll ID/viewport as viewport for A10_B1 map shifts around in non-640x480 resolutions. As such 'Restricted Scroll ID' textbox becomes irrelevant in mapeditor (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7882 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-31 18:16:06 +00:00
Flugente 7c69e12df8 - Lua function HandleSectorLiberation(...) is called whenever we liberate a sector 
- Lua function RecruitRPCAdditionalHandling(...) is called whenever we recruit a RPC

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7880 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-31 15:13:21 +00:00
silversurfer 5c107cee7e Fix: FACT_HILLBILLIES_KILLED could be set TRUE even if the hicks were still alive breaking vendor Keith's quest. An additional check prevents this. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7879 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-27 17:12:04 +00:00
silversurfer effc2d0d58 Fix: MAX_CTH_PENALTY_FOR_MOVING_TARGET wasn't read correctly from Ja2_Options.ini and also not used in the code. Now it's used like intended for OCTH. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7878 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-26 11:15:11 +00:00
Flugente 32a8b75748 - Fix: wrong final destination displayed for travelling militia 
- Fix: when ordering militia movement, data of another group's path can be erased
- Fix: a militia groups's path isn't always destroyed if the group is deleted
- Fix: unsafe pointer handling can result in a gamecrash when loading strategic AI data from a savegame
- Fix: traveltime calculations do not correctly handle waypoints, resulting in possible crashes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7876 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-24 14:09:48 +00:00
Flugente 856b34b446 Fix: endless clock as vehicle tries to cower 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7875 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-22 19:45:59 +00:00
silversurfer e370e21f5f New door handling from r7872 will now only happen in turn based combat. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7874 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-22 07:28:19 +00:00
Flugente 2470880bae Fix: absurd stat gains when hitting a target in NCTH 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7873 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-21 21:24:03 +00:00
silversurfer f24d417ac1 Enhanced the change from 7871 as the game doesn't distinguish between doors and containers. They are all "doors" in code terms. Now any "door" that doesn't have a key item assigned is considered a container. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-21 18:59:13 +00:00
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