Merge pull request #1600 from acemod/tacticalladderStringtable

Made use of the new stringtable macros
This commit is contained in:
ulteq 2015-06-13 09:52:02 +02:00
commit 86d7143890
3 changed files with 15 additions and 11 deletions

View File

@ -4,7 +4,7 @@ class CfgVehicles {
class CAManBase: Man { class CAManBase: Man {
class ACE_SelfActions { class ACE_SelfActions {
class ACE_TacticalLadders { class ACE_TacticalLadders {
displayName = $STR_ACE_DEPLOY_TACLADDER; displayName = CSTRING(Deploy);
condition = QUOTE((backpack ACE_player) == QUOTE(QUOTE(ACE_TacticalLadder_Pack))); condition = QUOTE((backpack ACE_player) == QUOTE(QUOTE(ACE_TacticalLadder_Pack)));
statement = QUOTE(call FUNC(deployTL)); statement = QUOTE(call FUNC(deployTL));
exceptions[] = {}; exceptions[] = {};
@ -17,7 +17,7 @@ class CfgVehicles {
class Bag_Base; class Bag_Base;
class ACE_TacticalLadder_Pack: Bag_Base { class ACE_TacticalLadder_Pack: Bag_Base {
scope = 2; scope = 2;
displayName = "$STR_ACE_TACTICALLADDER"; displayName = CSTRING(DisplayName);
descriptionShort = ""; descriptionShort = "";
model = PATHTOF(data\ace_tacticalladder_pack.p3d); model = PATHTOF(data\ace_tacticalladder_pack.p3d);
picture = PATHTOF(UI\ace_tactical_ladder_pack_ca.paa); picture = PATHTOF(UI\ace_tactical_ladder_pack_ca.paa);
@ -28,7 +28,7 @@ class CfgVehicles {
class House; class House;
class ACE_Tactical_Ladder: House { class ACE_Tactical_Ladder: House {
XEH_ENABLED; XEH_ENABLED;
displayName = $STR_ACE_TACTICALLADDER; displayName = CSTRING(DisplayName);
class DestructionEffects {}; class DestructionEffects {};
model = PATHTOF(data\ace_tacticalladder.p3d); model = PATHTOF(data\ace_tacticalladder.p3d);
animated = 1; animated = 1;
@ -62,7 +62,7 @@ class CfgVehicles {
condition = "true"; condition = "true";
class ACE_PickUp { class ACE_PickUp {
selection = ""; selection = "";
displayName = "$STR_ACE_PICKUP_TACLADDER"; displayName = CSTRING(Pickup);
distance = 4; distance = 4;
condition = QUOTE((backpack ACE_player) == ''); condition = QUOTE((backpack ACE_player) == '');
statement = QUOTE([ARR_2(_target,_player)] call FUNC(pickupTL)); statement = QUOTE([ARR_2(_target,_player)] call FUNC(pickupTL));
@ -72,7 +72,7 @@ class CfgVehicles {
}; };
class ACE_Position { class ACE_Position {
selection = ""; selection = "";
displayName = "$STR_ACE_POSITION_TACLADDER"; displayName = CSTRING(Position);
distance = 4; distance = 4;
condition = "true"; condition = "true";
statement = QUOTE([ARR_2(_target,_player)] call FUNC(positionTL)); statement = QUOTE([ARR_2(_target,_player)] call FUNC(positionTL));

View File

@ -37,7 +37,7 @@ GVAR(cancelTime) = ACE_time + 1; // Workaround to prevent accidental canceling
GVAR(currentStep) = 3; GVAR(currentStep) = 3;
GVAR(currentAngle) = 0; GVAR(currentAngle) = 0;
["Confirm", "Cancel", "Adjust"] call EFUNC(interaction,showMouseHint); [localize LSTRING(Deploy), localize LSTRING(Drop), localize LSTRING(Adjust)] call EFUNC(interaction,showMouseHint);
ACE_player setVariable [QGVAR(Deploy), ACE_player setVariable [QGVAR(Deploy),
[ACE_player, "DefaultAction", [ACE_player, "DefaultAction",

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="tacticalladder"> <Package name="tacticalladder">
<Key ID="STR_ACE_TACTICALLADDER"> <Key ID="STR_ACE_TacticalLadder_DisplayName">
<English>Telescopic Ladder</English> <English>Telescopic Ladder</English>
<German>Teleskopleiter</German> <German>Teleskopleiter</German>
<Russian>Телескопическая лестница</Russian> <Russian>Телескопическая лестница</Russian>
@ -12,7 +12,7 @@
<Italian>Telescopic Ladder</Italian> <Italian>Telescopic Ladder</Italian>
<Hungarian>Telescopic Ladder</Hungarian> <Hungarian>Telescopic Ladder</Hungarian>
</Key> </Key>
<Key ID="STR_ACE_DEPLOY_TACLADDER"> <Key ID="STR_ACE_TacticalLadder_Deploy">
<English>Deploy ladder</English> <English>Deploy ladder</English>
<German>Leiter aufbauen</German> <German>Leiter aufbauen</German>
<Russian>Установить лестницу</Russian> <Russian>Установить лестницу</Russian>
@ -23,7 +23,7 @@
<Italian>Deploy ladder</Italian> <Italian>Deploy ladder</Italian>
<Hungarian>Deploy ladder</Hungarian> <Hungarian>Deploy ladder</Hungarian>
</Key> </Key>
<Key ID="STR_ACE_DROP_TACLADDER"> <Key ID="STR_ACE_TacticalLadder_Drop">
<English>Drop ladder</English> <English>Drop ladder</English>
<German>Leiter ablegen</German> <German>Leiter ablegen</German>
<Russian>Положить лестницу</Russian> <Russian>Положить лестницу</Russian>
@ -34,7 +34,11 @@
<Italian>Drop ladder</Italian> <Italian>Drop ladder</Italian>
<Hungarian>Drop ladder</Hungarian> <Hungarian>Drop ladder</Hungarian>
</Key> </Key>
<Key ID="STR_ACE_POSITION_TACLADDER"> <Key ID="STR_ACE_TacticalLadder_Adjust">
<English>Adjust ladder</English>
<German>Leiter einstellen</German>
</Key>
<Key ID="STR_ACE_TacticalLadder_Position">
<English>Position ladder</English> <English>Position ladder</English>
<German>Leiter positionieren</German> <German>Leiter positionieren</German>
<Russian>Перенести лестницу</Russian> <Russian>Перенести лестницу</Russian>
@ -45,7 +49,7 @@
<Italian>Position ladder</Italian> <Italian>Position ladder</Italian>
<Hungarian>Position ladder</Hungarian> <Hungarian>Position ladder</Hungarian>
</Key> </Key>
<Key ID="STR_ACE_PICKUP_TACLADDER"> <Key ID="STR_ACE_TacticalLadder_Pickup">
<English>Pickup ladder</English> <English>Pickup ladder</English>
<German>Leiter aufnehmen</German> <German>Leiter aufnehmen</German>
<Russian>Взять лестницу</Russian> <Russian>Взять лестницу</Russian>