dan63
/
Untitled-Block-Stacking-Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix lock resets 

I still need to implement disabled and gravity lock delay modes
This commit is contained in:
dan63047 2023-11-13 00:29:45 +03:00
parent 8c40d97d73
commit 8add24d849
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine/resources.rs
View File

@ -274,7 +274,6 @@ impl Engine {
} }
}, },
} }
info!("lock resets: {}, lock delay: {}", self.lock_delay_resets_left, self.lock_delay_left);
} }
pub fn rotate_current_piece(&mut self, rotation: i8) -> bool { pub fn rotate_current_piece(&mut self, rotation: i8) -> bool {
@ -287,12 +286,12 @@ impl Engine {
}else{ }else{
1 1
}; };
self.lock_delay_check((0, 0));
for test in &self.rotation_system.kicks[self.current_piece.as_ref().unwrap().id][self.current_piece.as_ref().unwrap().rotation][id_for_kicks]{ for test in &self.rotation_system.kicks[self.current_piece.as_ref().unwrap().id][self.current_piece.as_ref().unwrap().rotation][id_for_kicks]{
let future_position = (self.current_piece.as_ref().unwrap().position.0 + test.0 as isize, self.current_piece.as_ref().unwrap().position.1 + test.1 as isize); let future_position = (self.current_piece.as_ref().unwrap().position.0 + test.0 as isize, self.current_piece.as_ref().unwrap().position.1 + test.1 as isize);
if self.position_is_valid(future_position, future_rotation) { if self.position_is_valid(future_position, future_rotation) {
self.current_piece.as_mut().unwrap().rotation = future_rotation; self.current_piece.as_mut().unwrap().rotation = future_rotation;
self.current_piece.as_mut().unwrap().position = future_position; self.current_piece.as_mut().unwrap().position = future_position;
self.lock_delay_check(*test);
return true; return true;
} }
} }
@ -303,12 +302,12 @@ impl Engine {
if (shift.0 == 0 && shift.1 == 0) || self.current_piece.is_none(){ if (shift.0 == 0 && shift.1 == 0) || self.current_piece.is_none(){
return true; return true;
} }
self.lock_delay_check(shift);
let future_position = ( let future_position = (
self.current_piece.as_ref().unwrap().position.0 + shift.0 as isize, // future X self.current_piece.as_ref().unwrap().position.0 + shift.0 as isize, // future X
self.current_piece.as_ref().unwrap().position.1 + shift.1 as isize // future Y self.current_piece.as_ref().unwrap().position.1 + shift.1 as isize // future Y
); );
if self.position_is_valid(future_position, self.current_piece.as_ref().unwrap().rotation) { if self.position_is_valid(future_position, self.current_piece.as_ref().unwrap().rotation) {
if shift.0 != 0 {self.lock_delay_check(shift);}
self.current_piece.as_mut().unwrap().position = future_position; self.current_piece.as_mut().unwrap().position = future_position;
true true
}else { }else {