Aberration

ark-mod · Dec 13, 2017 · f29aba3 · f29aba3
1 parent 4bc5b3f
commit f29aba3
Show file tree

Hide file tree

Showing 8 changed files with 294 additions and 17 deletions.
diff --git a/ArkBot/ArkBot.csproj b/ArkBot/ArkBot.csproj
@@ -67,12 +67,12 @@
       <HintPath>..\packages\Accord.Statistics.3.5.0\lib\net46\Accord.Statistics.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ArkSavegameToolkitNet, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ArkSavegameToolkitNet.1.6.0\lib\net461\ArkSavegameToolkitNet.dll</HintPath>
+    <Reference Include="ArkSavegameToolkitNet, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ArkSavegameToolkitNet.1.7.0\lib\net461\ArkSavegameToolkitNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ArkSavegameToolkitNet.Domain, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ArkSavegameToolkitNet.1.6.0\lib\net461\ArkSavegameToolkitNet.Domain.dll</HintPath>
+    <Reference Include="ArkSavegameToolkitNet.Domain, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ArkSavegameToolkitNet.1.7.0\lib\net461\ArkSavegameToolkitNet.Domain.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Autofac, Version=4.3.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">

diff --git a/ArkBot/Properties/AssemblyInfo.cs b/ArkBot/Properties/AssemblyInfo.cs
@@ -44,5 +44,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.78.*")]
-[assembly: AssemblyFileVersion("1.78.0.0")]
+[assembly: AssemblyVersion("1.79.*")]
+[assembly: AssemblyFileVersion("1.79.0.0")]
diff --git a/ArkBot/WebApp/dist/index.html b/ArkBot/WebApp/dist/index.html
@@ -18,5 +18,5 @@
           <h3 class="w3-text-grey">Loading...</h3>
         </div> 
       </section>
-<script type="text/javascript" src="inline.c5767e9193d00f4590c6.bundle.js"></script><script type="text/javascript" src="polyfills.6fd0ea22f809f9a8e008.bundle.js"></script><script type="text/javascript" src="scripts.38ac096be18638d631af.bundle.js"></script><script type="text/javascript" src="vendor.2468963ecce92a48eef5.bundle.js"></script><script type="text/javascript" src="main.b133ba32aba82870b3dc.bundle.js"></script></body>
+<script type="text/javascript" src="inline.27a923fc12bca702f0fc.bundle.js"></script><script type="text/javascript" src="polyfills.6fd0ea22f809f9a8e008.bundle.js"></script><script type="text/javascript" src="scripts.38ac096be18638d631af.bundle.js"></script><script type="text/javascript" src="vendor.2468963ecce92a48eef5.bundle.js"></script><script type="text/javascript" src="main.4e5a9fa74d04662ce9a7.bundle.js"></script></body>
 </html>
diff --git a/...ist/inline.c5767e9193d00f4590c6.bundle.js → ...ist/inline.27a923fc12bca702f0fc.bundle.js b/...ist/inline.c5767e9193d00f4590c6.bundle.js → ...ist/inline.27a923fc12bca702f0fc.bundle.js
diff --git a/.../dist/main.b133ba32aba82870b3dc.bundle.js → .../dist/main.4e5a9fa74d04662ce9a7.bundle.js b/.../dist/main.b133ba32aba82870b3dc.bundle.js → .../dist/main.4e5a9fa74d04662ce9a7.bundle.js
diff --git a/ArkBot/WebApp/src/app/arkmap-structures/arkmap-structures.component.ts b/ArkBot/WebApp/src/app/arkmap-structures/arkmap-structures.component.ts
@@ -252,8 +252,8 @@ export class ArkmapStructuresComponent implements OnInit, OnDestroy, OnChanges {
 
     imageLoaded(img: HTMLImageElement): void {
       this.img = img;
-      this.width = img.naturalWidth;
-      this.height = img.naturalHeight;
+      this.width = img ? img.naturalWidth : 1024;
+      this.height = img ? img.naturalHeight : 1024;
 
       //d3.select(this.canvasRef.nativeElement).call(this.zoom.on("zoom", () => this.zoomed()));
 
@@ -296,7 +296,7 @@ export class ArkmapStructuresComponent implements OnInit, OnDestroy, OnChanges {
       ctx.translate(transform.x, transform.y);
       ctx.scale(transform.k, transform.k);
 
-      ctx.drawImage(this.img, 0, 0);
+      if (this.img) ctx.drawImage(this.img, 0, 0);
 
       this.prevTransformK = transform.k;
     }
@@ -306,9 +306,11 @@ export class ArkmapStructuresComponent implements OnInit, OnDestroy, OnChanges {
 
       var img = new Image()
       img.onload = () => this.imageLoaded(img);
+      img.onerror = () => this.imageLoaded(undefined);
       img.src = !environment.demo ? `${this.getApiBaseUrl()}/map/${this.mapName}` : 'assets/demo/Ragnarok.jpg';
       if (img.complete) {
-        img.onload = null
+        img.onload = null;
+        img.onerror = null;
         this.imageLoaded(img);
       }
     }

diff --git a/ArkBot/aliases.json b/ArkBot/aliases.json
@@ -361,9 +361,6 @@
       "Kentro_Character_BP_C",
       "Kentro"
     ],
-    [
-      "Lamprey"
-    ],
     [
       "Leech",
       "Leech_Character_C"
@@ -800,6 +797,284 @@
       "ZombieDodo_Character_BP_C",
       "Zombie Dodo",
       "Zombiedodo"
+    ],
+    [
+      "Aberrant Achatina",
+      "Achatina_Character_BP_Aberrant_C",
+      "Aberrant Snail",
+      "Aberrant Acha"
+    ],
+    [
+      "Aberrant Angler",
+      "Angler_Character_BP_Aberrant_C",
+      "Aberrant Anglerfish"
+    ],
+    [
+      "Aberrant Ankylosaurus",
+      "Ankylo_Character_BP_Aberrant_C",
+      "Aberrant Ankylo",
+      "Aberrant Anky"
+    ],
+    [
+      "Aberrant Arthropluera",
+      "Arthro_Character_BP_Aberrant_C",
+      "Aberrant Arthro",
+      "Aberrant Centipede"
+    ],
+    [
+      "Aberrant Baryonyx",
+      "Baryonyx_Character_BP_Aberrant_C",
+      "Aberrant Bary"
+    ],
+    [
+      "Basilisk",
+      "Basilisk_Character_BP_C"
+    ],
+    [
+      "Aberrant Titanoboa",
+      "BoaFrill_Character_BP_Aberrant_C",
+      "Aberrant Boa",
+      "Aberrant Snake"
+    ],
+    [
+      "Aberrant Carnotaurus",
+      "Carno_Character_BP_Aberrant_C",
+      "Aberrant Carno"
+    ],
+    [
+      "Cave Wolf",
+      "CaveWolf_Character_BP_C"
+    ],
+    [
+      "Chupa Cabra",
+      "ChupaCabra_Character_BP_C"
+    ],
+    [
+      "Chupa Cabra Surface",
+      "ChupaCabra_Character_BP_Surface_C"
+    ],
+    [
+      "Aberrant Cnidaria",
+      "Cnidaria_Character_BP_Aberrant_C"
+    ],
+    [
+      "Aberrant Coelacanth",
+      "Coel_Character_BP_Aberrant_C",
+      "Aberrant Coel"
+    ],
+    [
+      "Crab",
+      "Crab_Character_BP_C"
+    ],
+    [
+      "Aberrant Dimetrodon",
+      "Dimetro_Character_BP_Aberrant_C",
+      "Aberrant Dimetro"
+    ],
+    [
+      "Aberrant Diplocaulus",
+      "Diplocaulus_Character_BP_Aberrant_C",
+      "Aberrant Newt"
+    ],
+    [
+      "Aberrant Diplodocus",
+      "Diplodocus_Character_BP_Aberrant_C"
+    ],
+    [
+      "Aberrant Dodo",
+      "Dodo_Character_BP_Aberrant_C",
+      "Aberrant Chicken"
+    ],
+    [
+      "Aberrant Doedicurus",
+      "Doed_Character_BP_Aberrant_C",
+      "Aberrant Doed"
+    ],
+    [
+      "Aberrant Dragonfly",
+      "Dragonfly_Character_BP_Aberrant_C"
+    ],
+    [
+      "Aberrant Dung Beetle",
+      "DungBeetle_Character_BP_Aberrant_C",
+      "Aberrant Beetle"
+    ],
+    [
+      "Aberrant Electrophorus",
+      "Eel_Character_BP_Aberrant_C",
+      "Aberrant Eel",
+      "Aberrant Electro"
+    ],
+    [
+      "Aberrant Equus",
+      "Equus_Character_BP_Aberrant_C",
+      "Aberrant Horse"
+    ],
+    [
+      "Aberrant Iguanodon",
+      "Iguanodon_Character_BP_Aberrant_C",
+      "Aberrant Iguan"
+    ],
+    [
+      "Lamprey",
+      "Lamprey_Character_C"
+    ],
+    [
+      "Lantern Bird",
+      "LanternBird_Character_BP_C"
+    ],
+    [
+      "Lantern Goat",
+      "LanternGoat_Character_BP_C"
+    ],
+    [
+      "Lantern Lizard",
+      "LanternLizard_Character_BP_C"
+    ],
+    [
+      "Lantern Pug",
+      "LanternPug_Character_BP_C"
+    ],
+    [
+      "Lightbug",
+      "Lightbug_Character_BaseBP_C"
+    ],
+    [
+      "Aberrant Lystrosaurus",
+      "Lystro_Character_BP_Aberrant_C",
+      "Aberrant Lystro"
+    ],
+    [
+      "Aberrant Manta",
+      "Manta_Character_BP_Aberrant_C"
+    ],
+    [
+      "Mega Basilisk",
+      "MegaBasilisk_Character_BP_C"
+    ],
+    [
+      "Mega Crab",
+      "MegaCrab_Character_BP_C"
+    ],
+    [
+      "Aberrant Megalosaurus",
+      "Megalosaurus_Character_BP_Aberrant_C",
+      "Aberrant Megalos",
+      "Aberrant Sleeping Raptor"
+    ],
+    [
+      "Mega Xenomorph Male",
+      "MegaXenomorph_Character_BP_Male_Surface_C"
+    ],
+    [
+      "Mole Rat",
+      "MoleRat_Character_BP_C"
+    ],
+    [
+      "Aberrant Moschops",
+      "Moschops_Character_BP_Aberrant_C"
+    ],
+    [
+      "Aberrant Otter",
+      "Otter_Character_BP_Aberrant_C"
+    ],
+    [
+      "Aberrant Parasaur",
+      "Para_Character_BP_Aberrant_C",
+      "Aberrant Para"
+    ],
+    [
+      "Aberrant Paracer",
+      "Paracer_Character_BP_Aberrant_C",
+      "Aberrant Paraceratherium"
+    ],
+    [
+      "Aberrant Piranha",
+      "Piranha_Character_BP_Aberrant_C",
+      "Aberrant Megapiranha"
+    ],
+    [
+      "Pteroteuthis",
+      "Pteroteuthis_Char_BP_C"
+    ],
+    [
+      "Pteroteuthis Surface",
+      "Pteroteuthis_Char_BP_Surface_C"
+    ],
+    [
+      "Aberrant Purlovia",
+      "Purlovia_Character_BP_Aberrant_C"
+    ],
+    [
+      "Aberrant Raptor",
+      "Raptor_Character_BP_Aberrant_C"
+    ],
+    [
+      "Rock Drake",
+      "RockDrake_Character_BP_C"
+    ],
+    [
+      "Aberrant Sabertooth Salmon",
+      "Salmon_Character_Aberrant_C",
+      "Aberrant Salmon"
+    ],
+    [
+      "Aberrant Sarcosuchus",
+      "Sarco_Character_BP_Aberrant_C",
+      "Aberrant Sarco",
+      "Aberrant Crocodile"
+    ],
+    [
+      "Aberrant Pulmonoscorpius",
+      "Scorpion_Character_BP_Aberrant_C",
+      "Aberrant Scorpion",
+      "Aberrant Scorpius",
+      "Aberrant Pulmono",
+      "Aberrant Scorp",
+      "Aberrant Pulminoscorpius"
+    ],
+    [
+      "Aberrant Ovis",
+      "Sheep_Character_BP_Aberrant_C",
+      "Aberrant Sheep"
+    ],
+    [
+      "Aberrant Spinosaur",
+      "Spino_Character_BP_Aberrant_C",
+      "Aberrant Spinosaurus",
+      "Aberrant Spino"
+    ],
+    [
+      "Aberrant Stegosaurus",
+      "Stego_Character_BP_Aberrant_C",
+      "Aberrant Stego"
+    ],
+    [
+      "Aberrant Beelzebufo",
+      "Toad_Character_BP_Aberrant_C",
+      "Aberrant Toad"
+    ],
+    [
+      "Aberrant Triceratops",
+      "Trike_Character_BP_Aberrant_C",
+      "Aberrant Trike"
+    ],
+    [
+      "Aberrant Trilobite",
+      "Trilobite_Character_Aberrant_C"
+    ],
+    [
+      "Aberrant Carbonemys",
+      "Turtle_Character_BP_Aberrant_C",
+      "Aberrant Turtle"
+    ],
+    [
+      "Xenomorph Female",
+      "Xenomorph_Character_BP_Female_C"
+    ],
+    [
+      "Xenomorph Male Surface",
+      "Xenomorph_Character_BP_Male_Surface_C"
     ]
   ]
 }
diff --git a/ArkBot/packages.config b/ArkBot/packages.config
@@ -4,7 +4,7 @@
   <package id="Accord.MachineLearning" version="3.5.0" targetFramework="net461" />
   <package id="Accord.Math" version="3.5.0" targetFramework="net461" />
   <package id="Accord.Statistics" version="3.5.0" targetFramework="net461" />
-  <package id="ArkSavegameToolkitNet" version="1.6.0" targetFramework="net461" />
+  <package id="ArkSavegameToolkitNet" version="1.7.0" targetFramework="net461" />
   <package id="Autofac" version="4.3.0" targetFramework="net461" />
   <package id="Autofac.Owin" version="4.0.0" targetFramework="net461" />
   <package id="Autofac.SignalR" version="3.0.2" targetFramework="net461" />