Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair

2024-08-30 18:23:18 +00:00 · 2015-04-22 01:45:35 +02:00 · 2015-04-22 01:45:35 +02:00 · 68749136c9
commit 68749136c9
parent d74dfed89b b6d7e12507
11 changed files with 25 additions and 11 deletions
--- a/addons/attach/CfgWeapons.hpp
+++ b/addons/attach/CfgWeapons.hpp
@ -5,6 +5,7 @@ class CfgWeapons {

    class ACE_IR_Strobe_Item: ACE_ItemCore {
        ACE_attachable = "ACE_IR_Strobe_Effect";
+        author = "$STR_ACE_Common_ACETeam";
        scope = 2;
        displayName = "$STR_ACE_IrStrobe_Name";
        descriptionShort = "$STR_ACE_IrStrobe_Description";
--- a/addons/common/CfgWeapons.hpp
+++ b/addons/common/CfgWeapons.hpp
@ -2,7 +2,6 @@
 class CfgWeapons {
    class ItemCore;
    class ACE_ItemCore: ItemCore {
-        author = "$STR_ACE_Common_ACETeam";
        type = 4096;//4;
        detectRange = -1;
        simulation = "ItemMineDetector";
@ -14,7 +13,6 @@ class CfgWeapons {
    };

    class ACE_FakePrimaryWeapon: Rifle_Base_F {
-        author = "$STR_ACE_Common_ACETeam";
        scope = 2;
        scopeCurator = 1;
        
@ -32,6 +30,7 @@ class CfgWeapons {

    class InventoryItem_Base_F;
    class ACE_Banana: ACE_ItemCore {
+        author = "$STR_ACE_Common_ACETeam";
        scope = 2;
        displayName = "$STR_ACE_Common_bananaDisplayName";
        descriptionShort = "$STR_ACE_Common_bananaDescr";
--- a/addons/explosives/CfgVehicles.hpp
+++ b/addons/explosives/CfgVehicles.hpp
@ -50,7 +50,7 @@ class CfgVehicles {
    class Items_base_F;
    class ACE_DefuseObject: Items_base_F {
        XEH_ENABLED;
-        author = "$STR_ACE_Common_ACETeam";
+        author = "ACE";
        _generalMacro = "ACE_DefuseObject";
        displayName = "ACE Defuse Helper";
        mapSize = 0.2;
@ -80,7 +80,7 @@ class CfgVehicles {
    };
    class ACE_Explosives_Place: Items_base_F {
        XEH_ENABLED;
-        author = "$STR_ACE_Common_ACETeam";
+        author = "ACE";
        _generalMacro = "ACE_Explosives_Place";
        displayName = "Multi-meter";
        mapSize = 0.2;
--- a/addons/grenades/CfgMagazines.hpp
+++ b/addons/grenades/CfgMagazines.hpp
@ -1,7 +1,7 @@
 class CfgMagazines {
    class HandGrenade;
    class ACE_HandFlare_Base: HandGrenade {
-        author = "$STR_ACE_Common_ACETeam";
+        scope = 1;
        value = 2;
        nameSoundWeapon = "smokeshell";
        nameSound = "smokeshell";
@ -9,6 +9,8 @@ class CfgMagazines {
        initSpeed = 22;
    };
    class ACE_HandFlare_White: ACE_HandFlare_Base {
+        author = "$STR_ACE_Common_ACETeam";
+        scope = 2;
        ammo = "ACE_F_Hand_White";
        displayname = "$STR_ACE_Grenades_M127A1_White_Name";
        descriptionshort = "$STR_ACE_Grenades_M127A1_White_Description";
@ -17,6 +19,8 @@ class CfgMagazines {
        picture = "\A3\Weapons_F\Data\UI\gear_flare_white_ca.paa";
    };
    class ACE_HandFlare_Red: ACE_HandFlare_Base {
+        author = "$STR_ACE_Common_ACETeam";
+        scope = 2;
        ammo = "ACE_F_Hand_Red";
        displayname = "$STR_ACE_Grenades_M127A1_Red_Name";
        descriptionshort = "$STR_ACE_Grenades_M127A1_Red_Description";
@ -25,6 +29,8 @@ class CfgMagazines {
        picture = "\A3\Weapons_F\Data\UI\gear_flare_red_ca.paa";
    };
    class ACE_HandFlare_Green: ACE_HandFlare_Base {
+        author = "$STR_ACE_Common_ACETeam";
+        scope = 2;
        ammo = "ACE_F_Hand_Green";
        displayname = "$STR_ACE_Grenades_M127A1_Green_Name";
        descriptionshort = "$STR_ACE_Grenades_M127A1_Green_Description";
@ -33,6 +39,8 @@ class CfgMagazines {
        picture = "\A3\Weapons_F\Data\UI\gear_flare_green_ca.paa";
    };
    class ACE_HandFlare_Yellow: ACE_HandFlare_Base {
+        author = "$STR_ACE_Common_ACETeam";
+        scope = 2;
        ammo = "ACE_F_Hand_Yellow";
        displayname = "$STR_ACE_Grenades_M127A1_Yellow_Name";
        descriptionshort = "$STR_ACE_Grenades_M127A1_Yellow_Description";
@ -41,8 +49,8 @@ class CfgMagazines {
        picture = "\A3\Weapons_F\Data\UI\gear_flare_yellow_ca.paa";
    };
    class ACE_M84: HandGrenade {
-        ammo = "ACE_G_M84";
        author = "$STR_ACE_Common_ACETeam";
+        ammo = "ACE_G_M84";
        displayname = "$STR_ACE_Grenades_M84_Name";
        descriptionshort = "$STR_ACE_Grenades_M84_Description";
        displayNameShort = "M84";
--- a/addons/logistics_wirecutter/CfgWeapons.hpp
+++ b/addons/logistics_wirecutter/CfgWeapons.hpp
@ -3,6 +3,7 @@ class CfgWeapons {
    class ACE_ItemCore;

    class ACE_wirecutter: ACE_ItemCore {
+        author = "$STR_ACE_Common_ACETeam";
        displayName = "$STR_ACE_logistics_wirecutter_wirecutterName";
        descriptionShort = "$STR_ACE_logistics_wirecutter_wirecutterDescription";
        model = "\A3\weapons_F\ammo\mag_univ.p3d";
--- a/addons/magazinerepack/stringtable.xml
+++ b/addons/magazinerepack/stringtable.xml
@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Edited with tabler. -->
 <Project name="ACE">
    <Package name="MagazineRepack">
        <Key ID="STR_ACE_MagazineRepack_RepackMagazines">
@ -66,7 +67,7 @@
            <German>%1 volle(s) Magazin(e) und %2 übrig gebliebene Patrone(n)</German>
            <Spanish>%1 cargador(es) completo(s) y %2 bala(s) extra(s)</Spanish>
            <French>%1 chargeur(s) plein(s) et %2 cartouche(s) en rab</French>
-            <Polish>Pełnych magazynków: %1.&lt;br /&gt; Dodatkowych naboi: %2.</Polish>
+            <Polish>Pełnych magazynków: %1.&lt;br/&gt;Dodatkowych naboi: %2.</Polish>
            <Czech>%1 plný zásobník(y) a %2 munice navíc</Czech>
            <Italian>%1 caricatore/i pieno e %2 munizioni extra</Italian>
            <Portuguese>%1 carregador(es) cheio(s) e %2 disparo(s) a mais</Portuguese>
@ -102,9 +103,9 @@
            <Spanish>%1 Total y %2 Parcial</Spanish>
            <Russian>%1 полных и %2 неполных</Russian>
            <Czech>%1 plný a %2 částečně</Czech>
-            <Polish>Pełnych: %1.&lt;br /&gt;Częściowo pełnych: %2.</Polish>
+            <Polish>Pełnych: %1.&lt;br/&gt;Częściowo pełnych: %2.</Polish>
            <Hungarian>%1 teljes és %2 részleges</Hungarian>
            <Italian>%1 pieno e %2 parziale</Italian>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/microdagr/CfgWeapons.hpp
+++ b/addons/microdagr/CfgWeapons.hpp
@ -3,6 +3,7 @@ class CfgWeapons {
    class InventoryItem_Base_F;

    class ACE_microDAGR: ACE_ItemCore {
+        author = "$STR_ACE_Common_ACETeam";
        scope = 2;
        displayName = "$STR_ACE_microdagr_itemName";
        descriptionShort = "$STR_ACE_microdagr_itemDescription";
--- a/addons/missileguidance/CfgVehicles.hpp
+++ b/addons/missileguidance/CfgVehicles.hpp
@ -20,7 +20,7 @@ class CfgVehicles {
    
    class ACE_Comanche_Test : B_Heli_Attack_01_F {
        displayName = "ACE_Comanche_Test";
-        author = "$STR_ACE_Common_ACETeam";
+        author = "ACE Team";
        class Library {
            libTextDesc = "ACE_Comanche_Test";
        };
--- a/addons/overheating/CfgWeapons.hpp
+++ b/addons/overheating/CfgWeapons.hpp
@ -5,6 +5,7 @@ class CfgWeapons {
    class ACE_SpareBarrel: ACE_ItemCore {
        displayname = "$STR_ACE_Overheating_SpareBarrelName";
        descriptionshort = "$STR_ACE_Overheating_SpareBarrelDescription";
+        //model = "";
        picture = QUOTE(PATHTOF(UI\spare_barrel_ca.paa));
        scope = 2;
        class ItemInfo: InventoryItem_Base_F {
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Edited with tabler. -->
 <Project name="ACE">
    <Package name="RealisticNames">
        <Key ID="STR_ACE_RealisticNames_HMG_01_Name">
@ -519,7 +520,7 @@
            <English>Punisher (GMG)</English>
            <German>Punisher (GMW)</German>
            <Spanish>Punisher (GMG)</Spanish>
-            <Polish>Punisher (CKM)</Polish>
+            <Polish>Punisher (GMG)</Polish>
            <Czech>Punisher (granátomet)</Czech>
            <French>Punisher (GMG)</French>
            <Russian>Kаратель (Гранатомет)</Russian>
--- a/addons/vehiclelock/CfgWeapons.hpp
+++ b/addons/vehiclelock/CfgWeapons.hpp
@ -3,6 +3,7 @@ class CfgWeapons {
    class ACE_ItemCore;

    class ACE_key_master: ACE_ItemCore {
+        author = "$STR_ACE_Common_ACETeam";
        displayName = "Vehicle Key: Master";
        descriptionShort = "$STR_ACE_Vehicle_Item_Master_Description";
        model = "\A3\weapons_F\ammo\mag_univ.p3d";