1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

New trait bonus for Ranger

Browse Source 
FIRING_SPEED_BONUS_SHOTGUNS will reduce the APs needed to fire shotguns. Default is 10 (percent).


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6429 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2013-09-22 18:25:57 +00:00
parent f3a36ee7c6
commit 810df5bce0
12 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/IMP Skill Trait.cpp
+11 -6
View File
@@ -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;
Laptop/personnel.cpp
+11 -6
View File
@@ -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;
Tactical/Points.cpp
+5
View File
@@ -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);
}
}
/////////////////////////////////////////////////////////////////////////////////////
}
Utils/_Ja25ChineseText.cpp
+1
View File
@@ -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",
Utils/_Ja25DutchText.cpp
+1
View File
@@ -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",
Utils/_Ja25EnglishText.cpp
+1
View File
@@ -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",
Utils/_Ja25FrenchText.cpp
+1
View File
@@ -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",
Utils/_Ja25GermanText.cpp
+2 -1
View File
@@ -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",
Utils/_Ja25ItalianText.cpp
+1
View File
@@ -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",
Utils/_Ja25PolishText.cpp
+1
View File
@@ -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",
Utils/_Ja25RussianText.cpp
+1
View File
@@ -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", //меньше тратит сил
Utils/_Ja25TaiwaneseText.cpp
+1
View File
@@ -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",