v1.3.2.1

* Added config setting 'Enabled' (allows disabling the mod instead of unloading it)
* Added shop prices markup % indicators as item tooltips

CapitalismMod.cs

@@ -10,6 +10,8 @@ namespace Capitalism {
 	public class ConfigurationData {
 		public string VersionSinceUpdate = "";
 
+		public bool Enabled = true;
+
 		public float MarkupExponent = 0.8f;
 		public float MarkupDivisor = 50f;
 		public float TaxMarkupPercent = 1.02f;
@@ -25,7 +27,7 @@ public class ConfigurationData {
 
 
 	public class CapitalismMod : Mod {
-		public readonly static Version ConfigVersion = new Version(1, 3, 0);
+		public readonly static Version ConfigVersion = new Version(1, 3, 2);
 		public JsonConfig<ConfigurationData> Config { get; private set; }
 
 
@@ -88,6 +90,8 @@ public override void HandlePacket( BinaryReader reader, int whoAmI ) {
 		////////////////
 
 		public override void PostDrawInterface( SpriteBatch sb ) {
+			if( !this.Config.Data.Enabled ) { return; }
+
 			DebugHelper.PrintToBatch( sb );
 		}
 	}

CapitalismNPC.cs

@@ -6,6 +6,9 @@
 namespace Capitalism {
 	class CapitalismNPC : GlobalNPC {
 		public override void SetupShop( int npc_type, Chest shop, ref int next_slot ) {
+			var mymod = (CapitalismMod)this.mod;
+			if( !mymod.Config.Data.Enabled ) { return; }
+
 			try {
 				Player player = Main.player[Main.myPlayer];
 				var modplayer = player.GetModPlayer<CapitalismPlayer>( this.mod );
@@ -20,6 +23,9 @@ public override void SetupShop( int npc_type, Chest shop, ref int next_slot ) {
 
 		public override bool CheckDead( NPC npc ) {
 			bool check = base.CheckDead( npc );
+			var mymod = (CapitalismMod)this.mod;
+			if( !mymod.Config.Data.Enabled ) { return check; }
+
 			try {
 				Player player = Main.player[Main.myPlayer];
 				if( player != null ) { return check; }

CapitalismNetProtocol.cs

@@ -11,7 +11,7 @@ public enum CapitalismNetProtocolTypes : byte {
 
 
 
-	public class CapitalismNetProtocol {
+	public static class CapitalismNetProtocol {
 		public static void RoutePacket( CapitalismMod mymod, BinaryReader reader ) {
 			CapitalismNetProtocolTypes protocol = (CapitalismNetProtocolTypes)reader.ReadByte();
 

CapitalismPlayer.cs

@@ -73,6 +73,9 @@ public override TagCompound Save() {
 		////////////////
 
 		public override void PreUpdate() {
+			var mymod = (CapitalismMod)this.mod;
+			if( !mymod.Config.Data.Enabled ) { return; }
+
 			this.Logic.Update( (CapitalismMod)this.mod, this.player );
 		}
 

Logic/VendorLogic.cs

@@ -88,8 +88,15 @@ public void UpdateShop( CapitalismMod mymod, Chest shop = null ) {
 				// Update only the first instance of an item
 				if( found_types.Contains(item.type) ) { continue; }
 				found_types.Add( item.type );
-
-				item.value = this.UpdateShopItem( mymod, item, shop );
+
+				int value = this.UpdateShopItem( mymod, item, shop );
+				double base_price = (double)this.BasePrices[ item.type ];
+				double markup = ((double)value - base_price) / base_price;
+
+				item.value = value;
+				if( markup >= 0.001d ) {
+					item.toolTip2 = "Has +" + (markup * 100d).ToString("N0") + "% markup";
+				}
 			}
 		}
 

build.txt

@@ -1,5 +1,5 @@
 author = hamstar
-version = 1.3.1
+version = 1.3.2.1
 displayName = Capitalism
 buildIgnore = *.csproj, *.user, obj\*, bin\*, .vs\*
 includePDB = false

capitalism todo.txt

@@ -2,6 +2,9 @@ v1.4.0
 -	Implement sell prices
 -	Add supply limits of items (based on price)
 
+v1.3.2
+-	Add 'Enabled' config setting
+-	Add tooltips to shop items to indicate total markup
 v1.2.1
 -	Change formula to use 'total spent' instead of 'total purchases'
 v1.2.0