From 4e55392fe3f97d3a0dd8d0c1bc4e5d805bb9b296 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 10 Jun 2020 20:39:40 +0200 Subject: [PATCH] modified crowded pods to be more inline with upgrade design --- TouchyTickets/Attractions/Attraction.cs | 4 +++- TouchyTickets/Attractions/AttractionType.cs | 2 -- TouchyTickets/Content/Localization/Localization.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TouchyTickets/Attractions/Attraction.cs b/TouchyTickets/Attractions/Attraction.cs index 80818a9..e21cf42 100644 --- a/TouchyTickets/Attractions/Attraction.cs +++ b/TouchyTickets/Attractions/Attraction.cs @@ -50,13 +50,15 @@ namespace TouchyTickets.Attractions { genRate *= (float) Math.Pow(modifier.Modifier.Multiplier, modifier.Amount); // apply star upgrades + if (Upgrade.FerrisWheelModifier.IsActive() && this.GetSurrounding(map, position, FerrisWheel).Any()) + genRate *= 2; if (Upgrade.FoodCourtModifier.IsActive() && this.GetSurrounding(map, position, FoodCourt).Any()) genRate *= 2; if (Upgrade.SpiralSlideModifier.IsActive() && this.GetSurrounding(map, position, SpiralSlide).Any()) genRate *= 2; if (Upgrade.HauntedHouseModifier.IsActive() && this.Type.Flags.HasFlag(Relaxed) && this.GetSurrounding(map, position, HauntedHouse).Any()) genRate *= 3; - + return genRate; } diff --git a/TouchyTickets/Attractions/AttractionType.cs b/TouchyTickets/Attractions/AttractionType.cs index df184e6..1ce1c4c 100644 --- a/TouchyTickets/Attractions/AttractionType.cs +++ b/TouchyTickets/Attractions/AttractionType.cs @@ -48,8 +48,6 @@ namespace TouchyTickets.Attractions { public float GetGenerationRate() { var genRate = this.generationPerSecond; - if (this == FerrisWheel && Upgrade.FerrisWheelModifier.IsActive()) - genRate *= 4; if (this.Flags.HasFlag(FastCars) && Upgrade.RollerCoasterModifier.IsActive()) genRate *= 2; if (this.Flags.HasFlag(Walking) && Upgrade.ManualRideModifier.IsActive()) diff --git a/TouchyTickets/Content/Localization/Localization.json b/TouchyTickets/Content/Localization/Localization.json index 9c62171..6f4b6c2 100644 --- a/TouchyTickets/Content/Localization/Localization.json +++ b/TouchyTickets/Content/Localization/Localization.json @@ -66,7 +66,7 @@ "FoodCourtModifier": "Tasty Treats", "FoodCourtModifierDescription": "Doubles ticket sales for all attractions adjacent to food courts.", "FerrisWheelModifier": "Crowded Pods", - "FerrisWheelModifierDescription": "Quadruples ticket sales for ferris wheels. Who cares about fire safety?", + "FerrisWheelModifierDescription": "Allows more people to oversee the area from ferris wheels. Doubles ticket sales for adjacent rides.", "RollerCoasterModifier": "No Brakes", "RollerCoasterModifierDescription": "Increases the speed of all car-based attractions, doubling their ticket sales.", "ManualRideModifier": "Push and Shove",