Revert "better threepeater bullets and sun position fix"

This reverts commit 36a1799.
ROBlNET13 · Oct 12, 2024 · 7b464e7 · 7b464e7
1 parent d4130f1
commit 7b464e7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 30 deletions.
diff --git a/game/Custom.css b/game/Custom.css
@@ -38,7 +38,7 @@
 }
 #sSunNum {
 	font-family: "continuumbold" !important;
-	margin-top: -5px !important;
+	margin-top: -2px !important;
 }
 #DivTeach {
 	width: 50% !important;
@@ -379,20 +379,3 @@ td {
 		transform: translate(0px, 0px);
 	}
 }
-
-@keyframes threepeaterDown { /* threepeaterDown 1.25s cubic-bezier(0.25, 0.46, 0.45, 0.94) forwards */
-	0% {
-		transform: translateY(0px);
-	}
-	100% {
-		transform: translateY(102px);
-	}
-}
-@keyframes threepeaterUp { /* threepeaterUp 1.25s cubic-bezier(0.25, 0.46, 0.45, 0.94) forwards */
-	0% {
-		transform: translateY(0px);
-	}
-	100% {
-		transform: translateY(-102px);
-	}
-}
diff --git a/game/js/CPlants.js b/game/js/CPlants.js
@@ -2000,36 +2000,40 @@ var CPlants = NewO({
 			f.BulletClass = [];
 			f.BulletEle = [];
 			for (b in c) {
-				let bullet = NewO({
-					X: e,
-					R: f.R,
-					D: 0,
-					Attack: 20,
-					Kind: 0,
-					ChangeC: 0,
-					pixelLeft: d,
-					F: oGd.MB1,
-				});
-				f.BulletClass.push(bullet);
+				f.BulletClass.push(
+					NewO({
+						X: e,
+						R: b,
+						D: 0,
+						Attack: 20,
+						Kind: 0,
+						ChangeC: 0,
+						pixelLeft: d,
+						F: oGd.MB1,
+					})
+				);
 				f.BulletEle.push(
 					NewImg(
 						0,
 						"images/Plants/PB00.gif",
 						"left:" +
 							d +
 							"px;top:" +
-							(GetY(f.R) - 65) +
+							(GetY(b) - 50) +
 							"px;visibility:hidden;z-index:" +
 							(3 * b + 2)
 					)
 				);
+<<<<<<< HEAD
 				if (b % 3 == 0) {
 					f.BulletEle[f.BulletEle.length - 1].style.animation =
 						`threepeaterDown ${(1.25 * $User.Visitor.TimeStep) / 10}s cubic-bezier(0.25, 0.46, 0.45, 0.94) forwards`;
 				} else if (b % 3 == 1) {
 					f.BulletEle[f.BulletEle.length - 1].style.animation =
 						`threepeaterUp ${(1.25 * $User.Visitor.TimeStep) / 10}s cubic-bezier(0.25, 0.46, 0.45, 0.94) forwards`;
 				}
+=======
+>>>>>>> parent of 36a1799 (better threepeater bullets and sun position fix)
 			}
 		},
 		PrivateDie: function (a) {