gotchi-battler-game-logic 2.0.7 → 3.0.0

package/.vscode/settings.json

@@ -1,5 +1,5 @@
-{
-    "files.exclude": {
-        "**/.git": false
-    }
+{
+    "files.exclude": {
+        "**/.git": false
+    }
 }

package/Dockerfile

@@ -1,10 +1,10 @@
-FROM node:18
-
-WORKDIR /usr/src/app
-
-COPY package*.json ./
-RUN npm i
-
-COPY . .
-
+FROM node:18-alpine
+
+WORKDIR /usr/src/app
+
+COPY package*.json ./
+RUN npm i
+
+COPY . .
+
 CMD ["node", "scripts/balancing/sims.js"]

package/README.md

@@ -1,50 +1,50 @@
-# Galaxy Brain Studios - Gotchi Battler Game Logic
-
-This npm module contains the game logic for the Gotchi Battler game developed by Galaxy Brain Studios.
-
-## Installation
-
-To install the module, run the following command:
-
-```
-npm install gotchi-battler-game-logic
-```
-
-## Usage
-
-To use the module in your project, import it as follows:
-
-```javascript
-const { battle } = require('gotchi-battler-game-logic')
-
-// team1 and team2 an in-game team objects (see below)
-// seed is a random seed for the game
-const result = battle(team1, team2, seed)
-```
-The schema for the in-game team object can be found in `/schemas/team.json`
-
-Examples of the in-game team object can be found in `/scripts/data/team1.json` and `/scripts/data/team2.json`
-
-## Development
-
-### Validate Tournament
-
-The validate tournament script does the following:
-- Fetches the data of a tournament from the Gotchi Battler website
-- Loops through all the battles in the tournament, bracket by bracket, round by round
-- For each battle, the logs are fetched from the Gotchi Battler website
-- The battle is then simulated using the game logic
-- The result of the simulation is compared to the actual result of the battle
-
-To validate the battles from the RF8 100K Tournament, run the following command:
-
-```bash
-node scripts/validateTournament.js 15
-```
-
-Get the tournament id from the URL of the tournament page on the Gotchi Battler website.
-
-
-PLEASE NOTE:
-- Currently, only the tournaments from Rarity Farming season 8 are supported (Tournament IDs 13-15)
+# Galaxy Brain Studios - Gotchi Battler Game Logic
+
+This npm module contains the game logic for the Gotchi Battler game developed by Galaxy Brain Studios.
+
+## Installation
+
+To install the module, run the following command:
+
+```
+npm install gotchi-battler-game-logic
+```
+
+## Usage
+
+To use the module in your project, import it as follows:
+
+```javascript
+const { battle } = require('gotchi-battler-game-logic')
+
+// team1 and team2 an in-game team objects (see below)
+// seed is a random seed for the game
+const result = battle(team1, team2, seed)
+```
+The schema for the in-game team object can be found in `/schemas/team.json`
+
+Examples of the in-game team object can be found in `/scripts/data/team1.json` and `/scripts/data/team2.json`
+
+## Development
+
+### Validate Tournament
+
+The validate tournament script does the following:
+- Fetches the data of a tournament from the Gotchi Battler website
+- Loops through all the battles in the tournament, bracket by bracket, round by round
+- For each battle, the logs are fetched from the Gotchi Battler website
+- The battle is then simulated locally using the game logic
+- The result of this simulation is then compared to the logs from the Gotchi Battler website
+
+To validate the battles from the RF8 100K Tournament, run the following command:
+
+```bash
+node scripts/validateTournament.js 15
+```
+
+Get the tournament id from the URL of the tournament page on the Gotchi Battler website.
+
+
+PLEASE NOTE:
+- Currently, only the tournaments from Rarity Farming season 8 and 9 are supported (Tournament IDs 13-15 + 18)
 - The script can take a while to run, in local testing it took around 20 minutes

package/cloudbuild.yaml

@@ -1,27 +1,27 @@
-steps:
-  - name: gcr.io/cloud-builders/docker
-    args:
-      - build
-      - '--no-cache'
-      - '-t'
-      - $_AR_HOSTNAME/$PROJECT_ID/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA
-      - '-t'
-      - $_AR_HOSTNAME/$PROJECT_ID/$REPO_NAME/$_SERVICE_NAME:latest
-      - .
-      - '-f'
-      - Dockerfile
-    id: Build
-  - name: gcr.io/cloud-builders/docker
-    args:
-      - push
-      - '$_AR_HOSTNAME/$PROJECT_ID/$REPO_NAME/$_SERVICE_NAME'
-      - '--all-tags'
-    id: Push
-images:
-  - $_AR_HOSTNAME/$PROJECT_ID/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA
-options:
-  substitutionOption: ALLOW_LOOSE
-  logging: CLOUD_LOGGING_ONLY
-substitutions:
-  _AR_HOSTNAME: europe-west1-docker.pkg.dev
-  _SERVICE_NAME: gotchi-battler-game-logic
+steps:
+  - name: gcr.io/cloud-builders/docker
+    args:
+      - build
+      - '--no-cache'
+      - '-t'
+      - $_AR_HOSTNAME/$PROJECT_ID/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA
+      - '-t'
+      - $_AR_HOSTNAME/$PROJECT_ID/$REPO_NAME/$_SERVICE_NAME:latest
+      - .
+      - '-f'
+      - Dockerfile
+    id: Build
+  - name: gcr.io/cloud-builders/docker
+    args:
+      - push
+      - '$_AR_HOSTNAME/$PROJECT_ID/$REPO_NAME/$_SERVICE_NAME'
+      - '--all-tags'
+    id: Push
+images:
+  - $_AR_HOSTNAME/$PROJECT_ID/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA
+options:
+  substitutionOption: ALLOW_LOOSE
+  logging: CLOUD_LOGGING_ONLY
+substitutions:
+  _AR_HOSTNAME: europe-west1-docker.pkg.dev
+  _SERVICE_NAME: gotchi-battler-game-logic

package/constants/tournamentManagerAbi.json

@@ -1,209 +1,209 @@
-[
-    {
-        "inputs": [
-            {
-                "internalType": "uint64",
-                "name": "subscriptionId",
-                "type": "uint64"
-            },
-            {
-                "internalType": "address",
-                "name": "vrfCoordinator",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "link",
-                "type": "address"
-            },
-            {
-                "internalType": "bytes32",
-                "name": "keyHash",
-                "type": "bytes32"
-            },
-            {
-                "internalType": "address",
-                "name": "feeTokenAddress",
-                "type": "address"
-            }
-        ],
-        "stateMutability": "nonpayable",
-        "type": "constructor"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "have",
-                "type": "address"
-            },
-            {
-                "internalType": "address",
-                "name": "want",
-                "type": "address"
-            }
-        ],
-        "name": "OnlyCoordinatorCanFulfill",
-        "type": "error"
-    },
-    {
-        "anonymous": false,
-        "inputs": [
-            {
-                "indexed": false,
-                "internalType": "uint32",
-                "name": "roundNumber",
-                "type": "uint32"
-            },
-            {
-                "indexed": false,
-                "internalType": "uint256",
-                "name": "randomWords",
-                "type": "uint256"
-            }
-        ],
-        "name": "ReturnedRoundRandomness",
-        "type": "event"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "uint32",
-                "name": "askedRound",
-                "type": "uint32"
-            }
-        ],
-        "name": "askRoundSeed",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "contractOwner",
-        "outputs": [
-            {
-                "internalType": "address",
-                "name": "",
-                "type": "address"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "invalidateTournament",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "uint32",
-                "name": "",
-                "type": "uint32"
-            }
-        ],
-        "name": "isRoundSeedRequested",
-        "outputs": [
-            {
-                "internalType": "bool",
-                "name": "",
-                "type": "bool"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "isValid",
-        "outputs": [
-            {
-                "internalType": "bool",
-                "name": "",
-                "type": "bool"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "uint256",
-                "name": "requestId",
-                "type": "uint256"
-            },
-            {
-                "internalType": "uint256[]",
-                "name": "randomWords",
-                "type": "uint256[]"
-            }
-        ],
-        "name": "rawFulfillRandomWords",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "roundNumber",
-        "outputs": [
-            {
-                "internalType": "uint32",
-                "name": "",
-                "type": "uint32"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "uint32",
-                "name": "",
-                "type": "uint32"
-            }
-        ],
-        "name": "roundSeeds",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [],
-        "name": "s_requestId",
-        "outputs": [
-            {
-                "internalType": "uint256",
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "internalType": "address",
-                "name": "_owner",
-                "type": "address"
-            }
-        ],
-        "name": "setOwner",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    }
+[
+    {
+        "inputs": [
+            {
+                "internalType": "uint64",
+                "name": "subscriptionId",
+                "type": "uint64"
+            },
+            {
+                "internalType": "address",
+                "name": "vrfCoordinator",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "link",
+                "type": "address"
+            },
+            {
+                "internalType": "bytes32",
+                "name": "keyHash",
+                "type": "bytes32"
+            },
+            {
+                "internalType": "address",
+                "name": "feeTokenAddress",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "nonpayable",
+        "type": "constructor"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "have",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "want",
+                "type": "address"
+            }
+        ],
+        "name": "OnlyCoordinatorCanFulfill",
+        "type": "error"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": false,
+                "internalType": "uint32",
+                "name": "roundNumber",
+                "type": "uint32"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "randomWords",
+                "type": "uint256"
+            }
+        ],
+        "name": "ReturnedRoundRandomness",
+        "type": "event"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint32",
+                "name": "askedRound",
+                "type": "uint32"
+            }
+        ],
+        "name": "askRoundSeed",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "contractOwner",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "invalidateTournament",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint32",
+                "name": "",
+                "type": "uint32"
+            }
+        ],
+        "name": "isRoundSeedRequested",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "isValid",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "requestId",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint256[]",
+                "name": "randomWords",
+                "type": "uint256[]"
+            }
+        ],
+        "name": "rawFulfillRandomWords",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "roundNumber",
+        "outputs": [
+            {
+                "internalType": "uint32",
+                "name": "",
+                "type": "uint32"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint32",
+                "name": "",
+                "type": "uint32"
+            }
+        ],
+        "name": "roundSeeds",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "s_requestId",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "_owner",
+                "type": "address"
+            }
+        ],
+        "name": "setOwner",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }
 ]

package/game-logic/index.js

@@ -1,7 +1,8 @@
-module.exports = {
-    'v1.4': require('./v1.4'),
-    'v1.5': require('./v1.5'),
-    'v1.6': require('./v1.6'),
-    'v1.7': require('./v1.7'),
-    current: 'v1.7'
+module.exports = {
+    'v1.4': require('./v1.4'),
+    'v1.5': require('./v1.5'),
+    'v1.6': require('./v1.6'),
+    'v1.7': require('./v1.7'),
+    'v1.8': require('./v1.8'),
+    current: 'v1.8'
 }