Merge branch 'main' into nikkums/renovate_wiiu

Author: nikkiwritescode

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

_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/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/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.