Merged
Byroks merged 8 commits from Situationsbedingte-Boni/Mali-#41 into develop 2024-03-29 14:28:50 +01:00
7 changed files with 85 additions and 3 deletions
Showing only changes of commit c3c48d761f - Show all commits

View File

@ -163,6 +163,7 @@
"faelschen": "Fälschen", "faelschen": "Fälschen",
"fangen": "Fangen", "fangen": "Fangen",
"fechten": "Fechten", "fechten": "Fechten",
"fechtkunst": "Fechtkunst",
"feueralchimie": "Feueralchimie", "feueralchimie": "Feueralchimie",
"gassenwissen": "Gassenwissen", "gassenwissen": "Gassenwissen",
"gaukeln": "Gaukeln", "gaukeln": "Gaukeln",
@ -288,6 +289,16 @@
"attack": "Angriff", "attack": "Angriff",
"damage": "Schaden", "damage": "Schaden",
"skill-goup-alltag": "Alltag",
"skill-goup-freiland": "Freiland",
"skill-goup-halbwelt": "Halbwelt",
"skill-goup-kampf": "Kampf",
"skill-goup-koerper": "Körper",
"skill-goup-sozial": "Sozial",
"skill-goup-unterwelt": "Unterwelt",
"skill-goup-waffen": "Waffen",
"skill-goup-wissen": "Wissen",
"spell-process-none": "Ohne", "spell-process-none": "Ohne",
"spell-process-artefakte": "Artefakte", "spell-process-artefakte": "Artefakte",
"spell-process-beherrschen": "Beherrschen", "spell-process-beherrschen": "Beherrschen",
@ -306,6 +317,7 @@
"spell-process-nekromantie": "Nekromantie", "spell-process-nekromantie": "Nekromantie",
"spell-process-runenstaebe": "Runenstäbe", "spell-process-runenstaebe": "Runenstäbe",
"spell-process-thaumatherapie": "Thaumatherapie", "spell-process-thaumatherapie": "Thaumatherapie",
"spell-process-thaumagraphie": "Thaumagraphie",
"spell-process-veraendern": "Verändern", "spell-process-veraendern": "Verändern",
"spell-process-vigilsignien": "Vigilsignien", "spell-process-vigilsignien": "Vigilsignien",
"spell-process-wundertat": "Wundertat", "spell-process-wundertat": "Wundertat",

View File

@ -107,4 +107,8 @@ export const loadHelpers = async function () {
} }
return length; return length;
}); });
Handlebars.registerHelper("console", (object: any) => {
console.log(object);
});
}; };

View File

@ -461,6 +461,7 @@ export class M5Character extends Actor {
} else { } else {
item.system.equipped = true; item.system.equipped = true;
data.info.magicUsing = item.system.magicUsing; data.info.magicUsing = item.system.magicUsing;
data.lernKostenZauber = item.system.lernKostenZauber;
} }
if (typeof data.info.class === "string") { if (typeof data.info.class === "string") {

View File

@ -193,6 +193,36 @@ export default class M5CharacterSheet extends ActorSheet {
}); });
}); });
html.find(".pp-increase").on("click", async (event) => {
let target = event.target.closest("[data-pp-name]") as HTMLElement;
let ppName = target ? target.dataset.ppName : null;
const context = this.actor as any;
const item = context.items.find((x) => x.type === "class" && x.system.equipped);
item.update({
system: {
lernKostenZauber: {
[ppName]: { pp: context.system.lernKostenZauber[ppName].pp + 1 },
},
},
});
this.render();
});
html.find(".pp-decrease").on("click", async (event) => {
let target = event.target.closest("[data-pp-name]") as HTMLElement;
let ppName = target ? target.dataset.ppName : null;
const context = this.actor as any;
const item = context.items.find((x) => x.type === "class" && x.system.equipped);
item.update({
system: {
lernKostenZauber: {
[ppName]: { pp: context.system.lernKostenZauber[ppName].pp - 1 },
},
},
});
this.render();
});
html.find(".fw-increase").on("click", async (event) => { html.find(".fw-increase").on("click", async (event) => {
let target = event.target.closest("[data-item-id]") as HTMLElement; let target = event.target.closest("[data-item-id]") as HTMLElement;
let itemId = target ? target.dataset.itemId : null; let itemId = target ? target.dataset.itemId : null;

View File

@ -388,4 +388,13 @@
.closebtn:hover { .closebtn:hover {
color: #000; color: #000;
} }
.pp-listing {
margin: 0 2rem;
flex: 1 0 16%;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: baseline;
}
} }

View File

@ -1,5 +1,4 @@
<div class="flexbox"> <div class="flexbox">
<div class="flexcolumn-1"> <div class="flexcolumn-1">
<div class="flexpart"> <div class="flexpart">
<div class="flexpart-header"><img src="icons/magic/symbols/star-inverted-yellow.webp" class="flexpart-icon">{{localize "midgard5.spellCasting"}}</div> <div class="flexpart-header"><img src="icons/magic/symbols/star-inverted-yellow.webp" class="flexpart-icon">{{localize "midgard5.spellCasting"}}</div>
@ -41,7 +40,7 @@
<th class="title">{{localize "midgard5.spell-effectDuration-short"}}</th> <th class="title">{{localize "midgard5.spell-effectDuration-short"}}</th>
<th class="title">{{localize "midgard5.ew"}}</th> <th class="title">{{localize "midgard5.ew"}}</th>
<th class="title"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th> <th class="title"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th>
<th class="title"><img src="/icons/svg/d20.svg" class="table-icon"><img src="/icons/svg/d20.svg" class="table-icon"></th></th> <th class="title"><img src="/icons/svg/d20.svg" class="table-icon"></th>
<td><a class="title add-spell"><i class="fa-regular fa-plus"></i></a></th> <td><a class="title add-spell"><i class="fa-regular fa-plus"></i></a></th>
</tr> </tr>
</thead> </thead>
@ -77,4 +76,31 @@
</div> </div>
</div> </div>
</div> </div>
<div class="flexcolumn-1">
<div class="flexpart">
<div class="flexpart-header">{{localize "midgard5.pp"}} {{localize "midgard5.spells"}}</div>
<table>
<tbody>
<tr>
<td colspan="4">
<div class="flexrow">
{{#each data.lernKostenZauber as |group name|}}
<span data-pp-name="{{name}}" class="pp-listing">
<label for="data.lernKostenZauber.{{name}}">{{localize (m5concat "midgard5.spell-process-" name)}}</label>
<span >
<i class="fa fa-minus-circle pp-decrease" style="cursor: pointer"></i>
<input style="width:15px" type="number" value={{group.pp}} data-dtype="Number" />
<i class="fa fa-plus-circle pp-increase" style="cursor: pointer"></i>
</span>
</span>
{{/each}}
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div> </div>

View File

@ -49,7 +49,7 @@
<div class="flexrow"> <div class="flexrow">
{{#each data.lernKostenAllgemein as |wert name|}} {{#each data.lernKostenAllgemein as |wert name|}}
<span style="flex: 1 0 26%"> <span style="flex: 1 0 26%">
<label for="data.lernKostenAllgemein.{{name}}">{{localize (m5concat "midgard5." name)}}</label> <label for="data.lernKostenAllgemein.{{name}}">{{localize (m5concat "midgard5.skill-goup-" name)}}</label>
<input style="width:35px" name="data.lernKostenAllgemein.{{name}}" type="number" value={{wert}} data-dtype="Number" /> <input style="width:35px" name="data.lernKostenAllgemein.{{name}}" type="number" value={{wert}} data-dtype="Number" />
</span> </span>
{{/each}} {{/each}}