1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,622 Commits 9 Branches 6 Tags
929d15ec8a3523a7dcfc2ae1f0648b34c60af9ef
Commit Graph
2622 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 929d15ec8a changed several variable names for body types to 'ubBodyType', as this is more consistent and allows wider use of macros 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-07 20:09:10 +00:00
Flugente 67fa865543 - Fix: Mike and Iggy could spawn as tanks 
- Tanks always get 100 HP
- replaced a few hardcoded values with enums


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7960 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-07 18:54:58 +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
Flugente 90486b015b Oly start PMC hiring if > 0 militia have been selected 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7958 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-04 19:11:13 +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
inshy 0c27f5f2c4 Russian language files updated: 
-Fixed grammar in Russian

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7954 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-30 18:39:42 +00:00
inshy 5474f16334 Russian language files updated: 
-Fixed some mistranslation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7953 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-29 20:19:37 +00:00
Flugente 0beda54c8d Fix: constructing/deconstructing a fortifiaction only worked if the tileset was part of the additonal tileset, not if it was a part of GENERIC 1 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7938 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-26 09:50:16 +00:00
Flugente 0a748a02b3 Message boxes can have a dropdown. For usage, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=341863&#msg_341863 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-25 17:34:18 +00:00
Flugente 6aa4e1e6c6 New background property: if <croucheddefense> is set, enemy CTH is modified if they fire on us while we are crouched against thick cover (size >= 2) in the direction of the shot. 
Backgrounds.xml tag was added in GameDir r2267.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-25 12:49:37 +00:00
Flugente d682b28a31 Fix: progress bar on dropdown menus was too small 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7932 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-24 22:23:13 +00:00
Flugente 2ba4b77a84 - Fix: when jumping over fences or sandbags, a merc was occasionally moved inside the structure. 
- Fix: sandbags could only be jumped if their height was < 2. A structure with a .jsd-size of 1 barely offers protection, thus limiting the usefulness of sandbags. From now on, sandbags with a height of 2 can also be jumped. Note: This requires a changed sandbag.jsd in GameDir.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7931 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-24 21:20:17 +00:00
Flugente f4f124c7b0 - Obliterating a sector will now destroy tanks as well. 
- Spawning a new enemy via [Alt] + [b] can create tanks.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7928 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-23 19:14:21 +00:00
Flugente e0dc813ea6 added missing text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7927 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-22 21:43:17 +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
Wanne 56072fdd0f Updated JA2 1.13 Credits (thx to Scheinworld) 
Updated Version Number

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-14 20:17:33 +00:00
inshy 470e5276ae Update Russian translation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7916 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-14 19:23:26 +00:00
Flugente eee91c14a7 Fix: nationalities did not show up 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7915 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-14 18:52:49 +00:00
inshy edcf96756a Update translation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7914 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-14 14:00:56 +00:00
Flugente cc9a310aef added more nationalities 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7913 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-13 17:43:47 +00:00
Flugente 251b7b51f2 added missing line breaks 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7911 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-12 21:24:28 +00:00
Wanne 02d52875c6 - Added missing texts for Chinese Version (gzDisplayCoverText[]) 
- Fixed invalid characters in some language texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7910 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-12 12:07:37 +00:00
inshy d69f1f98be Added missing lines for Russian language. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7909 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-12 08:59:30 +00:00
silversurfer 1d8136aa06 Fix: New IMP gear selection method didn't include the Sidearm category so mercs could be left without a gun if their trait selection didn't include one. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7908 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-09 16:19:47 +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 457814265c New item tag: mines with <antitankmine> set to 1 will be activated by vehicles or robots. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7906 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-08 19:54:54 +00:00
Flugente 25f04ef661 Added safety checks: 
MAX_NUMBER_OF_TRAITS must be higher than NUMBER_OF_MAJOR_TRAITS_ALLOWED at least by 1.
MAX_NUMBER_OF_TRAITS_FOR_IMP must be higher than NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP at least by 1.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7905 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-08 17:44:05 +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 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 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 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