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,700 Commits 9 Branches 6 Tags
5bc2bae07e31b4e65333fd0593079d90e5657601
Commit Graph
686 Commits
Author SHA1 Message Date
Flugente e206c21daa Unified strategic map display code for airspace, militia restrictions and disease 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-09 22:48:16 +00:00
Flugente 1689f1b571 Fix: sometimes items moved by the MOVEITEM assignment are left unreachable 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8100 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-09 20:18:35 +00:00
Wanne 446484f6ca UB 1.13 Fixes (by Jazz) 
- Externalized more hardcoded grid numbers


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8097 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-08 21:06:31 +00:00
Wanne ea6e30d8c8 UB 1.13 Fixes (by Jazz) 
- The problem was fixed with the mark of underground sectors on the strategic map (J14-1,K14-1,L15-2,L15-3).
- Fixed the problem with moving from the sector K14-1 to K15-1.
- Procedure HandleMovingTheEnemiesToBeNearPlayerWhenEnteringComplexMap was blocked in the file strategicamp.cpp.
- Added a few new parameters to the file UB_Options.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8096 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-07 18:41:45 +00:00
Flugente 12ae810316 - New feature: sector fortification allows to construct structures in sectors in a much easier way than by using amerc to build 'by hand'. Fortification nodes are in a subfolder in Profiles and can easily be altered and exchanged, even in an ongoing game. 
Fully savegame compatible.
GameDir >= r2296 is recommended, but not required.
- Cleaned up cover display functions.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-06 12:44:57 +00:00
Flugente 7e7476a4ea - Fix: machines have opinions 
- Fix: machines get diseases
- Fix: disease assignment menu box accessible if feature is off

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8093 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-05 19:51:39 +00:00
Flugente fe545b9eb3 Difficulty setting AlwaysUpGradeAdminsToTroopsProgress forces admin upgrade to troops once enough player progress is reached. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8051 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-02-06 00:05:51 +00:00
Flugente 330925b0ef When displaying a merc's maximum assignment points, factor in backgrounds values. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8050 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-02-05 22:18:05 +00:00
Flugente d1e1759aa2 Removed ENABLE_ZOMBIES-define 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-31 17:54:51 +00:00
Flugente a0051c3b8d RADIO_OPERATOR_REINFORCEMENT_SETTING in Skills_Settings.ini controls under what conditions radio operators can call militia reinforcements. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8043 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-28 22:55:56 +00:00
Flugente a9778435dd Fix: GROUP pointer can be NULL after MoveSAIGroupToSector is called 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8033 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-24 20:40:46 +00:00
Flugente db51179b2d Fix: changed variable type to prevent possible underflow 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8030 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-24 19:12:14 +00:00
Wanne b0207aadcb Reenabled the "AI Viewer" in Strategy screen when pressing F12 in a DEBUG 1.13 version 
- The AI Viewer was disabled in Revision 7727 (I don't know why ...)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8028 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-23 16:15:38 +00:00
Flugente b4179aeeeb Fix: It is possible to leave a sector while an explosion has been activated but not yet occured. In this case the game waits for the explosion to occur before hadnling AI, resulting in a deadlock. For more info on this bug, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22909&start=0& 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8026 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-17 16:00:42 +00:00
inshy 4cf9f557f8 1) Do not use a "Tab" instead "Space" in the text messages. We don't have symbol for symbol "Tab" in the fonts, so when we use it in the text the game show "A" 
2) Fixed mistakes in English
3) New translation for Russian text 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8025 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-17 09:54:44 +00:00
Wanne b430965027 Fixed compilation error in VS 2005 
- Missing "include <math.h>" in ASD.cpp
- Missing cast argument to FLOAT inside sqrt() function

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8021 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-15 08:09:52 +00:00
Flugente 3af6748b03 - Fix: compiler warning 
- If possible, use the intended macrso to determine sector coordinates

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8018 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-10 18:06:55 +00:00
Flugente f09d7818f0 - Moved ASD & Enemy Heli-related settings from JA2_Options.ini to Mod_Settings.ini. 
- Enemy Helis can also be unlocked if a certain game progress is reached.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8017 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-10 14:46:55 +00:00
Flugente f3acdb5963 If a downed enemy helicopter had soldiers on it, there is a chance that they survived the crash. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8016 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-09 22:28:26 +00:00
Flugente 7664342746 - New Feature: Arulco special division controls other features to fight the player. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343706&#msg_343706 
- New Feature: Enemy helicopters allow the AI to rapidly deploy troops aross the map. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343707&#msg_343707. GameDir <= r2279 is required.
- Fix: income of mine 0 was not correctly calculated

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8015 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-09 19:45:30 +00:00
silversurfer 50c764ee04 Fix: - additional defenses around Meduna and additional elites where used incorrectly from DifficultySettings.xml 
- corrected some typos for parameters from DifficultySettings.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8013 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-09 16:27:56 +00:00
Wanne 48413a9242 Fix: Fixed crash, when clicking on "Done" button after "Auto Resolve" has been finished (pGroup NULL pointer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8008 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-03 11:43:38 +00:00
Wanne 38e77c7295 Fix: Fixed compilation errors when trying to compile UB version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8001 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-11-04 08:12:47 +00:00
Wanne 91eef3098c - Equip Milita Improvements: I've written code, which adds attachments to free positions on the gun militia chose to pick up (by navaroe) 
- Bugfix: Reinforcements:  Parts of roadblocks were resurrected after reinforcements death (by navaroe)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7995 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-10-15 10:40:58 +00:00
Wanne ffdcb827df Externalized Quest strings (Encyclopedia) (FactDescText, QuestDescText) to the language Text files 
- See comment // TODO.Translate

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7989 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-09-13 12:00:23 +00:00
Wanne a2589f7034 Bugfixes / Improvements (macros) of Assignments (by Franimus) 
- Fixed warning for INT8 overflow on scroll region priority, seemingly had no effect though
- Use new assignment macros
- Bugfix - POWs' activity level being overwritten
- Feature - automatically bandage bleeding mercs on a PATIENT assignment
- Bugfix - mercs treated at facilities should not use mercs' medkits
- Added 3 new enums for facility doctor, patient, and repair
- Bugfix for facility patients not detected as being in a facility
- Bugfix - iBurstAPCost was ignoring half of its calculation due to extraneous semicolon


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7988 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-09-12 11:27:28 +00:00
Flugente 8a84db40d4 Fix: enemy tanks spawned by cheats are not added to the sector count 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-18 19:26:41 +00:00
Flugente 96d1177e31 Fix: sectors can't be selected in GETITEM menu 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7978 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-17 21:09:44 +00:00
inshy e251139d99 Do not use a "Tab" instead "Space" in the text messages. We don't have symbol for button "Tab" in the fonts, so when we use it in the text the game show "A" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7975 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-15 18:31:58 +00:00
Flugente 8fa2d4402c Rdio sets no longer need a battery. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7974 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-14 20:50:27 +00:00
Flugente 5e8ab2af31 Fix: possible access to invalid memory if waypoint is list was corrupted 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-07 20:16:15 +00:00
Flugente 7dbff83e24 - Fix: VS2010 debug build issue with reading in StructureConstruct.xml 
- replaced a few hardcoded values with enums
- use TANK(...) macro instead of checking for bodytype by hand

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7959 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-05 19:01:11 +00:00
silversurfer abe7117231 Fix (by navaroe): The game could try to place more soldiers on the map than the map had slots which would cause the game to crash. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7955 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-02 13:59:07 +00:00
Flugente f78d18ec10 Cheats are activated/deactivatesd by [Ctrl] + G. [Ctrl] + GABBI is longer in use. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7926 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-22 21:42:25 +00:00
Flugente b7f212b51b - Fix: attacking squadmates called OPINIONEVENT_CIV_ATTACKER in addition to OPINIONEVENT_FRIENDLYFIRE dynmic opinion event. 
- If a dynmic opinion event's opinion moifier is set to 0, this event is not used, thereby allowing to turn specific events off.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7919 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-15 18:51:08 +00:00
Flugente b8c3d26013 If an enemy group pursuits a player group that just retreated, make sure they don't arrive before or at the same time as the player group. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7907 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-08 21:06:31 +00:00
Flugente d37db2432b Fix: possible crash if entering a sector with more enemies present than map placements 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7903 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-05 18:04:33 +00:00
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 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 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 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 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 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
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 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 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