cetragm 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

cetragm/game.py

@@ -32,6 +32,9 @@ def lock_piece(piece, board, player):
     board_empty = all(cell[0] for row in board for cell in row)
     soft = player.soft # TODO: ADD SOFT, OR SOFT DROP CALC
     
+    if board_empty:
+        player.score += 2500
+    
     score_gain, player.combo = get_score(player.level, cleared, player.combo, board_empty, soft)
     player.score += score_gain
     

cetragm/main.py

@@ -21,7 +21,6 @@ def sigint_handler(sig, frame):
 sigint = threading.Event()
 lose = threading.Event()
 board_lock = threading.Lock()
-ROT_SEQ = ["0", "r", "2", "l"]
 
 signal.signal(signal.SIGINT, sigint_handler)
 
@@ -30,16 +29,19 @@ def setup_board(rows, cols):
     return board
 
 def is_grounded(active_piece, board):
-    if not active_piece:
+    if not active_piece or "pos" not in active_piece:
         return False
-    temp_pos = list(active_piece["pos"])
+    temp_pos = active_piece["pos"][:]
     temp_pos[1] += 1
     return collides({"name": active_piece["name"], "rotation": active_piece["rotation"], "pos": temp_pos}, board)
 
 def get_minos(active_piece):
-    if not active_piece:
+    if not active_piece or "name" not in active_piece:
+        return set()
+    try:
+        rot_matrix = pieces[active_piece["name"].lower()]["rotations"][active_piece["rotation"]]
+    except KeyError:
         return set()
-    rot_matrix = pieces[active_piece["name"].lower()]["rotations"][active_piece["rotation"]]
     minos = set()
     for dy, row in enumerate(rot_matrix):
         for dx, cell in enumerate(row):
@@ -59,6 +61,7 @@ def lock_and_are(player, board, shared):
     player.fall_progress = 0.0
     player.hold_lock = False
     player.soft = 0
+    player.lock_resets = 0
     
     if cleared:
         return "line_clear", 0.0
@@ -77,17 +80,16 @@ def lock_now(player, board, shared, bag):
     if loss:
         lose.set()
         return "loss"
-    elif cleared:
-        player.active_piece = {}
-        player.fall_progress = 0.0
-        player.soft = 0
+    
+    player.active_piece = {}
+    player.fall_progress = 0.0
+    player.soft = 0
+    player.hold_lock = False
+    player.lock_resets = 0
+    if cleared:
         return "line_clear"
     else:
         player.active_piece = {"name": bag.get_piece(), "pos": [3, 0], "rotation": "0"}
-        player.fall_progress = 0.0
-        player.soft = 0
-        player.hold_lock = False
-        player.lock_resets = 0
         return "active"
 
 def input_handler(player, board, action, bag, shared, LOCK_DELAY, FRAME):
@@ -283,17 +285,18 @@ def game_loop(shared, player, bag, inputs, fps):
                             break
                     else:
                         lock_timer = 0.0
-                
-                piece = player.active_piece
-                temp_pos = piece["pos"].copy()
-                temp_pos[1] += 1
-                if collides({"name": piece["name"], "pos": temp_pos, "rotation": piece["rotation"]}, board):
-                    lock_timer += dt
-                if lock_timer >= LOCK_DELAY:
-                    state, lock_timer = lock_and_are(player, board, shared)
-                    if state == "loss":
-                        return
-                    phase_timer = 0.0
+                        
+                if state == "active":
+                    piece = player.active_piece
+                    temp_pos = piece["pos"].copy()
+                    temp_pos[1] += 1
+                    if collides({"name": piece["name"], "pos": temp_pos, "rotation": piece["rotation"]}, board):
+                        lock_timer += dt
+                        if lock_timer >= LOCK_DELAY:
+                            state, lock_timer = lock_and_are(player, board, shared)
+                            if state == "loss":
+                                return
+                            phase_timer = 0.0
             
             # pause after line clear
             elif state == "line_clear":

cetragm/srs.py

@@ -12,10 +12,10 @@ ROT_180 = {"0": "2", "2": "0", "r": "l", "l": "r"}
 JLSTZ_OFFSETS = {"0": (0,0), "r": (0,0), "2": (0,0), "l": (0,0)}
 
 I_OFFSETS = {
-    "0": (-1, 0),
-    "r": (1, 0),
-    "2": (0, 1),
-    "l": (0, -1),
+    "0": (0, 0),
+    "r": (0, 0),
+    "2": (0, 0),
+    "l": (0, 0),
 }
 
 # These kick tables are not my values, they're from the Super Rotation System (or Tetris Guideline)

cetragm/tables.py

@@ -390,25 +390,29 @@ gravity = {
     90: 64,
     100: 80,
     120: 96,
-    140: 112,
-    160: 128,
-    170: 144,
+    140: 100,
+    160: 112,
+    170: 120,
     200: 4,
-    220: 32,
-    230: 64,
-    233: 96,
-    236: 128,
-    239: 160,
-    243: 192,
-    247: 224,
-    251: 256,
-    300: 512,
-    330: 768,
-    360: 1024,
-    400: 1280,
-    420: 1024,
-    450: 768,
-    500: 5120
+    220: 16,
+    230: 32,
+    233: 64,
+    236: 96,
+    239: 100,
+    243: 120,
+    247: 130,
+    251: 140,
+    300: 180,
+    330: 200,
+    360: 220,
+    400: 256, # 1g
+    420: 300,
+    450: 340,
+    500: 512,
+    600: 768,
+    700: 1024,
+    750: 1280,
+    800: 5120 # 20g
 }
 
 ROT_CW  = {"0": "r", "r": "2", "2": "l", "l": "0"}

{cetragm-0.1.5.dist-info → cetragm-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cetragm
-Version: 0.1.5
+Version: 0.1.6
 Summary: Cetra Grand Master | An oddly familiar block stacker in the command line!
 License-Expression: GPL-3.0-only
 License-File: LICENSE

{cetragm-0.1.5.dist-info → cetragm-0.1.6.dist-info}/RECORD

@@ -4,14 +4,14 @@ cetragm/bag.py,sha256=qPvDmKoduJPZuwz5DMhh9rp85MUEfUPuiFsqOfJNq2U,704
 cetragm/config.py,sha256=tJjbKxtwIWb3AMmIyBUosWkyHFO0OEzpYbqO5PHxz84,550
 cetragm/controls.py,sha256=iR-ZpudiE6J92FMZmOwZlZpcOUhxfc1bWvb18VR4Cbk,3165
 cetragm/draw.py,sha256=F4GZhNAXhxyPCksY0Pq4wjJQ904pgqCrCZ2ZDfgZHlU,6459
-cetragm/game.py,sha256=TkvIb_F3dmlChoOXOKH_vJVPEnnB7NjaIJdNpal7McM,3110
-cetragm/main.py,sha256=h5x-ZU_9_gVBWSWUGyDwuW8ZnRZcfPmLGoOPx0UKfBE,11487
+cetragm/game.py,sha256=tfIEEbtZc6VxxARGdlJ7C_jBzw-rsJU2dM8I7gPqMLk,3164
+cetragm/main.py,sha256=G2ce_4AsKDHd6GU5oig5ScUfSqa2uaEVVoHn85C6fhw,11624
 cetragm/player.py,sha256=9KL5cNDYCp98OB7AiVdKISCbnmSqMn0StM2Ve3OHWGE,2469
-cetragm/srs.py,sha256=YXXTkidVUiM9G9QCptzcgJBzgDNdIGHNndFlTp2TK_4,4867
-cetragm/tables.py,sha256=MCLD4tz5fO0YJJwEqdqmXegR24kzjWkzvZP5Ev6fQEQ,12220
+cetragm/srs.py,sha256=Fi4mOkaM_Qq716XUa1V4W1W2j4P7WsZmGnkOMbj7H2o,4865
+cetragm/tables.py,sha256=X3XBkTqQ7mX_jYDoDD5DfhW_cM8NOp-EU6tUY5PnoSE,12285
 cetragm/ui.txt,sha256=7wSQU8ht-5A2Fz5iFbuLTdzc1Cl6otcnqIRUw5_wZoM,2006
-cetragm-0.1.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-cetragm-0.1.5.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
-cetragm-0.1.5.dist-info/entry_points.txt,sha256=m6wjlRzXqvDPFceo250KJO4LDsEp_q2rBcCZa2lDcpo,73
-cetragm-0.1.5.dist-info/METADATA,sha256=iu3N60i-sJt_saxw-_gDWGLnP7WF4mvl1Rrx4uGe1Is,3134
-cetragm-0.1.5.dist-info/RECORD,,
+cetragm-0.1.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+cetragm-0.1.6.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
+cetragm-0.1.6.dist-info/entry_points.txt,sha256=m6wjlRzXqvDPFceo250KJO4LDsEp_q2rBcCZa2lDcpo,73
+cetragm-0.1.6.dist-info/METADATA,sha256=Hi6l9TgKtRhRz6F2UZFLvBu7g-b7W3lKav0_pHCRcuE,3134
+cetragm-0.1.6.dist-info/RECORD,,