notherbase-fs 1.3.2 → 1.3.5

package/controllers/explorer.js

@@ -45,7 +45,7 @@ const explorer = async function explorer(worldPath, voidPath) {
     
             let main = `${worldPath}/${req.params.region}/${req.params.area}/${req.params.poi}/views/${req.params.detail}`;
 
-            if (fs.existsSync(main + ".js")) {
+            if (fs.existsSync(main + ".ejs")) {
                 let context = {
                     siteTitle: `NotherBase - ${req.params.detail}`,
                     user: foundUser,
@@ -82,7 +82,7 @@ const explorer = async function explorer(worldPath, voidPath) {
     
             let main = `${worldPath}/${req.params.region}/${req.params.area}/${req.params.poi}/views/index`;
     
-            if (fs.existsSync(main + ".js")) {
+            if (fs.existsSync(main + ".ejs")) {
                 let context = {
                     siteTitle: `NotherBase - ${req.params.poi}`,
                     user: foundUser,

package/controllers/inventory.js

@@ -51,18 +51,18 @@ router.post("/", async function(req, res) {
                                     await foundInventory.save();
             
                                     res.status(200).send({
-                                        item: itemToEmpty,
+                                        item: {
+                                            _id: itemToEmpty
+                                        },
                                         amount: 0
                                     });
                                 }
                                 else {
                                     await foundInventory.save();
-            
                                     res.status(200).send(foundInventory.items[j]);
                                 }
                             }
                             else {
-                                console.log("subtract from too few", req.change);
                                 res.status(304).send(
                                     `Unable to remove ${req.body.amount} ${req.body.item} 
                                     from inventory because the inventory has only ${foundInventory.items[j].amount}.`
@@ -87,7 +87,6 @@ router.post("/", async function(req, res) {
                             res.status(200).send(foundInventory.items[foundInventory.items.length - 1]);
                         }
                         else {
-                            console.log("subtract from none", req.body);
                             res.status(304).send(
                                 `Unable to remove ${req.body.amount} ${req.body.item} 
                                 from inventory because the inventory has none.`
@@ -96,12 +95,10 @@ router.post("/", async function(req, res) {
                     };
                 }
                 else {
-                    console.log(`${req.body.item} doesn't exist!`);
                     res.status(400).send(`${req.body.item} doesn't exist!`);
                 }
             }
             else {
-                console.log(`${req.body.item} ${req.body.amount} Check Input!`);
                 res.status(400).send(`${req.body.item} ${req.body.amount} Check Input!`);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "1.3.2",
+  "version": "1.3.5",
   "description": "Functions to help make developing for NotherBase easier.",
   "main": "notherbase-fs.js",
   "scripts": {

package/test/coast/tall-beach/nono-cove/views/index.ejs

@@ -11,7 +11,7 @@
 
 <hr>
 
-<button onclick="tradeForDoll()">Trade 5g for a doll</button>
+<button onclick="tradeForDoll()" id="trade">Trade 5g for a doll</button>
 
 <hr>
 
@@ -68,8 +68,22 @@
 </a>
 
 <script>
+    let bought = false;
+
     let tradeForDoll = async function tradeForDoll() {
-        if (await playerInventory.change(itemIDs[0], -5)) await playerInventory.change(itemIDs[1], 1);
+        if (!bought) {
+            $("#trade").addClass("invisible");
+
+            let paid = await playerInventory.change("Gold Coin", -5);
+            
+            if (paid) {
+                bought = true;
+                await playerInventory.change("Rag Doll", 1);
+            }
+            else {
+                $("#trade").removeClass("invisible");
+            }
+        }
     }
 
     let time = 0;

package/views/inventory.ejs

@@ -45,7 +45,18 @@
             }
 
             try {
-                await $.post("/inventory", change, (data, status) => {
+                let data = null;
+                let status = null;
+
+                await $.post("/inventory", change, (d, s) => {
+                    data = d;
+                    status = s;
+                });
+
+                if (status === "notmodified") {
+                    return false;
+                }
+                else {
                     let holding = false;
 
                     for (let i = 0; i < this.items.length; i++) {
@@ -53,7 +64,7 @@
                             this.items[i].amount = data.amount;
                             holding = true;
 
-                            if (this.items[i].amount === 0) this.items.splice(i, 1);
+                            if (data.amount <= 0) this.items.splice(i, 1);
                         }
                     }
                     
@@ -62,9 +73,8 @@
                     }
 
                     this.render();
-                });
-
-                return true;
+                    return true;
+                }
             }
             catch(err) {
                 console.log(err);