@occultus/condition-api 0.22.0-alpha.4 → 0.22.0-alpha.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occultus/condition-api",
-  "version": "0.22.0-alpha.4",
+  "version": "0.22.0-alpha.6",
   "repository": {
     "type": "git",
     "url": "https://codeberg.org/TeamOccultus/StarTenonAPI"

package/src/api/Conditions.ts

@@ -7,17 +7,15 @@ import { TextProvider } from "@occultus/text-api";
  * 定义了条件的基本结构和必须实现的方法，所有具体的条件类都应该继承此抽象类并实现其抽象方法
  */
 export abstract class Conditions {
-  /**
-   * @param data 条件所需的数据
-   */
-  constructor(protected data: unknown) {}
+  constructor() {}
   /**
    * 检查玩家是否满足条件
    *
    * @param player 要检查的玩家对象
+   * @param visual 将这次检查设置为虚拟检查，不会消耗条件对应游戏元素的数量
    * @return 如果玩家满足条件返回`true`，否则返回`false`
    */
-  abstract check(player: Player): boolean;
+  abstract check(player: Player, visual?: boolean): boolean;
   /**
    * 获取条件的文本，该文本将会在任务面板中显示
    *

package/src/api/ExpCondition.ts

@@ -10,14 +10,12 @@ export class ExpConditions extends Conditions {
    * @param experience 满足条件所需的最低等级
    * @param consumeAmount 倘若为`true`，则条件检查通过后会自动消耗对应等级
    */
-  constructor(
-    protected experience: number,
-    protected consumeAmount = false
-  ) {
-    super(experience);
+  constructor(protected experience: number, protected consumeAmount = false) {
+    super();
   }
-  check(player: Player) {
+  check(player: Player, visual = false) {
     if (getAllExp(player) >= this.experience) {
+      if (visual) return true;
       if (!this.consumeAmount) return true;
       player.addExperience(-this.experience);
       return true;
@@ -30,9 +28,9 @@ export class ExpConditions extends Conditions {
         // 达到 %s 级
         {
           translate: "task.condition.level",
-          with: { text: this.experience.toString() }
-        }
-      ]
+          with: { text: this.experience.toString() },
+        },
+      ],
     };
   }
   getFailedReason(): RawMessage {
@@ -41,9 +39,9 @@ export class ExpConditions extends Conditions {
         // 你需要达到 %s 级
         {
           translate: "task.condition.level.failed",
-          with: { text: this.experience.toString() }
-        }
-      ]
+          with: { text: this.experience.toString() },
+        },
+      ],
     };
   }
 }

package/src/api/ItemConditions.ts

@@ -2,7 +2,7 @@ import { ItemStack, Player, RawMessage } from "@minecraft/server";
 import { Conditions } from "./Conditions";
 import {
   getItemAmountInContainer,
-  removeItemInContainer
+  removeItemInContainer,
 } from "@occultus/toolkit";
 import { TextProvider } from "@occultus/text-api";
 
@@ -20,7 +20,7 @@ export class ItemConditions extends Conditions {
     protected amount: number = 1,
     protected consumeAmount = false
   ) {
-    super(itemType);
+    super();
   }
   /**
    * 获取条件对应的 ItemStack
@@ -36,11 +36,12 @@ export class ItemConditions extends Conditions {
    * @param player
    * @return
    */
-  check(player: Player) {
+  check(player: Player, visual = false) {
     const container = player.getComponent("minecraft:inventory")?.container;
     if (!container) return false;
     const amount = getItemAmountInContainer(container, this.getItem().typeId);
     if (amount >= this.getItem().amount) {
+      if (visual) return true;
       if (!this.consumeAmount) return true;
       removeItemInContainer(container, this.itemType, this.amount);
       return true;
@@ -56,8 +57,8 @@ export class ItemConditions extends Conditions {
       rawtext: [
         { translate: this.getItem().localizationKey },
         { text: " × " },
-        { text: this.getItem().amount.toString() }
-      ]
+        { text: this.getItem().amount.toString() },
+      ],
     };
   }
   /**
@@ -72,8 +73,8 @@ export class ItemConditions extends Conditions {
         { text: " " },
         { translate: this.getItem().localizationKey },
         { text: " × " },
-        { text: this.getItem().amount.toString() }
-      ]
+        { text: this.getItem().amount.toString() },
+      ],
     };
   }
 }

package/src/api/ItemTagConditions.ts

@@ -22,7 +22,7 @@ export class ItemTagConditions extends Conditions {
     protected translateKey: string,
     protected consumeAmount: boolean = false
   ) {
-    super(tag);
+    super();
   }
   /**
    * 检查玩家是否符合该条件的要求
@@ -31,12 +31,12 @@ export class ItemTagConditions extends Conditions {
    * @param player
    * @return
    */
-  check(player: Player) {
+  check(player: Player, visual = false) {
     const container = player.getComponent("minecraft:inventory")?.container;
     if (!container) return false;
     const amount = getTagItemAmountInContainer(container, this.tag);
-
     if (amount >= this.amount) {
+      if (visual) return true;
       if (!this.consumeAmount) return true;
       removeTagItemInContainer(container, this.tag, this.amount);
       return true;

package/src/api/{KillEntityCondition.ts → KillEntityConditions.ts}

@@ -12,9 +12,9 @@ export class KillEntityConditions extends Conditions {
    * @param entityType 满足条件所需要的实体类型
    */
   constructor(public entityType: string) {
-    super(entityType);
+    super();
   }
-  check(player: Player) {
+  check(player: Player, visual = false) {
     return false;
   }
   getTextProvider(): RawMessage {

package/src/api/KillEntityFamilyCondition.ts

@@ -14,9 +14,9 @@ export class KillEntityFamilyConditions extends Conditions {
     public family: string,
     public localizationKey: string
   ) {
-    super(family);
+    super();
   }
-  check(player: Player) {
+  check(player: Player, visual = false) {
     return false;
   }
   getTextProvider(): RawMessage {

package/src/api/{LevelCondition.ts → LevelConditions.ts}

@@ -9,14 +9,12 @@ export class LevelConditions extends Conditions {
    * @param level 满足条件所需的最低等级
    * @param consumeAmount 倘若为`true`，则条件检查通过后会自动消耗对应等级
    */
-  constructor(
-    protected level: number,
-    protected consumeAmount = false
-  ) {
-    super(level);
+  constructor(protected level: number, protected consumeAmount = false) {
+    super();
   }
-  check(player: Player) {
+  check(player: Player, visual = false) {
     if (player.level >= this.level) {
+      if (visual) return true;
       if (!this.consumeAmount) return true;
       player.addLevels(-this.level);
       return true;
@@ -29,9 +27,9 @@ export class LevelConditions extends Conditions {
         // 达到 %s 级
         {
           translate: "task.condition.level",
-          with: { text: this.level.toString() }
-        }
-      ]
+          with: { text: this.level.toString() },
+        },
+      ],
     };
   }
   getFailedReason(): RawMessage {
@@ -40,9 +38,9 @@ export class LevelConditions extends Conditions {
         // 你需要达到 %s 级
         {
           translate: "task.condition.level.failed",
-          with: { text: this.level.toString() }
-        }
-      ]
+          with: { text: this.level.toString() },
+        },
+      ],
     };
   }
 }

package/src/index.ts

@@ -2,9 +2,9 @@
  * @module @occultus/condition-api
  */
 export * from "./api/ItemConditions";
-export * from "./api/KillEntityCondition";
+export * from "./api/KillEntityConditions";
 export * from "./api/KillEntityFamilyCondition";
-export * from "./api/LevelCondition";
+export * from "./api/LevelConditions";
 export * from "./api/ExpCondition";
 export * from "./api/ItemTagConditions"
 export * from "./api/Conditions";