Skip to content

Commit

Permalink
fix: Cepheus Engine compendium fixes and additions courtesy of @marvi…
Browse files Browse the repository at this point in the history
…n9257

Also fixes for Cepheus Engine autofire.
  • Loading branch information
xdy committed Dec 30, 2020
1 parent b4ede7c commit 1ed4010
Show file tree
Hide file tree
Showing 25 changed files with 140 additions and 34 deletions.
34 changes: 17 additions & 17 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@semantic-release/github": "^7.2.0",
"@semantic-release/release-notes-generator": "^9.0.1",
"@types/jquery": "^3.5.5",
"@types/node": "^14.14.14",
"@types/node": "^14.14.17",
"@types/webpack": "^4.41.25",
"@types/webpack-env": "^1.16.0",
"@typescript-eslint/eslint-plugin": "^4.11.1",
Expand All @@ -37,9 +37,9 @@
"fs-extra": "^9.0.1",
"mini-css-extract-plugin": "^1.3.3",
"prettier": "^2.2.1",
"sass": "^1.27.0",
"sass": "^1.32.0",
"sass-loader": "^10.1.0",
"semantic-release": "^17.3.0",
"semantic-release": "^17.3.1",
"source-map-loader": "^1.1.0",
"style-loader": "^2.0.0",
"ts-loader": "^8.0.12",
Expand Down
6 changes: 3 additions & 3 deletions src/module/handlebars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ export default function registerHandlebarsHelpers():void {
});

Handlebars.registerHelper('twodsix_burstModes', (weapon) => {
// Parse rates of fire, and ignore the 1
const modes = weapon.rateOfFire.split('-');
// Parse rates of fire, and ignore the first number (usually 1, but can be 0, which means no single fire)
const modes = weapon.rateOfFire.split(/-|\//);
modes.shift();
return modes;
});

Handlebars.registerHelper('twodsix_useCEAutofireRules', () => {
return (game.settings.get('twodsix', 'autofireRulesUsed') == TWODSIX.VARIANTS.CE);
return (game.settings.get('twodsix', 'autofireRulesUsed') === TWODSIX.VARIANTS.CE);
});

Handlebars.registerHelper('twodsix_useCELAutofireRules', (weapon) => {
Expand Down
1 change: 1 addition & 0 deletions static/assets/twodsix_icons/General/TDX.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions static/assets/twodsix_icons/General/ablat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions static/assets/twodsix_icons/General/advanced-base.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions static/assets/twodsix_icons/General/aerosol.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions static/assets/twodsix_icons/General/hand-calculator.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions static/assets/twodsix_icons/General/hand-computer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions static/assets/twodsix_icons/General/inertial-locator.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions static/assets/twodsix_icons/General/ir-goggles.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1ed4010

Please sign in to comment.