More 1155 changes #33
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cha0sg0d
merged commit 0be4b38
into
cha0s/dfd-216-use-erc1155-standard-for-spaceships-and
0xhank
pushed a commit
that referenced
this pull request
Oct 5, 2022
* test file * feat: load SolidStateERC1155 * temp: noodling around * test: working mint and uri tests * chore: comment * feat: sample bit pack * feat: not working artifact refactor * temp: working artifact activate and deactivate * test: some test starting to work: * feat: all artifact tests passing (no photoid or planetary shield) * move tests work almost but need to totally redo spaceships * feat: spaceships work * feat: all tests pass + photoid. Need crescent and planetary shield then clean up then clinet * failing test :( * feat: crescent test * feat: shield test passes * fix: clean up tests a bit * feat: prevent spaceship transfer * feat: bye bye DFToken * feat: Readme * clean * the nice nice cleanup * clean * clean * remove more data structures * feat: give artifacts unique ids for getter purposes * feat: encode / decode works, need to thread through * rename collection type * feat: tests pass with spaceships as separate entities * spaceship type * fix: photoid test * update types and readme * chore: move functions that can be internal into LibArtifact and LibSpaceship * Apply tweaks from code reivew Co-authored-by: Blaine Bublitz <blaine.bublitz@gmail.com> * More tweaks Co-authored-by: Blaine Bublitz <blaine.bublitz@gmail.com> * fix: return when found in getter * README tweaks Co-authored-by: Blaine Bublitz <blaine.bublitz@gmail.com> * feat: explain chunk properties in README * fix: ordering of args for artifact events * fix: split up getActiveArtifact into two checks * fix: remove @solidstate/spec * feat: create for Spaceship and Artifact * feat: simply business logic bc of asserts in token create * Store artifact information on contract planets (#28) * Store artifact information on each planet * Remove artifact task, as it does not make sense anymore * Comment out debug tasks until we have token APIs settled * Add ID logging to the prettyPrintToken util * fix: add extra timeout Co-authored-by: cha0sg0d <0xcha0sg0d@gmail.com> * More 1155 changes (#33) * contracts: Separate carried spaceship from carried artifact * contracts: Actually call the beforeTokenTransfer super call * Cha0s/erc1155 ctd (#34) * feat: working DFTokenFacet * add phated changes + new facet * feat: get players aritfacts and ships + tests. and refactor lol * remove unused modifier * remove silver token * fix: spaceship found event Co-authored-by: Blaine Bublitz <blaine.bublitz@gmail.com> * fix: bye bye spaceship zero moves (#35) * feat: ERC1155 clientside changes (#27) * client artifacts hacked to pieces * client: Implement ArtifactInfo and fix artifact decoding * client: Implement spaceship types and serde * client: Re-enable spaceships in arrival utils * client: Removing artifact map stuff * client: Re-enable hasGear check * client: Split spaceships from Artifacts in renderer * client: Render spaceships around planet * client: Add spaceship filename util * client: Split artifactImage and spaceshipImage * client: Fix mine artifact button without any ships * client: Remove some comment spaceship code * client: Remove canActivateArtifact because cooldowns were deleted * chore: Format code * client: Implement fetching wallet artifacts * client: Implement an initial spaceship download * client: Cache the artifacts & spaceships in player wallet * get the stupid fucking code out of the types package * client: Remove unused and unneeded function * client: cleanup share * client: Working to remove isSpaceShip throughout * client: Fix spaceship decoder * client: tokenType cleanup * client: More light cleanup * client: Split ArtifactsList & SpaceshipsList * client: Remove empty message from ArtifactsList * client: Allow sending spaceships via a SpaceshipRowg * client: Fix sending a spaceship * client: Cleanup ArtifactRow * client: Remove location from headers * client: Death to isSpaceShip * client: Fix some artifactId conversion logic * client: Begin getting ArtifactDetails working again * client: Fix wormhole rendering * client: Re-enable ArtifactDetailsPane & fetch artifact upgrades * client: Stop lying * client: Spaceship details & hover * client: Force vite to rebuild deps * client: Fix another ethers decoding problem * client: Remove spaceship code from ArtifactDetailsPane * client: More cleanup in ArtifactDetailsPane * client: Sync artifact inventory & fix some artifact action state * client: Put artifact & spaceship images in the PlanetDex * client: Note the shitty hover component * Update packages/procedural/src/ArtifactProcgen.ts * chore: Format code Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix: listen for SpaceshipFound event * contracts: fix tests * contracts: fix subgraph codegen and remove console.log Co-authored-by: Blaine Bublitz <blaine.bublitz@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
0xhank
pushed a commit
that referenced
this pull request
Oct 5, 2022
* contracts: Separate carried spaceship from carried artifact * contracts: Actually call the beforeTokenTransfer super call
cha0sg0d
added a commit
that referenced
this pull request
Oct 5, 2022
* test file * feat: load SolidStateERC1155 * temp: noodling around * test: working mint and uri tests * chore: comment * feat: sample bit pack * feat: not working artifact refactor * temp: working artifact activate and deactivate * test: some test starting to work: * feat: all artifact tests passing (no photoid or planetary shield) * move tests work almost but need to totally redo spaceships * feat: spaceships work * feat: all tests pass + photoid. Need crescent and planetary shield then clean up then clinet * failing test :( * feat: crescent test * feat: shield test passes * fix: clean up tests a bit * feat: prevent spaceship transfer * feat: bye bye DFToken * feat: Readme * remove more data structures * feat: give artifacts unique ids for getter purposes * feat: encode / decode works, need to thread through * rename collection type * feat: tests pass with spaceships as separate entities * spaceship type * fix: photoid test * update types and readme * chore: move functions that can be internal into LibArtifact and LibSpaceship * fix: return when found in getter * README tweaks * feat: explain chunk properties in README * fix: ordering of args for artifact events * fix: split up getActiveArtifact into two checks * fix: remove @solidstate/spec * feat: create for Spaceship and Artifact * feat: simply business logic bc of asserts in token create * Store artifact information on contract planets (#28) * Store artifact information on each planet * Remove artifact task, as it does not make sense anymore * Comment out debug tasks until we have token APIs settled * Add ID logging to the prettyPrintToken util * fix: add extra timeout * More 1155 changes (#33) * contracts: Separate carried spaceship from carried artifact * contracts: Actually call the beforeTokenTransfer super call * Cha0s/erc1155 ctd (#34) * feat: working DFTokenFacet * add phated changes + new facet * feat: get players aritfacts and ships + tests. and refactor lol * remove unused modifier * remove silver token * fix: spaceship found event * fix: bye bye spaceship zero moves (#35) * feat: ERC1155 clientside changes (#27) * client artifacts hacked to pieces * client: Implement ArtifactInfo and fix artifact decoding * client: Implement spaceship types and serde * client: Re-enable spaceships in arrival utils * client: Removing artifact map stuff * client: Re-enable hasGear check * client: Split spaceships from Artifacts in renderer * client: Render spaceships around planet * client: Add spaceship filename util * client: Split artifactImage and spaceshipImage * client: Fix mine artifact button without any ships * client: Remove some comment spaceship code * client: Remove canActivateArtifact because cooldowns were deleted * chore: Format code * client: Implement fetching wallet artifacts * client: Implement an initial spaceship download * client: Cache the artifacts & spaceships in player wallet * get the stupid fucking code out of the types package * client: Remove unused and unneeded function * client: cleanup share * client: Working to remove isSpaceShip throughout * client: Fix spaceship decoder * client: tokenType cleanup * client: More light cleanup * client: Split ArtifactsList & SpaceshipsList * client: Remove empty message from ArtifactsList * client: Allow sending spaceships via a SpaceshipRowg * client: Fix sending a spaceship * client: Cleanup ArtifactRow * client: Remove location from headers * client: Death to isSpaceShip * client: Fix some artifactId conversion logic * client: Begin getting ArtifactDetails working again * client: Fix wormhole rendering * client: Re-enable ArtifactDetailsPane & fetch artifact upgrades * client: Stop lying * client: Spaceship details & hover * client: Force vite to rebuild deps * client: Fix another ethers decoding problem * client: Remove spaceship code from ArtifactDetailsPane * client: More cleanup in ArtifactDetailsPane * client: Sync artifact inventory & fix some artifact action state * client: Put artifact & spaceship images in the PlanetDex * client: Note the shitty hover component * Update packages/procedural/src/ArtifactProcgen.ts * chore: Format code * fix: listen for SpaceshipFound event * contracts: fix tests * contracts: fix subgraph codegen and remove console.log Co-authored-by: Blaine Bublitz <blaine.bublitz@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes some more 1155 changes