koishi-plugin-resonance-columba-bot 0.2.2 → 0.2.4

package/lib/index.js

@@ -4171,7 +4171,7 @@ function apply(ctx, config) {
         if (nameFlag) {
           items_str = items_str + "查询到商品" + goodsName + "\n";
           if (responseData[goodsName]["buy"] != null && Object.keys(responseData[goodsName]["buy"]).length != 0) {
-            items_str = items_str + "\n购入：\n";
+            items_str = items_str + "\n商品购入：\n";
             for (var cityName in responseData[goodsName]["buy"]) {
               var trend_updown = responseData[goodsName]["buy"][cityName]["trend"] === "up" ? "↑" : "↓";
               let time2 = intervalTime(responseData[goodsName]["buy"][cityName]["time"]);
@@ -4180,6 +4180,7 @@ function apply(ctx, config) {
             }
           }
           var base_price_list = [];
+          let item_list = {};
           if (buyCity.length != 0) {
             if (buyCity.length > 1) {
               for (var buyCityName in buyCity) {
@@ -4188,22 +4189,22 @@ function apply(ctx, config) {
             } else {
               base_price_list.push(+responseData[goodsName]["buy"][buyCity[0]]["price"]);
             }
-            items_str = items_str + "\n购买物出售：\n";
             for (var cityName in responseData[goodsName]["sell"]) {
               if (responseData[goodsName]["sell"][cityName]["variation"] == 0)
                 continue;
+              let item_str = "";
               var trend = responseData[goodsName]["sell"][cityName]["variation"] + "%";
               var trend_updown = responseData[goodsName]["sell"][cityName]["trend"] === "up" ? "↑" : "↓";
               var time = intervalTime(responseData[goodsName]["sell"][cityName]["time"]);
-              items_str = items_str + cityName + " " + trend + trend_updown + " 时间 " + time + " 利润 ";
+              item_str = cityName + " " + trend + trend_updown + " 时间 " + time + " 利润 ";
               if (base_price_list.length > 1) {
                 for (var price in base_price_list) {
-                  items_str = items_str + cityName[price][0] + (+responseData[goodsName]["sell"][cityName]["price"] - base_price_list[price]) + " ";
+                  item_str = item_str + cityName[price][0] + Math.round(+responseData[goodsName]["sell"][cityName]["price"] * 1.2 - base_price_list[price] * 0.8);
                 }
-                items_str = items_str + "\n";
               } else {
-                items_str = items_str + (+responseData[goodsName]["sell"][cityName]["price"] - base_price_list[0]) + "\n";
+                item_str = item_str + Math.round(+responseData[goodsName]["sell"][cityName]["price"] * 1.2 - base_price_list[0] * 0.8);
               }
+              item_list[cityName] = item_str;
             }
           }
           base_price_list = [];
@@ -4229,25 +4230,28 @@ function apply(ctx, config) {
                 base_price = base_price + products_default[good]["craft"][craftGood] * craftGoodsPrice;
               }
               base_price_list.push(base_price);
-              items_str = items_str + "\n制造物出售：\n";
               for (var cityName in responseData[goodsName]["sell"]) {
                 if (responseData[goodsName]["sell"][cityName]["variation"] == 0)
                   continue;
                 var trend = responseData[goodsName]["sell"][cityName]["variation"] + "%";
                 var trend_updown = responseData[goodsName]["sell"][cityName]["trend"] === "up" ? "↑" : "↓";
                 var time = intervalTime(responseData[goodsName]["sell"][cityName]["time"]);
-                items_str = items_str + cityName + " " + trend + trend_updown + " 时间 " + time + " 利润 ";
+                if (!(cityName in item_list))
+                  item_list[cityName] = cityName + " " + trend + trend_updown + " 时间 " + time;
                 if (base_price_list.length > 1) {
                   for (var price in base_price_list) {
-                    items_str = items_str + cityName[price][0] + (+responseData[goodsName]["sell"][cityName]["price"] - base_price_list[price]) + " ";
+                    item_list[cityName] = item_list[cityName] + " 制造物利润 " + Math.round(+responseData[goodsName]["sell"][cityName]["price"] * 1.2 - base_price_list[price] * 0.8);
                   }
-                  items_str = items_str + "\n";
                 } else {
-                  items_str = items_str + (+responseData[goodsName]["sell"][cityName]["price"] - base_price_list[0]) + "\n";
+                  item_list[cityName] = item_list[cityName] + " 制造物利润 " + Math.round(+responseData[goodsName]["sell"][cityName]["price"] * 1.2 - base_price_list[0] * 0.8);
                 }
               }
             }
           }
+          items_str = items_str + "\n商品出售：\n";
+          for (let i in item_list) {
+            items_str = items_str + item_list[i] + "\n";
+          }
           break;
         }
       }
@@ -4294,7 +4298,7 @@ function apply(ctx, config) {
     var buyPrice = responseData["沙金"]["buy"]["淘金乐园"].price;
     var buyVariation = +responseData["沙金"]["buy"]["淘金乐园"].variation + "%";
     var buyTrend_updown = responseData["沙金"]["buy"]["淘金乐园"].trend === "up" ? "↑" : "↓";
-    var price = sellPrice - buyPrice * 0.75;
+    var price = Math.round(sellPrice * 1.2 - buyPrice * 0.75 * 0.8);
     var needNum = Math.ceil(5e6 / (sellPrice * 1.2 - buyPrice * 0.75 * 0.8));
     var outputStr = "无往不利成就计算\n三级制造台 满抬满砍 未计算副产 未计算垃圾\n";
     outputStr = outputStr + "当前最低沙金 淘金乐园 " + buyVariation + buyTrend_updown + " " + buyPrice + "\n";
@@ -4323,10 +4327,10 @@ function apply(ctx, config) {
       var buyPrice = responseData["沙金"]["buy"]["淘金乐园"].price;
       var buyVariation = +responseData["沙金"]["buy"]["淘金乐园"].variation + "%";
       var buyTrend_updown = responseData["沙金"]["buy"]["淘金乐园"].trend === "up" ? "↑" : "↓";
-      var price = sellPrice - buyPrice * 0.75;
+      var price = Math.round(sellPrice * 1.2 - buyPrice * 0.75 * 0.8);
       var needNum = Math.ceil(1e7 / (sellPrice * 1.2 - buyPrice * 0.75 * 0.8));
       var outputStr = "点石成金成就计算\n三级制造台 满抬满砍 未计算副产 未计算垃圾\n\n";
-      if (needNum <= 1016) {
+      if (needNum <= 1016 && +num >= needNum) {
         outputStr = outputStr + "当前最低沙金 淘金乐园 " + buyVariation + buyTrend_updown + " " + buyPrice + "\n";
         outputStr = outputStr + "当前最高金线 " + sellCity + " " + sellVariation + sellTrend_updown + " 利润：" + price + "\n";
         outputStr = outputStr + "当前行情可以直接完成点石成金成就\n";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-resonance-columba-bot",
   "description": "雷索纳斯科伦巴商会市场查询",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [