Skip to content

Commit 53e6906

Browse files
Sophilautianikkiwritescode
authored andcommitted
Fixed description formatting and added changelog
1 parent d391942 commit 53e6906

File tree

1 file changed

+34
-0
lines changed

1 file changed

+34
-0
lines changed

_maps/SuperFamicom/superfamicom.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1+
<<<<<<< HEAD:_maps/SuperFamicom/superfamicom.yaml
12
name:
23
en: Super Famicom
4+
=======
5+
---
6+
name:
7+
en: Famicom
8+
>>>>>>> 9d02bd87 (Fixed description formatting and added changelog):_maps/Famicom/famicom.yaml
39
desc:
410
en: A familiar logo becomes a wild goose chase for the bank!
511
ruleSet: Standard
@@ -9,19 +15,30 @@ targetAmount: 25000
915
baseSalary: 300
1016
salaryIncrement: 200
1117
maxDiceRoll: 8
18+
<<<<<<< HEAD:_maps/SuperFamicom/superfamicom.yaml
1219
frbFiles:
1320
- superfamicom0
1421
- superfamicom1
1522
- superfamicom2
1623
- superfamicom3
1724
background: bg006fixed
1825
mapIcon: superfamicom
26+
=======
27+
frbFiles:
28+
- famicom0
29+
- famicom1
30+
- famicom2
31+
- famicom3
32+
background: bg006fixed
33+
mapIcon: Famicomicon
34+
>>>>>>> 9d02bd87 (Fixed description formatting and added changelog):_maps/Famicom/famicom.yaml
1935
tourMode:
2036
bankruptcyLimit: 1
2137
opponent1: Mario
2238
opponent2: Bowser
2339
opponent3: DonkeyKong
2440
clearRank: 2
41+
<<<<<<< HEAD:_maps/SuperFamicom/superfamicom.yaml
2542
music:
2643
download:
2744
- https://nikkums.io/cswt/BGM/SuperFamicom.music.zip
@@ -34,6 +51,19 @@ music:
3451
auction: SuperFamicomStock.79
3552
ventureCards: SuperFamicomVenture.77
3653
win: SuperFamicomWin.75
54+
=======
55+
music:
56+
download: https://drive.google.com/uc?export=download&id=1dyAGe8faJ5EDThWuL1r8pVHA-h15yoZU&confirm=1
57+
map: FamicomBoard.72
58+
targetMet: FamicomTargetMet.72
59+
promotionMario: FamicomPromotion.80
60+
promotionDragonQuest: FamicomPromotion.80
61+
promotionMii: FamicomPromotion.80
62+
stock: FamicomAuction.79
63+
auction: FamicomStock.79
64+
ventureCards: FamicomVenture.77
65+
win: FamicomWin.75
66+
>>>>>>> 9d02bd87 (Fixed description formatting and added changelog):_maps/Famicom/famicom.yaml
3767
changelog:
3868
- version: 1
3969
added:
@@ -170,3 +200,7 @@ ventureCards:
170200
- 1 # 126 Revaluation venture! Roll the die and expand your shops by 2% for each number.
171201
- 0 # 127 Special arcade adventure! You're invited to play Round the Blocks and Memory Block!
172202
- 0 # 128 Special bonus! You receive 55 times the number of shops you own in gold coins from the bank!
203+
<<<<<<< HEAD:_maps/SuperFamicom/superfamicom.yaml
204+
=======
205+
...
206+
>>>>>>> 9d02bd87 (Fixed description formatting and added changelog):_maps/Famicom/famicom.yaml

0 commit comments

Comments
 (0)