diff --git a/Android/Resources/Drawable/Icon.png b/Android/Resources/Drawable/Icon.png index e2eacaa..111d522 100644 Binary files a/Android/Resources/Drawable/Icon.png and b/Android/Resources/Drawable/Icon.png differ diff --git a/TouchyTickets/Attractions/AttractionType.cs b/TouchyTickets/Attractions/AttractionType.cs index 14f7650..0d56fcb 100644 --- a/TouchyTickets/Attractions/AttractionType.cs +++ b/TouchyTickets/Attractions/AttractionType.cs @@ -12,6 +12,7 @@ namespace TouchyTickets.Attractions { static AttractionType() { Register(new AttractionType("Carousel", new[,] {{true}}, Attraction.Texture[0, 0, 1, 1], 0.5F, 50)); Register(new AttractionType("FoodCourt", new[,] {{true, true}}, Attraction.Texture[1, 0, 2, 1], 1.1F, 300)); + Register(new AttractionType("FerrisWheel", new[,] {{true, true}, {true, true}}, Attraction.Texture[0, 1, 2, 2], 3.5F, 2000)); } public readonly string Name; diff --git a/TouchyTickets/Content/Textures/Attractions.aseprite b/TouchyTickets/Content/Textures/Attractions.aseprite index 00e2ffe..d53c33f 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 0a05d4a..770750a 100644 Binary files a/TouchyTickets/Content/Textures/Attractions.png and b/TouchyTickets/Content/Textures/Attractions.png differ diff --git a/TouchyTickets/ParkMap.cs b/TouchyTickets/ParkMap.cs index 8e821cc..2a2934d 100644 --- a/TouchyTickets/ParkMap.cs +++ b/TouchyTickets/ParkMap.cs @@ -85,7 +85,7 @@ namespace TouchyTickets { if (this.draggingAttraction) { // move the current placing position var nextPos = (camera.ToWorldPos(drag.Position + drag.Delta) / Attraction.TileSize).ToPoint(); - if (nextPos.X >= 0 && nextPos.Y >= 0 && nextPos.X < this.Width && nextPos.Y < this.Height) + if (this.PlacingAttraction.GetCoveredTiles().Select(p => nextPos + p).All(p => p.X >= 0 && p.Y >= 0 && p.X < this.Width && p.Y < this.Height)) this.PlacingPosition = nextPos; } else { // move the camera