From faaf0a0f938c22b13e1620989e42e5ca6e051e9e Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 1 Jun 2020 17:39:57 +0200 Subject: [PATCH] rename yay --- Android/Activity1.cs | 2 +- Android/Android.csproj | 34 ++++++++++++++++-- Android/Properties/AndroidManifest.xml | 4 +-- Android/Properties/AssemblyInfo.cs | 6 ++-- Android/Resources/Drawable/Icon.png | Bin 27076 -> 4173 bytes Android/Resources/Values/Strings.xml | 2 +- Desktop/.config/dotnet-tools.json | 12 ------- Desktop/Desktop.csproj | 25 ------------- Desktop/Program.cs | 18 ---------- ThemeParkClicker.sln => TouchyTickets.sln | 8 +---- .../Attractions/Attraction.cs | 2 +- .../Attractions/AttractionType.cs | 2 +- .../Content/Content.mgcb | 0 .../Content/Fonts/EXEPixelPerfect.ttf | Bin .../Content/Fonts/Regular.spritefont | 0 .../Content/Textures/Attractions.aseprite | Bin .../Content/Textures/Attractions.png | Bin .../Content/Textures/Tiles.aseprite | Bin .../Content/Textures/Tiles.png | Bin .../Content/Textures/Ui.aseprite | Bin .../Content/Textures/Ui.png | Bin .../GameImpl.cs | 4 +-- .../ParkMap.cs | 4 +-- .../RainingTicket.cs | 2 +- .../SaveHandler.cs | 4 +-- .../TouchyTickets.csproj | 0 {ThemeParkClicker => TouchyTickets}/Ui.cs | 4 +-- 27 files changed, 50 insertions(+), 83 deletions(-) delete mode 100644 Desktop/.config/dotnet-tools.json delete mode 100644 Desktop/Desktop.csproj delete mode 100644 Desktop/Program.cs rename ThemeParkClicker.sln => TouchyTickets.sln (64%) rename {ThemeParkClicker => TouchyTickets}/Attractions/Attraction.cs (97%) rename {ThemeParkClicker => TouchyTickets}/Attractions/AttractionType.cs (98%) rename {ThemeParkClicker => TouchyTickets}/Content/Content.mgcb (100%) rename {ThemeParkClicker => TouchyTickets}/Content/Fonts/EXEPixelPerfect.ttf (100%) rename {ThemeParkClicker => TouchyTickets}/Content/Fonts/Regular.spritefont (100%) rename {ThemeParkClicker => TouchyTickets}/Content/Textures/Attractions.aseprite (100%) rename {ThemeParkClicker => TouchyTickets}/Content/Textures/Attractions.png (100%) rename {ThemeParkClicker => TouchyTickets}/Content/Textures/Tiles.aseprite (100%) rename {ThemeParkClicker => TouchyTickets}/Content/Textures/Tiles.png (100%) rename {ThemeParkClicker => TouchyTickets}/Content/Textures/Ui.aseprite (100%) rename {ThemeParkClicker => TouchyTickets}/Content/Textures/Ui.png (100%) rename {ThemeParkClicker => TouchyTickets}/GameImpl.cs (97%) rename {ThemeParkClicker => TouchyTickets}/ParkMap.cs (99%) rename {ThemeParkClicker => TouchyTickets}/RainingTicket.cs (97%) rename {ThemeParkClicker => TouchyTickets}/SaveHandler.cs (94%) rename ThemeParkClicker/ThemeParkClicker.csproj => TouchyTickets/TouchyTickets.csproj (100%) rename {ThemeParkClicker => TouchyTickets}/Ui.cs (99%) 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 25fe044482ebc8cf48bc4c566e934edde8a4bc23..e2eacaadc9ef5ebb191c9ca177f5e2f51a95713c 100644 GIT binary patch literal 4173 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 ky{f5w5@5Rd|J-}oFTI$_d=R$$`6sClv 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 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);