check top row bug

Author: kirjavascript

tests/src/floor.rs

@@ -57,9 +57,7 @@ fn test_floor() {
 fn test_floor_linecap() {
     let mut emu = util::emulator(None);
 
-    for _ in 0..3 {
-        emu.run_until_vblank();
-    }
+    for _ in 0..3 { emu.run_until_vblank(); }
 
     let practise_type = labels::get("practiseType") as usize;
     let game_mode = labels::get("gameMode") as usize;
@@ -76,9 +74,7 @@ fn test_floor_linecap() {
 
     emu.registers.pc = main_loop;
 
-    for _ in 0..5 {
-        emu.run_until_vblank();
-    }
+    for _ in 0..5 { emu.run_until_vblank(); }
 
     // get some tetrises
 
@@ -96,9 +92,7 @@ fn test_floor_linecap() {
 ##### ####
 ##### ####"##);
 
-        for _ in 0..40 {
-            emu.run_until_vblank();
-        }
+        for _ in 0..40 { emu.run_until_vblank(); }
     }
 
     // check rows aren't pulled from the top in linecap floor mode
@@ -132,9 +126,7 @@ fn test_floor0() {
 
     emu.registers.pc = main_loop;
 
-    for _ in 0..5 {
-        emu.run_until_vblank();
-    }
+    for _ in 0..5 { emu.run_until_vblank(); }
 
     // setup a tetris
 
@@ -150,9 +142,7 @@ fn test_floor0() {
 ##### ####
 ##### ####"##);
 
-    for _ in 0..40 {
-        emu.run_until_vblank();
-    }
+    for _ in 0..40 { emu.run_until_vblank(); }
 
     // check floor 0 doesnt burn lines
     assert_ne!(playfield::get(&mut emu, 0, 19), 0xEF);

tests/src/main.rs

@@ -12,6 +12,7 @@ mod pushdown;
 mod rng;
 mod score;
 mod sps;
+mod toprow;
 
 use gumdrop::Options;
 
@@ -43,17 +44,19 @@ fn main() {
     // run tests
     if options.test {
         floor::test();
-        println!("floor works!");
+        println!(">> floor ✅");
+        toprow::test();
+        println!(">> top row bug ✅");
         score::test();
-        println!("score works!");
+        println!(">> score ✅");
         score::test_render();
-        println!("score rendering works!");
+        println!(">> score rendering ✅");
         pushdown::test();
-        println!("pushdown works!");
+        println!(">> pushdown ✅");
         rng::test();
-        println!("rng seeds are the same!");
+        println!(">> rng seeds ✅");
         sps::test();
-        println!("sps is the same!");
+        println!(">> sps ✅");
     }
 
     // count cycles

tests/src/playfield.rs

@@ -1,48 +1,60 @@
 use rusticnes_core::nes::NesState;
-use crate::{labels};
+use crate::labels;
 
 pub fn set(emu: &mut NesState, x: u16, y: u16, value: u8) {
     let index = ((y * 10) + x) + labels::get("playfield");
     emu.memory.iram_raw[index as usize] = value;
 }
 
-pub fn get(emu: &mut NesState, x: u16, y: u16) -> u8 {
+pub fn get(emu: &NesState, x: u16, y: u16) -> u8 {
     let index = ((y * 10) + x) + labels::get("playfield");
     emu.memory.iram_raw[index as usize]
 }
 
-#[allow(dead_code)]
 pub fn clear(emu: &mut NesState) {
-    for line in 0..20 {
-        self::fill_line(emu, line);
+    for y in 0..20 {
+        for x in 0..10 {
+            self::set(emu, x, y, 0xEF);
+        }
     }
 }
 
+pub fn set_str(emu: &mut NesState, playfield: &str) {
+    set_str_inner(emu, playfield, false);
+}
+
 #[allow(dead_code)]
-pub fn fill_line(emu: &mut NesState, y: u16) {
-    for x in 0..10 {
-        self::set(emu, x, y, labels::get("BLOCK_TILES") as _);
-    }
+pub fn set_str_top(emu: &mut NesState, playfield: &str) {
+    set_str_inner(emu, playfield, true);
 }
 
-pub fn set_str(emu: &mut NesState, playfield: &str) {
+fn set_str_inner(emu: &mut NesState, playfield: &str, top: bool) {
     let rows = playfield.trim_start_matches('\n').split("\n").collect::<Vec<_>>();
-    let offset = 20 - rows.len() as u16;
+    let offset = if top {
+        0
+    } else {
+        20 - rows.len() as u16
+    };
     rows.iter().enumerate().for_each(|(y, line)| {
         line.chars().enumerate().for_each(|(x, ch)| {
             self::set(emu, x as _, offset + y as u16, if ch == '#' { 0x7b } else { 0xef });
         });
     });
+
 }
 
 #[allow(dead_code)]
-pub fn get_str(emu: &mut NesState) -> String {
+pub fn get_str(emu: &NesState) -> String {
     let mut s = String::new();
     for y in 0..20 {
+        let mut line = String::new();
         for x in 0..10 {
-            s.push_str(if self::get(emu, x, y) == 0xEF { " " } else { "#" });
+            line.push_str(if self::get(emu, x, y) == 0xEF { " " } else { "#" });
+        }
+        s.push_str(line.trim_end());
+        if y != 19 {
+            s.push_str("\n");
         }
-        s.push_str("\n");
     }
 
     s

tests/src/pushdown.rs

@@ -35,6 +35,7 @@ fn pushdown_impl(pushdown: u8, score: u16) -> u16 {
     let low = added & 0xF;
     let high = (added >> 4) * 10;
 
+    // you can dedupe the `- ones` here and just subtract it from `high` instead
     if high + low + hundredths - ones <= 100 {
         high + low - ones
     } else {