rename yay

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(

Android/Android.csproj

@@ -62,8 +62,31 @@
         <AndroidResource Include="Resources\Values\Strings.xml" />
     </ItemGroup>
     <ItemGroup>
+        <None Include="..\TouchyTickets\Content\Fonts\EXEPixelPerfect.ttf">
+          <Link>Content\Fonts\EXEPixelPerfect.ttf</Link>
+        </None>
+        <None Include="..\TouchyTickets\Content\Fonts\Regular.spritefont">
+          <Link>Content\Fonts\Regular.spritefont</Link>
+        </None>
+        <None Include="..\TouchyTickets\Content\Textures\Attractions.aseprite">
+          <Link>Content\Textures\Attractions.aseprite</Link>
+        </None>
+        <None Include="..\TouchyTickets\Content\Textures\Attractions.png">
+          <Link>Content\Textures\Attractions.png</Link>
+        </None>
+        <None Include="..\TouchyTickets\Content\Textures\Tiles.aseprite">
+          <Link>Content\Textures\Tiles.aseprite</Link>
+        </None>
+        <None Include="..\TouchyTickets\Content\Textures\Tiles.png">
+          <Link>Content\Textures\Tiles.png</Link>
+        </None>
+        <None Include="..\TouchyTickets\Content\Textures\Ui.aseprite">
+          <Link>Content\Textures\Ui.aseprite</Link>
+        </None>
+        <None Include="..\TouchyTickets\Content\Textures\Ui.png">
+          <Link>Content\Textures\Ui.png</Link>
+        </None>
         <None Include="Properties\AndroidManifest.xml" />
-        <MonoGameContentReference Include="..\ThemeParkClicker\Content\Content.mgcb" />
         <None Include="..\ThemeParkClicker\Content\*\**" />
     </ItemGroup>
     <ItemGroup>
@@ -72,10 +95,15 @@
         <PackageReference Include="MonoGame.Framework.Android" Version="3.7.1.189" />
     </ItemGroup>
     <ItemGroup>
-      <ProjectReference Include="..\ThemeParkClicker\ThemeParkClicker.csproj">
+      <ProjectReference Include="..\TouchyTickets\TouchyTickets.csproj">
         <Project>{3df7ae69-f3f0-461a-be98-f31eb576b5e2}</Project>
-        <Name>ThemeParkClicker</Name>
+        <Name>TouchyTickets</Name>
       </ProjectReference>
     </ItemGroup>
+    <ItemGroup>
+      <MonoGameContentReference Include="..\TouchyTickets\Content\Content.mgcb">
+        <Link>Content\Content.mgcb</Link>
+      </MonoGameContentReference>
+    </ItemGroup>
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Android.Android" android:versionCode="1" android:versionName="1.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="TouchyTickets.Android" android:versionCode="1" android:versionName="1.0">
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
-  <application android:label="Android"></application>
+  <application android:label="Touchy Tickets"></application>
 </manifest>

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: AssemblyProduct("Touchy Tickets")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

Android/Resources/Values/Strings.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Android</string>
+  <string name="app_name">Touchy Tickets</string>
 </resources>

Desktop/.config/dotnet-tools.json

@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "dotnet-mgcb": {
-      "version": "3.8.0.1375-develop",
-      "commands": [
-        "mgcb"
-      ]
-    }
-  }
-}

Desktop/Desktop.csproj

@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
-        <PublishReadyToRun>false</PublishReadyToRun>
-        <TieredCompilation>false</TieredCompilation>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Contentless" Version="2.0.*" />
-        <PackageReference Include="MonoGame.Content.Builder" Version="3.7.0.9" />
-        <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1375-develop" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <MonoGameContentReference Include="..\ThemeParkClicker\Content\Content.mgcb" />
-        <None Include="..\ThemeParkClicker\Content\*\**" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\ThemeParkClicker\ThemeParkClicker.csproj" />
-    </ItemGroup>
-
-</Project>

Desktop/Program.cs

@@ -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<TextInputEventArgs>((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();
-        }
-
-    }
-}

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

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 {
 

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 {
 

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; }

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 {
 

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();

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;

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<Texture2D>("Textures/Ui"), 16, 16);