diff --git a/css/Print.scss b/css/Print.scss index 102e2bbf..1925a8d5 100644 --- a/css/Print.scss +++ b/css/Print.scss @@ -19,8 +19,8 @@ $border-2px: 1.25pt; .titlebar, .subtabs { display: none; } - - section#misc { + + section#profile { padding: 0 !important; overflow: visible !important; background: white !important; @@ -62,12 +62,17 @@ $border-2px: 1.25pt; > .header { .attributes { - .attr { + > .attr { > .value { - border-width: $border-2px !important; + border-width: calc(0.5mm - 0.57pt/2) !important; > div { - border-width: $border-1px !important; + border-width: 0.57pt !important; + position: relative; + + > div { + @include size(100%); + } } } } @@ -99,6 +104,11 @@ $border-2px: 1.25pt; > .values { > div { border-width: $border-1px !important; + + > div { + width: calc(1.2mm - 0.57pt); + height: calc(1.2mm - 0.57pt); + } } } } diff --git a/css/components/content/Content.scss b/css/components/content/Content.scss index 42f540ad..60c596d7 100644 --- a/css/components/content/Content.scss +++ b/css/components/content/Content.scss @@ -21,7 +21,7 @@ @import "components/content/sheets/TalentsSheet"; @import "components/content/skills/Skills"; -#body > main > section { +section { @extend %max-size-relative; padding-top: $titlebar-height; z-index: 0; @@ -37,6 +37,20 @@ flex: none; } + .scroll { + flex: 1 1 100%; + + .scroll-inner { + padding: 0 35px; + + .textfield, .dropdown { + + .btn-icon { + margin: 10px 0 10px 11px; + } + } + } + } + > .page { flex: 1 1 auto; padding: 11px 0 3px; @@ -49,28 +63,6 @@ overflow: hidden; height: 100%; - .scroll { - flex: 1 1 100%; - - .scroll-inner { - padding: 0 35px; - display: flex; - flex-wrap: wrap; - - > div:not(.btn):not(.btn-icon):not(.textfield):not(.dropdown), > h2, > h3, > h4, > ul { - flex: 1 0 auto; - width: 100%; - margin-top: 20px; - } - - .textfield, .dropdown { - + .btn-icon { - margin: 10px 0 10px 11px; - } - } - } - } - > .options { flex: 1 0 auto; width: 200px; diff --git a/css/components/content/account/Account.scss b/css/components/content/account/Account.scss index 2e967432..34da1613 100644 --- a/css/components/content/account/Account.scss +++ b/css/components/content/account/Account.scss @@ -3,7 +3,7 @@ .scroll-inner { padding-bottom: 22px; - > div.padding { + > .padding { height: 22px; } diff --git a/css/components/content/herolist/Herolist.scss b/css/components/content/herolist/Herolist.scss index 8f2cb88e..3aa8078d 100644 --- a/css/components/content/herolist/Herolist.scss +++ b/css/components/content/herolist/Herolist.scss @@ -85,7 +85,7 @@ } } - > .btn.primary { + > .btn.btn-primary { min-width: 140px; } } diff --git a/css/components/content/profile/Profile.scss b/css/components/content/profile/Profile.scss index f2a3b209..e5eece97 100644 --- a/css/components/content/profile/Profile.scss +++ b/css/components/content/profile/Profile.scss @@ -80,6 +80,25 @@ } } } + + .personal-data { + display: flex; + flex-wrap: wrap; + + > div { + flex: none; + display: flex; + flex-wrap: wrap; + width: 323px; + margin-right: 22px; + margin-bottom: 10px; + align-items: flex-end; + } + } + + .end-char-creation { + margin-top: 20px; + } } } diff --git a/css/components/content/sheets/MainSheet.scss b/css/components/content/sheets/MainSheet.scss index 39e50dc1..2283a0c3 100644 --- a/css/components/content/sheets/MainSheet.scss +++ b/css/components/content/sheets/MainSheet.scss @@ -42,22 +42,22 @@ > .ap-portrait { flex: none; - width: 290px; + width: 7.6cm; margin-left: 10px; display: flex; flex-wrap: wrap; > .labelbox { display: flex; - height: 40px; - margin: 14px 0 0; - width: 170px; + height: 1cm; + margin: 0.38cm 0 0; + width: 4.4cm; &.el { width: 100%; .box { - width: 170px; + width: 4.4cm; font-size: 20px; font-weight: 400; } @@ -71,7 +71,7 @@ .box { font: bold 24px/40px Alegreya Sans; text-align: center; - width: 70px; + width: 2cm; } label { @@ -84,11 +84,16 @@ flex-direction: column; .box { - width: 120px; + width: 3.2cm; height: 148px; .avatar { @include size(100%); + + > img { + object-fit: cover; + @include size(100%); + } } } @@ -195,144 +200,4 @@ } } } - - - > .head { - padding-bottom: 20px; - border-bottom: 2px solid black; - height: 172px; - - > * { - float: left; - } - - .head-left { - @include size(150px); - - .portrait { - @include size(100%); - overflow: hidden; - display: flex; - justify-content: center; - align-items: center; - - img { - border: 4px solid black; - max-height: 100%; - max-width: 100%; - border-radius: 50%; - } - } - } - - .head-right { - @include size(568px 150px); - padding-left: 20px; - padding-top: 15px; - line-height: 23px; - position: relative; - - div.classes { - h1.name { - font: bold 20px/28px Caudex; - margin-bottom: 10px; - letter-spacing: 0.05em; - text-transform: uppercase; - } - - h2.race-culture { - font: bold 14px/20px Caudex; - letter-spacing: 0.05em; - margin-bottom: 10px; - } - - h2.prof { - font: bold 14px/20px Caudex; - letter-spacing: 0.05em; - } - } - - div.main-values { - text-align: right; - padding-top: 5px; - position: absolute; - top: 0; - right: 0; - - div.ap > span:not(.level) { - opacity: 0.25; - } - - div.so { - padding-top: 10px; - } - } - - div.qualities { - width: 100%; - float: left; - margin-top: 10px; - display: flex; - justify-content: space-between; - font: 13px/20px "Source Sans Pro"; - - .q-available { - opacity: 0.5; - } - } - } - } - - > .left { - margin-top: 20px; - border-right: 2px solid black; - width: 200px; - @include calc(height, '100% - 192px'); - float: left; - - .base-stats { - > div { - height: 16px; - - > div { - float: left; - - > span:first-child { - display: inline-block; - width: 30px; - } - } - } - } - - .vt-list, .nt-list { - list-style: none outside none; - - > li { - display: flex; - - > div { - flex: 1 0 auto; - - &:first-child { - width: 170px; - padding-left: 10px; - text-indent: -10px; - } - - &:last-child { - width: 28px; - } - } - } - } - } - - > .right { - @include calc(height, '100% - 192px'); - float: right; - width: 518px; - margin-top: 20px; - padding-left: 20px; - } } diff --git a/css/components/content/sheets/Sheets.scss b/css/components/content/sheets/Sheets.scss index cc77b9b9..03e9092b 100644 --- a/css/components/content/sheets/Sheets.scss +++ b/css/components/content/sheets/Sheets.scss @@ -1,3 +1,5 @@ +$border: 0.57pt solid black; + @import "layout/Box"; @import "layout/LabelBox"; @import "layout/Plain"; @@ -10,17 +12,18 @@ } .scroll-inner { - display: flex; flex-flow: column nowrap; align-items: center; + justify-content: center; .sheet { + flex: none; width: 21cm; height: 29.7cm; background: white; margin-top: 30px; text-align: left; - padding: 1cm; + padding: 0.89cm; font: 11px/16px Alegreya; color: black; letter-spacing: 0; @@ -82,12 +85,13 @@ flex: none; display: flex; flex-wrap: wrap-reverse; - width: 475px; + width: 12.65cm; .attr { flex: none; - margin: 5px 5px 0; // change + margin: 1.5mm 1.5mm 0; // change position: relative; // change + @include size(13mm); > .short { font: bold 10px/14px Alegreya; // change @@ -101,11 +105,13 @@ } > .value { - border: 2px solid transparent; + border-width: calc(0.5mm - 0.57pt/2); + border-style: solid; + border-color: transparent; padding: 0; // change > div { - border: 1px solid black; // change + border: $border; // change padding: 0; // change > div { @@ -163,3 +169,166 @@ } } } + +// #sheets { +// flex-flow: column nowrap; + +// > .options { +// margin-bottom: 11px; +// } + +// .scroll-inner { +// flex-flow: column nowrap; +// align-items: center; +// justify-content: center; + +// .sheet { +// flex: none; +// width: 21cm; +// height: 29.7cm; +// background: white; +// margin-top: 30px; +// text-align: left; +// padding: 1cm; +// font: 11px/16px Alegreya; +// color: black; +// letter-spacing: 0; +// display: flex; +// flex-direction: column; + +// &:last-child { +// margin-bottom: 30px; +// } + +// > div { +// display: flex; +// justify-content: space-between; +// } + +// h1, h2, h3 { +// color: black; +// margin: 0; +// } + +// h1 { +// font: italic bold 24px/22px Alegreya; +// } + +// h2 { +// font: 17px/13px Alegreya SC; +// text-transform: none; +// letter-spacing: 0; +// } + +// h3 { +// font: bold 16px Alegreya; +// letter-spacing: 0; +// } + +// > .header { +// margin-bottom: 11px; +// align-items: flex-end; +// flex: none; +// height: 110px; + +// > .title { +// flex: 1 1 100%; +// height: 50px; +// display: flex; +// flex-direction: column; +// justify-content: center; + +// h1, h2 { +// text-align: center; +// } + +// h2 { +// margin-top: 5px; +// } +// } + +// .attributes { +// flex: none; +// display: flex; +// flex-wrap: wrap-reverse; +// width: 475px; + +// .attr { +// flex: none; +// margin: 5px 5px 0; // change +// position: relative; // change + +// > .short { +// font: bold 10px/14px Alegreya; // change +// color: black; // change +// letter-spacing: 0.05em; +// text-transform: uppercase; +// text-align: center; +// position: absolute; // change +// top: 0; // change +// padding: 4px 8px 0; // change +// } + +// > .value { +// border: 2px solid transparent; +// padding: 0; // change + +// > div { +// border: 1px solid black; // change +// padding: 0; // change + +// > div { +// @include size(44px); +// text-align: center; +// font: bold 21px/30px Alegreya Sans; // change +// color: black; // change +// letter-spacing: 0.05em; +// text-transform: uppercase; +// background: transparent; // change +// overflow: hidden; +// padding-top: 14px; // change +// } +// } +// } + +// &.ATTR_1 > .value { +// border-color: red; +// } + +// &.ATTR_2 > .value { +// border-color: #90c; +// } + +// &.ATTR_3 > .value { +// border-color: #3c3; +// } + +// &.ATTR_4 > .value { +// border-color: black; +// } + +// &.ATTR_5 > .value { +// border-color: yellow; +// } + +// &.ATTR_6 > .value { +// border-color: blue; +// } + +// &.ATTR_7 > .value { +// border-color: white; +// } + +// &.ATTR_8 { +// margin-right: 0; + +// > .value { +// border-color: #f60; +// } +// } +// } +// } +// } +// } +// } +// } diff --git a/css/components/content/sheets/layout/Box.scss b/css/components/content/sheets/layout/Box.scss index 3e09ed9e..77a9791b 100644 --- a/css/components/content/sheets/layout/Box.scss +++ b/css/components/content/sheets/layout/Box.scss @@ -1,3 +1,3 @@ #sheets .box { - border: 1px solid black; + border: $border; } \ No newline at end of file diff --git a/css/components/content/sheets/layout/LabelBox.scss b/css/components/content/sheets/layout/LabelBox.scss index 7828b04d..d2ebd78c 100644 --- a/css/components/content/sheets/layout/LabelBox.scss +++ b/css/components/content/sheets/layout/LabelBox.scss @@ -5,6 +5,8 @@ > .box { flex: none; + height: 1cm; + line-height: 1cm; } > label { diff --git a/css/components/layout/Dropdown.scss b/css/components/layout/Dropdown.scss index 5a688363..0566d216 100644 --- a/css/components/layout/Dropdown.scss +++ b/css/components/layout/Dropdown.scss @@ -3,13 +3,7 @@ margin: 10px 0; font: 500 13px/30px Alegreya Sans; - label { - color: #a19b8f; - letter-spacing: 0.05em; - display: block; - font: 500 10px/1 Alegreya Sans; - padding-bottom: 6px; - } + @extend %label; > div { position: relative; diff --git a/css/components/layout/TextField.scss b/css/components/layout/TextField.scss index c12e4809..c9c23853 100644 --- a/css/components/layout/TextField.scss +++ b/css/components/layout/TextField.scss @@ -17,15 +17,8 @@ visibility: hidden; } } - - label { - color: #a19b8f; - font-size: 10px; - line-height: 10px; - letter-spacing: 0.05em; - display: block; - padding-bottom: 6px; - } + + @extend %label; input, textarea { width: 100%; diff --git a/css/components/layout/TextFieldButtonGroup.scss b/css/components/layout/TextFieldButtonGroup.scss new file mode 100644 index 00000000..a736ec0a --- /dev/null +++ b/css/components/layout/TextFieldButtonGroup.scss @@ -0,0 +1,3 @@ +.textfield-btn-group { + display: flex; +} \ No newline at end of file diff --git a/css/components/layout/_Layout.scss b/css/components/layout/_Layout.scss index 410bbd4a..c93409c4 100644 --- a/css/components/layout/_Layout.scss +++ b/css/components/layout/_Layout.scss @@ -1,3 +1,13 @@ +%label { + label { + color: #a19b8f; + letter-spacing: 0.05em; + display: block; + font: 500 12px/1 Alegreya Sans; + padding-bottom: 6px; + } +} + @import "Avatar"; @import "BorderButton"; @import "Card"; @@ -13,5 +23,6 @@ @import "Slider"; @import "SubTabs"; @import "TextField"; +@import "TextFieldButtonGroup"; @import "TitleBar"; @import "ToolBar"; \ No newline at end of file diff --git a/dist/bundle.js b/dist/bundle.js index b20acfc6..0ac219e0 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -42,7 +42,7 @@ _reactDom2.default.render(_react2.default.createElement(_AppController2.default, _WebAPIUtils2.default.getAllData(); -},{"./components/AppController":22,"./dispatcher/AppDispatcher":116,"./utils/WebAPIUtils":141,"react":328,"react-dom":158}],2:[function(require,module,exports){ +},{"./components/AppController":22,"./dispatcher/AppDispatcher":119,"./utils/WebAPIUtils":144,"react":331,"react-dom":161}],2:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -184,7 +184,7 @@ var AccountActions = { exports.default = AccountActions; -},{"../components/content/account/ForgotPassword":26,"../components/content/account/ForgotUsername":27,"../components/content/account/Login":28,"../components/content/account/Register":29,"../components/content/account/ResendActivation":30,"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../stores/core/AccountStore":132,"../utils/WebAPIUtils":141,"../utils/createOverlay":142,"../utils/reactAlert":144,"react":328,"react-dom":158}],3:[function(require,module,exports){ +},{"../components/content/account/ForgotPassword":26,"../components/content/account/ForgotUsername":27,"../components/content/account/Login":28,"../components/content/account/Register":29,"../components/content/account/ResendActivation":30,"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../stores/core/AccountStore":135,"../utils/WebAPIUtils":144,"../utils/createOverlay":145,"../utils/reactAlert":147,"react":331,"react-dom":161}],3:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -248,7 +248,7 @@ var AttributeActions = { exports.default = AttributeActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../stores/APStore":117,"../stores/AttributeStore":118}],4:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../stores/APStore":120,"../stores/AttributeStore":121}],4:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -316,7 +316,7 @@ var CombatTechniquesActions = { exports.default = CombatTechniquesActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../stores/APStore":117,"../stores/CombatTechniquesStore":119}],5:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../stores/APStore":120,"../stores/CombatTechniquesStore":122}],5:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -383,7 +383,7 @@ var CultureActions = { exports.default = CultureActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116}],6:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119}],6:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -450,7 +450,7 @@ var DisAdvActions = { exports.default = DisAdvActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../stores/APStore":117}],7:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../stores/APStore":120}],7:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -471,7 +471,7 @@ var EquipmentActions = {}; exports.default = EquipmentActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116}],8:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119}],8:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -503,7 +503,7 @@ var GroupsActions = { exports.default = GroupsActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116}],9:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119}],9:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -596,7 +596,7 @@ var HerolistActions = { exports.default = HerolistActions; -},{"../components/content/herolist/HeroCreation":44,"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../stores/ELStore":121,"../utils/WebAPIUtils":141,"../utils/createOverlay":142,"../utils/reactAlert":144,"react":328,"react-dom":158}],10:[function(require,module,exports){ +},{"../components/content/herolist/HeroCreation":44,"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../stores/ELStore":124,"../utils/WebAPIUtils":144,"../utils/createOverlay":145,"../utils/reactAlert":147,"react":331,"react-dom":161}],10:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -771,7 +771,7 @@ var InGameActions = { exports.default = InGameActions; -},{"../components/layout/Dialog":97,"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../utils/createOverlay":142,"react":328,"react-dom":158}],11:[function(require,module,exports){ +},{"../components/layout/Dialog":99,"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../utils/createOverlay":145,"react":331,"react-dom":161}],11:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -792,7 +792,7 @@ var InventoryActions = {}; exports.default = InventoryActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116}],12:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119}],12:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -892,7 +892,7 @@ var LiturgiesActions = { exports.default = LiturgiesActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../stores/APStore":117,"../stores/LiturgiesStore":126}],13:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../stores/APStore":120,"../stores/LiturgiesStore":129}],13:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -962,7 +962,7 @@ var ProfessionActions = { exports.default = ProfessionActions; -},{"../components/content/rcp/Selections":79,"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"react":328,"react-dom":158}],14:[function(require,module,exports){ +},{"../components/content/rcp/Selections":81,"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"react":331,"react-dom":161}],14:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -996,7 +996,7 @@ var ProfessionVariantActions = { exports.default = ProfessionVariantActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116}],15:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119}],15:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -1054,13 +1054,37 @@ var ProfileActions = { _WebAPIUtils2.default.changeHeroAvatar(type, type === 'ext' ? extern : file); }, - changeHair: function changeHair(option) { + changeFamily: function changeFamily(value) { + _AppDispatcher2.default.dispatch({ + actionType: _ActionTypes2.default.UPDATE_FAMILY, + value: value + }); + }, + changePlaceOfBirth: function changePlaceOfBirth(value) { + _AppDispatcher2.default.dispatch({ + actionType: _ActionTypes2.default.UPDATE_PLACEOFBIRTH, + value: value + }); + }, + changeDateOfBirth: function changeDateOfBirth(value) { + _AppDispatcher2.default.dispatch({ + actionType: _ActionTypes2.default.UPDATE_DATEOFBIRTH, + value: value + }); + }, + changeAge: function changeAge(value) { + _AppDispatcher2.default.dispatch({ + actionType: _ActionTypes2.default.UPDATE_AGE, + value: value + }); + }, + changeHaircolor: function changeHaircolor(option) { _AppDispatcher2.default.dispatch({ actionType: _ActionTypes2.default.UPDATE_HAIRCOLOR, option: option }); }, - changeEyes: function changeEyes(option) { + changeEyecolor: function changeEyecolor(option) { _AppDispatcher2.default.dispatch({ actionType: _ActionTypes2.default.UPDATE_EYECOLOR, option: option @@ -1078,6 +1102,30 @@ var ProfileActions = { value: value }); }, + changeTitle: function changeTitle(value) { + _AppDispatcher2.default.dispatch({ + actionType: _ActionTypes2.default.UPDATE_TITLE, + value: value + }); + }, + changeSocialStatus: function changeSocialStatus(option) { + _AppDispatcher2.default.dispatch({ + actionType: _ActionTypes2.default.UPDATE_SOCIALSTATUS, + option: option + }); + }, + changeCharacteristics: function changeCharacteristics(value) { + _AppDispatcher2.default.dispatch({ + actionType: _ActionTypes2.default.UPDATE_CHARACTERISTICS, + value: value + }); + }, + changeOtherInfo: function changeOtherInfo(value) { + _AppDispatcher2.default.dispatch({ + actionType: _ActionTypes2.default.UPDATE_OTHERINFO, + value: value + }); + }, rerollHair: function rerollHair() { _AppDispatcher2.default.dispatch({ actionType: _ActionTypes2.default.REROLL_HAIRCOLOR @@ -1107,7 +1155,7 @@ var ProfileActions = { exports.default = ProfileActions; -},{"../components/content/profile/ProfileAvatarChange":70,"../components/content/rcp/Selections":79,"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../utils/WebAPIUtils":141,"../utils/createOverlay":142,"react":328,"react-dom":158}],16:[function(require,module,exports){ +},{"../components/content/profile/ProfileAvatarChange":72,"../components/content/rcp/Selections":81,"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../utils/WebAPIUtils":144,"../utils/createOverlay":145,"react":331,"react-dom":161}],16:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -1158,7 +1206,7 @@ var RaceActions = { exports.default = RaceActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116}],17:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119}],17:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -1200,7 +1248,7 @@ var ServerActions = { }); }, connectionError: function connectionError(error) { - (0, _reactAlert2.default)('Verbindung nicht möglich', 'Die App konnte keine Verbindung zum Server herstellen. Bitte überprüfe deine Internetverbindung! ' + error + ' Es kann bei diesem Problem auch möglich sein, dass etwas im Programmablauf nicht stimmt. Informiere uns bitte über dein Problem, sollte es deiner Erkenntnis nach nicht an der Verbindung liegen!'); + (0, _reactAlert2.default)('Verbindung nicht möglich', 'Die App konnte keine Verbindung zum Server herstellen. Bitte überprüfe deine Internetverbindung! ' + JSON.stringify(error) + ' Es kann bei diesem Problem auch möglich sein, dass etwas im Programmablauf nicht stimmt. Informiere uns bitte über dein Problem, sollte es deiner Erkenntnis nach nicht an der Verbindung liegen!'); _AppDispatcher2.default.dispatch({ actionType: _ActionTypes2.default.WAIT_END }); @@ -1392,7 +1440,7 @@ var ServerActions = { exports.default = ServerActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../stores/core/HerolistStore":133,"../utils/reactAlert":144}],18:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../stores/core/HerolistStore":136,"../utils/reactAlert":147}],18:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -1466,7 +1514,7 @@ var SpecialAbilitiesActions = { exports.default = SpecialAbilitiesActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../stores/APStore":117}],19:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../stores/APStore":120}],19:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -1566,7 +1614,7 @@ var SpellsActions = { exports.default = SpellsActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../stores/APStore":117,"../stores/SpellsStore":130}],20:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../stores/APStore":120,"../stores/SpellsStore":133}],20:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -1651,7 +1699,7 @@ var TabActions = { exports.default = TabActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../stores/core/AccountStore":132,"../utils/reactAlert":144,"../utils/saveHero":146}],21:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../stores/core/AccountStore":135,"../utils/reactAlert":147,"../utils/saveHero":149}],21:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -1724,7 +1772,7 @@ var TalentsActions = { exports.default = TalentsActions; -},{"../constants/ActionTypes":114,"../dispatcher/AppDispatcher":116,"../stores/APStore":117,"../stores/TalentsStore":131}],22:[function(require,module,exports){ +},{"../constants/ActionTypes":117,"../dispatcher/AppDispatcher":119,"../stores/APStore":120,"../stores/TalentsStore":134}],22:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -1823,7 +1871,7 @@ var AppController = function (_Component) { exports.default = AppController; -},{"../stores/core/TabStore":134,"../stores/core/WaitStore":136,"./content/Content":23,"react":328}],23:[function(require,module,exports){ +},{"../stores/core/TabStore":137,"../stores/core/WaitStore":139,"./content/Content":23,"react":331}],23:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -1970,7 +2018,7 @@ Content.propTypes = { }; exports.default = Content; -},{"../layout/TitleBar":107,"./about/About":24,"./account/Account":25,"./attributes/Attribute":31,"./disadv/DisAdv":38,"./grouplist/Grouplist":43,"./herolist/Herolist":45,"./home/Home":47,"./items/Items":50,"./master/Master":60,"./profile/Profile":69,"./rcp/RCP":77,"./skills/Skills":88,"react":328}],24:[function(require,module,exports){ +},{"../layout/TitleBar":110,"./about/About":24,"./account/Account":25,"./attributes/Attribute":31,"./disadv/DisAdv":38,"./grouplist/Grouplist":43,"./herolist/Herolist":45,"./home/Home":47,"./items/Items":50,"./master/Master":60,"./profile/Profile":71,"./rcp/RCP":79,"./skills/Skills":90,"react":331}],24:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -2564,7 +2612,7 @@ var About = function (_Component) { exports.default = About; -},{"../../../stores/core/VersionStore":135,"../../layout/Scroll":102,"react":328}],25:[function(require,module,exports){ +},{"../../../stores/core/VersionStore":138,"../../layout/Scroll":104,"react":331}],25:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -2601,6 +2649,10 @@ var _TextField = require('../../layout/TextField'); var _TextField2 = _interopRequireDefault(_TextField); +var _TextFieldButtonGroup = require('../../layout/TextFieldButtonGroup'); + +var _TextFieldButtonGroup2 = _interopRequireDefault(_TextFieldButtonGroup); + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -2651,31 +2703,39 @@ var Account = function (_Component) { _react2.default.createElement( _Scroll2.default, null, - _react2.default.createElement(_TextField2.default, { - hint: 'Benutzernamen ändern', - value: this.state.newName, - onChange: this.handleName - }), - _react2.default.createElement(_IconButton2.default, { - icon: '', - onClick: this.changeName, - disabled: this.state.newName === '' || this.state.newName.length < 3 || this.state.newName.length > 20 - }), + _react2.default.createElement( + _TextFieldButtonGroup2.default, + null, + _react2.default.createElement(_TextField2.default, { + hint: 'Benutzernamen ändern', + value: this.state.newName, + onChange: this.handleName + }), + _react2.default.createElement(_IconButton2.default, { + icon: '', + onClick: this.changeName, + disabled: this.state.newName === '' || this.state.newName.length < 3 || this.state.newName.length > 20 + }) + ), _react2.default.createElement( 'div', { className: 'padding' }, (this.state.newName.length < 3 || this.state.newName.length > 20) && this.state.newName !== '' ? 'Der Benutzername muss mindestens 3 und darf maximal 20 Zeichen umfassen.' : null ), - _react2.default.createElement(_TextField2.default, { - hint: 'Passwort ändern', - value: this.state.newPassword, - onChange: this.handlePassword - }), - _react2.default.createElement(_IconButton2.default, { - icon: '', - onClick: this.changePassword, - disabled: this.state.newPassword === '' || this.state.newPassword.length < 5 || this.state.newPassword.length > 20 - }), + _react2.default.createElement( + _TextFieldButtonGroup2.default, + null, + _react2.default.createElement(_TextField2.default, { + hint: 'Passwort ändern', + value: this.state.newPassword, + onChange: this.handlePassword + }), + _react2.default.createElement(_IconButton2.default, { + icon: '', + onClick: this.changePassword, + disabled: this.state.newPassword === '' || this.state.newPassword.length < 5 || this.state.newPassword.length > 20 + }) + ), _react2.default.createElement( 'div', { className: 'padding' }, @@ -2696,7 +2756,7 @@ var Account = function (_Component) { exports.default = Account; -},{"../../../actions/AccountActions":2,"../../../stores/core/AccountStore":132,"../../layout/BorderButton":95,"../../layout/IconButton":99,"../../layout/Scroll":102,"../../layout/TextField":106,"react":328}],26:[function(require,module,exports){ +},{"../../../actions/AccountActions":2,"../../../stores/core/AccountStore":135,"../../layout/BorderButton":97,"../../layout/IconButton":101,"../../layout/Scroll":104,"../../layout/TextField":108,"../../layout/TextFieldButtonGroup":109,"react":331}],26:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -2798,7 +2858,7 @@ ForgotPassword.props = { }; exports.default = ForgotPassword; -},{"../../../actions/AccountActions":2,"../../../utils/createOverlay":142,"../../layout/Dialog":97,"../../layout/TextField":106,"react":328}],27:[function(require,module,exports){ +},{"../../../actions/AccountActions":2,"../../../utils/createOverlay":145,"../../layout/Dialog":99,"../../layout/TextField":108,"react":331}],27:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -2900,7 +2960,7 @@ ForgotUsername.props = { }; exports.default = ForgotUsername; -},{"../../../actions/AccountActions":2,"../../../utils/createOverlay":142,"../../layout/Dialog":97,"../../layout/TextField":106,"react":328}],28:[function(require,module,exports){ +},{"../../../actions/AccountActions":2,"../../../utils/createOverlay":145,"../../layout/Dialog":99,"../../layout/TextField":108,"react":331}],28:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -3039,7 +3099,7 @@ Login.props = { }; exports.default = Login; -},{"../../../actions/AccountActions":2,"../../../utils/createOverlay":142,"../../layout/Dialog":97,"../../layout/TextField":106,"react":328}],29:[function(require,module,exports){ +},{"../../../actions/AccountActions":2,"../../../utils/createOverlay":145,"../../layout/Dialog":99,"../../layout/TextField":108,"react":331}],29:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -3220,7 +3280,7 @@ Register.props = { }; exports.default = Register; -},{"../../../actions/AccountActions":2,"../../../utils/createOverlay":142,"../../layout/Dialog":97,"../../layout/TextField":106,"react":328}],30:[function(require,module,exports){ +},{"../../../actions/AccountActions":2,"../../../utils/createOverlay":145,"../../layout/Dialog":99,"../../layout/TextField":108,"react":331}],30:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -3322,7 +3382,7 @@ ResendActivation.props = { }; exports.default = ResendActivation; -},{"../../../actions/AccountActions":2,"../../../utils/createOverlay":142,"../../layout/Dialog":97,"../../layout/TextField":106,"react":328}],31:[function(require,module,exports){ +},{"../../../actions/AccountActions":2,"../../../utils/createOverlay":145,"../../layout/Dialog":99,"../../layout/TextField":108,"react":331}],31:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -3458,7 +3518,7 @@ var Attribute = function (_Component) { exports.default = Attribute; -},{"../../../stores/AttributeStore":118,"../../../stores/ELStore":121,"../../../stores/PhaseStore":127,"../../layout/Scroll":102,"./AttributeCalc":33,"./AttributeList":35,"react":328}],32:[function(require,module,exports){ +},{"../../../stores/AttributeStore":121,"../../../stores/ELStore":124,"../../../stores/PhaseStore":130,"../../layout/Scroll":104,"./AttributeCalc":33,"./AttributeList":35,"react":331}],32:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -3534,7 +3594,7 @@ AttributeBorder.propTypes = { }; exports.default = AttributeBorder; -},{"classnames":148,"react":328}],33:[function(require,module,exports){ +},{"classnames":151,"react":331}],33:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -3680,7 +3740,7 @@ AttributeCalc.propTypes = { }; exports.default = AttributeCalc; -},{"../../../stores/AttributeStore":118,"../../../stores/ListStore":125,"./AttributeCalcItem":34,"react":328}],34:[function(require,module,exports){ +},{"../../../stores/AttributeStore":121,"../../../stores/ListStore":128,"./AttributeCalcItem":34,"react":331}],34:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -3772,7 +3832,7 @@ AttributeCalcItem.propTypes = { }; exports.default = AttributeCalcItem; -},{"../../../actions/AttributeActions":3,"../../layout/IconButton":99,"./AttributeBorder":32,"react":328}],35:[function(require,module,exports){ +},{"../../../actions/AttributeActions":3,"../../layout/IconButton":101,"./AttributeBorder":32,"react":331}],35:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -3839,7 +3899,7 @@ AttributeList.propTypes = { }; exports.default = AttributeList; -},{"./AttributeListItem":36,"react":328}],36:[function(require,module,exports){ +},{"./AttributeListItem":36,"react":331}],36:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -3924,7 +3984,7 @@ AttributeListItem.propTypes = { }; exports.default = AttributeListItem; -},{"../../../actions/AttributeActions":3,"../../layout/IconButton":99,"./AttributeBorder":32,"react":328}],37:[function(require,module,exports){ +},{"../../../actions/AttributeActions":3,"../../layout/IconButton":101,"./AttributeBorder":32,"react":331}],37:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -4115,7 +4175,7 @@ var Advantages = function (_Component) { exports.default = Advantages; -},{"../../../actions/DisAdvActions":6,"../../../stores/DisAdvStore":120,"../../../stores/rcp/CultureStore":137,"../../../stores/rcp/ProfessionStore":138,"../../../stores/rcp/RaceStore":140,"../../layout/BorderButton":95,"../../layout/Checkbox":96,"../../layout/Slidein":103,"../../layout/TextField":106,"./DisAdvList":40,"react":328}],38:[function(require,module,exports){ +},{"../../../actions/DisAdvActions":6,"../../../stores/DisAdvStore":123,"../../../stores/rcp/CultureStore":140,"../../../stores/rcp/ProfessionStore":141,"../../../stores/rcp/RaceStore":143,"../../layout/BorderButton":97,"../../layout/Checkbox":98,"../../layout/Slidein":105,"../../layout/TextField":108,"./DisAdvList":40,"react":331}],38:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -4217,7 +4277,7 @@ var DisAdv = function (_React$Component) { exports.default = DisAdv; -},{"../../layout/BorderButton":95,"../../layout/SubTabs":104,"../../layout/TextField":106,"./Advantages":37,"./Disadvantages":42,"classnames":148,"react":328}],39:[function(require,module,exports){ +},{"../../layout/BorderButton":97,"../../layout/SubTabs":106,"../../layout/TextField":108,"./Advantages":37,"./Disadvantages":42,"classnames":151,"react":331}],39:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -4527,7 +4587,7 @@ DisAdvAddListItem.propTypes = { }; exports.default = DisAdvAddListItem; -},{"../../../actions/DisAdvActions":6,"../../../stores/DisAdvStore":120,"../../layout/BorderButton":95,"../../layout/Dropdown":98,"../../layout/TextField":106,"react":328}],40:[function(require,module,exports){ +},{"../../../actions/DisAdvActions":6,"../../../stores/DisAdvStore":123,"../../layout/BorderButton":97,"../../layout/Dropdown":100,"../../layout/TextField":108,"react":331}],40:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -4637,7 +4697,7 @@ DisAdvList.propTypes = { }; exports.default = DisAdvList; -},{"../../layout/Scroll":102,"./DisAdvAddListItem":39,"./DisAdvRemoveListItem":41,"classnames":148,"react":328}],41:[function(require,module,exports){ +},{"../../layout/Scroll":104,"./DisAdvAddListItem":39,"./DisAdvRemoveListItem":41,"classnames":151,"react":331}],41:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -4769,7 +4829,7 @@ DisAdvRemoveListItem.propTypes = { }; exports.default = DisAdvRemoveListItem; -},{"../../../actions/DisAdvActions":6,"../../layout/BorderButton":95,"../../layout/Dropdown":98,"../../layout/TextField":106,"react":328}],42:[function(require,module,exports){ +},{"../../../actions/DisAdvActions":6,"../../layout/BorderButton":97,"../../layout/Dropdown":100,"../../layout/TextField":108,"react":331}],42:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -4960,7 +5020,7 @@ var Disadvantages = function (_Component) { exports.default = Disadvantages; -},{"../../../actions/DisAdvActions":6,"../../../stores/DisAdvStore":120,"../../../stores/rcp/CultureStore":137,"../../../stores/rcp/ProfessionStore":138,"../../../stores/rcp/RaceStore":140,"../../layout/BorderButton":95,"../../layout/Checkbox":96,"../../layout/Slidein":103,"../../layout/TextField":106,"./DisAdvList":40,"react":328}],43:[function(require,module,exports){ +},{"../../../actions/DisAdvActions":6,"../../../stores/DisAdvStore":123,"../../../stores/rcp/CultureStore":140,"../../../stores/rcp/ProfessionStore":141,"../../../stores/rcp/RaceStore":143,"../../layout/BorderButton":97,"../../layout/Checkbox":98,"../../layout/Slidein":105,"../../layout/TextField":108,"./DisAdvList":40,"react":331}],43:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -5050,7 +5110,7 @@ var Grouplist = function (_Component) { exports.default = Grouplist; -},{"../../../actions/TabActions":20,"../../layout/BorderButton":95,"../../layout/RadioButtonGroup":101,"../../layout/Scroll":102,"../../layout/TextField":106,"react":328}],44:[function(require,module,exports){ +},{"../../../actions/TabActions":20,"../../layout/BorderButton":97,"../../layout/RadioButtonGroup":103,"../../layout/Scroll":104,"../../layout/TextField":108,"react":331}],44:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -5157,7 +5217,7 @@ HeroCreation.props = { }; exports.default = HeroCreation; -},{"../../../actions/HerolistActions":9,"../../layout/Dialog":97,"../../layout/Dropdown":98,"../../layout/TextField":106,"react":328}],45:[function(require,module,exports){ +},{"../../../actions/HerolistActions":9,"../../layout/Dialog":99,"../../layout/Dropdown":100,"../../layout/TextField":108,"react":331}],45:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -5343,7 +5403,7 @@ var Herolist = function (_Component) { exports.default = Herolist; -},{"../../../actions/HerolistActions":9,"../../../stores/APStore":117,"../../../stores/ELStore":121,"../../../stores/ProfileStore":128,"../../../stores/core/HerolistStore":133,"../../../stores/rcp/CultureStore":137,"../../../stores/rcp/ProfessionStore":138,"../../../stores/rcp/RaceStore":140,"../../layout/BorderButton":95,"../../layout/RadioButtonGroup":101,"../../layout/Scroll":102,"../../layout/TextField":106,"./HerolistItem":46,"react":328}],46:[function(require,module,exports){ +},{"../../../actions/HerolistActions":9,"../../../stores/APStore":120,"../../../stores/ELStore":124,"../../../stores/ProfileStore":131,"../../../stores/core/HerolistStore":136,"../../../stores/rcp/CultureStore":140,"../../../stores/rcp/ProfessionStore":141,"../../../stores/rcp/RaceStore":143,"../../layout/BorderButton":97,"../../layout/RadioButtonGroup":103,"../../layout/Scroll":104,"../../layout/TextField":108,"./HerolistItem":46,"react":331}],46:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -5512,7 +5572,7 @@ HerolistItem.propTypes = { }; exports.default = HerolistItem; -},{"../../../actions/HerolistActions":9,"../../../actions/TabActions":20,"../../../stores/ProfileStore":128,"../../../stores/rcp/CultureStore":137,"../../../stores/rcp/ProfessionStore":138,"../../../stores/rcp/ProfessionVariantStore":139,"../../../stores/rcp/RaceStore":140,"../../layout/Avatar":94,"../../layout/BorderButton":95,"classnames":148,"react":328,"react-progress-arc":160}],47:[function(require,module,exports){ +},{"../../../actions/HerolistActions":9,"../../../actions/TabActions":20,"../../../stores/ProfileStore":131,"../../../stores/rcp/CultureStore":140,"../../../stores/rcp/ProfessionStore":141,"../../../stores/rcp/ProfessionVariantStore":142,"../../../stores/rcp/RaceStore":143,"../../layout/Avatar":96,"../../layout/BorderButton":97,"classnames":151,"react":331,"react-progress-arc":163}],47:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -5629,7 +5689,7 @@ var Home = function (_Component) { exports.default = Home; -},{"../../layout/Scroll":102,"react":328}],48:[function(require,module,exports){ +},{"../../layout/Scroll":104,"react":331}],48:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -5683,7 +5743,7 @@ var Equipment = function (_Component) { exports.default = Equipment; -},{"../../../actions/EquipmentActions":7,"react":328}],49:[function(require,module,exports){ +},{"../../../actions/EquipmentActions":7,"react":331}],49:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -5737,7 +5797,7 @@ var Inventory = function (_Component) { exports.default = Inventory; -},{"../../../actions/InventoryActions":11,"react":328}],50:[function(require,module,exports){ +},{"../../../actions/InventoryActions":11,"react":331}],50:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -5827,7 +5887,7 @@ var Items = function (_Component) { exports.default = Items; -},{"../../layout/SubTabs":104,"./Equipment":48,"./Inventory":49,"react":328}],51:[function(require,module,exports){ +},{"../../layout/SubTabs":106,"./Equipment":48,"./Inventory":49,"react":331}],51:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -5932,7 +5992,7 @@ var Groups = function (_Component) { exports.default = Groups; -},{"../../../actions/GroupsActions":8,"../../../stores/GroupsStore":122,"../../layout/BorderButton":95,"../../layout/Scroll":102,"../../layout/Slidein":103,"react":328}],52:[function(require,module,exports){ +},{"../../../actions/GroupsActions":8,"../../../stores/GroupsStore":125,"../../layout/BorderButton":97,"../../layout/Scroll":104,"../../layout/Slidein":105,"react":331}],52:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -6146,7 +6206,7 @@ var InGame = function (_Component) { exports.default = InGame; -},{"../../../actions/InGameActions":10,"../../../stores/InGameStore":124,"../../layout/BorderButton":95,"../../layout/IconButton":99,"../../layout/Scroll":102,"../../layout/TextField":106,"./InGameControls":53,"./InGameEdit":54,"./InGameTableHealth":55,"./InGameTableIni":57,"./InGameTableLeft":58,"./InGameTableRight":59,"classnames":148,"react":328}],53:[function(require,module,exports){ +},{"../../../actions/InGameActions":10,"../../../stores/InGameStore":127,"../../layout/BorderButton":97,"../../layout/IconButton":101,"../../layout/Scroll":104,"../../layout/TextField":108,"./InGameControls":53,"./InGameEdit":54,"./InGameTableHealth":55,"./InGameTableIni":57,"./InGameTableLeft":58,"./InGameTableRight":59,"classnames":151,"react":331}],53:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -6306,7 +6366,7 @@ InGameControls.propTypes = { }; exports.default = InGameControls; -},{"../../../actions/InGameActions":10,"../../layout/BorderButton":95,"../../layout/Checkbox":96,"../../layout/IconButton":99,"classnames":148,"react":328}],54:[function(require,module,exports){ +},{"../../../actions/InGameActions":10,"../../layout/BorderButton":97,"../../layout/Checkbox":98,"../../layout/IconButton":101,"classnames":151,"react":331}],54:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -6535,7 +6595,7 @@ InGameEdit.propTypes = { exports.default = InGameEdit; -},{"../../../actions/InGameActions":10,"../../layout/BorderButton":95,"../../layout/Dropdown":98,"../../layout/Slidein":103,"../../layout/TextField":106,"react":328,"react-gemini-scrollbar":159}],55:[function(require,module,exports){ +},{"../../../actions/InGameActions":10,"../../layout/BorderButton":97,"../../layout/Dropdown":100,"../../layout/Slidein":105,"../../layout/TextField":108,"react":331,"react-gemini-scrollbar":162}],55:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -6633,7 +6693,7 @@ InGameTableHealth.propTypes = { }; exports.default = InGameTableHealth; -},{"./InGameTableHealthBar":56,"classnames":148,"react":328}],56:[function(require,module,exports){ +},{"./InGameTableHealthBar":56,"classnames":151,"react":331}],56:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -6695,7 +6755,7 @@ InGameTableHealthBar.propTypes = { }; exports.default = InGameTableHealthBar; -},{"classnames":148,"react":328}],57:[function(require,module,exports){ +},{"classnames":151,"react":331}],57:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -6790,7 +6850,7 @@ InGameTableIni.propTypes = { }; exports.default = InGameTableIni; -},{"classnames":148,"react":328}],58:[function(require,module,exports){ +},{"classnames":151,"react":331}],58:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -6907,7 +6967,7 @@ InGameTableLeft.propTypes = { }; exports.default = InGameTableLeft; -},{"classnames":148,"react":328}],59:[function(require,module,exports){ +},{"classnames":151,"react":331}],59:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -7076,7 +7136,7 @@ InGameTableRight.propTypes = { exports.default = InGameTableRight; -},{"../../../actions/InGameActions":10,"classnames":148,"react":328}],60:[function(require,module,exports){ +},{"../../../actions/InGameActions":10,"classnames":151,"react":331}],60:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -7167,7 +7227,7 @@ var Master = function (_Component) { exports.default = Master; -},{"../../layout/SubTabs":104,"./Groups":51,"./InGame":52,"react":328}],61:[function(require,module,exports){ +},{"../../layout/SubTabs":106,"./Groups":51,"./InGame":52,"react":331}],61:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -7212,9 +7272,9 @@ var _MainSheetCalcItem = require('./MainSheetCalcItem'); var _MainSheetCalcItem2 = _interopRequireDefault(_MainSheetCalcItem); -var _OverviewDisAdv = require('./OverviewDisAdv'); +var _OverviewConstSkills = require('./OverviewConstSkills'); -var _OverviewDisAdv2 = _interopRequireDefault(_OverviewDisAdv); +var _OverviewConstSkills2 = _interopRequireDefault(_OverviewConstSkills); var _Plain = require('../../layout/sheets/Plain'); @@ -7285,7 +7345,7 @@ var ChantSheet = function (_Component) { exports.default = ChantSheet; -},{"../../../stores/APStore":117,"../../../stores/AttributeStore":118,"../../../stores/DisAdvStore":120,"../../../stores/ELStore":121,"../../../stores/rcp/CultureStore":137,"../../../stores/rcp/ProfessionStore":138,"../../../stores/rcp/ProfessionVariantStore":139,"../../../stores/rcp/RaceStore":140,"../../layout/Avatar":94,"../../layout/sheets/Box":110,"../../layout/sheets/LabelBox":111,"../../layout/sheets/Plain":112,"../../layout/sheets/TextBox":113,"./MainSheetCalcItem":65,"./OverviewDisAdv":67,"./SheetHeader":71,"react":328}],62:[function(require,module,exports){ +},{"../../../stores/APStore":120,"../../../stores/AttributeStore":121,"../../../stores/DisAdvStore":123,"../../../stores/ELStore":124,"../../../stores/rcp/CultureStore":140,"../../../stores/rcp/ProfessionStore":141,"../../../stores/rcp/ProfessionVariantStore":142,"../../../stores/rcp/RaceStore":143,"../../layout/Avatar":96,"../../layout/sheets/Box":113,"../../layout/sheets/LabelBox":114,"../../layout/sheets/Plain":115,"../../layout/sheets/TextBox":116,"./MainSheetCalcItem":66,"./OverviewConstSkills":69,"./SheetHeader":73,"react":331}],62:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -7330,9 +7390,9 @@ var _MainSheetCalcItem = require('./MainSheetCalcItem'); var _MainSheetCalcItem2 = _interopRequireDefault(_MainSheetCalcItem); -var _OverviewDisAdv = require('./OverviewDisAdv'); +var _OverviewConstSkills = require('./OverviewConstSkills'); -var _OverviewDisAdv2 = _interopRequireDefault(_OverviewDisAdv); +var _OverviewConstSkills2 = _interopRequireDefault(_OverviewConstSkills); var _Plain = require('../../layout/sheets/Plain'); @@ -7428,7 +7488,7 @@ var CombatSheet = function (_Component) { exports.default = CombatSheet; -},{"../../../stores/APStore":117,"../../../stores/AttributeStore":118,"../../../stores/DisAdvStore":120,"../../../stores/ELStore":121,"../../../stores/rcp/CultureStore":137,"../../../stores/rcp/ProfessionStore":138,"../../../stores/rcp/ProfessionVariantStore":139,"../../../stores/rcp/RaceStore":140,"../../layout/Avatar":94,"../../layout/sheets/Box":110,"../../layout/sheets/LabelBox":111,"../../layout/sheets/Plain":112,"../../layout/sheets/TextBox":113,"./MainSheetCalcItem":65,"./OverviewDisAdv":67,"./SheetHeader":71,"react":328}],63:[function(require,module,exports){ +},{"../../../stores/APStore":120,"../../../stores/AttributeStore":121,"../../../stores/DisAdvStore":123,"../../../stores/ELStore":124,"../../../stores/rcp/CultureStore":140,"../../../stores/rcp/ProfessionStore":141,"../../../stores/rcp/ProfessionVariantStore":142,"../../../stores/rcp/RaceStore":143,"../../layout/Avatar":96,"../../layout/sheets/Box":113,"../../layout/sheets/LabelBox":114,"../../layout/sheets/Plain":115,"../../layout/sheets/TextBox":116,"./MainSheetCalcItem":66,"./OverviewConstSkills":69,"./SheetHeader":73,"react":331}],63:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -7473,10 +7533,6 @@ var _MainSheetCalcItem = require('./MainSheetCalcItem'); var _MainSheetCalcItem2 = _interopRequireDefault(_MainSheetCalcItem); -var _OverviewDisAdv = require('./OverviewDisAdv'); - -var _OverviewDisAdv2 = _interopRequireDefault(_OverviewDisAdv); - var _Plain = require('../../layout/sheets/Plain'); var _Plain2 = _interopRequireDefault(_Plain); @@ -7543,7 +7599,7 @@ var InventorySheet = function (_Component) { exports.default = InventorySheet; -},{"../../../stores/APStore":117,"../../../stores/AttributeStore":118,"../../../stores/DisAdvStore":120,"../../../stores/ELStore":121,"../../../stores/rcp/CultureStore":137,"../../../stores/rcp/ProfessionStore":138,"../../../stores/rcp/ProfessionVariantStore":139,"../../../stores/rcp/RaceStore":140,"../../layout/Avatar":94,"../../layout/sheets/Box":110,"../../layout/sheets/LabelBox":111,"../../layout/sheets/Plain":112,"../../layout/sheets/TextBox":113,"./MainSheetCalcItem":65,"./OverviewDisAdv":67,"./SheetHeader":71,"react":328}],64:[function(require,module,exports){ +},{"../../../stores/APStore":120,"../../../stores/AttributeStore":121,"../../../stores/DisAdvStore":123,"../../../stores/ELStore":124,"../../../stores/rcp/CultureStore":140,"../../../stores/rcp/ProfessionStore":141,"../../../stores/rcp/ProfessionVariantStore":142,"../../../stores/rcp/RaceStore":143,"../../layout/Avatar":96,"../../layout/sheets/Box":113,"../../layout/sheets/LabelBox":114,"../../layout/sheets/Plain":115,"../../layout/sheets/TextBox":116,"./MainSheetCalcItem":66,"./SheetHeader":73,"react":331}],64:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -7560,14 +7616,6 @@ var _APStore = require('../../../stores/APStore'); var _APStore2 = _interopRequireDefault(_APStore); -var _Avatar = require('../../layout/Avatar'); - -var _Avatar2 = _interopRequireDefault(_Avatar); - -var _Box = require('../../layout/sheets/Box'); - -var _Box2 = _interopRequireDefault(_Box); - var _CultureStore = require('../../../stores/rcp/CultureStore'); var _CultureStore2 = _interopRequireDefault(_CultureStore); @@ -7580,25 +7628,21 @@ var _ELStore = require('../../../stores/ELStore'); var _ELStore2 = _interopRequireDefault(_ELStore); -var _LabelBox = require('../../layout/sheets/LabelBox'); - -var _LabelBox2 = _interopRequireDefault(_LabelBox); - var _ListStore = require('../../../stores/ListStore'); var _ListStore2 = _interopRequireDefault(_ListStore); -var _MainSheetCalcItem = require('./MainSheetCalcItem'); +var _MainSheetCalc = require('./MainSheetCalc'); -var _MainSheetCalcItem2 = _interopRequireDefault(_MainSheetCalcItem); +var _MainSheetCalc2 = _interopRequireDefault(_MainSheetCalc); -var _OverviewDisAdv = require('./OverviewDisAdv'); +var _MainSheetPersonalData = require('./MainSheetPersonalData'); -var _OverviewDisAdv2 = _interopRequireDefault(_OverviewDisAdv); +var _MainSheetPersonalData2 = _interopRequireDefault(_MainSheetPersonalData); -var _Plain = require('../../layout/sheets/Plain'); +var _OverviewConstSkills = require('./OverviewConstSkills'); -var _Plain2 = _interopRequireDefault(_Plain); +var _OverviewConstSkills2 = _interopRequireDefault(_OverviewConstSkills); var _ProfileStore = require('../../../stores/ProfileStore'); @@ -7624,6 +7668,10 @@ var _SheetHeader = require('./SheetHeader'); var _SheetHeader2 = _interopRequireDefault(_SheetHeader); +var _SpecialAbilitiesStore = require('../../../stores/SpecialAbilitiesStore'); + +var _SpecialAbilitiesStore2 = _interopRequireDefault(_SpecialAbilitiesStore); + var _TextBox = require('../../layout/sheets/TextBox'); var _TextBox2 = _interopRequireDefault(_TextBox); @@ -7649,79 +7697,39 @@ var MainSheet = function (_Component) { key: 'render', value: function render() { - var source = { - attributes: _AttributeStore2.default.getAllForView(), - baseValues: _AttributeStore2.default.getBaseValues(), - race: _RaceStore2.default.getCurrentName(), - culture: _CultureStore2.default.getCurrentName(), - profession: _ProfessionVariantStore2.default.getCurrentName() !== null ? _ProfessionStore2.default.getCurrentName() + ' (' + _ProfessionVariantStore2.default.getCurrentName() + ')' : _ProfessionStore2.default.getCurrentName(), - el: _ELStore2.default.getStart().name, - apTotal: _APStore2.default.get(), - apUsed: _APStore2.default.getUsed(), - advActive: _DisAdvStore2.default.getActiveForView(true), - disadvActive: _DisAdvStore2.default.getActiveForView(false), - name: _ProfileStore2.default.getName(), - portrait: _ProfileStore2.default.getPortrait() - }; - - var attributes = source.attributes; - var baseValues = source.baseValues; - var race = source.race; - var culture = source.culture; - var profession = source.profession; - var el = source.el; - var apTotal = source.apTotal; - var apUsed = source.apUsed; - var advActive = source.advActive; - var disadvActive = source.disadvActive; - var name = source.name; - var portrait = source.portrait; + var ap = _APStore2.default.getAll(); + var el = _ELStore2.default.getStart().name; + var profile = _ProfileStore2.default.getAll(); + var race = _RaceStore2.default.getCurrentName(); + var culture = _CultureStore2.default.getCurrentName(); + var profession = _ProfessionVariantStore2.default.getCurrentName() !== null ? _ProfessionStore2.default.getCurrentName() + ' (' + _ProfessionVariantStore2.default.getCurrentName() + ')' : _ProfessionStore2.default.getCurrentName(); + var haircolorTags = _ProfileStore2.default.getHaircolorTags(); + var eyecolorTags = _ProfileStore2.default.getEyecolorTags(); + var socialstatusTags = _ProfileStore2.default.getSocialstatusTags(); + var advActive = _DisAdvStore2.default.getActiveForView(true); + var disadvActive = _DisAdvStore2.default.getActiveForView(false); + var commonsaActive = _SpecialAbilitiesStore2.default.getActiveForView(1, 2); + var attributes = _AttributeStore2.default.getAllForView(); var attrPrimary = [_ListStore2.default.getPrimaryAttrID(1), _ListStore2.default.getPrimaryAttrID(2)]; + var baseValues = _AttributeStore2.default.getBaseValues(); return _react2.default.createElement( 'div', { className: 'sheet main' }, _react2.default.createElement(_SheetHeader2.default, { title: 'Persönliche Daten' }), - _react2.default.createElement( - 'div', - { className: 'upper' }, - _react2.default.createElement( - 'div', - { className: 'info' }, - _react2.default.createElement(_Plain2.default, { className: 'name', label: 'Name', value: name }), - _react2.default.createElement(_Plain2.default, { className: 'family', label: 'Familie' }), - _react2.default.createElement(_Plain2.default, { className: 'placeofbirth', label: 'Geburtsort' }), - _react2.default.createElement(_Plain2.default, { className: 'dateofbirth', label: 'Geburtsdatum' }), - _react2.default.createElement(_Plain2.default, { className: 'age', label: 'Alter' }), - _react2.default.createElement(_Plain2.default, { className: 'gender', label: 'Geschlecht' }), - _react2.default.createElement(_Plain2.default, { className: 'race', label: 'Spezies', value: race }), - _react2.default.createElement(_Plain2.default, { className: 'size', label: 'Größe' }), - _react2.default.createElement(_Plain2.default, { className: 'weight', label: 'Gewicht' }), - _react2.default.createElement(_Plain2.default, { className: 'haircolor', label: 'Haarfarbe' }), - _react2.default.createElement(_Plain2.default, { className: 'eyecolor', label: 'Augenfarbe' }), - _react2.default.createElement(_Plain2.default, { className: 'culture', label: 'Kultur', value: culture }), - _react2.default.createElement(_Plain2.default, { className: 'profession', label: 'Profession', value: profession }), - _react2.default.createElement(_Plain2.default, { className: 'title', label: 'Titel' }), - _react2.default.createElement(_Plain2.default, { className: 'socialstatus', label: 'Sozialstatus' }), - _react2.default.createElement(_Plain2.default, { className: 'characteristics', label: 'Charakteristika' }), - _react2.default.createElement(_Plain2.default, { className: 'other', label: 'Sonstiges' }) - ), - _react2.default.createElement( - 'div', - { className: 'ap-portrait' }, - _react2.default.createElement(_LabelBox2.default, { className: 'el', label: 'Erfahrungsgrad', value: el }), - _react2.default.createElement(_LabelBox2.default, { className: 'ap-total', label: 'AP gesamt', value: apTotal }), - _react2.default.createElement( - _LabelBox2.default, - { className: 'portrait', label: 'Porträt/Wappen' }, - _react2.default.createElement(_Avatar2.default, { src: portrait }) - ), - _react2.default.createElement(_LabelBox2.default, { className: 'ap-available', label: 'AP verfügbar', value: apTotal - apUsed }), - _react2.default.createElement(_LabelBox2.default, { className: 'ap-used', label: 'AP ausgegeben', value: apUsed }) - ) - ), + _react2.default.createElement(_MainSheetPersonalData2.default, { + ap: ap, + culture: culture, + el: el, + eyecolorTags: eyecolorTags, + haircolorTags: haircolorTags, + profession: profession, + profile: profile, + race: race, + socialstatusTags: socialstatusTags + }), _react2.default.createElement( 'div', { className: 'lower' }, @@ -7731,120 +7739,24 @@ var MainSheet = function (_Component) { _react2.default.createElement( _TextBox2.default, { className: 'adv', label: 'Vorteile' }, - _react2.default.createElement(_OverviewDisAdv2.default, { list: advActive }) + _react2.default.createElement(_OverviewConstSkills2.default, { list: advActive }) ), _react2.default.createElement( _TextBox2.default, { className: 'disadv', label: 'Nachteile' }, - _react2.default.createElement(_OverviewDisAdv2.default, { list: disadvActive }) + _react2.default.createElement(_OverviewConstSkills2.default, { list: disadvActive }) ), _react2.default.createElement( _TextBox2.default, { className: 'common_special', label: 'Allgemeine Sonderfertigkeiten' }, - _react2.default.createElement('div', null) + _react2.default.createElement(_OverviewConstSkills2.default, { list: commonsaActive }) ) ), - attributes.length > 0 ? _react2.default.createElement( - 'div', - { className: 'calculated' }, - _react2.default.createElement( - 'div', - { className: 'calc-header' }, - _react2.default.createElement( - 'div', - null, - 'Wert' - ), - _react2.default.createElement( - 'div', - null, - 'Bonus/', - _react2.default.createElement('br', null), - 'Malus' - ), - _react2.default.createElement( - 'div', - null, - 'Zukauf' - ), - _react2.default.createElement( - 'div', - null, - 'Max' - ) - ), - _react2.default.createElement(_MainSheetCalcItem2.default, { - label: 'Lebensenergie', - calc: '(GW der Spezies + KO + KO)', - value: baseValues.le + attributes[6].value * 2, - add: _DisAdvStore2.default.get('ADV_25') && _DisAdvStore2.default.get('ADV_25').active ? _DisAdvStore2.default.get('ADV_25').tier : _DisAdvStore2.default.get('DISADV_28') && _DisAdvStore2.default.get('DISADV_28').active ? -_DisAdvStore2.default.get('DISADV_28').tier : 0, - purchased: baseValues.leAdd, - subLabel: 'Grundwert', - subArray: [baseValues.le] }), - _react2.default.createElement(_MainSheetCalcItem2.default, { - label: 'Astralenergie', - calc: '(20 durch Zauberer + Leiteigenschaft)', - value: attrPrimary[0] === 'ATTR_0' || !_AttributeStore2.default.get(attrPrimary[0]) ? 0 : 20 + _AttributeStore2.default.get(attrPrimary[0]).value, - add: _DisAdvStore2.default.get('ADV_23') && _DisAdvStore2.default.get('ADV_23').active ? _DisAdvStore2.default.get('ADV_23').tier : _DisAdvStore2.default.get('DISADV_26') && _DisAdvStore2.default.get('DISADV_26').active ? -_DisAdvStore2.default.get('DISADV_26').tier : 0, - purchased: baseValues.aeAdd, - subLabel: 'perm. eingesetzt/davon zurückgekauft', - subArray: [0, 0], - empty: attrPrimary[0] === 'ATTR_0' }), - _react2.default.createElement(_MainSheetCalcItem2.default, { - label: 'Karmaenergie', - calc: '(20 durch Geweihter + Leiteigenschaft)', - value: attrPrimary[1] === 'ATTR_0' || !_AttributeStore2.default.get(attrPrimary[1]) ? 0 : 20 + _AttributeStore2.default.get(attrPrimary[1]).value, - add: _DisAdvStore2.default.get('ADV_24') && _DisAdvStore2.default.get('ADV_24').active ? _DisAdvStore2.default.get('ADV_24').tier : _DisAdvStore2.default.get('DISADV_27') && _DisAdvStore2.default.get('DISADV_27').active ? -_DisAdvStore2.default.get('DISADV_27').tier : 0, - purchased: baseValues.keAdd, - subLabel: 'perm. eingesetzt/davon zurückgekauft', - subArray: [0, 0], - empty: attrPrimary[1] === 'ATTR_0' }), - _react2.default.createElement(_MainSheetCalcItem2.default, { - label: 'Seelenkraft', - calc: '(GW der Spezies + (MU + KL + IN)/6)', - value: baseValues.sk + Math.round((attributes[0].value + attributes[1].value + attributes[2].value) / 6), - add: _DisAdvStore2.default.get('ADV_26') && _DisAdvStore2.default.get('ADV_26').active ? 1 : _DisAdvStore2.default.get('DISADV_29') && _DisAdvStore2.default.get('DISADV_29').active ? -1 : 0, - purchased: null, - subLabel: 'Grundwert', - subArray: [baseValues.sk] }), - _react2.default.createElement(_MainSheetCalcItem2.default, { - label: 'Zähigkeit', - calc: '(GW der Spezies + (KO + KO + KK)/6)', - value: baseValues.zk + Math.round((attributes[6].value * 2 + attributes[7].value) / 6), - add: _DisAdvStore2.default.get('ADV_27') && _DisAdvStore2.default.get('ADV_27').active ? 1 : _DisAdvStore2.default.get('DISADV_30') && _DisAdvStore2.default.get('DISADV_30').active ? -1 : 0, - purchased: null, - subLabel: 'Grundwert', - subArray: [baseValues.zk] }), - _react2.default.createElement(_MainSheetCalcItem2.default, { - label: 'Ausweichen', - calc: '(GE/2)', - value: Math.round(attributes[5].value / 2), - add: 0, - purchased: null }), - _react2.default.createElement(_MainSheetCalcItem2.default, { - label: 'Initiative', - calc: '(MU + GE)/2', - value: Math.round((attributes[0].value + attributes[5].value) / 2), - add: 0, - purchased: null }), - _react2.default.createElement(_MainSheetCalcItem2.default, { - label: 'Geschwindigkeit', - calc: '(GW der Spezies, mögl. Einbeinig)', - value: baseValues.gs, - add: 0, - purchased: null, - subLabel: 'Grundwert', - subArray: [baseValues.gs] }), - _react2.default.createElement( - 'div', - { className: 'fate' }, - _react2.default.createElement( - 'h3', - null, - 'Schicksalspunkte' - ) - ) - ) : null + _react2.default.createElement(_MainSheetCalc2.default, { + attributes: attributes, + attrPrimary: attrPrimary, + baseValues: baseValues + }) ) ); } @@ -7855,7 +7767,168 @@ var MainSheet = function (_Component) { exports.default = MainSheet; -},{"../../../stores/APStore":117,"../../../stores/AttributeStore":118,"../../../stores/DisAdvStore":120,"../../../stores/ELStore":121,"../../../stores/ListStore":125,"../../../stores/ProfileStore":128,"../../../stores/rcp/CultureStore":137,"../../../stores/rcp/ProfessionStore":138,"../../../stores/rcp/ProfessionVariantStore":139,"../../../stores/rcp/RaceStore":140,"../../layout/Avatar":94,"../../layout/sheets/Box":110,"../../layout/sheets/LabelBox":111,"../../layout/sheets/Plain":112,"../../layout/sheets/TextBox":113,"./MainSheetCalcItem":65,"./OverviewDisAdv":67,"./SheetHeader":71,"react":328}],65:[function(require,module,exports){ +},{"../../../stores/APStore":120,"../../../stores/AttributeStore":121,"../../../stores/DisAdvStore":123,"../../../stores/ELStore":124,"../../../stores/ListStore":128,"../../../stores/ProfileStore":131,"../../../stores/SpecialAbilitiesStore":132,"../../../stores/rcp/CultureStore":140,"../../../stores/rcp/ProfessionStore":141,"../../../stores/rcp/ProfessionVariantStore":142,"../../../stores/rcp/RaceStore":143,"../../layout/sheets/TextBox":116,"./MainSheetCalc":65,"./MainSheetPersonalData":67,"./OverviewConstSkills":69,"./SheetHeader":73,"react":331}],65:[function(require,module,exports){ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +var _ListStore = require('../../../stores/ListStore'); + +var _ListStore2 = _interopRequireDefault(_ListStore); + +var _MainSheetCalcItem = require('./MainSheetCalcItem'); + +var _MainSheetCalcItem2 = _interopRequireDefault(_MainSheetCalcItem); + +var _react = require('react'); + +var _react2 = _interopRequireDefault(_react); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } + +var MainSheetCalc = function (_Component) { + _inherits(MainSheetCalc, _Component); + + function MainSheetCalc() { + _classCallCheck(this, MainSheetCalc); + + return _possibleConstructorReturn(this, Object.getPrototypeOf(MainSheetCalc).apply(this, arguments)); + } + + _createClass(MainSheetCalc, [{ + key: 'render', + value: function render() { + var _props = this.props; + var attributes = _props.attributes; + var attrPrimary = _props.attrPrimary; + var baseValues = _props.baseValues; + + + return attributes.length > 0 ? _react2.default.createElement( + 'div', + { className: 'calculated' }, + _react2.default.createElement( + 'div', + { className: 'calc-header' }, + _react2.default.createElement( + 'div', + null, + 'Wert' + ), + _react2.default.createElement( + 'div', + null, + 'Bonus/', + _react2.default.createElement('br', null), + 'Malus' + ), + _react2.default.createElement( + 'div', + null, + 'Zukauf' + ), + _react2.default.createElement( + 'div', + null, + 'Max' + ) + ), + _react2.default.createElement(_MainSheetCalcItem2.default, { + label: 'Lebensenergie', + calc: '(GW der Spezies + KO + KO)', + value: baseValues.le + attributes[6].value * 2, + add: _ListStore2.default.get('ADV_25') && _ListStore2.default.get('ADV_25').active ? _ListStore2.default.get('ADV_25').tier : _ListStore2.default.get('DISADV_28') && _ListStore2.default.get('DISADV_28').active ? -_ListStore2.default.get('DISADV_28').tier : 0, + purchased: baseValues.leAdd, + subLabel: 'Grundwert', + subArray: [baseValues.le] }), + _react2.default.createElement(_MainSheetCalcItem2.default, { + label: 'Astralenergie', + calc: '(20 durch Zauberer + Leiteigenschaft)', + value: attrPrimary[0] === 'ATTR_0' || !_ListStore2.default.get(attrPrimary[0]) ? 0 : 20 + _ListStore2.default.get(attrPrimary[0]).value, + add: _ListStore2.default.get('ADV_23') && _ListStore2.default.get('ADV_23').active ? _ListStore2.default.get('ADV_23').tier : _ListStore2.default.get('DISADV_26') && _ListStore2.default.get('DISADV_26').active ? -_ListStore2.default.get('DISADV_26').tier : 0, + purchased: baseValues.aeAdd, + subLabel: 'perm. eingesetzt/davon zurückgekauft', + subArray: [0, 0], + empty: attrPrimary[0] === 'ATTR_0' }), + _react2.default.createElement(_MainSheetCalcItem2.default, { + label: 'Karmaenergie', + calc: '(20 durch Geweihter + Leiteigenschaft)', + value: attrPrimary[1] === 'ATTR_0' || !_ListStore2.default.get(attrPrimary[1]) ? 0 : 20 + _ListStore2.default.get(attrPrimary[1]).value, + add: _ListStore2.default.get('ADV_24') && _ListStore2.default.get('ADV_24').active ? _ListStore2.default.get('ADV_24').tier : _ListStore2.default.get('DISADV_27') && _ListStore2.default.get('DISADV_27').active ? -_ListStore2.default.get('DISADV_27').tier : 0, + purchased: baseValues.keAdd, + subLabel: 'perm. eingesetzt/davon zurückgekauft', + subArray: [0, 0], + empty: attrPrimary[1] === 'ATTR_0' }), + _react2.default.createElement(_MainSheetCalcItem2.default, { + label: 'Seelenkraft', + calc: '(GW der Spezies + (MU + KL + IN)/6)', + value: baseValues.sk + Math.round((attributes[0].value + attributes[1].value + attributes[2].value) / 6), + add: _ListStore2.default.get('ADV_26') && _ListStore2.default.get('ADV_26').active ? 1 : _ListStore2.default.get('DISADV_29') && _ListStore2.default.get('DISADV_29').active ? -1 : 0, + purchased: null, + subLabel: 'Grundwert', + subArray: [baseValues.sk] }), + _react2.default.createElement(_MainSheetCalcItem2.default, { + label: 'Zähigkeit', + calc: '(GW der Spezies + (KO + KO + KK)/6)', + value: baseValues.zk + Math.round((attributes[6].value * 2 + attributes[7].value) / 6), + add: _ListStore2.default.get('ADV_27') && _ListStore2.default.get('ADV_27').active ? 1 : _ListStore2.default.get('DISADV_30') && _ListStore2.default.get('DISADV_30').active ? -1 : 0, + purchased: null, + subLabel: 'Grundwert', + subArray: [baseValues.zk] }), + _react2.default.createElement(_MainSheetCalcItem2.default, { + label: 'Ausweichen', + calc: '(GE/2)', + value: Math.round(attributes[5].value / 2), + add: 0, + purchased: null }), + _react2.default.createElement(_MainSheetCalcItem2.default, { + label: 'Initiative', + calc: '(MU + GE)/2', + value: Math.round((attributes[0].value + attributes[5].value) / 2), + add: 0, + purchased: null }), + _react2.default.createElement(_MainSheetCalcItem2.default, { + label: 'Geschwindigkeit', + calc: '(GW der Spezies, mögl. Einbeinig)', + value: baseValues.gs, + add: 0, + purchased: null, + subLabel: 'Grundwert', + subArray: [baseValues.gs] }), + _react2.default.createElement( + 'div', + { className: 'fate' }, + _react2.default.createElement( + 'h3', + null, + 'Schicksalspunkte' + ) + ) + ) : null; + } + }]); + + return MainSheetCalc; +}(_react.Component); + +MainSheetCalc.propTypes = { + attributes: _react.PropTypes.array.isRequired, + attrPrimary: _react.PropTypes.array.isRequired, + baseValues: _react.PropTypes.object.isRequired +}; +exports.default = MainSheetCalc; + +},{"../../../stores/ListStore":128,"./MainSheetCalcItem":66,"react":331}],66:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -7974,7 +8047,7 @@ MainSheetCalcItem.propTypes = { }; exports.default = MainSheetCalcItem; -},{"classnames":148,"react":328}],66:[function(require,module,exports){ +},{"classnames":151,"react":331}],67:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -7987,6 +8060,137 @@ var _Avatar = require('../../layout/Avatar'); var _Avatar2 = _interopRequireDefault(_Avatar); +var _LabelBox = require('../../layout/sheets/LabelBox'); + +var _LabelBox2 = _interopRequireDefault(_LabelBox); + +var _Plain = require('../../layout/sheets/Plain'); + +var _Plain2 = _interopRequireDefault(_Plain); + +var _react = require('react'); + +var _react2 = _interopRequireDefault(_react); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } + +var MainSheetPersonalData = function (_Component) { + _inherits(MainSheetPersonalData, _Component); + + function MainSheetPersonalData() { + _classCallCheck(this, MainSheetPersonalData); + + return _possibleConstructorReturn(this, Object.getPrototypeOf(MainSheetPersonalData).apply(this, arguments)); + } + + _createClass(MainSheetPersonalData, [{ + key: 'render', + value: function render() { + var _props = this.props; + var ap = _props.ap; + var culture = _props.culture; + var el = _props.el; + var eyecolorTags = _props.eyecolorTags; + var haircolorTags = _props.haircolorTags; + var profession = _props.profession; + var _props$profile = _props.profile; + var name = _props$profile.name; + var family = _props$profile.family; + var placeofbirth = _props$profile.placeofbirth; + var dateofbirth = _props$profile.dateofbirth; + var age = _props$profile.age; + var sex = _props$profile.sex; + var size = _props$profile.size; + var weight = _props$profile.weight; + var haircolor = _props$profile.haircolor; + var eyecolor = _props$profile.eyecolor; + var title = _props$profile.title; + var socialstatus = _props$profile.socialstatus; + var characteristics = _props$profile.characteristics; + var otherinfo = _props$profile.otherinfo; + var avatar = _props$profile.avatar; + var race = _props.race; + var socialstatusTags = _props.socialstatusTags; + + + return _react2.default.createElement( + 'div', + { className: 'upper' }, + _react2.default.createElement( + 'div', + { className: 'info' }, + _react2.default.createElement(_Plain2.default, { className: 'name', label: 'Name', value: name }), + _react2.default.createElement(_Plain2.default, { className: 'family', label: 'Familie', value: family }), + _react2.default.createElement(_Plain2.default, { className: 'placeofbirth', label: 'Geburtsort', value: placeofbirth }), + _react2.default.createElement(_Plain2.default, { className: 'dateofbirth', label: 'Geburtsdatum', value: dateofbirth }), + _react2.default.createElement(_Plain2.default, { className: 'age', label: 'Alter', value: age }), + _react2.default.createElement(_Plain2.default, { className: 'sex', label: 'Geschlecht', value: sex }), + _react2.default.createElement(_Plain2.default, { className: 'race', label: 'Spezies', value: race }), + _react2.default.createElement(_Plain2.default, { className: 'size', label: 'Größe', value: size }), + _react2.default.createElement(_Plain2.default, { className: 'weight', label: 'Gewicht', value: weight }), + _react2.default.createElement(_Plain2.default, { className: 'haircolor', label: 'Haarfarbe', value: haircolorTags[haircolor - 1] }), + _react2.default.createElement(_Plain2.default, { className: 'eyecolor', label: 'Augenfarbe', value: eyecolorTags[eyecolor - 1] }), + _react2.default.createElement(_Plain2.default, { className: 'culture', label: 'Kultur', value: culture }), + _react2.default.createElement(_Plain2.default, { className: 'profession', label: 'Profession', value: profession }), + _react2.default.createElement(_Plain2.default, { className: 'title', label: 'Titel', value: title }), + _react2.default.createElement(_Plain2.default, { className: 'socialstatus', label: 'Sozialstatus', value: socialstatusTags[socialstatus - 1] }), + _react2.default.createElement(_Plain2.default, { className: 'characteristics', label: 'Charakteristika', value: characteristics }), + _react2.default.createElement(_Plain2.default, { className: 'otherinfo', label: 'Sonstiges', value: otherinfo }) + ), + _react2.default.createElement( + 'div', + { className: 'ap-portrait' }, + _react2.default.createElement(_LabelBox2.default, { className: 'el', label: 'Erfahrungsgrad', value: el }), + _react2.default.createElement(_LabelBox2.default, { className: 'ap-total', label: 'AP gesamt', value: ap.total }), + _react2.default.createElement( + _LabelBox2.default, + { className: 'portrait', label: 'Porträt/Wappen' }, + _react2.default.createElement(_Avatar2.default, { src: avatar, img: true }) + ), + _react2.default.createElement(_LabelBox2.default, { className: 'ap-available', label: 'AP verfügbar', value: ap.total - ap.spent }), + _react2.default.createElement(_LabelBox2.default, { className: 'ap-used', label: 'AP ausgegeben', value: ap.spent }) + ) + ); + } + }]); + + return MainSheetPersonalData; +}(_react.Component); + +MainSheetPersonalData.propTypes = { + ap: _react.PropTypes.object.isRequired, + culture: _react.PropTypes.string.isRequired, + el: _react.PropTypes.string.isRequired, + eyecolorTags: _react.PropTypes.array.isRequired, + haircolorTags: _react.PropTypes.array.isRequired, + profession: _react.PropTypes.string.isRequired, + profile: _react.PropTypes.object.isRequired, + race: _react.PropTypes.string.isRequired, + socialstatusTags: _react.PropTypes.array.isRequired +}; +exports.default = MainSheetPersonalData; + +},{"../../layout/Avatar":96,"../../layout/sheets/LabelBox":114,"../../layout/sheets/Plain":115,"react":331}],68:[function(require,module,exports){ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; + +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + +var _Avatar = require('../../layout/Avatar'); + +var _Avatar2 = _interopRequireDefault(_Avatar); + var _APStore = require('../../../stores/APStore'); var _APStore2 = _interopRequireDefault(_APStore); @@ -8015,9 +8219,9 @@ var _IconButton = require('../../layout/IconButton'); var _IconButton2 = _interopRequireDefault(_IconButton); -var _OverviewDisAdv = require('./OverviewDisAdv'); +var _OverviewConstSkills = require('./OverviewConstSkills'); -var _OverviewDisAdv2 = _interopRequireDefault(_OverviewDisAdv); +var _OverviewConstSkills2 = _interopRequireDefault(_OverviewConstSkills); var _OverviewNameChange = require('./OverviewNameChange'); @@ -8081,29 +8285,14 @@ var Overview = function (_Component) { args[_key] = arguments[_key]; } - return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_Object$getPrototypeO = Object.getPrototypeOf(Overview)).call.apply(_Object$getPrototypeO, [this].concat(args))), _this), _this.state = { + return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_Object$getPrototypeO = Object.getPrototypeOf(Overview)).call.apply(_Object$getPrototypeO, [this].concat(args))), _this), _this.state = _extends({ advActive: _DisAdvStore2.default.getActiveForView(true), - disadvActive: _DisAdvStore2.default.getActiveForView(false), - name: _ProfileStore2.default.getName(), - gender: _ProfileStore2.default.getGender(), - portrait: _ProfileStore2.default.getPortrait(), - hair: _ProfileStore2.default.getHair(), - eyes: _ProfileStore2.default.getEyes(), - size: _ProfileStore2.default.getSize(), - weight: _ProfileStore2.default.getWeight(), + disadvActive: _DisAdvStore2.default.getActiveForView(false) + }, _ProfileStore2.default.getAll(), { phase: _PhaseStore2.default.get(), - showImageUpload: false, editName: false - }, _this._updateProfileStore = function () { - return _this.setState({ - name: _ProfileStore2.default.getName(), - gender: _ProfileStore2.default.getGender(), - portrait: _ProfileStore2.default.getPortrait(), - hair: _ProfileStore2.default.getHair(), - eyes: _ProfileStore2.default.getEyes(), - size: _ProfileStore2.default.getSize(), - weight: _ProfileStore2.default.getWeight() - }); + }), _this._updateProfileStore = function () { + return _this.setState(_ProfileStore2.default.getAll()); }, _this._updatePhaseStore = function () { return _this.setState({ phase: _PhaseStore2.default.get() @@ -8117,14 +8306,30 @@ var Overview = function (_Component) { return _this.setState({ editName: true }); }, _this.editNameCancel = function () { return _this.setState({ editName: false }); - }, _this.changeHair = function (option) { - return _ProfileActions2.default.changeHair(option); - }, _this.changeEyes = function (option) { - return _ProfileActions2.default.changeEyes(option); - }, _this.changeSize = function (event) { - return _ProfileActions2.default.changeSize(event.target.value); - }, _this.changeWeight = function (event) { - return _ProfileActions2.default.changeWeight(event.target.value); + }, _this.changeFamily = function (e) { + return _ProfileActions2.default.changeFamily(e.target.value); + }, _this.changePlaceOfBirth = function (e) { + return _ProfileActions2.default.changePlaceOfBirth(e.target.value); + }, _this.changeDateOfBirth = function (e) { + return _ProfileActions2.default.changeDateOfBirth(e.target.value); + }, _this.changeAge = function (e) { + return _ProfileActions2.default.changeAge(e.target.value); + }, _this.changeHaircolor = function (result) { + return _ProfileActions2.default.changeHaircolor(result); + }, _this.changeEyecolor = function (result) { + return _ProfileActions2.default.changeEyecolor(result); + }, _this.changeSize = function (e) { + return _ProfileActions2.default.changeSize(e.target.value); + }, _this.changeWeight = function (e) { + return _ProfileActions2.default.changeWeight(e.target.value); + }, _this.changeTitle = function (e) { + return _ProfileActions2.default.changeTitle(e.target.value); + }, _this.changeSocialStatus = function (result) { + return _ProfileActions2.default.changeSocialStatus(result); + }, _this.changeCharacteristics = function (e) { + return _ProfileActions2.default.changeCharacteristics(e.target.value); + }, _this.changeOtherInfo = function (e) { + return _ProfileActions2.default.changeOtherInfo(e.target.value); }, _this.rerollHair = function () { return _ProfileActions2.default.rerollHair(); }, _this.rerollEyes = function () { @@ -8154,34 +8359,55 @@ var Overview = function (_Component) { key: 'render', value: function render() { var _state = this.state; + var age = _state.age; + var avatar = _state.avatar; + var characteristics = _state.characteristics; var editName = _state.editName; + var eyecolor = _state.eyecolor; + var dateofbirth = _state.dateofbirth; + var family = _state.family; + var haircolor = _state.haircolor; var name = _state.name; - var portrait = _state.portrait; - var hair = _state.hair; - var eyes = _state.eyes; + var otherinfo = _state.otherinfo; + var placeofbirth = _state.placeofbirth; var size = _state.size; + var socialstatus = _state.socialstatus; + var title = _state.title; var weight = _state.weight; var phase = _state.phase; - var hairArr = _RaceStore2.default.getCurrent() ? [['blauschwarz', 1], ['blond', 2], ['braun', 3], ['dunkelblond', 4], ['dunkelbraun', 5], ['goldblond', 6], ['grau', 7], ['hellblond', 8], ['hellbraun', 9], ['kupferrot', 10], ['mittelblond', 11], ['mittelbraun', 12], ['rot', 13], ['rotblond', 14], ['schneeweiß', 15], ['schwarz', 16], ['silbern', 17], ['weißblond', 18], ['dunkelgrau', 19], ['hellgrau', 20], ['salzweiß', 21], ['silberweiß', 22], ['feuerrot', 23]].filter(function (e) { + var hairArr = _RaceStore2.default.getCurrent() ? _ProfileStore2.default.getHaircolorTags().map(function (e, i) { + return [e, i + 1]; + }).filter(function (e) { return _RaceStore2.default.getCurrent().hair.indexOf(e[1]) > -1; }) : []; - var eyesArr = _RaceStore2.default.getCurrent() ? [['amethystviolett', 1], ['bernsteinfarben', 2], ['blau', 3], ['braun', 4], ['dunkelbraun', 5], ['dunkelviolett', 6], ['eisgrau', 7], ['goldgesprenkelt', 8], ['grau', 9], ['graublau', 10], ['grün', 11], ['hellbraun', 12], ['rubinrot', 13], ['saphirblau', 14], ['schwarz', 15], ['schwarzbraun', 16], ['silbergrau', 17], ['smaragdgrün', 18]].filter(function (e) { + var eyesArr = _RaceStore2.default.getCurrent() ? _ProfileStore2.default.getEyecolorTags().map(function (e, i) { + return [e, i + 1]; + }).filter(function (e) { return _RaceStore2.default.getCurrent().eyes.indexOf(e[1]) > -1; }) : []; - var gender = this.state.gender === 'm' ? 'Männlich' : 'Weiblich'; + var socialstatusArr = _CultureStore2.default.getCurrent() ? _ProfileStore2.default.getSocialstatusTags().map(function (e, i) { + return [e, i + 1]; + }).filter(function (e) { + return _CultureStore2.default.getCurrent().social.indexOf(e[1]) > -1; + }) : []; + + var sex = this.state.sex === 'm' ? 'Männlich' : 'Weiblich'; var elAp = [900, 1000, 1100, 1200, 1400, 1700, 2100], ap = _APStore2.default.get(); - var currentEL = 'EL_7'; + var currentEL = 6; for (var i = 0; i < elAp.length; i++) { - if (elAp[i] >= ap) { - currentEL = 'EL_' + (i > 0 ? i : 1); + if (elAp[i] === ap) { + currentEL = i; + break; + } else if (elAp[i] > ap) { + currentEL = i - 1; break; } } @@ -8205,7 +8431,7 @@ var Overview = function (_Component) { _react2.default.createElement( 'div', { className: 'title-wrapper' }, - _react2.default.createElement(_Avatar2.default, { src: portrait, onClick: this.showImageUpload, wrapper: true }), + _react2.default.createElement(_Avatar2.default, { src: avatar, onClick: this.showImageUpload, wrapper: true }), _react2.default.createElement( 'div', { className: 'text-wrapper' }, @@ -8213,7 +8439,7 @@ var Overview = function (_Component) { _react2.default.createElement( 'div', { className: 'rcp' }, - gender, + sex, ' · ', _RaceStore2.default.getCurrent() !== undefined ? _RaceStore2.default.getCurrent().name : null, ' · ', @@ -8224,7 +8450,7 @@ var Overview = function (_Component) { _react2.default.createElement( 'div', { className: 'el' }, - _ELStore2.default.get(currentEL).name, + _ELStore2.default.get('EL_' + (currentEL + 1)).name, ' · ', ap, ' AP' @@ -8234,59 +8460,133 @@ var Overview = function (_Component) { _react2.default.createElement( 'h3', null, - 'Aussehen' + 'Persönliche Daten' ), _react2.default.createElement( - 'h4', - null, - 'Haarfarbe' - ), - _react2.default.createElement(_Dropdown2.default, { - value: hair, - onChange: this.changeHair, - options: hairArr - }), - _react2.default.createElement(_IconButton2.default, { icon: '', onClick: this.rerollHair }), - _react2.default.createElement( - 'h4', - null, - 'Augenfarbe' - ), - _react2.default.createElement(_Dropdown2.default, { - value: eyes, - onChange: this.changeEyes, - options: eyesArr - }), - _react2.default.createElement(_IconButton2.default, { icon: '', onClick: this.rerollEyes }), - _react2.default.createElement( - 'h4', - null, - 'Körpergröße' - ), - _react2.default.createElement(_TextField2.default, { - value: size, - onChange: this.changeSize - }), - _react2.default.createElement(_IconButton2.default, { icon: '', onClick: this.rerollSize }), - _react2.default.createElement( - 'h4', - null, - 'Gewicht' - ), - _react2.default.createElement(_TextField2.default, { - value: weight, - onChange: this.changeWeight - }), - _react2.default.createElement(_IconButton2.default, { icon: '', onClick: this.rerollWeight }), - phase === 2 ? _react2.default.createElement( 'div', - null, - _react2.default.createElement(_BorderButton2.default, { - label: 'Heldenerstellung beenden', - onClick: this.endCharacterCreation, - primary: true - }) - ) : null, + { className: 'personal-data' }, + _react2.default.createElement( + 'div', + null, + _react2.default.createElement(_TextField2.default, { + labelText: 'Familie', + value: family, + onChange: this.changeFamily + }) + ), + _react2.default.createElement( + 'div', + null, + _react2.default.createElement(_TextField2.default, { + labelText: 'Geburtsort', + value: placeofbirth, + onChange: this.changePlaceOfBirth + }) + ), + _react2.default.createElement( + 'div', + null, + _react2.default.createElement(_TextField2.default, { + labelText: 'Geburtsdatum', + value: dateofbirth, + onChange: this.changeDateOfBirth + }) + ), + _react2.default.createElement( + 'div', + null, + _react2.default.createElement(_TextField2.default, { + labelText: 'Alter', + value: age, + onChange: this.changeAge + }) + ), + _react2.default.createElement( + 'div', + { className: 'reroll' }, + _react2.default.createElement(_Dropdown2.default, { + label: 'Haarfarbe', + value: haircolor, + onChange: this.changeHaircolor, + options: hairArr + }), + _react2.default.createElement(_IconButton2.default, { icon: '', onClick: this.rerollHair }) + ), + _react2.default.createElement( + 'div', + { className: 'reroll' }, + _react2.default.createElement(_Dropdown2.default, { + label: 'Augenfarbe', + value: eyecolor, + onChange: this.changeEyecolor, + options: eyesArr + }), + _react2.default.createElement(_IconButton2.default, { icon: '', onClick: this.rerollEyes }) + ), + _react2.default.createElement( + 'div', + { className: 'reroll' }, + _react2.default.createElement(_TextField2.default, { + labelText: 'Körpergröße', + value: size, + onChange: this.changeSize + }), + _react2.default.createElement(_IconButton2.default, { icon: '', onClick: this.rerollSize }) + ), + _react2.default.createElement( + 'div', + { className: 'reroll' }, + _react2.default.createElement(_TextField2.default, { + labelText: 'Gewicht', + value: weight, + onChange: this.changeWeight + }), + _react2.default.createElement(_IconButton2.default, { icon: '', onClick: this.rerollWeight }) + ), + _react2.default.createElement( + 'div', + null, + _react2.default.createElement(_TextField2.default, { + labelText: 'Titel', + value: title, + onChange: this.changeTitle + }) + ), + _react2.default.createElement( + 'div', + null, + _react2.default.createElement(_Dropdown2.default, { + label: 'Sozialstatus', + value: socialstatus, + onChange: this.changeSocialStatus, + options: socialstatusArr + }) + ), + _react2.default.createElement( + 'div', + null, + _react2.default.createElement(_TextField2.default, { + labelText: 'Charakteristika', + value: characteristics, + onChange: this.changeCharacteristics + }) + ), + _react2.default.createElement( + 'div', + null, + _react2.default.createElement(_TextField2.default, { + labelText: 'Sonstiges', + value: otherinfo, + onChange: this.changeOtherInfo + }) + ) + ), + phase === 2 ? _react2.default.createElement(_BorderButton2.default, { + className: 'end-char-creation', + label: 'Heldenerstellung beenden', + onClick: this.endCharacterCreation, + primary: true + }) : null, phase === 3 ? _react2.default.createElement( 'div', null, @@ -8295,13 +8595,13 @@ var Overview = function (_Component) { null, 'Vorteile' ), - _react2.default.createElement(_OverviewDisAdv2.default, { list: this.state.advActive }), + _react2.default.createElement(_OverviewConstSkills2.default, { list: this.state.advActive }), _react2.default.createElement( 'h3', null, 'Nachteile' ), - _react2.default.createElement(_OverviewDisAdv2.default, { list: this.state.disadvActive }) + _react2.default.createElement(_OverviewConstSkills2.default, { list: this.state.disadvActive }) ) : null ) ); @@ -8313,7 +8613,7 @@ var Overview = function (_Component) { exports.default = Overview; -},{"../../../actions/ProfileActions":15,"../../../stores/APStore":117,"../../../stores/DisAdvStore":120,"../../../stores/ELStore":121,"../../../stores/PhaseStore":127,"../../../stores/ProfileStore":128,"../../../stores/rcp/CultureStore":137,"../../../stores/rcp/ProfessionStore":138,"../../../stores/rcp/ProfessionVariantStore":139,"../../../stores/rcp/RaceStore":140,"../../layout/Avatar":94,"../../layout/BorderButton":95,"../../layout/Dropdown":98,"../../layout/IconButton":99,"../../layout/Scroll":102,"../../layout/TextField":106,"./OverviewDisAdv":67,"./OverviewNameChange":68,"react":328}],67:[function(require,module,exports){ +},{"../../../actions/ProfileActions":15,"../../../stores/APStore":120,"../../../stores/DisAdvStore":123,"../../../stores/ELStore":124,"../../../stores/PhaseStore":130,"../../../stores/ProfileStore":131,"../../../stores/rcp/CultureStore":140,"../../../stores/rcp/ProfessionStore":141,"../../../stores/rcp/ProfessionVariantStore":142,"../../../stores/rcp/RaceStore":143,"../../layout/Avatar":96,"../../layout/BorderButton":97,"../../layout/Dropdown":100,"../../layout/IconButton":101,"../../layout/Scroll":104,"../../layout/TextField":108,"./OverviewConstSkills":69,"./OverviewNameChange":70,"react":331}],69:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -8334,49 +8634,64 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } -var OverviewDisAdv = function (_Component) { - _inherits(OverviewDisAdv, _Component); +var OverviewConstSkills = function (_Component) { + _inherits(OverviewConstSkills, _Component); - function OverviewDisAdv(props) { - _classCallCheck(this, OverviewDisAdv); + function OverviewConstSkills(props) { + _classCallCheck(this, OverviewConstSkills); - return _possibleConstructorReturn(this, Object.getPrototypeOf(OverviewDisAdv).call(this, props)); + return _possibleConstructorReturn(this, Object.getPrototypeOf(OverviewConstSkills).call(this, props)); } - _createClass(OverviewDisAdv, [{ + _createClass(OverviewConstSkills, [{ key: 'render', value: function render() { var roman = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X']; + var langLitc = new Set(['SA_28', 'SA_30']); return _react2.default.createElement( 'div', { className: 'list' }, - this.props.list.map(function (disadv) { + this.props.list.map(function (obj) { + var id = obj.id; + var name = obj.name; + var add = obj.add; + var tiers = obj.tiers; + var tier = obj.tier; - var name = disadv.name; - if (['ADV_28', 'ADV_29'].indexOf(disadv.id) > -1) name = 'Immunität gegen ' + disadv.add;else if (disadv.id === 'DISADV_1') name = 'Angst vor ' + disadv.add;else if (['DISADV_34', 'DISADV_50'].indexOf(disadv.id) > -1) name += ' ' + roman[disadv.tier - 1] + ' (' + disadv.add + ')';else if (disadv.hasOwnProperty('add')) name += ' (' + disadv.add + ')'; + if (langLitc.has(id)) { + return; + } - if (disadv.tiers !== undefined && disadv.tiers !== null && ['DISADV_34', 'DISADV_50'].indexOf(disadv.id) === -1) { - name += ' ' + roman[disadv.tier - 1]; + if (['ADV_28', 'ADV_29'].indexOf(id) > -1) name = 'Immunität gegen ' + add;else if (id === 'DISADV_1') name = 'Angst vor ' + add;else if (['DISADV_34', 'DISADV_50'].indexOf(id) > -1) name += ' ' + roman[tier - 1] + ' (' + add + ')';else if (add) name += ' (' + add + ')'; + + if (tiers !== undefined && tiers !== null && ['DISADV_34', 'DISADV_50'].indexOf(id) === -1) { + if (id === 'SA_30' && tier === 4) { + name += ' MS'; + } else { + name += ' ' + roman[tier - 1]; + } } return name; + }).filter(function (e) { + return e; }).join(', ') ); } }]); - return OverviewDisAdv; + return OverviewConstSkills; }(_react.Component); -OverviewDisAdv.propTypes = { +OverviewConstSkills.propTypes = { list: _react.PropTypes.array }; -exports.default = OverviewDisAdv; +exports.default = OverviewConstSkills; -},{"react":328}],68:[function(require,module,exports){ +},{"react":331}],70:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -8459,7 +8774,7 @@ OverviewNameChange.propTypes = { }; exports.default = OverviewNameChange; -},{"../../layout/IconButton":99,"../../layout/TextField":106,"react":328}],69:[function(require,module,exports){ +},{"../../layout/IconButton":101,"../../layout/TextField":108,"react":331}],71:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -8581,7 +8896,7 @@ var Profile = function (_Component) { exports.default = Profile; -},{"../../../stores/PhaseStore":127,"../../layout/SubTabs":104,"./Overview":66,"./Sheets":72,"react":328}],70:[function(require,module,exports){ +},{"../../../stores/PhaseStore":130,"../../layout/SubTabs":106,"./Overview":68,"./Sheets":74,"react":331}],72:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -8786,7 +9101,7 @@ ProfileAvatarChange.props = { }; exports.default = ProfileAvatarChange; -},{"../../../actions/ProfileActions":15,"../../layout/Avatar":94,"../../layout/Dialog":97,"../../layout/Dropdown":98,"../../layout/TextField":106,"react":328}],71:[function(require,module,exports){ +},{"../../../actions/ProfileActions":15,"../../layout/Avatar":96,"../../layout/Dialog":99,"../../layout/Dropdown":100,"../../layout/TextField":108,"react":331}],73:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -8874,7 +9189,7 @@ SheetHeader.propTypes = { }; exports.default = SheetHeader; -},{"../../../stores/AttributeStore":118,"../attributes/AttributeBorder":32,"react":328}],72:[function(require,module,exports){ +},{"../../../stores/AttributeStore":121,"../attributes/AttributeBorder":32,"react":331}],74:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, "__esModule", { @@ -8948,11 +9263,6 @@ var Sheets = function (_Component) { return _react2.default.createElement( 'div', { className: 'page', id: 'sheets' }, - _react2.default.createElement( - 'div', - { className: 'options' }, - _react2.default.createElement(_BorderButton2.default, { className: 'print-cs', label: 'Dokument drucken', onClick: this.print }) - ), _react2.default.createElement( _Scroll2.default, { className: 'sheet-wrapper' }, @@ -8969,10 +9279,13 @@ var Sheets = function (_Component) { return Sheets; }(_react.Component); +//
+
+## Installation
+
+ npm install colors
+
+## colors and styles!
+
+### text colors
+
+ - black
+ - red
+ - green
+ - yellow
+ - blue
+ - magenta
+ - cyan
+ - white
+ - gray
+ - grey
+
+### background colors
+
+
+
+ - bgBlack
+ - bgRed
+ - bgGreen
+ - bgYellow
+ - bgBlue
+ - bgMagenta
+ - bgCyan
+ - bgWhite
+
+### styles
+
+ - reset
+ - bold
+ - dim
+ - italic
+ - underline
+ - inverse
+ - hidden
+ - strikethrough
+
+### extras
+
+ - rainbow
+ - zebra
+ - america
+ - trap
+ - random
+
+
+## Usage
+
+By popular demand, `colors` now ships with two types of usages!
+
+The super nifty way
+
+```js
+var colors = require('colors');
+
+console.log('hello'.green); // outputs green text
+console.log('i like cake and pies'.underline.red) // outputs red underlined text
+console.log('inverse the color'.inverse); // inverses the color
+console.log('OMG Rainbows!'.rainbow); // rainbow
+console.log('Run the trap'.trap); // Drops the bass
+
+```
+
+or a slightly less nifty way which doesn't extend `String.prototype`
+
+```js
+var colors = require('colors/safe');
+
+console.log(colors.green('hello')); // outputs green text
+console.log(colors.red.underline('i like cake and pies')) // outputs red underlined text
+console.log(colors.inverse('inverse the color')); // inverses the color
+console.log(colors.rainbow('OMG Rainbows!')); // rainbow
+console.log(colors.trap('Run the trap')); // Drops the bass
+
+```
+
+I prefer the first way. Some people seem to be afraid of extending `String.prototype` and prefer the second way.
+
+If you are writing good code you will never have an issue with the first approach. If you really don't want to touch `String.prototype`, the second usage will not touch `String` native object.
+
+## Disabling Colors
+
+To disable colors you can pass the following arguments in the command line to your application:
+
+```bash
+node myapp.js --no-color
+```
+
+## Console.log [string substitution](http://nodejs.org/docs/latest/api/console.html#console_console_log_data)
+
+```js
+var name = 'Marak';
+console.log(colors.green('Hello %s'), name);
+// outputs -> 'Hello Marak'
+```
+
+## Custom themes
+
+### Using standard API
+
+```js
+
+var colors = require('colors');
+
+colors.setTheme({
+ silly: 'rainbow',
+ input: 'grey',
+ verbose: 'cyan',
+ prompt: 'grey',
+ info: 'green',
+ data: 'grey',
+ help: 'cyan',
+ warn: 'yellow',
+ debug: 'blue',
+ error: 'red'
+});
+
+// outputs red text
+console.log("this is an error".error);
+
+// outputs yellow text
+console.log("this is a warning".warn);
+```
+
+### Using string safe API
+
+```js
+var colors = require('colors/safe');
+
+// set single property
+var error = colors.red;
+error('this is red');
+
+// set theme
+colors.setTheme({
+ silly: 'rainbow',
+ input: 'grey',
+ verbose: 'cyan',
+ prompt: 'grey',
+ info: 'green',
+ data: 'grey',
+ help: 'cyan',
+ warn: 'yellow',
+ debug: 'blue',
+ error: 'red'
+});
+
+// outputs red text
+console.log(colors.error("this is an error"));
+
+// outputs yellow text
+console.log(colors.warn("this is a warning"));
+```
+
+*Protip: There is a secret undocumented style in `colors`. If you find the style you can summon him.*
\ No newline at end of file
diff --git a/node_modules/colors/examples/normal-usage.js b/node_modules/colors/examples/normal-usage.js
new file mode 100644
index 00000000..2818741e
--- /dev/null
+++ b/node_modules/colors/examples/normal-usage.js
@@ -0,0 +1,74 @@
+var colors = require('../lib/index');
+
+console.log("First some yellow text".yellow);
+
+console.log("Underline that text".yellow.underline);
+
+console.log("Make it bold and red".red.bold);
+
+console.log(("Double Raindows All Day Long").rainbow)
+
+console.log("Drop the bass".trap)
+
+console.log("DROP THE RAINBOW BASS".trap.rainbow)
+
+
+console.log('Chains are also cool.'.bold.italic.underline.red); // styles not widely supported
+
+console.log('So '.green + 'are'.underline + ' ' + 'inverse'.inverse + ' styles! '.yellow.bold); // styles not widely supported
+console.log("Zebras are so fun!".zebra);
+
+//
+// Remark: .strikethrough may not work with Mac OS Terminal App
+//
+console.log("This is " + "not".strikethrough + " fun.");
+
+console.log('Background color attack!'.black.bgWhite)
+console.log('Use random styles on everything!'.random)
+console.log('America, Heck Yeah!'.america)
+
+
+console.log('Setting themes is useful')
+
+//
+// Custom themes
+//
+console.log('Generic logging theme as JSON'.green.bold.underline);
+// Load theme with JSON literal
+colors.setTheme({
+ silly: 'rainbow',
+ input: 'grey',
+ verbose: 'cyan',
+ prompt: 'grey',
+ info: 'green',
+ data: 'grey',
+ help: 'cyan',
+ warn: 'yellow',
+ debug: 'blue',
+ error: 'red'
+});
+
+// outputs red text
+console.log("this is an error".error);
+
+// outputs yellow text
+console.log("this is a warning".warn);
+
+// outputs grey text
+console.log("this is an input".input);
+
+console.log('Generic logging theme as file'.green.bold.underline);
+
+// Load a theme from file
+colors.setTheme(__dirname + '/../themes/generic-logging.js');
+
+// outputs red text
+console.log("this is an error".error);
+
+// outputs yellow text
+console.log("this is a warning".warn);
+
+// outputs grey text
+console.log("this is an input".input);
+
+//console.log("Don't summon".zalgo)
\ No newline at end of file
diff --git a/node_modules/colors/examples/safe-string.js b/node_modules/colors/examples/safe-string.js
new file mode 100644
index 00000000..111b363a
--- /dev/null
+++ b/node_modules/colors/examples/safe-string.js
@@ -0,0 +1,76 @@
+var colors = require('../safe');
+
+console.log(colors.yellow("First some yellow text"));
+
+console.log(colors.yellow.underline("Underline that text"));
+
+console.log(colors.red.bold("Make it bold and red"));
+
+console.log(colors.rainbow("Double Raindows All Day Long"))
+
+console.log(colors.trap("Drop the bass"))
+
+console.log(colors.rainbow(colors.trap("DROP THE RAINBOW BASS")));
+
+console.log(colors.bold.italic.underline.red('Chains are also cool.')); // styles not widely supported
+
+
+console.log(colors.green('So ') + colors.underline('are') + ' ' + colors.inverse('inverse') + colors.yellow.bold(' styles! ')); // styles not widely supported
+
+console.log(colors.zebra("Zebras are so fun!"));
+
+console.log("This is " + colors.strikethrough("not") + " fun.");
+
+
+console.log(colors.black.bgWhite('Background color attack!'));
+console.log(colors.random('Use random styles on everything!'))
+console.log(colors.america('America, Heck Yeah!'));
+
+console.log('Setting themes is useful')
+
+//
+// Custom themes
+//
+//console.log('Generic logging theme as JSON'.green.bold.underline);
+// Load theme with JSON literal
+colors.setTheme({
+ silly: 'rainbow',
+ input: 'grey',
+ verbose: 'cyan',
+ prompt: 'grey',
+ info: 'green',
+ data: 'grey',
+ help: 'cyan',
+ warn: 'yellow',
+ debug: 'blue',
+ error: 'red'
+});
+
+// outputs red text
+console.log(colors.error("this is an error"));
+
+// outputs yellow text
+console.log(colors.warn("this is a warning"));
+
+// outputs grey text
+console.log(colors.input("this is an input"));
+
+
+// console.log('Generic logging theme as file'.green.bold.underline);
+
+// Load a theme from file
+colors.setTheme(__dirname + '/../themes/generic-logging.js');
+
+// outputs red text
+console.log(colors.error("this is an error"));
+
+// outputs yellow text
+console.log(colors.warn("this is a warning"));
+
+// outputs grey text
+console.log(colors.input("this is an input"));
+
+// console.log(colors.zalgo("Don't summon him"))
+
+
+
diff --git a/node_modules/colors/lib/colors.js b/node_modules/colors/lib/colors.js
new file mode 100644
index 00000000..59898de8
--- /dev/null
+++ b/node_modules/colors/lib/colors.js
@@ -0,0 +1,176 @@
+/*
+
+The MIT License (MIT)
+
+Original Library
+ - Copyright (c) Marak Squires
+
+Additional functionality
+ - Copyright (c) Sindre Sorhus
+
+Basic example in a web page
+
+```html
+
+
+
+```
+
+Open the above .html file in a browser and you should see
+
+
+
+**[Full online demo](http://kpdecker.github.com/jsdiff)**
+
+## Compatibility
+
+[](https://saucelabs.com/u/jsdiff)
+
+jsdiff supports all ES3 environments with some known issues on IE8 and below. Under these browsers some diff algorithms such as word diff and others may fail due to lack of support for capturing groups in the `split` operation.
+
+## License
+
+See [LICENSE](https://github.com/kpdecker/jsdiff/blob/master/LICENSE).
diff --git a/node_modules/diff/dist/diff.js b/node_modules/diff/dist/diff.js
new file mode 100644
index 00000000..f8597fa8
--- /dev/null
+++ b/node_modules/diff/dist/diff.js
@@ -0,0 +1,1351 @@
+/*!
+
+ diff v3.0.1
+
+Software License Agreement (BSD License)
+
+Copyright (c) 2009-2015, Kevin Decker Hello, my name is {{name}}. I am from {{hometown}}. I have " + + "{{kids.length}} kids:
" + + "Hello, my name is Alan. I am from Somewhere, TX. I have 2 kids:
+//