diff --git a/Android/Activity1.cs b/Android/Activity1.cs index 8c74e77..1b15db3 100644 --- a/Android/Activity1.cs +++ b/Android/Activity1.cs @@ -5,7 +5,7 @@ using Android.Views; using Microsoft.Xna.Framework; using MLEM.Extensions; using MLEM.Misc; -using ThemeParkClicker; +using TouchyTickets; namespace Android { [Activity( diff --git a/Android/Android.csproj b/Android/Android.csproj index 374e199..966c441 100644 --- a/Android/Android.csproj +++ b/Android/Android.csproj @@ -62,8 +62,31 @@ + + Content\Fonts\EXEPixelPerfect.ttf + + + Content\Fonts\Regular.spritefont + + + Content\Textures\Attractions.aseprite + + + Content\Textures\Attractions.png + + + Content\Textures\Tiles.aseprite + + + Content\Textures\Tiles.png + + + Content\Textures\Ui.aseprite + + + Content\Textures\Ui.png + - @@ -72,10 +95,15 @@ - + {3df7ae69-f3f0-461a-be98-f31eb576b5e2} - ThemeParkClicker + TouchyTickets + + + Content\Content.mgcb + + \ No newline at end of file diff --git a/Android/Properties/AndroidManifest.xml b/Android/Properties/AndroidManifest.xml index 710acda..72ef9f5 100644 --- a/Android/Properties/AndroidManifest.xml +++ b/Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + - + diff --git a/Android/Properties/AssemblyInfo.cs b/Android/Properties/AssemblyInfo.cs index fd082d4..31f4d47 100644 --- a/Android/Properties/AssemblyInfo.cs +++ b/Android/Properties/AssemblyInfo.cs @@ -6,12 +6,12 @@ using Android.App; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Android")] +[assembly: AssemblyTitle("Touchy Tickets")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Android")] -[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyProduct("Touchy Tickets")] +[assembly: AssemblyCopyright("Copyright © 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Android/Resources/Drawable/Icon.png b/Android/Resources/Drawable/Icon.png index 25fe044..e2eacaa 100644 Binary files a/Android/Resources/Drawable/Icon.png and b/Android/Resources/Drawable/Icon.png differ diff --git a/Android/Resources/Values/Strings.xml b/Android/Resources/Values/Strings.xml index 7f40978..3a2c2df 100644 --- a/Android/Resources/Values/Strings.xml +++ b/Android/Resources/Values/Strings.xml @@ -1,4 +1,4 @@ - Android + Touchy Tickets diff --git a/Desktop/.config/dotnet-tools.json b/Desktop/.config/dotnet-tools.json deleted file mode 100644 index c429d1a..0000000 --- a/Desktop/.config/dotnet-tools.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "isRoot": true, - "tools": { - "dotnet-mgcb": { - "version": "3.8.0.1375-develop", - "commands": [ - "mgcb" - ] - } - } -} \ No newline at end of file diff --git a/Desktop/Desktop.csproj b/Desktop/Desktop.csproj deleted file mode 100644 index ea39c15..0000000 --- a/Desktop/Desktop.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - Exe - netcoreapp3.0 - false - false - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Desktop/Program.cs b/Desktop/Program.cs deleted file mode 100644 index f2dfd5b..0000000 --- a/Desktop/Program.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Microsoft.Xna.Framework; -using MLEM.Misc; -using ThemeParkClicker; - -namespace Desktop { - public static class Program { - - public static void Main() { - TextInputWrapper.Current = new TextInputWrapper.DesktopGl((w, c) => w.TextInput += c); - using var game = new GameImpl(); - game.GraphicsDeviceManager.PreferredBackBufferWidth = 1080 / 3; - game.GraphicsDeviceManager.PreferredBackBufferHeight = 1920 / 3; - game.IsMouseVisible = true; - game.Run(); - } - - } -} \ No newline at end of file diff --git a/ThemeParkClicker.sln b/TouchyTickets.sln similarity index 64% rename from ThemeParkClicker.sln rename to TouchyTickets.sln index cd60f02..05793b1 100644 --- a/ThemeParkClicker.sln +++ b/TouchyTickets.sln @@ -1,11 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThemeParkClicker", "ThemeParkClicker\ThemeParkClicker.csproj", "{3DF7AE69-F3F0-461A-BE98-F31EB576B5E2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TouchyTickets", "TouchyTickets\TouchyTickets.csproj", "{3DF7AE69-F3F0-461A-BE98-F31EB576B5E2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "Android\Android.csproj", "{410C0262-131C-4D0E-910D-D01B4F7143E0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Desktop", "Desktop\Desktop.csproj", "{41506EAE-7E73-4147-8C8F-CA70924DB7FA}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -20,9 +18,5 @@ Global {410C0262-131C-4D0E-910D-D01B4F7143E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {410C0262-131C-4D0E-910D-D01B4F7143E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {410C0262-131C-4D0E-910D-D01B4F7143E0}.Release|Any CPU.Build.0 = Release|Any CPU - {41506EAE-7E73-4147-8C8F-CA70924DB7FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {41506EAE-7E73-4147-8C8F-CA70924DB7FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41506EAE-7E73-4147-8C8F-CA70924DB7FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {41506EAE-7E73-4147-8C8F-CA70924DB7FA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/ThemeParkClicker/Attractions/Attraction.cs b/TouchyTickets/Attractions/Attraction.cs similarity index 97% rename from ThemeParkClicker/Attractions/Attraction.cs rename to TouchyTickets/Attractions/Attraction.cs index 72fe77e..4b74feb 100644 --- a/ThemeParkClicker/Attractions/Attraction.cs +++ b/TouchyTickets/Attractions/Attraction.cs @@ -7,7 +7,7 @@ using MLEM.Extensions; using MLEM.Startup; using MLEM.Textures; -namespace ThemeParkClicker.Attractions { +namespace TouchyTickets.Attractions { [DataContract] public class Attraction { diff --git a/ThemeParkClicker/Attractions/AttractionType.cs b/TouchyTickets/Attractions/AttractionType.cs similarity index 98% rename from ThemeParkClicker/Attractions/AttractionType.cs rename to TouchyTickets/Attractions/AttractionType.cs index e6f3d17..14f7650 100644 --- a/ThemeParkClicker/Attractions/AttractionType.cs +++ b/TouchyTickets/Attractions/AttractionType.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using MLEM.Textures; using Newtonsoft.Json; -namespace ThemeParkClicker.Attractions { +namespace TouchyTickets.Attractions { [JsonConverter(typeof(Converter))] public class AttractionType { diff --git a/ThemeParkClicker/Content/Content.mgcb b/TouchyTickets/Content/Content.mgcb similarity index 100% rename from ThemeParkClicker/Content/Content.mgcb rename to TouchyTickets/Content/Content.mgcb diff --git a/ThemeParkClicker/Content/Fonts/EXEPixelPerfect.ttf b/TouchyTickets/Content/Fonts/EXEPixelPerfect.ttf similarity index 100% rename from ThemeParkClicker/Content/Fonts/EXEPixelPerfect.ttf rename to TouchyTickets/Content/Fonts/EXEPixelPerfect.ttf diff --git a/ThemeParkClicker/Content/Fonts/Regular.spritefont b/TouchyTickets/Content/Fonts/Regular.spritefont similarity index 100% rename from ThemeParkClicker/Content/Fonts/Regular.spritefont rename to TouchyTickets/Content/Fonts/Regular.spritefont diff --git a/ThemeParkClicker/Content/Textures/Attractions.aseprite b/TouchyTickets/Content/Textures/Attractions.aseprite similarity index 100% rename from ThemeParkClicker/Content/Textures/Attractions.aseprite rename to TouchyTickets/Content/Textures/Attractions.aseprite diff --git a/ThemeParkClicker/Content/Textures/Attractions.png b/TouchyTickets/Content/Textures/Attractions.png similarity index 100% rename from ThemeParkClicker/Content/Textures/Attractions.png rename to TouchyTickets/Content/Textures/Attractions.png diff --git a/ThemeParkClicker/Content/Textures/Tiles.aseprite b/TouchyTickets/Content/Textures/Tiles.aseprite similarity index 100% rename from ThemeParkClicker/Content/Textures/Tiles.aseprite rename to TouchyTickets/Content/Textures/Tiles.aseprite diff --git a/ThemeParkClicker/Content/Textures/Tiles.png b/TouchyTickets/Content/Textures/Tiles.png similarity index 100% rename from ThemeParkClicker/Content/Textures/Tiles.png rename to TouchyTickets/Content/Textures/Tiles.png diff --git a/ThemeParkClicker/Content/Textures/Ui.aseprite b/TouchyTickets/Content/Textures/Ui.aseprite similarity index 100% rename from ThemeParkClicker/Content/Textures/Ui.aseprite rename to TouchyTickets/Content/Textures/Ui.aseprite diff --git a/ThemeParkClicker/Content/Textures/Ui.png b/TouchyTickets/Content/Textures/Ui.png similarity index 100% rename from ThemeParkClicker/Content/Textures/Ui.png rename to TouchyTickets/Content/Textures/Ui.png diff --git a/ThemeParkClicker/GameImpl.cs b/TouchyTickets/GameImpl.cs similarity index 97% rename from ThemeParkClicker/GameImpl.cs rename to TouchyTickets/GameImpl.cs index c00c546..3f3d11e 100644 --- a/ThemeParkClicker/GameImpl.cs +++ b/TouchyTickets/GameImpl.cs @@ -6,9 +6,9 @@ using MLEM.Cameras; using MLEM.Extensions; using MLEM.Font; using MLEM.Startup; -using ThemeParkClicker.Attractions; +using TouchyTickets.Attractions; -namespace ThemeParkClicker { +namespace TouchyTickets { public class GameImpl : MlemGame { public static GameImpl Instance { get; private set; } diff --git a/ThemeParkClicker/ParkMap.cs b/TouchyTickets/ParkMap.cs similarity index 99% rename from ThemeParkClicker/ParkMap.cs rename to TouchyTickets/ParkMap.cs index a5b52a6..8e821cc 100644 --- a/ThemeParkClicker/ParkMap.cs +++ b/TouchyTickets/ParkMap.cs @@ -9,9 +9,9 @@ using MLEM.Extensions; using MLEM.Misc; using MLEM.Startup; using MLEM.Textures; -using ThemeParkClicker.Attractions; +using TouchyTickets.Attractions; -namespace ThemeParkClicker { +namespace TouchyTickets { [DataContract] public class ParkMap { diff --git a/ThemeParkClicker/RainingTicket.cs b/TouchyTickets/RainingTicket.cs similarity index 97% rename from ThemeParkClicker/RainingTicket.cs rename to TouchyTickets/RainingTicket.cs index f26403d..1d0a18c 100644 --- a/ThemeParkClicker/RainingTicket.cs +++ b/TouchyTickets/RainingTicket.cs @@ -5,7 +5,7 @@ using MLEM.Extensions; using MLEM.Misc; using MLEM.Textures; -namespace ThemeParkClicker { +namespace TouchyTickets { public class RainingTicket { private static readonly Random Random = new Random(); diff --git a/ThemeParkClicker/SaveHandler.cs b/TouchyTickets/SaveHandler.cs similarity index 94% rename from ThemeParkClicker/SaveHandler.cs rename to TouchyTickets/SaveHandler.cs index 95ea691..f3e2c17 100644 --- a/ThemeParkClicker/SaveHandler.cs +++ b/TouchyTickets/SaveHandler.cs @@ -3,7 +3,7 @@ using System.IO; using System.Numerics; using Newtonsoft.Json; -namespace ThemeParkClicker { +namespace TouchyTickets { public static class SaveHandler { private static readonly JsonSerializer Serializer = JsonSerializer.Create(new JsonSerializerSettings { @@ -41,7 +41,7 @@ namespace ThemeParkClicker { public static DirectoryInfo GetGameDirectory(bool create) { var path = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - var dir = new DirectoryInfo(Path.Combine(path, "ThemeParkClicker")); + var dir = new DirectoryInfo(Path.Combine(path, "TouchyTickets")); if (!dir.Exists && create) dir.Create(); return dir; diff --git a/ThemeParkClicker/ThemeParkClicker.csproj b/TouchyTickets/TouchyTickets.csproj similarity index 100% rename from ThemeParkClicker/ThemeParkClicker.csproj rename to TouchyTickets/TouchyTickets.csproj diff --git a/ThemeParkClicker/Ui.cs b/TouchyTickets/Ui.cs similarity index 99% rename from ThemeParkClicker/Ui.cs rename to TouchyTickets/Ui.cs index b44c190..0dcbf48 100644 --- a/ThemeParkClicker/Ui.cs +++ b/TouchyTickets/Ui.cs @@ -15,9 +15,9 @@ using MLEM.Startup; using MLEM.Textures; using MLEM.Ui; using MLEM.Ui.Elements; -using ThemeParkClicker.Attractions; +using TouchyTickets.Attractions; -namespace ThemeParkClicker { +namespace TouchyTickets { public class Ui { public static readonly UniformTextureAtlas Texture = new UniformTextureAtlas(MlemGame.LoadContent("Textures/Ui"), 16, 16);