Merge branch 'main' into main

.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.yaml

@@ -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/ChumBucket/ChumBucket.yaml

@@ -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/ColossusEX/colossusEX.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

_maps/CrestOfFlames/crestofflames.yaml

@@ -1,9 +1,7 @@
 name:
   en: Crest of Flames
-  jp: 炎の紋章
 desc:
   en: The Crest of the Goddess who governs the world of Fódlan. A long and perilous journey to collect the four suits awaits - beware of being sent off course by backstreet and warp spaces, and make sure to buy stocks wisely whenever you visit the banks.
-  jp: フォドラを司る女神の紋章。
 ruleSet: Standard
 theme: DragonQuest
 initialCash: 3000

_maps/DreamWorld/DreamWorld.yaml

@@ -49,6 +49,9 @@ tourMode:
   opponent3: Birdo
   clearRank: 2
 changelog:
+  - version: 6
+    changed:
+      - Fix misalignment of coordinates on upper side of center circle
   - version: 5
     added:
       - Arcade Music

_maps/Ennesan04/Ennesan04.yaml

@@ -40,6 +40,9 @@ tourMode:
   opponent3: Bianca
   clearRank: 2
 changelog:
+  - version: 7
+    changed:
+      - Changed venture card 87 to 86
   - version: 6
     changed:
       - Change auction music to vanilla music
@@ -166,8 +169,8 @@ ventureCards:
   - 0  #  83 Dicey adventure! Roll 1/3/5 and warp to a random location. Roll 2/4/6 and everyone else warps.
   - 1  #  84 Moneymaking venture! The winning player must pay you 10% of their ready cash!
   - 0  #  85 Moneymaking venture! Roll the die and get 85 times the number shown in gold coins from the bank!
-  - 0  #  86 Moneymaking venture! Take 100G from all other players!
-  - 1  #  87 Venture on! Roll the special all-7s-and-8s die and move forward again.
+  - 1  #  86 Moneymaking venture! Take 100G from all other players!
+  - 0  #  87 Venture on! Roll the special all-7s-and-8s die and move forward again.
   - 0  #  88 Misadventure! All other players swap places!
   - 0  #  89 Freebie! All players take a Suit Yourself card!
   - 1  #  90 Price hike venture! All shop prices go up by 30% until your next turn.

_maps/Ennesan05/Ennesan05.yaml

@@ -40,6 +40,9 @@ tourMode:
   opponent3: Bianca
   clearRank: 2
 changelog:
+  - version: 7
+    changed:
+      - Changed venture card 87 to 86
   - version: 6
     changed:
       - Change auction music to vanilla music
@@ -175,8 +178,8 @@ ventureCards:
   - 0  #  83 Dicey adventure! Roll 1/3/5 and warp to a random location. Roll 2/4/6 and everyone else warps.
   - 1  #  84 Moneymaking venture! The winning player must pay you 10% of their ready cash!
   - 0  #  85 Moneymaking venture! Roll the die and get 85 times the number shown in gold coins from the bank!
-  - 0  #  86 Moneymaking venture! Take 100G from all other players!
-  - 1  #  87 Venture on! Roll the special all-7s-and-8s die and move forward again.
+  - 1  #  86 Moneymaking venture! Take 100G from all other players!
+  - 0  #  87 Venture on! Roll the special all-7s-and-8s die and move forward again.
   - 0  #  88 Misadventure! All other players swap places!
   - 0  #  89 Freebie! All players take a Suit Yourself card!
   - 1  #  90 Price hike venture! All shop prices go up by 30% until your next turn.

_maps/Ennesan06/Ennesan06.yaml

@@ -1,7 +1,7 @@
 name:
   en: Enne-san Board 06
 desc:
-  en: BackStreet warps to Spade Suit, which is bounded by Event Square 106.
+  en: BackStreet warps to Spade Suit, which is bounded by Event Square 100.
 ruleSet: Standard
 theme: DragonQuest
 initialCash: 1800
@@ -41,6 +41,10 @@ tourMode:
   opponent3: Bianca
   clearRank: 2
 changelog:
+  - version: 10
+    changed:
+      - Changed venture card 87 to 82
+      - Description hotfix
   - version: 9
     changed:
       - When passing through the event square way, where shop values increase or decrease, one can now proceed toward the outside of the board in addition to proceeding to the bank.
@@ -168,12 +172,12 @@ ventureCards:
   - 0  #  79 Forced buyout! You can buy a vacant plot or shop for three times its value, whether someone else owns it or not.
   - 1  #  80 Freebie! Take a Spade!
   - 1  #  81 Misadventure! All other players can only move forward 1 on their next turn.
-  - 0  #  82 Freebie! Take a Club!
+  - 1  #  82 Freebie! Take a Club!
   - 0  #  83 Dicey adventure! Roll 1/3/5 and warp to a random location. Roll 2/4/6 and everyone else warps.
   - 1  #  84 Moneymaking venture! The winning player must pay you 10% of their ready cash!
   - 0  #  85 Moneymaking venture! Roll the die and get 85 times the number shown in gold coins from the bank!
   - 0  #  86 Moneymaking venture! Take 100G from all other players!
-  - 1  #  87 Venture on! Roll the special all-7s-and-8s die and move forward again.
+  - 0  #  87 Venture on! Roll the special all-7s-and-8s die and move forward again.
   - 0  #  88 Misadventure! All other players swap places!
   - 0  #  89 Freebie! All players take a Suit Yourself card!
   - 1  #  90 Price hike venture! All shop prices go up by 30% until your next turn.

_maps/Ennesan15/Ennesan15.yaml

@@ -41,6 +41,9 @@ tourMode:
   opponent3: Bianca
   clearRank: 2
 changelog:
+  - version: 6
+    changed:
+      - Changed venture card 87 to 124
   - version: 5
     changed:
       - Changed the effect of the event square under the bank, where you can earn diamonds, to buy yourself card for 100G.
@@ -149,7 +152,7 @@ ventureCards:
   - 1  #  84 Moneymaking venture! The winning player must pay you 10% of their ready cash!
   - 0  #  85 Moneymaking venture! Roll the die and get 85 times the number shown in gold coins from the bank!
   - 0  #  86 Moneymaking venture! Take 100G from all other players!
-  - 1  #  87 Venture on! Roll the special all-7s-and-8s die and move forward again.
+  - 0  #  87 Venture on! Roll the special all-7s-and-8s die and move forward again.
   - 0  #  88 Misadventure! All other players swap places!
   - 0  #  89 Freebie! All players take a Suit Yourself card!
   - 1  #  90 Price hike venture! All shop prices go up by 30% until your next turn.
@@ -186,7 +189,7 @@ ventureCards:
   - 1  # 121 Capital venture! You can invest up to 400G of the bank's money in your shops.
   - 1  # 122 Moneymaking venture! The winning player must pay you 20% of their ready cash!
   - 0  # 123 Dicey adventure! Roll 1/3/5 and your shops expand by 20%. Roll 2/4/6 and everyone else's shops expand by 5%.
-  - 0  # 124 Suit venture! Buy a Suit Yourself card for 50G.
+  - 1  # 124 Suit venture! Buy a Suit Yourself card for 50G.
   - 0  # 125 Dicey adventure! Roll 1/3/5 to warp to a boon square. Roll 2/4/6 to warp to the arcade.
   - 1  # 126 Revaluation venture! Roll the die and expand your shops by 2% for each number.
   - 0  # 127 Special arcade adventure! You're invited to play Round the Blocks and Memory Block!

_maps/Ennesan20/Ennesan20.yaml

@@ -1,7 +1,7 @@
 name:
   en: Enne-san Board 20
 desc:
-  en: It will be a long game. Pressing the switch 8 times strengthens the effect of the event square on the upper right island. From there, pressing the switch 2 more times will make other islands very strong.
+  en: It will be a long game. Pressing the switch 12 times strengthens the effect of the event square on the upper right island. From there, pressing the switch 2 more times will make other islands very strong.
 ruleSet: Standard
 theme: DragonQuest
 initialCash: 2000
@@ -21,38 +21,93 @@ frbFiles:
 - Ennesan20_9
 - Ennesan20_10
 - Ennesan20_11
-- Ennesan20_11
-- Ennesan20_11
-- Ennesan20_11
+- Ennesan20_12
+- Ennesan20_13
+- Ennesan20_14
 - Ennesan20_15
-- Ennesan20_11
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_15
+- Ennesan20_29
 background: grid_gray
 mapIcon: Enne20
 music:
   download:
     - https://nikkums.io/cswt/BGM/Ennesan20.music.zip
-    - https://drive.google.com/u/0/uc?id=1xksonm57-8iNyw88K5cYE6BQfi50Z_HB&export=download
+    - https://drive.google.com/uc?export=download&id=1yX5GZdPoxNJi4MQtZpQOHI4wiluhrldd&confirm=1
   map:
   - Ennesan20_1_Map.65
   - Map_Ennesan20_2.65
   - Map_Ennesan20_2.65
-  - Map_Ennesan20_3.65
-  - Map_Ennesan20_3.65
-  - Map_Ennesan20_4.40
-  - Map_Ennesan20_4.40
+  - Map_Ennesan20_3.55
+  - Map_Ennesan20_3.55
+  - Map_Ennesan20_3.55
+  - Map_Ennesan20_4.65
+  - Map_Ennesan20_4.65
+  - Map_Ennesan20_4.65
+  - Map_Ennesan20_5.40
   - Map_Ennesan20_5.40
-  - Map_Ennesan20_6.40
+  - Map_Ennesan20_6.55
   - Map_Ennesan20_7.40
-  - Ennesan19_1_Map.55
-  - Ennesan19_1_Map.55
-  - Ennesan19_1_Map.55
-  - Ennesan19_1_Map.55
-  - Ennesan19_1_Map.55
-  - Ennesan19_1_Map.55
+  - Map_Ennesan20_8.40
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
   stock: Stock_grid.70
   ventureCards: Arcade_grid.60
   auction: Auction_grid.55
-  targetMet: Targetmet_Ennesan17.35
+  targetMet:
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Map_Ennesan20_9.55
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
+  - Targetmet_Ennesan20.50
   win: Ennesan17_Win.45
   guestAppear:
   guestLeave:
@@ -73,6 +128,13 @@ tourMode:
   opponent3: Bianca
   clearRank: 2
 changelog:
+  - version: 7
+    changed:
+      - Changed the number of switches that need to be pressed to be able to go to the upper right island from 7 to 11 times.
+      - It is now necessary to pass through a switch if you want to obtain the suit until the upper right island is released.
+      - Increased board states from 16 to 29 (actually increased from 11 to 15).
+      - Changed the effect of some event squares.
+      - Changed some music
   - version: 6
     changed:
       - Changed Event Square on top right island to warp to any Suit Square until the top right island is released.

_maps/Ennesan21A/Ennesan21A.yaml

@@ -8,7 +8,7 @@ initialCash: 3000
 targetAmount: 30000
 baseSalary: 400
 salaryIncrement: 200
-maxDiceRoll: 8
+maxDiceRoll: 7
 frbFiles:
 - Ennesan21A
 background: grid_lightblue2
@@ -43,6 +43,9 @@ tourMode:
   opponent3: Bianca
   clearRank: 2
 changelog:
+  - version: 2
+    changed:
+      - Changed maxDiceRoll from 8 to 7
   - version: 1
     added:
       - Initial Release