From 917c65d6b8ccb275c619db54080f867cfa309c76 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Sun, 27 May 2012 12:31:39 -0600 Subject: [PATCH] Added scam warning Version ticked a little early --- TShockAPI/Properties/AssemblyInfo.cs | 4 ++-- TShockAPI/TShock.cs | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs index f6c1764b..c3083d8a 100644 --- a/TShockAPI/Properties/AssemblyInfo.cs +++ b/TShockAPI/Properties/AssemblyInfo.cs @@ -48,5 +48,5 @@ using System.Runtime.InteropServices; // Build Number // MMdd of the build -[assembly: AssemblyVersion("3.9.0.0526")] -[assembly: AssemblyFileVersion("3.9.0.0526")] +[assembly: AssemblyVersion("3.9.1.0526")] +[assembly: AssemblyFileVersion("3.9.1.0526")] diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index bfb3f8c9..677e0016 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -44,7 +44,7 @@ namespace TShockAPI private static string LogFormat = LogFormatDefault; private static bool LogClear = false; public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version; - public static readonly string VersionCodename = "Zack time: 1 week = 3 months"; + public static readonly string VersionCodename = "4.x & 50th download milestone"; public static string SavePath = "tshock"; @@ -131,7 +131,11 @@ namespace TShockAPI #endif AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; - getTShockAscii(); + if (Version.Major >= 4) + { + getTShockAscii(); + } + try { @@ -200,7 +204,7 @@ namespace TShockAPI if (Config.EnableGeoIP && File.Exists(geoippath)) Geo = new GeoIPCountry(geoippath); - Log.ConsoleInfo(string.Format("TerrariaShock Version {0} ({1}) now running.", Version, VersionCodename)); + Log.ConsoleInfo(string.Format("|> Version {0} ({1}) now running.", Version, VersionCodename)); GameHooks.PostInitialize += OnPostInit; GameHooks.Update += OnUpdate; @@ -259,6 +263,7 @@ namespace TShockAPI " \\__\\/ /__/:/ \\ \\:\\ \\ \\::/ \\ \\::/ \\ \\:\\ \n" + " \\__\\/ \\__\\/ \\__\\/ \\__\\/ \\__\\/ \n" + ""); + Console.WriteLine("TShock for Terraria is open & free software. If you paid, you were scammed."); // ReSharper restore LocalizableElement }