feat: Add Stellar Crown (#533)

Co-authored-by: Felipe Contreras Salinas <felipe@bstr.cl>

.all-contributorsrc

@@ -61,6 +61,15 @@
       "contributions": [
         "data"
       ]
+    },
+    {
+      "login": "Reloadaxe",
+      "name": "Benjamin Rousseliere",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44167126?v=4",
+      "profile": "https://github.com/Reloadaxe",
+      "contributions": [
+        "data"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.bruno/cards/advanced-query.bru

@@ -0,0 +1,25 @@
+meta {
+  name: Advanced Query
+  type: http
+  seq: 1
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/cards?name=eq:Pikachu&hp=gte:60&hp=lt:70&localId=5&localId=not:tg&id=neq:cel25-5
+  body: none
+  auth: none
+}
+
+params:query {
+  name: eq:Pikachu
+  hp: gte:60
+  hp: lt:70
+  localId: 5
+  localId: not:tg
+  id: neq:cel25-5
+}
+
+assert {
+  res.status: eq 200
+  res.body: length 14
+}

.bruno/environments/Developpement.bru

@@ -1,3 +1,3 @@
 vars {
-  BASE_URL: http://localhost:3000
+  BASE_URL: http://127.0.0.1:3000
 }

.bruno/sets/Advanced Query.bru

@@ -0,0 +1,21 @@
+meta {
+  name: Advanced Query
+  type: http
+  seq: 4
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/sets?cardCount.official=gt:64&id=swsh
+  body: none
+  auth: none
+}
+
+params:query {
+  cardCount.official:gt: 64
+  id: swsh
+}
+
+assert {
+  res.status: eq 200
+  res.body: length 17
+}

.bruno/sets/Get a card by set name.bru

@@ -0,0 +1,16 @@
+meta {
+  name: Get a card by set name
+  type: http
+  seq: 6
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/sets/Crystal%20Guardians/10
+  body: none
+  auth: none
+}
+
+assert {
+  res.status: eq 200
+  res.body.id: eq ex14-10
+}

.bruno/sets/Get a set by name.bru

@@ -0,0 +1,16 @@
+meta {
+  name: Get a set by name
+  type: http
+  seq: 5
+}
+
+get {
+  url: {{BASE_URL}}/v2/en/sets/Crystal%20Guardians
+  body: none
+  auth: none
+}
+
+assert {
+  res.status: eq 200
+  res.body.id: eq ex14
+}

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,5 @@
 <!--
 Thanks for your Pull Request, Please provide the related Issue using "Fix #0" or describe the change(s) you made.
-The issue title must follow Conventional Commit (verified by Github Actions) conventionalcommits.org.
+The issue title must follow Conventional Commit conventionalcommits.org.
 More informations at https://github.com/tcgdex/cards-database/blob/master/CONTRIBUTING.md
 -->

.github/workflows/build.yml

@@ -40,6 +40,7 @@ jobs:
       with:
         username: ${{ secrets.DOCKERHUB_USER }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
+      if: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
 
     - name: Login to Github Packages
       uses: docker/login-action@v3
@@ -47,15 +48,16 @@ jobs:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.DOCKER_TOKEN }}
+      if: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
     - name: Build and push
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
-        push: true
+        push: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
         file: ./Dockerfile
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}

.github/workflows/test.yml

@@ -17,10 +17,11 @@ jobs:
 
 
     - name: Setup BunJS
-      uses: oven-sh/setup-bun@v1
+      uses: oven-sh/setup-bun@v2
 
     - name: Install deps
       run: |
+        bun install -g @usebruno/cli
         bun install --frozen-lockfile
         cd server
         bun install --frozen-lockfile
@@ -31,3 +32,11 @@ jobs:
         bun run validate
         cd server
         bun run validate
+
+    - name: Validate some requests
+      run: |
+        cd server
+        bun run start &
+        sleep 10
+        cd ../.bruno
+        bru run --env Developpement

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/oven/bun:1-alpine as BUILD_IMAGE
+FROM docker.io/oven/bun:1-alpine AS build
 
 # go to work folder
 WORKDIR /usr/src/app
@@ -28,7 +28,7 @@ rm -rf node_modules && \
 bun install --frozen-install --production
 
 # go to another VM
-FROM docker.io/oven/bun:1-alpine as PROD_IMAGE
+FROM docker.io/oven/bun:1-alpine AS prod
 
 # inform software to be in production
 ENV NODE_ENV=production
@@ -40,11 +40,11 @@ USER bun
 WORKDIR /usr/src/app
 
 # copy from build image
-COPY --chown=bun:bun --from=BUILD_IMAGE /usr/src/app/server/generated ./generated
-COPY --chown=bun:bun --from=BUILD_IMAGE /usr/src/app/server/node_modules ./node_modules
-COPY --chown=bun:bun --from=BUILD_IMAGE /usr/src/app/server/src ./src
-COPY --chown=bun:bun --from=BUILD_IMAGE /usr/src/app/server/public ./public
-COPY --chown=bun:bun --from=BUILD_IMAGE /usr/src/app/server/package.json ./package.json
+COPY --chown=bun:bun --from=build /usr/src/app/server/generated ./generated
+COPY --chown=bun:bun --from=build /usr/src/app/server/node_modules ./node_modules
+COPY --chown=bun:bun --from=build /usr/src/app/server/src ./src
+COPY --chown=bun:bun --from=build /usr/src/app/server/public ./public
+COPY --chown=bun:bun --from=build /usr/src/app/server/package.json ./package.json
 
 # Expose port
 EXPOSE 3000

README.md

@@ -13,11 +13,11 @@
 	<a href="https://github.com/tcgdex/cards-database/stargazers">
 		<img src="https://img.shields.io/github/stars/tcgdex/cards-database?style=flat-square" alt="Github stars">
 	</a>
-	<a href="https://github.com/tcgdex/compiler">
-		<img src="https://img.shields.io/github/workflow/status/tcgdex/cards-database/Compile?style=flat-square" alt="Compiler build passing" />
+	<a href="https://github.com/tcgdex/cards-database/actions">
+		<img src="https://img.shields.io/github/actions/workflow/status/TCGdex/cards-database/build.yml?style=flat-square" alt="Compiler build passing" />
 	</a>
 	<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img src="https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square" alt="All Contributors Badge" /></a>
+<a href="#contributors-"><img src="https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square" alt="All Contributors Badge" /></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>
 
@@ -91,6 +91,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Maxopoly"><img src="https://avatars.githubusercontent.com/u/12138136?v=4?s=100" width="100px;" alt="Maxopoly"/><br /><sub><b>Maxopoly</b></sub></a><br /><a href="#data-Maxopoly" title="Data">🔣</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/calli23"><img src="https://avatars.githubusercontent.com/u/24553863?v=4?s=100" width="100px;" alt="calli23"/><br /><sub><b>calli23</b></sub></a><br /><a href="#data-calli23" title="Data">🔣</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://imclement.com"><img src="https://avatars.githubusercontent.com/u/1112701?v=4?s=100" width="100px;" alt="Clement Yuan"/><br /><sub><b>Clement Yuan</b></sub></a><br /><a href="#data-spyworldxp" title="Data">🔣</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Reloadaxe"><img src="https://avatars.githubusercontent.com/u/44167126?v=4?s=100" width="100px;" alt="Benjamin Rousseliere"/><br /><sub><b>Benjamin Rousseliere</b></sub></a><br /><a href="#data-Reloadaxe" title="Data">🔣</a></td>
     </tr>
   </tbody>
 </table>

data/Base/Base Set 2/4.ts

@@ -63,9 +63,7 @@ const card: Card = {
 			value: "-30"
 		},
 	],
-
-
-
+	retreat: 3,
 
 }
 

data/Base/Base Set/4.ts

@@ -82,6 +82,8 @@ const card: Card = {
 		},
 	],
 
+	retreat: 3,
+
 	description: {
 		fr: "Il peut fondre la roche de son souffle brûlant. Il est souvent la cause de nombreux incendies."
 	}

data/Base/Team Rocket/21.ts

@@ -77,6 +77,8 @@ const card: Card = {
 		},
 	],
 
+	retreat: 3,
+
 	description: {
 		fr: "Comme possédé, il crache du feu tel un volcan, essayant de brûler tout ce qu'il voit."
 	}

data/Base/Team Rocket/4.ts

@@ -77,6 +77,8 @@ const card: Card = {
 		},
 	],
 
+	retreat: 3,
+
 	description: {
 		fr: "Comme possédé, il crache du feu tel un volcan, essayant de brûler tout ce qu'il voit."
 	}

data/Base/Wizards Black Star Promos/1.ts

@@ -55,11 +55,7 @@ const card: Card = {
 			value: "×2"
 		},
 	],
-
-
-
-
-
+	retreat: 1,
 }
 
 export default card

data/Base/Wizards Black Star Promos/24.ts

@@ -49,6 +49,7 @@ const card: Card = {
 			value: "×2"
 		},
 	],
+	retreat: 1,
 
 	description: {
 		fr: "Votre anniversaire : _________________________________________"

data/Base/Wizards Black Star Promos/4.ts

@@ -64,6 +64,7 @@ const card: Card = {
 			value: "×2"
 		},
 	],
+	retreat: 1,
 
 	description: {
 		fr: "Quand plusieurs de ces Pokémon se réunissent, ils attirent tellement d'électricité qu'ils peuvent provoquer des coups de foudre."

data/Black & White/Black & White/115.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Black & White'
 
 const card: Card = {
+	dexId: [25],
 	name: {
 		fr: "Pikachu",
 		en: "Pikachu",

data/E-Card/Best of game/1.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Best of game'
 
 const card: Card = {
+	dexId: [125],
 	set: Set,
 
 	name: {

data/E-Card/Best of game/2.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Best of game'
 
 const card: Card = {
+	dexId: [107],
 	set: Set,
 
 	name: {

data/E-Card/Expedition Base Set/39.ts

@@ -71,10 +71,7 @@ const card: Card = {
 			value: "×2"
 		},
 	],
-
-
-
-
+	retreat: 2,
 
 }
 

data/E-Card/Expedition Base Set/40.ts

@@ -67,10 +67,7 @@ const card: Card = {
 			value: "×2"
 		},
 	],
-
-
-
-
+	retreat: 3,
 
 }
 

data/E-Card/Expedition Base Set/6.ts

@@ -67,10 +67,7 @@ const card: Card = {
 			value: "×2"
 		},
 	],
-
-
-
-
+	retreat: 3,
 
 }
 

data/EX/Crystal Guardians/4.ts

@@ -68,10 +68,7 @@ const card: Card = {
 			value: "×2"
 		},
 	],
-
-
-
-
+	retreat: 2,
 
 }
 

data/EX/Power Keepers/6.ts

@@ -66,10 +66,7 @@ const card: Card = {
 			value: "×2"
 		},
 	],
-
-
-
-
+	retreat: 2,
 
 }
 

data/Gym/Gym Challenge/2.ts

@@ -63,9 +63,7 @@ const card: Card = {
 			value: "-30"
 		},
 	],
-
-
-
+	retreat: 3,
 
 }
 

data/Legendary Collection/Legendary Collection/3.ts

@@ -63,9 +63,7 @@ const card: Card = {
 			value: "-30"
 		},
 	],
-
-
-
+	retreat: 3,
 
 }
 

data/McDonald's Collection/Macdonald's Collection 2014/1.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [13],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2014/10.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [659],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2014/11.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [661],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2014/12.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [676],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2014/2.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [650],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2014/3.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [653],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2014/4.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [656],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2014/5.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [25],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2014/6.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [686],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2014/7.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [679],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2014/8.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [209],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2014/9.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2014'
 
 const card: Card = {
+	dexId: [684],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/1.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [252],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/10.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [183],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/11.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [263],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/12.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [300],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/2.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [270],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/3.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [255],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/4.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [120],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/5.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [258],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/6.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [25],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/7.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [309],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/8.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [111],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2015/9.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2015'
 
 const card: Card = {
+	dexId: [307],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/1.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [722],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/10.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [742],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/11.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [731],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/12.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [734],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/2.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [736],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/3.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [725],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/4.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [728],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/5.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [25],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/6.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [789],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/7.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [739],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/8.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [52],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2017/9.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2017'
 
 const card: Card = {
+	dexId: [50],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/1.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [58],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/10.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [113],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/11.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [133],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/12.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [137],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/2.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [54],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/3.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [116],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/4.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [25],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/5.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [79],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/6.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [66],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/7.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [104],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/8.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [81],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2018/9.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2018'
 
 const card: Card = {
+	dexId: [147],
 	set: Set,
 
 	variants: {

data/McDonald's Collection/Macdonald's Collection 2021/16.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2021'
 
 const card: Card = {
+	dexId: [813],
 	name: {
 		en: "Scorbunny",
 		fr: "Flambino",

data/McDonald's Collection/Macdonald's Collection 2021/24.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2021'
 
 const card: Card = {
+	dexId: [816],
 	name: {
 		en: "Sobble",
 		fr: "Larméléon",

data/McDonald's Collection/Macdonald's Collection 2021/8.ts

@@ -2,6 +2,7 @@ import { Card } from '../../../interfaces'
 import Set from '../Macdonald\'s Collection 2021'
 
 const card: Card = {
+	dexId: [810],
 	name: {
 		en: "Grookey",
 		fr: "Ouistempo",

data/POP/Nintendo Black Star Promos/12.ts

@@ -55,10 +55,7 @@ const card: Card = {
 			value: "×2"
 		},
 	],
-
-
-
-
+	retreat: 1,
 
 }
 

data/Platinum/Pokémon Rumble/7.ts

@@ -50,6 +50,7 @@ const card: Card = {
 			value: "-20"
 		},
 	],
+	retreat: 1,
 
 
 

data/Scarlet & Violet/151/001.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [1],
 	set: Set,
 
 	name: {
@@ -44,7 +45,11 @@ const card: Card = {
 	}],
 
 	retreat: 2,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/002.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [2],
 	set: Set,
 
 	name: {
@@ -57,7 +58,11 @@ const card: Card = {
 	}],
 
 	retreat: 3,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/003.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [3],
 	set: Set,
 
 	name: {
@@ -66,7 +67,12 @@ const card: Card = {
 	}],
 
 	retreat: 4,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		reverse: false,
+		normal: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/004.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [4],
 	set: Set,
 
 	name: {
@@ -55,7 +56,11 @@ const card: Card = {
 	}],
 
 	retreat: 1,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/005.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [5],
 	set: Set,
 
 	name: {
@@ -57,7 +58,11 @@ const card: Card = {
 	}],
 
 	retreat: 2,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/006.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [6],
 	set: Set,
 
 	name: {
@@ -65,8 +66,19 @@ const card: Card = {
 		damage: 330
 	}],
 
+	weaknesses: [
+		{
+			type: "Water",
+			value: "×2"
+		},
+	],
 	retreat: 2,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		normal: false,
+		reverse: false
+	}
 }
 
-export default card
+export default card

data/Scarlet & Violet/151/007.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [7],
 	set: Set,
 
 	name: {
@@ -55,7 +56,11 @@ const card: Card = {
 	}],
 
 	retreat: 1,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/008.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [8],
 	set: Set,
 
 	name: {
@@ -55,7 +56,11 @@ const card: Card = {
 	}],
 
 	retreat: 2,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/009.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [9],
 	set: Set,
 
 	name: {
@@ -66,7 +67,12 @@ const card: Card = {
 	}],
 
 	retreat: 3,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		reverse: false,
+		normal: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/010.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [251],
 	set: Set,
 
 	name: {
@@ -44,7 +45,11 @@ const card: Card = {
 	}],
 
 	retreat: 1,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/011.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [11],
 	set: Set,
 
 	name: {
@@ -55,7 +56,11 @@ const card: Card = {
 	}],
 
 	retreat: 3,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/012.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [12],
 	set: Set,
 
 	name: {
@@ -64,7 +65,11 @@ const card: Card = {
 	}],
 
 	retreat: 1,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/013.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [13],
 	set: Set,
 
 	name: {
@@ -48,7 +49,11 @@ const card: Card = {
 	}],
 
 	retreat: 1,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/014.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [14],
 	set: Set,
 
 	name: {
@@ -57,7 +58,11 @@ const card: Card = {
 	}],
 
 	retreat: 3,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/015.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [15],
 	set: Set,
 
 	name: {
@@ -57,7 +58,12 @@ const card: Card = {
 	}],
 
 	retreat: 1,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		normal: false,
+		reverse: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/016.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [16],
 	set: Set,
 
 	name: {
@@ -55,7 +56,11 @@ const card: Card = {
 	}],
 
 	retreat: 1,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/017.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [17],
 	set: Set,
 
 	name: {
@@ -35,7 +36,11 @@ const card: Card = {
 	}],
 
 	retreat: 0,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card

data/Scarlet & Violet/151/018.ts

@@ -2,6 +2,7 @@ import { Card } from "../../../interfaces"
 import Set from "../151"
 
 const card: Card = {
+	dexId: [18],
 	set: Set,
 
 	name: {
@@ -57,7 +58,11 @@ const card: Card = {
 	}],
 
 	retreat: 0,
-	regulationMark: "G"
+	regulationMark: "G",
+
+	variants: {
+		holo: false
+	}
 }
 
 export default card