Skip to content

Bulk Silver Withdraw #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
cha0sg0d wants to merge 10 commits into
base: devcon
Choose a base branch
from
Draft

Bulk Silver Withdraw #43

cha0sg0d wants to merge 10 commits into from

Conversation

@cha0sg0d
Copy link

@cha0sg0d cha0sg0d commented Oct 5, 2022 •
edited
Loading

Features:

  • Withdraw Silver from Asteroid
  • Bulk Withdraw Silver from Multiple Asteroids
  • client: Bulk Withdraw function
  • Need to get player score for bulkPlayerIds too.
  • Extract All Button should call `

cha0sg0d
cha0sg0d commented Oct 5, 2022
View reviewed changes
client/src/Frontend/Views/SendResources.tsx
<StyledShowPercent>
<span>{value}%</span>
<span>
{/* <span>{value}%</span> */}
Copy link
Author

@cha0sg0d cha0sg0d Oct 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{/* <span>{value}%</span> */}

cha0sg0d
cha0sg0d commented Oct 6, 2022
View reviewed changes
client/src/Backend/GameLogic/GameManager.ts
throw new Error('game has ended');
}
const planet = this.entityStore.getPlanetWithId(locationId);
console.log(`basic withdraw planet`, planet);
Copy link
Author

@cha0sg0d cha0sg0d Oct 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
console.log(`basic withdraw planet`, planet);

cha0sg0d
cha0sg0d commented Oct 6, 2022
View reviewed changes
client/src/Backend/GameLogic/GameManager.ts
locationIds: planets.map((p) => p.locationId),
};

console.log(`clean args`, Promise.resolve([[...ids]]));
Copy link
Author

@cha0sg0d cha0sg0d Oct 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
console.log(`clean args`, Promise.resolve([[...ids]]));

cha0sg0d
cha0sg0d commented Oct 6, 2022
View reviewed changes
client/src/Frontend/Panes/PlanetContextPane.tsx

let upgradeRow = null;
if (!p?.destroyed && owned) {
if (!p?.destroyed && owned && p?.planetType == PlanetType.PLANET) {
Copy link
Author

@cha0sg0d cha0sg0d Oct 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (!p?.destroyed && owned && p?.planetType == PlanetType.PLANET) {
if (!p?.destroyed && owned && p?.planetType === PlanetType.PLANET) {

cha0sg0d
cha0sg0d commented Oct 6, 2022
View reviewed changes
cha0sg0d
cha0sg0d commented Oct 6, 2022
View reviewed changes
eth/test/DFSilver.ts
await conquerUnownedPlanet(world, world.user1Core, SPAWN_PLANET_1, LVL1_ASTEROID_NEBULA);
await conquerUnownedPlanet(world, world.user1Core, SPAWN_PLANET_1, LVL1_ASTEROID_DEEP_SPACE);

// await feedSilverToCap(world, world.user1Core, LVL1_ASTEROID_1, LVL3_SPACETIME_2);
Copy link
Author

@cha0sg0d cha0sg0d Oct 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// await feedSilverToCap(world, world.user1Core, LVL1_ASTEROID_1, LVL3_SPACETIME_2);

cha0sg0d
cha0sg0d commented Oct 6, 2022
View reviewed changes
packages/serde/src/player.ts
claimedShips: rawPlayer.claimedShips,
finalRank: rawPlayer.finalRank.toNumber(),
claimedReward: rawPlayer.claimedReward,
silver: silver,
Copy link
Author

@cha0sg0d cha0sg0d Oct 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Silver is a synthetic field on the Player type in client, maybe we should change that

cha0sg0d
cha0sg0d commented Oct 6, 2022
View reviewed changes
packages/types/src/player.ts
lastClaimTimestamp: number;
score: number;

silver: number;
Copy link
Author

@cha0sg0d cha0sg0d Oct 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should silver be added on client but not contracts as a property of player?

cha0sg0d
cha0sg0d commented Oct 6, 2022
View reviewed changes
client/src/Frontend/Views/SendResources.tsx
disabled={planet.isHomePlanet || disabled}
>
{/* <TooltipTrigger name={TooltipName.Abandon}> */}
{extracting ? 'Extracting' : `Extract all (${Math.floor(silver)}) silver`}
Copy link
Author

@cha0sg0d cha0sg0d Oct 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{extracting ? 'Extracting' : `Extract all (${Math.floor(silver)}) silver`}
{extracting ? 'Extracting' : `Extract (${Math.floor(silver)}) silver`}

I think we should change this so Extract All can refer to extracting silver from multiple planets.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@cha0sg0d