dan63
/
TetraStats
mirror of https://github.com/dan63047/TetraStats.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inf SDF, 0 ARR, fixed kicks for SRS+, yet softdrop still works like shit

This commit is contained in:
dan63047 2024-07-05 02:04:39 +03:00
parent f5baf493ca
commit 1c29cce71b
2 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/data_objects/freyhoe_test.dart
View File

@ -40,8 +40,7 @@ class HandlingHandler{
return direction; return direction;
} }
int movementKeyReleased(bool left, bool right, double subframe){ void movementKeyReleased(bool left, bool right, double subframe){
int lastFrameMovement = processMovenent(subframe);
if (left) { if (left) {
activeLeft = !left; activeLeft = !left;
} }
@ -59,7 +58,6 @@ class HandlingHandler{
dasLeft = das; dasLeft = das;
direction = 0; direction = 0;
} }
return lastFrameMovement;
} }
int processMovenent(double delta){ int processMovenent(double delta){
@ -75,6 +73,7 @@ class HandlingHandler{
} }
}else{ }else{
arrLeft -= delta; arrLeft -= delta;
if (arr == 0.0) return direction*10;
if (arrLeft < 0.0) { if (arrLeft < 0.0) {
arrLeft += arr; arrLeft += arr;
return direction; return direction;
@ -262,6 +261,8 @@ class Simulation{
// That thing allows me to test my new staff i'm trying to implement // That thing allows me to test my new staff i'm trying to implement
void main() async { void main() async {
var replayJson = jsonDecode(File("/home/dan63047/Документы/replays/6550eecf2ffc5604e6224fc5.ttrm").readAsStringSync()); var replayJson = jsonDecode(File("/home/dan63047/Документы/replays/6550eecf2ffc5604e6224fc5.ttrm").readAsStringSync());
// frame 994: garbage lost
// frame 1550: T-spin failed
ReplayData replay = ReplayData.fromJson(replayJson); ReplayData replay = ReplayData.fromJson(replayJson);
TetrioRNG rng = TetrioRNG(replay.stats[0][0].seed); TetrioRNG rng = TetrioRNG(replay.stats[0][0].seed);
List<Tetromino> queue = rng.shuffleList(tetrominoes.toList()); List<Tetromino> queue = rng.shuffleList(tetrominoes.toList());
@ -270,6 +271,7 @@ void main() async {
HandlingHandler? handling; HandlingHandler? handling;
Map<KeyType, EventKeyPress> activeKeypresses = {}; Map<KeyType, EventKeyPress> activeKeypresses = {};
int currentFrame = 0; int currentFrame = 0;
double subframesWent = 0;
events.removeAt(0); // get rig of Event.start events.removeAt(0); // get rig of Event.start
Event nextEvent = events.removeAt(0); Event nextEvent = events.removeAt(0);
Stats stats = Stats(); Stats stats = Stats();
@ -308,31 +310,48 @@ void main() async {
bool handleRotation(int r){ bool handleRotation(int r){
if (r == 0) return true; if (r == 0) return true;
int future_rotation = (rot + r) % 4; int futureRotation = (rot + r) % 4;
List<Coords> tests = (current == Tetromino.I ? kickset.kickTableI : kickset.kickTable)[rot][r == -1 ? 0 : r]; List<Coords> tests = (current == Tetromino.I ? kickset.kickTableI : kickset.kickTable)[rot][r == -1 ? 0 : r];
for (Coords test in tests){ for (Coords test in tests){
if (board.positionIsValid(current, coords+test, future_rotation)){ if (board.positionIsValid(current, coords+test, futureRotation)){
coords += test; coords += test;
rot = future_rotation; rot = futureRotation;
return true; return true;
} }
} }
return false; return false;
} }
coords += spawnPositionFixes[current.index]; void handleGravity(double frames){
for (currentFrame; currentFrame <= replay.roundLengths[0]; currentFrame++){ if (frames == 0) return;
gravityBucket += settings != null ? (handling!.sdfActive ? settings.g! * settings.handling!.sdf : settings.g!) : 0; gravityBucket += settings != null ? (handling!.sdfActive ? settings.g! * settings.handling!.sdf : settings.g!) * frames : 0;
int movement = handling != null ? handling.processMovenent(1.0) : 0;
if (board.positionIsValid(current, Coords(coords.x+movement, coords.y), rot)) coords.x += movement;
int gravityImpact = 0; int gravityImpact = 0;
if (gravityBucket >= 1.0){ if (gravityBucket >= 1.0){
gravityImpact = gravityBucket.truncate(); gravityImpact = gravityBucket.truncate();
gravityBucket -= gravityBucket.truncate(); gravityBucket -= gravityBucket.truncate();
} }
if (board.positionIsValid(current, Coords(coords.x, coords.y-gravityImpact), rot)) coords.y -= gravityImpact; while (gravityImpact > 0){
if (board.positionIsValid(current, Coords(coords.x, coords.y-1), rot)) coords.y -= 1;
gravityImpact--;
}
}
void handleMovement(double frames){
if (frames == 0 || handling == null) return;
int movement = handling.processMovenent(frames);
while (movement.abs() > 0){
if (board.positionIsValid(current, Coords(movement.isNegative ? coords.x-1 : coords.x+1, coords.y), rot)) movement.isNegative ? coords.x-- : coords.x++;
movement.isNegative ? movement++ : movement--;
}
}
coords += spawnPositionFixes[current.index];
for (currentFrame; currentFrame <= replay.roundLengths[0]; currentFrame++){
handleMovement(1-subframesWent);
handleGravity(1-subframesWent);
subframesWent = 0;
if (settings?.handling?.sdf == 41) coords.y = sonicDrop();
print("$currentFrame: $current at $coords\n$board"); print("$currentFrame: $current at $coords\n$board");
//print(stats.combo); //print(stats.combo);
if (currentFrame == nextEvent.frame){ if (currentFrame == nextEvent.frame){
@ -349,7 +368,11 @@ void main() async {
break; break;
case EventType.keydown: case EventType.keydown:
nextEvent as EventKeyPress; nextEvent as EventKeyPress;
activeKeypresses[nextEvent.data.key] = nextEvent; double subframesDiff = nextEvent.data.subframe - subframesWent;
subframesWent += subframesDiff;
handleMovement(subframesDiff);
handleGravity(subframesDiff);
//activeKeypresses[nextEvent.data.key] = nextEvent;
switch (nextEvent.data.key){ switch (nextEvent.data.key){
case KeyType.rotateCCW: case KeyType.rotateCCW:
handleRotation(-1); handleRotation(-1);
@ -440,11 +463,14 @@ void main() async {
break; break;
case EventType.keyup: case EventType.keyup:
nextEvent as EventKeyPress; nextEvent as EventKeyPress;
double subframesDiff = nextEvent.data.subframe - subframesWent;
subframesWent += subframesDiff;
handleMovement(subframesDiff);
handleGravity(subframesDiff);
switch (nextEvent.data.key){ switch (nextEvent.data.key){
case KeyType.moveLeft: case KeyType.moveLeft:
case KeyType.moveRight: case KeyType.moveRight:
int pontencialMovement = handling!.movementKeyReleased(nextEvent.data.key == KeyType.moveLeft, nextEvent.data.key == KeyType.moveRight, nextEvent.data.subframe); handling!.movementKeyReleased(nextEvent.data.key == KeyType.moveLeft, nextEvent.data.key == KeyType.moveRight, nextEvent.data.subframe);
if (board.positionIsValid(current, Coords(coords.x+pontencialMovement, coords.y), rot)) coords.x += pontencialMovement;
break; break;
case KeyType.softDrop: case KeyType.softDrop:
handling?.sdfActive = false; handling?.sdfActive = false;

32
lib/data_objects/tetrio_multiplayer_replay.dart
View File

@ -856,44 +856,44 @@ class SRSPlus extends KicksetBase{
[ [
[Coords( 0, 0), Coords( 1, 0), Coords( 1, 1), Coords( 0,-2), Coords( 1,-2)], // 0 -> 270 [Coords( 0, 0), Coords( 1, 0), Coords( 1, 1), Coords( 0,-2), Coords( 1,-2)], // 0 -> 270
[Coords( 0, 0), Coords(-1, 0), Coords(-1, 1), Coords( 0,-2), Coords(-1,-2)], // 0 -> 90 [Coords( 0, 0), Coords(-1, 0), Coords(-1, 1), Coords( 0,-2), Coords(-1,-2)], // 0 -> 90
[Coords( 0, 0), Coords(-1, 0), Coords(-1, 1), Coords( 0,-2), Coords(-1,-2)], // 0 -> 180 [Coords( 0, 0), Coords( 0, 1), Coords( 1, 1), Coords(-1, 1), Coords( 1, 0), Coords(-1, 0)], // 0 -> 180
], ],
[ [
[Coords( 0, 0), Coords( 1, 0), Coords( 1,-1), Coords( 0, 2), Coords( 1, 2)], // 90 -> 0 [Coords( 0, 0), Coords( 1, 0), Coords( 1,-1), Coords( 0, 2), Coords( 1, 2)], // 90 -> 0
[Coords( 0, 0), Coords( 1, 0), Coords( 1,-1), Coords( 0, 2), Coords( 1, 2)], // 90 -> 180 [Coords( 0, 0), Coords( 1, 0), Coords( 1,-1), Coords( 0, 2), Coords( 1, 2)], // 90 -> 180
[Coords( 0, 0), Coords( 1, 0), Coords( 1,-1), Coords( 0, 2), Coords( 1, 2)], // 90 -> 270 [Coords( 0, 0), Coords( 1, 0), Coords( 1, 2), Coords( 1, 1), Coords( 0, 2), Coords( 0, 1)], // 90 -> 270
], ],
[ [
[Coords( 0, 0), Coords(-1, 0), Coords(-1, 1), Coords( 0,-2), Coords(-1,-2)], // 180 -> 90 [Coords( 0, 0), Coords(-1, 0), Coords(-1, 1), Coords( 0,-2), Coords(-1,-2)], // 180 -> 90
[Coords( 0, 0), Coords( 1, 0), Coords( 1, 1), Coords( 0,-2), Coords( 1,-2)], // 180 -> 270 [Coords( 0, 0), Coords( 1, 0), Coords( 1, 1), Coords( 0,-2), Coords( 1,-2)], // 180 -> 270
[Coords( 0, 0), Coords( 1, 0), Coords( 1, 1), Coords( 0,-2), Coords( 1,-2)], // 180 -> 0 [Coords( 0, 0), Coords( 0,-1), Coords(-1,-1), Coords( 1,-1), Coords(-1, 0), Coords( 1, 0)], // 180 -> 0
], ],
[ [
[Coords( 0, 0), Coords(-1, 0), Coords(-1,-1), Coords( 0, 2), Coords(-1, 2)], // 270 -> 180 [Coords( 0, 0), Coords(-1, 0), Coords(-1,-1), Coords( 0, 2), Coords(-1, 2)], // 270 -> 180
[Coords( 0, 0), Coords(-1, 0), Coords(-1,-1), Coords( 0, 2), Coords(-1, 2)], // 270 -> 0 [Coords( 0, 0), Coords(-1, 0), Coords(-1,-1), Coords( 0, 2), Coords(-1, 2)], // 270 -> 0
[Coords( 0, 0), Coords(-1, 0), Coords(-1,-1), Coords( 0, 2), Coords(-1, 2)], // 270 -> 90 [Coords( 0, 0), Coords(-1, 0), Coords(-1, 2), Coords(-1, 1), Coords( 0, 2), Coords( 0, 1)], // 270 -> 90
] ]
]; ];
kickTableI = [ kickTableI = [
[ [
[Coords( 0, 0), Coords( 1, 0), Coords( 1, 1), Coords( 0,-2), Coords( 1,-2)], // 0 -> 270 [Coords( 0, 0), Coords(-1, 0), Coords( 2, 0), Coords( 2,-1), Coords(-1, 2)], // 0 -> 270
[Coords( 0, 0), Coords(-1, 0), Coords(-1, 1), Coords( 0,-2), Coords(-1,-2)], // 0 -> 90 [Coords( 0, 0), Coords( 1, 0), Coords( 2, 0), Coords(-1,-1), Coords( 1, 2)], // 0 -> 90
[Coords( 0, 0), Coords( 1, 0), Coords( 1, 1), Coords( 0,-2), Coords( 1,-2)], // 0 -> 180 [Coords( 0, 0), Coords( 0, 1)], // 0 -> 180
], ],
[ [
[Coords( 0, 0), Coords( 1, 0), Coords( 1,-1), Coords( 0, 2), Coords( 1, 2)], // 90 -> 0 [Coords( 0, 0), Coords(-1, 0), Coords( 2, 0), Coords(-1,-2), Coords( 2,-1)], // 90 -> 0
[Coords( 0, 0), Coords( 1, 0), Coords( 1,-1), Coords( 0, 2), Coords( 1, 2)], // 90 -> 180 [Coords( 0, 0), Coords(-1, 0), Coords( 2, 0), Coords(-1, 2), Coords( 2, 1)], // 90 -> 180
[Coords( 0, 0), Coords( 1, 0), Coords( 1, 1), Coords( 0,-2), Coords( 1,-2)], // 90 -> 270 [Coords( 0, 0), Coords( 1, 0)], // 90 -> 270
], ],
[ [
[Coords( 0, 0), Coords(-1, 0), Coords(-1, 1), Coords( 0,-2), Coords(-1,-2)], // 180 -> 90 [Coords( 0, 0), Coords(-2, 0), Coords( 1, 0), Coords(-2, 1), Coords( 1,-2)], // 180 -> 90
[Coords( 0, 0), Coords( 1, 0), Coords( 1, 1), Coords( 0,-2), Coords( 1,-2)], // 180 -> 270 [Coords( 0, 0), Coords(-2, 0), Coords(-1, 0), Coords( 2, 1), Coords(-1,-2)], // 180 -> 270
[Coords( 0, 0), Coords(-1, 0), Coords(-1, 1), Coords( 0,-2), Coords(-1,-2)], // 180 -> 0 [Coords( 0, 0), Coords( 0,-1)], // 180 -> 0
], ],
[ [
[Coords( 0, 0), Coords(-1, 0), Coords(-1,-1), Coords( 0, 2), Coords(-1, 2)], // 270 -> 180 [Coords( 0, 0), Coords( 1, 0), Coords(-2, 0), Coords( 1, 2), Coords(-2,-1)], // 270 -> 180
[Coords( 0, 0), Coords(-1, 0), Coords(-1,-1), Coords( 0, 2), Coords(-1, 2)], // 270 -> 0 [Coords( 0, 0), Coords( 1, 0), Coords(-2, 0), Coords( 1,-2), Coords(-2, 1)], // 270 -> 0
[Coords( 0, 0), Coords(-1, 0), Coords(-1,-1), Coords( 0, 2), Coords(-1, 2)], // 270 -> 90 [Coords( 0, 0), Coords(-1, 0)], // 270 -> 90
] ]
]; ];
additionalOffsetEmpty = [Coords( 0, 0),Coords( 0, 0),Coords( 0, 0),Coords( 0, 0)]; additionalOffsetEmpty = [Coords( 0, 0),Coords( 0, 0),Coords( 0, 0),Coords( 0, 0)];