-1}
@@ -94,7 +96,7 @@ class Talents extends Component {
skt={talent.skt}
addPoint={this.addPoint.bind(null, talent.id)}
addDisabled={talent.disabledIncrease}
- removePoint={this.removePoint.bind(null, talent.id)}
+ removePoint={this.state.phase < 3 ? this.removePoint.bind(null, talent.id) : undefined}
removeDisabled={talent.disabledDecrease} />
))
}
diff --git a/js/components/layout/BorderButton.js b/js/components/layout/BorderButton.js
index 731d9877..179cd3a6 100644
--- a/js/components/layout/BorderButton.js
+++ b/js/components/layout/BorderButton.js
@@ -11,13 +11,9 @@ class BorderButton extends Component {
label: PropTypes.string
};
- constructor(props) {
- super(props);
- }
-
render() {
- const className = classNames('btn', this.props.primary && 'primary', this.props.fullWidth && 'fullWidth', this.props.disabled && 'disabled', this.props.className);
+ const className = classNames('btn', this.props.primary && 'btn-primary', this.props.fullWidth && 'fullWidth', this.props.disabled && 'disabled', this.props.className);
const labelTextElement = this.props.label ? (
{this.props.label}
diff --git a/js/components/layout/IconButton.js b/js/components/layout/IconButton.js
index 85424161..9857585e 100644
--- a/js/components/layout/IconButton.js
+++ b/js/components/layout/IconButton.js
@@ -17,7 +17,7 @@ class IconButton extends Component {
render() {
- const className = classNames('iconbutton', this.props.primary && 'primary', this.props.disabled && 'disabled', this.props.className);
+ const className = classNames('btn-icon', this.props.primary && 'btn-primary', this.props.disabled && 'disabled', this.props.className);
return (
diff --git a/js/constants/ActionTypes.js b/js/constants/ActionTypes.js
index ed67ae28..9abaeb6b 100644
--- a/js/constants/ActionTypes.js
+++ b/js/constants/ActionTypes.js
@@ -52,6 +52,7 @@ export default keyMirror({
// PhaseStore
INCREASE_PHASE: null,
RESET_PHASE: null,
+ FINALIZE_CHARACTER_CREATION: null,
// CharbaseStore
SET_RULES: null,
diff --git a/js/stores/AttributeStore.js b/js/stores/AttributeStore.js
index b228da36..82ff2a09 100644
--- a/js/stores/AttributeStore.js
+++ b/js/stores/AttributeStore.js
@@ -129,8 +129,7 @@ var AttributeStore = Object.assign({}, EventEmitter.prototype, {
},
getAllForView: function() {
- // var phase = PhaseStore.get();
- var phase = 1;
+ var phase = PhaseStore.get();
var attrsObj = ListStore.getObjByCategory(CATEGORY);
var attrs = [];
diff --git a/js/stores/CombatTechniquesStore.js b/js/stores/CombatTechniquesStore.js
index 930a987f..2f8b7ebb 100644
--- a/js/stores/CombatTechniquesStore.js
+++ b/js/stores/CombatTechniquesStore.js
@@ -31,7 +31,7 @@ function _updateSortOrder(option) {
function _clear() {
ListStore.getAllByCategory(CATEGORY).forEach(e => {
- ListStore.setSR(e.id, 0);
+ ListStore.setSR(e.id, 6);
ListStore.setProperty(e.id, 'dependencies', []);
});
}
@@ -105,8 +105,7 @@ var CombatTechniquesStore = Object.assign({}, EventEmitter.prototype, {
},
getAllForView: function() {
- // var phase = PhaseStore.get();
- var phase = 1;
+ var phase = PhaseStore.get();
var combatTechniquesObj = ListStore.getObjByCategory(CATEGORY);
var combatTechniques = [];
@@ -123,7 +122,7 @@ var CombatTechniquesStore = Object.assign({}, EventEmitter.prototype, {
if (phase < 3)
_max = ELStore.getStart().max_combattech + _max_bonus;
else {
- let primary = leit.map(e => this.get(`ATTR_${e}`).value);
+ let primary = leit.map(e => ListStore.get(e).value);
_max = Math.max(...primary) + 2 + _max_bonus;
}
combatTechnique.disabledIncrease = fw >= _max;
diff --git a/js/stores/HistoryStore.js b/js/stores/HistoryStore.js
index 1b865443..c6cf4d66 100644
--- a/js/stores/HistoryStore.js
+++ b/js/stores/HistoryStore.js
@@ -11,35 +11,68 @@ import reactAlert from '../utils/reactAlert';
import reqPurchase from '../utils/reqPurchase';
var _history = [];
+var _lastSaveIndex = -1;
-function _add(obj) {
- _history.push(obj);
+function _add(actionType, costs = 0, previousState = null, options) {
+ _history.push({
+ actionType,
+ costs,
+ previousState,
+ options
+ });
}
function _clear() {
_history = [];
}
+function _resetSaveIndex() {
+ _lastSaveIndex = _history.length - 1;
+}
+
function _updateAll(array) {
_history = array;
+ _lastSaveIndex = _history.length - 1;
}
function _assignRCP(selections) {
- // if (!selections.useCulturePackage) {
- // _used -= _rcp[1];
- // }
+ let race = RaceStore.getCurrent();
+ _add(ActionTypes.SELECT_RACE, race.ap, undefined, race.id);
+ let culture = CultureStore.getCurrent();
+ _add(ActionTypes.SELECT_CULTURE, culture.ap, undefined, race.id);
+ let profession = ProfessionStore.getCurrent() || { id: 'P_0', ap: 0 };
+ _add(ActionTypes.SELECT_PROFESSION, profession.ap, undefined, profession.id);
+ let professionVariant = ProfessionVariantStore.getCurrent();
+ if (professionVariant) {
+ _add(ActionTypes.SELECT_PROFESSION_VARIANT, professionVariant.ap, undefined, professionVariant.id);
+ }
- // if (selections.buyLiteracy) {
- // const culture = CultureStore.getCurrent();
- // let id = culture.literacy.length > 1 ? selections.litc : culture.literacy[0];
- // _used += ListStore.get('SA_28').sel[id - 1][2];
- // }
+ let { attrSel, useCulturePackage, lang, buyLiteracy, litc, cantrips, combattech, curses, langLitc, spec } = selections;
- // let p = ProfessionStore.getCurrent();
- // if (p) {
- // let apCosts = reqPurchase(p.req);
- // _used += apCosts;
- // }
+ _add('SELECT_ATTRIBUTE_MOD', undefined, undefined, attrSel);
+ _add('PURCHASE_CULTURE_PACKAGE', undefined, undefined, useCulturePackage);
+ if (lang !== 0) {
+ _add('SELECT_MOTHER_TONGUE', undefined, undefined, lang);
+ }
+ _add('PURCHASE_MAIN_LITERACY', undefined, undefined, buyLiteracy);
+ if (spec[0] !== null || spec[1] !== '') {
+ _add('SELECT_SKILL_SPECIALISATION', undefined, undefined, spec);
+ }
+ if (litc !== 0) {
+ _add('SELECT_MAIN_LITERACY', undefined, undefined, litc);
+ }
+ if (cantrips.size > 0) {
+ _add('SELECT_CANTRIPS', undefined, undefined, Array.from(cantrips));
+ }
+ if (combattech.size > 0) {
+ _add('SELECT_COMBAT_TECHNIQUES', undefined, undefined, Array.from(combattech));
+ }
+ if (curses.size > 0) {
+ _add('SELECT_CURSES', undefined, undefined, Array.from(curses));
+ }
+ if (langLitc.size > 0) {
+ _add('SELECT_LANGUAGES_AND_LITERACIES', undefined, undefined, Array.from(langLitc));
+ }
}
var HistoryStore = Object.assign({}, EventEmitter.prototype, {
@@ -72,18 +105,31 @@ HistoryStore.dispatchToken = AppDispatcher.register( function( payload ) {
case ActionTypes.CLEAR_HERO:
_clear();
+ _resetSaveIndex();
break;
case ActionTypes.RECEIVE_HERO:
+ _clear();
_updateAll(payload.history);
+ _resetSaveIndex();
break;
case ActionTypes.ASSIGN_RCP_ENTRIES:
_assignRCP(payload.selections);
+ _resetSaveIndex();
+ break;
+
+ case ActionTypes.FINALIZE_CHARACTER_CREATION:
+ _resetSaveIndex();
break;
case ActionTypes.CREATE_NEW_HERO:
_clear();
+ _resetSaveIndex();
+ break;
+
+ case ActionTypes.SAVE_HERO_SUCCESS:
+ _resetSaveIndex();
break;
default:
diff --git a/js/stores/LiturgiesStore.js b/js/stores/LiturgiesStore.js
index 58a00182..6cc791e5 100644
--- a/js/stores/LiturgiesStore.js
+++ b/js/stores/LiturgiesStore.js
@@ -145,8 +145,7 @@ var LiturgiesStore = Object.assign({}, EventEmitter.prototype, {
},
getActiveForView: function() {
- // var phase = PhaseStore.get();
- var phase = 1;
+ var phase = PhaseStore.get();
var liturgiesObj = ListStore.getObjByCategory(CATEGORY);
var liturgies = [];
@@ -177,7 +176,7 @@ var LiturgiesStore = Object.assign({}, EventEmitter.prototype, {
if (phase < 3)
_max = ELStore.getStart().max_skill + _max_bonus;
else {
- let checkValues = liturgy.check.map(attr => this.get(`ATTR_${attr}`).value);
+ let checkValues = liturgy.check.map(attr => ListStore.get(attr).value);
_max = Math.max(...checkValues) + 2 + _max_bonus;
}
aspc.some(e => {
diff --git a/js/stores/PhaseStore.js b/js/stores/PhaseStore.js
index 0a1b7188..21b7ad90 100644
--- a/js/stores/PhaseStore.js
+++ b/js/stores/PhaseStore.js
@@ -48,6 +48,10 @@ PhaseStore.dispatchToken = AppDispatcher.register( function( payload ) {
_update(2);
break;
+ case ActionTypes.FINALIZE_CHARACTER_CREATION:
+ _update(3);
+ break;
+
default:
return true;
}
diff --git a/js/stores/SpellsStore.js b/js/stores/SpellsStore.js
index c74784c6..3ac29eee 100644
--- a/js/stores/SpellsStore.js
+++ b/js/stores/SpellsStore.js
@@ -172,8 +172,7 @@ var SpellsStore = Object.assign({}, EventEmitter.prototype, {
},
getActiveForView: function() {
- // var phase = PhaseStore.get();
- var phase = 1;
+ var phase = PhaseStore.get();
var spellsObj = ListStore.getObjByCategory(CATEGORY);
var spells = [];
@@ -209,7 +208,7 @@ var SpellsStore = Object.assign({}, EventEmitter.prototype, {
if (phase < 3)
_max = ELStore.getStart().max_skill + _max_bonus;
else {
- let checkValues = spell.check.map(attr => this.get(`ATTR_${attr}`).value);
+ let checkValues = spell.check.map(attr => ListStore.get(attr).value);
_max = Math.max(...checkValues) + 2 + _max_bonus;
}
if (SA_88_ACTIVE.indexOf(merk) === -1)
diff --git a/js/stores/TalentsStore.js b/js/stores/TalentsStore.js
index 7e71af09..013ab66d 100644
--- a/js/stores/TalentsStore.js
+++ b/js/stores/TalentsStore.js
@@ -109,8 +109,7 @@ var TalentsStore = Object.assign({}, EventEmitter.prototype, {
},
getAllForView: function() {
- // var phase = PhaseStore.get();
- var phase = 1;
+ var phase = PhaseStore.get();
var talentsObj = ListStore.getObjByCategory(CATEGORY);
var talents = [];
@@ -127,7 +126,7 @@ var TalentsStore = Object.assign({}, EventEmitter.prototype, {
if (phase < 3)
_max = ELStore.getStart().max_skill + _max_bonus;
else {
- let checkValues = check.map(attr => this.get(`ATTR_${attr}`).value);
+ let checkValues = check.map(attr => ListStore.get(attr).value);
_max = Math.max(...checkValues) + 2 + _max_bonus;
}
talent.disabledIncrease = fw >= _max;
diff --git a/js/utils/WebAPIUtils.js b/js/utils/WebAPIUtils.js
index 1f41d47b..38da7074 100644
--- a/js/utils/WebAPIUtils.js
+++ b/js/utils/WebAPIUtils.js
@@ -250,13 +250,13 @@ var WebAPIUtils = {
},
loadHero: function(id) {
ServerActions.startLoading();
- ServerActions.loadHeroSuccess(id, {
+ ServerActions.loadHeroSuccess(id, `{
"sex":"m",
"pers":{
- _hair: 1,
- _eyes: 1,
- _size: 167,
- _weight: 71
+ "_hair": 1,
+ "_eyes": 1,
+ "_size": 167,
+ "_weight": 71
},
"attr":{
"values":[
@@ -291,8 +291,9 @@ var WebAPIUtils = {
},
"sa":{
"active":[["SA_10",[["TAL_48","Test"]]],["SA_28",[9,14]],["SA_30",[[8,4],[23,2],[6,1]]]]
- }
- });
+ },
+ "history": []
+ }`);
// return new Promise(function(){
// jQuery.ajax(
// {
@@ -361,19 +362,19 @@ var WebAPIUtils = {
} else if (type === 'file') {
finalData = new FormData(data);
}
- // return new Promise(function(){
- // jQuery.ajax({
- // url: 'http://cha5app.dsa-sh.de/php/uploadheropic.php?hid=' + ProfileStore.getID() + '&type=' + type + urlAdd,
- // type: 'POST',
- // data: finalData,
- // success: function(result) {
+ return new Promise(function(){
+ jQuery.ajax({
+ url: 'http://cha5app.dsa-sh.de/php/uploadheropic.php?hid=' + ProfileStore.getID() + '&type=' + type + urlAdd,
+ type: 'POST',
+ data: finalData,
+ success: function(result) {
ServerActions.changeHeroAvatarSuccess(type === 'file' ? result : data);
- // },
- // error: function(error) {
- // ServerActions.connectionError(error);
- // }
- // });
- // });
+ },
+ error: function(error) {
+ ServerActions.connectionError(error);
+ }
+ });
+ });
},
deleteHero: function(heroid) {
ServerActions.startLoading();