Skip to content

Commit

Permalink
Merge pull request #182 from SystemParadox/fix-intershard-resources
Browse files Browse the repository at this point in the history
Add InterShardResourceConstant, fix resources missing from MarketResourceConstant
  • Loading branch information
pyrodogg authored Sep 28, 2020
2 parents d2ec418 + a22ed05 commit fe48238
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions dist/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ declare const BOOSTS: {
};
};

declare const INTERSHARD_RESOURCES: [SUBSCRIPTION_TOKEN, CPU_UNLOCK, PIXEL, ACCESS_KEY];
declare const INTERSHARD_RESOURCES: InterShardResourceConstant[];

declare const COMMODITIES: Record<
CommodityConstant | MineralConstant | RESOURCE_GHODIUM | RESOURCE_ENERGY,
Expand Down Expand Up @@ -2430,7 +2430,8 @@ type CommodityConstant =
| RESOURCE_EMANATION
| RESOURCE_ESSENCE;

type MarketResourceConstant = ResourceConstant | SUBSCRIPTION_TOKEN;
type InterShardResourceConstant = SUBSCRIPTION_TOKEN | CPU_UNLOCK | PIXEL | ACCESS_KEY;
type MarketResourceConstant = ResourceConstant | InterShardResourceConstant;

type RESOURCE_ENERGY = "energy";
type RESOURCE_POWER = "power";
Expand Down
2 changes: 1 addition & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ declare const BOOSTS: {
};
};

declare const INTERSHARD_RESOURCES: [SUBSCRIPTION_TOKEN, CPU_UNLOCK, PIXEL, ACCESS_KEY];
declare const INTERSHARD_RESOURCES: InterShardResourceConstant[];

declare const COMMODITIES: Record<
CommodityConstant | MineralConstant | RESOURCE_GHODIUM | RESOURCE_ENERGY,
Expand Down
3 changes: 2 additions & 1 deletion src/literals.ts
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,8 @@ type CommodityConstant =
| RESOURCE_EMANATION
| RESOURCE_ESSENCE;

type MarketResourceConstant = ResourceConstant | SUBSCRIPTION_TOKEN;
type InterShardResourceConstant = SUBSCRIPTION_TOKEN | CPU_UNLOCK | PIXEL | ACCESS_KEY;
type MarketResourceConstant = ResourceConstant | InterShardResourceConstant;

type RESOURCE_ENERGY = "energy";
type RESOURCE_POWER = "power";
Expand Down

0 comments on commit fe48238

Please sign in to comment.