Compare commits

...

4 Commits

Author SHA1 Message Date
Mandar
7a92a61f12 Update 0.5.1 patch for fix limited sheet and npc tech 2020-12-24 21:33:55 +01:00
Vlyan
8ec36673a9 fix for npc techniques 2020-12-24 21:31:37 +01:00
Mandar
3404ca0c8f Fix limited sheet for Pj and Pnj 2020-12-24 21:25:53 +01:00
Vlyan
607c7d9e6b no description if empty 2020-12-24 21:22:59 +01:00
14 changed files with 97 additions and 58 deletions

View File

@@ -50,7 +50,11 @@ export class BaseSheetL5r5e extends ActorSheet {
} }
// Check if technique is allowed for this character // Check if technique is allowed for this character
if (item.data.type === "technique" && !this.actor.data.data.techniques[item.data.data.technique_type]) { if (
!game.user.isGM &&
item.data.type === "technique" &&
!this.actor.data.data.techniques[item.data.data.technique_type]
) {
new Dialog({ new Dialog({
title: "Nope !", title: "Nope !",
content: game.i18n.localize("l5r5e.techniques.not_allowed"), content: game.i18n.localize("l5r5e.techniques.not_allowed"),

File diff suppressed because one or more lines are too long

View File

@@ -137,47 +137,4 @@
margin: 0.5rem 0.25rem 0; margin: 0.5rem 0.25rem 0;
} }
} }
.limited {
h1 {
margin: 0.5rem 0;
}
img {
&.full {
flex: 0 0 content;
height: auto;
width: auto;
border: 0 none;
}
}
.sheet-header {
flex: none;
}
ul {
display: flex;
flex-wrap: wrap;
li {
flex: 50%;
padding: 0.25rem 0;
input {
width: 75%;
float: right;
}
&:nth-child(1) {
flex: calc(50% - 1rem);
margin-right: 1rem;
}
&:nth-child(3),
&:nth-child(4) {
flex: calc(50% - 5rem);
margin-right: 1rem;
}
&:nth-child(5) {
flex: auto;
input {
width: 2rem;
}
}
}
}
}
} }

View File

@@ -156,9 +156,22 @@
flex: 33%; flex: 33%;
&:nth-child(1), &:nth-child(1),
&:nth-child(2) { &:nth-child(2) {
flex: 50%; flex: calc(50% - 5rem);
margin: 0 0 0.5rem; margin: 0 0 0.5rem;
} }
&:nth-child(3) {
flex: auto;
input {
width: 2rem;
}
}
&:nth-child(4),
&:nth-child(5) {
flex: 50%;
input {
font-size: 1rem;
}
}
} }
} }
} }
@@ -495,4 +508,55 @@
} }
} }
} }
&.actor,
&.npc {
.limited {
h1 {
margin: 0.5rem 0;
}
img {
&.full {
flex: 0 0 content;
height: auto;
width: auto;
border: 0 none;
}
}
.sheet-header {
flex: none;
height: auto;
}
ul {
display: flex;
flex-wrap: wrap;
li {
flex: 50%;
padding: 0.25rem 0;
input {
width: 75%;
float: right;
}
&:nth-child(1),
&:nth-child(2) {
flex: calc(50% - 5rem);
margin-right: 1rem;
}
&:nth-child(3) {
flex: auto;
input {
width: 2rem;
}
}
&:nth-child(4),
&:nth-child(5) {
flex: calc(50% - 1rem);
margin-right: 1rem;
input {
font-size: 1rem;
}
}
}
}
}
}
} }

View File

@@ -2,7 +2,7 @@
"name": "l5r5e", "name": "l5r5e",
"title": "Legend of the Five Rings (5th Edition)", "title": "Legend of the Five Rings (5th Edition)",
"description": "This is a game system, multilanguage in En/FR/ES, for Legend of the Five Rings (5th Edition) by <a href='https://edge-studio.net/'>Edge Studio</a> <p> - Join the official Discord server: <a href='https://discord.gg/foundryvtt'> Official Discord</a></p><p> - Rejoignez la communauté Francophone: <a href='https://discord.gg/pPSDNJk'>Francophone Discord</a></p>", "description": "This is a game system, multilanguage in En/FR/ES, for Legend of the Five Rings (5th Edition) by <a href='https://edge-studio.net/'>Edge Studio</a> <p> - Join the official Discord server: <a href='https://discord.gg/foundryvtt'> Official Discord</a></p><p> - Rejoignez la communauté Francophone: <a href='https://discord.gg/pPSDNJk'>Francophone Discord</a></p>",
"version": "0.5.0", "version": "0.5.1",
"minimumCoreVersion": "0.7.5", "minimumCoreVersion": "0.7.5",
"compatibleCoreVersion": "0.7.9", "compatibleCoreVersion": "0.7.9",
"author": "Team L5R", "author": "Team L5R",
@@ -96,5 +96,5 @@
], ],
"url": "https://gitlab.com/teaml5r/l5r5e", "url": "https://gitlab.com/teaml5r/l5r5e",
"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/v0.5.0/raw/l5r5e.zip?job=build" "download": "https://gitlab.com/teaml5r/l5r5e/-/jobs/artifacts/v0.5.1/raw/l5r5e.zip?job=build"
} }

View File

@@ -13,14 +13,14 @@
</li> </li>
<li> <li>
<label class="attribute-label"> <label class="attribute-label">
{{ localize 'l5r5e.school' }} {{ localize 'l5r5e.schoolrank' }}
<input type="text" name="data.identity.school" value="{{data.identity.school}}"/> <input type="number" name="data.identity.school_rank" value="{{data.identity.school_rank}}" class="select-on-focus" data-dtype="Number" min="0" placeholder="0"/>
</label> </label>
</li> </li>
<li> <li>
<label class="attribute-label"> <label class="attribute-label">
{{ localize 'l5r5e.schoolrank' }} {{ localize 'l5r5e.school' }}
<input type="number" name="data.identity.school_rank" value="{{data.identity.school_rank}}" class="select-on-focus" data-dtype="Number" min="0" placeholder="0"/> <input type="text" name="data.identity.school" value="{{data.identity.school}}"/>
</label> </label>
</li> </li>
<li> <li>

View File

@@ -17,6 +17,12 @@
<input type="text" name="data.identity.family" value="{{data.identity.family}}"/> <input type="text" name="data.identity.family" value="{{data.identity.family}}"/>
</label> </label>
</li> </li>
<li>
<label class="attribute-label">
{{ localize 'l5r5e.schoolrank' }}
<input type="number" name="data.identity.school_rank" value="{{data.identity.school_rank}}" class="select-on-focus" data-dtype="Number" min="0" placeholder="0"/>
</label>
</li>
<li> <li>
<label class="attribute-label"> <label class="attribute-label">
{{ localize 'l5r5e.school' }} {{ localize 'l5r5e.school' }}
@@ -29,12 +35,6 @@
<input type="text" name="data.identity.roles" value="{{data.identity.roles}}"/> <input type="text" name="data.identity.roles" value="{{data.identity.roles}}"/>
</label> </label>
</li> </li>
<li>
<label class="attribute-label">
{{ localize 'l5r5e.schoolrank' }}
<input type="number" name="data.identity.school_rank" value="{{data.identity.school_rank}}" class="select-on-focus" data-dtype="Number" min="0" placeholder="0"/>
</label>
</li>
</ul> </ul>
</div> </div>
</form> </form>

View File

@@ -7,5 +7,7 @@
<li data-item-id="{{advancement._id}}" class="item-control item-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li> <li data-item-id="{{advancement._id}}" class="item-control item-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li>
{{/if}} {{/if}}
</ul> </ul>
{{#if advancement.data.description}}
<div class="item-description item-description-{{advancement._id}}">{{{ advancement.data.description }}}</div> <div class="item-description item-description-{{advancement._id}}">{{{ advancement.data.description }}}</div>
{{/if}}
</li> </li>

View File

@@ -16,5 +16,7 @@
<li>{{{ property.name }}}</li> <li>{{{ property.name }}}</li>
{{/each}} {{/each}}
</ul> </ul>
{{#if item.data.description}}
<div class="item-description item-description-{{item._id}}">{{{ item.data.description }}}</div> <div class="item-description item-description-{{item._id}}">{{{ item.data.description }}}</div>
{{/if}}
</li> </li>

View File

@@ -12,5 +12,7 @@
<li>{{{ property.name }}}</li> <li>{{{ property.name }}}</li>
{{/each}} {{/each}}
</ul> </ul>
{{#if item.data.description}}
<div class="item-description item-description-{{item._id}}">{{{ item.data.description }}}</div> <div class="item-description item-description-{{item._id}}">{{{ item.data.description }}}</div>
{{/if}}
</li> </li>

View File

@@ -7,5 +7,7 @@
<li data-item-id="{{peculiarity._id}}" class="item-control item-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li> <li data-item-id="{{peculiarity._id}}" class="item-control item-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li>
{{/if}} {{/if}}
</ul> </ul>
{{#if peculiarity.data.description}}
<div class="item-description item-description-{{peculiarity._id}}">{{{ peculiarity.data.description }}}</div> <div class="item-description item-description-{{peculiarity._id}}">{{{ peculiarity.data.description }}}</div>
{{/if}}
</li> </li>

View File

@@ -6,5 +6,7 @@
<li class="property-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li> <li class="property-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li>
{{/if}} {{/if}}
</ul> </ul>
{{#if item.data.description}}
<div class="item-description item-description-{{item._id}}">{{{ item.data.description }}}</div> <div class="item-description item-description-{{item._id}}">{{{ item.data.description }}}</div>
{{/if}}
</li> </li>

View File

@@ -7,5 +7,7 @@
<li data-item-id="{{technique._id}}" class="item-control item-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li> <li data-item-id="{{technique._id}}" class="item-control item-delete" title="{{localize 'l5r5e.global.delete'}}"><i class="fas fa-trash"></i></li>
{{/if}} {{/if}}
</ul> </ul>
{{#if technique.data.description}}
<div class="item-description item-description-{{technique._id}}">{{{ technique.data.description }}}</div> <div class="item-description item-description-{{technique._id}}">{{{ technique.data.description }}}</div>
{{/if}}
</li> </li>

View File

@@ -17,5 +17,7 @@
<li>{{{ property.name }}}</li> <li>{{{ property.name }}}</li>
{{/each}} {{/each}}
</ul> </ul>
{{#if item.data.description}}
<div class="item-description item-description-{{item._id}}">{{{ item.data.description }}}</div> <div class="item-description item-description-{{item._id}}">{{{ item.data.description }}}</div>
{{/if}}
</li> </li>