working

RuneLabsxyz · Nov 14, 2024 · e00819f · e00819f
1 parent 9688419
commit e00819f
Show file tree

Hide file tree

Showing 352 changed files with 70,093 additions and 7,441 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/deploy-mainnet.yaml b/.github/workflows/deploy-mainnet.yaml
@@ -10,9 +10,9 @@ name: Deploy to slot
 
 on:
   push:
-    branches:
-      - "1on1-mainnet"
-      - "deployment-mainnet"
+    branches: 
+      - '1on1-mainnet'
+      - 'deployment-mainnet'
 
 permissions:
   contents: read
@@ -28,7 +28,7 @@ jobs:
       - id: setup-dojo
         uses: runelabsxyz/setup-dojo@main
         with:
-          version: "v1.0.0"
+          version: 'v1.0.0-alpha.16'
 
       - uses: oven-sh/setup-bun@v2
         with:
@@ -37,21 +37,22 @@ jobs:
       - name: Install dependencies
         working-directory: ./client
         run: bun install --frozen-lockfile
-
+      
       - name: Build frontend for slot
         run: bun run build
         working-directory: ./client
         env:
           ENV: mainnet
           # Force the auto bundler to prepare for cloudflare (otherwise it does weird things)
-          CF_PAGES: "1"
+          CF_PAGES: '1'
           # For now, isok, but getting an official file at some point would be nice:
           PUBLIC_TORII_URL: https://api.cartridge.gg/x/octoguns-mn-alpha-1/torii
           PUBLIC_RPC_URL: https://api.cartridge.gg/x/starknet/mainnet
-          PUBLIC_WORLD_ADDRESS: "0x7447477a7c852c946f0b8d13ebdfe0db9e78f3de60ab799320691502b4d32a3"
+          PUBLIC_WORLD_ADDRESS: '0x7447477a7c852c946f0b8d13ebdfe0db9e78f3de60ab799320691502b4d32a3'
 
       - name: Deploy to cloudflare pages
         working-directory: ./client
-        run: bun wrangler pages deploy
+        run: bun wrangler pages deploy 
         env:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+
diff --git a/.github/workflows/deploy-slot.yaml b/.github/workflows/deploy-slot.yaml
@@ -10,9 +10,9 @@ name: Deploy to slot
 
 on:
   push:
-    branches:
-      - "main"
-      - "deployment"
+    branches: 
+      - 'main'
+      - 'deployment'
 
 permissions:
   contents: read
@@ -28,7 +28,7 @@ jobs:
       - id: setup-dojo
         uses: runelabsxyz/setup-dojo@main
         with:
-          version: "v1.0.0"
+          version: 'v1.0.0-alpha.16'
 
       - uses: oven-sh/setup-bun@v2
         with:
@@ -42,25 +42,25 @@ jobs:
         working-directory: ./contracts
         run: sozo test -P slot
         if: false # Set this to true when we finally have working tests
-
+      
       - name: Deploy contract
         working-directory: ./contracts
         run: sozo migrate apply -P slot
-        env:
+        env: 
           DOJO_ACCOUNT_ADDRESS: ${{ secrets.DOJO_ACCOUNT_ADDRESS }}
           DOJO_PRIVATE_KEY: ${{ secrets.DOJO_PRIVATE_KEY }}
 
       - name: Install dependencies
         working-directory: ./client
         run: bun install --frozen-lockfile
-
+      
       - name: Build frontend for slot
         run: bun run build
         working-directory: ./client
         env:
           ENV: slot
           # Force the auto bundler to prepare for cloudflare (otherwise it does weird things)
-          CF_PAGES: "1"
+          CF_PAGES: '1'
           # For now, isok, but getting an official file at some point would be nice:
           PUBLIC_TORII_URL: https://api.cartridge.gg/x/octoguns-public-alpha1/torii
           PUBLIC_RPC_URL: https://api.cartridge.gg/x/octoguns-public-alpha1/katana
@@ -70,6 +70,7 @@ jobs:
 
       - name: Deploy to cloudflare pages
         working-directory: ./client
-        run: bun wrangler pages deploy
+        run: bun wrangler pages deploy 
         env:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-dojo 1.0.0
-scarb 2.8.4
+dojo 1.0.0-alpha.16
+scarb 2.7.0
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ OctoGuns is a fully on-chain 1v1 strategy FPS where players control 8 characters
 
 ### Versions
 
-- Dojo: 1.0.0
+- Dojo: 1.0.0-alpha9
 - Node: 20
 - Cairo: 2.7.0
 
@@ -47,7 +47,8 @@ OctoGuns is a fully on-chain 1v1 strategy FPS where players control 8 characters
 - Customizable, no-code maps
 - User-generated content support
 
+
 ## Data
 
 - world address: 0x7447477a7c852c946f0b8d13ebdfe0db9e78f3de60ab799320691502b4d32a3
-- contract address: 0x1650b45b82ed70796c56e3bc19bff48ac4ccf7152a2f76bfd36981a99672e9
+- contract address: 0x1650b45b82ed70796c56e3bc19bff48ac4ccf7152a2f76bfd36981a99672e9
diff --git a/client/bun.lockb b/client/bun.lockb
diff --git a/client/package.json b/client/package.json
@@ -11,39 +11,40 @@
     "format": "prettier --write ."
   },
   "devDependencies": {
-    "@sveltejs/adapter-auto": "^3.3.1",
-    "@sveltejs/adapter-cloudflare": "^4.7.4",
-    "@sveltejs/kit": "^2.8.0",
-    "@sveltejs/vite-plugin-svelte": "^4.0.0",
+    "@sveltejs/adapter-auto": "^3.2.4",
+    "@sveltejs/adapter-cloudflare": "^4.7.2",
+    "@sveltejs/kit": "^2.5.25",
+    "@sveltejs/vite-plugin-svelte": "^3.1.2",
     "@types/three": "^0.168.0",
     "autoprefixer": "^10.4.20",
     "dotenv": "^16.4.5",
-    "postcss": "^8.4.47",
-    "svelte": "^5.1.13",
-    "svelte-check": "^4.0.6",
-    "tailwindcss": "^3.4.14",
-    "typescript": "^5.6.3",
-    "vite": "^5.4.10",
-    "wrangler": "^3.86.0"
+    "postcss": "^8.4.43",
+    "svelte": "^4.2.19",
+    "svelte-check": "^3.8.6",
+    "tailwindcss": "^3.4.10",
+    "typescript": "^5.5.4",
+    "vite": "^5.4.2",
+    "wrangler": "^3.79.0"
   },
   "type": "module",
   "dependencies": {
     "@cartridge/controller": "^0.3.46",
-    "@dojoengine/core": "^1.0.0-alpha.30",
-    "@dojoengine/create-burner": "^1.0.0-alpha.30",
+    "@dojoengine/core": "^1.0.0-alpha.29",
+    "@dojoengine/create-burner": "^1.0.0-alpha.29",
     "@dojoengine/recs": "^2.0.13",
-    "@dojoengine/state": "^1.0.0-alpha.30",
-    "@dojoengine/torii-client": "^1.0.0-alpha.30",
-    "@dojoengine/torii-wasm": "^1.0.0-alpha.30",
-    "@dojoengine/utils": "^1.0.0-alpha.30",
-    "@threlte/core": "^8.0.0-next.30",
-    "@threlte/extras": "^9.0.0-next.39",
+    "@dojoengine/state": "^1.0.0-alpha.29",
+    "@dojoengine/torii-client": "^1.0.0-alpha.29",
+    "@dojoengine/torii-wasm": "^1.0.0-alpha.29",
+    "@dojoengine/utils": "^1.0.0-alpha.29",
+    "@latticexyz/utils": "^2.2.0",
+    "@threlte/core": "^7.3.1",
+    "@threlte/extras": "^8.11.5",
     "clsx": "^2.1.1",
     "lucide-svelte": "^0.445.0",
     "prettier": "^3.3.3",
-    "prettier-plugin-svelte": "^3.2.7",
+    "prettier-plugin-svelte": "^3.2.6",
     "starknet": "^6.11.0",
-    "tailwind-merge": "^2.5.4",
+    "tailwind-merge": "^2.5.2",
     "three": "^0.168.0",
     "three-inspect": "^0.7.2",
     "vite-plugin-mkcert": "^1.17.6",