From a886088f486802153df5271e1644518ec08af854 Mon Sep 17 00:00:00 2001 From: Cheese Date: Mon, 30 Nov 2015 10:15:50 +1100 Subject: [PATCH] more changes --- .../game/clans/clans/map/ItemMapRenderer.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapRenderer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapRenderer.java index a1e264b4d..841d703b2 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapRenderer.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapRenderer.java @@ -103,18 +103,17 @@ public class ItemMapRenderer extends MapRenderer if (owningClan.getName().equals("Shops")) { clanColor = Color.WHITE; - - if (relation == ClansUtility.ClanRelation.SAFE) - clanColor2 = Color.CYAN; + clanColor2 = Color.CYAN; } else if (owningClan.getName().equals("Spawn")) { clanColor = Color.WHITE; + clanColor2 = Color.GREEN; } if (owningClan.getName().equals("Fields")) { clanColor = Color.WHITE; - clanColor2 = Color.ORANGE; + clanColor2 = Color.RED; } else { @@ -151,12 +150,7 @@ public class ItemMapRenderer extends MapRenderer int chunkX1 = (int) Math.floor(blockX / 16D); int chunkZ1 = (int) Math.floor(blockZ / 16D); - //Checkin' - boolean checker = (mapX + (mapZ % 3)) % 3 == 0; - Color drawColor = clanColor; - if (checker && clanColor2 != null) - drawColor = clanColor2; - + //Inside if (colorAll || @@ -178,6 +172,16 @@ public class ItemMapRenderer extends MapRenderer { Color cColor = MapPalette.getColor(color); double clans = colorAll ? 1 : 0.8;// 0.65; + + //Stripes + boolean checker = (mapX + (mapZ % 3)) % 3 == 0; + Color drawColor = clanColor; + if (checker && clanColor2 != null) + { + drawColor = clanColor2; + clans = 0.65; + } + double base = 1 - clans; int r = (int) ((cColor.getRed() * base) + (drawColor.getRed() * clans)); @@ -192,6 +196,14 @@ public class ItemMapRenderer extends MapRenderer Color cColor = MapPalette.getColor(color); double clans = 0.65;// 0.4; + + //Use clanColor2 no matter what for admins + Color drawColor = clanColor; + if (owningClan.isAdmin() && clanColor2 != null) + { + drawColor = clanColor2; + } + double base = 1 - clans; int r = (int) ((cColor.getRed() * base) + (drawColor.getRed() * clans));