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

- Updated cover system (by CptMoore)

Browse Source 
o New settings:

* New settings *

gGameExternalOptions.ubStanceEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "STANCE_EFFECTIVENESS", 10, 0, 100);
How much the stance influences the view range reduction. Prone will give you 10% (default) view reduction / cover.

gGameExternalOptions.ubLBEEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "LBE_EFFECTIVENESS", 50, 0, 100);
Dual welding the longest sniper rifles with full attachements, having a third backup sniper rifle, one combat pack and one backpack will give a 50% (default) sight penalty with the default settings.

* Removed settings *

gGameExternalOptions.fMovementSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "MOVEMENT_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fStanceSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "STANCE_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fLBESightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "LBE_SIGHT_ADJUSTMENT", TRUE); 



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-10-23 07:42:17 +00:00
parent 1e036ea548
commit a94cfc2492
3 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+8 -12
View File
@@ -736,16 +736,14 @@ void LoadGameExternalOptions()
gGameExternalOptions.fQuietRealTimeSneak = iniReader.ReadBoolean("JA2 Tactical Settings","QUIET_REAL_TIME_SNEAK", FALSE);
// CPT: Cover System Settings
gGameExternalOptions.ubStealthTraitCoverValue = iniReader.ReadInteger("JA2 Tactical Settings","STEALTH_TRAIT_COVER_VALUE", 15, 0, 100);
gGameExternalOptions.ubStealthEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "STEALTH_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubTreeCoverEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings","TREE_COVER_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubCamouflageEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "CAMOUFLAGE_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubCoverDisplayUpdateWait = iniReader.ReadInteger("JA2 Tactical Settings", "COVER_DISPLAY_UPDATE_WAIT", 500, -1, 10000);
gGameExternalOptions.fMovementSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "MOVEMENT_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fStanceSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "STANCE_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fLBESightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "LBE_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.ubStealthTraitCoverValue = iniReader.ReadInteger("JA2 Tactical Settings", "STEALTH_TRAIT_COVER_VALUE", 15, 0, 100);
gGameExternalOptions.ubStealthEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "STEALTH_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubTreeCoverEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "TREE_COVER_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubCamouflageEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "CAMOUFLAGE_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubStanceEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "STANCE_EFFECTIVENESS", 10, 0, 100);
gGameExternalOptions.ubLBEEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "LBE_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubMovementEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "MOVEMENT_EFFECTIVENESS", 50, 0, 100);
gGameExternalOptions.ubCoverDisplayUpdateWait = iniReader.ReadInteger("JA2 Tactical Settings", "COVER_DISPLAY_UPDATE_WAIT", 500, -1, 10000);
//################# Rain Settings ##################
@@ -1017,8 +1015,6 @@ void LoadGameExternalOptions()
// HEADROCK HAM B2.4
gGameExternalOptions.iMineIncomePercentage = iniReader.ReadInteger("JA2 HAM Settings","MINE_INCOME_PERCENTAGE", 100, 1, 1000);
// HEADROCK HAM B1: Set minimum and maximum CTH
gGameExternalOptions.iMaximumCTH = iniReader.ReadInteger("JA2 HAM Settings","MAXIMUM_POSSIBLE_CTH",99);
GameSettings.h
+3 -4
View File
@@ -512,12 +512,11 @@ BOOLEAN gbBulletTracer;
UINT8 ubStealthEffectiveness;
UINT8 ubTreeCoverEffectiveness;
UINT8 ubCamouflageEffectiveness;
UINT8 ubStanceEffectiveness;
UINT8 ubLBEEffectiveness;
UINT8 ubMovementEffectiveness;
UINT8 ubCoverDisplayUpdateWait;
BOOLEAN fMovementSightAdjustment;
BOOLEAN fStanceSightAdjustment;
BOOLEAN fLBESightAdjustment;
// HEADROCK HAM B1: Global modifier for mine income (0 is automatically turned to 1 to avoid divide-by-zero.)
INT16 iMineIncomePercentage;
Tactical/LOS.cpp
+40 -21
View File
@@ -43,6 +43,7 @@
#include "Text.h"
#include "Quests.h"
#include "items.h"
#include "Item Types.h"
#endif
#include "fresh_header.h"
#include "test_space.h"
@@ -503,11 +504,9 @@ INT8 GetSightAdjustmentCamouflageOnTerrain( SOLDIERTYPE* pSoldier, const UINT8&
return 0;
}
// current implementation will assume the return will be below 0 and then scale it depending on your stance
INT8 scaler = -(ANIM_STAND - ubStance) * 5; // stand = 0%, crouch = 6-3 = 30%, prone = 6-1 = 50;
INT8 scaler = -(ANIM_STAND+1 - ubStance); // stand = 7-6 => 10%, crouch = 7-3 => 66%, prone = 7-1 => 100%;
// last term corresponds to the maximum of scaler before
scaler *= gGameExternalOptions.ubCamouflageEffectiveness / 50;
scaler = gGameExternalOptions.ubCamouflageEffectiveness * scaler / 6;
switch(ubTerrainType) {
case LOW_GRASS:
@@ -539,7 +538,7 @@ INT8 GetSightAdjustmentCamouflageOnTerrain( SOLDIERTYPE* pSoldier, const UINT8&
*/
INT8 GetSightAdjustmentThroughMovement( SOLDIERTYPE* pSoldier, const INT8& bTilesMoved, const UINT8& ubLightlevel )
{
if (!gGameExternalOptions.fMovementSightAdjustment) {
if (gGameExternalOptions.ubMovementEffectiveness == 0) {
return 0;
}
@@ -550,26 +549,21 @@ INT8 GetSightAdjustmentThroughMovement( SOLDIERTYPE* pSoldier, const INT8& bTile
UINT8 ubBrightness = SHADE_MIN - ubLightlevel; // 3: starlight, 5: evening dark, 15: day
UINT8 ubScalerInPercent = 6 * ubBrightness; //0:0, 15:90
return bMovementAdjustment * ubScalerInPercent / 100;
return bMovementAdjustment * ubScalerInPercent / 100 * gGameExternalOptions.ubMovementEffectiveness / 100;
}
INT8 GetSightAdjustmentThroughStance( const UINT8& ubStance )
{
if (!gGameExternalOptions.fStanceSightAdjustment) {
if (gGameExternalOptions.ubStanceEffectiveness == 0) {
return 0;
}
// well why do we have a positive number here?
// just because I wanted to have logic which goes both directions
INT8 bStanceAdjustment = (ubStance - 3) * 2; // stand = 15%, crouch = 0%, prone = -10%
INT8 bStanceAdjustment = -(ANIM_STAND - ubStance) * 20; // stand = 6-6 => 0%, crouch = 6-3 => 60%, prone = 6-1 => 100%;
return bStanceAdjustment;
return gGameExternalOptions.ubStanceEffectiveness * bStanceAdjustment / 100;
}
/**
* TODO: Figure out how to find out your equipment cost. Big equipment will make you more visible! we could go after the load itself (kg)
* TODO: but we still want a backpack to count more than your vest
*
* Calculates a percentage value to be added (or substracted) from sight. it's based on the amount of LBE.
*
* @param pSoldier the target
@@ -577,16 +571,41 @@ INT8 GetSightAdjustmentThroughStance( const UINT8& ubStance )
*/
INT8 GetSightAdjustmentBasedOnLBE( SOLDIERTYPE* pSoldier )
{
if (!gGameExternalOptions.fLBESightAdjustment) {
if (gGameExternalOptions.ubLBEEffectiveness == 0) {
return 0;
}
// ....
//if(UsingNewInventorySystem() == true && pSoldier->inv[BPACKPOCKPOS].exists() == true) {
//pSoldier->inv[BPACKPOCKPOS]
//CalculateObjectWeight
//}
return 0;
UINT8 ubScale = 0;
if(UsingNewInventorySystem() == true)
{
if (pSoldier->inv[HANDPOS].exists())
{
ubScale += min( 10, CalculateItemSize( &pSoldier->inv[HANDPOS] ) );
}
if (pSoldier->inv[SECONDHANDPOS].exists())
{
ubScale += max( 0, min( 10, CalculateItemSize( &pSoldier->inv[SECONDHANDPOS] ) ) - 5 );
}
if (pSoldier->inv[CPACKPOCKPOS].exists())
{
ubScale += 5;
}
if (pSoldier->inv[BPACKPOCKPOS].exists())
{
ubScale += 15;
}
if (pSoldier->inv[GUNSLINGPOCKPOS].exists())
{
ubScale += max( 0, min( 10, CalculateItemSize( &pSoldier->inv[GUNSLINGPOCKPOS] ) ) - 5 );
}
}
return gGameExternalOptions.ubLBEEffectiveness * ubScale / 50;
}
/**