Fix credits and settings dropdowns, add high score, fps counter

This commit is contained in:
csd4ni3l
2025-06-17 15:08:24 +02:00
parent da650a5bda
commit ab11d92e3a
7 changed files with 79 additions and 26 deletions

View File

@@ -4,7 +4,7 @@ from game.enemy import Enemy
from utils.constants import weapons, min_enemy_y, max_enemy_y
from ursina import *
from ursina.shaders import lit_with_shadows_shader
import os
import os, json
enemy_file_names = os.listdir("assets/graphics/enemy")
@@ -12,6 +12,12 @@ class Game():
def __init__(self, pypresence_client) -> None:
self.pypresence_client = pypresence_client
if os.path.exists("data.json"):
with open("data.json", "r") as file:
self.high_score = json.load(file)["high_score"]
else:
self.high_score = 0
pypresence_client.update(state='Training Aim', details=f'Hits: 0/0 Accuracy: 0%')
self.ground = Entity(model='plane', collider='box', scale=64, texture='grass', texture_scale=(4,4), shader=lit_with_shadows_shader)
@@ -23,7 +29,7 @@ class Game():
for n, weapon in enumerate(weapons):
self.inventory.append(weapons[weapon]["image"], weapon, n)
self.player = Player(self.info_label, self.inventory, pypresence_client)
self.player = Player(self.high_score, self.info_label, self.inventory, pypresence_client)
self.shootables_parent = Entity()
mouse.traverse_target = self.shootables_parent
@@ -40,6 +46,7 @@ class Game():
self.sky = Sky()
self.sky.update = self.update
def summon_enemy(self):
if not len(self.enemies) >= 50:
@@ -50,7 +57,7 @@ class Game():
if held_keys["escape"]:
self.back_to_main_menu()
elif held_keys["space"]:
elif held_keys["n"]:
self.summon_enemy()
def back_to_main_menu(self):
@@ -70,3 +77,6 @@ class Game():
for enemy in self.enemies:
destroy(enemy)
with open("data.json", "w") as file:
file.write(json.dumps({"high_score": self.player.high_score}, indent=4))

View File

@@ -7,8 +7,8 @@ from utils.preload import death_sound
import json
class Player(FirstPersonController):
def __init__(self, info_label, inventory, pypresence_client) -> None:
super().__init__(model='cube', z=16, color=color.orange, origin_y=-.5, speed=8, collider='box', gravity=False, shader=lit_with_shadows_shader)
def __init__(self, high_score, info_label, inventory, pypresence_client) -> None:
super().__init__(model='cube', z=16, color=color.orange, origin_y=-.5, speed=8, collider='box', gravity=True, shader=lit_with_shadows_shader)
self.collider = BoxCollider(self, Vec3(0,1,0), Vec3(1,2,1))
@@ -19,7 +19,7 @@ class Player(FirstPersonController):
self.info_label = info_label
self.inventory = inventory
self.pypresence_client = pypresence_client
self.high_score = high_score
self.last_presence_update = time.perf_counter()
self.shots_fired = 0
self.shots_hit = 0
@@ -40,15 +40,18 @@ class Player(FirstPersonController):
self.x = max(-16, min(self.x, 16))
self.z = max(-16, min(self.z, 16))
self.info_label.text = f"Score: {self.score} Hits: {self.shots_fired}/{self.shots_hit} Accuracy: {round(self.accuracy, 2)}%"
self.info_label.text = f"High Score: {self.high_score} Score: {self.score} Hits: {self.shots_fired}/{self.shots_hit} Accuracy: {round(self.accuracy, 2)}%"
weapon_name = self.inventory.slot_names[self.inventory.current_slot]
self.weapon_attack_speed = weapons[weapon_name]["atk_speed"]
self.weapon_dmg = weapons[weapon_name]["dmg"]
if self.score > self.high_score:
self.high_score = self.score
if time.perf_counter() - self.last_presence_update >= 3:
self.last_presence_update = time.perf_counter()
self.pypresence_client.update(state='Training Aim', details=f"Score: {self.score} Hits: {self.shots_fired}/{self.shots_hit} Accuracy: {round(self.accuracy, 2)}%")
self.pypresence_client.update(state='Training Aim', details=f"High Score: {self.high_score} Score: {self.score} Hits: {self.shots_fired}/{self.shots_hit} Accuracy: {round(self.accuracy, 2)}%")
def summon_enemy(self):
pass