Merge pull request #107 from fvtt-fria-ligan/dev

CONTRIBUTING.md

@@ -56,7 +56,7 @@ npm install
 
 ```bash
 # Build the dist folder where the system package lives.
-npm run build
+npm run dev
 ```
 
 ### 3. Link dist folder in systems.
@@ -101,7 +101,7 @@ If you do, congratulations:tada:! To begin editing the code:
 
 ```bash
 # Run the command that builds the dist folder then watches it for changes.
-npm run build:watch
+npm run dev:watch
 ```
 
 You can cancel watching the files for changes by using the command `ctrl + c` in the terminal window.

gulpfile.js

@@ -25,7 +25,7 @@ const stylesDirectory = `${sourceDirectory}/styles`;
 const stylesExtension = "scss";
 const sourceFileExtension = "js";
 const srcFiles = ["lang", "templates"];
-const staticFiles = ["assets", "fonts", "scripts", "system.json", "template.json"];
+const staticFiles = ["assets", "fonts", "scripts", "system.json", "template.json", "LICENSE"];
 const getDownloadURL = (version) =>
 	`https://github.com/fvtt-fria-ligan/forbidden-lands-foundry-vtt/releases/download/v${version}/v${version}.zip`;
 const repoPathing = (relativeSourcePath = ".", sourcemapPath = ".") => {

package.json

@@ -19,8 +19,9 @@
 		}
 	],
 	"scripts": {
-		"build": "cross-env NODE_ENV=development gulp build",
-		"build:watch": "cross-env NODE_ENV=development gulp watch",
+		"dev": "cross-env NODE_ENV=development gulp build",
+		"dev:watch": "cross-env NODE_ENV=development gulp watch",
+		"build": "cross-env NODE_ENV=production gulp build",
 		"link-project": "gulp link",
 		"clean": "gulp clean",
 		"clean:link": "gulp link --clean",
@@ -34,6 +35,7 @@
 	},
 	"devDependencies": {
 		"@rollup/plugin-node-resolve": "^11.2.1",
+		"@rollup/plugin-strip": "^2.0.0",
 		"@types/foundry-vtt-types": "npm:@league-of-foundry-developers/foundry-vtt-types@^0.7.9-5",
 		"@types/jquery": "^3.5.5",
 		"@typhonjs-fvtt/eslint-config-foundry.js": "^0.7.9",

rollup.config.js

@@ -1,4 +1,6 @@
-const { nodeResolve } = require("@rollup/plugin-node-resolve");
+const { nodeResolve } = require("@rollup/plugin-node-resolve"); // Node resolve is used to bundle node-modules at build if needed.
+const { terser } = require("rollup-plugin-terser"); // We are using terser to shave off 42% of our codebase at production
+const strip = require("@rollup/plugin-strip"); // Strip is used to remove console.logs and the hooks debug setting.
 const dotenv = require("dotenv");
 const result = dotenv.config();
 const env = process.env.NODE_ENV || "development";
@@ -13,5 +15,18 @@ module.exports = {
 		format: "es",
 		sourcemap: env === "development" ? true : false,
 	},
-	plugins: [nodeResolve()],
+	plugins: [
+		env === "production"
+			? strip({
+					labels: ["hookDebug"],
+			  })
+			: null,
+		nodeResolve(),
+		env === "production"
+			? terser({
+					mangle: false,
+					module: true,
+			  })
+			: null,
+	],
 };

src/lang/en.json

@@ -24,6 +24,7 @@
 	"ARTIFACT.APPEARANCE": "Appearance",
 	"ARTIFACT.ARTIFACT_BONUS": "Artifact Bonus",
 	"ARTIFACT.DESCRIPTION": "Description",
+	"ARTIFACT.DICELESS": "Special",
 	"ARTIFACT.DRAWBACK": "Drawback",
 	"ARTIFACT.EPIC": "Epic",
 	"ARTIFACT.LEGENDARY": "Legendary",
@@ -350,9 +351,9 @@
 	"FLCG.TALENT": "Talent",
 
 	"FLCG.SETTINGS.DATASET_DIR": "Dataset Directory",
-	"FLCG.SETTINGS.DATASET_DIR_HINT": "Path to a directory with dataset.json file. You can make your own dataset to customize generator's output.",
+	"FLCG.SETTINGS.DATASET_DIR_HINT": "Path to a directory with dataset.json file. You can make your own dataset to customize the generator's output.",
 	"FLCG.WARNING": "WARNING!",
 	"FLCG.WARNING_DESTRUCTIVE_EDIT": "You are about to destructively edit your character.",
-	"FLCG.WARNING_HINT": "Clicking the \"Apply!\"-button in the character generator will change your character with no way to reset the changes.",
+	"FLCG.WARNING_HINT": "Clicking the \"Apply!\"-button in the character generator will permanently change your character with no way to revert these changes.",
 	"FLCG.WARNING_ARE_YOU_SURE": "Are you sure you want to do this?"
 }

src/module/components/character-generator/character-converter.js

@@ -125,7 +125,7 @@ export class CharacterConverter {
 		return new ItemClass({
 			name: name,
 			type: type || "gear",
-			data: type === "talent" ? {} : { weight: "tiny" },
+			data: type === "talent" ? {} : { weight: "none" },
 		});
 	}
 

src/module/components/character-generator/character-generator.js

@@ -76,7 +76,7 @@ export class ForbiddenLandsCharacterGenerator extends Application {
 		await this.existActor.update({ ["data"]: updateData.data });
 		await this.existActor.createEmbeddedEntity("OwnedItem", updateData.items);
 
-		return false;
+		return this.close();
 	}
 
 	handleInputKin(event) {
@@ -237,13 +237,22 @@ export class ForbiddenLandsCharacterGenerator extends Application {
 		let kin = kinKey ? this.dataset.kin[kinKey] : this.rollOn(this.dataset.kin);
 
 		character.kin = kin.key;
-		if (character.age === undefined) {
-			character.age = this.rollAge(kin.age);
+		if (character.kin === "elf") {
+			character.age = {
+				ageNumber: NaN,
+				ageKey: 1,
+				ageString: "Adult",
+			};
+			character = this.rollFormativeEvents(character);
 		} else {
-			character.age.ageNumber = this.rollNumber(
-				kin.age[character.age.ageKey][0],
-				kin.age[character.age.ageKey][1],
-			);
+			if (character.age === undefined) {
+				character.age = this.rollAge(kin.age);
+			} else {
+				character.age.ageNumber = this.rollNumber(
+					kin.age[character.age.ageKey][0],
+					kin.age[character.age.ageKey][1],
+				);
+			}
 		}
 		character.childhood = this.rollOn(kin.childhood);
 
@@ -258,6 +267,7 @@ export class ForbiddenLandsCharacterGenerator extends Application {
 
 	rollFormativeEvents(character) {
 		let profession = this.dataset.profession[character.profession];
+		if (!profession) return character;
 		let formativeEvents = [];
 		let rolled = [];
 		let event = {};
@@ -304,8 +314,8 @@ export class ForbiddenLandsCharacterGenerator extends Application {
 		const mapping = ["Young", "Adult", "Old"];
 		let age = {};
 		age.ageKey = this.rollNumber(0, 2);
-		age.ageString = mapping[age.ageKey];
 		age.ageNumber = this.rollNumber(ageRanges[age.ageKey][0], ageRanges[age.ageKey][1]);
+		age.ageString = mapping[age.ageKey];
 
 		return age;
 	}

src/module/forbidden-lands.js

@@ -12,7 +12,12 @@ import FBL from "./system/config.js";
 import registerSettings from "./system/settings.js";
 import { BaseDie, GearDie } from "./components/dice.js";
 
-//CONFIG.debug.hooks = true;
+/**
+ * We use this label to remove the debug option in production builds. @See rollup.config.js
+ */
+// eslint-disable-next-line no-unused-labels
+hookDebug: CONFIG.debug.hooks = true;
+console.warn("HOOKS DEBUG ENABLED: ", CONFIG.debug.hooks);
 
 Hooks.once("init", () => {
 	game.fbl = {
@@ -31,8 +36,8 @@ Hooks.once("init", () => {
 });
 
 Hooks.once("ready", () => {
-	migrateWorld();
 	initializeCalendar();
+	migrateWorld();
 });
 
 Hooks.once("diceSoNiceReady", (dice3d) => {

src/module/hooks/calendar-weather.js

@@ -1,9 +1,10 @@
 export function initializeCalendar() {
 	// Init support for the Calendar/Weather module
 	if (!game.modules.get("calendar-weather")?.active) {
-		console.warn(
-			"Install the Calendar/Weather module for calendar support: https://foundryvtt.com/packages/calendar-weather/",
-		);
+		if (game.settings.get("forbidden-lands", "worldSchemaVersion") === 0)
+			ui.notifications.notify(
+				"Install the Calendar/Weather module for calendar support: https://foundryvtt.com/packages/calendar-weather/",
+			);
 		return;
 	}
 

src/module/hooks/migration.js

@@ -14,7 +14,7 @@ export const migrateWorld = async () => {
 					await actor.update(update, { enforceTypes: false });
 				}
 			} catch (e) {
-				console.error(e);
+				ui.notifications.error("Migration of actors failed.");
 			}
 		}
 		for (let item of game.items.entities) {
@@ -24,7 +24,7 @@ export const migrateWorld = async () => {
 					await item.update(update, { enforceTypes: false });
 				}
 			} catch (e) {
-				console.error(e);
+				ui.notifications.error("Migration of items failed.");
 			}
 		}
 		for (let scene of game.scenes.entities) {
@@ -33,8 +33,8 @@ export const migrateWorld = async () => {
 				if (!isObjectEmpty(update)) {
 					await scene.update(update, { enforceTypes: false });
 				}
-			} catch (err) {
-				console.error(err);
+			} catch (e) {
+				ui.notifications.error("Migration of scenes failed.");
 			}
 		}
 		for (let pack of game.packs.filter(

src/module/sheets/actor/actor.js

@@ -20,6 +20,7 @@ export class ForbiddenLandsActorSheet extends ActorSheet {
 
 	activateListeners(html) {
 		super.activateListeners(html);
+		if (!game.user.isGM && this.actor.limited) return;
 		// Attribute markers
 		html.find(".change-attribute").on("click contextmenu", (ev) => {
 			const attributeName = $(ev.currentTarget).data("attribute");

src/module/sheets/actor/character.js

@@ -5,9 +5,8 @@ export class ForbiddenLandsCharacterSheet extends ForbiddenLandsActorSheet {
 	static get defaultOptions() {
 		return mergeObject(super.defaultOptions, {
 			classes: ["forbidden-lands", "sheet", "actor"],
-			template: "systems/forbidden-lands/templates/character.hbs",
 			width: 700,
-			height: 770,
+			height: 780,
 			resizable: false,
 			scrollY: [
 				".armors .item-list .items",
@@ -27,6 +26,11 @@ export class ForbiddenLandsCharacterSheet extends ForbiddenLandsActorSheet {
 		});
 	}
 
+	get template() {
+		if (!game.user.isGM && this.actor.limited) return "systems/forbidden-lands/templates/limited-character.hbs";
+		return "systems/forbidden-lands/templates/character.hbs";
+	}
+
 	getData() {
 		const data = super.getData();
 		this.computeSkills(data);
@@ -221,6 +225,7 @@ export class ForbiddenLandsCharacterSheet extends ForbiddenLandsActorSheet {
 									<br/>`,
 								yes: async () => await this._charGen(),
 								no: () => {},
+								defaultYes: false,
 							});
 						} else {
 							await this._charGen();

src/module/sheets/item/item.js

@@ -3,7 +3,7 @@ export class ForbiddenLandsItemSheet extends ItemSheet {
 		return mergeObject(super.defaultOptions, {
 			...super.defaultOptions,
 			classes: ["forbidden-lands", "sheet", "item"],
-			width: window.innerWidth * 0.18 + 150,
+			width: window.innerWidth * 0.12 + 250,
 			resizable: false,
 		});
 	}

src/module/system/settings.js

@@ -10,7 +10,7 @@ export default function registerSettings() {
 	game.settings.register("forbidden-lands", "allowUnlimitedPush", {
 		name: game.i18n.localize("FLPS.SETTINGS.ALLOW_PUSH"),
 		hint: game.i18n.localize("FLPS.SETTINGS.ALLOW_PUSH_HINT"),
-		scope: "world",
+		scope: "client",
 		config: true,
 		default: false,
 		type: Boolean,