[WIP] Inferno Integration

client/scripts/com/monsters/siege/SiegeBuildingPopup.as

@@ -249,7 +249,8 @@ package com.monsters.siege
                {
                   this._videoStream.close();
                   this._currentVideoURL = this._currentWeapon.video;
-                  this._videoStream.play(this._currentWeapon.video);
+                  //added this so the game looks for the video hosted on the server and doesnt have to check locally
+                  this._videoStream.play(GLOBAL._storageURL + this._currentWeapon.video);
                }
             }
             else if(this._currentPreviewUrl != this._currentWeapon.videopreview)

client/scripts/com/monsters/siege/weapons/SiegeWeapon.as

@@ -59,7 +59,8 @@ package com.monsters.siege.weapons
          this._properties = {};
          this.image = _IMAGE_FOLDER_URL + this.weaponID + ".png";
          this.icon = _ICON_FOLDER_URL + "siege_icon_" + this.weaponID + ".png";
-         this.video = "assets/videos/" + this.weaponID + "400x175.flv";
+         // formerly "assets/videos/", changed to be simply "videos/" for the sake of consistency
+         this.video = "videos/" + this.weaponID + "400x175.flv";
          this.videopreview = "videos/" + this.weaponID + "_preview" + ".png";
          this.name = KEYS.Get("#w_" + this.weaponID + "#");
          this.description = KEYS.Get("w_" + this.weaponID + "desc");

server/src/app.routes.ts

@@ -54,6 +54,7 @@ router.post("/api/bm/yardplanner/savetemplate", auth, debugDataLog("Saving templ
 router.post("/api/bm/base/load", auth, debugDataLog("Inferno load data"), baseLoad);
 router.post("/api/bm/base/infernomonsters", auth, debugDataLog("Load inferno monsters"), infernoMonsters);
 router.post("/api/bm/base/save", auth, debugDataLog("Inferno save data"), baseSave);
+router.post("/api/bm/base/updatesaved", auth, debugDataLog("Inferno Updated Save"), updateSaved);
 
 // Worldmap v2
 router.post("/worldmapv2/getarea", auth, debugDataLog("MR2 get area"), getArea);

server/src/config/DevSettings.ts

@@ -6,7 +6,7 @@ export const devConfig = {
   skipTutorial: true,
   unlockAllEventRewards: false,
   maproom: true,
-  inferno: false,
+  inferno: true,
   devSandbox: false,
   debugSandbox: false,
 };

server/src/controllers/baseLoad.ts

@@ -14,6 +14,7 @@ import { generateID } from "../utils/generateID";
 import { loadBuildBase, loadViewBase } from "../services/base/loadBase";
 import { saveFailureErr } from "../errors/errorCodes.";
 import { removeBaseProtection } from "../services/maproom/v2";
+import { DescentStatus } from "../models/descentstatus.model";
 
 
 interface BaseLoadRequest {
@@ -33,12 +34,18 @@ export const baseLoad: KoaController = async (ctx) => {
   await ORMContext.em.populate(user, ["save"]);
   const authSave = user.save;
   let save: Save = null;
+  logging(requestBody.type);
 
   if (requestBody.type === "build") {
     save = await loadBuildBase(ctx, requestBody.baseid);
     if(save && save.saveuserid !== user.userid) {
       throw saveFailureErr;
     }
+  } else if (requestBody.type === "ibuild") {
+    save = await loadBuildBase(ctx, authSave.baseid_inferno.toString());
+    if (save && save.saveuserid !== user.userid) {
+      throw saveFailureErr;
+    }
   } else {
     save = await loadViewBase(ctx, requestBody.baseid)
   }
@@ -48,21 +55,31 @@ export const baseLoad: KoaController = async (ctx) => {
   );
   if (save) {
     if (process.env.ENV === "local") {
-      logging(`Base loaded:`, JSON.stringify(save, null, 2));
+      //logging(`Base loaded:`, JSON.stringify(save, null, 2));
     }
   } else if (requestBody.baseid && requestBody.baseid === "0") {
     // There was no existing save, create one with some defaults
     logging(`Base not found, creating a new save`);
 
     save = ORMContext.em.create(Save, getDefaultBaseData(user));
 
+    if (requestBody.type === "ibuild") {
+      save.type = "inferno",
+      save.baseid = authSave.baseid_inferno.toString();
+      save.credits = authSave.credits;
+      save.resources = authSave.iresources;
+      authSave.stats["other"]["underhalLevel"] = 1;
+      await ORMContext.em.persistAndFlush(authSave);
+    }
+
     // Add the save to the database
     await ORMContext.em.persistAndFlush(save);
 
-    user.save = save;
-
-    // Update user base save
-    await ORMContext.em.persistAndFlush(user);
+    if (requestBody.type !== "ibuild") {
+      user.save = save;
+      // Update user base save || ONLY IF WE DIDNT JUST CREATE AN INFERNO BASE
+      await ORMContext.em.persistAndFlush(user);
+    }
   }
 
   if (!save) throw saveFailureErr;
@@ -93,6 +110,28 @@ export const baseLoad: KoaController = async (ctx) => {
     await ORMContext.em.persistAndFlush(save);
   }
 
+  if (requestBody.type == "iwmattack") {
+    //logging(JSON.stringify(save));
+    //await ORMContext.em.persistAndFlush(save);
+  }
+
+  if (requestBody.type === "idescent") {
+    //[201,202,203,204,205,206,207] - inferno base IDs
+    const descentBases = [[201,1,0],[202,2,0],[203,3,0],[204,4,0],[205,5,0],[206,6,0],[207,7,0]];
+    let descentStatus = await ORMContext.em.findOne(DescentStatus, {
+       userid: authSave.userid,
+      })
+    if (!descentStatus) {
+      descentStatus = ORMContext.em.create(DescentStatus, {
+        userid: authSave.userid,
+        wmstatus: descentBases,
+      })
+      await ORMContext.em.persistAndFlush(descentStatus);
+    }
+    save.wmstatus = descentStatus.wmstatus;
+    await ORMContext.em.persistAndFlush(save);
+  }
+
   const filteredSave = FilterFrontendKeys(save);
 
   const isTutorialEnabled = devConfig.skipTutorial ? 205 : 0;