diff --git a/TouchyTickets/Attractions/AttractionFlags.cs b/TouchyTickets/Attractions/AttractionFlags.cs index 2acc9d5..210b9d0 100644 --- a/TouchyTickets/Attractions/AttractionFlags.cs +++ b/TouchyTickets/Attractions/AttractionFlags.cs @@ -9,7 +9,7 @@ namespace TouchyTickets.Attractions { Relaxed = 1, Cars = 2, Walking = 4, - FastCars = Cars | 8, + FastCars = 8, All = ~0 } diff --git a/TouchyTickets/Attractions/AttractionModifier.cs b/TouchyTickets/Attractions/AttractionModifier.cs index 9b80e40..816eb73 100644 --- a/TouchyTickets/Attractions/AttractionModifier.cs +++ b/TouchyTickets/Attractions/AttractionModifier.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; using MLEM.Textures; using Newtonsoft.Json; +using static TouchyTickets.Attractions.AttractionFlags; namespace TouchyTickets.Attractions { [JsonConverter(typeof(Converter))] @@ -11,10 +12,11 @@ namespace TouchyTickets.Attractions { public static readonly Dictionary Modifiers = new Dictionary(); static AttractionModifier() { - Register(new AttractionModifier("Lubricant", 200, AttractionFlags.Cars, 1.02F, Ui.Texture[0, 4])); - Register(new AttractionModifier("LouderMusic", 500, AttractionFlags.Relaxed, 1.05F, Ui.Texture[2, 4])); - Register(new AttractionModifier("LongerQueue", 1000, AttractionFlags.All, 1.1F, Ui.Texture[1, 4])); - Register(new AttractionModifier("Bouncer", 1500, AttractionFlags.Walking, 1.05F, Ui.Texture[3, 4])); + Register(new AttractionModifier("Lubricant", 200, Cars | FastCars, 1.02F, Ui.Texture[0, 4])); + Register(new AttractionModifier("LouderMusic", 500, Relaxed, 1.03F, Ui.Texture[2, 4])); + Register(new AttractionModifier("LongerQueue", 1000, All, 1.06F, Ui.Texture[1, 4])); + Register(new AttractionModifier("Bouncer", 1500, Walking, 1.2F, Ui.Texture[3, 4])); + Register(new AttractionModifier("OnRideCameras", 2500, FastCars, 1.1F, Ui.Texture[4, 4])); } public readonly string Name; diff --git a/TouchyTickets/Content/Localization/Localization.json b/TouchyTickets/Content/Localization/Localization.json index 6f4b6c2..9f5197d 100644 --- a/TouchyTickets/Content/Localization/Localization.json +++ b/TouchyTickets/Content/Localization/Localization.json @@ -46,6 +46,8 @@ "LouderMusicDescription": "Relaxed rides play louder music, causing riders to leave faster.", "Bouncer": "Bouncers", "BouncerDescription": "Bouncers are placed at walking-based rides, allowing only young, energetic people to enter.", + "OnRideCameras": "On-Ride Pictures", + "OnRideCamerasDescription": "Cameras are installed on rides, allowing riders to purchase an on-ride picture.", "----- Upgrades -----": "", "MapSize1": "Big Park", "MapSize1Description": "Increases your park's buildable area. Existing attractions are not removed.", diff --git a/TouchyTickets/Content/Textures/Ui.aseprite b/TouchyTickets/Content/Textures/Ui.aseprite index 8b3fc1b..f8bf91f 100644 Binary files a/TouchyTickets/Content/Textures/Ui.aseprite and b/TouchyTickets/Content/Textures/Ui.aseprite differ diff --git a/TouchyTickets/Content/Textures/Ui.png b/TouchyTickets/Content/Textures/Ui.png index 0011c70..6e756fb 100644 Binary files a/TouchyTickets/Content/Textures/Ui.png and b/TouchyTickets/Content/Textures/Ui.png differ