Merge branch 'develop'

DRKV333 · Jun 23, 2019 · 59e72f1 · 59e72f1
2 parents 94df965 + cf6f6d9
commit 59e72f1
Show file tree

Hide file tree

Showing 144 changed files with 1,208 additions and 286 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain
diff --git a/ContainerAdapters/ExtractinatorAdapter.cs b/ContainerAdapters/ExtractinatorAdapter.cs
@@ -345,11 +345,21 @@ public void Extract(int x, int y, int extractType)
                     num5 += Main.rand.Next(0, 6);
                 }
             }
+
+            int tempTargetX = Player.tileTargetX;
+            Player.tileTargetX = x;
+
+            int tempTargetY = Player.tileTargetY;
+            Player.tileTargetY = y;
+
             ItemLoader.ExtractinatorUse(ref num6, ref num5, extractType);
             if (num6 > 0)
             {
                 Item.NewItem(x * 16, y * 16, 1, 1, num6, num5, false, -1, false, false);
             }
+
+            Player.tileTargetX = tempTargetX;
+            Player.tileTargetY = tempTargetY;
         }
 
         public bool InjectItem(int x, int y, Item item)

diff --git a/Content/LivingHellstoneItem.png b/Content/LivingHellstoneItem.png
diff --git a/Content/LivingHellstoneItem.xcf b/Content/LivingHellstoneItem.xcf
diff --git a/Content/LivingHellstoneTile.png b/Content/LivingHellstoneTile.png
diff --git a/Content/LivingHellstoneTile.xcf b/Content/LivingHellstoneTile.xcf
diff --git a/Content/MagicStorageInterfaceTile.png b/Content/MagicStorageInterfaceTile.png
diff --git a/Content/MagicStorageInterfaceTile.xcf b/Content/MagicStorageInterfaceTile.xcf
diff --git a/Content/MechTransfer.gpl b/Content/MechTransfer.gpl
@@ -0,0 +1,20 @@
+GIMP Palette
+Name: MechTransfer
+Columns: 1
+#
+255   0 255	Padding
+ 20  20  20	Outline
+ 56  56  56	FillDark
+ 90  90  90	FillMid
+127 127 127	FillLight
+107   0   0	Input
+  0 107   0	Output
+255 104   0	Passthrough
+ 16 182 170	Super
+ 45  45  45	FillDarkAlt
+ 73  73  73	FillMidAlt
+146 146 146	FillLightAlt
+ 68   0   0	InputAlt
+  0  68   0	OutputAlt
+164  67   0	PassthroughAlt
+ 42 139 131	SuperAlt
diff --git a/Content/OmniTurretTile.png b/Content/OmniTurretTile.png
diff --git a/Content/OmniTurretTile.xcf b/Content/OmniTurretTile.xcf
diff --git a/Content/PlayerInterfaceItem.png b/Content/PlayerInterfaceItem.png
diff --git a/Content/PlayerInterfaceTile.png b/Content/PlayerInterfaceTile.png
diff --git a/Content/PlayerInterfaceTile.xcf b/Content/PlayerInterfaceTile.xcf
diff --git a/Content/PneumaticActuatorItem.png b/Content/PneumaticActuatorItem.png
diff --git a/Content/StackExtractorTile.png b/Content/StackExtractorTile.png
diff --git a/Content/TransferAssemblerTile.png b/Content/TransferAssemblerTile.png
diff --git a/Content/TransferExtractorTile.png b/Content/TransferExtractorTile.png
diff --git a/Content/TransferFilterTile.png b/Content/TransferFilterTile.png
diff --git a/Content/TransferGateTile.png b/Content/TransferGateTile.png
diff --git a/Content/TransferInjectorTile.png b/Content/TransferInjectorTile.png
diff --git a/Content/TransferInletItem.png b/Content/TransferInletItem.png
diff --git a/Content/TransferInletTile.png b/Content/TransferInletTile.png
diff --git a/Content/TransferOutletTile.png b/Content/TransferOutletTile.png
diff --git a/Content/TransferPipeTile.png b/Content/TransferPipeTile.png
diff --git a/Content/TransferRelayTile.png b/Content/TransferRelayTile.png
diff --git a/Content/Transitions.png b/Content/Transitions.png
diff --git a/Content/content.json b/Content/content.json
@@ -0,0 +1,99 @@
+{
+	"contentDir" : "",
+	"targetDir" : "..",
+	"preBatch" : [
+		"def ascale(i,x): return i.resize((int(i.width*x),int(i.height*x)), Image.NEAREST)",
+		"",
+		"def bettergridder(i,gridColor):",
+		"   j = Image.new(i.mode, (i.width, i.height))",
+		"   p = i.getpalette()",
+		"   if p != None: j.putpalette(p)",
+		"   j.info = i.info",
+		"   ipix = i.load()",
+		"   jpix = j.load()",
+		"   hmax = 0",
+		"   jx = 0",
+		"   for x in range(i.width):",
+		"      jy = 0",
+		"      for y in range(i.height):",
+		"         if ipix[x,y] != gridColor:",
+		"            jpix[jx,jy] = ipix[x,y]",
+		"            jy += 1",
+		"      if jy != 0: jx += 1",
+		"      hmax = max(hmax, jy)",
+		"   return j.crop((0,0,jx,hmax))"
+	],
+	"postBatch" : "pass",
+	"actionGroups" :
+	[
+		{
+			"name" : "stiles",
+			"action" : ">ascale(i,2)",
+			"files" :
+			[
+				{ "p" : "TransferPipeTile.png",          "t" : "Tiles" },
+				{ "p" : "TransferInjectorTile.png",      "t" : "Tiles" },
+				{ "p" : "TransferExtractorTile.png",     "t" : "Tiles" },
+				{ "p" : "StackExtractorTile.png",        "t" : "Tiles" },
+				{ "p" : "TransferFilterTile.png",        "t" : "Tiles" },
+				{ "p" : "TransferGateTile.png",          "t" : "Tiles" },
+				{ "p" : "TransferOutletTile.png",        "t" : "Tiles" },
+				{ "p" : "TransferRelayTile.png",         "t" : "Tiles" },
+				{ "p" : "TransferInletTile.png",         "t" : "Tiles" },
+				{ "p" : "OmniTurretTile.png",            "t" : "Tiles" },
+				{ "p" : "PlayerInterfaceTile.png",       "t" : "Tiles" },	
+				{ "p" : "MagicStorageInterfaceTile.png", "t" : "Tiles" },
+				{ "p" : "TransferAssemblerTile.png",     "t" : "Tiles" },
+				{ "p" : "LivingHellstoneTile.png",       "t" : "Tiles" } 
+			]
+		},
+		{
+			"name" : "citems",
+			"action" : ">i.crop((0,0,16,16))",
+			"files" :
+			[
+				{ "p" : ">stiles:TransferPipeTile.png",      "t" : "Items/TransferPipeItem.png"      },
+				{ "p" : ">stiles:TransferInjectorTile.png",  "t" : "Items/TransferInjectorItem.png"  },
+				{ "p" : ">stiles:TransferExtractorTile.png", "t" : "Items/TransferExtractorItem.png" },
+				{ "p" : ">stiles:StackExtractorTile.png",    "t" : "Items/StackExtractorItem.png"    },
+				{ "p" : ">stiles:TransferFilterTile.png",    "t" : "Items/TransferFilterItem.png"    },
+				{ "p" : ">stiles:TransferGateTile.png",      "t" : "Items/TransferGateItem.png"      },
+				{ "p" : ">stiles:TransferOutletTile.png",    "t" : "Items/TransferOutletItem.png"    },
+				{ "p" : ">stiles:TransferAssemblerTile.png", "t" : "Items/TransferAssemblerItem.png"    }
+			]
+		},
+		{ "name" : "cfilteraltitem", "action" : ">i.crop((0,18,16,18+16))",     "files" : [ { "p" : ">stiles:TransferFilterTile.png",    "t" : "Items/InverseTransferFilterItem.png" } ] },
+		{ "name" : "crelayitem",     "action" : ">i.crop((0,0,34,16))",	        "files" : [ { "p" : ">stiles:TransferRelayTile.png",     "t" : "$"                                   } ] },
+		{ "name" : "cturretitem1",   "action" : ">i.crop((0,0,34,36))",         "files" : [ { "p" : ">stiles:OmniTurretTile.png",        "t" : "$"                                   } ] },
+		{ "name" : "cturretitem2",   "action" : ">i.crop((36,0,36+34,36))",     "files" : [ { "p" : ">stiles:OmniTurretTile.png",        "t" : "$"                                   } ] },
+		{ "name" : "cturretitem3",   "action" : ">i.crop((72,76,72+34,76+36))", "files" : [ { "p" : ">stiles:OmniTurretTile.png",        "t" : "$"                                   } ] },
+		{
+			"name" : "remtilepad",
+			"action" : ">bettergridder(i,i.getpixel((16,0)))",
+			"files" :
+			[
+				{ "p" : ">crelayitem:TransferRelayTile.png",     "t" : "Items/TransferRelayItem.png"         },
+				{ "p" : ">stiles:MagicStorageInterfaceTile.png", "t" : "Items/MagicStorageInterfaceItem.png" },
+				{ "p" : ">cturretitem1:OmniTurretTile.png",      "t" : "Items/OmniTurretItem.png"            },
+				{ "p" : ">cturretitem2:OmniTurretTile.png",      "t" : "Items/SuperOmniTurretItem.png"       },
+				{ "p" : ">cturretitem3:OmniTurretTile.png",      "t" : "Items/MatterProjectorItem.png"       }
+
+			]
+		},
+		{
+			"name" : "smisc",
+			"action" : ">ascale(i, 2)",
+			"files" :
+			[
+				{ "p" : "PlayerInterfaceItem.png",   "t" : "Items" },
+				{ "p" : "PneumaticActuatorItem.png", "t" : "Items" },
+				{ "p" : "TransferInletItem.png",     "t" : "Items" },
+				{ "p" : "LivingHellstoneItem.png",   "t" : "Items" },
+				{ "p" : "Transitions.png",           "t" : "Tiles/Transitions/Top.png"}
+			]
+		},
+		{ "name" : "fliptransitions1", "action" : ">i.transpose(Image.ROTATE_90)", "files" : [ { "p" : ">smisc:Top.png",               "t" : "Tiles/Transitions/Left.png"   } ] },
+		{ "name" : "fliptransitions2", "action" : ">i.transpose(Image.ROTATE_90)", "files" : [ { "p" : ">fliptransitions1:Left.png",   "t" : "Tiles/Transitions/Bottom.png" } ] },
+		{ "name" : "fliptransitions3", "action" : ">i.transpose(Image.ROTATE_90)", "files" : [ { "p" : ">fliptransitions2:Bottom.png", "t" : "Tiles/Transitions/Right.png"  } ] }
+	]
+}
diff --git a/Items/InverseTransferFilterItem.png b/Items/InverseTransferFilterItem.png
diff --git a/Items/InverseTransferFilterItem.xcf b/Items/InverseTransferFilterItem.xcf
diff --git a/Items/ItemFilterItem.xcf b/Items/ItemFilterItem.xcf
diff --git a/Items/LivingHellstoneItem.png b/Items/LivingHellstoneItem.png
diff --git a/Items/MagicFilterItem.png b/Items/MagicFilterItem.png
diff --git a/Items/MagicStorageInterfaceItem.png b/Items/MagicStorageInterfaceItem.png
diff --git a/Items/MagicStorageInterfaceItem.xcf b/Items/MagicStorageInterfaceItem.xcf
diff --git a/Items/MatterProjectorItem.png b/Items/MatterProjectorItem.png
diff --git a/Items/MatterProjectorItem.xcf b/Items/MatterProjectorItem.xcf
diff --git a/Items/MeleeFilterItem.png b/Items/MeleeFilterItem.png
diff --git a/Items/OmniTurretItem.png b/Items/OmniTurretItem.png
diff --git a/Items/OmniTurretItem.xcf b/Items/OmniTurretItem.xcf
diff --git a/Items/PlayerInterfaceItem.png b/Items/PlayerInterfaceItem.png
diff --git a/Items/PlayerInterfaceItem.xcf b/Items/PlayerInterfaceItem.xcf
diff --git a/Items/PneumaticActuatorItem.cs b/Items/PneumaticActuatorItem.cs
@@ -5,12 +5,6 @@ namespace MechTransfer.Items
 {
     public class PneumaticActuatorItem : ModItem
     {
-        public override void SetStaticDefaults()
-        {
-            DisplayName.SetDefault("Pneumatic actuator");
-            Tooltip.SetDefault("Used to craft item transfer devices");
-        }
-
         public override void SetDefaults()
         {
             item.width = 26;

diff --git a/Items/PneumaticActuatorItem.png b/Items/PneumaticActuatorItem.png
diff --git a/Items/PneumaticActuatorItem.xcf b/Items/PneumaticActuatorItem.xcf
diff --git a/Items/RangedFilterItem.png b/Items/RangedFilterItem.png
diff --git a/Items/SimplePlaceableItem.cs b/Items/SimplePlaceableItem.cs