uberwald/l5rx-chiaroscuro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' into dev_skillslist

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	system/lang/en-en.json
#	system/lang/fr-fr.json
#	system/scripts/actor.js
#	system/scripts/actors/base-character-sheet.js
#	system/scripts/combat.js
#	system/scripts/config.js
#	system/scripts/dice/dice-picker-dialog.js
#	system/scripts/dice/roll-n-keep-dialog.js
#	system/scripts/gm/gm-monitor.js
#	system/scripts/gm/gm-toolbox.js
#	system/scripts/hooks.js
#	system/scripts/items/technique-sheet.js
#	system/scripts/main-l5r5e.js
#	system/scripts/migration.js
#	system/scripts/preloadTemplates.js
#	system/scripts/settings.js
#	system/scripts/socket-handler.js
#	system/styles/l5r5e.css
#	system/system.json
#	system/templates/actors/character-sheet.html
This commit is contained in:
Vlyan
2023-12-14 10:08:41 +01:00
parent 67b7601fa1 9a46cfb842
commit 6f7b00328e
54 changed files with 9442 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
system/scripts/main-l5r5e.js
View File

@@ -112,99 +112,99 @@ Hooks.once("init", async () => {
// ***** Register custom sheets *****
// Actors
Actors.unregisterSheet("core", ActorSheet);
Actors.registerSheet(L5R5E.systemName, CharacterSheetL5r5e, {
Actors.registerSheet(L5R5E.namespace, CharacterSheetL5r5e, {
types: ["character"],
label: "ACTOR.TypeCharacter",
label: "TYPES.Actor.character",
makeDefault: true,
});
Actors.registerSheet(L5R5E.systemName, NpcSheetL5r5e, {
Actors.registerSheet(L5R5E.namespace, NpcSheetL5r5e, {
types: ["npc"],
label: "ACTOR.TypeNpc",
label: "TYPES.Actor.npc",
makeDefault: true,
});
Actors.registerSheet(L5R5E.systemName, ArmySheetL5r5e, {
Actors.registerSheet(L5R5E.namespace, ArmySheetL5r5e, {
types: ["army"],
label: "ACTOR.TypeArmy",
label: "TYPES.Actor.army",
makeDefault: true,
});
// Items
Items.unregisterSheet("core", ItemSheet);
Items.registerSheet(L5R5E.systemName, ItemSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, ItemSheetL5r5e, {
types: ["item"],
label: "ITEM.TypeItem",
label: "TYPES.Item.item",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, SkillSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, SkillSheetL5r5e, {
types: ["skill"],
label: "ITEM.TypeSkill",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, ArmorSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, ArmorSheetL5r5e, {
types: ["armor"],
label: "ITEM.TypeArmor",
label: "TYPES.Item.armor",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, WeaponSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, WeaponSheetL5r5e, {
types: ["weapon"],
label: "ITEM.TypeWeapon",
label: "TYPES.Item.weapon",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, TechniqueSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, TechniqueSheetL5r5e, {
types: ["technique"],
label: "ITEM.TypeTechnique",
label: "TYPES.Item.technique",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, PropertySheetL5r5e, {
Items.registerSheet(L5R5E.namespace, PropertySheetL5r5e, {
types: ["property"],
label: "ITEM.TypeProperty",
label: "TYPES.Item.property",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, PeculiaritySheetL5r5e, {
Items.registerSheet(L5R5E.namespace, PeculiaritySheetL5r5e, {
types: ["peculiarity"],
label: "ITEM.TypePeculiarity",
label: "TYPES.Item.peculiarity",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, AdvancementSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, AdvancementSheetL5r5e, {
types: ["advancement"],
label: "ITEM.TypeAdvancement",
label: "TYPES.Item.advancement",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, TitleSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, TitleSheetL5r5e, {
types: ["title"],
label: "ITEM.TypeTitle",
label: "TYPES.Item.title",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, BondSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, BondSheetL5r5e, {
types: ["bond"],
label: "ITEM.TypeBond",
label: "TYPES.Item.bond",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, SignatureScrollSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, SignatureScrollSheetL5r5e, {
types: ["signature_scroll"],
label: "ITEM.TypeSignature_scroll",
label: "TYPES.Item.signature_scroll",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, ItemPatternSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, ItemPatternSheetL5r5e, {
types: ["item_pattern"],
label: "ITEM.TypeItem_pattern",
label: "TYPES.Item.item_pattern",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, ArmyCohortSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, ArmyCohortSheetL5r5e, {
types: ["army_cohort"],
label: "ITEM.TypeArmy_cohort",
label: "TYPES.Item.army_cohort",
makeDefault: true,
});
Items.registerSheet(L5R5E.systemName, ArmyFortificationSheetL5r5e, {
Items.registerSheet(L5R5E.namespace, ArmyFortificationSheetL5r5e, {
types: ["army_fortification"],
label: "ITEM.TypeArmy_fortification",
label: "TYPES.Item.army_fortification",
makeDefault: true,
});
// Journal
Journal.unregisterSheet("core", JournalSheet);
Journal.registerSheet(L5R5E.systemName, BaseJournalSheetL5r5e, {
label: "JOURNAL.TypeJournal",
Journal.registerSheet(L5R5E.namespace, BaseJournalSheetL5r5e, {
label: "TYPES.Journal.journal",
makeDefault: true,
});
@@ -216,7 +216,7 @@ Hooks.once("init", async () => {
// Override the default Token _drawBar function to allow fatigue bar reversing.
Token.prototype._drawBar = function (number, bar, data) {
const reverseBar = data.attribute === "fatigue" && game.settings.get(L5R5E.systemName, "token-reverseFatigueBar");
const reverseBar = data.attribute === "fatigue" && game.settings.get(L5R5E.namespace, "token-reverseFatigueBar");
// Bar value
const pct = Math.clamped(Number(data.value), 0, data.max) / data.max;