dungeonslayers/ds4
dungeonslayers/ds4
3
0
Fork 0
Code Issues 9 Pull requests 7 Projects Releases 10 Packages 1 Activity

Merge branch 'master' into 76-common-checks-in-actor-sheets

Browse source
This commit is contained in:
Johannes Loher 2021-04-13 20:22:09 +02:00
commit 17a270d361
6 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -2,7 +2,7 @@
"private": true, "private": true,
"name": "dungeonslayers4", "name": "dungeonslayers4",
"description": "An implementation of the Dungeonslayers 4 game system for Foundry Virtual Tabletop.", "description": "An implementation of the Dungeonslayers 4 game system for Foundry Virtual Tabletop.",
"version": "0.5.1", "version": "0.5.2",
"license": "MIT", "license": "MIT",
"homepage": "https://git.f3l.de/dungeonslayers/ds4", "homepage": "https://git.f3l.de/dungeonslayers/ds4",
"repository": { "repository": {

4
src/lang/de.json
View file

@ -239,7 +239,7 @@
"DS4.SettingUseSlayingDiceForAutomatedChecksName": "Slayende Würfel", "DS4.SettingUseSlayingDiceForAutomatedChecksName": "Slayende Würfel",
"DS4.SettingUseSlayingDiceForAutomatedChecksHint": "Benutze Slayende Würfel bei automatisierten Proben.", "DS4.SettingUseSlayingDiceForAutomatedChecksHint": "Benutze Slayende Würfel bei automatisierten Proben.",
"DS4.ChecksAppraise": "Schätzen", "DS4.ChecksAppraise": "Schätzen",
"DS4.ChangeSpell": "Zauber Wechseln", "DS4.ChecksChangeSpell": "Zauber Wechseln",
"DS4.ChecksClimb": "Klettern", "DS4.ChecksClimb": "Klettern",
"DS4.ChecksCommunicate": "Verständigen", "DS4.ChecksCommunicate": "Verständigen",
"DS4.ChecksDecipherScript": "Inschrift Entziffern", "DS4.ChecksDecipherScript": "Inschrift Entziffern",
@ -250,6 +250,7 @@
"DS4.ChecksFlirt": "Flirten", "DS4.ChecksFlirt": "Flirten",
"DS4.ChecksHaggle": "Feilschen", "DS4.ChecksHaggle": "Feilschen",
"DS4.ChecksHide": "Verbergen", "DS4.ChecksHide": "Verbergen",
"DS4.ChecksIdentifyMagic": "Magie Erkennen",
"DS4.ChecksJump": "Springen", "DS4.ChecksJump": "Springen",
"DS4.ChecksKnowledge": "Wissen", "DS4.ChecksKnowledge": "Wissen",
"DS4.ChecksOpenLock": "Schlösser Öffnen", "DS4.ChecksOpenLock": "Schlösser Öffnen",
@ -259,6 +260,7 @@
"DS4.ChecksResistDisease": "Krankheit Trotzen", "DS4.ChecksResistDisease": "Krankheit Trotzen",
"DS4.ChecksRide": "Reiten", "DS4.ChecksRide": "Reiten",
"DS4.ChecksSearch": "Suchen", "DS4.ChecksSearch": "Suchen",
"DS4.ChecksSenseMagic": "Magie Erspüren",
"DS4.ChecksSneak": "Sneak", "DS4.ChecksSneak": "Sneak",
"DS4.ChecksStartFire": "Feuer Machen", "DS4.ChecksStartFire": "Feuer Machen",
"DS4.ChecksSwim": "Schwimmen", "DS4.ChecksSwim": "Schwimmen",

4
src/lang/en.json
View file

@ -239,7 +239,7 @@
"DS4.SettingUseSlayingDiceForAutomatedChecksName": "Slaying Dice", "DS4.SettingUseSlayingDiceForAutomatedChecksName": "Slaying Dice",
"DS4.SettingUseSlayingDiceForAutomatedChecksHint": "Use Slaying Dice for automated checks.", "DS4.SettingUseSlayingDiceForAutomatedChecksHint": "Use Slaying Dice for automated checks.",
"DS4.ChecksAppraise": "Appraise", "DS4.ChecksAppraise": "Appraise",
"DS4.ChangeSpell": "Change Spell", "DS4.ChecksChangeSpell": "Change Spell",
"DS4.ChecksClimb": "Climb", "DS4.ChecksClimb": "Climb",
"DS4.ChecksCommunicate": "Communicate", "DS4.ChecksCommunicate": "Communicate",
"DS4.ChecksDecipherScript": "Decipher Script", "DS4.ChecksDecipherScript": "Decipher Script",
@ -250,6 +250,7 @@
"DS4.ChecksFlirt": "Flirt", "DS4.ChecksFlirt": "Flirt",
"DS4.ChecksHaggle": "Haggle", "DS4.ChecksHaggle": "Haggle",
"DS4.ChecksHide": "Hide", "DS4.ChecksHide": "Hide",
"DS4.ChecksIdentifyMagic": "Identify Magic",
"DS4.ChecksJump": "Jump", "DS4.ChecksJump": "Jump",
"DS4.ChecksKnowledge": "Knowledge", "DS4.ChecksKnowledge": "Knowledge",
"DS4.ChecksOpenLock": "Open Lock", "DS4.ChecksOpenLock": "Open Lock",
@ -259,6 +260,7 @@
"DS4.ChecksResistDisease": "Resist Disease", "DS4.ChecksResistDisease": "Resist Disease",
"DS4.ChecksRide": "Ride", "DS4.ChecksRide": "Ride",
"DS4.ChecksSearch": "Search", "DS4.ChecksSearch": "Search",
"DS4.ChecksSenseMagic": "Sense Magic",
"DS4.ChecksSneak": "Sneak", "DS4.ChecksSneak": "Sneak",
"DS4.ChecksStartFire": "Start Fire", "DS4.ChecksStartFire": "Start Fire",
"DS4.ChecksSwim": "Swim", "DS4.ChecksSwim": "Swim",

2
src/module/actor/actor.ts
View file

@ -231,6 +231,7 @@ export class DS4Actor extends Actor<DS4ActorData, DS4Item, DS4ActorPreparedData>
flirt: data.attributes.mind.total + data.traits.aura.total, flirt: data.attributes.mind.total + data.traits.aura.total,
haggle: data.attributes.mind.total + Math.max(data.traits.intellect.total, data.traits.intellect.total), haggle: data.attributes.mind.total + Math.max(data.traits.intellect.total, data.traits.intellect.total),
hide: data.attributes.mobility.total + data.traits.agility.total, hide: data.attributes.mobility.total + data.traits.agility.total,
identifyMagic: data.attributes.mind.total + data.traits.intellect.total,
jump: data.attributes.mobility.total + data.traits.agility.total, jump: data.attributes.mobility.total + data.traits.agility.total,
knowledge: data.attributes.mind.total + data.traits.intellect.total, knowledge: data.attributes.mind.total + data.traits.intellect.total,
openLock: data.attributes.mind.total + data.traits.dexterity.total, openLock: data.attributes.mind.total + data.traits.dexterity.total,
@ -240,6 +241,7 @@ export class DS4Actor extends Actor<DS4ActorData, DS4Item, DS4ActorPreparedData>
resistDisease: data.attributes.body.total + data.traits.constitution.total, resistDisease: data.attributes.body.total + data.traits.constitution.total,
ride: data.attributes.mobility.total + Math.max(data.traits.agility.total, data.traits.aura.total), ride: data.attributes.mobility.total + Math.max(data.traits.agility.total, data.traits.aura.total),
search: Math.max(data.attributes.mind.total + data.traits.intellect.total, 8), search: Math.max(data.attributes.mind.total + data.traits.intellect.total, 8),
senseMagic: data.attributes.mind.total + data.traits.aura.total,
sneak: data.attributes.mobility.total + data.traits.agility.total, sneak: data.attributes.mobility.total + data.traits.agility.total,
startFire: data.attributes.mind.total + data.traits.dexterity.total, startFire: data.attributes.mind.total + data.traits.dexterity.total,
swim: data.attributes.mobility.total + data.traits.strength.total, swim: data.attributes.mobility.total + data.traits.strength.total,

4
src/module/config.ts
View file

@ -284,7 +284,7 @@ export const DS4 = {
checks: { checks: {
appraise: "DS4.ChecksAppraise", appraise: "DS4.ChecksAppraise",
changeSpell: "DS4.ChangeSpell", changeSpell: "DS4.ChecksChangeSpell",
climb: "DS4.ChecksClimb", climb: "DS4.ChecksClimb",
communicate: "DS4.ChecksCommunicate", communicate: "DS4.ChecksCommunicate",
decipherScript: "DS4.ChecksDecipherScript", decipherScript: "DS4.ChecksDecipherScript",
@ -295,6 +295,7 @@ export const DS4 = {
flirt: "DS4.ChecksFlirt", flirt: "DS4.ChecksFlirt",
haggle: "DS4.ChecksHaggle", haggle: "DS4.ChecksHaggle",
hide: "DS4.ChecksHide", hide: "DS4.ChecksHide",
identifyMagic: "DS4.ChecksIdentifyMagic",
jump: "DS4.ChecksJump", jump: "DS4.ChecksJump",
knowledge: "DS4.ChecksKnowledge", knowledge: "DS4.ChecksKnowledge",
openLock: "DS4.ChecksOpenLock", openLock: "DS4.ChecksOpenLock",
@ -304,6 +305,7 @@ export const DS4 = {
resistDisease: "DS4.ChecksResistDisease", resistDisease: "DS4.ChecksResistDisease",
ride: "DS4.ChecksRide", ride: "DS4.ChecksRide",
search: "DS4.ChecksSearch", search: "DS4.ChecksSearch",
senseMagic: "DS4.ChecksSenseMagic",
sneak: "DS4.ChecksSneak", sneak: "DS4.ChecksSneak",
startFire: "DS4.ChecksStartFire", startFire: "DS4.ChecksStartFire",
swim: "DS4.ChecksSwim", swim: "DS4.ChecksSwim",

4
src/system.json
View file

@ -2,7 +2,7 @@
"name": "ds4", "name": "ds4",
"title": "Dungeonslayers 4", "title": "Dungeonslayers 4",
"description": "The Dungeonslayers 4 system for FoundryVTT. Dungeonslayers (© Christian Kennig) is licensed under CC BY-NC-SA 3.0 (https://creativecommons.org/licenses/by-nc-sa/3.0/de/deed.en).", "description": "The Dungeonslayers 4 system for FoundryVTT. Dungeonslayers (© Christian Kennig) is licensed under CC BY-NC-SA 3.0 (https://creativecommons.org/licenses/by-nc-sa/3.0/de/deed.en).",
"version": "0.5.1", "version": "0.5.2",
"minimumCoreVersion": "0.7.9", "minimumCoreVersion": "0.7.9",
"compatibleCoreVersion": "0.7.9", "compatibleCoreVersion": "0.7.9",
"templateVersion": 3, "templateVersion": 3,
@ -71,7 +71,7 @@
"primaryTokenAttribute": "combatValues.hitPoints", "primaryTokenAttribute": "combatValues.hitPoints",
"url": "https://git.f3l.de/dungeonslayers/ds4", "url": "https://git.f3l.de/dungeonslayers/ds4",
"manifest": "https://git.f3l.de/dungeonslayers/ds4/-/raw/latest/src/system.json?inline=false", "manifest": "https://git.f3l.de/dungeonslayers/ds4/-/raw/latest/src/system.json?inline=false",
"download": "https://git.f3l.de/dungeonslayers/ds4/-/jobs/artifacts/0.5.1/download?job=build", "download": "https://git.f3l.de/dungeonslayers/ds4/-/jobs/artifacts/0.5.2/download?job=build",
"license": "MIT", "license": "MIT",
"initiative": "@combatValues.initiative.total", "initiative": "@combatValues.initiative.total",
"manifestPlusVersion": "1.0.0", "manifestPlusVersion": "1.0.0",