\n${actor.data.data.use}\n`;
+
+ if (actor.data.data.interaction)
+ newInfo += `Interaction
\n${actor.data.data.interaction}\n`;
+
+ if (actor.data.data.loot)
+ newInfo += `Loot
\n${actor.data.data.loot}\n`;
+
+ newData["data.info"] = newInfo;
+ newData["data.-=combat"] = null;
+ newData["data.-=environment"] = null;
+ newData["data.-=motive"] = null;
+ newData["data.-=gmIntrusion"] = null;
+ newData["data.-=interaction"] = null;
+ newData["data.-=use"] = null;
+ newData["data.-=loot"] = null;
+
+ newData["data.version"] = this.forVersion;
+
+ return newData;
+};
+
+//Only export the latest migrator
+export const NPCActorMigrator = NPCActorv1ToV2Migrator;
diff --git a/module/migrations/migrate.js b/module/migrations/migrate.js
index 66bf0176..f43f0418 100644
--- a/module/migrations/migrate.js
+++ b/module/migrations/migrate.js
@@ -1,3 +1,4 @@
+import { NPCActorMigrator } from "./NPCActorMigrations.js";
import { PCActorMigrator } from "./PCActorMigrations.js";
import { ItemMigrator } from "./ItemMigrations.js";
@@ -9,7 +10,7 @@ export async function migrateWorld() {
return;
const currentPCActorVersion = PCActorMigrator.forVersion;
- const currentNPCActorVersion = 1; //NPCActorMigrator.forVersion;
+ const currentNPCActorVersion = NPCActorMigrator.forVersion;
const currentItemVersion = Item.forVersion;
let pcActors = game.actors.entities.filter(actor => actor.data.type === 'pc' && actor.data.data.version < currentPCActorVersion);
@@ -19,6 +20,7 @@ export async function migrateWorld() {
if (pcActors && pcActors.length > 0 || npcActors && npcActors.length > 0 || items && items.length > 0) {
ui.notifications.info(`Applying Numenera system migrations. Please be patient and do not close your game or shut down your server.`, {permanent: true});
+ //TODO these 3 migration blocks are exactly the same, refactor plz
try {
if (pcActors && pcActors.length > 0) {
const updatedPcData = await Promise.all(pcActors.map(async actor => await PCActorMigrator.migrate(actor)));
@@ -33,21 +35,20 @@ export async function migrateWorld() {
console.error("Error in PC migrations", e);
}
- //No NPC migrations yet
- // try {
- // if (npcActors)
- // npcActors = await Promise.all(pcActors.map(async actor => await NPCActorMigrator.migrate(actor)));
+ try {
+ if (npcActors && npcActors.length > 0) {
+ const updatedNpcData = await Promise.all(npcActors.map(async actor => await NPCActorMigrator.migrate(actor)));
- // for (const npcActor of npcActors) {
- // await NumeneraNPCActor.update(npcActor.data);
- // }
+ for (let i = 0; i < npcActors.length; i++) {
+ await npcActors[i].update(updatedNpcData[i]);
+ }
- // console.log("NPC Actor migration succeeded!");
- // } catch (e) {console.l
- // console.error("Error in NPC migrations", e);
- // }
+ console.log("NPC Actor migration succeeded!");
+ }
+ } catch (e) {
+ console.error("Error in NPC migrations", e);
+ }
- //No separate Item migrations yet
try {
if (items && items.length > 0) {
const updatedItems = await Promise.all(items.map(async item => await ItemMigrator.migrate(item)));
diff --git a/module/roll.js b/module/roll.js
index 611aed9d..fcab2d3c 100644
--- a/module/roll.js
+++ b/module/roll.js
@@ -2,11 +2,15 @@
Rolls a d20 and then determines your success level.
*/
-export function numeneraRoll(level = 0) {
+export function numeneraRollFormula(level = 0) {
let formula = "d20";
- if (level) formula += "+" + 3 * level;
+ if (level > 0) formula += "+" + 3 * level;
+
+ return formula;
+}
- return new Roll(formula).roll();
+export function numeneraRoll(level = 0) {
+ return new Roll(numeneraRollFormula(level));
}
export function rollText(dieRoll) {
diff --git a/module/settings.js b/module/settings.js
index 1e4f6059..e70037bb 100644
--- a/module/settings.js
+++ b/module/settings.js
@@ -79,4 +79,13 @@ export const registerSystemSettings = function() {
type: Boolean,
default: true
});
+
+ game.settings.register("numenera", "trademarkNotice", {
+ name: "Trademark Notice",
+ hint: "The Monte Cook Games logo, Numenera, and the Numenera logo are trademarks of Monte Cook Games, LLC in the U.S.A. and other countries. All Monte Cook Games characters and character names, and the distinctive likenesses thereof, are trademarks of Monte Cook Games, LLC. Content on this site or associated files derived from Monte Cook Games publications is © 2013-2019 Monte Cook Games, LLC. Monte Cook Games permits web sites and similar fan-created publications for their games, subject to the policy given at http://www.montecookgames.com/fan-use-policy/. The contents of this site are for personal, non-commercial use only. Monte Cook Games is not responsible for this site or any of the content, that did not originate directly from Monte Cook Games, on or in it. Use of Monte Cook Games’s trademarks and copyrighted materials anywhere on this site and its associated files should not be construed as a challenge to those trademarks or copyrights. Materials on this site may not be reproduced or distributed except with the permission of the site owner and in compliance with Monte Cook Games policy given at http://www.montecookgames.com/fan-use-policy/.",
+ scope: "world",
+ config: true,
+ type: null,
+ default: null
+ });
}
diff --git a/module/socket.js b/module/socket.js
index ab8265e4..48949f6d 100644
--- a/module/socket.js
+++ b/module/socket.js
@@ -13,7 +13,6 @@ function handleGMIntrusion(args) {
return;
//TODO disable or don't show Refuse button if PC has 0 XP
- //TODO display message for everyone about 1) intrusion and 2) choice
const actor = game.actors.entities.find(a => a.data._id === actorId);
const dialog = new GMIntrusionDialog(actor);
dialog.render(true);
diff --git a/numenera.js b/numenera.js
index d9551dbb..0cfa02e1 100644
--- a/numenera.js
+++ b/numenera.js
@@ -13,10 +13,8 @@ import { NumeneraOddityItemSheet } from './module/item/sheets/NumeneraOddityItem
import { NumeneraSkillItemSheet } from './module/item/sheets/NumeneraSkillItemSheet.js';
import { NumeneraWeaponItemSheet } from './module/item/sheets/NumeneraWeaponItemSheet.js';
-
import { NUMENERA } from './module/config.js';
import { getInitiativeFormula, rollInitiative } from './module/combat.js';
-import { rollText } from './module/roll.js';
import { preloadHandlebarsTemplates } from './module/templates.js';
import { registerSystemSettings } from './module/settings.js';
import { migrateWorld } from './module/migrations/migrate.js';
@@ -24,6 +22,7 @@ import { numeneraSocketListeners } from './module/socket.js';
import { RecoveryDialog } from './module/apps/RecoveryDialog.js';
import { registerHandlebarHelpers } from './module/handlebarHelpers.js';
import { add3rdBarToPCTokens, cypherToken } from './module/token.js';
+import { registerHooks } from './module/hooks.js';
Hooks.once("init", function() {
console.log('Numenera | Initializing Numenera System');
@@ -59,125 +58,20 @@ Hooks.once("init", function() {
Items.registerSheet("numenera", NumeneraOddityItemSheet, { types: ["oddity"], makeDefault: true });
Items.registerSheet("numenera", NumeneraSkillItemSheet, { types: ["skill"], makeDefault: true });
Items.registerSheet("numenera", NumeneraWeaponItemSheet, { types: ["weapon"], makeDefault: true });
+
+ //May seem weird but otherwise
+ Items.registerSheet("numenera", ActorSheet, { types: ["npcAttack"], makeDefault: true });
registerSystemSettings();
registerHandlebarHelpers();
preloadHandlebarsTemplates();
});
+//Place asy clean, well-behaved hook here
Hooks.once("init", cypherToken);
Hooks.once("ready", add3rdBarToPCTokens);
-
-//TODO cleanup the functions here, it's gonna get messy real quick
-
-/*
-Display an NPC's difficulty between parentheses in the Actors list
-*/
-Hooks.on('renderActorDirectory', (app, html, options) => {
- const found = html.find(".entity-name");
-
- app.entities
- .filter(actor => actor.data.type === 'npc')
- .forEach(actor => {
- found.filter((i, elem) => elem.innerText === actor.data.name)
- .each((i, elem) => elem.innerText += ` (${actor.data.data.level * 3})`);
- })
-});
-
-Hooks.on('renderCompendium', async (app, html, options) => {
- const npcs = game.actors.entities.filter(e => e.constructor === NumeneraNPCActor);
-
- html.find(".entry-name")
- .each((i, el) => {
- const actor = npcs.find(npc => el.innerText.indexOf(npc.data.name) !== -1);
- if (!actor)
- return;
-
- //Display the NPC's target between parentheses
- el.innerHTML += ` (${actor.data.data.level * 3})`;
- });
-
-});
-
-Hooks.on("renderChatMessage", (app, html, data) => {
- if (!data.message.roll)
- return;
-
- const roll = JSON.parse(data.message.roll);
-
- //Don't apply ChatMessage enhancement to recovery rolls
- if (roll && roll.dice[0].faces === 20)
- {
- const special = rollText(roll.total);
- const dt = html.find("h4.dice-total")[0];
-
- //"special" refers to special attributes: minor/major effect or GM intrusion text, special background, etc.
- if (special) {
- const { text, color } = special;
- const newContent = ``;
-
- $(newContent).insertBefore(dt);
- }
-
- if (game.settings.get("numenera", "d20Rolling") === "taskLevels") {
- const rolled = roll.dice[0].rolls[0].roll;
- const taskLevel = Math.floor(rolled / 3);
- const skillLevel = (roll.total - rolled) / 3;
- const sum = taskLevel + skillLevel;
-
- let text = `${game.i18n.localize("NUMENERA.successLevel")} ${sum}`;
-
- if (skillLevel !== 0) {
- const sign = sum > 0 ? "+" : "-";
- text += ` (${taskLevel}${sign}${skillLevel})`;
- }
-
- dt.textContent = text;
- }
-
- }
-});
-
-/**
- * Add additional system-specific sidebar directory context menu options for D&D5e Actor entities
- * @param {jQuery} html The sidebar HTML
- * @param {Array} entryOptions The default array of context menu options
- */
-Hooks.on("getActorDirectoryEntryContext", (html, entryOptions) => {
- entryOptions.push({
- name: game.i18n.localize("NUMENERA.gmIntrusion"),
- icon: '',
- callback: li => {
- const actor = game.actors.get(li.data("entityId"));
- const ownerIds = Object.entries(actor.data.permission)
- .filter(entry => {
- const [id, permissionLevel] = entry;
- return permissionLevel >= ENTITY_PERMISSIONS.OWNER
- && id !== game.user.id
- })
- .map(usersPermissions => usersPermissions[0]);
-
- game.socket.emit("system.numenera", {type: "gmIntrusion", data: {
- userIds: ownerIds,
- actorId: actor.data._id,
- }});
-
- ChatMessage.create({
- content: `${game.i18n.localize("NUMENERA.gmIntrusion")}
${game.i18n.localize("NUMENERA.gmIntrusionText")} ${actor.data.name}`,
- });
- },
- condition: li => {
- if (!game.user.isGM)
- return false;
-
- const actor = game.actors.get(li.data("entityId"));
- return actor && actor.data.type === "pc";
- }
- });
-});
-
-/**
- * Once the entire VTT framework is initialized, check to see if we should perform a data migration
- */
Hooks.once("ready", migrateWorld);
Hooks.once("ready", numeneraSocketListeners);
+
+//Random hooks should go in there
+registerHooks();
\ No newline at end of file
diff --git a/package.json b/package.json
index 1bdea2e5..eef481fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "numenera-foundryvtt",
- "version": "0.10.0",
+ "version": "0.11.0",
"description": "Support for the Numenera role playing game for the Foundry virtual tabletop",
"dependencies": {},
"devDependencies": {
diff --git a/sass/numenera.scss b/sass/numenera.scss
index 2fd78657..1483b5f4 100644
--- a/sass/numenera.scss
+++ b/sass/numenera.scss
@@ -7,6 +7,20 @@ $foundry-border-color: #782e22;
$border-color: #325d6d;
$font-stack: Ogirema;
+@mixin editor($class, $height, $id) {
+ div.#{$class} {
+ height: #{$height};
+
+ .editor {
+ height: 100%;
+ }
+
+ button#save-#{$id} {
+ width: 99%;
+ }
+ }
+}
+
span.numenera-message-special {
font-weight: bold;
font-size: large;
@@ -150,14 +164,35 @@ form.numenera {
div > div.npc-info {
flex: 0.25;
- input.levelDie {
- width: 2ch;
- align-content: center;
+ h1 {
+ margin-left: 0.5em;
+ margin-right: 0.5em;
+
+ input.charname {
+ width: 70%;
+ }
+
+ input.level {
+ width: 3em;
+ align-content: center;
+ }
}
}
div > div.npc-stats {
- flex: 0.5;
+ flex: 0.15;
+ padding: 1em;
+ text-align: center;
+
+ label {
+ padding-top: 2px;
+ font-size: 16px;
+ font-weight: bold;
+ }
+
+ input {
+ width: 2ch;
+ }
}
ul {
@@ -342,15 +377,22 @@ form.numenera {
border-bottom: 1px solid $border-color;
}
- div.description {
- height: 425px;
-
- .editor {
- height: 100%;
- }
+ //TinyMCE editors
+ @include editor("description", 425px, "bio");
- button#save-bio {
- width: 99%;
+ $totalDescriptionHeight: 285px;
+ $buttonHeight: 34px;
+ $descriptionHeight: $totalDescriptionHeight - $buttonHeight;
+
+ @include editor("npc-description", $descriptionHeight, "npc-description");
+ @include editor("npc-info", $descriptionHeight, "npc-info");
+
+ div.npc-modifications {
+ display: flex;
+ flex-direction: column;
+
+ textarea {
+ flex: 1;
}
}
@@ -404,6 +446,10 @@ form.numenera {
margin: 0.5em 0 0.5em 0;
border: 1px solid black;
border-radius: 8px;
+
+ &.sheet-tabs {
+ flex: 0;
+ }
}
a.item {
@@ -645,4 +691,4 @@ form.numenera-recovery {
padding: 4px 12px 4px 12px;
margin: 8px;
border: 1px solid #737373;
-}
\ No newline at end of file
+}
diff --git a/system.json b/system.json
index cc5d9cf0..75553c30 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
"name": "numenera",
"title": "Numenera",
"description": "Simple support for Numenera for the Fountry Virtual TableTop.",
- "version": "0.10.0",
+ "version": "0.11.0",
"author": "SolarBear",
"scripts": ["lib/dragula/dragula.min.js"],
"esmodules": ["numenera.js"],
@@ -21,9 +21,9 @@
}
],
"socket": true,
- "compatibleCoreVersion": "0.6.1",
+ "compatibleCoreVersion": "0.6.2",
"minimumCoreVersion" : "0.5.5",
"url": "https://github.com/SolarBear/Numenera-FoundryVTT",
"manifest": "https://raw.githubusercontent.com/SolarBear/Numenera-FoundryVTT/master/system.json",
- "download": "https://github.com/SolarBear/Numenera-FoundryVTT/releases/download/0.10.0/numenera-foundryvtt-0.10.0.zip"
+ "download": "https://github.com/SolarBear/Numenera-FoundryVTT/releases/download/0.11.0/numenera-foundryvtt-0.11.0.zip"
}
diff --git a/template.json b/template.json
index bed80fc5..b76a2613 100644
--- a/template.json
+++ b/template.json
@@ -50,29 +50,22 @@
},
"npc": {
"level": 1,
- "attacks": {},
- "description": null,
- "motive": null,
- "environment": null,
+ "description": "",
+ "info": "",
"health": {
"value": 1,
"max": 1
},
- "combat": null,
"damage": 0,
"armor": 0,
"movement": "short",
- "modifications": null,
- "interaction": null,
- "use": null,
- "loot": null,
- "gmIntrusion": null,
+ "modifications": "",
"image": null,
- "version": 1
+ "version": 2
}
},
"Item": {
- "types": ["ability", "armor", "artifact", "cypher", "equipment", "oddity", "skill", "weapon"],
+ "types": ["ability", "armor", "artifact", "cypher", "equipment", "npcAttack", "oddity", "skill", "weapon"],
"templates": {
"common": {
"notes": "",
@@ -128,6 +121,9 @@
"templates": ["common", "sellable"],
"quantity": 0
},
+ "npcAttack": {
+ "templates": ["common"]
+ },
"oddity": {
"templates": ["carriable", "common"]
},
diff --git a/templates/actor/characterSheet.html b/templates/actor/characterSheet.html
index d6a89eda..f376c73e 100644
--- a/templates/actor/characterSheet.html
+++ b/templates/actor/characterSheet.html
@@ -171,15 +171,16 @@ {{localize "NUMENERA.pc.armor.label"}}
{{/if}}
- {{localize "NUMENERA.abilities.tab.name"}}
- {{localize "NUMENERA.abilities.tab.cost"}}
- {{localize "NUMENERA.abilities.tab.range"}}
- {{localize "NUMENERA.abilities.tab.description"}}
- {{localize "NUMENERA.item.ability.tab.name"}}
+ {{localize "NUMENERA.item.ability.tab.cost"}}
+ {{localize "NUMENERA.item.ability.tab.range"}}
+ {{localize "NUMENERA.item.ability.tab.description"}}
+
@@ -195,8 +196,8 @@ {{localize "NUMENERA.pc.armor.label"}}
@@ -225,8 +226,8 @@ {{localize "NUMENERA.pc.armor.label"}} {{ability.data.notes}}
- 
-
+
+
{{else}}
@@ -236,7 +237,7 @@ {{localize "NUMENERA.pc.armor.label"}}
{{/if}}
- {{{localize "NUMENERA.abilities.tab.instructions"}}}
+ {{{localize "NUMENERA.item.ability.tab.instructions"}}}
{{/each}}
@@ -272,11 +273,11 @@ {{cypher.name}}
{{#if cypher.editable}}
-
- {{localize "NUMENERA.pc.numenera.form"}}: {{cypher.data.form}}
+ {{localize "NUMENERA.pc.numenera.cypher.form"}}: {{cypher.data.form}}
- {{localize "NUMENERA.pc.numenera.effect"}}: {{cypher.data.effect}}
+ {{localize "NUMENERA.pc.numenera.cypher.effect"}}: {{cypher.data.effect}}
@@ -340,11 +341,11 @@ {{artifact.name}}
{{#if artifact.editable}}
-
{{localize "NUMENERA.pc.armor.label"}}
@@ -225,8 +226,8 @@ {{localize "NUMENERA.pc.armor.label"}} {{ability.data.notes}}
-
+
+
{{localize "NUMENERA.pc.armor.label"}}
{{/if}}
- {{{localize "NUMENERA.abilities.tab.instructions"}}}
+ {{{localize "NUMENERA.item.ability.tab.instructions"}}}
{{/each}}
@@ -272,11 +273,11 @@ {{cypher.name}}
{{#if cypher.editable}}
-
- {{localize "NUMENERA.pc.numenera.form"}}: {{cypher.data.form}}
+ {{localize "NUMENERA.pc.numenera.cypher.form"}}: {{cypher.data.form}}
- {{localize "NUMENERA.pc.numenera.effect"}}: {{cypher.data.effect}}
+ {{localize "NUMENERA.pc.numenera.cypher.effect"}}: {{cypher.data.effect}}
@@ -340,11 +341,11 @@ {{artifact.name}}
{{#if artifact.editable}}
-
- {{localize "NUMENERA.pc.numenera.form"}}: {{cypher.data.form}} + {{localize "NUMENERA.pc.numenera.cypher.form"}}: {{cypher.data.form}}
- {{localize "NUMENERA.pc.numenera.effect"}}: {{cypher.data.effect}} + {{localize "NUMENERA.pc.numenera.cypher.effect"}}: {{cypher.data.effect}}