- added AP & BP cost setting for arming bombs/grenades in inventory

- Fix: blowing up grenades in inventory now correctly costs APs
- a message now shows how many prisoners were taken

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5891 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-03-03 16:24:34 +00:00
parent fc2e10314b
commit 48c66c8662
14 changed files with 145 additions and 24 deletions
+14
View File
@@ -763,6 +763,20 @@ enum
extern STR16 szMTATextStr[];
enum
{
STR_INV_ARM_BLOWUP_AP,
STR_INV_ARM_BLOWUP,
STR_INV_ARM_ARM_AP,
STR_INV_ARM_ARM,
STR_INV_ARM_DISARM_AP,
STR_INV_ARM_DISARM,
TEXT_NUM_INV_ARM_STR
};
extern STR16 szInventoryArmTextStr[];
enum
{
AIR_RAID_TURN_STR,
+11 -1
View File
@@ -7521,7 +7521,7 @@ STR16 szPrisonerTextStr[]=
L"%d 名俘虏已供出同伙位置", //L"%d prisoners revealed enemy positions.",
L"%d 名俘虏已加入我方阵营", //L"%d prisoners joined our cause.",
L"俘虏掀起大规模暴动!在 %s 监狱!", //L"Prisoners start a massive riot in %s!",
L"俘虏被押送前往 %s 监狱", //L"Prisoners were sent to %s!",
L"%d 俘虏被押送前往 %s 监狱", //L"Prisoners were sent to %s!",
L"俘虏已被释放!", //L"Prisoners have been released!",
L"军队已占领 %s 监狱,俘虏已被释放!", //L"The army now occupies the prison in %s, the prisoners were freed!",
L"这敌人丫宁死不从!",//L"The enemy refuses to surrender!",
@@ -7538,4 +7538,14 @@ STR16 szMTATextStr[]= // TODO.Translate
L"%s had to stop %s.",
};
STR16 szInventoryArmTextStr[]= // TODO.Translate
{
L"Blow up (%d AP)",
L"Blow up",
L"Arm (%d AP)",
L"Arm",
L"Disarm (%d AP)",
L"Disarm",
};
#endif //CHINESE
+11 -1
View File
@@ -7519,7 +7519,7 @@ STR16 szPrisonerTextStr[]=
L"%d prisoners revealed enemy positions.",
L"%d prisoners joined our cause.",
L"Prisoners start a massive riot in %s!",
L"Prisoners were sent to %s!",
L"%d prisoners were sent to %s!",
L"Prisoners have been released!",
L"The army now occupies the prison in %s, the prisoners were freed!",
L"The enemy refuses to surrender!",
@@ -7536,4 +7536,14 @@ STR16 szMTATextStr[]= // TODO.Translate
L"%s had to stop %s.",
};
STR16 szInventoryArmTextStr[]= // TODO.Translate
{
L"Blow up (%d AP)",
L"Blow up",
L"Arm (%d AP)",
L"Arm",
L"Disarm (%d AP)",
L"Disarm",
};
#endif //DUTCH
+11 -1
View File
@@ -7506,7 +7506,7 @@ STR16 szPrisonerTextStr[]=
L"%d prisoners revealed enemy positions.",
L"%d prisoners joined our cause.",
L"Prisoners start a massive riot in %s!",
L"Prisoners were sent to %s!",
L"%d prisoners were sent to %s!",
L"Prisoners have been released!",
L"The army now occupies the prison in %s, the prisoners were freed!",
L"The enemy refuses to surrender!",
@@ -7523,4 +7523,14 @@ STR16 szMTATextStr[]=
L"%s had to stop %s.",
};
STR16 szInventoryArmTextStr[]=
{
L"Blow up (%d AP)",
L"Blow up",
L"Arm (%d AP)",
L"Arm",
L"Disarm (%d AP)",
L"Disarm",
};
#endif //ENGLISH
+11 -1
View File
@@ -7503,7 +7503,7 @@ STR16 szPrisonerTextStr[]=
L"%d prisoners revealed enemy positions.",
L"%d prisoners joined our cause.",
L"Prisoners start a massive riot in %s!",
L"Prisoners were sent to %s!",
L"%d prisoners were sent to %s!",
L"Prisoners have been released!",
L"The army now occupies the prison in %s, the prisoners were freed!",
L"The enemy refuses to surrender!",
@@ -7520,4 +7520,14 @@ STR16 szMTATextStr[]= // TODO.Translate
L"%s had to stop %s.",
};
STR16 szInventoryArmTextStr[]= // TODO.Translate
{
L"Blow up (%d AP)",
L"Blow up",
L"Arm (%d AP)",
L"Arm",
L"Disarm (%d AP)",
L"Disarm",
};
#endif //FRENCH
+11 -1
View File
@@ -7330,7 +7330,7 @@ STR16 szPrisonerTextStr[]=
L"%d Gefangene haben uns Truppenstandorte verraten.",
L"%d Gefangene schliessen sich uns an.",
L"Gefangenenaufstand in %s!",
L"Gefangene wurden nach %s geschickt!",
L"%d Gefangene wurden nach %s geschickt!",
L"Gefangene freigelassen!",
L"Die Armee hat das Gefängnis in %s besetzt, die Gefangenen wurden befreit!",
L"Der Gegner weigert sich aufzugeben!",
@@ -7347,4 +7347,14 @@ STR16 szMTATextStr[]=
L"%s musste %s stoppen.",
};
STR16 szInventoryArmTextStr[]= // TODO.Translate
{
L"Blow up (%d AP)",
L"Blow up",
L"Arm (%d AP)",
L"Arm",
L"Disarm (%d AP)",
L"Disarm",
};
#endif //GERMAN
+11 -1
View File
@@ -7506,7 +7506,7 @@ STR16 szPrisonerTextStr[]=
L"%d prisoners revealed enemy positions.",
L"%d prisoners joined our cause.",
L"Prisoners start a massive riot in %s!",
L"Prisoners were sent to %s!",
L"%d prisoners were sent to %s!",
L"Prisoners have been released!",
L"The army now occupies the prison in %s, the prisoners were freed!",
L"The enemy refuses to surrender!",
@@ -7523,4 +7523,14 @@ STR16 szMTATextStr[]= // TODO.Translate
L"%s had to stop %s.",
};
STR16 szInventoryArmTextStr[]= // TODO.Translate
{
L"Blow up (%d AP)",
L"Blow up",
L"Arm (%d AP)",
L"Arm",
L"Disarm (%d AP)",
L"Disarm",
};
#endif //ITALIAN
+11 -1
View File
@@ -7525,7 +7525,7 @@ STR16 szPrisonerTextStr[]=
L"%d prisoners revealed enemy positions.",
L"%d prisoners joined our cause.",
L"Prisoners start a massive riot in %s!",
L"Prisoners were sent to %s!",
L"%d prisoners were sent to %s!",
L"Prisoners have been released!",
L"The army now occupies the prison in %s, the prisoners were freed!",
L"The enemy refuses to surrender!",
@@ -7542,4 +7542,14 @@ STR16 szMTATextStr[]= // TODO.Translate
L"%s had to stop %s.",
};
STR16 szInventoryArmTextStr[]= // TODO.Translate
{
L"Blow up (%d AP)",
L"Blow up",
L"Arm (%d AP)",
L"Arm",
L"Disarm (%d AP)",
L"Disarm",
};
#endif //POLISH
+11 -1
View File
@@ -7506,7 +7506,7 @@ STR16 szPrisonerTextStr[]=
L"%d prisoners revealed enemy positions.",
L"%d prisoners joined our cause.",
L"Prisoners start a massive riot in %s!",
L"Prisoners were sent to %s!",
L"%d prisoners were sent to %s!",
L"Prisoners have been released!",
L"The army now occupies the prison in %s, the prisoners were freed!",
L"The enemy refuses to surrender!",
@@ -7523,4 +7523,14 @@ STR16 szMTATextStr[]= // TODO.Translate
L"%s had to stop %s.",
};
STR16 szInventoryArmTextStr[]= // TODO.Translate
{
L"Blow up (%d AP)",
L"Blow up",
L"Arm (%d AP)",
L"Arm",
L"Disarm (%d AP)",
L"Disarm",
};
#endif //RUSSIAN
+11 -1
View File
@@ -7523,7 +7523,7 @@ STR16 szPrisonerTextStr[]=
L"%d prisoners revealed enemy positions.",
L"%d prisoners joined our cause.",
L"Prisoners start a massive riot in %s!",
L"Prisoners were sent to %s!",
L"%d prisoners were sent to %s!",
L"Prisoners have been released!",
L"The army now occupies the prison in %s, the prisoners were freed!",
L"The enemy refuses to surrender!",
@@ -7540,4 +7540,14 @@ STR16 szMTATextStr[]= // TODO.Translate
L"%s had to stop %s.",
};
STR16 szInventoryArmTextStr[]= // TODO.Translate
{
L"Blow up (%d AP)",
L"Blow up",
L"Arm (%d AP)",
L"Arm",
L"Disarm (%d AP)",
L"Disarm",
};
#endif //TAIWANESE