Rename state to storage
This commit is contained in:
		@@ -2,7 +2,7 @@ import { ActionController, registerAction } from './ActionController';
 | 
			
		||||
import { grabVillageResources, grabVillageResourceStorage } from '../Page/ResourcesBlock';
 | 
			
		||||
import { changeHeroResource, grabCurrentHeroResource } from '../Page/HeroPage';
 | 
			
		||||
import { grabActiveVillageId } from '../Page/VillageBlock';
 | 
			
		||||
import { HeroState } from '../State/HeroState';
 | 
			
		||||
import { HeroStorage } from '../Storage/HeroStorage';
 | 
			
		||||
import { calcHeroResource } from '../Core/HeroBalance';
 | 
			
		||||
import { HeroAllResources } from '../Core/Hero';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
@@ -12,7 +12,7 @@ import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
export class BalanceHeroResourcesAction extends ActionController {
 | 
			
		||||
    async run(args: Args, task: Task): Promise<any> {
 | 
			
		||||
        const activeVillageId = grabActiveVillageId();
 | 
			
		||||
        const heroVillageId = new HeroState().getVillageId();
 | 
			
		||||
        const heroVillageId = new HeroStorage().getVillageId();
 | 
			
		||||
 | 
			
		||||
        if (heroVillageId === undefined || activeVillageId !== heroVillageId) {
 | 
			
		||||
            changeHeroResource(HeroAllResources);
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@ import { ActionController, registerAction } from './ActionController';
 | 
			
		||||
import { grabVillageList } from '../Page/VillageBlock';
 | 
			
		||||
import { grabHeroVillage } from '../Page/HeroPage';
 | 
			
		||||
import { path } from '../utils';
 | 
			
		||||
import { HeroState } from '../State/HeroState';
 | 
			
		||||
import { HeroStorage } from '../Storage/HeroStorage';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
 | 
			
		||||
@@ -25,6 +25,6 @@ export class GoToHeroVillageAction extends ActionController {
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        return new HeroState().getVillageId();
 | 
			
		||||
        return new HeroStorage().getVillageId();
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@ import { grabVillageResources } from '../Page/ResourcesBlock';
 | 
			
		||||
import { grabActiveVillageId, grabVillageList } from '../Page/VillageBlock';
 | 
			
		||||
import { SendResourcesTask } from '../Task/SendResourcesTask';
 | 
			
		||||
import { aroundMinutes, timestamp } from '../utils';
 | 
			
		||||
import { VillageState } from '../State/VillageState';
 | 
			
		||||
import { VillageStorage } from '../Storage/VillageStorage';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
 | 
			
		||||
@@ -83,7 +83,7 @@ export class SendResourcesAction extends ActionController {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private getRecipientRequirements(villageId: number): Resources {
 | 
			
		||||
        const state = new VillageState(villageId);
 | 
			
		||||
        const state = new VillageStorage(villageId);
 | 
			
		||||
        const resources = state.getResources();
 | 
			
		||||
        const incoming = state.getIncomingMerchants().reduce((m, i) => m.add(i.resources), Resources.zero());
 | 
			
		||||
        const requirements = this.scheduler.getVillageRequiredResources(villageId);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user