From f284bbf09d0cd6c83c06fc6822d85054c19bbbbf Mon Sep 17 00:00:00 2001 From: Mark Lenser Date: Sat, 19 May 2018 09:16:13 +0200 Subject: [PATCH] version 18.1.3 --- 5eShaped/5eShaped.html | 10 +++++----- 5eShaped/changelog.md | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/5eShaped/5eShaped.html b/5eShaped/5eShaped.html index 0102ccdc48..b73185d1b6 100644 --- a/5eShaped/5eShaped.html +++ b/5eShaped/5eShaped.html @@ -2397,7 +2397,7 @@ var findSpellcasting = exports.findSpellcasting = function findSpellcasting(repe }; var cleanContent = exports.cleanContent = function cleanContent(content) { - return content.replace(/\*\*\n\t/g, '**').replace(/\*\*\n/g, '**').replace(/:\*\*/g, '**:').replace(/\s\s\n\n/g, '\n\n').replace(/“/g, '"').replace(/”/g, '"').replace(/'/g, '’'); + return content.replace(/\*\*\n\t/g, '**').replace(/\*\*\n/g, '**').replace(/:\s\*\*/g, '.** ').replace(/:\*\*/g, '.**').replace(/\*\*:/g, '.**').replace(/\*\*\./g, '.**').replace(/\s\s\n\n/g, '\n\n').replace(/“/g, '"').replace(/”/g, '"').replace(/'/g, '’'); }; var parseRepeatFromName = function parseRepeatFromName(data, repString) { @@ -3075,7 +3075,7 @@ var _processing = __webpack_require__(8); /* global on:false, generateRowID:false, getTranslationByKey:false */ var cleanContent = exports.cleanContent = function cleanContent(content) { - return content.trim().replace(/.*(\\n)/, '').trim().replace(/.*(\\n)/, '').trim().replace(/.*(\\n)/, '').replace('. ', '. ').replace(/\*\*\n\t/g, '**').replace(/\*\*\n/g, '**').replace(/:\*\*/g, '**:').replace(/\s\s\n\n/g, '\n\n').replace(/“/g, '"').replace(/”/g, '"').replace(/'/g, '’').trim().trim(); + return content.trim().replace(/.*(\\n)/, '').trim().replace(/.*(\\n)/, '').trim().replace(/.*(\\n)/, '').replace('. ', '. ').replace(/\*\*\n\t/g, '**').replace(/\*\*\n/g, '**').replace(/:\s\*\*/g, '.** ').replace(/:\*\*/g, '.**').replace(/\*\*:/g, '.**').replace(/\*\*\./g, '.**').replace(/\s\s\n\n/g, '\n\n').replace(/“/g, '"').replace(/”/g, '"').replace(/'/g, '’').trim().trim(); }; var parseAttackType = function parseAttackType(data, repString) { @@ -5170,7 +5170,7 @@ var cleanName = function cleanName(name) { }; var cleanContent = exports.cleanContent = function cleanContent(content) { - return content.trim().replace(/.*(\\n)/, '').trim().replace(/.*(\\n)/, '').trim().replace(/\u00a0/g, '').replace(/\+ (\d+) to hit/g, '+$1 to hit').replace(/Hit:(\d+)/g, 'Hit: $1').replace(/.*(\\n)/, '').replace('. ', '. ').replace(/\*\*\n\t/g, '**').replace(/\*\*\n/g, '**').replace(/:\s\*\*/g, '**: ').replace(/:\*\*/g, '**:').replace(/\s\s\n\n/g, '\n\n').replace(/“/g, '"').replace(/”/g, '"').replace(/'/g, '’').replace(/\sLegendary Actions\n/g, '\n Legendary Actions\n').replace(/\sReactions\n/g, '\n Reactions\n').replace(/\s\sActions\n\n/g, '\n Actions\n\n').replace(/^(?:\s?Actions\n)/g, 'content \n Actions\n').replace(/^(?:\s?Traits\n)/g, 'content \n Traits\n').replace(/\sTraits\n/g, '\n Traits\n').replace(/\sRegional Effects\n/g, '\n Regional Effects\n').replace(/\sLair Actions\n/g, '\n Lair Actions\n').trim().trim().replace('reach ft.', '').trim().replace(/\sft.\//, '/') // bandit and salamander + return content.trim().replace(/.*(\\n)/, '').trim().replace(/.*(\\n)/, '').trim().replace(/\u00a0/g, '').replace(/\+ (\d+) to hit/g, '+$1 to hit').replace(/Hit:(\d+)/g, 'Hit: $1').replace(/.*(\\n)/, '').replace('. ', '. ').replace(/\*\*\n\t/g, '**').replace(/\*\*\n/g, '**').replace(/:\s\*\*/g, '.** ').replace(/:\*\*/g, '.**').replace(/\*\*:/g, '.**').replace(/\*\*\./g, '.**').replace(/\s\s\n\n/g, '\n\n').replace(/“/g, '"').replace(/”/g, '"').replace(/'/g, '’').replace(/\u2060/g, '').replace(/\sLegendary Actions\n/g, '\n Legendary Actions\n').replace(/\sReactions\n/g, '\n Reactions\n').replace(/\s\sActions\n\n/g, '\n Actions\n\n').replace(/^(?:\s?Actions\n)/g, 'content \n Actions\n').replace(/^(?:\s?Traits\n)/g, 'content \n Traits\n').replace(/\sTraits\n/g, '\n Traits\n').replace(/\sRegional Effects\n/g, '\n Regional Effects\n').replace(/\sLair Actions\n/g, '\n Lair Actions\n').trim().trim().replace('reach ft.', '').trim().replace(/\sft.\//, '/') // bandit and salamander .replace(/ \n\n[A-z].*/g, '').trim(); }; @@ -5228,7 +5228,7 @@ var parseSRDContentSection = exports.parseSRDContentSection = function parseSRDC data.legendary_action_amount_max = parseInt(legendaryActionsMatch[1], 10); } } - var re = /@(.*)@(?::|\.)\s([^@]+)/gi; + var re = /@(.*)(?::|\.)@\s([^@]+)/gi; var match = void 0; while ((match = re.exec(section.replace(/\*\*/g, '@'))) !== null) { if (match && match[1] && match[2]) { @@ -8988,7 +8988,7 @@ var upgradeSheet = exports.upgradeSheet = function upgradeSheet(sheetVersion) { /* 35 */ /***/ (function(module, exports) { -module.exports = {"name":"5eShaped","version":"18.1.2","bin":"./","description":"5e Shaped character sheet for Roll20.net","main":"gulpfile.js","devDependencies":{"babel-core":"^6.26.3","babel-eslint":"^8.2.3","babel-loader":"^7.1.4","babel-preset-es2015":"^6.24.0","cache-loader":"^1.2.2","chai":"^4.1.2","chai-spies":"^1.0.0","cross-env":"^5.1.4","eslint":"^4.19.1","eslint-config-airbnb":"^16.1.0","eslint-plugin-import":"^2.11.0","eslint-plugin-jsx-a11y":"^6.0.3","eslint-plugin-react":"^7.7.0","gulp":"^3.9.1","gulp-autoprefixer":"^5.0.0","gulp-clean-css":"^3.9.3","gulp-concat":"^2.6.0","gulp-file-include":"^2.0.1","gulp-htmlmin":"^4.0.0","gulp-if":"^2.0.2","gulp-json-sort":"^1.0.0","gulp-nunjucks-render":"^2.2.2","gulp-rename":"^1.2.2","gulp-replace-task":"^0.11.0","gulp-sass":"^4.0.1","gulp-tap":"^1.0.1","gulp-util":"^3.0.8","gulp-wrapper":"1.0.0","istanbul-instrumenter-loader":"^3.0.1","json-loader":"^0.5.7","mocha":"^5.1.1","mocha-webpack":"^1.1.0","nyc":"^11.7.1","request":"2.85.0","sass-lint":"^1.12.1","sinon":"^4.5.0","streamqueue":"^1.1.2","webpack-node-externals":"^1.7.2","webpack-stream":"^4.0.3"},"repository":{"type":"git","url":"https://bitbucket.org/mlenser/5eshaped/"},"scripts":{"coverage":"cross-env NODE_ENV=coverage nyc npm test","lint":"eslint ./sheet/**/*.js ./test/**/*.js","sass-lint":"sass-lint ./sheet/**/*.scss -v -q","test":"mocha-webpack --opts test/mocha.webpack.opts","version-bump-patch":"npm version patch --no-git-tag-version","version-bump-minor":"npm version minor --no-git-tag-version","version-bump-major":"npm version major --no-git-tag-version"},"nyc":{"extension":[".js"],"all":true,"instrument":false,"sourceMap":false,"reporter":["lcov","text-summary","text"]},"author":"Mark Lenser (Kryx)","private":true} +module.exports = {"name":"5eShaped","version":"18.1.3","bin":"./","description":"5e Shaped character sheet for Roll20.net","main":"gulpfile.js","devDependencies":{"babel-core":"^6.26.3","babel-eslint":"^8.2.3","babel-loader":"^7.1.4","babel-preset-es2015":"^6.24.0","cache-loader":"^1.2.2","chai":"^4.1.2","chai-spies":"^1.0.0","cross-env":"^5.1.4","eslint":"^4.19.1","eslint-config-airbnb":"^16.1.0","eslint-plugin-import":"^2.11.0","eslint-plugin-jsx-a11y":"^6.0.3","eslint-plugin-react":"^7.7.0","gulp":"^3.9.1","gulp-autoprefixer":"^5.0.0","gulp-clean-css":"^3.9.3","gulp-concat":"^2.6.0","gulp-file-include":"^2.0.1","gulp-htmlmin":"^4.0.0","gulp-if":"^2.0.2","gulp-json-sort":"^1.0.0","gulp-nunjucks-render":"^2.2.2","gulp-rename":"^1.2.2","gulp-replace-task":"^0.11.0","gulp-sass":"^4.0.1","gulp-tap":"^1.0.1","gulp-util":"^3.0.8","gulp-wrapper":"1.0.0","istanbul-instrumenter-loader":"^3.0.1","json-loader":"^0.5.7","mocha":"^5.1.1","mocha-webpack":"^1.1.0","nyc":"^11.7.1","request":"2.85.0","sass-lint":"^1.12.1","sinon":"^4.5.0","streamqueue":"^1.1.2","webpack-node-externals":"^1.7.2","webpack-stream":"^4.0.3"},"repository":{"type":"git","url":"https://bitbucket.org/mlenser/5eshaped/"},"scripts":{"coverage":"cross-env NODE_ENV=coverage nyc npm test","lint":"eslint ./sheet/**/*.js ./test/**/*.js","sass-lint":"sass-lint ./sheet/**/*.scss -v -q","test":"mocha-webpack --opts test/mocha.webpack.opts","version-bump-patch":"npm version patch --no-git-tag-version","version-bump-minor":"npm version minor --no-git-tag-version","version-bump-major":"npm version major --no-git-tag-version"},"nyc":{"extension":[".js"],"all":true,"instrument":false,"sourceMap":false,"reporter":["lcov","text-summary","text"]},"author":"Mark Lenser (Kryx)","private":true} /***/ }), /* 36 */ diff --git a/5eShaped/changelog.md b/5eShaped/changelog.md index 4e8d25b06c..5f6b7f6f4b 100644 --- a/5eShaped/changelog.md +++ b/5eShaped/changelog.md @@ -11,6 +11,12 @@ Bugs fall into the patch category. The sheet will always upgrade itself unless I specify otherwise, though some things like roll template fields changing will require users who have added custom macros to fix. +## 18.1.3 + +### Bug fixes + +- [#714: Mordenkainen's Tome of Foes, seems like monster imports fail to get actions](https://bitbucket.org/mlenser/5eshaped/issues/714/mordenkainens-tome-of-foes-seems-like) + ## 18.1.2 ### Bug fixes