Merge branch 'FortuneStreetModding:main' into main

FortuneStreetModding · Sep 23, 2023 · 8a5e2fd · 8a5e2fd
2 parents c6fcbf7 + 8cc65f0
commit 8a5e2fd
Show file tree

Hide file tree

Showing 70 changed files with 474 additions and 21 deletions.
diff --git a/_data/mapList.yaml b/_data/mapList.yaml
@@ -356,15 +356,12 @@ backgrounds: backgrounds.yml
     Ennesan20.zip:
       urls:
       - https://nikkums.io/cswt/Maps/Ennesan20.zip
-    Ennesan21B.zip:
-      urls:
-      - https://nikkums.io/cswt/Maps/Ennesan21B.zip
     Ennesan22A.zip:
       urls:
       - https://nikkums.io/cswt/Maps/Ennesan22A.zip
-    Ennesan22B.zip:
+    Ennesan23.zip:
       urls:
-      - https://nikkums.io/cswt/Maps/Ennesan22B.zip
+      - https://nikkums.io/cswt/Maps/Ennesan23.zip
     EternaCity.zip:
       urls:
       - https://nikkums.io/cswt/Maps/EternaCity.zip
@@ -428,9 +425,6 @@ backgrounds: backgrounds.yml
     Palamecia.zip:
       urls:
       - https://nikkums.io/cswt/Maps/Palamecia.zip
-    PalmBrinks.zip:
-      urls:
-      - https://nikkums.io/cswt/Maps/PalmBrinks.zip
     PlanetMira.zip:
       urls:
       - https://nikkums.io/cswt/Maps/PlanetMira.zip
@@ -443,9 +437,6 @@ backgrounds: backgrounds.yml
     RainbowRoadWii.zip:
       urls:
       - https://nikkums.io/cswt/Maps/RainbowRoadWii.zip
-    Rokkenjima.zip:
-      urls:
-      - https://nikkums.io/cswt/Maps/Rokkenjima.zip
     Shibuya.zip:
       urls:
       - https://nikkums.io/cswt/Maps/Shibuya.zip

diff --git a/_maps/Abwarten/Abwarten.yaml b/_maps/Abwarten/Abwarten.yaml
@@ -151,6 +151,9 @@ ventureCards:
   - 0  # 127 Special arcade adventure! You're invited to play Round the Blocks and Memory Block!
   - 1  # 128 Special bonus! You receive 55 times the number of shops you own in gold coins from the bank!
 changelog:
+  - version: 4
+    changed:
+     - Fixed board crash or softlock when pressing switches in games built with CSMM 5.0.0 or later
   - version: 3
     changed:
      - Replaced venture cards 87 and 115 with others to fix crash

diff --git a/_maps/Abwarten/Abwarten0.frb b/_maps/Abwarten/Abwarten0.frb
diff --git a/_maps/Abwarten/Abwarten1.frb b/_maps/Abwarten/Abwarten1.frb
diff --git a/_maps/BabyPark/babypark.png → _maps/BabyPark/BabyPark.png b/_maps/BabyPark/babypark.png → _maps/BabyPark/BabyPark.png
diff --git a/_maps/Colossus/majinzo1.frb b/_maps/Colossus/majinzo1.frb
diff --git a/_maps/Colossus/majinzo2.frb b/_maps/Colossus/majinzo2.frb
diff --git a/_maps/ColossusE/MajinStatueE.yaml b/_maps/ColossusE/MajinStatueE.yaml
@@ -25,6 +25,9 @@ tourMode:
   opponent3: Peach
   clearRank: 1
 changelog:
+  - version: 3
+    changed:
+      - Fixed board crash or softlock when pressing switches in games built with CSMM 5.0.0 or later
   - version: 2
     changed:
       - Corrected incorrectly assigned districts and added districts F and G

diff --git a/_maps/ColossusE/o_majinzo1.frb b/_maps/ColossusE/o_majinzo1.frb
diff --git a/_maps/ColossusE/o_majinzo2.frb b/_maps/ColossusE/o_majinzo2.frb
diff --git a/_maps/DSPeachsCastle/ds-peach.yaml b/_maps/DSPeachsCastle/ds-peach.yaml
@@ -41,6 +41,9 @@ music:
   domination: ME_MONOPOLY_ISDS.60
   bankruptcy: ME_BANKRUPT_ISDS.60
 changelog:
+  - version: 5
+    changed:
+      - Fixed board crash or softlock when pressing switches in games built with CSMM 5.0.0 or later
   - version: 4
     changed:
       - Changed background to bg003fixed

diff --git a/_maps/DSPeachsCastle/ds-peach0.frb b/_maps/DSPeachsCastle/ds-peach0.frb
diff --git a/_maps/DSPeachsCastle/ds-peach1.frb b/_maps/DSPeachsCastle/ds-peach1.frb
diff --git a/_maps/DSRobbinHoodRuins/ds-robbin.yaml b/_maps/DSRobbinHoodRuins/ds-robbin.yaml
@@ -169,6 +169,9 @@ ventureCards:
   - 0  # 127 Special arcade adventure! You're invited to play Round the Blocks and Memory Block!
   - 0  # 128 Special bonus! You receive 55 times the number of shops you own in gold coins from the bank!
 changelog:
+  - version: 5
+    changed:
+      - Fixed board crash or softlock when pressing switches in games built with CSMM 5.0.0 or later
   - version: 4
     added:
       - DS BGM

diff --git a/_maps/DSRobbinHoodRuins/ds-robbin0.frb b/_maps/DSRobbinHoodRuins/ds-robbin0.frb
diff --git a/_maps/DSRobbinHoodRuins/ds-robbin1.frb b/_maps/DSRobbinHoodRuins/ds-robbin1.frb
diff --git a/_maps/Ennesan06/Ennesan06.frb b/_maps/Ennesan06/Ennesan06.frb
diff --git a/_maps/Ennesan06/Ennesan06.webp b/_maps/Ennesan06/Ennesan06.webp
diff --git a/_maps/Ennesan06/Ennesan06.yaml b/_maps/Ennesan06/Ennesan06.yaml
@@ -42,6 +42,10 @@ tourMode:
   opponent3: Bianca
   clearRank: 2
 changelog:
+  - 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.
+      - Changed the effect of the event square adjacent to the spade suit from 106 to 100 venture cards.
   - version: 8
     changed:
       - Changed some music

diff --git a/_maps/Ennesan17/Ennesan17.frb b/_maps/Ennesan17/Ennesan17.frb
diff --git a/_maps/Ennesan17/Ennesan17.yaml b/_maps/Ennesan17/Ennesan17.yaml
@@ -41,6 +41,9 @@ tourMode:
   opponent3: Bianca
   clearRank: 2
 changelog:
+  - version: 6
+    changed:
+      - Fixed Softlock issue when warping to event squares adjacent to the lower left and lower right warp event squares
   - version: 5
     added: 
       - Added to description that the game will be longer

diff --git a/_maps/Ennesan22A/Ennesan22A.frb b/_maps/Ennesan22A/Ennesan22A.frb
diff --git a/_maps/Ennesan22A/Ennesan22A.webp b/_maps/Ennesan22A/Ennesan22A.webp
diff --git a/_maps/Ennesan22A/Ennesan22A.yaml b/_maps/Ennesan22A/Ennesan22A.yaml
@@ -43,6 +43,11 @@ tourMode:
   opponent3: Bianca
   clearRank: 2
 changelog:
+  - version: 3
+    changed:
+      - Corrected an error in setting the initial shop value for some shops.
+      - Changed the effect of some event squares
+      - Changed venture card 46 to 124
   - version: 2
     changed:
       - Changed shop values for some shops
@@ -99,7 +104,7 @@ ventureCards:
   - 1  #  43 Misadventure! You pay an assets tax of two gold coins per unit of stock that you own!
   - 1  #  44 Misadventure! Roll the die and pay 44 times the number in gold coins to the player in last place!
   - 0  #  45 Dicey adventure! Roll 1/3/5 to warp to a take-a-break square. Roll 2/4/6 to warp to the arcade.
-  - 1  #  46 Misadventure! You drop your wallet and lose 10% of your ready cash!
+  - 0  #  46 Misadventure! You drop your wallet and lose 10% of your ready cash!
   - 0  #  47 Dicey adventure! Roll 2-6 to get all the suits. Roll 1 and lose all your suits.
   - 1  #  48 Misadventure! All shops in a district picked at random fall in value by 10%!
   - 0  #  49 Misadventure! All shops in a district picked at random fall in value by 20%!
@@ -177,7 +182,7 @@ ventureCards:
   - 0  # 121 Capital venture! You can invest up to 400G of the bank's money in your shops.
   - 0  # 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!

diff --git a/_maps/Ennesan23/Enne23.png b/_maps/Ennesan23/Enne23.png