From a90e0e56181ca3e254047d5688aa3416b27d2a2c Mon Sep 17 00:00:00 2001
From: "Laetitia (O-01-67)" <68935009+O-01-67@users.noreply.github.com>
Date: Mon, 6 Mar 2023 19:54:29 -0500
Subject: [PATCH] e-pushers and pushStrength parameter

---
 mods/pushers.js | 282 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 245 insertions(+), 37 deletions(-)

diff --git a/mods/pushers.js b/mods/pushers.js
index 2a7c890b..16abe8c2 100644
--- a/mods/pushers.js
+++ b/mods/pushers.js
@@ -1,79 +1,287 @@
 elements.up_pusher = {
+	color: "#9fafdf",
 	properties: {
 		range: 10,
+		pushStrength: 1,
 	},
-	color: "#7f7f7f",
-	tick: function(pixel) {
-		if(!pixel.range) {
-			pixel.range = 10;
-		};
-		for(i=(pixel.range - 1); i>=0; i--) { //9 -> 10
-			if (!isEmpty(pixel.x,pixel.y-1-i,true)) {
-				tryMove(pixelMap[pixel.x][pixel.y-1-i],pixel.x,pixel.y-2-i);
+	tick: function(pixel) { 
+		pixel.range ??= 10;
+		pixel.pushStrength ??= 1;
+
+		for(h = 0; h < pixel.pushStrength; h++) {
+			for(i=(pixel.range - 1); i>=0; i--) {
+				if (!isEmpty(pixel.x,pixel.y-1-i,true)) {
+					tryMove(pixelMap[pixel.x][pixel.y-1-i],pixel.x,pixel.y-2-i);
+				};
 			};
 		};
+		
+		doDefaults(pixel);
 	},
 	category: "machines",
-	insulate: true,
+	breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
+	tempHigh: 2400,
+	stateHigh: ["molten_aluminum", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
+	density: 10000,
+	hardness: 0.85,
+	conduct: 1,
 	state: "solid",
 }
 
 elements.down_pusher = {
-	color: "#7f7f7f",
+	color: "#9fafdf",
 	properties: {
 		range: 10,
+		pushStrength: 1,
 	},
-	tick: function(pixel) {
-		if(!pixel.range) {
-			pixel.range = 10;
-		};
-		for(i=(pixel.range - 1); i>=0; i--) {
-			if (!isEmpty(pixel.x,pixel.y+1+i,true)) {
-				tryMove(pixelMap[pixel.x][pixel.y+1+i],pixel.x,pixel.y+2+i);
+	tick: function(pixel) { 
+		pixel.range ??= 10;
+		pixel.pushStrength ??= 1;
+
+			for(h = 0; h < pixel.pushStrength; h++) {
+				for(i=(pixel.range - 1); i>=0; i--) {
+					if (!isEmpty(pixel.x,pixel.y+1+i,true)) {
+						tryMove(pixelMap[pixel.x][pixel.y+1+i],pixel.x,pixel.y+2+i);
+					};
+				};
 			};
-		};
+
+		doDefaults(pixel);
 	},
 	category: "machines",
-	insulate: true,
+	breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
+	tempHigh: 2400,
+	stateHigh: ["molten_aluminum0", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
+	density: 10000,
+	hardness: 0.85,
+	conduct: 1,
 	state: "solid",
 }
 
 elements.left_pusher = {
-	color: "#7f7f7f",
+	color: "#9fafdf",
 	properties: {
 		range: 10,
+		pushStrength: 1,
 	},
-	tick: function(pixel) {
-		if(!pixel.range) {
-			pixel.range = 10;
-		};
-		for(i=(pixel.range - 1); i>=0; i--) {
-			if (!isEmpty(pixel.x-1-i,pixel.y,true)) {
-				tryMove(pixelMap[pixel.x-1-i][pixel.y],pixel.x-2-i,pixel.y);
+	tick: function(pixel) { 
+		pixel.range ??= 10;
+		pixel.pushStrength ??= 1;
+
+		for(h = 0; h < pixel.pushStrength; h++) {
+			for(i=(pixel.range - 1); i>=0; i--) {
+				if (!isEmpty(pixel.x-1-i,pixel.y,true)) {
+					tryMove(pixelMap[pixel.x-1-i][pixel.y],pixel.x-2-i,pixel.y);
+				};
 			};
 		};
+
+		doDefaults(pixel);
 	},
 	category: "machines",
-	insulate: true,
+	breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
+	tempHigh: 2400,
+	stateHigh: ["molten_aluminum", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
+	density: 10000,
+	hardness: 0.85,
+	conduct: 1,
 	state: "solid",
 }
 
 elements.right_pusher = {
-	color: "#7f7f7f",
+	color: "#9fafdf",
 	properties: {
 		range: 10,
+		pushStrength: 1,
 	},
-	tick: function(pixel) {
-		if(!pixel.range) {
-			pixel.range = 10;
-		};
-		for(i=(pixel.range - 1); i>=0; i--) {
-			if (!isEmpty(pixel.x+1+i,pixel.y,true)) {
-				tryMove(pixelMap[pixel.x+1+i][pixel.y],pixel.x+2+i,pixel.y);
+	tick: function(pixel) { 
+		pixel.range ??= 10;
+		pixel.pushStrength ??= 1;
+
+		for(h = 0; h < pixel.pushStrength; h++) {
+			for(i=(pixel.range - 1); i>=0; i--) {
+				if (!isEmpty(pixel.x+1+i,pixel.y,true)) {
+					tryMove(pixelMap[pixel.x+1+i][pixel.y],pixel.x+2+i,pixel.y);
+				};
 			};
 		};
+
+		doDefaults(pixel);
 	},
 	category: "machines",
-	insulate: true,
+	breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
+	tempHigh: 2400,
+	stateHigh: ["molten_aluminum", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
+	density: 10000,
+	hardness: 0.85,
+	conduct: 1,
+	state: "solid",
+}
+
+elements.up_e_pusher = {
+	color: "#9f9f6f",
+	properties: {
+		range: 10,
+		pushTime: 0,
+		pushLength: 5,
+		pushStrength: 1,
+	},
+	tick: function(pixel) { 
+		pixel.range ??= 10;
+		pixel.pushTime ??= 0;
+		pixel.pushLength ??= 5;
+		pixel.pushStrength ??= 1;
+		if(isNaN(pixel.pushTime) || pixel.pushTime < 0) { pixel.pushTime = 0 };
+
+		if(pixel.charge) {
+			pixel.pushTime = pixel.pushLength;
+		};
+
+		if(pixel.pushTime > 0) {
+			for(h = 0; h < pixel.pushStrength; h++) {
+				for(i=(pixel.range - 1); i>=0; i--) {
+					if (!isEmpty(pixel.x,pixel.y-1-i,true)) {
+						tryMove(pixelMap[pixel.x][pixel.y-1-i],pixel.x,pixel.y-2-i);
+					};
+				};
+			};
+			pixel.pushTime--;
+		};
+		
+		doDefaults(pixel);
+	},
+	category: "machines",
+	breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
+	tempHigh: 2400,
+	stateHigh: ["molten_aluminum", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
+	density: 10000,
+	hardness: 0.85,
+	conduct: 1,
+	state: "solid",
+}
+
+elements.down_e_pusher = {
+	color: "#9f9f6f",
+	properties: {
+		range: 10,
+		pushTime: 0,
+		pushLength: 5,
+		pushStrength: 1,
+	},
+	tick: function(pixel) { 
+		pixel.range ??= 10;
+		pixel.pushTime ??= 0;
+		pixel.pushLength ??= 5;
+		pixel.pushStrength ??= 1;
+		if(isNaN(pixel.pushTime) || pixel.pushTime < 0) { pixel.pushTime = 0 };
+
+		if(pixel.charge) {
+			pixel.pushTime = pixel.pushLength;
+		};
+
+		if(pixel.pushTime > 0) {
+			for(h = 0; h < pixel.pushStrength; h++) {
+				for(i=(pixel.range - 1); i>=0; i--) {
+					if (!isEmpty(pixel.x,pixel.y+1+i,true)) {
+						tryMove(pixelMap[pixel.x][pixel.y+1+i],pixel.x,pixel.y+2+i);
+					};
+				};
+			};
+			pixel.pushTime--;
+		};
+
+		doDefaults(pixel);
+	},
+	category: "machines",
+	breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
+	tempHigh: 2400,
+	stateHigh: ["molten_aluminum0", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
+	density: 10000,
+	hardness: 0.85,
+	conduct: 1,
+	state: "solid",
+}
+
+elements.left_e_pusher = {
+	color: "#9f9f6f",
+	properties: {
+		range: 10,
+		pushTime: 0,
+		pushLength: 5,
+		pushStrength: 1,
+	},
+	tick: function(pixel) { 
+		pixel.range ??= 10;
+		pixel.pushTime ??= 0;
+		pixel.pushLength ??= 5;
+		pixel.pushStrength ??= 1;
+		if(isNaN(pixel.pushTime) || pixel.pushTime < 0) { pixel.pushTime = 0 };
+
+		if(pixel.charge) {
+			pixel.pushTime = pixel.pushLength;
+		};
+
+		if(pixel.pushTime > 0) {
+			for(h = 0; h < pixel.pushStrength; h++) {
+				for(i=(pixel.range - 1); i>=0; i--) {
+					if (!isEmpty(pixel.x-1-i,pixel.y,true)) {
+						tryMove(pixelMap[pixel.x-1-i][pixel.y],pixel.x-2-i,pixel.y);
+					};
+				};
+			};
+			pixel.pushTime--;
+		};
+
+		doDefaults(pixel);
+	},
+	category: "machines",
+	breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
+	tempHigh: 2400,
+	stateHigh: ["molten_aluminum", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
+	density: 10000,
+	hardness: 0.85,
+	conduct: 1,
+	state: "solid",
+}
+
+elements.right_e_pusher = {
+	color: "#9f9f6f",
+	properties: {
+		range: 10,
+		pushTime: 0,
+		pushLength: 5,
+		pushStrength: 1,
+	},
+	tick: function(pixel) { 
+		pixel.range ??= 10;
+		pixel.pushTime ??= 0;
+		pixel.pushLength ??= 5;
+		pixel.pushStrength ??= 1;
+		if(isNaN(pixel.pushTime) || pixel.pushTime < 0) { pixel.pushTime = 0 };
+
+		if(pixel.charge) {
+			pixel.pushTime = pixel.pushLength;
+		};
+
+		if(pixel.pushTime > 0) {
+			for(h = 0; h < pixel.pushStrength; h++) {
+				for(i=(pixel.range - 1); i>=0; i--) {
+					if (!isEmpty(pixel.x+1+i,pixel.y,true)) {
+						tryMove(pixelMap[pixel.x+1+i][pixel.y],pixel.x+2+i,pixel.y);
+					};
+				};
+			};
+			pixel.pushTime--;
+		};
+
+		doDefaults(pixel);
+	},
+	category: "machines",
+	breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
+	tempHigh: 2400,
+	stateHigh: ["molten_aluminum", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
+	density: 10000,
+	hardness: 0.85,
+	conduct: 1,
 	state: "solid",
 }