koishi-plugin-resonance-columba-bot 2.0.2 → 3.0.0

package/lib/data/roleSkills.d.ts

@@ -159,6 +159,9 @@ export declare var role_resonanceskills: {
     涟: {
         resonance: number;
     };
+    马吉拉·星仪: {
+        resonance: number;
+    };
 };
 export declare var ROLE_RESONANCE_SKILLS: {
     [role: string]: ResonanceSkills;

package/lib/index.d.ts

@@ -9,8 +9,10 @@ export interface Config {
     BigPrice: number;
     LowSmallPrice: number;
     LowBigPrice: number;
+    ShortTeamList: Array<string>;
     TeamList: Array<string>;
     ErrorTeamList: Array<string>;
+    MaxTeamList: Array<string>;
     ErrorItemList: Array<string>;
     ItemSendList: Dict<Dict<ConfigItemList, string>, string>;
     StartUrl: string;

package/lib/index.js

@@ -28,8 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   Config: () => Config,
   ConfigItemList: () => ConfigItemList,
   apply: () => apply,
@@ -39,7 +39,7 @@ __export(src_exports, {
   responseData: () => responseData,
   send_error: () => send_error
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 var import_koishi = require("koishi");
 
 // src/data/cicies.ts
@@ -74,7 +74,9 @@ var cityList = [
   "汇流塔",
   "远星大桥",
   "栖羽站",
-  "岚心城"
+  "岚心城",
+  "塔图站",
+  "黑月游乐城"
 ];
 var cityItemList = {};
 var CITIES = cityList;
@@ -209,6 +211,7 @@ var calculatePrice = /* @__PURE__ */ __name((pdtName, city, type, variation) =>
 var EVENTS = [
   // 红茶战争 2024/03/21 - 2024/04/11
   // 红茶战争 2024/07/30 - 2024/08/20
+  // 红茶战争 常驻
   {
     name: "红茶战争",
     description: "红茶购买量+50%, 红茶税率-5%",
@@ -705,6 +708,9 @@ var role_resonanceskills = {
   },
   涟: {
     resonance: 5
+  },
+  "马吉拉·星仪": {
+    resonance: 5
   }
 };
 var ROLE_RESONANCE_SKILLS = import_columbabuild3.RESONANCE_SKILLS;
@@ -748,6 +754,7 @@ var calculateOneGraphBuyCombinations = /* @__PURE__ */ __name((prices, maxLot, b
         const priceData = prices[name2];
         let buyPrice = priceData?.["buy"]?.[fromCity]?.price ?? 0;
         if (buyPrice === 0) {
+          console.warn(`No buy price data for ${name2} in ${fromCity}`);
           return [];
         }
         let buyLot = product.buyLot?.[fromCity] ?? 0;
@@ -1157,13 +1164,11 @@ var https = require("https");
 var vm = require("vm");
 async function updata_columba_data(ctx, startUrl = "", flag = false) {
   const result = await ctx.http("https://unpkg.com/resonance-data-columba/dist/columbabuild.js", { redirect: "manual" });
-  console.log(result.headers.get("location"));
   if (errorNum != 0) {
     var loca = result.headers.get("location");
     let locaNum = loca.match(/\d+(\.\d+)?/g);
     let num = Number(locaNum[1]) - errorNum;
     loca = loca.replace(locaNum[1], String(num));
-    console.log(loca);
     var url = "https://unpkg.com" + loca;
     console.log("尝试使用旧版本数据源 版本号 " + locaNum[0] + "." + num);
     send_error("尝试使用旧版本数据源 版本号 " + locaNum[0] + "." + num);
@@ -1173,7 +1178,6 @@ async function updata_columba_data(ctx, startUrl = "", flag = false) {
   if (startUrl != "" && startUrl != void 0) {
     url = startUrl;
   }
-  console.log(url);
   try {
     https.get(url, (res) => {
       let data = "";
@@ -1233,10 +1237,10 @@ __name(toSimplified, "toSimplified");
 
 // src/index.ts
 var name = "resonance-columba-bot";
-var min = 0;
-var errorNum = 0;
 var qqID = "";
 var getDataUrl = "";
+var min = 0;
+var errorNum = 0;
 var low_min = 0;
 var ConfigItemList = import_koishi.Schema.object({
   variation: import_koishi.Schema.array(import_koishi.Schema.number()).description("幅度阈值"),
@@ -1462,7 +1466,7 @@ function get_generalProfitIndex(maxRestock, onegraphBuyCombinationsGo, onegraphB
 }
 __name(get_generalProfitIndex, "get_generalProfitIndex");
 var ctx_send;
-function flagMaxTimer() {
+function flagMaxTimer(flag) {
   send_flag_max = true;
 }
 __name(flagMaxTimer, "flagMaxTimer");
@@ -1876,7 +1880,7 @@ function apply(ctx, config) {
     getDataUrl = ctx.config.DataUrl;
     console.log("插件启动");
     console.log("行情刷新时间为:", time, "毫秒");
-    if (ctx.config.StartUrl != "" && ctx.config.StartUrl != void 0)
+    if (ctx.config.StartUrl != "" && ctx.config.StartUrl != null)
       updata_columba_data(ctx, ctx.config.StartUrl, true);
     else
       updata_columba_data(ctx, "", true);
@@ -1959,6 +1963,15 @@ function apply(ctx, config) {
         if (nameFlag) {
           items_str = items_str + "查询到商品" + goodsName + "\n";
           short_items_str = goodsName;
+          if (responseData[goodsName]["buy"] != null && Object.keys(responseData[goodsName]["buy"]).length != 0) {
+            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"]);
+              items_str = items_str + cityName + " " + responseData[goodsName]["buy"][cityName]["variation"] + "%" + trend_updown + " 时间 " + time2 + " " + responseData[goodsName]["buy"][cityName]["price"].toString() + "\n";
+              buyCity.push(cityName);
+            }
+          }
           var city_list = [];
           for (var i = 0; i < 3; i++) {
             let max_price = 0;
@@ -1992,13 +2005,13 @@ function apply(ctx, config) {
               var trend = responseData[goodsName]["sell"][cityName2]["variation"] + "%";
               var trend_updown = responseData[goodsName]["sell"][cityName2]["trend"] === "up" ? "↑" : "↓";
               var time = intervalTime(responseData[goodsName]["sell"][cityName2]["time"]);
-              item_str = cityName2 + " " + trend + trend_updown + " 时间 " + time + " 售价 ";
+              item_str = cityName2 + " " + trend + trend_updown + " 时间 " + time + " 利润 ";
               if (base_price_list.length > 1) {
                 for (var price in base_price_list) {
-                  item_str = item_str + buyCity[price][0] + Math.round(+responseData[goodsName]["sell"][cityName2]["price"]);
+                  item_str = item_str + buyCity[price][0] + Math.round(+responseData[goodsName]["sell"][cityName2]["price"] * 1.2 - base_price_list[price] * 0.8) + " ";
                 }
               } else {
-                item_str = item_str + Math.round(+responseData[goodsName]["sell"][cityName2]["price"]);
+                item_str = item_str + Math.round(+responseData[goodsName]["sell"][cityName2]["price"] * 1.2 - base_price_list[0] * 0.8);
               }
               item_list[cityName2] = item_str;
             }
@@ -2014,7 +2027,52 @@ function apply(ctx, config) {
               item_list[cityName2] = item_str;
             }
           }
-          items_str = items_str + "商品出售：\n";
+          base_price_list = [];
+          var base_price = 0;
+          for (var good in PRODUCTS) {
+            if (PRODUCTS[good].name === goodsName) {
+              if (PRODUCTS[good].craft == null)
+                break;
+              items_str = items_str + "\n原材料购入：\n";
+              for (var craftGood in PRODUCTS[good]["craft"]) {
+                var craftBuyCity = "";
+                var craftGoodsPrice = 99999;
+                if (craftGood in responseData && Object.keys(responseData[craftGood]["buy"]).length != 0) {
+                  for (var cityName in responseData[craftGood]["buy"]) {
+                    if (responseData[craftGood]["buy"][cityName].price < craftGoodsPrice) {
+                      let trend2 = responseData[craftGood]["buy"][cityName]["variation"] + "%";
+                      let trend_updown2 = responseData[craftGood]["buy"][cityName]["trend"] === "up" ? "↑" : "↓";
+                      let time2 = intervalTime(responseData[craftGood]["buy"][cityName]["time"]);
+                      craftBuyCity = cityName;
+                      craftGoodsPrice = responseData[craftGood]["buy"][cityName].price;
+                      items_str = items_str + craftGood + " " + cityName + " " + trend2 + trend_updown2 + " 时间 " + time2 + " " + craftGoodsPrice + "\n";
+                    }
+                  }
+                  base_price = base_price + PRODUCTS[good]["craft"][craftGood] * craftGoodsPrice;
+                } else {
+                  items_str = items_str + craftGood + " 无出售数据,未计入成本。\n";
+                }
+              }
+              base_price_list.push(base_price);
+              for (let cityName2 of city_list) {
+                if (responseData[goodsName]["sell"][cityName2]["variation"] == 0)
+                  continue;
+                var trend = responseData[goodsName]["sell"][cityName2]["variation"] + "%";
+                var trend_updown = responseData[goodsName]["sell"][cityName2]["trend"] === "up" ? "↑" : "↓";
+                var time = intervalTime(responseData[goodsName]["sell"][cityName2]["time"]);
+                if (!(cityName2 in item_list))
+                  item_list[cityName2] = cityName2 + " " + trend + trend_updown + " 时间 " + time;
+                if (base_price_list.length > 1) {
+                  for (var price in base_price_list) {
+                    item_list[cityName2] = item_list[cityName2] + " 制造物利润 " + Math.round(+responseData[goodsName]["sell"][cityName2]["price"] * 1.2 - base_price_list[price] * 0.8);
+                  }
+                } else {
+                  item_list[cityName2] = item_list[cityName2] + " 制造物利润 " + Math.round(+responseData[goodsName]["sell"][cityName2]["price"] * 1.2 - base_price_list[0] * 0.8);
+                }
+              }
+            }
+          }
+          items_str = items_str + "\n商品出售：\n";
           short_items_str = short_items_str + "出售\n";
           for (let i2 in item_list) {
             items_str = items_str + item_list[i2] + "\n";

package/lib/utils/route-page-utils.d.ts

@@ -1,6 +1,6 @@
 import { CityName } from "../data/cicies";
 import { GetPricesProducts } from "../interfaces/get-prices";
-import { PlayerConfig, PlayerConfigBargain, PlayerConfigEvents, PlayerConfigPrestige, PlayerConfigProductUnlockStatus, PlayerConfigRoles } from "../interfaces/player-config";
+import { PlayerConfig, PlayerConfigBargain, PlayerConfigPrestige, PlayerConfigProductUnlockStatus, PlayerConfigRoles, PlayerConfigEvents } from "../interfaces/player-config";
 import { Product } from "../interfaces/product";
 import { CityGroupedExchanges, Exchange, OnegraphBuyCombinationStats, OnegraphBuyCombinations } from "../interfaces/route-page";
 export declare const GENERAL_PROFIT_INDEX_RESTOCK_FATIGUE_CONSTANT = 33;
@@ -8,7 +8,8 @@ export declare const calculateGeneralProfitIndex: (profit: number, fatigue: numb
 export declare const calculateExchanges: (playerConfig: PlayerConfig, fromCities: CityName[], toCities: CityName[], prices: GetPricesProducts) => Exchange[];
 export declare const groupeExchangesByCity: (exchanges: Exchange[]) => CityGroupedExchanges;
 export declare const calculateAccumulatedValues: (playerConfig: PlayerConfig, cityGroupedExchanges: CityGroupedExchanges) => void;
-export declare const getBestRoutesByNumberOfBuyingProductTypes: (fromCity: CityName, nbOfType: number, cityGroupedExchanges: CityGroupedExchanges, playerConfig: PlayerConfig) => any[];
+export declare const getBestRoutesByNumberOfBuyingProductTypes: (fromCity: CityName, nbOfType: number, // number of different kind of product to buy from the same city
+cityGroupedExchanges: CityGroupedExchanges, playerConfig: PlayerConfig) => any[];
 export declare const calculateOneGraphBuyCombinations: (prices: GetPricesProducts, maxLot: number, bargain: PlayerConfigBargain, prestige: PlayerConfigPrestige, roles: PlayerConfigRoles, productUnlockStatus: PlayerConfigProductUnlockStatus, playerConfigEvents: PlayerConfigEvents) => OnegraphBuyCombinations;
 export declare const getOneGraphRecommendation: (restock: number, goAndReturn: boolean, fromCity: CityName, toCity: CityName, buyCombinationsGo: OnegraphBuyCombinations, buyCombinationsRt?: OnegraphBuyCombinations) => OnegraphBuyCombinationStats[];
 export declare const getResonanceSkillBuyMorePercent: (roles: PlayerConfigRoles, product: Product, fromCity: CityName) => number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-resonance-columba-bot",
-  "description": "雷索纳斯综合功能插件-娃娃鱼报社版",
-  "version": "2.0.2",
+  "description": "雷索纳斯科伦巴商会市场查询",
+  "version": "3.0.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -20,6 +20,6 @@
   },
   "dependencies": {
     "axios": "^1.7.7",
-    "resonance-data-columba": "^1.3.105"
+    "resonance-data-columba": "^1.3.3"
   }
 }