Merge pull request #4315 from acemod/fixChemlightShieldDescriptions

Fix Chemlight Shield Green and Red descriptions
This commit is contained in:
jonpas 2016-09-01 01:20:04 +02:00 committed by GitHub
commit eb007973c1

View File

@ -6,27 +6,27 @@ class CfgWeapons {
muzzles[] += {"ACE_Chemlight_OrangeMuzzle","ACE_Chemlight_WhiteMuzzle","ACE_Chemlight_HiRedMuzzle","ACE_Chemlight_HiYellowMuzzle","ACE_Chemlight_HiOrangeMuzzle","ACE_Chemlight_HiWhiteMuzzle","ACE_Chemlight_IRMuzzle"};
class ThrowMuzzle;
class ACE_Chemlight_OrangeMuzzle: ThrowMuzzle {
magazines[] = {"ACE_Chemlight_Orange"};
};
class ACE_Chemlight_WhiteMuzzle: ThrowMuzzle {
magazines[] = {"ACE_Chemlight_White"};
};
class ACE_Chemlight_HiRedMuzzle: ThrowMuzzle {
magazines[] = {"ACE_Chemlight_HiRed"};
};
class ACE_Chemlight_HiYellowMuzzle: ThrowMuzzle {
magazines[] = {"ACE_Chemlight_HiYellow"};
};
class ACE_Chemlight_HiOrangeMuzzle: ThrowMuzzle {
magazines[] = {"ACE_Chemlight_HiOrange"};
};
class ACE_Chemlight_HiWhiteMuzzle: ThrowMuzzle {
magazines[] = {"ACE_Chemlight_HiWhite"};
};
@ -34,10 +34,10 @@ class CfgWeapons {
magazines[] = {"ACE_Chemlight_IR"};
};
};
class ACE_ItemCore;
class InventoryItem_Base_F;
class ACE_Chemlight_Shield: ACE_ItemCore {
author = ECSTRING(common,ACETeam);
displayName = CSTRING(Shield_Empty_DisplayName);
@ -49,12 +49,12 @@ class CfgWeapons {
mass = 1;
};
};
class ACE_Chemlight_Shield_Green: ACE_ItemCore {
ACE_Chemlight = "Chemlight_green";
author = ECSTRING(common,ACETeam);
displayName = CSTRING(Shield_Green_DisplayName);
descriptionShort = CSTRING(Shield_Empty_DescriptionShort);
descriptionShort = CSTRING(Shield_Green_DescriptionShort);
model = "\A3\weapons_F\ammo\mag_univ.p3d";
picture = QPATHTOF(UI\ace_chemlight_shield_green_x_ca.paa);
scope = 1;
@ -67,11 +67,11 @@ class CfgWeapons {
};
};
};
class ACE_Chemlight_Shield_Red: ACE_Chemlight_Shield_Green {
ACE_Chemlight = "Chemlight_red";
displayName = CSTRING(Shield_Red_DisplayName);
descriptionShort = CSTRING(Shield_Green_DescriptionShort);
descriptionShort = CSTRING(Shield_Red_DescriptionShort);
picture = QPATHTOF(UI\ace_chemlight_shield_red_x_ca.paa);
class ItemInfo: InventoryItem_Base_F {
mass = 1;
@ -97,7 +97,7 @@ class CfgWeapons {
};
};
};
class ACE_Chemlight_Shield_Yellow: ACE_Chemlight_Shield_Green {
ACE_Chemlight = "Chemlight_yellow";
displayName = CSTRING(Shield_Yellow_DisplayName);
@ -112,7 +112,7 @@ class CfgWeapons {
};
};
};
class ACE_Chemlight_Shield_Orange: ACE_Chemlight_Shield_Green {
ACE_Chemlight = "ACE_Chemlight_Orange";
displayName = CSTRING(Shield_Orange_DisplayName);