1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,637 Commits 9 Branches 6 Tags
98c1e6a1f529104f2984c3192da76472ce7a53be
Commit Graph
7637 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sevenfm cbc1b8c5e3 New background property: <animal_friend> will refuse to attack animals, unless attacked by that animal. 
New background property: <civgroup_loyal> will refuse to attack neutral members of the same civilian group.
Fixed array bound in GetTileSetIndexVector().

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8731 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-01-15 20:27:00 +00:00
Sevenfm 5a8ff9ff20 Added new background tags: <animal_friend>, <civgroup_loyal>. 
Lua: spelling corrected.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2505 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2020-01-15 20:22:21 +00:00
Sevenfm 9c563c9c8a Improved AI path tweaks. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8730 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-01-12 09:17:51 +00:00
Sevenfm 168f9b9f6d Improved AI path tweaks. 
FindBestNearbyCover: avoid moving into light if not in light already and not under attack.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8729 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-01-12 09:07:31 +00:00
Sevenfm fde1e517e2 Grenade pin sounds. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2504 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2020-01-11 17:17:34 +00:00
Sevenfm f54a91718b Play grenade pin sound (supports custom grenade pin sound with <sSound> tag in Weapons.xml) 
Help AI associate noise with enemy presence: 
- melee attack noise type changed to NOISE_BULLET_IMPACT
- HTH attack noise type changed to NOISE_BULLET_IMPACT
- grenade pin noise type changed to NOISE_GRENADE_IMPACT
- launcher attack noise type changed to NOISE_GUNFIRE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-01-11 17:15:17 +00:00
Sevenfm 6386338422 Lua code improvements. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8727 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-01-09 12:19:56 +00:00
Sevenfm e35c52821f Improved Lua code: 
- default values
- array bounds
- min/max values
- correct variable types

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8726 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-01-09 12:11:18 +00:00
Sevenfm 9e6412a937 Lua: initialize return values to prevent returning garbage if soldier is not found. 
Improved r8104 fix to allow Fatima quest (civilians and NPCs with profile can go off screen).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8725 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-01-08 17:17:59 +00:00
Sevenfm a802c3db63 Added more nationalities. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8724 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-01-07 16:37:54 +00:00
Sevenfm f10590587a New option AUTO_HIDE_PB (TRUE) enables auto hiding of the progress bar when mouse cursor is on the top map row. 
AI soldiers will now avoid staying at top map row.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8723 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-01-05 08:20:42 +00:00
Sevenfm 5291c3ec15 New option AUTO_HIDE_PB (TRUE) enabled auto hiding of the progress bar when mouse cursor is on the top map row. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2503 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2020-01-05 08:18:17 +00:00
Sevenfm 58308434f7 FindNearbyDarkerSpot should return INT32 value to prevent bugs when used with big maps (by bfant). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8722 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-01-01 10:14:37 +00:00
Sevenfm 11e18d8510 New option AI_TACTICAL_RETREAT (false by default). 
Moved AI_EXTRA_SUPPRESSION, AI_NEW_MORALE, AI_BETTER_COVER and AI_YELLOW_FLANKING to [Tactical AI Settings].

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2502 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2019-12-30 08:48:05 +00:00
Sevenfm 470bae3c20 New option AI_TACTICAL_RETREAT (false by default) controls tactical enemy retreat from battle. 
Moved options AI_YELLOW_FLANKING, AI_EXTRA_SUPPRESSION, AI_NEW_MORALE and AI_BETTER_COVER to [Tactical AI Settings]
AI_NEW_MORALE:
- zombies always have high morale
- always low morale when soldier is blinded
- neutrals always have low morale even if they have guns, so they don't run into the heat of battle
- prevent hopeless morale when not under attack
UpdateAniTiles: also check EXPLOSV_CREATUREGAS (from merc05's fixes)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8721 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-30 08:45:08 +00:00
Sevenfm d02a4ddd7d Implemented some of the merc05's fixes (http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24256): 
- fix for stopping snitches from preventing misbehavior
- fix for stopping snitches reports
- improved code for refused handcuffing
- fixed item bug with items dropping from backpack after using transformation in turnbased mode
- improved code for dart ammotype effect
- removed assert in AddCharacterToAnySquad to prevent crash when selecting merc in vehicle and plotting travel route
- added EXPLOSV_CREATUREGAS effect in UpdateAniTiles()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8720 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-22 06:22:23 +00:00
Sevenfm 3efe899526 HandleItemPointerClick(): use correct target level. 
CalcPreRecoilOffset(), CalcRecoilOffset(): fix counterforce calculation for weapon resting feature.
SOLDIERTYPE::GetAPBonus(): use THROUGH_STRATEGIC_MOVE instead of soldier's facing direction to determine sector type.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-22 05:57:52 +00:00
Sevenfm 0b2e16ac93 Improved r8524 fix to work with 1280x720 resolution. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-21 13:05:46 +00:00
Sevenfm 25975df86a Fixed incorrect AIMING_LEVELS_REDUCTION_ON_ALTWEAPHOLD value. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2501 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2019-12-11 02:01:15 +00:00
Sevenfm 0a6277c6b1 InternalDropBlood: use correct data to determine blood type. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8717 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-07 00:08:10 +00:00
silversurfer 7fc10ab175 Fix: duplicated opinions 76 to 79 removed 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2499 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2019-12-06 08:23:18 +00:00
Sevenfm 0e8c086a9a NCTH: improved laser bonus code. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8716 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-05 08:48:26 +00:00
Sevenfm b367fad899 Switch scope mode to default for suppressed soldier if he uses alt weapon holding. 
Improved AI path tweaks.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8715 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-04 13:27:24 +00:00
Sevenfm 92b6f40a17 Improved AI path tweaks. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8714 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-04 12:05:11 +00:00
Sevenfm 219a1c76e2 Experimental path AI tweaks: 
- avoid light at night
- avoid corpses
- avoid deep water
- avoid gas/fire

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8713 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-03 21:52:36 +00:00
Flugente 0e94a5e21c - Added dialogue events for using a lockbomb (ADE_LOCKBOMB) and sniper warning (ADE_SNIPERWARNING) 
- Character lines can be replaced before playing via HandleReplaceQuote(...) in Overhead.lua.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2497 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2019-12-02 22:14:26 +00:00
Flugente c92290155f Character lines can be replaced before playing via HandleReplaceQuote(...) in Overhead.lua. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8712 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-02 22:02:04 +00:00
Flugente 8ace6a2954 Added dialogue events for using a lockbomb (ADE_LOCKBOMB) and sniper warning (ADE_SNIPERWARNING) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-12-01 20:34:46 +00:00
Flugente 61c6972efa Complaints about sexual harassment now use separate voice lines 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8710 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-11-28 22:24:49 +00:00
Flugente c9025796aa improved comments 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-11-27 23:31:16 +00:00
Flugente c8207018e3 Added Battlesounds for melee attacks. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=358569&#msg_358569

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8708 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-11-27 21:46:49 +00:00
Flugente f579e36753 Change: Backpacks no longer automatically break civilian disguise. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=358568&#msg_358568

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2492 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2019-11-27 21:35:07 +00:00
Flugente 32cdfc18cd Change: Backpacks no longer automatically break civilian disguise. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=358568&#msg_358568

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8707 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-11-27 21:33:55 +00:00
Sevenfm b29e9700f3 Fixed incorrect integer calculation. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8706 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-11-22 14:24:21 +00:00
Flugente d0bfe95c78 If the new JA2_Options.ini option GEARKITS_ALWAYS_AVAILABLE is TRUE (default: FALSE), a merc's gear kits are always available during the hiring process, even if they've been bought before. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=358411&#msg_358411

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8704 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-10-31 23:43:43 +00:00
Flugente 9622fbeeb8 If the new JA2_Options.ini option GEARKITS_ALWAYS_AVAILABLE is TRUE (default: FALSE), a merc's gear kits are always available during the hiring process, even if they've been bought before. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=358411&#msg_358411

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2482 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2019-10-31 23:41:58 +00:00
Wanne ceca7b00f5 Update - 2019-10-03: Deadly Games German Translated Mercs for 1.13 - BETA (by firebat) 
Added:
-JADG-Lynx [Indexnumber: 350]
-JA1-Hitman [Indexnumber: 351]
-JADG-Ice [Indexnumber: 352]
-JADG-Grunty [Indexnumber: 353]
-JADG-Nails [Indexnumber: 354]
-JADG-Sidney [Indexnumber: 355]
-JA1-Jimmy [Indexnumber: 356]
-JADG-Scope [Indexnumber: 358]

Bugfix: IMPVoices.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8703 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-10-31 12:03:15 +00:00
Flugente 130272bbe5 FIX: no GUI for random items 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-10-27 19:49:48 +00:00
Flugente 1e191f8e0c Fix: random items have wrong usItemClass 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2481 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2019-10-24 20:24:18 +00:00
Flugente 8b698f0633 Fix: inventory button to change firemodes was greyed out for guns with one base fire mode, even if it had several barrel configurations 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-10-23 22:07:58 +00:00
Flugente cd87c4f9cc Fix: inventory button to change firemodes was greyed out for guns with one base fire mode, even if a bayonet granted them a second fire mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8700 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-10-23 21:28:05 +00:00
Flugente 14619a22cc Revamped <scrounging>-tag of Backgrounds.xml: instead of hoarding items, mercs steal small amounts of money from the locals, which can lower loyalty. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=21308&goto=358321&#msg_358321

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-10-22 21:46:53 +00:00
Flugente fb88f714da Added <wealth>-tag to describe the relative wealth of a sector, used for the revamped <scrounging>-tag of Backgrounds.xml. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=21308&goto=358321&#msg_358321

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2478 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2019-10-22 21:44:52 +00:00
Sevenfm e1657cefb7 Improved movement noise calculation. 
Fixed max array size bugs.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8698 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-10-22 20:45:43 +00:00
Sevenfm 7908dc2ff3 Reverted resetting next action in CancelAIAction() as it doesn't work as expected. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8697 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-10-18 21:31:19 +00:00
Sevenfm ef46feb9b1 Fixed bug introduced in r8695. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8696 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-10-06 18:44:19 +00:00
Sevenfm 30df6c350a CalcTargetMovementOffset: better integer calculation for max tiles penalty. 
SOLDIERTYPE::initialize: initialize additional data.
EVENT_FireSoldierWeapon: if shooting soldier is invisible, locate screen to target spot.
CancelAIAction: reset next AI action.
FindBestPath: improved gas avoiding code.
InGas: improved code, also check the spot itself.
LegalNPCDestination: disabled additional checks to prevent AI deadlock.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8695 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-10-03 16:49:04 +00:00
Sevenfm 54e7c1e24d DrawCTHIndicator: bAimTime -> bShownAimTime fix. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8694 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-09-25 18:40:51 +00:00
Wanne a077019d13 Updated Chinese text files (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8693 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-09-10 19:17:52 +00:00
silversurfer a181d7c061 Fix: RaiseZombies function ignored sector levels and modified wrong sector info counters 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8692 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-08-24 19:11:26 +00:00