ScriptSorcerer/Tetris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented xustom keybinds

Browse Source
This commit is contained in:
IM23a-bachmannj2
2025-02-02 21:36:32 +01:00
parent fc31ab5912
commit 16c1ef8dd6
6 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/util/control.py
+8 -9
View File
@@ -1,5 +1,5 @@
import pygame, sys
from util import write_save
from game.util.util import write_save, get_font
class Controls_Handler():
def __init__(self, save):
@@ -13,9 +13,9 @@ class Controls_Handler():
else: self.navigate_menu(actions)
def render(self, surface):
self.draw_text(surface, "Control Profile " + str(self.curr_block+1) , 20, pygame.Color((0,0,0)), 480 / 2, 270/8)
self.draw_text(surface, "Control Profile " + str(self.curr_block+1) , 20, pygame.Color((255, 255, 255)), 480 / 2, 270/8)
self.display_controls(surface, self.save_file["controls"][str(self.curr_block)])
if self.curr_block == self.save_file["current_profile"]: self.draw_text(surface, "*" , 20, pygame.Color((0,0,0)), 20, 20)
if self.curr_block == self.save_file["current_profile"]: self.draw_text(surface, "*" , 20, pygame.Color((255, 255, 255)), 20, 20)
def navigate_menu(self, actions):
# Move the cursor up and down
@@ -25,8 +25,7 @@ class Controls_Handler():
if actions["Left"]: self.curr_block = (self.curr_block -1) % len(self.save_file["controls"])
if actions["Right"]: self.curr_block = (self.curr_block +1) % len(self.save_file["controls"])
# Handle Selection
if actions["Action1"] or actions["Start"]:
# Set the current profile to be the main one
if pygame.key.get_pressed()[pygame.K_RETURN]:
if self.cursor_dict[self.curr_index] == "Set":
self.controls = self.save_file["controls"][str(self.curr_block)]
self.save_file["current_profile"] = self.curr_block
@@ -55,18 +54,18 @@ class Controls_Handler():
done = True
def display_controls(self,surface, controls):
color = (255,13,5) if self.selected else (255,250,239)
color = (173, 2, 2) if self.selected else (207, 190, 41)
pygame.draw.rect(surface, color, (80 , 270/4 - 10 + (self.curr_index*30), 320, 20) )
i = 0
for control in controls:
self.draw_text(surface, control + ' - ' + pygame.key.name(controls[control]),20,
pygame.Color((0,0,0)), 480 / 2, 270/4 + i)
pygame.Color((255,255,255)), 480 / 2, 270/4 + i)
i += 30
self.draw_text(surface, "Set Current Profile",20, pygame.Color((0,0,0)), 480 / 2, 270/4 + i)
self.draw_text(surface, "Set Current Profile",20, pygame.Color((255, 255, 255)), 480 / 2, 270/4 + i)
def setup(self):
self.selected = False
self.font = pygame.font.Font("RetroFont.ttf", 20)
self.font = get_font(20)
self.cursor_dict = {}
self.curr_index = 0
i = 0
game/util/util.py
+9 -14
View File
@@ -1,24 +1,18 @@
import pygame
import json, os
# calculate fall speed
def get_fall_interval(score):
"""
Calculate the fall interval based on the current score.
"""
base_interval = 1000 # Base interval in milliseconds
decrease_per_1000_points = 50 # Decrease in ms per 1000 points
min_interval = 100 # Minimum interval in milliseconds
base_interval = 1000
decrease_per_1000_points = 50
min_interval = 100
# Calculate the fall interval
interval = base_interval - (score // 400) * decrease_per_1000_points
# Ensure the interval doesn't go below the minimum
return max(interval, min_interval)
# Draw text simplified
def draw_text(surface, text, font, x, y, color):
"""Utility function to render text onto a surface."""
text_surface = font.render(text, True, color)
@@ -26,6 +20,7 @@ def draw_text(surface, text, font, x, y, color):
surface.blit(text_surface, text_rect)
def get_font(size):
pygame.font.init()
return pygame.font.Font("assets/font.ttf", size)
def get_background():
@@ -35,7 +30,7 @@ def get_background():
def load_score(filename):
"""Load JSON data only if the file is not empty."""
if os.path.exists(filename) and os.path.getsize(filename) > 0: # Check if file exists & not empty
if os.path.exists(filename) and os.path.getsize(filename) > 0:
with open(filename, "r") as file:
return json.load(file)
return {}
@@ -70,10 +65,10 @@ def load_save():
def create_save():
new_save = {
"controls":{
"0" :{"Left": pygame.K_a, "Right": pygame.K_d, "Up": pygame.K_w, "Down": pygame.K_s,
"Start": pygame.K_RETURN, "Action1": pygame.K_SPACE},
"1" :{"Left": pygame.K_a, "Right": pygame.K_d, "Up": pygame.K_w, "Down": pygame.K_s,
"Start": pygame.K_RETURN, "Action1": pygame.K_SPACE}
"0" :{"Left": pygame.K_LEFT, "Right": pygame.K_RIGHT, "Up": pygame.K_UP, "Down": pygame.K_DOWN,
"Hold": pygame.K_c},
"1" :{"Left": pygame.K_LEFT, "Right": pygame.K_RIGHT, "Up": pygame.K_UP, "Down": pygame.K_DOWN,
"Hold": pygame.K_c}
},
"current_profile": 0
}