diff --git a/system/lang/fr-fr.json b/system/lang/fr-fr.json index b2a710d..691c1cf 100644 --- a/system/lang/fr-fr.json +++ b/system/lang/fr-fr.json @@ -36,7 +36,7 @@ "clan": "Clan", "family": "Famille", "school": "Ecole", - "schoolRank": "Rang", + "schoolrank": "Rang", "roles": "Rôles", "distinctions": "Aptitudes", "distinctionstip": "Lorsque vous effectuez un test auquel s'applique une aptitude, vous pouvez relancer jusqu'à 2 dés.", @@ -51,7 +51,7 @@ "successes": "Succès", "explosives": "Explosifs", "opportunities": "Opportunités", - "strives": "Conflicts", + "strives": "Conflits", "difficulty": "Difficulté", "dicepicker": "Dice Picker" }, diff --git a/system/scripts/dice/dice-picker-dialog.js b/system/scripts/dice/dice-picker-dialog.js index ac916f8..e030582 100644 --- a/system/scripts/dice/dice-picker-dialog.js +++ b/system/scripts/dice/dice-picker-dialog.js @@ -29,7 +29,7 @@ export class DicePickerDialog extends Application { id: "l5r5e-dice-picker-dialog", classes: ["l5r5e", "dice-picker-dialog"], template: "systems/l5r5e/templates/dice/dice-picker-dialog.html", - width: 400, + width: 480, // height: 400, // title: "L5R Dice Roller", actor: null, @@ -44,9 +44,9 @@ export class DicePickerDialog extends Application { constructor(options = null) { super(options); - // Get Actor from: sheet, selected token, nothing - const actor = options?.actor || canvas.tokens.controlled[0]?.actor || null; - if (actor instanceof Actor) { + // Get Actor from: options, 1st selected token, selected character + const actor = options?.actor || canvas.tokens.controlled[0]?.actor || game.user.character || null; + if (actor instanceof Actor && actor.owner) { this.actor = actor; } @@ -133,7 +133,7 @@ export class DicePickerDialog extends Application { roll.l5r5e.stance = approach; roll.l5r5e.skillId = this.skillData.id; - roll.l5r5e.actor = this.actor; + roll.actor = this.actor; await roll.roll(); await roll.toMessage(); diff --git a/system/scripts/dice/roll.js b/system/scripts/dice/roll.js index 709387a..b0d12a6 100644 --- a/system/scripts/dice/roll.js +++ b/system/scripts/dice/roll.js @@ -44,6 +44,10 @@ export class RollL5r5e extends Roll { // TODO parse difficulty stance skillId from cmd line ? } + set actor(actor) { + this.l5r5e.actor = (actor instanceof Actor && actor.owner) || null; + } + /** * Execute the Roll, replacing dice and evaluating the total result * @override @@ -259,6 +263,11 @@ export class RollL5r5e extends Roll { type: template, content: this._total, sound: CONFIG.sounds.dice, + speaker: { + actor: this.l5r5e.actor?._id || null, + token: this.l5r5e.actor?.token || null, + alias: this.l5r5e.actor?.name || null, + }, }, messageData ); diff --git a/system/scripts/main-l5r5e.js b/system/scripts/main-l5r5e.js index 16d183b..31ba6d3 100644 --- a/system/scripts/main-l5r5e.js +++ b/system/scripts/main-l5r5e.js @@ -75,6 +75,12 @@ Hooks.once("init", async function () { return game.i18n.localize(key); }); + Handlebars.registerHelper("localizeSkillId", function (skillName) { + const key = + "l5r5e.skills." + RollL5r5e.getCategoryForSkillId(skillName.toLowerCase()) + "." + skillName.toLowerCase(); + return game.i18n.localize(key); + }); + Handlebars.registerHelper("localizeRing", function (ringName) { const key = "l5r5e.rings." + ringName.toLowerCase(); return game.i18n.localize(key); diff --git a/system/scripts/sheets/actor-sheet.js b/system/scripts/sheets/actor-sheet.js index e0904d3..be387a7 100644 --- a/system/scripts/sheets/actor-sheet.js +++ b/system/scripts/sheets/actor-sheet.js @@ -111,7 +111,7 @@ export class ActorSheetL5r5e extends ActorSheet { */ async _createFeat() { const data = { - name: game.i18n.localize("L5r5e.FeatPlaceholderName"), + name: game.i18n.localize("l5r5e.featplaceholdername"), type: "feat", }; const created = await this.actor.createEmbeddedEntity("OwnedItem", data); diff --git a/system/styles/conf/l5r5e.scss b/system/styles/conf/l5r5e.scss index c2b46a7..835e46e 100644 --- a/system/styles/conf/l5r5e.scss +++ b/system/styles/conf/l5r5e.scss @@ -3,9 +3,9 @@ @import "../scss/global"; @import "../scss/fonts"; @import "../scss/ui"; -@import "../scss/dices"; .l5r5e { + @import "../scss/dices"; @import "../scss/sheets"; @import "../scss/nav"; @import "../scss/rings"; diff --git a/system/styles/l5r5e.css b/system/styles/l5r5e.css index 5274278..df7eef6 100644 --- a/system/styles/l5r5e.css +++ b/system/styles/l5r5e.css @@ -1 +1 @@ -.window-app .window-content{z-index:1;position:relative;background:url("../assets/imgs/bgL5R.webp") no-repeat;background-size:cover}.window-app .window-resizable-handle{z-index:2;background:rgba(0,0,0,0.75)}*{transition-property:background, color, border-color, text-shadow, box-shadow;transition-duration:0.5s;transition-timing-function:ease}input[type="text"]:focus,input[type="number"]:focus,input[type="password"]:focus,input[type="date"]:focus,input[type="time"]:focus{box-shadow:0 0 6px rgba(255,0,0,0.75)}.tabs .item.active{text-shadow:0 0 10px rgba(255,0,0,0.75)}#controls .scene-control.active,#controls .control-tool.active,#controls .scene-control:hover,#controls .control-tool:hover{box-shadow:0 0 10px rgba(255,0,0,0.75)}ul,li{list-style-type:none;margin:0;padding:0}input[type="text"],input[type="number"],input[type="password"],input[type="date"],input[type="time"]{background:rgba(255,255,255,0.5);border:1px solid rgba(186,187,177,0.5);padding:0.25rem;color:#764f40}@font-face{font-family:"LogotypeL5r";src:url("../fonts/LogotypeL5r.ttf") format("truetype")}@font-face{font-family:"BrushtipTexe";src:url("../fonts/BrushtipTexe.otf") format("opentype")}@font-face{font-family:"PatrickHand";src:url("../fonts/PatrickHand.ttf") format("truetype")}body{font:16px "PatrickHand",sans-serif;letter-spacing:0.05rem}h1,h4{font-family:"BrushtipTexe",sans-serif}h1{font-size:2rem}h4{font-size:1.25rem}i.strife,i.success,i.explosive,i.opportunity,i.d6,i.d12,i.i_earth,i.i_water,i.i_fire,i.i_air,i.i_void{font-family:LogotypeL5r;line-height:1rem;font-style:normal;font-weight:normal;vertical-align:middle}i.strife:before{content:"f"}i.success:before{content:"s"}i.explosive:before{content:"e"}i.opportunity:before{content:"o"}i.d6:before{content:"r"}i.d12:before{content:"k"}i.i_earth:before{content:"g"}i.i_water:before{content:"w"}i.i_fire:before{content:"i"}i.i_air:before{content:"a"}i.i_void:before{content:"v"}#sidebar{background-position:top;background-size:100%;background-repeat:no-repeat;background:url("../assets/ui/bgSidebar.png") no-repeat;top:0;height:100%;padding:0.5rem}#sidebar #sidebar-tabs{flex:0 0 1rem;box-sizing:border-box;margin:0 0 0.25rem;border-bottom:1px solid rgba(255,255,255,0.25);box-shadow:none}#sidebar #sidebar-tabs>.item{line-height:27px;border-radius:100%;margin:0;flex:0 0 27px;height:27px}#sidebar #sidebar-tabs>.item .active{border:1px solid rgba(255,100,0,0.75);box-shadow:0 0 6px rgba(255,100,0,0.75)}#sidebar .message-sender{color:#963c41}#sidebar .chat-control-icon{cursor:url(../l5r-ui/ui/cursors/pointer.webp),pointer}#hotbar{margin:0}#hotbar #action-bar{flex:0 0 100%}#hotbar #action-bar .macro{-o-border-image:url("../assets/ui/macro-button.webp");border-image:url("../assets/ui/macro-button.webp");border-image-slice:8 fill;border-image-width:0.25rem;border-image-outset:0;border-radius:0}#hotbar #action-bar .macro .macro-key{background:transparent}#hotbar #action-bar #macro-list{background:rgba(0,0,0,0.75);margin:0;padding:0.05rem;border:none;border-radius:0;background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image-width:0.5rem;border-image-outset:0px;box-shadow:0.25rem 0.25rem 0.5rem rgba(0,0,0,0.75)}#hotbar .bar-controls{background:rgba(0,0,0,0.75);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image-width:0.5rem;border-image-outset:0px;box-shadow:0 0 0.25rem rgba(0,0,0,0.75);border-radius:0;margin:0 0.5rem}#hotbar .bar-controls a.page-control,#hotbar .bar-controls span.page-number{font-size:1rem;line-height:0.95rem}#players{background:rgba(0,0,0,0.75);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image-width:0.5rem;border-image-outset:0px;margin:0;padding:0;left:1.15rem;bottom:0.65rem;box-shadow:inset 0 0 0.5rem rgba(0,0,0,0.75)}#players:before{z-index:-1;position:absolute;content:"";background:transparent url("../assets/ui/players-border.webp") no-repeat 0 0;background-size:100%;display:block;top:-12px;right:10%;left:10%;bottom:0}#logo{height:80px;margin-left:0.5rem;opacity:0.5}#logo:hover{opacity:0.75}#navigation{left:120px}#navigation #nav-toggle,#navigation #scene-list .scene.nav-item{cursor:default;color:rgba(255,255,255,0.65);background:linear-gradient(#285064, #0a141e, #285064);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image-width:0.25rem;border-image-outset:0px}#navigation #scene-list .scene.nav-item.active{background:linear-gradient(#41140f, #230a05, #41140f)}#navigation #scene-list .scene.view,#navigation #scene-list .scene.context{cursor:default;color:#fff;background:linear-gradient(#41140f, #230a05, #41140f);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image-width:0.25rem;border-image-outset:0px;box-shadow:0 0 20px red}#controls{top:100px}#controls .scene-control.active,#controls .control-tool.active,#controls .scene-control:hover,#controls .control-tool:hover{background:linear-gradient(#41140f, #230a05, #41140f);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image-width:0.25rem;border-image-outset:0px;box-shadow:0 0 10px rgba(255,0,0,0.75)}#controls .scene-control,#controls .control-tool{background:linear-gradient(#285064, #0a141e, #285064);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image-width:0.25rem;border-image-outset:0px}.l5r5e.chat-dice>img{border:1px solid transparent;background-repeat:no-repeat;background-position:center;background-size:100%;height:44px;width:44px;outline:none;margin:0;flex:0 0 20px;display:inline-block}.l5r5e.sheet{min-width:600px}.l5r5e.sheet .sheet-header h1{flex:auto;margin:0 0.5rem 0.25rem}.l5r5e.sheet .sheet-header h1 input{flex:0 0 100%;height:4rem;margin:0.5rem 0 0;width:100%;color:#963c41;background:transparent;border:0 none;border-radius:0;border-bottom:1px dotted rgba(0,0,0,0.5)}.l5r5e.sheet .sheet-header h1:before{content:"";position:absolute;background:url("../assets/imgs/brushL5r.webp") no-repeat 0 0;background-size:contain;height:225px;width:100%;z-index:-1;left:-0.25rem}.l5r5e.sheet .sheet-header img{flex:0 0 150px;height:150px;margin-right:0;-o-object-fit:contain;object-fit:contain;background:rgba(255,255,255,0.5);border:1px solid rgba(186,187,177,0.5);--notchSize: 0.5rem;-webkit-clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)))}.l5r5e.sheet .sheet-header .header-fields h2{font-family:"BrushtipTexe",sans-serif;float:right;width:50%;padding:0 0.25rem;margin:0;text-align:right;color:rgba(0,0,0,0.5);border-bottom:rgba(255,255,255,0.65);--notchSize: 0.5rem;-webkit-clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100%) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100%));clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100%) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100%))}.l5r5e.sheet .sheet-header .header-fields h2:before{content:"";position:absolute;height:1px;width:100%}.l5r5e.sheet .sheet-header .identity-wrapper{display:flex;flex-wrap:wrap;flex:0 0 calc(100% - 150px - 0.25rem)}.l5r5e.sheet .sheet-header .identity-wrapper .identity-content{flex:0 0 100%;display:flex;flex-wrap:wrap;margin:0.5rem}.l5r5e.sheet .sheet-header .identity-wrapper .identity-content li{flex:33%}.l5r5e.sheet .sheet-header .identity-wrapper .identity-content li:nth-child(1),.l5r5e.sheet .sheet-header .identity-wrapper .identity-content li:nth-child(2){flex:50%;margin:0 0 0.5rem}.l5r5e.sheet .sheet-header .rings{float:left;width:calc(50% - 0.25rem);padding:0.25rem}.l5r5e.sheet .sheet-header .social-content{flex:0 0 100%;display:flex;padding:0.25rem}.l5r5e.sheet .sheet-header .attributes-wrapper{float:right;width:calc(50% - 0.25rem);padding:0.5rem 0 0.5rem 1rem;display:flex;flex-wrap:wrap;flex-direction:column;background:rgba(186,187,177,0.5);--notchSize: 0.5rem;-webkit-clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100%) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100%));clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100%) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100%))}.l5r5e.sheet .sheet-header .attributes-wrapper .endurance-content label,.l5r5e.sheet .sheet-header .attributes-wrapper .composure-content label,.l5r5e.sheet .sheet-header .attributes-wrapper .void-content label{float:left;width:50%}.l5r5e.sheet .sheet-header .attributes-wrapper li p{display:none;position:absolute}.l5r5e.sheet .sheet-header .attributes-wrapper li:hover p{display:block}.l5r5e.sheet .sheet-header .identity-wrapper label,.l5r5e.sheet .sheet-header .social-content label,.l5r5e.sheet .sheet-header .attributes-wrapper label{display:flex;color:#5a6e5a;text-transform:uppercase;font-size:0.75rem;line-height:2rem}.l5r5e.sheet .sheet-header .identity-wrapper label input,.l5r5e.sheet .sheet-header .social-content label input,.l5r5e.sheet .sheet-header .attributes-wrapper label input{flex:1;margin:0 1rem 0 0.5rem}.l5r5e.sheet article{background:rgba(255,255,255,0.5);padding:0.5rem}.l5r5e nav.sheet-tabs{background:rgba(186,187,177,0.5);color:rgba(0,0,0,0.5);--notchSize: 0.5rem;-webkit-clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100%) 100%, var(--notchSize) 100%, 0% calc(100%));clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100%) 100%, var(--notchSize) 100%, 0% calc(100%))}.l5r5e nav .item:hover{background-color:rgba(0,0,0,0.75);color:#fff;text-shadow:black 1px 2px 0}.l5r5e nav .item.active{height:2.5rem;line-height:2rem;background-color:rgba(73,12,11,0.85);color:#fff;background-color:rgba(73,12,11,0.85);-webkit-clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% 100%, 0 100%, 0% 0%, 0% 100%);clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% 100%, 0 100%, 0% 0%, 0% 100%)}.l5r5e nav .item.active:hover{background-color:rgba(73,12,11,0.85);cursor:default}.l5r5e .rings{display:flex;flex-wrap:wrap;color:rgba(255,255,255,0.65)}.l5r5e .rings #earth,.l5r5e .rings #air,.l5r5e .rings #water,.l5r5e .rings #fire,.l5r5e .rings #void{position:relative;flex:1 1 50%;text-align:center}.l5r5e .rings #earth i.i_earth,.l5r5e .rings #earth i.i_water,.l5r5e .rings #earth i.i_fire,.l5r5e .rings #earth i.i_air,.l5r5e .rings #earth i.i_void,.l5r5e .rings #air i.i_earth,.l5r5e .rings #air i.i_water,.l5r5e .rings #air i.i_fire,.l5r5e .rings #air i.i_air,.l5r5e .rings #air i.i_void,.l5r5e .rings #water i.i_earth,.l5r5e .rings #water i.i_water,.l5r5e .rings #water i.i_fire,.l5r5e .rings #water i.i_air,.l5r5e .rings #water i.i_void,.l5r5e .rings #fire i.i_earth,.l5r5e .rings #fire i.i_water,.l5r5e .rings #fire i.i_fire,.l5r5e .rings #fire i.i_air,.l5r5e .rings #fire i.i_void,.l5r5e .rings #void i.i_earth,.l5r5e .rings #void i.i_water,.l5r5e .rings #void i.i_fire,.l5r5e .rings #void i.i_air,.l5r5e .rings #void i.i_void{font-size:5rem;line-height:4.75rem}.l5r5e .rings #earth label,.l5r5e .rings #air label,.l5r5e .rings #water label,.l5r5e .rings #fire label,.l5r5e .rings #void label{position:relative;width:5rem;line-height:0;float:right}.l5r5e .rings #earth input,.l5r5e .rings #air input,.l5r5e .rings #water input,.l5r5e .rings #fire input,.l5r5e .rings #void input{position:absolute;height:2rem;width:2rem;border-radius:100%;top:0;left:0;border:2px solid rgba(186,187,177,0.5);color:rgba(255,255,255,0.65)}.l5r5e .rings #earth input:hover,.l5r5e .rings #air input:hover,.l5r5e .rings #water input:hover,.l5r5e .rings #fire input:hover,.l5r5e .rings #void input:hover{border:2px solid rgba(255,0,0,0.75);text-shadow:0 0 6px rgba(255,0,0,0.75);box-shadow:0 0 6px inset rgba(255,0,0,0.75)}.l5r5e .rings #earth{float:right;color:#699678}.l5r5e .rings #earth input{top:auto;right:0;bottom:-1rem;left:auto;background:#699678}.l5r5e .rings #earth label strong{position:absolute;bottom:0.75rem;left:-1.75rem}.l5r5e .rings #air{color:#917896}.l5r5e .rings #air input{top:auto;right:auto;bottom:-1rem;left:0;background:#917896}.l5r5e .rings #air label{float:left}.l5r5e .rings #air label strong{position:absolute;bottom:0.75rem;right:-1rem}.l5r5e .rings #water{float:right;color:#5f919b;padding-right:2rem}.l5r5e .rings #water input{top:17%;right:-1.25rem;bottom:auto;left:auto;background:#5f919b}.l5r5e .rings #water label strong{position:absolute;bottom:-0.75rem;right:2rem}.l5r5e .rings #fire{color:#9b7350;padding-left:2rem}.l5r5e .rings #fire input{top:17%;right:auto;bottom:auto;left:-1.25rem;background:#9b7350}.l5r5e .rings #fire label{float:left}.l5r5e .rings #fire label strong{position:absolute;bottom:-0.75rem;right:2rem}.l5r5e .rings #void{top:-2rem;margin:0 calc(50% - 2.5rem);color:#4b4641}.l5r5e .rings #void input{top:-1rem;right:auto;bottom:auto;left:30%;background:#4b4641}.l5r5e .rings #void label strong{position:absolute;bottom:-0.75rem;left:1.75rem}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%} +.window-app .window-content{z-index:1;position:relative;background:url("../assets/imgs/bgL5R.webp") no-repeat;background-size:cover}.window-app .window-resizable-handle{z-index:2;background:rgba(0,0,0,0.75)}*{transition-property:background, color, border-color, text-shadow, box-shadow;transition-duration:0.5s;transition-timing-function:ease}input[type="text"]:focus,input[type="number"]:focus,input[type="password"]:focus,input[type="date"]:focus,input[type="time"]:focus{box-shadow:0 0 6px rgba(255,0,0,0.75)}.tabs .item.active{text-shadow:0 0 10px rgba(255,0,0,0.75)}#controls .scene-control.active,#controls .control-tool.active,#controls .scene-control:hover,#controls .control-tool:hover{box-shadow:0 0 10px rgba(255,0,0,0.75)}ul,li{list-style-type:none;margin:0;padding:0}input[type="text"],input[type="number"],input[type="password"],input[type="date"],input[type="time"]{background:rgba(255,255,255,0.5);border:1px solid rgba(186,187,177,0.5);padding:0.25rem;color:#764f40}@font-face{font-family:"LogotypeL5r";src:url("../fonts/LogotypeL5r.ttf") format("truetype")}@font-face{font-family:"BrushtipTexe";src:url("../fonts/BrushtipTexe.otf") format("opentype")}@font-face{font-family:"PatrickHand";src:url("../fonts/PatrickHand.ttf") format("truetype")}body{font:16px "PatrickHand",sans-serif;letter-spacing:0.05rem}h1,h4{font-family:"BrushtipTexe",sans-serif}h1{font-size:2rem}h4{font-size:1.25rem}i.strife,i.success,i.explosive,i.opportunity,i.d6,i.d12,i.i_earth,i.i_water,i.i_fire,i.i_air,i.i_void{font-family:LogotypeL5r;line-height:1rem;font-style:normal;font-weight:normal;vertical-align:middle}i.strife:before{content:"f"}i.success:before{content:"s"}i.explosive:before{content:"e"}i.opportunity:before{content:"o"}i.d6:before{content:"r"}i.d12:before{content:"k"}i.i_earth:before{content:"g"}i.i_water:before{content:"w"}i.i_fire:before{content:"i"}i.i_air:before{content:"a"}i.i_void:before{content:"v"}#sidebar{background-position:top;background-size:100%;background-repeat:no-repeat;background:url("../assets/ui/bgSidebar.png") no-repeat;top:0;height:100%;padding:0.5rem}#sidebar #sidebar-tabs{flex:0 0 1rem;box-sizing:border-box;margin:0 0 0.25rem;border-bottom:1px solid rgba(255,255,255,0.25);box-shadow:none}#sidebar #sidebar-tabs>.item{line-height:27px;border-radius:100%;margin:0;flex:0 0 27px;height:27px}#sidebar #sidebar-tabs>.item .active{border:1px solid rgba(255,100,0,0.75);box-shadow:0 0 6px rgba(255,100,0,0.75)}#sidebar .message-sender{color:#963c41}#sidebar .chat-control-icon{cursor:url(../l5r-ui/ui/cursors/pointer.webp),pointer}#hotbar{margin:0}#hotbar #action-bar{flex:0 0 100%}#hotbar #action-bar .macro{-o-border-image:url("../assets/ui/macro-button.webp");border-image:url("../assets/ui/macro-button.webp");border-image-slice:8 fill;border-image-width:0.25rem;border-image-outset:0;border-radius:0}#hotbar #action-bar .macro .macro-key{background:transparent}#hotbar #action-bar #macro-list{background:rgba(0,0,0,0.75);margin:0;padding:0.05rem;border:none;border-radius:0;background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image-width:0.5rem;border-image-outset:0px;box-shadow:0.25rem 0.25rem 0.5rem rgba(0,0,0,0.75)}#hotbar .bar-controls{background:rgba(0,0,0,0.75);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image-width:0.5rem;border-image-outset:0px;box-shadow:0 0 0.25rem rgba(0,0,0,0.75);border-radius:0;margin:0 0.5rem}#hotbar .bar-controls a.page-control,#hotbar .bar-controls span.page-number{font-size:1rem;line-height:0.95rem}#players{background:rgba(0,0,0,0.75);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image:url("../assets/ui/macro-button.webp") 15 repeat;border-image-width:0.5rem;border-image-outset:0px;margin:0;padding:0;left:1.15rem;bottom:0.65rem;box-shadow:inset 0 0 0.5rem rgba(0,0,0,0.75)}#players:before{z-index:-1;position:absolute;content:"";background:transparent url("../assets/ui/players-border.webp") no-repeat 0 0;background-size:100%;display:block;top:-12px;right:10%;left:10%;bottom:0}#logo{height:80px;margin-left:0.5rem;opacity:0.5}#logo:hover{opacity:0.75}#navigation{left:120px}#navigation #nav-toggle,#navigation #scene-list .scene.nav-item{cursor:default;color:rgba(255,255,255,0.65);background:linear-gradient(#285064, #0a141e, #285064);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image-width:0.25rem;border-image-outset:0px}#navigation #scene-list .scene.nav-item.active{background:linear-gradient(#41140f, #230a05, #41140f)}#navigation #scene-list .scene.view,#navigation #scene-list .scene.context{cursor:default;color:#fff;background:linear-gradient(#41140f, #230a05, #41140f);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image-width:0.25rem;border-image-outset:0px;box-shadow:0 0 20px red}#controls{top:100px}#controls .scene-control.active,#controls .control-tool.active,#controls .scene-control:hover,#controls .control-tool:hover{background:linear-gradient(#41140f, #230a05, #41140f);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image-width:0.25rem;border-image-outset:0px;box-shadow:0 0 10px rgba(255,0,0,0.75)}#controls .scene-control,#controls .control-tool{background:linear-gradient(#285064, #0a141e, #285064);background-origin:padding-box;-o-border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image:url("../assets/ui/macro-button.webp") 10 repeat;border-image-width:0.25rem;border-image-outset:0px}.l5r5e .chat-dice>img{border:1px solid transparent;background-repeat:no-repeat;background-position:center;background-size:100%;height:44px;width:44px;outline:none;margin:0;flex:0 0 20px;display:inline-block}.l5r5e .dice-picker-dialog .profil{float:left}.l5r5e .dice-picker-dialog .dices{float:right}.l5r5e.sheet{min-width:600px}.l5r5e.sheet .sheet-header h1{flex:auto;margin:0 0.5rem 0.25rem}.l5r5e.sheet .sheet-header h1 input{flex:0 0 100%;height:4rem;margin:0.5rem 0 0;width:100%;color:#963c41;background:transparent;border:0 none;border-radius:0;border-bottom:1px dotted rgba(0,0,0,0.5)}.l5r5e.sheet .sheet-header h1:before{content:"";position:absolute;background:url("../assets/imgs/brushL5r.webp") no-repeat 0 0;background-size:contain;height:225px;width:100%;z-index:-1;left:-0.25rem}.l5r5e.sheet .sheet-header img{flex:0 0 150px;height:150px;margin-right:0;-o-object-fit:contain;object-fit:contain;background:rgba(255,255,255,0.5);border:1px solid rgba(186,187,177,0.5);--notchSize: 0.5rem;-webkit-clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)))}.l5r5e.sheet .sheet-header .header-fields h2{font-family:"BrushtipTexe",sans-serif;float:right;width:50%;padding:0 0.25rem;margin:0;text-align:right;color:rgba(0,0,0,0.5);border-bottom:rgba(255,255,255,0.65);--notchSize: 0.5rem;-webkit-clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100%) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100%));clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100%) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100%))}.l5r5e.sheet .sheet-header .header-fields h2:before{content:"";position:absolute;height:1px;width:100%}.l5r5e.sheet .sheet-header .identity-wrapper{display:flex;flex-wrap:wrap;flex:0 0 calc(100% - 150px - 0.25rem)}.l5r5e.sheet .sheet-header .identity-wrapper .identity-content{flex:0 0 100%;display:flex;flex-wrap:wrap;margin:0.5rem}.l5r5e.sheet .sheet-header .identity-wrapper .identity-content li{flex:33%}.l5r5e.sheet .sheet-header .identity-wrapper .identity-content li:nth-child(1),.l5r5e.sheet .sheet-header .identity-wrapper .identity-content li:nth-child(2){flex:50%;margin:0 0 0.5rem}.l5r5e.sheet .sheet-header .rings{float:left;width:calc(50% - 0.25rem);padding:0.25rem}.l5r5e.sheet .sheet-header .social-content{flex:0 0 100%;display:flex;padding:0.25rem}.l5r5e.sheet .sheet-header .attributes-wrapper{float:right;width:calc(50% - 0.25rem);padding:0.5rem 0 0.5rem 1rem;display:flex;flex-wrap:wrap;flex-direction:column;background:rgba(186,187,177,0.5);--notchSize: 0.5rem;-webkit-clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100%) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100%));clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100%) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100%))}.l5r5e.sheet .sheet-header .attributes-wrapper .endurance-content label,.l5r5e.sheet .sheet-header .attributes-wrapper .composure-content label,.l5r5e.sheet .sheet-header .attributes-wrapper .void-content label{float:left;width:50%}.l5r5e.sheet .sheet-header .attributes-wrapper li p{display:none;position:absolute}.l5r5e.sheet .sheet-header .attributes-wrapper li:hover p{display:block}.l5r5e.sheet .sheet-header .identity-wrapper label,.l5r5e.sheet .sheet-header .social-content label,.l5r5e.sheet .sheet-header .attributes-wrapper label{display:flex;color:#5a6e5a;text-transform:uppercase;font-size:0.75rem;line-height:2rem}.l5r5e.sheet .sheet-header .identity-wrapper label input,.l5r5e.sheet .sheet-header .social-content label input,.l5r5e.sheet .sheet-header .attributes-wrapper label input{flex:1;margin:0 1rem 0 0.5rem}.l5r5e.sheet article{background:rgba(255,255,255,0.5);padding:0.5rem}.l5r5e nav.sheet-tabs{background:rgba(186,187,177,0.5);color:rgba(0,0,0,0.5);--notchSize: 0.5rem;-webkit-clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100%) 100%, var(--notchSize) 100%, 0% calc(100%));clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100%) 100%, var(--notchSize) 100%, 0% calc(100%))}.l5r5e nav .item:hover{background-color:rgba(0,0,0,0.75);color:#fff;text-shadow:black 1px 2px 0}.l5r5e nav .item.active{height:2.5rem;line-height:2rem;background-color:rgba(73,12,11,0.85);color:#fff;background-color:rgba(73,12,11,0.85);-webkit-clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% 100%, 0 100%, 0% 0%, 0% 100%);clip-path:polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% 100%, 0 100%, 0% 0%, 0% 100%)}.l5r5e nav .item.active:hover{background-color:rgba(73,12,11,0.85);cursor:default}.l5r5e .rings{display:flex;flex-wrap:wrap;color:rgba(255,255,255,0.65)}.l5r5e .rings #earth,.l5r5e .rings #air,.l5r5e .rings #water,.l5r5e .rings #fire,.l5r5e .rings #void{position:relative;flex:1 1 50%;text-align:center}.l5r5e .rings #earth i.i_earth,.l5r5e .rings #earth i.i_water,.l5r5e .rings #earth i.i_fire,.l5r5e .rings #earth i.i_air,.l5r5e .rings #earth i.i_void,.l5r5e .rings #air i.i_earth,.l5r5e .rings #air i.i_water,.l5r5e .rings #air i.i_fire,.l5r5e .rings #air i.i_air,.l5r5e .rings #air i.i_void,.l5r5e .rings #water i.i_earth,.l5r5e .rings #water i.i_water,.l5r5e .rings #water i.i_fire,.l5r5e .rings #water i.i_air,.l5r5e .rings #water i.i_void,.l5r5e .rings #fire i.i_earth,.l5r5e .rings #fire i.i_water,.l5r5e .rings #fire i.i_fire,.l5r5e .rings #fire i.i_air,.l5r5e .rings #fire i.i_void,.l5r5e .rings #void i.i_earth,.l5r5e .rings #void i.i_water,.l5r5e .rings #void i.i_fire,.l5r5e .rings #void i.i_air,.l5r5e .rings #void i.i_void{font-size:5rem;line-height:4.75rem}.l5r5e .rings #earth label,.l5r5e .rings #air label,.l5r5e .rings #water label,.l5r5e .rings #fire label,.l5r5e .rings #void label{position:relative;width:5rem;line-height:0;float:right}.l5r5e .rings #earth input,.l5r5e .rings #air input,.l5r5e .rings #water input,.l5r5e .rings #fire input,.l5r5e .rings #void input{position:absolute;height:2rem;width:2rem;border-radius:100%;top:0;left:0;border:2px solid rgba(186,187,177,0.5);color:rgba(255,255,255,0.65)}.l5r5e .rings #earth input:hover,.l5r5e .rings #air input:hover,.l5r5e .rings #water input:hover,.l5r5e .rings #fire input:hover,.l5r5e .rings #void input:hover{border:2px solid rgba(255,0,0,0.75);text-shadow:0 0 6px rgba(255,0,0,0.75);box-shadow:0 0 6px inset rgba(255,0,0,0.75)}.l5r5e .rings #earth{float:right;color:#699678}.l5r5e .rings #earth input{top:auto;right:0;bottom:-1rem;left:auto;background:#699678}.l5r5e .rings #earth label strong{position:absolute;bottom:0.75rem;left:-1.75rem}.l5r5e .rings #air{color:#917896}.l5r5e .rings #air input{top:auto;right:auto;bottom:-1rem;left:0;background:#917896}.l5r5e .rings #air label{float:left}.l5r5e .rings #air label strong{position:absolute;bottom:0.75rem;right:-1rem}.l5r5e .rings #water{float:right;color:#5f919b;padding-right:2rem}.l5r5e .rings #water input{top:17%;right:-1.25rem;bottom:auto;left:auto;background:#5f919b}.l5r5e .rings #water label strong{position:absolute;bottom:-0.75rem;right:2rem}.l5r5e .rings #fire{color:#9b7350;padding-left:2rem}.l5r5e .rings #fire input{top:17%;right:auto;bottom:auto;left:-1.25rem;background:#9b7350}.l5r5e .rings #fire label{float:left}.l5r5e .rings #fire label strong{position:absolute;bottom:-0.75rem;right:2rem}.l5r5e .rings #void{top:-2rem;margin:0 calc(50% - 2.5rem);color:#4b4641}.l5r5e .rings #void input{top:-1rem;right:auto;bottom:auto;left:30%;background:#4b4641}.l5r5e .rings #void label strong{position:absolute;bottom:-0.75rem;left:1.75rem}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%}.l5r5e .testing{width:14.28571%}.l5r5e .testing{width:28.57143%} diff --git a/system/styles/scss/dices.scss b/system/styles/scss/dices.scss index ae08a2b..dd1271f 100644 --- a/system/styles/scss/dices.scss +++ b/system/styles/scss/dices.scss @@ -2,7 +2,7 @@ // dices.scss // Dice in chat -.l5r5e.chat-dice > img { +.chat-dice > img { border: 1px solid transparent; background-repeat: no-repeat; background-position: center; @@ -17,3 +17,12 @@ flex: 0 0 20px; display: inline-block; } + +.dice-picker-dialog { + .profil { + float: left; + } + .dices { + float: right; + } +} diff --git a/system/templates/dice/dice-picker-dialog.html b/system/templates/dice/dice-picker-dialog.html index a87be19..d55031e 100644 --- a/system/templates/dice/dice-picker-dialog.html +++ b/system/templates/dice/dice-picker-dialog.html @@ -1,5 +1,10 @@ -
-
+
+ +
+ +
+ +
diff --git a/system/templates/sheets/actor/attributes.html b/system/templates/sheets/actor/attributes.html index fd4d6d1..f0de90c 100644 --- a/system/templates/sheets/actor/attributes.html +++ b/system/templates/sheets/actor/attributes.html @@ -41,7 +41,7 @@