diff --git a/Laptop/IMP Skill Trait.cpp b/Laptop/IMP Skill Trait.cpp index 59e30fd7..62216082 100644 --- a/Laptop/IMP Skill Trait.cpp +++ b/Laptop/IMP Skill Trait.cpp @@ -1984,34 +1984,39 @@ void AssignSkillTraitHelpText( UINT8 ubTraitNumber, BOOLEAN fExpertLevel ) swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[2], ( gSkillTraitValues.ubRAPumpShotgunsAPsReduction * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } + if( gSkillTraitValues.ubRAFiringSpeedBonusShotguns != 0 ) + { + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[3], ( gSkillTraitValues.ubRAFiringSpeedBonusShotguns * (fExpertLevel ? 2 : 1)), L"%"); + wcscat( apStr, atStr ); + } if( gSkillTraitValues.ubRAGroupTimeSpentForTravellingFoot != 0 ) { - swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[3], ( gSkillTraitValues.ubRAGroupTimeSpentForTravellingFoot * (fExpertLevel ? 2 : 1)), L"%"); + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[4], ( gSkillTraitValues.ubRAGroupTimeSpentForTravellingFoot * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } if( gSkillTraitValues.ubRAGroupTimeSpentForTravellingVehicle != 0 ) { - swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[4], ( gSkillTraitValues.ubRAGroupTimeSpentForTravellingVehicle * (fExpertLevel ? 2 : 1)), L"%"); + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[5], ( gSkillTraitValues.ubRAGroupTimeSpentForTravellingVehicle * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } if( gSkillTraitValues.ubRABreathForTravellingReduction != 0 ) { - swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[5], ( gSkillTraitValues.ubRABreathForTravellingReduction * (fExpertLevel ? 2 : 1)), L"%"); + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[6], ( gSkillTraitValues.ubRABreathForTravellingReduction * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } if( gSkillTraitValues.ubRAWeatherPenaltiesReduction != 0 ) { - swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[6], ( gSkillTraitValues.ubRAWeatherPenaltiesReduction * (fExpertLevel ? 2 : 1)), L"%"); + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[7], ( gSkillTraitValues.ubRAWeatherPenaltiesReduction * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } // if( gSkillTraitValues.ubRACamoEffectivenessBonus != 0 ) // { - // swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[7], ( gSkillTraitValues.ubRACamoEffectivenessBonus * (fExpertLevel ? 2 : 1)), L"%"); + // swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[8], ( gSkillTraitValues.ubRACamoEffectivenessBonus * (fExpertLevel ? 2 : 1)), L"%"); // wcscat( apStr, atStr ); // } if( gSkillTraitValues.ubRACamoWornountSpeedReduction != 0 ) { - swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[8], ( gSkillTraitValues.ubRACamoWornountSpeedReduction * (fExpertLevel ? 2 : 1)), L"%"); + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[9], ( gSkillTraitValues.ubRACamoWornountSpeedReduction * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } break; diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp index 54a5e1e2..e7e3ec31 100644 --- a/Laptop/personnel.cpp +++ b/Laptop/personnel.cpp @@ -7242,34 +7242,39 @@ void AssignPersonnelSkillTraitHelpText( UINT8 ubTraitNumber, BOOLEAN fExpertLeve swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[2], ( gSkillTraitValues.ubRAPumpShotgunsAPsReduction * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } + if( gSkillTraitValues.ubRAFiringSpeedBonusShotguns != 0 ) + { + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[3], ( gSkillTraitValues.ubRAFiringSpeedBonusShotguns * (fExpertLevel ? 2 : 1)), L"%"); + wcscat( apStr, atStr ); + } if( gSkillTraitValues.ubRAGroupTimeSpentForTravellingFoot != 0 ) { - swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[3], ( gSkillTraitValues.ubRAGroupTimeSpentForTravellingFoot * (fExpertLevel ? 2 : 1)), L"%"); + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[4], ( gSkillTraitValues.ubRAGroupTimeSpentForTravellingFoot * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } if( gSkillTraitValues.ubRAGroupTimeSpentForTravellingVehicle != 0 ) { - swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[4], ( gSkillTraitValues.ubRAGroupTimeSpentForTravellingVehicle * (fExpertLevel ? 2 : 1)), L"%"); + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[5], ( gSkillTraitValues.ubRAGroupTimeSpentForTravellingVehicle * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } if( gSkillTraitValues.ubRABreathForTravellingReduction != 0 ) { - swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[5], ( gSkillTraitValues.ubRABreathForTravellingReduction * (fExpertLevel ? 2 : 1)), L"%"); + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[6], ( gSkillTraitValues.ubRABreathForTravellingReduction * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } if( gSkillTraitValues.ubRAWeatherPenaltiesReduction != 0 ) { - swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[6], ( gSkillTraitValues.ubRAWeatherPenaltiesReduction * (fExpertLevel ? 2 : 1)), L"%"); + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[7], ( gSkillTraitValues.ubRAWeatherPenaltiesReduction * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } //if( gSkillTraitValues.ubRACamoEffectivenessBonus != 0 ) //{ - // swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[7], ( gSkillTraitValues.ubRACamoEffectivenessBonus * (fExpertLevel ? 2 : 1)), L"%"); + // swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[8], ( gSkillTraitValues.ubRACamoEffectivenessBonus * (fExpertLevel ? 2 : 1)), L"%"); // wcscat( apStr, atStr ); //} if( gSkillTraitValues.ubRACamoWornountSpeedReduction != 0 ) { - swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[8], ( gSkillTraitValues.ubRACamoWornountSpeedReduction * (fExpertLevel ? 2 : 1)), L"%"); + swprintf( atStr, gzIMPMajorTraitsHelpTextsRanger[9], ( gSkillTraitValues.ubRACamoWornountSpeedReduction * (fExpertLevel ? 2 : 1)), L"%"); wcscat( apStr, atStr ); } break; diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp index 2d56ace2..79492b00 100644 --- a/Tactical/Points.cpp +++ b/Tactical/Points.cpp @@ -2300,6 +2300,11 @@ INT16 MinAPsToShootOrStab(SOLDIERTYPE *pSoldier, INT32 sGridNo, INT16 bAimTime, { bAPCost = (INT16)((bAPCost * (100 - gSkillTraitValues.ubGSFiringSpeedBonusPistols * NUM_SKILL_TRAITS( pSoldier, GUNSLINGER_NT ) ) / 100)+ 0.5); } + // Decrease APs needed for Shotguns - Ranger + else if (Weapon[ usUBItem ].ubWeaponType == GUN_SHOTGUN && HAS_SKILL_TRAIT( pSoldier, RANGER_NT ) ) + { + bAPCost = (INT16)((bAPCost * (100 - gSkillTraitValues.ubRAFiringSpeedBonusShotguns * NUM_SKILL_TRAITS( pSoldier, RANGER_NT ) ) / 100)+ 0.5); + } } ///////////////////////////////////////////////////////////////////////////////////// } diff --git a/Utils/_Ja25ChineseText.cpp b/Utils/_Ja25ChineseText.cpp index ca4c41a7..66e7fc52 100644 --- a/Utils/_Ja25ChineseText.cpp +++ b/Utils/_Ja25ChineseText.cpp @@ -145,6 +145,7 @@ STR16 gzIMPMajorTraitsHelpTextsRanger[]= L"步枪命中率 +%d%s\n",// L"+%d%s Chance to Hit with Rifles\n", L"霰弹枪命中率 +%d%s\n",// L"+%d%s Chance to Hit with Shotguns\n", L"泵动式霰弹上膛所需行动点 -%d%s \n",// L"-%d%s APs needed to pump Shotguns\n", + L"-%d%s APs to fire Shotguns\n", //TODO.Translate L"队伍在区域间步行移动的速度 +%d%s\n",// L"+%d%s group travelling speed between sectors if traveling by foot\n", L"队伍在区域间乘车移动的速度 +%d%s\n",// L"+%d%s group travelling speed between sectors if traveling in vehicle (except helicopter)\n", L"区域间移动时体力消耗 -%d%s\n",// L"-%d%s less energy spent for travelling between sectors\n", diff --git a/Utils/_Ja25DutchText.cpp b/Utils/_Ja25DutchText.cpp index c8a427d0..2e916636 100644 --- a/Utils/_Ja25DutchText.cpp +++ b/Utils/_Ja25DutchText.cpp @@ -145,6 +145,7 @@ STR16 gzIMPMajorTraitsHelpTextsRanger[]= L"+%d%s CtH with Rifles\n", L"+%d%s CtH with Shotguns\n", L"-%d%s APs needed to pump Shotguns\n", + L"-%d%s APs to fire Shotguns\n", L"+%d%s group traveling speed between sectors if traveling by foot\n", L"+%d%s group traveling speed between sectors if traveling in vehicle (except helicopter)\n", L"-%d%s less energy spent for travelling between sectors\n", diff --git a/Utils/_Ja25EnglishText.cpp b/Utils/_Ja25EnglishText.cpp index 31e7b922..23efe0dd 100644 --- a/Utils/_Ja25EnglishText.cpp +++ b/Utils/_Ja25EnglishText.cpp @@ -145,6 +145,7 @@ STR16 gzIMPMajorTraitsHelpTextsRanger[]= L"+%d%s CtH with Rifles\n", L"+%d%s CtH with Shotguns\n", L"-%d%s APs needed to pump Shotguns\n", + L"-%d%s APs to fire Shotguns\n", L"+%d%s group traveling speed between sectors if traveling by foot\n", L"+%d%s group traveling speed between sectors if traveling in vehicle (except helicopter)\n", L"-%d%s less energy spent for travelling between sectors\n", diff --git a/Utils/_Ja25FrenchText.cpp b/Utils/_Ja25FrenchText.cpp index 0d06ac82..d57442f9 100644 --- a/Utils/_Ja25FrenchText.cpp +++ b/Utils/_Ja25FrenchText.cpp @@ -146,6 +146,7 @@ STR16 gzIMPMajorTraitsHelpTextsRanger[]= L"+%d%s de chance de toucher avec un fusil\n", L"+%d%s de chance de toucher avec un fusil à pompe\n", L"-%d%s du nombre de PA nécessaire pour recharger le fusil à pompe\n", + L"-%d%s APs to fire Shotguns\n", //TODO.Translate L"+%d%s de vitesse de déplacement du groupe entre les secteurs si ils sont à pieds\n", L"+%d%s de vitesse de déplacement du groupe entre les secteurs si ils sont dans un véhicule (excepté l'hélicopter)\n", L"-%d%s d'énergies nécessaire pour traverser les secteurs\n", diff --git a/Utils/_Ja25GermanText.cpp b/Utils/_Ja25GermanText.cpp index 14353b30..60370834 100644 --- a/Utils/_Ja25GermanText.cpp +++ b/Utils/_Ja25GermanText.cpp @@ -142,7 +142,8 @@ STR16 gzIMPMajorTraitsHelpTextsRanger[]= { L"+%d%s Trefferchance mit Gewehren\n", L"+%d%s Trefferchance mit Schrotflinten\n", - L"-%d%s APs gebraucht um Schrotflinten zu repetieren\n", + L"-%d%s APs benötigt um Schrotflinten zu repetieren\n", + L"-%d%s APs benötigt um Schrotflinten abzufeuern\n", L"+%d%s Marschgeschwindigkeit der Gruppe zwischen Sektoren zu Fuß\n", L"+%d%s Marschgeschwindigkeit der Gruppe zwischen Sektoren bei Benutzung von Fahrzeugen (außer dem Helikopter)\n", L"-%d%s weniger Energieverlust beim Reisen zwischen Sektoren\n", diff --git a/Utils/_Ja25ItalianText.cpp b/Utils/_Ja25ItalianText.cpp index 5c55460a..e27b1e99 100644 --- a/Utils/_Ja25ItalianText.cpp +++ b/Utils/_Ja25ItalianText.cpp @@ -143,6 +143,7 @@ STR16 gzIMPMajorTraitsHelpTextsRanger[]= L"+%d%s CtH with Rifles\n", L"+%d%s CtH with Shotguns\n", L"-%d%s APs needed to pump Shotguns\n", + L"-%d%s APs to fire Shotguns\n", L"+%d%s group traveling speed between sectors if traveling by foot\n", L"+%d%s group traveling speed between sectors if traveling in vehicle (except helicopter)\n", L"-%d%s less energy spent for travelling between sectors\n", diff --git a/Utils/_Ja25PolishText.cpp b/Utils/_Ja25PolishText.cpp index b2f8e1a0..7fdb5859 100644 --- a/Utils/_Ja25PolishText.cpp +++ b/Utils/_Ja25PolishText.cpp @@ -145,6 +145,7 @@ STR16 gzIMPMajorTraitsHelpTextsRanger[]= L"+%d%s CtH with Rifles\n", L"+%d%s CtH with Shotguns\n", L"-%d%s APs needed to pump Shotguns\n", + L"-%d%s APs to fire Shotguns\n", L"+%d%s group traveling speed between sectors if traveling by foot\n", L"+%d%s group traveling speed between sectors if traveling in vehicle (except helicopter)\n", L"-%d%s less energy spent for travelling between sectors\n", diff --git a/Utils/_Ja25RussianText.cpp b/Utils/_Ja25RussianText.cpp index 40e5b647..09c0eab5 100644 --- a/Utils/_Ja25RussianText.cpp +++ b/Utils/_Ja25RussianText.cpp @@ -145,6 +145,7 @@ STR16 gzIMPMajorTraitsHelpTextsRanger[]= L"+%d%s к шансу поразить из винтовки\n", L"+%d%s к шансу поразить из ружья\n", L"-%d%s ОД на перезарядку ружья\n", + L"-%d%s APs to fire Shotguns\n", //TODO.Translate L"+%d%s к скорости передвижения группы между секторами, если идти пешком\n", L"+%d%s к скорости передвижения группы между секторами, \nесли передвигаться на транспорте (в особенности на вертолёте)\n", L"-%d%s к затрате энергии при переходе между секторами\n", //меньше тратит сил diff --git a/Utils/_Ja25TaiwaneseText.cpp b/Utils/_Ja25TaiwaneseText.cpp index bae57906..01a363ab 100644 --- a/Utils/_Ja25TaiwaneseText.cpp +++ b/Utils/_Ja25TaiwaneseText.cpp @@ -146,6 +146,7 @@ STR16 gzIMPMajorTraitsHelpTextsRanger[]= L"+%d%s CtH with Rifles\n", L"+%d%s CtH with Shotguns\n", L"-%d%s APs needed to pump Shotguns\n", + L"-%d%s APs to fire Shotguns\n", L"+%d%s group traveling speed between sectors if traveling by foot\n", L"+%d%s group traveling speed between sectors if traveling in vehicle (except helicopter)\n", L"-%d%s less energy spent for travelling between sectors\n",