diff --git a/Tactical/LOS.cpp b/Tactical/LOS.cpp index 964a841cb..9ca951564 100644 --- a/Tactical/LOS.cpp +++ b/Tactical/LOS.cpp @@ -2584,7 +2584,7 @@ void DamageRiotShield( SOLDIERTYPE* pSoldier, INT32& rsDamage, INT32& rsSecondar UINT16 shieldstrength = Item[pObj->usItem].usRiotShieldStrength; - UINT16 damagetoshield = 2 * damage_original / shieldstrength; + UINT16 damagetoshield = 1.5f * damage_original / shieldstrength; pSoldier->RiotShieldTakeDamage( damagetoshield ); diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 31ce8e619..e9ae32629 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -19325,12 +19325,14 @@ void SOLDIERTYPE::DestroyEquippedRiotShield( ) // Delete object 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 ) diff --git a/Utils/Text.h b/Utils/Text.h index d74cfc1b3..5613557ca 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -2510,6 +2510,7 @@ enum MSG113_WORKING_RADIO_SET, MSG113_BINOCULAR, MSG113_PATIENCE, + MSG113_SHIELD_DESTROYED, TEXT_NUM_MSG113, }; diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index bfe29ea51..b7cb65edf 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -7396,6 +7396,7 @@ STR16 New113Message[] = L"正在工作的无线电设备。", L"望远镜", L"病人", + L"%s's shield has been destroyed!", // TODO.Translate }; STR16 New113HAMMessage[] = diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index df59f632d..27d3598c1 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -7409,6 +7409,7 @@ STR16 New113Message[] = L"a working radio set", L"a binocular", L"patience", + L"%s's shield has been destroyed!", // TODO.Translate }; // TODO.Translate diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 6502fc4a5..35d051200 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -7394,6 +7394,7 @@ STR16 New113Message[] = L"a working radio set", L"a binocular", L"patience", + L"%s's shield has been destroyed!", }; STR16 New113HAMMessage[] = diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index fe2fe475a..75847802f 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -7406,6 +7406,7 @@ STR16 New113Message[] = L"une radio", L"des jumelles", L"de la patience", + L"%s's shield has been destroyed!", // TODO.Translate }; STR16 New113HAMMessage[] = diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 1c9dd042d..e39818f56 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -7233,6 +7233,7 @@ STR16 New113Message[] = L"a working radio set", L"a binocular", L"patience", + L"%s's shield has been destroyed!", // TODO.Translate }; STR16 New113HAMMessage[] = diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 13cdbb8d8..54bf2b115 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -7400,6 +7400,7 @@ STR16 New113Message[] = L"a working radio set", L"a binocular", L"patience", + L"%s's shield has been destroyed!", // TODO.Translate }; // TODO.Translate diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index fac7f9ae7..0cfbe5246 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -7409,6 +7409,7 @@ STR16 New113Message[] = L"a working radio set", L"a binocular", L"patience", + L"%s's shield has been destroyed!", // TODO.Translate }; STR16 New113HAMMessage[] = diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index ab1a149a7..e8c368a95 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -7398,6 +7398,7 @@ STR16 New113Message[] = L"работающая радиостанция", L"бинокль", L"терпение", + L"%s's shield has been destroyed!", // TODO.Translate }; STR16 New113HAMMessage[] =