1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Little Alien

Browse Source 
- Added additional damage multiplier to explosives/melee/guns




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@79 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2006-05-25 10:42:56 +00:00
parent 7fcf6e7cb5
commit 7929d945f6
6 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+5
View File
@@ -386,6 +386,11 @@ void LoadGameExternalOptions()
gGameExternalOptions.ubGameProgressStartMadlabQuest = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_START_MADLAB_QUEST",35); gGameExternalOptions.ubGameProgressStartMadlabQuest = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_START_MADLAB_QUEST",35);
gGameExternalOptions.ubGameProgressMikeAvailable = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_MIKE_AVALIABLE",50); gGameExternalOptions.ubGameProgressMikeAvailable = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_MIKE_AVALIABLE",50);
gGameExternalOptions.ubGameProgressIggyAvaliable = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_IGGY_AVALIABLE",70); gGameExternalOptions.ubGameProgressIggyAvaliable = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_IGGY_AVALIABLE",70);
gGameExternalOptions.ubExplosivesDamageMultiplier = iniReader.ReadInteger("JA2 Gameplay Settings","EXPLOSIVES_DAMAGE_MULTIPLIER",1);
gGameExternalOptions.ubMeleeDamageMultiplier = iniReader.ReadInteger("JA2 Gameplay Settings","MELEE_DAMAGE_MULTIPLIER",1);
gGameExternalOptions.ubGunDamageMultiplier = iniReader.ReadInteger("JA2 Gameplay Settings","GUN_DAMAGE_MULTIPLIER",1);
} }
GameSettings.h
+3
View File
@@ -231,6 +231,9 @@ typedef struct
UINT8 ubGameProgressStartMadlabQuest; UINT8 ubGameProgressStartMadlabQuest;
UINT8 ubGameProgressMikeAvailable; UINT8 ubGameProgressMikeAvailable;
UINT8 ubGameProgressIggyAvaliable; UINT8 ubGameProgressIggyAvaliable;
UINT8 ubExplosivesDamageMultiplier;
UINT8 ubGunDamageMultiplier;
UINT8 ubMeleeDamageMultiplier;
} GAME_EXTERNAL_OPTIONS; } GAME_EXTERNAL_OPTIONS;
GameVersion.cpp
+2 -2
View File
@@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else #else
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.78 2006.05.23" }; INT16 zVersionLabel[256] = { L"Release v1.13.79 2006.05.25" };
#endif #endif
INT8 czVersionNumber[16] = { "Build 06.05.21" }; INT8 czVersionNumber[16] = { "Build 06.05.25" };
INT16 zTrackingNumber[16] = { L"Z" }; INT16 zTrackingNumber[16] = { L"Z" };
JA2.vcproj
+2 -2
View File
@@ -43,7 +43,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib" AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.78_2006_05_23.exe" OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.79_2006_05_25.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\" AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib" AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.78_2006_05_23.exe" OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.79_2006_05_25.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\" AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
Tactical/Weapons.cpp
+12 -4
View File
@@ -5460,12 +5460,20 @@ UINT8 GetDamage ( OBJECTTYPE *pObj )
{ {
// DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("GetDamage")); // DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("GetDamage"));
if ( Item[pObj->usItem].usItemClass == IC_BLADE || Item[pObj->usItem].usItemClass == IC_PUNCH || Item[pObj->usItem].usItemClass == IC_TENTACLES ) if ( Item[pObj->usItem].usItemClass == IC_BLADE || Item[pObj->usItem].usItemClass == IC_PUNCH || Item[pObj->usItem].usItemClass == IC_TENTACLES )
return min(255,Weapon[ pObj->usItem ].ubImpact + GetMeleeDamageBonus(pObj)); {
UINT8 ubDamage = Weapon[ pObj->usItem ].ubImpact + GetMeleeDamageBonus(pObj);
return min(255, (UINT8)( (ubDamage) + ( (double)ubDamage / 100) * gGameExternalOptions.ubMeleeDamageMultiplier ) );
}
else else
return min(255,Weapon[ pObj->usItem ].ubImpact + GetDamageBonus(pObj)); {
UINT8 ubDamage = Weapon[ pObj->usItem ].ubImpact + GetDamageBonus(pObj);
return min(255, (UINT8)( (ubDamage) + ( (double)ubDamage / 100) * gGameExternalOptions.ubGunDamageMultiplier ) );
}
} }
UINT8 GetShotsPerBurst( OBJECTTYPE *pObj ) UINT8 GetShotsPerBurst( OBJECTTYPE *pObj )
{ {
// DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("GetShotsPerBurst")); // DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("GetShotsPerBurst"));
TileEngine/Explosion Control.cpp
+5
View File
@@ -1575,9 +1575,14 @@ BOOLEAN ExpAffect( INT16 sBombGridNo, INT16 sGridNo, UINT32 uiDist, UINT16 usIte
// Calculate wound amount // Calculate wound amount
sWoundAmt = pExplosive->ubDamage + (INT16) ( (pExplosive->ubDamage * uiRoll) / 100 ); sWoundAmt = pExplosive->ubDamage + (INT16) ( (pExplosive->ubDamage * uiRoll) / 100 );
sWoundAmt = min(255, (UINT16)( (sWoundAmt) + ( (double)sWoundAmt / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier ) ); //lal
// Calculate breath amount ( if stun damage applicable ) // Calculate breath amount ( if stun damage applicable )
sBreathAmt = ( pExplosive->ubStunDamage * 100 ) + (INT16) ( ( ( pExplosive->ubStunDamage / 2 ) * 100 * uiRoll ) / 100 ) ; sBreathAmt = ( pExplosive->ubStunDamage * 100 ) + (INT16) ( ( ( pExplosive->ubStunDamage / 2 ) * 100 * uiRoll ) / 100 ) ;
sBreathAmt = min(255, (UINT16)( (sBreathAmt) + ( (double)sBreathAmt / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier ) ); //lal
// ATE: Make sure guys get pissed at us! // ATE: Make sure guys get pissed at us!
HandleBuldingDestruction( sGridNo ,ubOwner ); HandleBuldingDestruction( sGridNo ,ubOwner );