diff --git a/TouchyTickets/Attractions/AttractionType.cs b/TouchyTickets/Attractions/AttractionType.cs index fef97b7..ef11e85 100644 --- a/TouchyTickets/Attractions/AttractionType.cs +++ b/TouchyTickets/Attractions/AttractionType.cs @@ -14,9 +14,10 @@ namespace TouchyTickets.Attractions { public static readonly AttractionType SpiralSlide = Register(new AttractionType("SpiralSlide", RectArea(1, 2), Attraction.Texture[5, 0, 1, 2], 3, 1200)); public static readonly AttractionType HedgeMaze = Register(new AttractionType("HedgeMaze", RectArea(2, 2), Attraction.Texture[3, 3, 2, 2], 6, 2500)); public static readonly AttractionType FerrisWheel = Register(new AttractionType("FerrisWheel", RectArea(2, 2), Attraction.Texture[0, 1, 2, 2], 12, 4000)); - public static readonly AttractionType WildMouse = Register(new AttractionType("WildMouse", RectArea(3, 2), Attraction.Texture[2, 1, 3, 2], 24, 8000)); - public static readonly AttractionType LogFlume = Register(new AttractionType("LogFlume", new[,] {{true, true, false}, {true, true, true}}, Attraction.Texture[0, 3, 3, 2], 30, 12000)); - public static readonly AttractionType WoodCoaster = Register(new AttractionType("WoodCoaster", RectArea(3, 3), Attraction.Texture[0, 5, 3, 3], 65, 28000)); + public static readonly AttractionType FreefallCoaster = Register(new AttractionType("FreefallCoaster", new[,] {{true, false, true}, {true, true, true}}, Attraction.Texture[6, 0, 3, 2], 24, 8000)); + public static readonly AttractionType WildMouse = Register(new AttractionType("WildMouse", RectArea(3, 2), Attraction.Texture[2, 1, 3, 2], 30, 12000)); + public static readonly AttractionType LogFlume = Register(new AttractionType("LogFlume", new[,] {{true, true, false}, {true, true, true}}, Attraction.Texture[0, 3, 3, 2], 50, 24000)); + public static readonly AttractionType WoodCoaster = Register(new AttractionType("WoodCoaster", RectArea(3, 3), Attraction.Texture[0, 5, 3, 3], 80, 35000)); public readonly string Name; public readonly bool[,] Area; @@ -46,7 +47,7 @@ namespace TouchyTickets.Attractions { if (this == FerrisWheel && Upgrade.FerrisWheelModifier.IsActive()) genRate *= 4; // this should contain all car-based coasters - if ((this == Carousel || this == WildMouse) && Upgrade.RollerCoasterModifier.IsActive()) + if ((this == Carousel || this == WildMouse || this == WoodCoaster || this == FreefallCoaster) && Upgrade.RollerCoasterModifier.IsActive()) genRate *= 2; // this should contain all coasters where people just walk around on their own if ((this == SpiralSlide || this == HedgeMaze) && Upgrade.ManualRideModifier.IsActive()) diff --git a/TouchyTickets/Content/Localization/Localization.json b/TouchyTickets/Content/Localization/Localization.json index 3ccef01..34d2646 100644 --- a/TouchyTickets/Content/Localization/Localization.json +++ b/TouchyTickets/Content/Localization/Localization.json @@ -23,7 +23,8 @@ "LogFlume": "Log Flume", "HedgeMaze": "Hedge Maze", "SpiralSlide": "Spiral Slide", - "WoodCoaster": "Wood Coaster", + "WoodCoaster": "Wooden Coaster", + "FreefallCoaster": "Freefall Coaster", "MapSize1": "Big Park", "MapSize1Description": "Increases your park's buildable area. Existing attractions are not removed.", "MapSize2": "Bigger Park", diff --git a/TouchyTickets/Content/Textures/Attractions.aseprite b/TouchyTickets/Content/Textures/Attractions.aseprite index 47fcddf..eed75ab 100644 Binary files a/TouchyTickets/Content/Textures/Attractions.aseprite and b/TouchyTickets/Content/Textures/Attractions.aseprite differ diff --git a/TouchyTickets/Content/Textures/Attractions.png b/TouchyTickets/Content/Textures/Attractions.png index 223c383..8599934 100644 Binary files a/TouchyTickets/Content/Textures/Attractions.png and b/TouchyTickets/Content/Textures/Attractions.png differ diff --git a/TouchyTickets/Ui.cs b/TouchyTickets/Ui.cs index c4d863c..7600761 100644 --- a/TouchyTickets/Ui.cs +++ b/TouchyTickets/Ui.cs @@ -157,7 +157,7 @@ namespace TouchyTickets { button.IsDisabled = GameImpl.Instance.Tickets < price; }; var center = button.AddChild(new Group(Anchor.Center, new Vector2(0.8F, 1), false) {CanBeMoused = false}); - center.AddChild(new Paragraph(Anchor.AutoCenter, 1, Localization.Get(attraction.Key), true)); + center.AddChild(new Paragraph(Anchor.AutoCenter, 1, Localization.Get(attraction.Key), true) {TextScale = 0.085F}); center.AddChild(new Paragraph(Anchor.AutoCenter, 1, p => attraction.Value.GetGenerationRate() + "/s", true) {TextScale = 0.08F}); button.AddChild(new Image(Anchor.CenterLeft, new Vector2(40), attraction.Value.TextureRegion) { Padding = new Vector2(4)