-
-
Notifications
You must be signed in to change notification settings - Fork 4
Added cantrips and blessings to activatable prereqs #173
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Lector
wants to merge
8
commits into
main
Choose a base branch
from
feature/prereq-cantrip
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
16de03d
Added cantrips and blessings to activatable prereqs
Lector 6737a32
Blessing and Cantrips are now entries in GeneralPrerequisites.
Lector 7ac029a
Merge branch 'main' into feature/prereq-cantrip
Lector 9652cda
Blessing and CantripPrerequisite.ts are now a TinyActivatablePrereq i…
Lector 0b93f01
Merge branch 'feature/prereq-cantrip' of https://github.com/elyukai/o…
Lector baa37e0
Fix cache
Lector 739620d
prettier
Lector fbe85e7
Cantrip- und BlessingPrereq ist now grouped under TinyActivatablePrer…
Lector File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import * as DB from "tsondb/schema/dsl" | ||
| import { BlessingIdentifier } from "../../_Identifier.js" | ||
| import { DisplayOption } from "../DisplayOption.js" | ||
|
|
||
| export const BlessingPrerequisite = DB.TypeAlias(import.meta.url, { | ||
| name: "BlessingPrerequisite", | ||
| comment: "Requires a specific blessing.", | ||
| type: () => | ||
| DB.Object({ | ||
| id: DB.Required({ | ||
| comment: "The required blessing.", | ||
| type: BlessingIdentifier(), | ||
| }), | ||
| display_option: DB.Optional({ | ||
| type: DB.IncludeIdentifier(DisplayOption), | ||
| }), | ||
| }), | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import * as DB from "tsondb/schema/dsl" | ||
| import { CantripIdentifier } from "../../_Identifier.js" | ||
| import { DisplayOption } from "../DisplayOption.js" | ||
|
|
||
| export const CantripPrerequisite = DB.TypeAlias(import.meta.url, { | ||
| name: "CantripPrerequisite", | ||
| comment: "Requires a specific cantrip.", | ||
| type: () => | ||
| DB.Object({ | ||
| id: DB.Required({ | ||
| comment: "The required cantrip.", | ||
| type: CantripIdentifier(), | ||
| }), | ||
| display_option: DB.Optional({ | ||
| type: DB.IncludeIdentifier(DisplayOption), | ||
| }), | ||
| }), | ||
| }) |
26 changes: 26 additions & 0 deletions
26
src/types/prerequisites/single/TinyActivatablePrerequisite.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import * as DB from "tsondb/schema/dsl" | ||
| import { BlessingIdentifier, CantripIdentifier } from "../../_Identifier.js" | ||
| import { DisplayOption } from "../DisplayOption.js" | ||
|
|
||
| export const TinyActivatablePrerequisite = DB.TypeAlias(import.meta.url, { | ||
| name: "TinyActivatablePrerequisite", | ||
| comment: "Requires a specific cantrip or blessing.", | ||
| type: () => | ||
| DB.Object({ | ||
| id: DB.Required({ | ||
| comment: "The required item.", | ||
| type: DB.IncludeIdentifierType(TinyActivatableCategory), | ||
| }), | ||
| display_option: DB.Optional({ | ||
| type: DB.IncludeIdentifier(DisplayOption), | ||
| }), | ||
| }), | ||
| }) | ||
|
|
||
| const TinyActivatableCategory = DB.Enum(import.meta.url, { | ||
| name: "TinyActivatableCategory", | ||
| values: () => ({ | ||
| Blessing: DB.EnumCase({ type: BlessingIdentifier() }), | ||
| Cantrip: DB.EnumCase({ type: CantripIdentifier() }), | ||
| }), | ||
| }) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ich hätte jetzt grundsätzlich
BlessingPrerequisiteundCantripPrerequisiteunterTinyActivatablePrerequisitezusammengefasst, weil beide gleich funktionieren. Dann kannst du eineTinyActivatableIdentifierGroupin_IdentifierGroup.tsmit den beiden Entities erstellen und dann als ID verwenden.