Skip to content

Commit

Permalink
Merge branch 'main' into bunkers-n-badasses
Browse files Browse the repository at this point in the history
  • Loading branch information
sigrunixia authored Jul 9, 2023
2 parents 6a0409e + 394d033 commit 26e2862
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 67 deletions.
51 changes: 0 additions & 51 deletions .github/ISSUE_TEMPLATE/feature-request.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "3.6.5"
".": "3.6.7"
}
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [3.6.7](https://github.com/javalent/fantasy-statblocks/compare/3.6.6...3.6.7) (2023-07-04)


### Bug Fixes

* basic 5e layout now shows 10xp for 0cr creatures ([e6e9bb3](https://github.com/javalent/fantasy-statblocks/commit/e6e9bb3fde33bad21ef67f90a8433b47535274b2))

## [3.6.6](https://github.com/javalent/fantasy-statblocks/compare/3.6.5...3.6.6) (2023-06-29)


### Bug Fixes

* solves the bug that inhibits the property to be fully dice parsed ([#237](https://github.com/javalent/fantasy-statblocks/issues/237)) ([27cf649](https://github.com/javalent/fantasy-statblocks/commit/27cf6498590c714cc8905cbae39e29714571943a))

## [3.6.5](https://github.com/javalent/fantasy-statblocks/compare/3.6.4...3.6.5) (2023-05-13)


Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "obsidian-5e-statblocks",
"name": "Fantasy Statblocks",
"version": "3.6.5",
"version": "3.6.7",
"description": "Create Fantasy Statblocks in Obsidian.md",
"minAppVersion": "0.12.0",
"author": "Jeremy Valentine",
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fantasy-statblocks",
"version": "3.6.5",
"version": "3.6.7",
"description": "Create Fantasy statblocks in Obsidian.md",
"scripts": {
"dev": "node ./esbuild.config.mjs",
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/basic 5e/basic5e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export const Statblock5e: StatblockItem[] = [
"0": {
cr: "0",
value: 0,
xp: 0
xp: 10
},
"1/8": {
cr: "1/8",
Expand Down
13 changes: 3 additions & 10 deletions src/view/ui/MarkdownHolder.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,20 @@
}
}
}
let start = 0;
property = ''
for (const dice of split) {
if (typeof dice != "string") {
const replacer = dice.original ?? dice.text;
let diceString;
let diceText = plugin.getRollerString(dice.text);
if (dice.original) {
diceString = `${dice.original} (\`dice: ${diceText}\`)`;
} else {
diceString = `\`dice: ${diceText}\``;
}
const index = property.slice(start).indexOf(replacer);
property =
property.slice(0, start) +
property.slice(start).replace(replacer, diceString);
start =
property.slice(0, start).length + index + diceString.length + 1;
property += diceString
} else {
start += dice.length;
property += dice
}
}
Expand Down

0 comments on commit 26e2862

Please sign in to comment.