Initial renaming

2022-06-22 21:16:01 -04:00 · 2022-06-22 21:16:01 -04:00 · 79384d4f92
commit 79384d4f92
parent 323f06891a
4 changed files with 64 additions and 165 deletions
--- a/ExpandedArmorDetails.csproj
+++ b/ExpandedArmorDetails.csproj
@ -7,8 +7,8 @@
    <ProjectGuid>{C5889536-4EE7-40BC-A8FD-7F1A80C3F3E5}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MunitionsExpert</RootNamespace>
-    <AssemblyName>Faupi-MunitionsExpert</AssemblyName>
+    <RootNamespace>ExpandedArmorDetails</RootNamespace>
+    <AssemblyName>bepis69-ExpandedArmorDetails</AssemblyName>
    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <Deterministic>true</Deterministic>
@ -30,19 +30,19 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-  </PropertyGroup>
+<!--  <PropertyGroup>-->
+<!--    <SignAssembly>true</SignAssembly>-->
+<!--  </PropertyGroup>-->
+<!--  <PropertyGroup>-->
+<!--    <AssemblyOriginatorKeyFile>-->
+<!--    </AssemblyOriginatorKeyFile>-->
+<!--  </PropertyGroup>-->
  <ItemGroup>
    <Compile Include="src\client\StaticIconsPatch.cs" />
    <Compile Include="src\client\CachedAttributesPatch.cs" />
    <Compile Include="src\client\ModInformation.cs" />
    <Compile Include="src\client\Attributes.cs" />
-    <Compile Include="src\client\MunitionsExpert.cs" />
+    <Compile Include="src\client\ExpandedArmorDetails.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
@ -56,47 +56,47 @@
  </ItemGroup>
  <ItemGroup>
    <Reference Include="0Harmony">
-      <HintPath>..\..\Shared\BepInEx\0Harmony.dll</HintPath>
+      <HintPath>lib\BepInEx\0Harmony.dll</HintPath>
    </Reference>
    <Reference Include="Aki.Common">
-      <HintPath>..\..\Shared\AKI\Aki.Common.dll</HintPath>
+      <HintPath>lib\AKI\Aki.Common.dll</HintPath>
    </Reference>
    <Reference Include="Aki.Reflection">
-      <HintPath>..\..\Shared\AKI\Aki.Reflection.dll</HintPath>
+      <HintPath>lib\AKI\Aki.Reflection.dll</HintPath>
    </Reference>
    <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\Shared\EFT\Assembly-CSharp.dll</HintPath>
+      <HintPath>lib\EFT\Assembly-CSharp.dll</HintPath>
    </Reference>
    <Reference Include="BepInEx">
-      <HintPath>..\..\Shared\BepInEx\BepInEx.dll</HintPath>
+      <HintPath>lib\BepInEx\BepInEx.dll</HintPath>
    </Reference>
    <Reference Include="Comfort">
-      <HintPath>..\..\Shared\EFT\Comfort.dll</HintPath>
+      <HintPath>lib\EFT\Comfort.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\References\EFT-Managed\Newtonsoft.Json.dll</HintPath>
+      <HintPath>lib\EFT\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="UnityEngine">
-      <HintPath>..\..\Shared\EFT\UnityEngine.dll</HintPath>
+      <HintPath>lib\EFT\UnityEngine.dll</HintPath>
    </Reference>
    <Reference Include="UnityEngine.CoreModule">
-      <HintPath>..\..\Shared\EFT\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>lib\EFT\UnityEngine.CoreModule.dll</HintPath>
    </Reference>
    <Reference Include="UnityEngine.UnityWebRequestModule">
-      <HintPath>..\..\Shared\EFT\UnityEngine.UnityWebRequestModule.dll</HintPath>
+      <HintPath>lib\EFT\UnityEngine.UnityWebRequestModule.dll</HintPath>
    </Reference>
    <Reference Include="UnityEngine.UnityWebRequestTextureModule">
-      <HintPath>..\..\Shared\EFT\UnityEngine.UnityWebRequestTextureModule.dll</HintPath>
+      <HintPath>lib\EFT\UnityEngine.UnityWebRequestTextureModule.dll</HintPath>
    </Reference>
    <Reference Include="UnityEngine.UnityWebRequestWWWModule">
-      <HintPath>..\..\Shared\EFT\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
+      <HintPath>lib\EFT\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <Folder Include="_Build\Faupi-MunitionsExpert\" />
+    <Folder Include="_Build\bepis69-ExpandedArmorDetails\" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
--- a/src/server/package.json
+++ b/src/server/package.json
@ -1,10 +1,10 @@
 {
-    "name": "MunitionsExpert",
-    "author": "Faupi",
-    "version": "1.4.1",
+    "name": "bepis69-ExpandedArmorDetails",
+    "author": "bepis69",
+    "version": "0.0.1",
    "license": "NCSA Open Source",
    "main": "./src/MunitionsExpert.js",
-    "akiVersion": "3.0.0",
+    "akiVersion": "2.3.1",
    "updatedBy": "CWX",
    "scripts": {
        "setup:environment": "npm i",
--- a/src/server/res/translations.json
+++ b/src/server/res/translations.json
@ -1,137 +1,64 @@
 {
    "en": {
-        "DAMAGE": "Damage",
-        "PENETRATION": "Armor penetration",
-        "ARMOR DAMAGE": "Damage to armor",
-        "FRAGMENTATION CHANCE": "Fragmentation chance",
-        "RICOCHET CHANCE": "Ricochet chance",
-        "ME_class": "Class",
-        "ME_noarmor": "Unarmored"
+        "DURABILITY FACTOR": "Durability Factor",
+        "EFFECTIVE DURABILITY": "Effective Durability"
    },
    "cz": {
-        "DAMAGE": "Poškození",
-        "PENETRATION": "Průbojnost",
-        "ARMOR DAMAGE": "Poškození brnění",
-        "FRAGMENTATION CHANCE": "Šance na fragmentaci",
-        "RICOCHET CHANCE": "Šance na odraz",
-        "ME_class": "Třída",
-        "ME_noarmor": "Neobrněný"
+        "DURABILITY FACTOR": "Faktor trvanlivosti",
+        "EFFECTIVE DURABILITY": "Efektivní životnost"
    },
    "pl": {
-        "DAMAGE": "Szkoda",
-        "PENETRATION": "Penetracja pancerza",
-        "ARMOR DAMAGE": "Uszkodzenie zbroi",
-        "FRAGMENTATION CHANCE": "Szansa na fragmentację",
-        "RICOCHET CHANCE": "Szansa na rykoszet",
-        "ME_class": "Klasa",
-        "ME_noarmor": "Nieumiejętny"
+        "DURABILITY FACTOR": "Współczynnik trwałości",
+        "EFFECTIVE DURABILITY": "Efektywna trwałość"
    },
    "po": {
-        "DAMAGE": "Dano",
-        "PENETRATION": "Penetração de armadura",
-        "ARMOR DAMAGE": "Danos à armadura",
-        "FRAGMENTATION CHANCE": "Chance de fragmentação",
-        "RICOCHET CHANCE": "Chance de ricochete",
-        "ME_class": "Classe",
-        "ME_noarmor": "Sem armadura"
+        "DURABILITY FACTOR": "Fator de durabilidade",
+        "EFFECTIVE DURABILITY": "Durabilidade efetiva"
    },
    "ch": {
-        "DAMAGE": "损坏",
-        "PENETRATION": "护甲穿透",
-        "ARMOR DAMAGE": "对盔甲的伤害",
-        "FRAGMENTATION CHANCE": "碎片机会",
-        "RICOCHET CHANCE": "跳弹机会",
-        "ME_class": "类",
-        "ME_noarmor": "无所作为"
+        "DURABILITY FACTOR": "耐久性因素",
+        "EFFECTIVE DURABILITY": "有效耐久性"
    },
    "ru": {
-        "DAMAGE": "Повреждать",
-        "PENETRATION": "Бронепробиваемость",
-        "ARMOR DAMAGE": "Повреждение брони",
-        "FRAGMENTATION CHANCE": "Вероятность фрагментации",
-        "RICOCHET CHANCE": "Шанс рикошета",
-        "ME_class": "Класс",
-        "ME_noarmor": "Без оружия"
+        "DURABILITY FACTOR": "Фактор долговечности",
+        "EFFECTIVE DURABILITY": "Эффективная долговечность"
    },
    "es": {
-        "DAMAGE": "Daño",
-        "PENETRATION": "Penetración de armadura",
-        "ARMOR DAMAGE": "Daño a la armadura",
-        "FRAGMENTATION CHANCE": "Posibilidad de fragmentación",
-        "RICOCHET CHANCE": "Oportunidad de rebote",
-        "ME_class": "Clase",
-        "ME_noarmor": "Sin armadura"
+        "DURABILITY FACTOR": "Factor de durabilidad",
+        "EFFECTIVE DURABILITY": "Durabilidad efectiva"
    },
    "es-mx": {
-        "DAMAGE": "Daño",
-        "PENETRATION": "Penetración de armadura",
-        "ARMOR DAMAGE": "Daño a la armadura",
-        "FRAGMENTATION CHANCE": "Posibilidad de fragmentación",
-        "RICOCHET CHANCE": "Oportunidad de rebote",
-        "ME_class": "Clase",
-        "ME_noarmor": "Sin armadura"
+        "DURABILITY FACTOR": "Factor de durabilidad",
+        "EFFECTIVE DURABILITY": "Durabilidad efectiva"
    },
    "ge": {
-        "DAMAGE": "Schaden",
-        "PENETRATION": "Rüstungsdurchdringung",
-        "ARMOR DAMAGE": "Beschädigung der Rüstung",
-        "FRAGMENTATION CHANCE": "Fragmentierung Chance",
-        "RICOCHET CHANCE": "Querschläger-Chance",
-        "ME_class": "Klasse",
-        "ME_noarmor": "Ungepanzert"
+        "DURABILITY FACTOR": "Haltbarkeitsfaktor",
+        "EFFECTIVE DURABILITY": "Effektive Haltbarkeit"
    },
    "sk": {
-        "DAMAGE": "Poškodenie",
-        "PENETRATION": "Prienik do brnenia",
-        "ARMOR DAMAGE": "Poškodenie brnenia",
-        "FRAGMENTATION CHANCE": "Šanca na fragmentáciu",
-        "RICOCHET CHANCE": "Šanca na odraz",
-        "ME_class": "Trieda",
-        "ME_noarmor": "Neozbrojený"
+        "DURABILITY FACTOR": "Faktor trvanlivosti",
+        "EFFECTIVE DURABILITY": "Efektívna životnosť"
    },
    "tu": {
-        "DAMAGE": "Hasar",
-        "PENETRATION": "Zırh penetrasyon",
-        "ARMOR DAMAGE": "Zırhta hasar",
-        "FRAGMENTATION CHANCE": "Parçalanma şansı",
-        "RICOCHET CHANCE": "Sekme şansı",
-        "ME_class": "Sınıf",
-        "ME_noarmor": "zırhsız"
+
+        "DURABILITY FACTOR": "Dayanıklılık Faktörü",
+        "EFFECTIVE DURABILITY": "Etkili Dayanıklılık"
    },
    "it": {
-        "DAMAGE": "Danno",
-        "PENETRATION": "Penetrazione dell'armatura",
-        "ARMOR DAMAGE": "Danni all'armatura",
-        "FRAGMENTATION CHANCE": "Possibilità di frammentazione",
-        "RICOCHET CHANCE": "Possibilità di rimbalzo",
-        "ME_class": "Classe",
-        "ME_noarmor": "Disarmato"
+
+        "DURABILITY FACTOR": "Fattore di durabilità",
+        "EFFECTIVE DURABILITY": "Durabilità effettiva"
    },
    "jp": {
-        "DAMAGE": "ダメージ",
-        "PENETRATION": "装甲貫通",
-        "ARMOR DAMAGE": "鎧の損傷",
-        "FRAGMENTATION CHANCE": "断片化の可能性",
-        "RICOCHET CHANCE": "跳ね返るチャンス",
-        "ME_class": "クラス",
-        "ME_noarmor": "無装甲"
+        "DURABILITY FACTOR": "耐久性係数",
+        "EFFECTIVE DURABILITY": "効果的な耐久性"
    },
    "fr": {
-        "DAMAGE": "Dommage",
-        "PENETRATION": "Pénétration d'armure",
-        "ARMOR DAMAGE": "Dommages à l'armure",
-        "FRAGMENTATION CHANCE": "Chance de fragmentation",
-        "RICOCHET CHANCE": "Chance de ricochet",
-        "ME_class": "Classe",
-        "ME_noarmor": "Sans armure"
+        "DURABILITY FACTOR": "Facteur de durabilité",
+        "EFFECTIVE DURABILITY": "Durabilité efficace"
    },
    "hu": {
-        "DAMAGE": "Kár",
-        "PENETRATION": "Páncélátütő",
-        "ARMOR DAMAGE": "A páncél sérülése",
-        "FRAGMENTATION CHANCE": "Töredezettség esélye",
-        "RICOCHET CHANCE": "Ricochet esély",
-        "ME_class": "Osztály",
-        "ME_noarmor": "Fegyvertelen"
+        "DURABILITY FACTOR": "Tartóssági tényező",
+        "EFFECTIVE DURABILITY": "Hatékony tartósság"
    }
 }
--- a/src/server/src/ExpandedArmorDetails.ts
+++ b/src/server/src/ExpandedArmorDetails.ts
@ -7,7 +7,7 @@ import { JsonUtil } from "@spt-aki/utils/JsonUtil"
 import { InitialModLoader } from "@spt-aki/loaders/InitialModLoader"
 import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables";

-class MunitionsExpert implements IMod
+class ExpandedArmorDetails implements IMod
 {
    private logger: ILogger;
    private database: DatabaseServer;
@ -20,7 +20,6 @@ class MunitionsExpert implements IMod
    private translations: { [x: string]: any; };
    private items: { [x: string]: any; };
    private path: { resolve: (arg0: string) => any; };
-    private cfg: { BulletBackgroundColours: boolean; };

    public load(container: DependencyContainer)
    {
@ -31,7 +30,6 @@ class MunitionsExpert implements IMod
        this.translations = require("../res/translations.json");
        this.logger.info(`Loading: ${this.mod.name} ${this.mod.version}`);
        this.path = require("path");
-        this.cfg = require("./config.json");
        this.hookRoutes();
    }

@ -68,17 +66,17 @@ class MunitionsExpert implements IMod
    private hookRoutes()
    {
        this.router.registerDynamicRouter(
-            "MunitionsExpert",
+            "ExpandedArmorDetails",
            [
                {
-                    url: "/MunitionsExpert/GetInfo",
+                    url: "/ExpandedArmorDetails/GetInfo",
                    action: (url, info, sessionId, output) =>
                    {
                        return this.getModInfo(url, info, sessionId, output)
                    }
                }
            ],
-            "MunitionsExpert"
+            "ExpandedArmorDetails"
        )
    }

@ -94,32 +92,6 @@ class MunitionsExpert implements IMod
        
        return this.json.serialize(modOutput);
    }
-
-    changeBulletColour()
-    {
-        if (this.cfg.BulletBackgroundColours === true)
-        {
-            for (const i in this.items) 
-            {
-                const item = this.items[i]
-            
-                //set baground colour of ammo depending on pen
-                if (item._parent === "5485a8684bdc2da71d8b4567") 
-                {
-                    const pen = item._props.PenetrationPower
-                    let colour = ""
-            
-                    pen > 60 ? colour = "red" :     //SuperHighPen 
-                    pen > 50 ? colour = "yellow" :  //HighPen 
-                    pen > 40 ? colour = "violet" :  //MedHighPen 
-                    pen > 30 ? colour = "blue" :    //MedPen 
-                    pen > 20 ? colour = "green" :   //LowMedPen 
-                    colour = "grey"                 //LowPen 
-                    item._props.BackgroundColor = colour
-                }
-            }
-        }
-    }
 }

-module.exports = { mod: new MunitionsExpert() };
+module.exports = { mod: new ExpandedArmorDetails() };