Skip to content

Commit 08edcbb

Browse files
committed
Update for 2.14.4-beta
1 parent f985d85 commit 08edcbb

10 files changed

Lines changed: 37 additions & 167 deletions

mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Debug Tools",
33
"description": "Adds a special debug tools menu into the game.",
4-
"version": "2.3.5",
4+
"version": "2.3.6",
55
"author": "Chiri Vulpes",
66
"github": "https://github.com/WaywardGame/debugtools",
77
"waywardVersion": "2.14.0-beta",

package-lock.json

Lines changed: 16 additions & 147 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
"watch": "npx tsc --build --watch --pretty --preserveWatchOutput"
1111
},
1212
"devDependencies": {
13-
"@wayward/types": "^2.14.3-beta",
14-
"rimraf": "3.0.2",
15-
"typescript": "^5.7.2"
13+
"@wayward/types": "^2.14.4-beta",
14+
"typescript": "^5.8.2"
1615
}
1716
}

src/action/AddItemToInventory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export default new Action(ActionArgument.Container, ActionArgument.ANY(ActionArg
8888
}
8989
}
9090

91-
action.executor.island.items.moveItemsToContainer(action.executor, createdItems, target);
91+
action.executor.island.items.moveItemsToContainer(action.executor, createdItems, target, { skipDrop: true });
9292

9393
if (containerObject instanceof Human) {
9494
containerObject.updateTablesAndWeight("M");

src/action/Heal.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,13 @@ export default new Action(ActionArgument.Entity, ActionArgument.OPTIONAL(ActionA
8989

9090
if (equippedReferences) {
9191
for (const [equipType, itemReference] of Object.entries(equippedReferences)) {
92-
const item = ItemReference.item(itemReference);
93-
if (item) {
94-
human.equip(item, +equipType as EquipType);
92+
const itemRef = ItemReference.create(itemReference);
93+
94+
if (itemRef?.item) {
95+
human.equip(itemRef.item, +equipType as EquipType);
9596
}
97+
98+
itemRef?.dispose();
9699
}
97100
}
98101
}

src/action/MagicalPropertyActions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { EntityType } from "@wayward/game/game/entity/IEntity";
33
import { Action } from "@wayward/game/game/entity/action/Action";
44
import { ActionArgument, ActionUsability } from "@wayward/game/game/entity/action/IAction";
55
import { ActionArgumentCustom } from "@wayward/game/game/entity/action/argument/ActionArgumentCustom";
6-
import type { MagicalPropertyIdentityHash } from "@wayward/game/game/magic/MagicalPropertyManager";
7-
import { MagicalPropertyIdentity } from "@wayward/game/game/magic/MagicalPropertyManager";
86
import MagicalPropertyType, { magicalPropertyDescriptions } from "@wayward/game/game/magic/MagicalPropertyType";
97
import Enums from "@wayward/game/utilities/enum/Enums";
108
import { defaultCanUseHandler } from "../Actions";
9+
import type { MagicalPropertyIdentityHash } from "@wayward/game/game/magic/IMagicalProperty";
10+
import { MagicalPropertyIdentity } from "@wayward/game/game/magic/IMagicalProperty";
1111

1212
export class MagicalPropertyIdentityArgument extends ActionArgumentCustom<MagicalPropertyIdentity> {
1313

src/ui/ActionHistory.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ export default class ActionHistory extends Component {
7979
const executor = game.references.resolve(context.executorReference) as Entity | undefined;
8080
this.renderHistoryItem(executor, context);
8181
if (Date.now() - lastSleep > 2) {
82-
await this.sleep(10);
82+
if (!await this.sleep(10)) {
83+
return;
84+
}
85+
8386
lastSleep = Date.now();
8487
}
8588
}

src/ui/InspectDialog.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -353,12 +353,7 @@ export default class InspectDialog extends TabDialog<InspectInformationSection>
353353
@Bound
354354
private logUpdate(): void {
355355
if (this.shouldLog) {
356-
Object.defineProperty(window, "$$tile", {
357-
configurable: true,
358-
get: () => {
359-
return this.tile;
360-
},
361-
});
356+
ConsoleUtility.magic.$$tile(this, me => me?.tile);
362357
this.LOG.info("$$tile:", this.tile?.["debug"]);
363358
this.shouldLog = false;
364359
}

src/ui/component/MagicalPropertiesEditor.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import type Doodad from "@wayward/game/game/doodad/Doodad";
22
import type Item from "@wayward/game/game/item/Item";
3-
import type { MagicalPropertyIdentityHash } from "@wayward/game/game/magic/MagicalPropertyManager";
4-
import { MagicalPropertyIdentity } from "@wayward/game/game/magic/MagicalPropertyManager";
53
import type MagicalPropertyType from "@wayward/game/game/magic/MagicalPropertyType";
64
import { magicalPropertyDescriptions } from "@wayward/game/game/magic/MagicalPropertyType";
75
import { TextContext } from "@wayward/game/language/ITranslation";
@@ -16,6 +14,8 @@ import { Bound } from "@wayward/utilities/Decorators";
1614
import { DebugToolsTranslation, translation } from "../../IDebugTools";
1715
import MagicalPropertyActions from "../../action/MagicalPropertyActions";
1816
import SingletonEditor from "./SingletonEditor";
17+
import type { MagicalPropertyIdentityHash } from "@wayward/game/game/magic/IMagicalProperty";
18+
import { MagicalPropertyIdentity } from "@wayward/game/game/magic/IMagicalProperty";
1919

2020
export enum MagicalPropertiesEditorClasses {
2121
Main = "debug-tools-magical-properties-editor",

src/ui/inspect/EntityInformation.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,9 @@ export default class EntityInformation extends InspectInformationSection {
220220
return;
221221
}
222222

223+
// TODO: Take off Curse check when we add it back in
223224
const stats = Enums.values(Stat)
224-
.filter(stat => this.entity?.asEntityWithStats?.stat.has(stat) && (!this.subsections.some(subsection => subsection.getImmutableStats().includes(stat))))
225+
.filter(stat => this.entity?.asEntityWithStats?.stat.has(stat) && (!this.subsections.some(subsection => subsection.getImmutableStats().includes(stat))) && stat !== Stat.Curse)
225226
.map(stat => this.entity?.asEntityWithStats?.stat.get<IStat>(stat))
226227
.filterNullish();
227228

0 commit comments

Comments
 (0)