@occultus/condition-api 0.22.0-alpha.5 → 0.22.0-beta.1

package/README.md

@@ -27,4 +27,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-```
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occultus/condition-api",
-  "version": "0.22.0-alpha.5",
+  "version": "0.22.0-beta.1",
   "repository": {
     "type": "git",
     "url": "https://codeberg.org/TeamOccultus/StarTenonAPI"
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@occultus/format-api": "0.21.0",
-    "@occultus/text-api": "0.20.0",
-    "@occultus/toolkit": "0.22.1"
+    "@occultus/toolkit": "0.22.1",
+    "@occultus/text-api": "0.21.0"
   },
   "devDependencies": {
     "typedoc": "^0.28.15"

package/src/api/Conditions.ts

@@ -12,9 +12,10 @@ export abstract class Conditions {
    * 检查玩家是否满足条件
    *
    * @param player 要检查的玩家对象
+   * @param visual 将这次检查设置为虚拟检查，不会消耗条件对应游戏元素的数量
    * @return 如果玩家满足条件返回`true`，否则返回`false`
    */
-  abstract check(player: Player): boolean;
+  abstract check(player: Player, visual?: boolean): boolean;
   /**
    * 获取条件的文本，该文本将会在任务面板中显示
    *

package/src/api/ExpCondition.ts

@@ -16,8 +16,9 @@ export class ExpConditions extends Conditions {
   ) {
     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;

package/src/api/ItemConditions.ts

@@ -1,9 +1,6 @@
 import { ItemStack, Player, RawMessage } from "@minecraft/server";
 import { Conditions } from "./Conditions";
-import {
-  getItemAmountInContainer,
-  removeItemInContainer
-} from "@occultus/toolkit";
+import { getItemAmountOfPlayer, removeItemOfPlayer } from "@occultus/toolkit";
 import { TextProvider } from "@occultus/text-api";
 
 /**
@@ -36,13 +33,14 @@ 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);
+    const amount = getItemAmountOfPlayer(player, this.getItem().typeId);
     if (amount >= this.getItem().amount) {
+      if (visual) return true;
       if (!this.consumeAmount) return true;
-      removeItemInContainer(container, this.itemType, this.amount);
+      removeItemOfPlayer(player, this.itemType, this.amount);
       return true;
     }
     return false;

package/src/api/ItemTagConditions.ts

@@ -2,7 +2,7 @@ import { Player, RawMessage } from "@minecraft/server";
 import { Conditions } from "./Conditions";
 import {
   getTagItemAmountInContainer,
-  removeTagItemInContainer,
+  removeTagItemInContainer
 } from "@occultus/toolkit";
 import { TextProvider } from "@occultus/text-api";
 
@@ -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;
@@ -52,8 +52,8 @@ export class ItemTagConditions extends Conditions {
       rawtext: [
         { translate: "task.condition.itemTag" },
         { text: " × " },
-        { text: this.translateKey },
-      ],
+        { text: this.translateKey }
+      ]
     };
   }
   /**
@@ -68,8 +68,8 @@ export class ItemTagConditions extends Conditions {
         { text: " " },
         { translate: this.translateKey },
         { text: " × " },
-        { text: this.amount.toString() },
-      ],
+        { text: this.amount.toString() }
+      ]
     };
   }
 }

package/src/api/KillEntityConditions.ts

@@ -14,7 +14,7 @@ export class KillEntityConditions extends Conditions {
   constructor(public entityType: string) {
     super();
   }
-  check(player: Player) {
+  check(_player: Player, _visual = false) {
     return false;
   }
   getTextProvider(): RawMessage {

package/src/api/KillEntityFamilyCondition.ts

@@ -16,7 +16,7 @@ export class KillEntityFamilyConditions extends Conditions {
   ) {
     super();
   }
-  check(player: Player) {
+  check(_player: Player, _visual = false) {
     return false;
   }
   getTextProvider(): RawMessage {

package/src/api/LevelConditions.ts

@@ -15,8 +15,9 @@ export class LevelConditions extends Conditions {
   ) {
     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;

package/src/index.ts

@@ -1,10 +1,10 @@
-/**
- * @module @occultus/condition-api
- */
-export * from "./api/ItemConditions";
-export * from "./api/KillEntityConditions";
-export * from "./api/KillEntityFamilyCondition";
-export * from "./api/LevelConditions";
-export * from "./api/ExpCondition";
-export * from "./api/ItemTagConditions"
-export * from "./api/Conditions";
+/**
+ * @module @occultus/condition-api
+ */
+export * from "./api/ItemConditions";
+export * from "./api/KillEntityConditions";
+export * from "./api/KillEntityFamilyCondition";
+export * from "./api/LevelConditions";
+export * from "./api/ExpCondition";
+export * from "./api/ItemTagConditions";
+export * from "./api/Conditions";