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

- fixed explosion/stun damage multiplier

Browse Source 
- enabled strategic event NPC_ACTION_SEND_SOLDIERS_TO_BATTLE_LOCATION


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@273 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2006-06-20 16:42:32 +00:00
parent d9f049de49
commit 99a0c3db6f
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else #else
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.262" }; INT16 zVersionLabel[256] = { L"Release v1.13.273" };
#endif #endif
Strategic/Meanwhile.cpp
+2 -1
View File
@@ -681,7 +681,8 @@ void ProcessImplicationsOfMeanwhile( void )
{ //Wake up the queen earlier to punish the good players! { //Wake up the queen earlier to punish the good players!
ExecuteStrategicAIAction( STRATEGIC_AI_ACTION_WAKE_QUEEN, 0, 0 ); ExecuteStrategicAIAction( STRATEGIC_AI_ACTION_WAKE_QUEEN, 0, 0 );
} }
HandleNPCDoAction( QUEEN, NPC_ACTION_SEND_SOLDIERS_TO_BATTLE_LOCATION, 0 ); //HandleNPCDoAction( QUEEN, NPC_ACTION_SEND_SOLDIERS_TO_BATTLE_LOCATION, 0 );
ExecuteStrategicAIAction( NPC_ACTION_SEND_SOLDIERS_TO_BATTLE_LOCATION, 0, 0 );
break; break;
case CAMBRIA_LIBERATED: case CAMBRIA_LIBERATED:
case ALMA_LIBERATED: case ALMA_LIBERATED:
Strategic/Strategic AI.cpp
-1
View File
@@ -4054,7 +4054,6 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
case NPC_ACTION_SEND_SOLDIERS_TO_BATTLE_LOCATION: case NPC_ACTION_SEND_SOLDIERS_TO_BATTLE_LOCATION:
//Send 4, 8, or 12 troops (based on difficulty) to the location of the first battle. If nobody is there when they arrive, //Send 4, 8, or 12 troops (based on difficulty) to the location of the first battle. If nobody is there when they arrive,
//those troops will get reassigned. //those troops will get reassigned.
ubSectorID = (UINT8)STRATEGIC_INDEX_TO_SECTOR_INFO( sWorldSectorLocationOfFirstBattle ); ubSectorID = (UINT8)STRATEGIC_INDEX_TO_SECTOR_INFO( sWorldSectorLocationOfFirstBattle );
TileEngine/Explosion Control.cpp
+7 -9
View File
@@ -1573,19 +1573,17 @@ BOOLEAN ExpAffect( INT16 sBombGridNo, INT16 sGridNo, UINT32 uiDist, UINT16 usIte
uiRoll = PreRandom( 100 ); uiRoll = PreRandom( 100 );
// Calculate wound amount // Calculate wound amount
sWoundAmt = pExplosive->ubDamage + (INT16) ( (pExplosive->ubDamage * uiRoll) / 100 ); INT16 newDamage = pExplosive->ubDamage + (INT16)(( pExplosive->ubDamage * gGameExternalOptions.ubExplosivesDamageMultiplier) / 100) ); //lal
DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("ExpAffect: explosive dmg = %d, woundamt = %d",pExplosive->ubDamage,sWoundAmt));
sWoundAmt = newDamage + (INT16) ( (newDamage * uiRoll) / 100 );
sWoundAmt = min(255, (UINT16)( (sWoundAmt) + ( (double)sWoundAmt / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier ) ); //lal
DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("ExpAffect: explosive dmg multiplier = %d, woundamt = %d",gGameExternalOptions.ubExplosivesDamageMultiplier,sWoundAmt));
// 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 ) ; INT16 newBreath = pExplosive->ubStunDamage + (INT16)(( pExplosive->ubStunDamage * gGameExternalOptions.ubExplosivesDamageMultiplier) / 100) ); //lal
DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("ExpAffect: breath dmg = %d, breathamt = %d",pExplosive->ubStunDamage,sBreathAmt));
sBreathAmt = ( newBreath * 100 ) + (INT16) ( ( ( newBreath / 2 ) * 100 * uiRoll ) / 100 ) ;
sBreathAmt = (UINT16)( (sBreathAmt) + ( (double)sBreathAmt / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier ) ; //lal //Madd: remove 255 max, since it was making breath damage next to nothing
DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("ExpAffect: breath dmg multiplier = %d, breathamt = %d",gGameExternalOptions.ubExplosivesDamageMultiplier,sBreathAmt));
// ATE: Make sure guys get pissed at us! // ATE: Make sure guys get pissed at us!
HandleBuldingDestruction( sGridNo ,ubOwner ); HandleBuldingDestruction( sGridNo ,ubOwner );