Merge branch 'main' into main

Author: Sophilautia

.github/workflows/deploy.yml

@@ -25,7 +25,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-        
+          submodules: true
+
       - name: Install, build, and upload your site
         uses: withastro/action@v2
 

.github/workflows/modpack.yml

@@ -58,8 +58,5 @@ jobs:
       - name: Upload modpacks to S3
         run: aws s3 cp ./_modpacks/build/ s3://${{ secrets.S3_BUCKET_NAME }}/cswt/Modpacks/ --recursive --exclude "*" --include "*.zip" --include "packs.json"
 
-      - name: Temporarily also upload CSWT-main to old location
-        run: aws s3 cp ./_modpacks/build/cswt.zip s3://${{ secrets.S3_BUCKET_NAME }}/cswt/Builds/cswtpycsmm-dev.zip
-
       - name: Create CloudFront invalidation for modpack
         run: aws cloudfront create-invalidation --distribution-id ${{ secrets.CLOUDFRONT_DISTRIBUTION_ID }} --paths /cswt/Modpacks/* /cswt/Builds/*

.gitignore

@@ -37,6 +37,7 @@ _site/
 *.arc
 !_modpacks/resources/*/*/*.arc
 *.scene
+!_modpacks/resources/*/*/*.scene
 
 ### Binary Files ###
 *.zip
@@ -73,4 +74,4 @@ Thumbs.db
 dist/
 
 # generated types
-.astro/
+.astro/

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "public/ghidra-boom-street"]
+	path = public/ghidra-boom-street
+	url = ../ghidra-boom-street.git
+	branch = main

_maps/Bunnyland/is30-rabbitland.yaml

@@ -11,7 +11,7 @@ salaryIncrement: 200
 maxDiceRoll: 6
 frbFile1: is30-rabbitland
 bgmId: BGM_MAP_PEACH
-background: bg003
+background: bg101
 mapIcon: bunny
 music: 
   download: 
@@ -181,6 +181,9 @@ ventureCards:
 authors:
   - name: mask1n
 changelog:
+  - version: 5
+    changed:
+      - Background changed to Castle Trodain for accuracy
   - version: 4
     changed:
       - Venture card 115 replaced with Venture card 9

_maps/CastleTown/castletown.frb

@@ -4,7 +4,7 @@ desc:
   en: Inspired by the town from The Legend of Zelda Twilight Princess. Market prices are a little wild, so be careful! And watch out for that pesky anarcho-capitalist baby, Malo! (Board can have occasional stuttering, especially on Wii hardware)
 ruleSet: Standard
 theme: DragonQuest
-initialCash: 1800
+initialCash: 2000
 targetAmount: 20000
 baseSalary: 300
 salaryIncrement: 200
@@ -43,6 +43,13 @@ shopNames:
   en:
     1: Malo Mart
 changelog:
+  - version: 5
+    changed:
+      - Remove upper and lower Backstreets
+      - Change upper Backstreet to Venture Square
+      - Lower Backstreet changed to Event Square where you can get yourself card.
+      - Change Venture Square to Change of Suits at the four corners of the large rectangle.
+      - Initial cash increase from 1800 to 2000
   - version: 4
     changed: 
       - Shop name update

_maps/CastleTown/castletown.webp

@@ -1,17 +1,7 @@
 name:
   en: The Chum Bucket
-  de: The Chum Bucket
-  fr: The Chum Bucket
-  it: The Chum Bucket
-  jp: The Chum Bucket
-  es: The Chum Bucket
 desc:
   en: A downtrodden restaurant located in the town of Bikini Bottom, and the main rival of the world-famous Krusty Krab.
-  de: A downtrodden restaurant located in the town of Bikini Bottom, and the main rival of the world-famous Krusty Krab.
-  fr: A downtrodden restaurant located in the town of Bikini Bottom, and the main rival of the world-famous Krusty Krab.
-  it: A downtrodden restaurant located in the town of Bikini Bottom, and the main rival of the world-famous Krusty Krab.
-  jp: A downtrodden restaurant located in the town of Bikini Bottom, and the main rival of the world-famous Krusty Krab.
-  es: A downtrodden restaurant located in the town of Bikini Bottom, and the main rival of the world-famous Krusty Krab.
 ruleSet: Standard
 theme: Mario
 initialCash: 2000

_maps/CastleTown/castletown.yaml

@@ -3,14 +3,12 @@ name:
   de: Der Koloss EX
   fr: Colosse EX
   it: Il Colosso EX
-  jp: 聖地ゴルド EX
   es: El Coloso EX
 desc:
   en: The same Colossus you know and love, but with four states instead of two! Now, rather than rotating 180 degrees twice, it rotates 90 degrees four times.
   de: Derselbe Koloss, den du kennst und liebst, aber mit vier Zuständen statt zwei! Anstatt sich zweimal um 180 Grad zu drehen, dreht es sich jetzt viermal um 90 Grad.
   fr: Le même Colosse que vous connaissez et aimez, mais avec quatre états au lieu de deux ! Maintenant, plutôt que de tourner deux fois à 180 degrés, il tourne quatre fois à 90 degrés.
   it: lo stesso colosso che conosci e ami, ma con quattro stati invece di due! Ora, invece di ruotare di 180 gradi due volte, ruota di 90 gradi quattro volte.
-  jp: あなたが知っていて愛する同じ 聖地ゴルド ですが、2 つではなく 4 つの状態があります! これで、180 度を 2 回回転させるのではなく、90 度を 4 回回転させます。
   es: ¡El mismo Coloso que conoces y amas, pero con cuatro estados en lugar de dos! Ahora, en lugar de girar 180 grados dos veces, gira 90 grados cuatro veces.
 ruleSet: Standard
 theme: DragonQuest