diff --git a/images/ui/ecryme_logo_01.webp b/images/ui/ecryme_logo_01.webp
new file mode 100644
index 0000000..7a567b3
Binary files /dev/null and b/images/ui/ecryme_logo_01.webp differ
diff --git a/images/ui/ecryme_logo_small_01.webp b/images/ui/ecryme_logo_small_01.webp
new file mode 100644
index 0000000..898f5d4
Binary files /dev/null and b/images/ui/ecryme_logo_small_01.webp differ
diff --git a/images/ui/fond_carnet_01.webp b/images/ui/fond_carnet_01.webp
new file mode 100644
index 0000000..f93bd40
Binary files /dev/null and b/images/ui/fond_carnet_01.webp differ
diff --git a/images/ui/logo_pause.webp b/images/ui/logo_pause.webp
deleted file mode 100644
index 0abedd3..0000000
Binary files a/images/ui/logo_pause.webp and /dev/null differ
diff --git a/lang/en.json b/lang/en.json
new file mode 100644
index 0000000..a571d04
--- /dev/null
+++ b/lang/en.json
@@ -0,0 +1,26 @@
+{
+ "ACTOR": {
+ "TypePersonnage": "PC"
+ },
+ "ITEM": {
+ "TypeTrait": "Trait",
+ "TypeWeapon": "Weapon",
+ "TypeEquipment": "Equipment"
+ },
+ "ECRY": {
+ "ui": {
+ "traitType": "Trait type",
+ "niveauTrait": "Trait level",
+ "weight": "Weight",
+ "cost": "Cost",
+ "costunit": "Unit",
+ "effect": "Incidence",
+ "ingot": "Ingot",
+ "ingotin": "Ingotin",
+ "goldcoin": "Gold coin",
+ "lige": "Lige",
+ "hurle": "Howl",
+ "coin": "Coin"
+ }
+ }
+}
\ No newline at end of file
diff --git a/lang/fr.json b/lang/fr.json
index 3759df4..1655365 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1,13 +1,27 @@
{
"ACTOR": {
- "TypePersonnage": "Personnage"
+ "TypePersonnage": "PC"
},
"ITEM": {
- "TypeArme": "Arme",
- "TypeEquipement": "Equipement",
- "TypeTarot": "Tarot",
- "TypeElementbio": "Element Biographique",
- "TypeArchetype": "Archetype",
- "TypeSortilege": "Sortilège"
+ "TypeTrait": "Trait",
+ "TypeWeapon": "Weapon",
+ "TypeEquipment": "Equipment"
+ },
+ "ECRY": {
+ "ui": {
+ "traitType": "Type de trait",
+ "niveauTrait": "Niveau du trait",
+ "effect": "Effect",
+ "weight": "Poids",
+ "cost": "Prix",
+ "costUnit": "Unité",
+ "ingot": "Lingot",
+ "ingotin": "Lingotin",
+ "goldcoin": "Pièce d'or",
+ "lige": "Lige",
+ "hurle": "Hurle",
+ "coin": "Sous"
+
+ }
}
}
\ No newline at end of file
diff --git a/modules/actors/ecryme-actor-sheet.js b/modules/actors/ecryme-actor-sheet.js
index 91cdb69..13813e6 100644
--- a/modules/actors/ecryme-actor-sheet.js
+++ b/modules/actors/ecryme-actor-sheet.js
@@ -3,7 +3,7 @@
* @extends {ActorSheet}
*/
-import { EcrymeUtility } from "./common/ecryme-utility.js";
+import { EcrymeUtility } from "../common/ecryme-utility.js";
/* -------------------------------------------- */
export class EcrymeActorSheet extends ActorSheet {
diff --git a/modules/actors/ecryme-actor.js b/modules/actors/ecryme-actor.js
index a498eb5..101ea88 100644
--- a/modules/actors/ecryme-actor.js
+++ b/modules/actors/ecryme-actor.js
@@ -1,6 +1,6 @@
/* -------------------------------------------- */
-import { EcrymeUtility } from "./common/ecryme-utility.js";
-import { EcrymeRollDialog } from "./dialogs/ecryme-roll-dialog.js";
+import { EcrymeUtility } from "../common/ecryme-utility.js";
+import { EcrymeRollDialog } from "../dialogs/ecryme-roll-dialog.js";
/* -------------------------------------------- */
diff --git a/modules/app/ecryme-combat.js b/modules/app/ecryme-combat.js
index 7f2df10..7a65184 100644
--- a/modules/app/ecryme-combat.js
+++ b/modules/app/ecryme-combat.js
@@ -1,4 +1,4 @@
-import { EcrymeUtility } from "./common/ecryme-utility.js";
+import { EcrymeUtility } from "../common/ecryme-utility.js";
/* -------------------------------------------- */
export class EcrymeCombat extends Combat {
diff --git a/modules/app/ecryme-commands.js b/modules/app/ecryme-commands.js
index 8ddb413..63e8af6 100644
--- a/modules/app/ecryme-commands.js
+++ b/modules/app/ecryme-commands.js
@@ -1,7 +1,7 @@
/* -------------------------------------------- */
-import { EcrymeUtility } from "./common/ecryme-utility.js";
-import { EcrymeCharacterSummary } from "./app/ecryme-summary-app.js"
+import { EcrymeUtility } from "../common/ecryme-utility.js";
+import { EcrymeCharacterSummary } from "../app/ecryme-summary-app.js"
/* -------------------------------------------- */
export class EcrymeCommands {
diff --git a/modules/app/ecryme-summary-app.js b/modules/app/ecryme-summary-app.js
index 2f0f881..cbc94aa 100644
--- a/modules/app/ecryme-summary-app.js
+++ b/modules/app/ecryme-summary-app.js
@@ -1,5 +1,5 @@
/* -------------------------------------------- */
-import { EcrymeUtility } from "./common/ecryme-utility.js";
+import { EcrymeUtility } from "../common/ecryme-utility.js";
/* -------------------------------------------- */
export class EcrymeCharacterSummary extends Application {
@@ -38,7 +38,7 @@ export class EcrymeCharacterSummary extends Application {
constructor() {
super();
//game.settings.set("world", "character-summary-data", {npcList: [], x:0, y:0})
- this.settings = game.settings.get("world", "character-summary-data")
+ //this.settings = game.settings.get("world", "character-summary-data")
}
/* -------------------------------------------- */
diff --git a/modules/common/ecryme-config.js b/modules/common/ecryme-config.js
index 5202b52..0e8a4c4 100644
--- a/modules/common/ecryme-config.js
+++ b/modules/common/ecryme-config.js
@@ -1,3 +1,39 @@
export const ECRYME_CONFIG = {
+
+ traitTypes: {
+ normal: "Normal",
+ spleen: "Spleen",
+ ideal: "Ideal"
+ },
+ traitLevel: [
+ {value: -3, text: "-3"},
+ {value: -2, text: "-2"},
+ {value: -1, text: "-1"},
+ {value: +1, text: "+1"},
+ {value: +2, text: "+2"},
+ {value: +3, text: "+3"}
+ ],
+ skillLevel: {
+ "0": "0",
+ "1": "1",
+ "2": "2",
+ "3": "3",
+ "4": "4",
+ "5": "5",
+ "6": "6",
+ "7": "7",
+ "8": "8",
+ "9": "9",
+ "10": "10"
+ },
+ costUnits: {
+ "ingot": {name: "ECRY.ui.ingot", value: 100000},
+ "ingotin": {name: "ECRY.ui.ingotin", value: 10000},
+ "goldcoin": {name: "ECRY.ui.goldcoin", value: 1000 },
+ "lige": {name: "ECRY.ui.lige", value: 100 },
+ "hurle": {name: "ECRY.ui.hurle", value: 10 },
+ "coin": {name: "ECRY.ui.coin", value: 1 }
+ }
+
}
\ No newline at end of file
diff --git a/modules/common/ecryme-utility.js b/modules/common/ecryme-utility.js
index 236af32..a543991 100644
--- a/modules/common/ecryme-utility.js
+++ b/modules/common/ecryme-utility.js
@@ -1,5 +1,5 @@
/* -------------------------------------------- */
-import { EcrymeCommands } from "./ecryme-commands.js";
+import { EcrymeCommands } from "../app/ecryme-commands.js";
/* -------------------------------------------- */
@@ -101,6 +101,7 @@ export class EcrymeUtility {
const templatePaths = [
'systems/fvtt-ecryme/templates/actors/editor-notes-gm.hbs',
'systems/fvtt-ecryme/templates/items/partial-item-nav.hbs',
+ 'systems/fvtt-ecryme/templates/items/partial-item-equipment.hbs',
'systems/fvtt-ecryme/templates/items/partial-item-description.hbs'
]
return loadTemplates(templatePaths);
diff --git a/modules/dialogs/ecryme-roll-dialog.js b/modules/dialogs/ecryme-roll-dialog.js
index 828f41d..cb8a608 100644
--- a/modules/dialogs/ecryme-roll-dialog.js
+++ b/modules/dialogs/ecryme-roll-dialog.js
@@ -1,4 +1,4 @@
-import { EcrymeUtility } from "./ecryme-utility.js";
+import { EcrymeUtility } from "../common/ecryme-utility.js";
export class EcrymeRollDialog extends Dialog {
diff --git a/modules/ecryme-main.js b/modules/ecryme-main.js
index ee3472d..b524892 100644
--- a/modules/ecryme-main.js
+++ b/modules/ecryme-main.js
@@ -11,13 +11,12 @@
import { EcrymeActor } from "./actors/ecryme-actor.js";
import { EcrymeItemSheet } from "./items/ecryme-item-sheet.js";
import { EcrymeActorSheet } from "./actors/ecryme-actor-sheet.js";
-import { EcrymeNPCSheet } from "./actors/ecryme-npc-sheet.js";
import { EcrymeUtility } from "./common/ecryme-utility.js";
import { EcrymeCombat } from "./app/ecryme-combat.js";
import { EcrymeItem } from "./items/ecryme-item.js";
import { EcrymeHotbar } from "./app/ecryme-hotbar.js"
import { EcrymeCharacterSummary } from "./app/ecryme-summary-app.js"
-import { MALEFICES_CONFIG } from "./common/ecryme-config.js"
+import { ECRYME_CONFIG } from "./common/ecryme-config.js"
/* -------------------------------------------- */
/* Foundry VTT Initialization */
@@ -58,8 +57,8 @@ Hooks.once("init", async function () {
/* -------------------------------------------- */
// Register sheet application classes
Actors.unregisterSheet("core", ActorSheet);
- Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["personnage"], makeDefault: true });
- Actors.registerSheet("fvtt-ecryme", EcrymeNPCSheet, { types: ["pnj"], makeDefault: false });
+ Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["pc"], makeDefault: true });
+ //Actors.registerSheet("fvtt-ecryme", EcrymeNPCSheet, { types: ["pnj"], makeDefault: false });
Items.unregisterSheet("core", ItemSheet);
Items.registerSheet("fvtt-ecryme", EcrymeItemSheet, { makeDefault: true });
diff --git a/modules/items/ecryme-item-sheet.js b/modules/items/ecryme-item-sheet.js
index d60a79c..000dffc 100644
--- a/modules/items/ecryme-item-sheet.js
+++ b/modules/items/ecryme-item-sheet.js
@@ -1,4 +1,4 @@
-import { EcrymeUtility } from "./common/ecryme-utility.js";
+import { EcrymeUtility } from "../common/ecryme-utility.js";
/**
* Extend the basic ItemSheet with some very simple modifications
diff --git a/modules/items/ecryme-item.js b/modules/items/ecryme-item.js
index 2d2bc6d..1e452b1 100644
--- a/modules/items/ecryme-item.js
+++ b/modules/items/ecryme-item.js
@@ -1,4 +1,4 @@
-import { EcrymeUtility } from "./ecryme-utility.js";
+import { EcrymeUtility } from "../common/ecryme-utility.js";
export const defaultItemImg = {
weapon: "systems/fvtt-ecryme/images/icons/weapon.webp",
diff --git a/styles/ecryme.css b/styles/ecryme.css
index 8e22378..2146f6c 100644
--- a/styles/ecryme.css
+++ b/styles/ecryme.css
@@ -80,7 +80,7 @@
input:hover, select:hover {
border-width: 4px;
- border-color: rgb(85, 65, 130);
+ border-color: rgba(37, 124, 37, 0.7);
}
input:disabled {
@@ -403,7 +403,7 @@ li.folder > .folder-header h3 {
/* Sheet */
.window-app.sheet .window-content .sheet-header{
color: rgba(19, 18, 18, 0.95);
- background: url("../images/ui/background_01_clear.webp");
+ background: url("../images/ui/fond_carnet_01.webp");
/*background: #494e6b;*/
}
@@ -425,7 +425,7 @@ select {
.window-app.sheet .window-content .sheet-header input[type="password"], .window-app.sheet .window-content .sheet-header input[type="date"], .window-app.sheet .window-content .sheet-header input[type="time"] {
color: rgba(19, 18, 18, 0.95);
- background: url("../images/ui/background_01_clear.webp");
+ background: url("../images/ui/fond_carnet_01.webp");
border: 1 none;
margin-bottom: 0.25rem;
margin-left: 2px;
@@ -433,7 +433,7 @@ select {
.window-app.sheet .window-content .sheet-body input[type="password"], .window-app.sheet .window-content .sheet-body input[type="date"], .window-app.sheet .window-content .sheet-body input[type="time"] {
color: rgba(19, 18, 18, 0.95);
- background: url("../images/ui/background_01_clear.webp");
+ background: url("../images/ui/fond_carnet_01.webp");
border: 1 none;
margin-bottom: 0.25rem;
margin-left: 2px;
@@ -450,7 +450,7 @@ select {
.window-app .window-content, .window-app.sheet .window-content .sheet-body{
font-size: 0.8rem;
/*background: url("../images/ui/pc_sheet_bg.webp") repeat left top;*/
- background: url("../images/ui/background_01_clear.webp");
+ background: url("../images/ui/fond_carnet_01.webp");
color: rgba(19, 18, 18, 0.95);
}
@@ -473,7 +473,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
margin: 0;
padding: 0 0 0 0.25rem;
text-align: center;
- text-transform: uppercase;
+ /*text-transform: uppercase;*/
line-height: 1.5rem;
border-top: 0 none;
border-bottom: 0 none;
@@ -799,7 +799,7 @@ ul, li {
background-color:#f5f5f5;
background-position: 0px 35px;
background-repeat: no-repeat;
- background-image: url("../images/ui/background_01_clear.webp");
+ background-image: url("../images/ui/fond_carnet_01.webp");
color: rgba(19, 18, 18, 0.95);
}
@@ -1155,15 +1155,15 @@ ul, li {
color: #CCC
}
#pause > img {
- content: url(../images/ui/logo_pause.webp);
+ content: url(../images/ui/ecryme_logo_small_01.webp);
height: 200px;
width: 200px;
- top: -100px;
+ top: -200px;
left: calc(50% - 132px);
}
#logo {
- content : url(../images/ui/logo_pause.webp);
+ content : url(../images/ui/ecryme_logo_small_01.webp);
width: 100px;
height: 60px;
}
@@ -1311,17 +1311,6 @@ ul, li {
max-width: 16px;
max-height: 12px;
}
-.flip-tarot {
- transform: scaleY(-1);
-}
-.tarot-fixed-width {
- width: 140px;
- max-width: 140px;
-}
-.tarot-title {
- text-align: center;
- font-weight: bold;
-}
.character-summary-rollable {
text-decoration: underline;
}
diff --git a/system.json b/system.json
index b459fd6..08c8920 100644
--- a/system.json
+++ b/system.json
@@ -4,7 +4,7 @@
"modules/ecryme-main.js"
],
"gridDistance": 1,
- "gridUnits": "u",
+ "gridUnits": "m",
"languages": [
{
"lang": "fr",
@@ -42,7 +42,7 @@
],
"title": "Ecryme, le Jeu de Rôles",
"url": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme",
- "version": "10.0.0",
+ "version": "10.0.3",
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme/archive/fvtt-ecryme-v10.0.0.zip",
"background": "systems/fvtt-ecryme/images/ui/accueil_01.webp"
}
\ No newline at end of file
diff --git a/template.json b/template.json
index 4355f07..71e0f44 100644
--- a/template.json
+++ b/template.json
@@ -1,7 +1,7 @@
{
"Actor": {
"types": [
- "personnage"
+ "pc"
],
"templates": {
"biodata": {
@@ -122,7 +122,7 @@
"description": ""
}
},
- "personnage": {
+ "pc": {
"templates": [
"biodata",
"core"
@@ -130,50 +130,53 @@
}
},
"Item": {
- "types": ["item", "trait", "weapon", "scar", "specialization","annency", "boheme", "contact"],
+ "types": ["equipment", "trait", "weapon", "scar", "specialization","annency", "boheme", "contact"],
"templates": {
- "base": {
+ "common": {
"description": ""
+ },
+ "equipement": {
+ "weight": 0,
+ "cost": 0,
+ "costunit": ""
}
},
- "item": {
- "templates": ["base"],
+ "equipment": {
+ "templates": ["common","equipement"],
"quantity": 1,
"weight": 0
},
"trait": {
- "templates": ["base"],
- "traitype": "basic",
- "value": 1,
- "min": -2,
- "max": 2
+ "templates": ["common"],
+ "traitype": "normal",
+ "level": 1
},
"weapon": {
- "templates": ["base"],
- "effectLevel": 1
+ "templates": ["common", "equipement"],
+ "effect": 0
},
"specialization": {
- "templates": ["base"],
+ "templates": ["common"],
"skillname": ""
},
"scar": {
- "templates": ["base"],
+ "templates": ["common"],
"skillcategory": ["physical", "mental", "social", "cephalie"],
"scarLevel": 1
},
- "anence": {
- "templates": ["base"],
+ "annency": {
+ "templates": ["common"],
"collective": false,
"multiple": false,
"improvements": ""
},
"boheme": {
- "templates": ["base"],
+ "templates": ["common"],
"ideals": "",
"political": ""
},
"contact": {
- "templates": ["base"],
+ "templates": ["common"],
"attitude": "neutral",
"organization": "",
"location":""
diff --git a/templates/items/item-arme-sheet.hbs b/templates/items/item-arme-sheet.hbs
deleted file mode 100644
index 62dc172..0000000
--- a/templates/items/item-arme-sheet.hbs
+++ /dev/null
@@ -1,73 +0,0 @@
-
diff --git a/templates/items/item-trait-sheet.hbs b/templates/items/item-trait-sheet.hbs
new file mode 100644
index 0000000..b596894
--- /dev/null
+++ b/templates/items/item-trait-sheet.hbs
@@ -0,0 +1,48 @@
+
diff --git a/templates/items/item-weapon-sheet.hbs b/templates/items/item-weapon-sheet.hbs
new file mode 100644
index 0000000..e70f6df
--- /dev/null
+++ b/templates/items/item-weapon-sheet.hbs
@@ -0,0 +1,34 @@
+
diff --git a/templates/items/partial-item-equipment.hbs b/templates/items/partial-item-equipment.hbs
new file mode 100644
index 0000000..d6deb92
--- /dev/null
+++ b/templates/items/partial-item-equipment.hbs
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+