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
3,616 Commits 9 Branches 6 Tags
bd5fc83ef8daf9cb027472cf4d34c6bdc34261bd
Commit Graph
3616 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shadooow bd5fc83ef8 fixed gap between the involved table and uninvolved table 
fixed uninvolved header not appearing at all when all mercs were involved

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9205 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-30 19:23:03 +00:00
Shadooow 61f56fe0e6 fixed regression that caused mercs to keep their direction&animation when moving into another sector 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9204 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 18:29:35 +00:00
Shadooow 14e963e338 re-enabled the scrolling functionality via mouse wheel on the message scroll bar which got lost due to previous change to message region boundaries 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9203 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 14:34:44 +00:00
Shadooow c9b9652940 reworked the camouflage and weight map regions to be created only on demand 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 13:26:02 +00:00
Shadooow 30b3528956 improved the boundaries of the message area in map screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9201 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 12:56:56 +00:00
Shadooow f0f558f872 fixed collapsed soldiers sometimes not being able to get up when they should have until next player round 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9200 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 09:36:58 +00:00
Shadooow d238927dd0 detaching attachment will no longer check for 12AP more than it should, this was kind of safety check, but it is confusing and not needed anymore 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9199 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 08:48:54 +00:00
Shadooow 6d8e11931a fixed negative value passed into PreRandom that could cause game to crash 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9198 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-27 00:21:47 +00:00
Shadooow c7139a2569 using an item will now close EDB if opened, this fixed bug where attaching a 40mm grenade into laucher via EDB box and firing from it without closing it didn't substract AP for attaching the grenade 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9197 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-26 22:44:19 +00:00
Sevenfm d02547c7c8 When attaching launchable to attached launcher, use launcher's reload AP cost. 
Don't apply ambidextrous attach speed bonus when attaching launchable to launcher.
When playing reload sounds, set volume and pan based on soldier's location.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9196 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-26 13:49:55 +00:00
Sevenfm 8413c5ee8f GetReliability: attached weapons should not add reliability. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9195 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-26 07:06:43 +00:00
Sevenfm 4b646aad96 GetSightAdjustmentCamouflageOnTerrain: fix signed/unsigned calculation, limit effectiveness to +-100. 
GetDetailedSightAdjustmentCamouflageOnTerrain: fix signed/unsigned calculation.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9194 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-24 15:02:27 +00:00
Sevenfm 36d67602fd Added camouflage bonus to the survival trait (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9193 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-24 09:02:48 +00:00
Sevenfm a8bace71fc Rebel command balancing (by rftr): 
- most admin actions' effectiveness now scale with town loyalty
- added the ability to spend supplies to raise town loyalty
- fixed arc website dropdown issues
- minor code cleaning in Rebel Command.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9192 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-22 09:31:38 +00:00
Sevenfm c577894d3f Allow scuba bottle to work from backpack slot for mod compatibility. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9191 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-19 08:25:27 +00:00
Sevenfm 8d8f912e1a Fix: ASD deploys tanks if there are any in reserve, instead of prioritizing jeeps (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9190 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-19 07:22:32 +00:00
Shadooow 68664bed77 fixed bleeding value not being substracted when losing max hp which resulted into the graphic HP bar having wrong color 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9189 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-18 08:26:32 +00:00
Sevenfm ff172cc92f fix: follow-up minievents properly wait for the specified time (by rftr) 
fix: money income from rebel command displays properly in finances (by rftr)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9188 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-18 06:15:40 +00:00
Shadooow a3bcfef40a maximum heath of merc on mapscreen will now show in red color if the merc suffered a health loss from critical hit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 23:16:52 +00:00
Shadooow 7f57376f93 pressing ESC while map movement popup box opened will now cancel the box instead of leaving map into tactical mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9186 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 22:37:20 +00:00
Shadooow 9f18ebb382 fix: mercs in a helicopter can initiate movement by clicking in their destination column, like regular on-foot/in-car movement (by rfrt) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9185 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 21:58:13 +00:00
Sevenfm b11957691c Fix for critical bug introduced in r9182: replace CoweringShockLevel check which calculates suppression tolerance every time, with IsCowering, which uses cowering animation check. 
DrawBarsInUIBox: fix possible divide by zero.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9184 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-16 16:07:31 +00:00
Sevenfm 9fd9e82397 NEW_SUPPRESSION_CODE: 
- increased min base value for suppression tolerance, so merc with low morale/level have higher base tolerance which can be reduced by other factors
- NEARBY_FRIENDLIES_AFFECT_TOLERANCE: penalty -0.5 if friend is cowering or unconscious, increased limits to +-5

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9183 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-15 09:05:32 +00:00
Sevenfm 6d14282538 NEW_SUPPRESSION_CODE: 
- use effective experience level when calculating base suppression tolerance, so nearby squad leaders may raise effective level and help fight suppression
- if NEARBY_FRIENDLIES_AFFECT_TOLERANCE option is active, nearby friends can help increase suppression tolerance, up to +-3 points added depending on distance, only for merc bodytypes

CheckStatusNearbyFriendlies: minor code improvements, fixed variable names, use INT16 for calculation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9182 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-15 08:44:57 +00:00
Sevenfm 7978ad77f3 Morale changes for AI soldiers: 
- GetMoraleModifier: use bMorale for both player and AI.
- CalcSuppressionTolerance: use morale as a base for tolerance for AI soldiers.
- HandleSuppressionFire: morale loss for AI soldiers.
- EVENT_BeginMercTurn: increase morale for AI soldiers.
- TacticalCreateSoldier: Set morale = 60 + 2 * bExpLevel + Random(20) when creating AI soldier.

NEW_SUPPRESSION_CODE: UseGun, UseGunNCTH: reduce shock when firing gun.
AI_NEW_MORALE: limit AI morale depending on morale and shock level.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9181 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-15 05:52:09 +00:00
Sevenfm 7a7f554908 Fix/change: the hospital now checks for mercs with damaged stats in addition to damaged health. in addition, the hospital now charges money to heal damaged stats (by rftr). 
Minor fixes for quest debug log.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9180 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-15 04:49:17 +00:00
Shadooow 144842b1f6 Fixed crash when Carmen attempts to give the diskette to the Barry. Note, this is rather a workaround than anything. The reason for this crash is that the Merchants.xml contains only 68 entries, but the total number of arms dealers is 80. Thus the remaining 12 slots are zero-fill and therefore the function to check if soldier is armsdealer will return true for Barry as his profile id is 0. A large rewrite of this additional arms dealers system is required. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-14 18:47:06 +00:00
Sevenfm aa767c4355 Minor code improvements for quest logging. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9178 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-14 08:43:15 +00:00
Sevenfm 0a717c2697 Removed option AI_DECISION_INFO. 
Added quest debug logging to Logs\QuestInfo.txt

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9177 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-14 08:35:32 +00:00
Sevenfm 9f787dd73d QOL change: show additional ammo stats at bobby ray's website (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9176 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-14 06:40:28 +00:00
Sevenfm b689b51962 NEW_SUPPRESSION_CODE: calc base suppression tolerance for AI from health/shock instead of AI morale. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9175 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-05 12:10:07 +00:00
Sevenfm d3d06bced6 Mercs with the <druguse> tag in their background don't automatically consume drugs/alcohol if they are asleep (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9174 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-05 07:29:05 +00:00
Shadooow 712d6664be removed one of my comments that got into slive ource by accident 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9173 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-05 02:31:58 +00:00
Sevenfm d1911e421e Added NEW_SUPPRESSION_CODE option, which makes suppression tolerance calculation more balanced. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-04 17:55:04 +00:00
Sevenfm 93f8484d56 Added array readers to the ini reader (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9171 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-04 07:08:32 +00:00
Sevenfm 9ebd4a5137 Bugfix: dissolve all militia groups involved in a battle when it is completed. this fixes bad/immobile militia groups created by safehouses (ARC feature) (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9170 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-04 06:59:37 +00:00
Shadooow 20335041f7 fixed autobandaging showing up during conversation which caused numerous issues 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9169 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-24 02:10:48 +00:00
Shadooow 566f8ab5d4 fixed exploit allowing to steal attachments from vendor items 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9168 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-24 01:45:04 +00:00
Sevenfm 95a810e382 AI flanking: 
- avoid moving too far from noise spot, except for CUNNINGSOLO
- avoid moving too close to enemy vision range

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9167 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-23 18:20:49 +00:00
Shadooow 999fc8ac96 improved the graphic of the prebattle table 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9166 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-17 08:50:52 +00:00
Shadooow 79bd483fe4 allowed mouse wheel to work in map screen message log area 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9165 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-10 20:53:57 +00:00
Shadooow ac3d9a9ec8 fixed loading games via main menu->preferences->load game not loading them correctly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9164 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-06 07:43:04 +00:00
Sevenfm 418cf24039 misc fixes (by rftr): 
- cleaned up warnings in Rebel Command.cpp
- ARC: Draft directive is hidden if volunteer pool option is disabled
- fixed dropdown menu behaviour at the RIS website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9163 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-03 05:15:54 +00:00
Wanne 7a14a167fb Updated Chinese Text files (by kmoi) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9162 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-02 19:14:51 +00:00
Sevenfm b7adaf802a Small arc update (by rftr): 
- 2 new directives
- 3 new admin actions
- arc website dropdown fix
- one admin action per region can now be changed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9161 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-09-01 16:48:13 +00:00
Sevenfm 67c04dd44b Fixes: issue with combining filters for LOBOT (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9160 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-08-29 16:47:25 +00:00
Sevenfm 7f5a06bb93 Fix the 'between' operator as well as 'greater than' and 'less than' comparisons for LOBOT filters (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9159 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-08-28 21:09:51 +00:00
Flugente a93e9b4a9c Added helper functions to easier determine gun stats 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9158 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-08-27 20:48:19 +00:00
Sevenfm 99142603cb Added timer fix suggested by Terapevt to avoid incorrect signed/unsigned comparison later. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9157 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-08-27 18:35:15 +00:00
Sevenfm a8c2fa6788 ADD_SMOKE_AFTER_EXPLOSION option: 
- use default item SMOKE_GRENADE (151) if it's available
- search for first smoke grenade if default item is not grenade
- check that correct smoke grenade was found

Also added new functions:
- ItemIsHandGrenade to check if item is hand grenade
- GetFirstHandGrenadeOfType to find first item which is hand grenade of selected type
- GetHandGrenadeOfType same as GetFirstHandGrenadeOfType, but first check if provided default item is hand grenade of needed type

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9156 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-08-27 17:30:27 +00:00