Skip to content

Commit

Permalink
Plugins 🔌
Browse files Browse the repository at this point in the history
  • Loading branch information
Kooshaba committed Mar 5, 2024
1 parent 74fe837 commit 6ba8137
Show file tree
Hide file tree
Showing 93 changed files with 2,797 additions and 1,198 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ Sky Strife is broken into several sub-packages. Here are the packages that are e

## Prerequisites

`node` - Version 18.16.1 or greater
`foundry` - Used to run your local node, run tests, and deploy contracts. [Install](https://github.com/foundry-rs/foundry#installation)

> There is currently an issue with the latest version of Foundry which causes Sky Strife deployment to fail. Please revert back to an old version using this command `foundryup -C 375df5834d0fea8350a4aae9ca34a0dab55d74ac`
## Steps

1. Install latest forge using `foundryup` (see [foundry docs](https://book.getfoundry.sh/getting-started/installation))
Expand Down
1 change: 1 addition & 0 deletions maps/*official/2p-isle.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"templateId":"Mountain","values":{"Position":{"x":-6,"y":-5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-5,"y":-5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-4,"y":-5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-3,"y":-5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-2,"y":-5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-1,"y":-5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":0,"y":-5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":1,"y":-5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":2,"y":-5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":3,"y":-5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":4,"y":-5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":5,"y":-5,"z":0}}},{"templateId":"Mountain","values":{"Position":{"x":6,"y":-5,"z":0}}},{"templateId":"Mountain","values":{"Position":{"x":-7,"y":-4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-6,"y":-4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-5,"y":-4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-4,"y":-4,"z":0}}},{"templateId":"GoldMine","values":{"Position":{"x":-4,"y":-4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-3,"y":-4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-2,"y":-4,"z":0}}},{"templateId":"Forest","values":{"Position":{"x":-1,"y":-4,"z":0}}},{"templateId":"Forest","values":{"Position":{"x":0,"y":-4,"z":0}}},{"templateId":"Forest","values":{"Position":{"x":1,"y":-4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":2,"y":-4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":3,"y":-4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":4,"y":-4,"z":0}}},{"templateId":"GoldMine","values":{"Position":{"x":4,"y":-4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":5,"y":-4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":6,"y":-4,"z":0}}},{"templateId":"Mountain","values":{"Position":{"x":7,"y":-4,"z":0}}},{"templateId":"Mountain","values":{"Position":{"x":-8,"y":-3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-7,"y":-3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-6,"y":-3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-5,"y":-3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-4,"y":-3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-3,"y":-3,"z":0}}},{"templateId":"Mountain","values":{"Position":{"x":-2,"y":-3,"z":0}}},{"templateId":"Mountain","values":{"Position":{"x":2,"y":-3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":3,"y":-3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":4,"y":-3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":5,"y":-3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":6,"y":-3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":7,"y":-3,"z":0}}},{"templateId":"Mountain","values":{"Position":{"x":8,"y":-3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-8,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-7,"y":-2,"z":0}}},{"templateId":"SpawnSettlement","values":{"Position":{"x":-7,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-6,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-5,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-4,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-3,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-2,"y":-2,"z":0}}},{"templateId":"Mountain","values":{"Position":{"x":-1,"y":-2,"z":0}}},{"templateId":"Mountain","values":{"Position":{"x":1,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":2,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":3,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":4,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":5,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":6,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":7,"y":-2,"z":0}}},{"templateId":"SpawnSettlement","values":{"Position":{"x":7,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":8,"y":-2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-8,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-7,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-6,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-5,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-4,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-2,"y":-1,"z":0}}},{"templateId":"Forest","values":{"Position":{"x":-1,"y":-1,"z":0}}},{"templateId":"Forest","values":{"Position":{"x":1,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":2,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":4,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":5,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":6,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":7,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":8,"y":-1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-7,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-6,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-5,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-3,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-2,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-1,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":0,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":1,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":2,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":3,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":5,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":6,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":7,"y":0,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-6,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-5,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-4,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-3,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-2,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-1,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":0,"y":1,"z":0}}},{"templateId":"Settlement","values":{"Position":{"x":0,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":1,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":2,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":3,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":4,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":5,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":6,"y":1,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-5,"y":2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-4,"y":2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-3,"y":2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-2,"y":2,"z":0}}},{"templateId":"Forest","values":{"Position":{"x":-1,"y":2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":0,"y":2,"z":0}}},{"templateId":"Forest","values":{"Position":{"x":1,"y":2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":2,"y":2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":3,"y":2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":4,"y":2,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":5,"y":2,"z":0}}},{"templateId":"Mountain","values":{"Position":{"x":-2,"y":3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-1,"y":3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":0,"y":3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":1,"y":3,"z":0}}},{"templateId":"Mountain","values":{"Position":{"x":2,"y":3,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-1,"y":4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":0,"y":4,"z":0}}},{"templateId":"GoldMine","values":{"Position":{"x":0,"y":4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":1,"y":4,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":-1,"y":5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":0,"y":5,"z":0}}},{"templateId":"Grass","values":{"Position":{"x":1,"y":5,"z":0}}}]
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion maps/2p-isle.json

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions maps/gm-island.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@
"mud:up": "pnpm recursive exec mud set-version -v canary && pnpm install",
"mud:link": "pnpm recursive exec mud set-version -l ../../../mud && pnpm install",
"---": "---",
"dev": "pnpm --filter ecs-browser run build && pnpm --filter phaserx run build && run-pty % % pnpm run dev:client % pnpm run dev:contracts % pnpm run dev:upload-map % pnpm run dev:copy-maps % pnpm run dev:create-debug-matches",
"dev": "pnpm --filter ecs-browser run build && pnpm --filter phaserx run build && run-pty % % pnpm run dev:client % pnpm run dev:contracts % pnpm run dev:upload-map % pnpm run dev:copy-maps % pnpm run dev:create-debug-matches % pnpm run dev:plugins",
"dev:client": "pnpm --filter client run dev",
"dev:contracts": "DEBUG=mud:* pnpm --filter contracts run dev",
"dev:upload-map": "wait-port localhost:8545 && sleep 70 && pnpm --filter headless-client run upload-map:dev",
"dev:copy-maps": "wait-port localhost:8545 && sleep 80 && pnpm --filter headless-client run copy-maps:dev",
"dev:create-debug-matches": "wait-port localhost:8545 && pnpm --filter headless-client run create-debug-matches:dev"
"dev:create-debug-matches": "wait-port localhost:8545 && pnpm --filter headless-client run create-debug-matches:dev",
"dev:plugins": "pnpm --filter plugins run dev"
},
"devDependencies": {
"@latticexyz/cli": "2.0.0-main-5ab67e33",
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics-worker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"scripts": {
"prepare-local-db": "pnpm wrangler d1 execute --local --file=./schema.sql player-transactions",
"prepare-local-db": "pnpm wrangler d1 execute --local --file=./player-transactions-schema.sql player-transactions",
"dev": "pnpm prepare-local-db && wrangler dev src/index.ts",
"deploy-worker": "pnpm wrangler deploy --config=./wrangler.toml src/index.ts"
},
Expand Down
8 changes: 6 additions & 2 deletions packages/analytics-worker/player-transactions-schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ CREATE TABLE IF NOT EXISTS player_transactions_31337
world_address TEXT,
player_address TEXT,
match_entity TEXT,
session_wallet_address TEXT
session_wallet_address TEXT,
action_id TEXT,
client_submitted_timestamp INTEGER
);

DROP TABLE IF EXISTS player_transactions_17001;
Expand All @@ -41,5 +43,7 @@ CREATE TABLE IF NOT EXISTS player_transactions_17001
world_address TEXT,
player_address TEXT,
match_entity TEXT,
session_wallet_address TEXT
session_wallet_address TEXT,
action_id TEXT,
client_submitted_timestamp INTEGER
);
Loading

0 comments on commit 6ba8137

Please sign in to comment.