Skip to content

Commit

Permalink
json formating, comment indent, release with die styling
Browse files Browse the repository at this point in the history
  • Loading branch information
mjording committed Oct 21, 2024
1 parent d8fb1b0 commit 162f807
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ If either of these conditions are not met on the commit that tag points at, the
- The `system.json` file's `download` url must match the expected outcome of the release CI artifact. This should simply be changing version numbers in the url to match the release version.

```text
https://github.com/mjording/marvel-multiverse/releases/download/release-1.8.0/marvel-multiverse-1.8.0.zip
https://github.com/mjording/marvel-multiverse/releases/download/release-1.8.1/marvel-multiverse-1.8.1.zip
└─ Tag Name ──┘ └─ V ─┘ (version)
```

Expand Down
4 changes: 2 additions & 2 deletions module/documents/chat-message.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ export class ChatMessageMarvel extends ChatMessage {
let damageReduction = 0;
let lessDamage = 0;
if (target){
damageReduction = damageType && damageType === "focus" ? target.system.focusDamageReduction : target.system.healthDamageReduction;
damageReduction = damageType && damageType === "focus" ? target?.system.focusDamageReduction : target?.system.healthDamageReduction;
lessDamage = marvelDie.total * damageReduction;
}
const abilityValue = actor.system.abilities[abilityAbr].value;
Expand Down Expand Up @@ -334,7 +334,7 @@ export class ChatMessageMarvel extends ChatMessage {
* Handles our button clicks from the chat log
* @param {string} action
* @param {string} messageId
* @param {number} dieIndex
* @param {number} dieIndex
*/
async _handleChatButton(action, messageId, dieIndex, isInit, flavor){

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "marvel-multiverse",
"version": "1.8.0",
"version": "1.8.1",
"description": "CSS compiler for the MarvelMultiverse system",
"scripts": {
"build:css": "sass src/scss/marvel-multiverse.scss css/marvel-multiverse.css --style=expanded --no-source-map",
Expand Down
2 changes: 1 addition & 1 deletion packs/_source/origins/inhuman.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"flags": {},
"effects": [],
"_key": "!items!MW6nYPrxE9kFFV59"
}
}
2 changes: 1 addition & 1 deletion packs/_source/powers/Super-Strength/jump-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@
],
"folder": "88848a43d8a58388",
"_key": "!items!WpErC2aBVVJjvt7d "
}
}
2 changes: 1 addition & 1 deletion packs/_source/powers/Super-Strength/jump-3.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@
],
"folder": "88848a43d8a58388",
"_key": "!items!7tD1eHitRB9sVZuw163d09d3e7 "
}
}
2 changes: 1 addition & 1 deletion packs/_source/traits/battle-ready.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
}
],
"_key": "!items!AlnpAp5Bl0hhT1T3"
}
}
4 changes: 2 additions & 2 deletions system.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"thumbnail": "systems/marvel-multiverse/ui/official/mmrpg-setup-thumbnail.png"
}
],
"version": "1.8.0",
"version": "1.8.1",
"compatibility": {
"minimum": 12,
"verified": "12.328"
Expand Down Expand Up @@ -116,7 +116,7 @@
],
"socket": true,
"manifest": "https://raw.githubusercontent.com/mjording/marvel-multiverse/main/system.json",
"download": "https://github.com/mjording/marvel-multiverse/releases/download/release-1.8.0/marvel-multiverse-release-1.8.0.zip",
"download": "https://github.com/mjording/marvel-multiverse/releases/download/release-1.8.1/marvel-multiverse-release-1.8.1.zip",
"background": "systems/marvel-multiverse/ui/official/mmrpg-background.webp",
"grid": {
"distance": 5,
Expand Down

0 comments on commit 162f807

Please sign in to comment.