Foundry/ripcrypt
1
0
Fork 0
Code Issues 22 Pull requests Releases Activity Actions

Merge pull request #59 from Eldritch-Oliver/feature/prompt-equip-on-drop

Browse source 
Add a prompt when you drag and drop an item onto an actor that asks you if you want to equip the item automatically
This commit is contained in:
Oliver 2025-10-07 18:31:55 -06:00 • committed by GitHub
commit cc917878c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 114 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/Apps/ItemSheets/AllItemSheetV1.mjs
View file

@ -61,7 +61,7 @@ export class AllItemSheetV1 extends GenericAppMixin(HandlebarsApplicationMixin(I
await super._processSubmitData(...args);
if (this.document.system.forceRerender) {
await this.render(false);
await this.render();
};
};
// #endregion

2
module/Apps/ItemSheets/ArmourSheet.mjs
View file

@ -55,7 +55,7 @@ export class ArmourSheet extends GenericAppMixin(HandlebarsApplicationMixin(Item
await super._processSubmitData(...args);
if (this.document.system.forceRerender) {
await this.render(false);
await this.render();
};
};

5
module/data/Actor/Entity.mjs
View file

@ -155,6 +155,11 @@ export class EntityData extends foundry.abstract.TypeDataModel {
};
// #region Getters
get equippedWeapons() {
const weapons = this.parent.itemTypes.weapon;
return weapons.filter(w => w.system.equipped);
};
get equippedArmour() {
const armours = this.parent.itemTypes.armour;
const slots = Object.fromEntries(

40
module/data/Item/Armour.mjs
View file

@ -4,12 +4,13 @@ import { localizer } from "../../utils/Localizer.mjs";
import { Logger } from "../../utils/Logger.mjs";
import { requiredInteger } from "../helpers.mjs";
const { diffObject, getProperty, setProperty } = foundry.utils;
const { DialogV2 } = foundry.applications.api;
const { fields } = foundry.data;
const { getProperty, diffObject, mergeObject } = foundry.utils;
/** Used for Armour and Shields */
export class ArmourData extends CommonItemData {
// MARK: Schema
// #region Schema
static defineSchema() {
return {
...super.defineSchema(),
@ -39,20 +40,23 @@ export class ArmourData extends CommonItemData {
}),
};
};
// MARK: Base Data
prepareBaseData() {
super.prepareBaseData();
};
// MARK: Derived Data
prepareDerivedData() {
super.prepareDerivedData();
};
// #endregion Schema
// #region Lifecycle
async _preCreate(item, options) {
const showEquipPrompt = options.showEquipPrompt ?? true;
if (showEquipPrompt && this.parent.isEmbedded && this._canEquip()) {
const shouldEquip = await DialogV2.confirm({
window: { title: `Equip Item?` },
content: `Do you want to equip ${item.name}?`,
});
if (shouldEquip) {
this.updateSource({ "equipped": true });
};
};
};
async _preUpdate(changes, options, user) {
// return false
if (options.force && game.settings.get(`ripcrypt`, `devMode`)) { return };
// Ensure changes is a diffed object
@ -69,9 +73,7 @@ export class ArmourData extends CommonItemData {
);
// Don't stop the update, but don't allow changing the equipped status
mergeObject(changes, {
"system.equipped": false,
});
setProperty(changes, `system.equipped`, false);
// Set a flag so that we can tell the sheet that it needs to rerender
this.forceRerender = true;
@ -79,7 +81,9 @@ export class ArmourData extends CommonItemData {
return valid;
};
// #endregion Lifecycle
// #region Helpers
/**
* Used to tell the preUpdate logic whether or not to prevent the item from
* being equipped or not.
@ -106,11 +110,9 @@ export class ArmourData extends CommonItemData {
};
return true;
};
// #endregion
// #region Getters
get locationString() {
return [...this.location].join(`, `);
};
// #endregion
// #endregion Helpers
};

80
module/data/Item/Weapon.mjs
View file

@ -2,12 +2,14 @@ import { barAttribute, optionalInteger, requiredInteger } from "../helpers.mjs";
import { CommonItemData } from "./Common.mjs";
import { gameTerms } from "../../gameTerms.mjs";
import { localizer } from "../../utils/Localizer.mjs";
import { Logger } from "../../utils/Logger.mjs";
const { diffObject, getProperty, setProperty } = foundry.utils;
const { DialogV2 } = foundry.applications.api;
const { fields } = foundry.data;
const { hasProperty, mergeObject } = foundry.utils;
export class WeaponData extends CommonItemData {
// MARK: Schema
// #region Schema
static defineSchema() {
return {
...super.defineSchema(),
@ -41,39 +43,69 @@ export class WeaponData extends CommonItemData {
}),
};
};
// MARK: Base Data
prepareBaseData() {
super.prepareBaseData();
};
// MARK: Derived Data
prepareDerivedData() {
super.prepareDerivedData();
};
// #endregion Schema
// #region Lifecycle
async _preCreate(item, options) {
const showEquipPrompt = options.showEquipPrompt ?? true;
if (showEquipPrompt && this.parent.isEmbedded && this._canEquip()) {
const shouldEquip = await DialogV2.confirm({
window: { title: `Equip Item?` },
content: `Do you want to equip ${item.name}?`,
});
if (shouldEquip) {
this.updateSource({ "equipped": true });
};
};
};
/**
*
* @param {*} changes The expanded object that was used for the update
* @param {*} options
* @param {*} user
* @returns
*/
async _preUpdate(changes, options, user) {
if (options.force && game.settings.get(`ripcrypt`, `devMode`)) { return };
const diff = diffObject(this.parent._source, changes);
let valid = super._preUpdate(changes, options, user);
if (hasProperty(changes, `system.equipped`) && !this.parent.isEmbedded) {
if (getProperty(diff, `system.equipped`) && !this._canEquip()) {
ui.notifications.error(localizer(
`RipCrypt.notifs.error.cannot-equip-not-embedded`,
`RipCrypt.notifs.error.cannot-equip`,
{ itemType: `@TYPES.Item.${this.parent.type}` },
));
mergeObject(
changes,
{ "-=system.equipped": null },
{ inplace: true, performDeletions: true },
);
return false;
// Don't stop the update, but don't allow changing the equipped status
setProperty(changes, `system.equipped`, false);
// Set a flag so that we can tell the sheet that it needs to rerender
this.forceRerender = true;
};
return valid;
};
// #endregion
// #endregion Lifecycle
// #region Helpers
/**
* Used to tell the preUpdate logic whether or not to prevent the item from
* being equipped or not.
*/
_canEquip() {
const parent = this.parent;
if (!parent.isEmbedded || !(parent.parent instanceof Actor)) {
Logger.error(`Unable to equip item when it's not embedded`);
return false;
};
const actor = this.parent.parent.system;
if (actor.equippedWeapons?.length >= actor.limit.weapons) {
return false;
};
return true;
};
// #region Getters
get traitString() {
return [...this.traits].join(`, `);
};
@ -84,7 +116,7 @@ export class WeaponData extends CommonItemData {
};
return String(this.range.short ?? this.range.long ?? ``);
};
// #endregion
// #endregion Helpers
// #region Sheet Data
async getFormFields(_ctx) {
@ -225,5 +257,5 @@ export class WeaponData extends CommonItemData {
return fields;
};
// #endregion
// #endregion Sheet Data
};