diff options
author | Alexander NeonXP Kiryukhin <a.kiryukhin@mail.ru> | 2019-06-10 03:15:51 +0300 |
---|---|---|
committer | Alexander NeonXP Kiryukhin <a.kiryukhin@mail.ru> | 2019-06-10 03:15:51 +0300 |
commit | 06645cdac4184f5c1cf50f2a4b94be3d72d634f0 (patch) | |
tree | 1eb62ec1d2275ae6feb90cfceedb7b93257005b0 /src/Actions | |
parent | 4b01d81d3daed894bc93f77dbbbe5501a4552447 (diff) |
More improvements
Diffstat (limited to 'src/Actions')
-rw-r--r-- | src/Actions/actions.ts | 2 | ||||
-rw-r--r-- | src/Actions/entity.ts | 13 | ||||
-rw-r--r-- | src/Actions/settings.ts | 11 |
3 files changed, 25 insertions, 1 deletions
diff --git a/src/Actions/actions.ts b/src/Actions/actions.ts index 988ba65..62abb96 100644 --- a/src/Actions/actions.ts +++ b/src/Actions/actions.ts @@ -1,9 +1,11 @@ import auth from './auth' import entity from './entity' +import settings from './settings'; export const actions = { ...auth, ...entity, + ...settings, } export default actions
\ No newline at end of file diff --git a/src/Actions/entity.ts b/src/Actions/entity.ts index d23022a..8b01ea6 100644 --- a/src/Actions/entity.ts +++ b/src/Actions/entity.ts @@ -9,7 +9,7 @@ const entity = { 'update': (region: Region, width: number, refresh: boolean) => async (dispatch, getStore) => { const store = getStore() const queue = store.entities.loadQueue - const loadedAlready = refresh ? + const loadedAlready = !refresh ? [ ...Object.keys(store.entities.portals), ...queue, @@ -18,6 +18,7 @@ const entity = { dispatch(entity.setLoadQueue([...queue, ...tiles])) setImmediate(() => dispatch(entity.loadRutine())) }, + 'loadRutine': () => async (dispatch, getStore) => { const store = getStore() const queue = store.entities.loadQueue @@ -27,6 +28,8 @@ const entity = { loadTiles(chunk, params) .then(({ result, failed }) => { const queue = store.entities.loadQueue + dispatch(entity.linksGC(result.linksByTile)) + dispatch(entity.fieldsGC(result.fieldsByTile)) dispatch(entity.portalsSet(result.portals)) dispatch(entity.linksSet(result.links)) dispatch(entity.fieldsSet(result.fields)) @@ -73,6 +76,14 @@ const entity = { type: 'linksSet', links, }), + 'linksGC': (links: { [tile: string]: string[] }) => ({ + type: 'linksGC', + links, + }), + 'fieldsGC': (fields: { [tile: string]: string[] }) => ({ + type: 'fieldsGC', + fields, + }), 'fieldsSet': (fields: { [guid: string]: Field }) => ({ type: 'fieldsSet', fields, diff --git a/src/Actions/settings.ts b/src/Actions/settings.ts new file mode 100644 index 0000000..8dfc3fc --- /dev/null +++ b/src/Actions/settings.ts @@ -0,0 +1,11 @@ +const settings = { + 'setLevelFrom': (level: Number) => ({ + type: 'setLevelFrom', + level + }), + 'setLevelTo': (level: Number) => ({ + type: 'setLevelTo', + level + }) +} +export default settings
\ No newline at end of file |