1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,606 Commits 9 Branches 6 Tags
c11014afa1cddd239e9a0634a56324d1272b256e
Commit Graph
7606 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 86e21d43a8 If the player retreats from an enemy attack that was targetted at this sector, the enemy group pursuits instead of being given new orders. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-05 12:44:12 +00:00
Flugente 54d202fc79 - Fix: mercs can consume items that shouldnt' be consumed 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7900 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-05 10:37:27 +00:00
Flugente 48178ea56f - Fix: CHANCE_SAY_ANNOYING_PHRASE wasn't used in english when spotting enemies 
- removed obsolete drug code
- if health is changed by drugs, display that via damage floater

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-04 20:27:29 +00:00
Flugente a3e05a9412 - increased 'cigar' drug effects 
- neurotoxin darts now use the new drug system

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2258 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-07-04 20:24:00 +00:00
Flugente de46a125ab Fix: mercs complain about killing of civilians they did not witness 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7898 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-28 21:35:47 +00:00
Flugente 9cae4bde9a Fix: crash when placing vehicles with to long name (by asm-debacle) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7897 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-28 20:34:33 +00:00
Flugente 4d9140da57 New Feature: Drug System Overhaul. The drug system has been completely overhauled. 
Requires GameDir >= r2257.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=341541&#msg_341541

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7896 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-28 17:47:25 +00:00
Flugente 036ada1226 New Feature: Drug System Overhaul. The drug system has been completely overhauled. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=341541&#msg_341541

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2257 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-28 17:44:55 +00:00
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 33fe5aae59 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_v1.13_data@2256 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-19 18:56:53 +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 c59a9722f3 - added opinion event OPINIONEVENT_CIV_ATTACKER, used when injuring a non-hostile civilian/militia 
- cleaning kits can be merged

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2255 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-15 17:10:09 +00:00
Flugente 65ca8103db Backgrounds have been overhauled (by edmortimer & Flugente) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2254 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-14 12:42:37 +00:00
Flugente 965b8c993c Fix: delay email to stop player from finishing quest too fast 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2253 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-13 18:14:46 +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 31edbbfb97 - 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)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2252 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-13 17:18:29 +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 397a6091f3 Kyle takes over the San Mona leather shop once his quest is over 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2251 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-04 12:55:36 +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 caeccad6a8 New Feature: Tactical recruitment allows recruiting civilians as volunteers. 
See http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=341335&#msg_341335

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2250 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-03 21:01:41 +00:00
Flugente 2164466392 Added 20 profiles each for green, regular and veteran militia (by edmortimer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2249 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-03 19:22:18 +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 07d2fc2395 Added range modifier for throwing knives 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2248 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-01 20:57:02 +00:00
Flugente 16dacbde55 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_v1.13_data@2247 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-01 20:24:09 +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
Flugente a923411446 - Lua function HandleSectorLiberation(...) is called whenever we liberate a sector 
- Lua function RecruitRPCAdditionalHandling(...) is called whenever we recruit a RPC

For the moment, both functions add volunteers once important prisons are liberated or Miguel is recruited.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2246 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-05-31 15:11:32 +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 f8f950f765 Deleted Feature: The poison feature has been made obsolelte by the disease feature and has been removed 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2245 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-05-20 20:37:02 +00:00
Flugente 23531fbcdc 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_v1.13_data@2244 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-05-19 20:51:22 +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
silversurfer c3336044cb - modified spread pattern names to look better in EDB 
- changed the mechanics attribute of some mercs with explosive skill to something higher than zero so they do not automatically blow themselves up anymore

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2243 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-05-14 23:30:43 +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