MidgardVTT-Entwicklung
/
foundry-vtt-system-midgard5
7
0
Fork 0
Code Issues 16 Pull Requests Actions Projects 1 Releases 8 Wiki Activity

Entbehrungen #89

Merged
Byroks merged 10 commits from entbehrungen into develop 2024-03-24 20:02:26 +01:00
Conversation 6 Commits 10 Files Changed 14 +50 -83
6 changed files with 50 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e5ace68557 - Show all commits

5
lang/de.json
View File

@ -241,11 +241,12 @@
"midgard5.enduranceBonus": "Ausdauerbonus", "midgard5.enduranceBonus": "Ausdauerbonus",
"midgard5.lpProtection": "Rüstungsschutz (LP)", "midgard5.lpProtection": "Rüstungsschutz (LP)",
"midgard5.apProtection": "Rüstungsschutz (AP)", "midgard5.apProtection": "Rüstungsschutz (AP)",
"midgard5.deprivation": "Entbehrung", "midgard5.deprivation": "Zähigkeit",
"midgard5.deprivations": "Entbehrungen", "midgard5.deprivations": "Entbehrungen",
"midgard5.deprivationCold": "Zähigkeit Kälte", "midgard5.deprivationCold": "Zähigkeit Kälte",
"midgard5.deprivationHeat": "Zähigkeit Hitze", "midgard5.deprivationHeat": "Zähigkeit Hitze",
"midgard5.deprivationFood": "Zähigkeit Hunger & Durst", "midgard5.deprivationFood": "Zähigkeit Hunger",
"midgard5.deprivationThirst": "Zähigkeit Durst",
"midgard5.new-skill": "Neue Fertigkeit", "midgard5.new-skill": "Neue Fertigkeit",
"midgard5.special": "Spezial", "midgard5.special": "Spezial",

13
source/module/M5Base.ts
View File

@ -106,6 +106,7 @@ export enum M5Stats {
DEPRIVATION_COLD = "cold", DEPRIVATION_COLD = "cold",
DEPRIVATION_HEAT = "heat", DEPRIVATION_HEAT = "heat",
DEPRIVATION_FOOD = "food", DEPRIVATION_FOOD = "food",
DEPRIVATION_THIRST = "thirst",
HOARD = "hoard", HOARD = "hoard",
HOARD_NEXT = "hoardNext", HOARD_NEXT = "hoardNext",
HOARD_MIN = "hoardMin", HOARD_MIN = "hoardMin",
@ -198,15 +199,9 @@ export interface M5CharacterCalculatedData {
brawlFw: number; brawlFw: number;
poisonResistance: M5ModResult; poisonResistance: M5ModResult;
enduranceBonus: number; enduranceBonus: number;
Byroks commented 2024-03-20 16:28:36 +01:00
Outdated
Review
Copy Link

Muss das in 3 geteilt sein? Das mod Array von ColdBonus wird zb. garnicht verwendet sondern nur die Value beschrieben, der PW wert ist auch einfach nur die Summe von beiden werten.

Bitte das einmal zusammenfassen, am besten wird bei Skills dann ein Versteckter Aktiver Effekt hinzugefügt der den Mod beinhaltet.

Muss das in 3 geteilt sein? Das mod Array von ColdBonus wird zb. garnicht verwendet sondern nur die Value beschrieben, der PW wert ist auch einfach nur die Summe von beiden werten. Bitte das einmal zusammenfassen, am besten wird bei Skills dann ein Versteckter Aktiver Effekt hinzugefügt der den Mod beinhaltet.
deprivationCold: M5ModResult; deprivationCold: number;
deprivationColdBonus: M5ModResult; deprivationHeat: number;
deprivationColdPw: number; deprivationFood: number;
deprivationHeat: M5ModResult;
deprivationHeatBonus: M5ModResult;
deprivationHeatPw: number;
deprivationFood: M5ModResult;
deprivationFoodBonus: M5ModResult;
deprivationFoodPw: number;
hoard: number; hoard: number;
hoardNext: number; hoardNext: number;
hoardMin: number; hoardMin: number;

30
source/module/actors/M5Character.ts
View File

@ -126,15 +126,9 @@ export class M5Character extends Actor {
brawlFw: 0, brawlFw: 0,
poisonResistance: { value: 0, mods: [] }, poisonResistance: { value: 0, mods: [] },
enduranceBonus: 0, enduranceBonus: 0,
deprivationCold: { value: 0, mods: [] }, deprivationCold: 0,
deprivationColdBonus: { value: 0, mods: [] }, deprivationHeat: 0,
deprivationColdPw: 0, deprivationFood: 0,
deprivationHeat: { value: 0, mods: [] },
deprivationHeatBonus: { value: 0, mods: [] },
deprivationHeatPw: 0,
deprivationFood: { value: 0, mods: [] },
deprivationFoodBonus: { value: 0, mods: [] },
deprivationFoodPw: 0,
hoard: 0, hoard: 0,
encumbrance: 0, encumbrance: 0,
load: 0, load: 0,
@ -210,15 +204,9 @@ export class M5Character extends Actor {
ret.stats.brawlFw = ret.stats.brawl.value + ret.stats.attackBonus.value + (data.info.race === "Zwerg" ? 1 : 0); ret.stats.brawlFw = ret.stats.brawl.value + ret.stats.attackBonus.value + (data.info.race === "Zwerg" ? 1 : 0);
ret.stats.poisonResistance = this.modResult(30 + Math.floor(ret.attributes.ko.value / 2)); ret.stats.poisonResistance = this.modResult(30 + Math.floor(ret.attributes.ko.value / 2));
ret.stats.enduranceBonus = Math.floor(ret.attributes.ko.value / 10) + Math.floor(ret.attributes.st.value / 20); ret.stats.enduranceBonus = Math.floor(ret.attributes.ko.value / 10) + Math.floor(ret.attributes.st.value / 20);
ret.stats.deprivationCold = this.modResult(Math.floor(ret.attributes.ko.value / 2)); ret.stats.deprivationCold = (Math.floor(ret.attributes.ko.value / 2));
ret.stats.deprivationColdBonus = this.modResult(0); ret.stats.deprivationHeat = (Math.floor(ret.attributes.ko.value / 2));
ret.stats.deprivationColdPw = Math.min(100, (ret.stats.deprivationCold.value + ret.stats.deprivationColdBonus.value)); ret.stats.deprivationFood = (Math.floor(40 + (ret.attributes.ko.value / 2)));
ret.stats.deprivationHeat = this.modResult(Math.floor(ret.attributes.ko.value / 2));
ret.stats.deprivationHeatBonus = this.modResult(0);
ret.stats.deprivationHeatPw = Math.min(100, (ret.stats.deprivationHeat.value + ret.stats.deprivationHeatBonus.value));
ret.stats.deprivationFood = this.modResult(Math.floor(40 + (ret.attributes.ko.value / 2)));
ret.stats.deprivationFoodBonus = this.modResult(0);
ret.stats.deprivationFoodPw = Math.min(100, (ret.stats.deprivationFood.value + ret.stats.deprivationFoodBonus.value));
ret.stats.hoardMin = M5Character.levelThreshold.at(ret.level - 1) / 2; ret.stats.hoardMin = M5Character.levelThreshold.at(ret.level - 1) / 2;
ret.stats.hoardNext = M5Character.levelThreshold.at(ret.level) / 2; ret.stats.hoardNext = M5Character.levelThreshold.at(ret.level) / 2;
ret.stats.wealth = parseFloat((data.info.gold + data.info.silver / 10 + data.info.copper / 100).toPrecision(3)); ret.stats.wealth = parseFloat((data.info.gold + data.info.silver / 10 + data.info.copper / 100).toPrecision(3));
@ -561,17 +549,17 @@ export class M5Character extends Actor {
// Adjust stat Kälte based on Überleben (Gebirge) skill // Adjust stat Kälte based on Überleben (Gebirge) skill
if (item.name === "Überleben (Gebirge)") { if (item.name === "Überleben (Gebirge)") {
ret.stats.deprivationColdBonus.value += Math.floor(item.system.fw * 5); ret.stats.deprivationCold += Math.floor(item.system.fw * 5);
} }
// Adjust stat Kälte based on Überleben (Steppe) skill // Adjust stat Kälte based on Überleben (Steppe) skill
if (item.name === "Überleben (Steppe)") { if (item.name === "Überleben (Steppe)") {
ret.stats.deprivationHeatBonus.value += Math.floor(item.system.fw * 5); ret.stats.deprivationHeat += Math.floor(item.system.fw * 5);
} }
// Adjust stat Durst & Hunger based on Robustheit skill // Adjust stat Durst & Hunger based on Robustheit skill
if (item.name === "Robustheit") { if (item.name === "Robustheit") {
ret.stats.deprivationFoodBonus.value += 10; ret.stats.deprivationFood += 10;
} }
}); });
} }

6
source/module/actors/M5ModAggregate.ts
View File

@ -41,9 +41,9 @@ export default class M5ModAggregate {
this.push({ type: M5ModType.STAT, id: M5Stats.AP, operation: M5ModOperation.SET, value: calc.stats.ap.value }, characterString); this.push({ type: M5ModType.STAT, id: M5Stats.AP, operation: M5ModOperation.SET, value: calc.stats.ap.value }, characterString);
this.push({ type: M5ModType.STAT, id: M5Stats.PROTECTION_LP, operation: M5ModOperation.SET, value: calc.stats.lpProtection.value }, characterString); this.push({ type: M5ModType.STAT, id: M5Stats.PROTECTION_LP, operation: M5ModOperation.SET, value: calc.stats.lpProtection.value }, characterString);
this.push({ type: M5ModType.STAT, id: M5Stats.PROTECTION_AP, operation: M5ModOperation.SET, value: calc.stats.apProtection.value }, characterString); this.push({ type: M5ModType.STAT, id: M5Stats.PROTECTION_AP, operation: M5ModOperation.SET, value: calc.stats.apProtection.value }, characterString);
this.push({ type: M5ModType.STAT, id: M5Stats.DEPRIVATION_COLD, operation: M5ModOperation.SET, value: calc.stats.deprivationCold.value }, characterString); this.push({ type: M5ModType.STAT, id: M5Stats.DEPRIVATION_COLD, operation: M5ModOperation.SET, value: calc.stats.deprivationCold }, characterString);
this.push({ type: M5ModType.STAT, id: M5Stats.DEPRIVATION_HEAT, operation: M5ModOperation.SET, value: calc.stats.deprivationHeat.value }, characterString); this.push({ type: M5ModType.STAT, id: M5Stats.DEPRIVATION_HEAT, operation: M5ModOperation.SET, value: calc.stats.deprivationHeat }, characterString);
this.push({ type: M5ModType.STAT, id: M5Stats.DEPRIVATION_FOOD, operation: M5ModOperation.SET, value: calc.stats.deprivationFood.value }, characterString); this.push({ type: M5ModType.STAT, id: M5Stats.DEPRIVATION_FOOD, operation: M5ModOperation.SET, value: calc.stats.deprivationFood }, characterString);
} }
push(mod: M5ItemMod, source: string) { push(mod: M5ItemMod, source: string) {

6
source/module/rolls/M5Roll.ts
View File

@ -199,7 +199,7 @@ export class M5Roll {
const rollData = actor.getRollData() as M5RollData; const rollData = actor.getRollData() as M5RollData;
rollData.rolls["0"] = { rollData.rolls["0"] = {
formula: "@c.calc.stats.deprivationCold.value + @c.calc.stats.deprivationColdBonus.value -1D100", formula: "@c.calc.stats.deprivationCold -1D100",
enabled: true, enabled: true,
label: (game as Game).i18n.localize("midgard5.deprivationCold"), label: (game as Game).i18n.localize("midgard5.deprivationCold"),
result: "", result: "",
@ -216,7 +216,7 @@ export class M5Roll {
const rollData = actor.getRollData() as M5RollData; const rollData = actor.getRollData() as M5RollData;
rollData.rolls["0"] = { rollData.rolls["0"] = {
formula: "@c.calc.stats.deprivationHeat.value + @c.calc.stats.deprivationHeatBonus.value -1D100", formula: "@c.calc.stats.deprivationHeat -1D100",
enabled: true, enabled: true,
label: (game as Game).i18n.localize("midgard5.deprivationHeat"), label: (game as Game).i18n.localize("midgard5.deprivationHeat"),
result: "", result: "",
@ -233,7 +233,7 @@ export class M5Roll {
const rollData = actor.getRollData() as M5RollData; const rollData = actor.getRollData() as M5RollData;
rollData.rolls["0"] = { rollData.rolls["0"] = {
formula: "@c.calc.stats.deprivationFood.value + @c.calc.stats.deprivationFoodBonus.value -1D100", formula: "@c.calc.stats.deprivationFood -1D100",
enabled: true, enabled: true,
label: (game as Game).i18n.localize("midgard5.deprivationFood"), label: (game as Game).i18n.localize("midgard5.deprivationFood"),
result: "", result: "",

73
templates/sheets/character/base_values.hbs
View File

@ -55,50 +55,6 @@
</div> </div>
</div> </div>
<div class="flexcolumn-2">
<div class="flexpart">
<div class="flexpart-header"><img src="icons/skills/wounds/injury-body-pain-gray.webp" class="flexpart-icon">{{localize "midgard5.deprivations"}}</div>
<table>
<thead>
<tr>
<th class="title"><img src="/icons/svg/eye.svg" class="table-icon"></th>
<th class="title">{{localize "midgard5.deprivation"}}</th>
<th class="title">{{localize "midgard5.ew"}}</th>
<th class="title">{{localize "midgard5.bonus"}}</th>
<th class="title">{{localize "midgard5.pw"}}</th>
<th class="title"><img src="/icons/svg/d20.svg" class="table-icon"></th>
</tr>
</thead>
<tbody class="items-list">
<tr data-item-id="{{itemId}}">
<td class="flexpart-img"><img src="/icons/magic/water/snowflake-ice-blue.webp" class="flexpart-icon"></td>
<td class="padding edit-item">{{localize "midgard5.deprivationCold"}}</td>
<td class="fixed-value">{{data.calc.stats.deprivationCold.value}}</td>
<td class="fixed-value">{{data.calc.stats.deprivationColdBonus.value}}</td>
<td class="fixed-value">{{add data.calc.stats.deprivationCold.value data.calc.stats.deprivationColdBonus.value}}</td>
<td><button class="roll-button roll-deprivationCold-button"></button></td>
</tr>
<tr data-item-id="{{itemId}}">
<td class="flexpart-img"><img src="/icons/magic/fire/orb-lightning-sun.webp" class="flexpart-icon"></td>
<td class="padding edit-item">{{localize "midgard5.deprivationHeat"}}</td>
<td class="fixed-value">{{data.calc.stats.deprivationHeat.value}}</td>
<td class="fixed-value">{{data.calc.stats.deprivationHeatBonus.value}}</td>
<td class="fixed-value">{{add data.calc.stats.deprivationHeat.value data.calc.stats.deprivationHeatBonus.value}}</td>
<td><button class="roll-button roll-deprivationHeat-button"></button></td>
</tr>
<tr data-item-id="{{itemId}}">
<td class="flexpart-img"><img src="/icons/consumables/food/plate-fish-bowl-bones-brown.webp" class="flexpart-icon"></td>
<td class="padding edit-item">{{localize "midgard5.deprivationFood"}}</td>
<td class="fixed-value">{{data.calc.stats.deprivationFood.value}}</td>
<td class="fixed-value">{{data.calc.stats.deprivationFoodBonus.value}}</td>
<td class="fixed-value">{{add data.calc.stats.deprivationFood.value data.calc.stats.deprivationFoodBonus.value}}</td>
<td><button class="roll-button roll-deprivationFood-button"></button></td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="flexcolumn-2"> <div class="flexcolumn-2">
<div class="flexpart"> <div class="flexpart">
<div class="flexpart-header"><img src="icons/magic/time/arrows-circling-pink.webp" class="flexpart-icon">{{localize "midgard5.calculated-values"}}</div> <div class="flexpart-header"><img src="icons/magic/time/arrows-circling-pink.webp" class="flexpart-icon">{{localize "midgard5.calculated-values"}}</div>
@ -166,4 +122,31 @@
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<div class="flexcolumn-1">
<div class="flexpart">
<div class="flexpart-header"><img src="icons/skills/wounds/injury-body-pain-gray.webp" class="flexpart-icon">{{localize "midgard5.deprivations"}} & {{localize "midgard5.deprivation"}}</div>
<table>
<tr height = 10px></tr>
<tr>
<td class="flexpart-img"><img src="/icons/sundries/survival/waterskin-leather-brown.webp" class="flexpart-icon"></td>
<td bgcolor="#eaead7" class="padding edit-item highlight" >{{localize "midgard5.deprivationThirst"}}</td>
<td bgcolor="#eaead7" class="center">{{data.calc.stats.deprivationFood.value}}</td>
<td bgcolor="#eaead7" class="fixed-value" style="border-right: 1px solid black;"><button class="roll-button roll-deprivationFood-button" /></td>
<td class="flexpart-img"><img src="/icons/magic/fire/orb-lightning-sun.webp" class="flexpart-icon"></td>
<td class="padding edit-item highlight">{{localize "midgard5.deprivationHeat"}}</td>
<td class="center">{{ data.calc.stats.deprivationHeat.value}}</td>
<td class="fixed-value" style="border-right: 1px solid black;"><button class="roll-button roll-deprivationHeat-button"></button></td>
<td class="flexpart-img"><img src="/icons/consumables/food/plate-fish-bowl-bones-brown.webp" class="flexpart-icon"></td>
<td bgcolor="#eaead7" class="padding edit-item highlight">{{localize "midgard5.deprivationFood"}}</td>
<td bgcolor="#eaead7" class="center">{{data.calc.stats.deprivationFood.value}}</td>
<td bgcolor="#eaead7" class="fixed-value" style="border-right: 1px solid black;"><button class="roll-button roll-deprivationFood-button"></button></td>
<td class="flexpart-img"><img src="/icons/magic/water/snowflake-ice-blue.webp" class="flexpart-icon"></td>
<td class="padding edit-item highlight">{{localize "midgard5.deprivationCold"}}</td>
<td class="center">{{data.calc.stats.deprivationCold.value}}</td>
<td class="fixed-value"><button class="roll-button roll-deprivationCold-button"></button></td>
</tr>
</table>
</div>
</div>