From b52c970a4083eb2663483f659a10e8d8ca3269ea Mon Sep 17 00:00:00 2001
From: LDip999 <ldip999@outlook.com>
Date: Sun, 22 Dec 2024 23:37:35 +0100
Subject: [PATCH 1/8] Tetris extra monies

---
 .../game/machinery/computer/arcade/tetris.dm  | 31 +++++++++++++++----
 tgui/src/interfaces/tetris/tetris.js          | 24 ++++++++++++--
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/modular_sand/code/game/machinery/computer/arcade/tetris.dm b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
index 19b7edde7d..9b25c5957d 100644
--- a/modular_sand/code/game/machinery/computer/arcade/tetris.dm
+++ b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
@@ -7,7 +7,13 @@
 #define TETRIS_SCORE_MAX_SCI 10000
 #define TETRIS_TIME_COOLDOWN 600
 #define TETRIS_NO_SCIENCE TRUE
-
+//Line bonus defines, for when you clear a set amount of rows in a single go. Beat Fenny with a newspaper if these values are unbalanced, it was their numbers
+#define L1_bonus 1
+#define L2_bonus 3
+#define L3_bonus 9
+#define L4_bonus 15
+//Maximum amount of line bonus monies
+#define MaxBonus 1000
 // Cooldown defines
 #define TETRIS_COOLDOWN_MAIN cooldown_timer
 
@@ -26,7 +32,10 @@
 			// Sanitize score as an integer
 			// Restricts maximum score to (default) 100,000
 			var/temp_score = sanitize_num_clamp(text2num(href_list["tetrisScore"]), max=TETRIS_SCORE_MAX)
-
+			var/l1 = sanitize_num_clamp(text2num(href_list["Lines1"]),max= 100)
+			var/l2 = sanitize_num_clamp(text2num(href_list["Lines2"]), max= 100)
+			var/l3 = sanitize_num_clamp(text2num(href_list["Lines3"]), max= 100)
+			var/l4 = sanitize_num_clamp(text2num(href_list["Lines4"]), max = 100)
 			// Check for high score
 			if(temp_score > TETRIS_SCORE_HIGH)
 				// Alert admins
@@ -34,7 +43,13 @@
 
 			// Round and clamp prize count from 0 to (default) 5
 			var/reward_count = clamp(round(temp_score/TETRIS_REWARD_DIVISOR), 0, TETRIS_PRIZES_MAX)
-
+			var/linesbonus = 0
+			linesbonus = (l1 * L1_bonus) + (l2*L2_bonus) + (l3*L3_bonus) + (l4 * L4_bonus)
+			if(linesbonus > 0)
+				var/obj/item/stack/f13Cash/caps/linesbonuscash = new /obj/item/stack/f13Cash/caps();
+				linesbonuscash.amount = linesbonus;
+			 	visible_message(span_notice("[src] dispenses [linesbonuscash]!"), span_notice("I hear a chime and a clunk."))
+				linesbonuscash.forceMove(get_turf(src))
 			// Define score text
 			var/score_text = (reward_count ? temp_score : "PATHETIC! TRY HARDER")
 
@@ -61,7 +76,7 @@
 			// Vend prizes
 			for(var/i = 0; i < reward_count; i++)
 				prizevend(usr)
-
+			
 			// Check if science points are possible and allowed
 			if((!SSresearch.science_tech) || TETRIS_NO_SCIENCE)
 				return
@@ -107,8 +122,8 @@
 	<META HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=iso-8859-1'>
 	<title>Telemetry Enhanced Testing and Research Informatic Simulator</title>
 	<script language='JavaScript'>
-	function submitScore(s){
-		window.location.href = 'byond://?src=\ref[src];tetrisScore=' + s;
+	function submitScore(s,l1,l2,l3,l4){
+		window.location.href = 'byond://?src=\ref[src];tetrisScore=' + s + '&Lines1=' + l1 + '&Lines2=' + l2 +'&Lines3=' + l3 + "&Lines4="+ l4;
 	}
 	</script>
 	<script language='JavaScript1.2'>
@@ -168,3 +183,7 @@
 #undef TETRIS_TIME_COOLDOWN
 #undef TETRIS_NO_SCIENCE
 #undef TETRIS_COOLDOWN_MAIN
+#undef L1_bonus 
+#undef L2_bonus 
+#undef L3_bonus 
+#undef L4_bonus 
\ No newline at end of file
diff --git a/tgui/src/interfaces/tetris/tetris.js b/tgui/src/interfaces/tetris/tetris.js
index 0abb6a8614..4fa2770403 100644
--- a/tgui/src/interfaces/tetris/tetris.js
+++ b/tgui/src/interfaces/tetris/tetris.js
@@ -1,4 +1,4 @@
-var i, j, IsOver, MaxX=10, MaxY=20, NextCol, Col, Score, Lines, IsHideFocus=true;
+var i, j, IsOver, MaxX=10, MaxY=20, NextCol, Col, Score, Lines, IsHideFocus=true, Lines1, Lines2, Lines3, Lines4;
 PosX=new Array(4);
 PosY=new Array(4);
 Delay=new Array(828,620,464,348,260,196,148,112,84,64,48,36,27);
@@ -74,6 +74,10 @@ function Init(nn)
     Score=0;
     Level=1;
     Lines=0;
+    Lines1=0;
+    Lines2=0;
+    Lines3=0;
+    Lines4=0;
     window.document.ScoreForm.Score.value = Score;
     window.document.ScoreForm.Level.value = Level;
     window.document.ScoreForm.Lines.value = Lines;
@@ -102,7 +106,7 @@ function Go()
           document.images[PosX[nn]+MaxX*(PosY[nn]-1)].src = Pic[Col+1].src;
       }
       //if (confirm("Super, you got a score of "+Score+" ! Play again ?")) Init(true);
-	  submitScore(Score);
+	  submitScore(Score,Lines1,Lines2,Lines3,Lines4);
       return;
     }
     for (nn=0; nn<4; nn++)
@@ -296,6 +300,22 @@ function Remove()
       }
     }
   }
+  switch(nn){
+    case 0:
+      break;
+    case 1:
+      Lines1++;
+      break;
+    case 2:
+      Lines2++;
+      break;
+    case 3:
+      Lines3++;
+      break;
+    case 4:
+      Lines4++;
+      break;
+  }
   Score+=100*nn;
   Lines+=nn;
   if ((Score>=1500*Level)&&(Level<12)) Level++;

From 6d5348cd3f13e22c60adad333e57ed90cbc952f3 Mon Sep 17 00:00:00 2001
From: LDip999 <ldip999@outlook.com>
Date: Sun, 22 Dec 2024 23:41:58 +0100
Subject: [PATCH 2/8] Unused line b gone

---
 modular_sand/code/game/machinery/computer/arcade/tetris.dm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modular_sand/code/game/machinery/computer/arcade/tetris.dm b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
index 9b25c5957d..4bcc4e6516 100644
--- a/modular_sand/code/game/machinery/computer/arcade/tetris.dm
+++ b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
@@ -12,8 +12,6 @@
 #define L2_bonus 3
 #define L3_bonus 9
 #define L4_bonus 15
-//Maximum amount of line bonus monies
-#define MaxBonus 1000
 // Cooldown defines
 #define TETRIS_COOLDOWN_MAIN cooldown_timer
 

From aad5297634436f636a1b229832b66b17cd5568bf Mon Sep 17 00:00:00 2001
From: LDip999 <ldip999@outlook.com>
Date: Sun, 22 Dec 2024 23:45:58 +0100
Subject: [PATCH 3/8] What is going on

---
 modular_sand/code/game/machinery/computer/arcade/tetris.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_sand/code/game/machinery/computer/arcade/tetris.dm b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
index 4bcc4e6516..83dd7725d5 100644
--- a/modular_sand/code/game/machinery/computer/arcade/tetris.dm
+++ b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
@@ -184,4 +184,4 @@
 #undef L1_bonus 
 #undef L2_bonus 
 #undef L3_bonus 
-#undef L4_bonus 
\ No newline at end of file
+#undef L4_bonus 

From 79c1606d986818cf48feb050ad1d411431f9e60f Mon Sep 17 00:00:00 2001
From: LDip999 <ldip999@outlook.com>
Date: Mon, 23 Dec 2024 00:14:38 +0100
Subject: [PATCH 4/8] Makes the tetris machine less mean >:(

---
 modular_sand/code/game/machinery/computer/arcade/tetris.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_sand/code/game/machinery/computer/arcade/tetris.dm b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
index 83dd7725d5..c1aaead697 100644
--- a/modular_sand/code/game/machinery/computer/arcade/tetris.dm
+++ b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
@@ -49,7 +49,7 @@
 			 	visible_message(span_notice("[src] dispenses [linesbonuscash]!"), span_notice("I hear a chime and a clunk."))
 				linesbonuscash.forceMove(get_turf(src))
 			// Define score text
-			var/score_text = (reward_count ? temp_score : "PATHETIC! TRY HARDER")
+			var/score_text = (reward_count ? temp_score : "You can do it! I believe in you!")
 
 			// Display normal message
 			say("YOUR SCORE: [score_text]!")

From ee31fd4e3d75d10b777c92c773d77cac7cbf64e2 Mon Sep 17 00:00:00 2001
From: LDip999 <ldip999@outlook.com>
Date: Mon, 23 Dec 2024 00:31:29 +0100
Subject: [PATCH 5/8] It runs on my machine TM

---
 modular_sand/code/game/machinery/computer/arcade/tetris.dm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modular_sand/code/game/machinery/computer/arcade/tetris.dm b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
index c1aaead697..6e37438d10 100644
--- a/modular_sand/code/game/machinery/computer/arcade/tetris.dm
+++ b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
@@ -41,11 +41,10 @@
 
 			// Round and clamp prize count from 0 to (default) 5
 			var/reward_count = clamp(round(temp_score/TETRIS_REWARD_DIVISOR), 0, TETRIS_PRIZES_MAX)
-			var/linesbonus = 0
-			linesbonus = (l1 * L1_bonus) + (l2*L2_bonus) + (l3*L3_bonus) + (l4 * L4_bonus)
+			var/linesbonus = ((l1 * L1_bonus) + (l2*L2_bonus) + (l3*L3_bonus) + (l4 * L4_bonus))
 			if(linesbonus > 0)
-				var/obj/item/stack/f13Cash/caps/linesbonuscash = new /obj/item/stack/f13Cash/caps();
-				linesbonuscash.amount = linesbonus;
+				var/obj/item/stack/f13Cash/caps/linesbonuscash = new /obj/item/stack/f13Cash/caps
+				linesbonuscash.amount = linesbonus + 0 //This doesn't work without the + 0. Why? Has I ever?
 			 	visible_message(span_notice("[src] dispenses [linesbonuscash]!"), span_notice("I hear a chime and a clunk."))
 				linesbonuscash.forceMove(get_turf(src))
 			// Define score text

From d5ecaa3b7922c6bea0d0bbf9e22f93f4ab92db76 Mon Sep 17 00:00:00 2001
From: LDip999 <ldip999@outlook.com>
Date: Mon, 23 Dec 2024 00:41:22 +0100
Subject: [PATCH 6/8] Was it really that extra breakline?

---
 modular_sand/code/game/machinery/computer/arcade/tetris.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modular_sand/code/game/machinery/computer/arcade/tetris.dm b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
index 6e37438d10..d6f144de6a 100644
--- a/modular_sand/code/game/machinery/computer/arcade/tetris.dm
+++ b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
@@ -47,6 +47,7 @@
 				linesbonuscash.amount = linesbonus + 0 //This doesn't work without the + 0. Why? Has I ever?
 			 	visible_message(span_notice("[src] dispenses [linesbonuscash]!"), span_notice("I hear a chime and a clunk."))
 				linesbonuscash.forceMove(get_turf(src))
+				
 			// Define score text
 			var/score_text = (reward_count ? temp_score : "You can do it! I believe in you!")
 

From 7a6e7229a210674f5974a9fb5e896bd1631a0156 Mon Sep 17 00:00:00 2001
From: LDip999 <ldip999@outlook.com>
Date: Mon, 23 Dec 2024 00:42:47 +0100
Subject: [PATCH 7/8] Hiding the evidence of my wrongdoing

---
 modular_sand/code/game/machinery/computer/arcade/tetris.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modular_sand/code/game/machinery/computer/arcade/tetris.dm b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
index d6f144de6a..4f6a6f8d55 100644
--- a/modular_sand/code/game/machinery/computer/arcade/tetris.dm
+++ b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
@@ -44,8 +44,8 @@
 			var/linesbonus = ((l1 * L1_bonus) + (l2*L2_bonus) + (l3*L3_bonus) + (l4 * L4_bonus))
 			if(linesbonus > 0)
 				var/obj/item/stack/f13Cash/caps/linesbonuscash = new /obj/item/stack/f13Cash/caps
-				linesbonuscash.amount = linesbonus + 0 //This doesn't work without the + 0. Why? Has I ever?
 			 	visible_message(span_notice("[src] dispenses [linesbonuscash]!"), span_notice("I hear a chime and a clunk."))
+				linesbonuscash.amount = linesbonus
 				linesbonuscash.forceMove(get_turf(src))
 				
 			// Define score text

From 9cdd4c090a20433aa834b81b8aca8c658cad249c Mon Sep 17 00:00:00 2001
From: LDip999 <ldip999@outlook.com>
Date: Mon, 23 Dec 2024 00:57:30 +0100
Subject: [PATCH 8/8] This should work?

---
 modular_sand/code/game/machinery/computer/arcade/tetris.dm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modular_sand/code/game/machinery/computer/arcade/tetris.dm b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
index 4f6a6f8d55..a8623e0e4b 100644
--- a/modular_sand/code/game/machinery/computer/arcade/tetris.dm
+++ b/modular_sand/code/game/machinery/computer/arcade/tetris.dm
@@ -43,10 +43,9 @@
 			var/reward_count = clamp(round(temp_score/TETRIS_REWARD_DIVISOR), 0, TETRIS_PRIZES_MAX)
 			var/linesbonus = ((l1 * L1_bonus) + (l2*L2_bonus) + (l3*L3_bonus) + (l4 * L4_bonus))
 			if(linesbonus > 0)
-				var/obj/item/stack/f13Cash/caps/linesbonuscash = new /obj/item/stack/f13Cash/caps
-			 	visible_message(span_notice("[src] dispenses [linesbonuscash]!"), span_notice("I hear a chime and a clunk."))
-				linesbonuscash.amount = linesbonus
-				linesbonuscash.forceMove(get_turf(src))
+				var/obj/item/stack/f13Cash/moneytodrop = new /obj/item/stack/f13Cash/caps(get_turf(src))
+				moneytodrop.amount = linesbonus
+				visible_message(span_notice("[src] dispenses [moneytodrop]!"), span_notice("I hear a chime and a clunk."))
 				
 			// Define score text
 			var/score_text = (reward_count ? temp_score : "You can do it! I believe in you!")