Compare commits

...

8 Commits

Author SHA1 Message Date
Vlyan
8817f390e4 Release v1.10.1 2023-08-22 08:50:56 +02:00
Vlyan
b993914dcb v1.10.1 - #50, #51, #52
Css fixes and add the ability to have a different name on the custom-compendium
2023-08-19 12:36:13 +02:00
Vlyan
9fa30444aa Merge branch 'user-defined-name-for-custom-compendium' into 'dev'
Adding the ability to have a different name on the custom-compendium. This...

See merge request teaml5r/l5r5e!32
2023-08-19 10:06:37 +00:00
Vlyan
d607abe45d Merge branch 'fix-issue-52-dice-picker-with-large-font' into 'dev'
[Issue-#52] Fixing Dice-Picker with large text-size by setting max size using...

See merge request teaml5r/l5r5e!33
2023-08-19 09:59:40 +00:00
litasa
6e534d5bf3 [Issue-#52] Fixing Dice-Picker with large text-size by setting max size using rem instead of px. Also fixed the cropped numbers by removing their padding 2023-08-18 10:23:36 +02:00
litasa
848a54fa1e Adding the ability to have a different name on the custom-compendium. This also have the positive effect that you can easily switch between the clean git version and your own 2023-08-17 22:06:53 +02:00
Vlyan
7740aed299 Merge branch 'wait-for-3d-dice-animation-before-showing-result' into 'dev'
Roll-n-Keep dialog now waits for the DiceSoNice animation to finish before...

See merge request teaml5r/l5r5e!28
2023-06-18 08:58:19 +00:00
Litasa
c1adae132b Roll-n-Keep dialog now waits for the DiceSoNice animation to finish before... 2023-06-18 08:58:19 +00:00
14 changed files with 70 additions and 15 deletions

View File

@@ -1,6 +1,12 @@
# Changelog # Changelog
Date format : day/month/year Date format : day/month/year
## 1.10.1 - 22/08/2023 - Litasa's fixes
All these changes are thanks to Litasa.
- Roll-n-Keep dialog now waits for the DiceSoNice animation to finish before displaying the result when re-rolling or exploding dice (!28).
- Adding the ability to have a different name for the custom-compendium (needed to disable the system embedded ones).
- Fixes some CSS issues when the font size is not the default (#50, #51 and #52).
## 1.10.0 - 11/06/2023 - FoundryVTT v11 Compatibility ## 1.10.0 - 11/06/2023 - FoundryVTT v11 Compatibility
__! Be certain to carefully back up any critical user data before installing this update !__ __! Be certain to carefully back up any critical user data before installing this update !__
- Updated the System to FoundryVTT v11. - Updated the System to FoundryVTT v11.

View File

@@ -1,16 +1,14 @@
# Copyright (c) CC BY-NC-SA 4.0 2020 - 2021 This System is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. # Copyright (c) CC BY-NC-SA 4.0 2020 - 2023 This System is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
By exercising the Licensed Rights (link below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. By exercising the Licensed Rights (link below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
https://creativecommons.org/licenses/by-nc-sa/4.0/ https://creativecommons.org/licenses/by-nc-sa/4.0/
# Copyright (c) 2018 - 2023 Fantasy Flight Games. Legend of the Five Rings est TM de Fantasy Flight Games.
# Copyright (c) 2018 - 2021 Fantasy Flight Games. Legend of the Five Rings est TM de Fantasy Flight Games.
All images, texts and contents are the property of their creator / legal owner. All images, texts and contents are the property of their creator / legal owner.
# Copyright (c) 2020 - 2023 Foundry Network
# Copyright (c) 2020 - 2021 Foundry Network
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@@ -17,6 +17,11 @@
"CustomTechniques": { "CustomTechniques": {
"Title": "Use custom techniques", "Title": "Use custom techniques",
"Hint": "Add 'Specificity' technique type to serve as a catch-all." "Hint": "Add 'Specificity' technique type to serve as a catch-all."
},
"CustomCompendiumName": {
"Title": "Custom Compendium Name",
"Hint": "For advanced users that want to change the name of the custom compendiums (Used to disables the embedded ones).",
"Notification": "Unable set Custom Compendium: '{name}'. Is it activated and registered with Babele?"
} }
}, },
"TYPES": { "TYPES": {

View File

@@ -17,6 +17,11 @@
"CustomTechniques": { "CustomTechniques": {
"Title": "Use custom techniques", "Title": "Use custom techniques",
"Hint": "Add 'Specificity' technique type to serve as a catch-all." "Hint": "Add 'Specificity' technique type to serve as a catch-all."
},
"CustomCompendiumName": {
"Title": "Custom Compendium Name",
"Hint": "For advanced users that want to change the name of the custom compendiums (Used to disables the embedded ones).",
"Notification": "Unable set Custom Compendium: '{name}'. Is it activated and registered with Babele?"
} }
}, },
"TYPES": { "TYPES": {

View File

@@ -17,6 +17,11 @@
"CustomTechniques": { "CustomTechniques": {
"Title": "Utiliser les techniques personnalisées", "Title": "Utiliser les techniques personnalisées",
"Hint": "Ajoute un type de technique 'Particularités' pour servir de fourre-tout." "Hint": "Ajoute un type de technique 'Particularités' pour servir de fourre-tout."
},
"CustomCompendiumName": {
"Title": "Nom du CustomCompendium",
"Hint": "Pour les utilisateurs avancés qui souhaitent modifier le nom du compendium personnalisé (utilisé pour désactiver ceux intégrés).",
"Notification": "Impossible de définir le compendium personnalisé : '{name}'. Est-il activé et enregistré auprès de Babele ?"
} }
}, },
"TYPES": { "TYPES": {

View File

@@ -17,6 +17,11 @@
"CustomTechniques": { "CustomTechniques": {
"Title": "Usa tecniche custom", "Title": "Usa tecniche custom",
"Hint": "Aggiunge il tipo 'Speciale' come termine generale." "Hint": "Aggiunge il tipo 'Speciale' come termine generale."
},
"CustomCompendiumName": {
"Title": "Custom Compendium Name",
"Hint": "For advanced users that want to change the name of the custom compendiums (Used to disables the embedded ones).",
"Notification": "Unable set Custom Compendium: '{name}'. Is it activated and registered with Babele?"
} }
}, },
"TYPES": { "TYPES": {

View File

@@ -535,7 +535,7 @@ export class RollnKeepDialog extends FormApplication {
// Show DsN dice for the new roll // Show DsN dice for the new roll
if (game.dice3d !== undefined) { if (game.dice3d !== undefined) {
game.dice3d.showForRoll( await game.dice3d.showForRoll(
roll, roll,
game.user, game.user,
true, true,

View File

@@ -6,7 +6,7 @@ export default class HooksL5r5e {
// Enable embed Babele compendiums only if custom compendium is not found or disabled // Enable embed Babele compendiums only if custom compendium is not found or disabled
if ( if (
typeof Babele !== "undefined" && typeof Babele !== "undefined" &&
Babele.get().modules.every((module) => module.module !== "l5r5e-custom-compendiums") Babele.get().modules.every((module) => module.module !== game.settings.get(CONFIG.l5r5e.namespace, "custom-compendium-name"))
) { ) {
Babele.get().setSystemTranslationsDir("babele"); // Since Babele v2.0.7 Babele.get().setSystemTranslationsDir("babele"); // Since Babele v2.0.7
} }

View File

@@ -2,6 +2,8 @@
* Custom system settings register * Custom system settings register
*/ */
export const RegisterSettings = function () { export const RegisterSettings = function () {
const isBabeleRegistered = (typeof Babele !== "undefined");
/* ------------------------------------ */ /* ------------------------------------ */
/* User settings */ /* User settings */
/* ------------------------------------ */ /* ------------------------------------ */
@@ -36,6 +38,20 @@ export const RegisterSettings = function () {
type: Boolean, type: Boolean,
default: false, default: false,
}); });
game.settings.register(CONFIG.l5r5e.namespace, "custom-compendium-name", {
name: "SETTINGS.CustomCompendiumName.Title",
hint: "SETTINGS.CustomCompendiumName.Hint",
scope: "world",
config: isBabeleRegistered,
requiresReload: true,
type: String,
default: "l5r5e-custom-compendiums",
onChange: (name) => {
if (!Babele.get().modules.find((module) => module.module === name)) {
ui.notifications.warn(game.i18n.format("SETTINGS.CustomCompendiumName.Notification", { name }), { permanent: true });
}
}
});
/* ------------------------------------ */ /* ------------------------------------ */
/* Update */ /* Update */

File diff suppressed because one or more lines are too long

View File

@@ -118,7 +118,7 @@
// Dice Picker // Dice Picker
.dice-picker-dialog { .dice-picker-dialog {
min-width: 600px; min-width: 35rem;
min-height: auto; min-height: auto;
// Utility // Utility
* { * {
@@ -225,6 +225,7 @@
background: none; background: none;
border: none; border: none;
font-size: large; font-size: large;
padding: 0;
&-ring { &-ring {
color: #f0f0e0; color: #f0f0e0;

View File

@@ -1,11 +1,13 @@
/** Sheets **/ /** Sheets **/
&.sheet { &.sheet {
min-width: 600px; min-width: 37rem;
label { label {
&:hover { &:hover {
text-shadow: 0 0 2px $red; text-shadow: 0 0 2px $red;
} }
} }
.l5r-buttons-bar { .l5r-buttons-bar {
display: flex; display: flex;
flex: 0 0 100%; flex: 0 0 100%;
@@ -21,6 +23,7 @@
margin: 0 0 0 8px; margin: 0 0 0 8px;
} }
} }
&.actor { &.actor {
.sheet-header { .sheet-header {
h1 { h1 {
@@ -44,11 +47,13 @@
font-size: 1rem; font-size: 1rem;
} }
} }
form { form {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-content: flex-start; align-content: flex-start;
} }
.sheet-body { .sheet-body {
flex: 0 0 100%; flex: 0 0 100%;
align-items: flex-start; align-items: flex-start;
@@ -84,6 +89,7 @@
} }
} }
} }
section, section,
article { article {
&.tab[data-tab] { &.tab[data-tab] {
@@ -93,6 +99,7 @@
} }
} }
} }
.sheet-header { .sheet-header {
flex: 0 0 100%; flex: 0 0 100%;
align-items: flex-start; align-items: flex-start;
@@ -575,6 +582,7 @@
} }
} }
} }
article { article {
background: $l5r5e-white-light; background: $l5r5e-white-light;
padding: 0.5rem; padding: 0.5rem;
@@ -740,6 +748,7 @@
flex: 0 0 calc(50% - 0.5rem); flex: 0 0 calc(50% - 0.5rem);
} }
} }
.xp, .xp,
.money-wrapper { .money-wrapper {
flex: 100%; flex: 100%;
@@ -758,6 +767,7 @@
line-height: 13px; line-height: 13px;
} }
} }
table { table {
font-size: 0.85rem; font-size: 0.85rem;
color: $black-light; color: $black-light;
@@ -824,6 +834,7 @@
} }
} }
} }
.inventory { .inventory {
.items-wrapper { .items-wrapper {
h3 { h3 {
@@ -918,6 +929,7 @@
} }
} }
} }
nav { nav {
&.sheet-tabs { &.sheet-tabs {
flex: 100%; flex: 100%;

View File

@@ -32,8 +32,7 @@ button {
overflow: initial; overflow: initial;
height: calc(100% - 1.1rem); height: calc(100% - 1.1rem);
top: 0.2rem; top: 0.2rem;
width: 320px; min-width: 20rem;
min-width: 40px;
letter-spacing: 0.1rem; letter-spacing: 0.1rem;
position: relative; position: relative;
margin-right: 0.5rem; margin-right: 0.5rem;
@@ -172,6 +171,9 @@ button {
} }
} }
&.collapsed { &.collapsed {
min-width: 0;
width: 3rem !important;
#sidebar-tabs { #sidebar-tabs {
> .item { > .item {
&.active { &.active {

View File

@@ -7,11 +7,11 @@
"changelog": "https://gitlab.com/teaml5r/l5r5e/-/blob/master/CHANGELOG.md", "changelog": "https://gitlab.com/teaml5r/l5r5e/-/blob/master/CHANGELOG.md",
"license": "https://gitlab.com/teaml5r/l5r5e/-/blob/master/LICENSE.md", "license": "https://gitlab.com/teaml5r/l5r5e/-/blob/master/LICENSE.md",
"manifest": "https://gitlab.com/teaml5r/l5r5e/-/raw/master/system/system.json", "manifest": "https://gitlab.com/teaml5r/l5r5e/-/raw/master/system/system.json",
"download": "https://gitlab.com/teaml5r/l5r5e/-/jobs/artifacts/v1.10.0/raw/l5r5e.zip?job=build", "download": "https://gitlab.com/teaml5r/l5r5e/-/jobs/artifacts/v1.10.1/raw/l5r5e.zip?job=build",
"version": "1.10.0", "version": "1.10.1",
"compatibility": { "compatibility": {
"minimum": 11, "minimum": 11,
"verified": "11.301" "verified": "11.307"
}, },
"manifestPlusVersion": "1.2.0", "manifestPlusVersion": "1.2.0",
"socket": true, "socket": true,