Print a warning if a riot shield is destroyed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8437 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-08-01 17:35:34 +00:00
parent a7bb8b9fe9
commit de22a5f9ab
11 changed files with 17 additions and 6 deletions
+1 -1
View File
@@ -2584,7 +2584,7 @@ void DamageRiotShield( SOLDIERTYPE* pSoldier, INT32& rsDamage, INT32& rsSecondar
UINT16 shieldstrength = Item[pObj->usItem].usRiotShieldStrength; UINT16 shieldstrength = Item[pObj->usItem].usRiotShieldStrength;
UINT16 damagetoshield = 2 * damage_original / shieldstrength; UINT16 damagetoshield = 1.5f * damage_original / shieldstrength;
pSoldier->RiotShieldTakeDamage( damagetoshield ); pSoldier->RiotShieldTakeDamage( damagetoshield );
+7 -5
View File
@@ -19325,12 +19325,14 @@ void SOLDIERTYPE::DestroyEquippedRiotShield( )
// Delete object // Delete object
DeleteObj( pObj ); DeleteObj( pObj );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_SHIELD_DESTROYED], this->GetName( ) );
// dirty interface panel
DirtyMercPanelInterface( this, DIRTYLEVEL2 );
this->DoMercBattleSound( BATTLE_SOUND_CURSE1 );
} }
// dirty interface panel
DirtyMercPanelInterface( this, DIRTYLEVEL2 );
this->DoMercBattleSound( BATTLE_SOUND_CURSE1 );
} }
void SOLDIERTYPE::RiotShieldTakeDamage( INT32 sDamage ) void SOLDIERTYPE::RiotShieldTakeDamage( INT32 sDamage )
+1
View File
@@ -2510,6 +2510,7 @@ enum
MSG113_WORKING_RADIO_SET, MSG113_WORKING_RADIO_SET,
MSG113_BINOCULAR, MSG113_BINOCULAR,
MSG113_PATIENCE, MSG113_PATIENCE,
MSG113_SHIELD_DESTROYED,
TEXT_NUM_MSG113, TEXT_NUM_MSG113,
}; };
+1
View File
@@ -7396,6 +7396,7 @@ STR16 New113Message[] =
L"正在工作的无线电设备。", L"正在工作的无线电设备。",
L"望远镜", L"望远镜",
L"病人", L"病人",
L"%s's shield has been destroyed!", // TODO.Translate
}; };
STR16 New113HAMMessage[] = STR16 New113HAMMessage[] =
+1
View File
@@ -7409,6 +7409,7 @@ STR16 New113Message[] =
L"a working radio set", L"a working radio set",
L"a binocular", L"a binocular",
L"patience", L"patience",
L"%s's shield has been destroyed!", // TODO.Translate
}; };
// TODO.Translate // TODO.Translate
+1
View File
@@ -7394,6 +7394,7 @@ STR16 New113Message[] =
L"a working radio set", L"a working radio set",
L"a binocular", L"a binocular",
L"patience", L"patience",
L"%s's shield has been destroyed!",
}; };
STR16 New113HAMMessage[] = STR16 New113HAMMessage[] =
+1
View File
@@ -7406,6 +7406,7 @@ STR16 New113Message[] =
L"une radio", L"une radio",
L"des jumelles", L"des jumelles",
L"de la patience", L"de la patience",
L"%s's shield has been destroyed!", // TODO.Translate
}; };
STR16 New113HAMMessage[] = STR16 New113HAMMessage[] =
+1
View File
@@ -7233,6 +7233,7 @@ STR16 New113Message[] =
L"a working radio set", L"a working radio set",
L"a binocular", L"a binocular",
L"patience", L"patience",
L"%s's shield has been destroyed!", // TODO.Translate
}; };
STR16 New113HAMMessage[] = STR16 New113HAMMessage[] =
+1
View File
@@ -7400,6 +7400,7 @@ STR16 New113Message[] =
L"a working radio set", L"a working radio set",
L"a binocular", L"a binocular",
L"patience", L"patience",
L"%s's shield has been destroyed!", // TODO.Translate
}; };
// TODO.Translate // TODO.Translate
+1
View File
@@ -7409,6 +7409,7 @@ STR16 New113Message[] =
L"a working radio set", L"a working radio set",
L"a binocular", L"a binocular",
L"patience", L"patience",
L"%s's shield has been destroyed!", // TODO.Translate
}; };
STR16 New113HAMMessage[] = STR16 New113HAMMessage[] =
+1
View File
@@ -7398,6 +7398,7 @@ STR16 New113Message[] =
L"работающая радиостанция", L"работающая радиостанция",
L"бинокль", L"бинокль",
L"терпение", L"терпение",
L"%s's shield has been destroyed!", // TODO.Translate
}; };
STR16 New113HAMMessage[] = STR16 New113HAMMessage[] =