unstaged id changes
This commit is contained in:
Lukas Obermann
+5
-3
@@ -1,5 +1,4 @@
|
||||
{
|
||||
"$schema": "https://bucklescript.github.io/bucklescript/docson/build-schema.json",
|
||||
"name": "optolith-client",
|
||||
"version": "0.1.0",
|
||||
"sources": [
|
||||
@@ -18,6 +17,7 @@
|
||||
{ "dir": "src/App/Utilities/YAML" },
|
||||
{ "dir": "src/App/Views" },
|
||||
{ "dir": "src/App/Views/Universal" },
|
||||
{ "dir": "src/Cloud" },
|
||||
{ "dir": "src/Control" },
|
||||
{ "dir": "src/Data" },
|
||||
{ "dir": "src/Data/__tests__", "type": "dev" },
|
||||
@@ -45,10 +45,13 @@
|
||||
"bs-dependencies": [
|
||||
"@glennsl/bs-json",
|
||||
"@glennsl/bs-jest",
|
||||
"bs-fetch",
|
||||
"bs-webapi",
|
||||
"decco",
|
||||
"reason-react",
|
||||
"reductive"
|
||||
],
|
||||
"ppx-flags": [ "decco/ppx" ],
|
||||
"reason": {
|
||||
"react-jsx": 3
|
||||
},
|
||||
@@ -56,6 +59,5 @@
|
||||
"number": "+A-42-48",
|
||||
"error": "+A-3-4-27-32-41-44-102"
|
||||
},
|
||||
"namespace": true,
|
||||
"refmt": 3
|
||||
"namespace": true
|
||||
}
|
||||
|
||||
Generated
+18089
-4081
File diff suppressed because it is too large
Load Diff
+62
-61
@@ -11,73 +11,74 @@
|
||||
"license": "MPL-2.0",
|
||||
"main": "dist/main.js",
|
||||
"dependencies": {
|
||||
"@glennsl/bs-json": "5.0.2",
|
||||
"ajv": "6.12.6",
|
||||
"bs-platform": "8.4.2",
|
||||
"bs-webapi": "0.19.1",
|
||||
"electron-devtools-installer": "3.1.1",
|
||||
"electron-log": "4.2.4",
|
||||
"electron-updater": "4.3.1",
|
||||
"electron-window-state": "5.0.3",
|
||||
"moment": "2.25.3",
|
||||
"mousetrap": "1.6.5",
|
||||
"react": "16.13.1",
|
||||
"react-custom-scrollbars": "4.2.1",
|
||||
"react-dom": "16.13.1",
|
||||
"react-markdown": "4.3.1",
|
||||
"react-portal": "4.2.1",
|
||||
"react-redux": "7.2.1",
|
||||
"react-textfit": "1.1.0",
|
||||
"reason-react": "0.9.1",
|
||||
"reductive": "2.1.1",
|
||||
"redux": "4.0.5",
|
||||
"redux-devtools-extension": "2.13.8",
|
||||
"redux-thunk": "2.3.0",
|
||||
"relude": "0.63.1",
|
||||
"remark-breaks": "1.0.5",
|
||||
"reselect": "4.0.0",
|
||||
"semver": "7.3.2",
|
||||
"ssh2-sftp-client": "5.3.1",
|
||||
"tslib": "1.11.2",
|
||||
"yaml": "1.10.0"
|
||||
"@glennsl/bs-jest": "^0.7.0",
|
||||
"@glennsl/bs-json": "^5.0.2",
|
||||
"ajv": "^6.12.6",
|
||||
"bs-fetch": "^0.6.2",
|
||||
"bs-platform": "^9.0.2",
|
||||
"bs-webapi": "^0.19.1",
|
||||
"decco": "^1.4.0",
|
||||
"electron-devtools-installer": "^3.1.1",
|
||||
"electron-log": "^4.2.4",
|
||||
"electron-updater": "^4.3.1",
|
||||
"electron-window-state": "^5.0.3",
|
||||
"moment": "^2.25.3",
|
||||
"mousetrap": "^1.6.5",
|
||||
"react": "^17.0.2",
|
||||
"react-custom-scrollbars": "^4.2.1",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-markdown": "^4.3.1",
|
||||
"react-portal": "^4.2.1",
|
||||
"react-redux": "^7.2.1",
|
||||
"react-textfit": "^1.1.0",
|
||||
"reason-react": "^0.9.1",
|
||||
"reductive": "^2.1.1",
|
||||
"redux": "^4.0.5",
|
||||
"redux-devtools-extension": "^2.13.8",
|
||||
"redux-thunk": "^2.3.0",
|
||||
"relude": "^0.63.1",
|
||||
"remark-breaks": "^1.0.5",
|
||||
"reselect": "^4.0.0",
|
||||
"semver": "^7.3.2",
|
||||
"ssh2-sftp-client": "^5.3.1",
|
||||
"tslib": "^1.11.2",
|
||||
"yaml": "^1.10.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "11.0.0",
|
||||
"@commitlint/config-conventional": "11.0.0",
|
||||
"@glennsl/bs-jest": "0.6.0",
|
||||
"@types/classnames": "2.2.11",
|
||||
"@types/jest": "26.0.15",
|
||||
"@types/mousetrap": "1.6.4",
|
||||
"@types/node": "14.14.7",
|
||||
"@types/react": "16.9.56",
|
||||
"@types/react-custom-scrollbars": "4.0.7",
|
||||
"@types/react-dom": "16.9.9",
|
||||
"@types/react-portal": "4.0.2",
|
||||
"@types/react-redux": "7.1.11",
|
||||
"@types/semver": "7.3.4",
|
||||
"@typescript-eslint/eslint-plugin": "4.7.0",
|
||||
"@typescript-eslint/parser": "4.7.0",
|
||||
"@commitlint/cli": "^12.1.1",
|
||||
"@commitlint/config-conventional": "^12.1.1",
|
||||
"@types/jest": "^26.0.22",
|
||||
"@types/mousetrap": "^1.6.7",
|
||||
"@types/node": "^14.14.41",
|
||||
"@types/react": "^17.0.3",
|
||||
"@types/react-custom-scrollbars": "^4.0.7",
|
||||
"@types/react-dom": "^17.0.3",
|
||||
"@types/react-portal": "^4.0.2",
|
||||
"@types/react-redux": "^7.1.16",
|
||||
"@types/semver": "^7.3.4",
|
||||
"@typescript-eslint/eslint-plugin": "^4.22.0",
|
||||
"@typescript-eslint/parser": "^4.22.0",
|
||||
"custom-env": "2.0.1",
|
||||
"dotenv": "8.2.0",
|
||||
"electron": "10.1.5",
|
||||
"electron-builder": "22.9.1",
|
||||
"electron-notarize": "0.3.0",
|
||||
"eslint": "7.13.0",
|
||||
"eslint-plugin-react": "7.21.5",
|
||||
"eslint-plugin-react-hooks": "4.2.0",
|
||||
"fs-extra": "9.0.1",
|
||||
"gentype": "3.38.0",
|
||||
"html-webpack-plugin": "4.5.0",
|
||||
"husky": "4.3.0",
|
||||
"jest": "26.4.2",
|
||||
"electron": "^10.4.3",
|
||||
"electron-builder": "^22.10.5",
|
||||
"electron-notarize": "^1.0.0",
|
||||
"eslint": "^7.25.0",
|
||||
"eslint-plugin-react": "^7.23.2",
|
||||
"eslint-plugin-react-hooks": "^4.2.0",
|
||||
"fs-extra": "9.1.0",
|
||||
"gentype": "^3.48.0",
|
||||
"html-webpack-plugin": "^5.3.1",
|
||||
"husky": "^4.3.0",
|
||||
"jest": "^26.6.3",
|
||||
"qusly-core": "2.5.2",
|
||||
"sass": "1.29.0",
|
||||
"standard-version": "9.0.0",
|
||||
"ts-jest": "26.4.4",
|
||||
"ts-loader": "8.0.11",
|
||||
"sass": "^1.32.11",
|
||||
"standard-version": "^9.2.0",
|
||||
"ts-jest": "^26.5.5",
|
||||
"ts-loader": "^9.1.1",
|
||||
"typescript": "3.8.3",
|
||||
"webpack": "5.4.0",
|
||||
"webpack-cli": "4.2.0"
|
||||
"webpack": "^5.35.1",
|
||||
"webpack-cli": "^4.6.0"
|
||||
},
|
||||
"scripts": {
|
||||
"prerelease:win": "set NODE_ENV=development && node ./deploy/buildInsiderWin.js",
|
||||
|
||||
@@ -4,7 +4,12 @@
|
||||
* `dec` entry's level decreases the value.
|
||||
*/
|
||||
let modifyByLevel:
|
||||
(int, option(Activatable_Dynamic.t), option(Activatable_Dynamic.t)) => int;
|
||||
(
|
||||
int,
|
||||
option(Activatable_Dynamic.t('a)),
|
||||
option(Activatable_Dynamic.t('a))
|
||||
) =>
|
||||
int;
|
||||
|
||||
/**
|
||||
* `modifyByLevelM value inc dec` modifies a base `value` by the active level of
|
||||
@@ -15,8 +20,8 @@ let modifyByLevel:
|
||||
let modifyByLevelM:
|
||||
(
|
||||
option(int),
|
||||
option(Activatable_Dynamic.t),
|
||||
option(Activatable_Dynamic.t)
|
||||
option(Activatable_Dynamic.t('a)),
|
||||
option(Activatable_Dynamic.t('a))
|
||||
) =>
|
||||
int;
|
||||
|
||||
@@ -30,8 +35,8 @@ let modifyByLevelM:
|
||||
let getModifierByIsActive:
|
||||
(
|
||||
option(int),
|
||||
option(Activatable_Dynamic.t),
|
||||
option(Activatable_Dynamic.t)
|
||||
option(Activatable_Dynamic.t('a)),
|
||||
option(Activatable_Dynamic.t('a))
|
||||
) =>
|
||||
int;
|
||||
|
||||
@@ -43,7 +48,7 @@ let getModifierByIsActive:
|
||||
let getModifierByIsActives:
|
||||
(
|
||||
option(int),
|
||||
list(option(Activatable_Dynamic.t)),
|
||||
list(option(Activatable_Dynamic.t))
|
||||
list(option(Activatable_Dynamic.t('a))),
|
||||
list(option(Activatable_Dynamic.t('a)))
|
||||
) =>
|
||||
int;
|
||||
|
||||
+1
-1
Submodule src/Database updated: 42c3f15c06...54851f5532
+18
-12
@@ -6,8 +6,12 @@ let getMax:
|
||||
~startEl: ExperienceLevel.t,
|
||||
~phase: Id.Phase.t,
|
||||
~heroAttrs: Ley_IntMap.t(Attribute.Dynamic.t),
|
||||
~exceptionalSkill: option(Activatable_Dynamic.t),
|
||||
~propertyKnowledge: option(Activatable_Dynamic.t),
|
||||
~exceptionalSkill: option(Activatable_Dynamic.t(Advantage.Static.t)),
|
||||
~propertyKnowledge: option(
|
||||
Activatable_Dynamic.t(
|
||||
MagicalSpecialAbility.Static.t,
|
||||
),
|
||||
),
|
||||
~staticEntry: Spell.Static.t
|
||||
) =>
|
||||
int;
|
||||
@@ -20,10 +24,10 @@ let isIncreasable:
|
||||
~startEl: ExperienceLevel.t,
|
||||
~phase: Id.Phase.t,
|
||||
~heroAttrs: Ley_IntMap.t(Attribute.Dynamic.t),
|
||||
~exceptionalSkill: option(Activatable_Dynamic.t),
|
||||
~propertyKnowledge: option(Activatable_Dynamic.t),
|
||||
~exceptionalSkill: option(Advantage.Static.t),
|
||||
~propertyKnowledge: option(MagicalSpecialAbility.Static.t),
|
||||
~staticEntry: Spell.Static.t,
|
||||
~heroEntry: ActivatableSkill.Dynamic.t
|
||||
~heroEntry: ActivatableSkill.Dynamic.t('a)
|
||||
) =>
|
||||
bool;
|
||||
|
||||
@@ -35,11 +39,11 @@ let isIncreasable:
|
||||
*/
|
||||
let getMin:
|
||||
(
|
||||
~propertyKnowledge: Activatable_Dynamic.t,
|
||||
~propertyKnowledge: Activatable_Dynamic.t(MagicalSpecialAbility.Static.t),
|
||||
~staticSpells: Ley_IntMap.t(Spell.Static.t),
|
||||
~heroSpells: Ley_IntMap.t(ActivatableSkill.Dynamic.t),
|
||||
~heroSpells: Ley_IntMap.t(ActivatableSkill.Dynamic.t('a)),
|
||||
~staticEntry: Spell.Static.t,
|
||||
~heroEntry: ActivatableSkill.Dynamic.t
|
||||
~heroEntry: ActivatableSkill.Dynamic.t('a)
|
||||
) =>
|
||||
option(int);
|
||||
|
||||
@@ -48,11 +52,11 @@ let getMin:
|
||||
*/
|
||||
let isDecreasable:
|
||||
(
|
||||
~propertyKnowledge: Activatable_Dynamic.t,
|
||||
~propertyKnowledge: Activatable_Dynamic.t(MagicalSpecialAbility.Static.t),
|
||||
~staticSpells: Ley_IntMap.t(Spell.Static.t),
|
||||
~heroSpells: Ley_IntMap.t(ActivatableSkill.Dynamic.t),
|
||||
~heroSpells: Ley_IntMap.t(ActivatableSkill.Dynamic.t('a)),
|
||||
~staticEntry: Spell.Static.t,
|
||||
~heroEntry: ActivatableSkill.Dynamic.t
|
||||
~heroEntry: ActivatableSkill.Dynamic.t('a)
|
||||
) =>
|
||||
bool;
|
||||
|
||||
@@ -64,7 +68,9 @@ module PropertyKnowledge: {
|
||||
let getAvailableProperties:
|
||||
(
|
||||
Ley_IntMap.t(Spell.Static.t),
|
||||
Ley_IntMap.t(ActivatableSkill.Dynamic.t)
|
||||
Ley_IntMap.t(
|
||||
ActivatableSkill.Dynamic.t(MagicalSpecialAbility.Static.t),
|
||||
)
|
||||
) =>
|
||||
list(int);
|
||||
};
|
||||
|
||||
+24
-6
@@ -1134,9 +1134,9 @@ module SpecialAbility = struct
|
||||
module CombatStyleSpecialAbility = struct
|
||||
type t = GaretherGossenStil | Other of int
|
||||
|
||||
let fromInt = function x -> Other x
|
||||
let fromInt = function 40 -> GaretherGossenStil | x -> Other x
|
||||
|
||||
let toInt = function Other x -> x
|
||||
let toInt = function GaretherGossenStil -> 40 | Other x -> x
|
||||
end
|
||||
|
||||
module AdvancedCombatSpecialAbility = struct
|
||||
@@ -1163,9 +1163,19 @@ module SpecialAbility = struct
|
||||
| ScholarDesMagierkollegsZuHoningen
|
||||
| Other of int
|
||||
|
||||
let fromInt = function x -> Other x
|
||||
let fromInt = function
|
||||
| 37 -> ScholarDerHalleDesLebensZuNorburg
|
||||
| 42 -> ScholarDesKreisesDerEinfuehlung
|
||||
| 55 -> MadaschwesternStil
|
||||
| 24 -> ScholarDesMagierkollegsZuHoningen
|
||||
| x -> Other x
|
||||
|
||||
let toInt = function Other x -> x
|
||||
let toInt = function
|
||||
| ScholarDerHalleDesLebensZuNorburg -> 37
|
||||
| ScholarDesKreisesDerEinfuehlung -> 42
|
||||
| MadaschwesternStil -> 55
|
||||
| ScholarDesMagierkollegsZuHoningen -> 24
|
||||
| Other x -> x
|
||||
end
|
||||
|
||||
module AdvancedMagicalSpecialAbility = struct
|
||||
@@ -1302,9 +1312,17 @@ module SpecialAbility = struct
|
||||
| FollowersOfTheGoldenOne
|
||||
| Other of int
|
||||
|
||||
let fromInt = function x -> Other x
|
||||
let fromInt = function
|
||||
| 38 -> BirdsOfPassage
|
||||
| 40 -> HuntressesOfTheWhiteMaiden
|
||||
| 47 -> FollowersOfTheGoldenOne
|
||||
| x -> Other x
|
||||
|
||||
let toInt = function Other x -> x
|
||||
let toInt = function
|
||||
| BirdsOfPassage -> 38
|
||||
| HuntressesOfTheWhiteMaiden -> 40
|
||||
| FollowersOfTheGoldenOne -> 47
|
||||
| Other x -> x
|
||||
end
|
||||
|
||||
module AdvancedKarmaSpecialAbility = struct
|
||||
|
||||
Reference in New Issue
Block a user