diff --git a/TouchyTickets/Attractions/Attraction.cs b/TouchyTickets/Attractions/Attraction.cs index a0d8b68..7e62e82 100644 --- a/TouchyTickets/Attractions/Attraction.cs +++ b/TouchyTickets/Attractions/Attraction.cs @@ -38,7 +38,6 @@ namespace TouchyTickets.Attractions { var amount = this.ticketPercentage.Floor(); if (amount > 0) { GameImpl.Instance.Tickets += amount; - GameImpl.Instance.Analytics.AddResourceEvent(false, "Tickets", amount, "Attraction", this.Type.Name); this.ticketPercentage -= amount; } // return the generation rate per second diff --git a/TouchyTickets/Attractions/AttractionType.cs b/TouchyTickets/Attractions/AttractionType.cs index ef11e85..df5dbee 100644 --- a/TouchyTickets/Attractions/AttractionType.cs +++ b/TouchyTickets/Attractions/AttractionType.cs @@ -10,14 +10,16 @@ namespace TouchyTickets.Attractions { public static readonly Dictionary Attractions = new Dictionary(); public static readonly AttractionType Carousel = Register(new AttractionType("Carousel", RectArea(1, 1), Attraction.Texture[0, 0, 1, 1], 0.5F, 50)); - public static readonly AttractionType FoodCourt = Register(new AttractionType("FoodCourt", RectArea(2, 1), Attraction.Texture[1, 0, 2, 1], 1.5F, 300)); - 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 MirrorHouse = Register(new AttractionType("MirrorHouse", RectArea(1, 1), Attraction.Texture[3, 0, 1, 1], 1, 150)); + public static readonly AttractionType FoodCourt = Register(new AttractionType("FoodCourt", RectArea(2, 1), Attraction.Texture[1, 0, 2, 1], 2F, 300)); + public static readonly AttractionType SpiralSlide = Register(new AttractionType("SpiralSlide", RectArea(1, 2), Attraction.Texture[5, 0, 1, 2], 4, 1200)); + public static readonly AttractionType HedgeMaze = Register(new AttractionType("HedgeMaze", RectArea(2, 2), Attraction.Texture[3, 3, 2, 2], 8, 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 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 static readonly AttractionType HauntedHouse = Register(new AttractionType("HauntedHouse", RectArea(2, 2), Attraction.Texture[3, 5, 2, 2], 30, 12000)); + public static readonly AttractionType WildMouse = Register(new AttractionType("WildMouse", RectArea(3, 2), Attraction.Texture[2, 1, 3, 2], 50, 24000)); + public static readonly AttractionType LogFlume = Register(new AttractionType("LogFlume", new[,] {{true, true, false}, {true, true, true}}, Attraction.Texture[0, 3, 3, 2], 75, 38000)); + public static readonly AttractionType WoodCoaster = Register(new AttractionType("WoodCoaster", RectArea(3, 3), Attraction.Texture[0, 5, 3, 3], 90, 60000)); public readonly string Name; public readonly bool[,] Area; @@ -46,11 +48,11 @@ namespace TouchyTickets.Attractions { if (this == FerrisWheel && Upgrade.FerrisWheelModifier.IsActive()) genRate *= 4; - // this should contain all car-based coasters + // this should contain all car-based coasters that are fast 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()) + if ((this == SpiralSlide || this == HedgeMaze || this == MirrorHouse) && Upgrade.ManualRideModifier.IsActive()) genRate *= 3; return genRate; diff --git a/TouchyTickets/Content/Localization/Localization.json b/TouchyTickets/Content/Localization/Localization.json index ffd5862..64f9b6d 100644 --- a/TouchyTickets/Content/Localization/Localization.json +++ b/TouchyTickets/Content/Localization/Localization.json @@ -26,6 +26,8 @@ "SpiralSlide": "Spiral Slide", "WoodCoaster": "Wooden Coaster", "FreefallCoaster": "Freefall Coaster", + "MirrorHouse": "House of Mirrors", + "HauntedHouse": "Haunted House", "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 eed75ab..f6eb952 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 8599934..f6ef263 100644 Binary files a/TouchyTickets/Content/Textures/Attractions.png and b/TouchyTickets/Content/Textures/Attractions.png differ