macniel
/
foundry-dsa41-game
2
1
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects 1 Releases 19 Wiki Activity

feature/basic-combat #50

Closed
macniel wants to merge 6 commits from feature/basic-combat into feature/inventory
pull from: feature/basic-combat
merge into: macniel:feature/inventory
Conversation 1 Commits 6 Files Changed 444
macniel commented 2025-10-04 22:39:00 +02:00
Owner

Ermöglicht das ermitteln der Initiative (allerdings noch nicht via Combat Tracker, da muss noch der W/M der Waffe eingerechnet werden, oder hooken damit der Spielende abgefragt werden kann welche Waffe benutzt werden soll)

Resourcen wie LeP, AuP und AsP können nun getrackt werden.

aktuell gehaltene Waffen werden links unter dem Charakter angezeigt samt ihren Statistiken und können angeklickt werden um deren AT/PA/Ini zu werfen.

Ermöglicht das ermitteln der Initiative (allerdings noch nicht via Combat Tracker, da muss noch der W/M der Waffe eingerechnet werden, oder hooken damit der Spielende abgefragt werden kann welche Waffe benutzt werden soll) Resourcen wie LeP, AuP und AsP können nun getrackt werden. aktuell gehaltene Waffen werden links unter dem Charakter angezeigt samt ihren Statistiken und können angeklickt werden um deren AT/PA/Ini zu werfen.
macniel added 4 commits 2025-10-04 22:39:00 +02:00
macniel added this to the DSA 4.1 Game Module für Foundry project 2025-10-04 22:39:45 +02:00
macniel added this to the Charakterbogen milestone 2025-10-04 22:39:56 +02:00
paranoidSpectre requested changes 2025-10-05 10:46:29 +02:00
src/templates/actor/actor-character-sheet.hbs Outdated
@ -35,0 +25,4 @@
{{#each attacks}}
<div>
<h3>{{this.using}} ({{this.name}})</h3>
{{#if this.at}}
paranoidSpectre commented 2025-10-05 10:45:58 +02:00
Collaborator

Einrückung

Einrückung
src/templates/ui/partial-rollable-button.hbs Outdated
@ -1,6 +1,6 @@
<div class="block rollable {{this.type}} {{this.gruppe}}" data-id="{{this.id}}" data-taw="{{this.taw}}" data-name="{{this.name}}" data-eigenschaft1="{{this.eigenschaft1}}" data-eigenschaft2="{{this.eigenschaft2}}" data-eigenschaft3="{{this.eigenschaft3}}" data-taw="{{this.taw}}" data-rollEigenschaft1="{{this.rollEigenschaft1}}" data-rollEigenschaft2="{{this.rollEigenschaft2}}" data-rollEigenschaft3="{{this.rollEigenschaft3}}">
<div class="die">
<div class="die">
paranoidSpectre commented 2025-10-05 10:46:16 +02:00
Collaborator

Einrückung

Einrückung
src/templates/ui/partial-rollable-weaponskill-button.hbs Outdated
@ -0,0 +1,22 @@
<div class="block rollable {{this.type}} {{this.gruppe}}" data-id="{{this.id}}" data-taw="{{this.taw}}" data-name="{{this.name}}" data-eigenschaft1="{{this.eigenschaft1}}" data-eigenschaft2="{{this.eigenschaft2}}" data-eigenschaft3="{{this.eigenschaft3}}" data-taw="{{this.taw}}" data-rollEigenschaft1="{{this.rollEigenschaft1}}" data-rollEigenschaft2="{{this.rollEigenschaft2}}" data-rollEigenschaft3="{{this.rollEigenschaft3}}">
<div class="die">
{{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
paranoidSpectre commented 2025-10-05 10:46:26 +02:00
Collaborator

Einrückung

Einrückung
macniel added 1 commit 2025-10-05 13:38:00 +02:00
macniel commented 2025-10-05 13:42:27 +02:00
Poster
Owner

code basis gelinted @paranoidSpectre

code basis gelinted @paranoidSpectre
macniel requested review from paranoidSpectre 2025-10-05 13:42:30 +02:00
macniel added 1 commit 2025-10-05 13:42:42 +02:00
Pull Request Check / testing (pull_request) Successful in 17s Details
fa05bed932 chore: eslinted
macniel closed this pull request 2025-10-05 13:43:30 +02:00
macniel changed title from feature/basic-combat to feature/basic-combat 2025-10-05 13:44:11 +02:00
macniel changed title from feature/basic-combat to feature/basic-combat 2025-10-05 13:44:20 +02:00
macniel changed title from feature/basic-combat to feature/basic-combat 2025-10-05 13:44:54 +02:00
All checks were successful
Pull Request Check / testing (pull_request) Successful in 17s
Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
paranoidSpectre
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Charakterbogen
Projects
Clear projects
No project
DSA 4.1 Game Module für Foundry
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: macniel/foundry-dsa41-game#50
There is no content yet.
Delete Branch "feature/basic-combat"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?