Finish enemy and weapon customization, removal, Disable debug stuff, remove bottom movement, add set speed/size

This commit is contained in:
csd4ni3l
2025-06-19 21:50:05 +02:00
parent 613ff7eef7
commit a9c6f7dab4
8 changed files with 192 additions and 78 deletions

View File

@@ -4,7 +4,7 @@ from ursina.prefabs.dropdown_menu import DropdownMenuButton
from ursina.prefabs.button_group import ButtonGroup
import pypresence, json, copy
from utils.utils import FakePyPresence, Dropdown, FileManager
from utils.utils import FakePyPresence, Dropdown, FileManager, is_float
from utils.constants import discord_presence_id, settings, settings_start_category
from utils.preload import music_sound
@@ -28,11 +28,17 @@ class Settings:
self.ui += [self.main, self.back, self.category_group]
self.dmg_inputs = {}
self.atk_speed_inputs = {}
self.weapon_dmg_inputs = {}
self.weapon_atk_speed_inputs = {}
self.weapon_img_paths = {}
self.img_path_buttons = {}
self.save_buttons = {}
self.weapon_img_path_buttons = {}
self.weapon_remove_buttons = {}
self.enemy_speed_inputs = {}
self.enemy_size_inputs = {}
self.enemy_img_paths = {}
self.enemy_img_path_buttons = {}
self.enemy_remove_buttons = {}
self.show(self.category)
@@ -46,6 +52,9 @@ class Settings:
elif category == "Weapons":
self.weapons()
return
elif category == "Enemies":
self.enemies()
return
y = .2
@@ -101,13 +110,16 @@ class Settings:
self.dir_file_manager = FileManager(return_folders=True, z=-1)
self.dir_file_manager.on_submit = lambda value, btn=btn, name=name: self.directory_selected(btn, name, str(value[0]))
def image_file_selected(self, btn, name, value):
def image_file_selected(self, btn, item_type, name, value):
btn.text = f"Select File ({value})"
self.weapon_img_paths[name] = value
if item_type == "weapon":
self.weapon_img_paths[name] = value
elif item_type == "enemy":
self.enemy_img_paths[name] = value
def select_image_file(self, btn, name):
def select_image_file(self, btn, name, item_type):
self.file_manager = FileManager(z=-1)
self.file_manager.on_submit = lambda value, btn=btn, name=name: self.image_file_selected(btn, name, str(value[0]))
self.file_manager.on_submit = lambda value, btn=btn, name=name: self.image_file_selected(btn, item_type, name, str(value[0]))
def dropdown_update(self, n, dropdown_menu, btn):
dropdown_menu.text = btn.text
@@ -152,11 +164,135 @@ class Settings:
else:
music_sound.stop()
if self.category == "Weapons" and self.data["weapons"]:
for name in self.data["weapons"]:
dmg, attack_speed, image = self.weapon_dmg_inputs[name].text, self.weapon_atk_speed_inputs[name].text, self.weapon_img_paths[name]
self.data["weapons"][name] = {"dmg": float(dmg), "atk_speed": float(attack_speed), "image": image}
if self.category == "Enemies" and self.data["enemies"]:
for name in self.data["enemies"]:
speed, size, image = self.enemy_speed_inputs[name].text, self.enemy_size_inputs[name].text, self.enemy_img_paths[name]
self.data["enemies"][name] = {"speed": float(speed), "size": float(size), "image": image}
json.dump(self.data, open('settings.json', 'w'), indent=4)
self.hide()
self.__init__(self.rpc)
def add_enemy(self):
name, speed, size, image = self.new_enemy_name_input.text, self.enemy_speed_inputs["New"].text, self.enemy_size_inputs["New"].text, self.enemy_img_paths["New"]
self.data["enemies"] = self.data.get("enemies", settings["Enemies"]["default"])
if name in self.data["enemies"] or not name or not speed or not is_float(speed) or not size or not is_float(size) or not image:
return
self.data["enemies"][name] = {"speed": float(speed), "size": float(size), "image": image}
self.clear()
self.enemies()
def add_weapon(self):
name, dmg, atk_speed, image = self.new_weapon_name_input.text, self.weapon_dmg_inputs["New"].text, self.weapon_atk_speed_inputs["New"].text, self.weapon_img_paths["New"]
self.data["weapons"] = self.data.get("weapons", settings["Weapons"]["default"])
if name in self.data["weapons"] or not name or not dmg or not is_float(dmg) or not atk_speed or not is_float(atk_speed) or not image:
return
self.data["weapons"][name] = {"dmg": float(dmg), "atk_speed": float(atk_speed), "image": image}
self.clear()
self.weapons()
def remove_enemy(self, name):
self.data["enemies"] = self.data.get("enemies", settings["Enemies"]["default"])
del self.data["enemies"][name]
self.clear()
self.enemies()
def remove_weapon(self, name):
self.data["weapons"] = self.data.get("weapons", settings["Weapons"]["default"])
del self.data["weapons"][name]
self.clear()
self.weapons()
def enemies(self):
y = .3
for enemy_name, enemy_dict in list(self.data.get("enemies", settings["Enemies"]["default"]).items()) + list({"New": {"speed": 0.12, "size": 1.0, "image": None}}.items()):
speed, size, image = enemy_dict["speed"], enemy_dict["size"], enemy_dict["image"]
self.enemy_img_paths[enemy_name] = image
if not image is None:
self.ui.append(Text(enemy_name, parent=camera.ui, position=(-.8, y), scale=1.2))
else:
self.new_enemy_name_input = InputField(default_value="New", parent=camera.ui, position=(-.75, y - .01), scale_x=0.125, scale_y=.05)
self.ui.append(self.new_enemy_name_input)
self.ui.append(Text("Speed: ", parent=camera.ui, position=(-.6, y), scale=1.2))
self.enemy_speed_inputs[enemy_name] = InputField(default_value=str(round(speed, 2)), parent=camera.ui, position=(-.4, y - .01), scale_x=0.125, scale_y=.05)
self.ui.append(self.enemy_speed_inputs[enemy_name])
self.ui.append(Text("Size: ", parent=camera.ui, position=(-.3, y), scale=1.2))
self.enemy_size_inputs[enemy_name] = InputField(default_value=str(round(size, 2)), parent=camera.ui, position=(-.15, y - .01), scale_x=0.125, scale_y=.05)
self.ui.append(self.enemy_size_inputs[enemy_name])
self.ui.append(Text("Image Path: ", parent=camera.ui, position=(-.05, y), scale=1.2))
self.enemy_img_path_buttons[enemy_name] = Button(text=f"Select File ({image})", scale_x=.6, scale_y=0.05, text_size=.75, position=(0.43, y - .01))
self.enemy_img_path_buttons[enemy_name].on_click = lambda name=enemy_name, btn=self.enemy_img_path_buttons[enemy_name]: self.select_image_file(btn, name, "enemy")
self.ui.append(self.enemy_img_path_buttons[enemy_name])
if image is None:
self.enemy_add_button = Button(text="Add", scale_x=.1, scale_y=0.05, text_size=.7, position=(0.8, y - .01))
self.enemy_add_button.on_click = lambda: self.add_enemy()
self.ui.append(self.enemy_add_button)
else:
self.enemy_remove_buttons[enemy_name] = Button(text="Remove", scale_x=.1, scale_y=0.05, text_size=.7, position=(0.8, y - .01))
self.enemy_remove_buttons[enemy_name].on_click = lambda name=enemy_name: self.remove_enemy(name)
self.ui.append(self.enemy_remove_buttons[enemy_name])
y -= 0.08
self.apply_button = Button('Apply', parent=camera.ui, color=color.green, scale=(.15, .08), position=(.6, -.4), on_click=self.apply_changes)
self.ui.append(self.apply_button)
def weapons(self):
y = .3
for weapon_name, weapon_dict in list(self.data.get("weapons", settings["Weapons"]["default"]).items()) + list({"New": {"dmg": 10, "atk_speed": 0.1, "image": None}}.items()):
dmg, atk_speed, image = weapon_dict["dmg"], weapon_dict["atk_speed"], weapon_dict["image"]
self.weapon_img_paths[weapon_name] = image
if not image is None:
self.ui.append(Text(weapon_name, parent=camera.ui, position=(-.8, y), scale=1.2))
else:
self.new_weapon_name_input = InputField(default_value="New", parent=camera.ui, position=(-.75, y - .01), scale_x=0.125, scale_y=.05)
self.ui.append(self.new_weapon_name_input)
self.ui.append(Text("DMG: ", parent=camera.ui, position=(-.6, y), scale=1.2))
self.weapon_dmg_inputs[weapon_name] = InputField(default_value=str(round(dmg, 2)), parent=camera.ui, position=(-.45, y - .01), scale_x=0.125, scale_y=.05)
self.ui.append(self.weapon_dmg_inputs[weapon_name])
self.ui.append(Text("Attack Speed: ", parent=camera.ui, position=(-.35, y), scale=1.2))
self.weapon_atk_speed_inputs[weapon_name] = InputField(default_value=str(round(atk_speed, 2)), parent=camera.ui, position=(-0.075, y - .01), scale_x=0.125, scale_y=.05)
self.ui.append(self.weapon_atk_speed_inputs[weapon_name])
self.ui.append(Text("Image Path: ", parent=camera.ui, position=(0.025, y), scale=1.2))
self.weapon_img_path_buttons[weapon_name] = Button(text=f"Select File ({image})", scale_x=.5, scale_y=0.05, text_size=.5, position=(0.475, y - .01))
self.weapon_img_path_buttons[weapon_name].on_click = lambda name=weapon_name, btn=self.weapon_img_path_buttons[weapon_name]: self.select_image_file(btn, name, "weapon")
self.ui.append(self.weapon_img_path_buttons[weapon_name])
if image is None:
self.weapon_add_button = Button(text="Add", scale_x=.1, scale_y=0.05, text_size=.7, position=(0.8, y - .01))
self.weapon_add_button.on_click = lambda: self.add_weapon()
self.ui.append(self.weapon_add_button)
else:
self.weapon_remove_buttons[weapon_name] = Button(text="Remove", scale_x=.1, scale_y=0.05, text_size=.7, position=(0.8, y - .01))
self.weapon_remove_buttons[weapon_name].on_click = lambda name=weapon_name: self.remove_weapon(name)
self.ui.append(self.weapon_remove_buttons[weapon_name])
y -= 0.08
self.apply_button = Button('Apply', parent=camera.ui, color=color.green, scale=(.15, .08), position=(.6, -.4), on_click=self.apply_changes)
self.ui.append(self.apply_button)
def clear(self):
for e in list(self.ui):
if e not in (self.main, self.back, self.category_group):
@@ -201,39 +337,4 @@ class Settings:
self.credits_label = Text(text=text, parent=camera.ui, position=(0, 0), origin=(0, 0), scale=font_size, color=color.white)
self.credits_label.type = 'credits_text'
self.ui.append(self.credits_label)
def save_weapon(self, name):
dmg, attack_speed, image = self.dmg_inputs[name].text, self.atk_speed_inputs[name].text, self.weapon_img_paths[name]
self.edits["weapons"] = self.edits.get("weapons", settings["Weapons"]["default"])
self.edits["weapons"][name] = {"dmg": float(dmg), "atk_speed": float(attack_speed), "image": image}
self.apply_changes()
def weapons(self):
y = .2
for weapon_name, weapon_dict in self.data.get("weapons", settings["Weapons"]["default"]).items():
dmg, atk_speed, image = weapon_dict["dmg"], weapon_dict["atk_speed"], weapon_dict["image"]
self.ui.append(Text(weapon_name, parent=camera.ui, position=(-.8, y), scale=1.2))
self.ui.append(Text("DMG: ", parent=camera.ui, position=(-.6, y), scale=1.2))
self.dmg_inputs[weapon_name] = InputField(default_value=str(round(dmg, 2)), parent=camera.ui, position=(-.45, y - .01), scale_x=0.125, scale_y=.05)
self.ui.append(self.dmg_inputs[weapon_name])
self.ui.append(Text("Attack Speed: ", parent=camera.ui, position=(-.35, y), scale=1.2))
self.atk_speed_inputs[weapon_name] = InputField(default_value=str(round(atk_speed, 2)), parent=camera.ui, position=(-0.075, y - .01), scale_x=0.125, scale_y=.05)
self.ui.append(self.atk_speed_inputs[weapon_name])
self.ui.append(Text("Image Path: ", parent=camera.ui, position=(0.05, y), scale=1.2))
self.img_path_buttons[weapon_name] = Button(text=f"Select File ({image})", scale_x=.3, scale_y=0.05, text_size=.5, position=(0.4, y - .01))
self.img_path_buttons[weapon_name].on_click = lambda name=weapon_name, btn=self.img_path_buttons[weapon_name]: self.select_image_file(btn, name)
self.ui.append(self.img_path_buttons[weapon_name])
self.save_buttons[weapon_name] = Button(text="Save", scale_x=.1, scale_y=0.05, text_size=.7, position=(0.7, y - .01))
self.save_buttons[weapon_name].on_click = lambda name=weapon_name: self.save_weapon(name)
self.ui.append(self.save_buttons[weapon_name])
y -= 0.08
self.ui.append(self.credits_label)