diff --git a/vitrix/lib/entities/player.py b/vitrix/lib/entities/player.py index 501ea85..c57235e 100644 --- a/vitrix/lib/entities/player.py +++ b/vitrix/lib/entities/player.py @@ -5,10 +5,12 @@ from ursina.prefabs.first_person_controller import FirstPersonController from lib.entities.bullet import Bullet +from lib.paths import GamePaths from lib.weapons.hammer import Hammer from lib.weapons.pistol import Pistol from lib.weapons.sword import Sword from lib.weapons.battleaxe import BattleAxe +# from lib.UI.inventory import inventory from lib.items.aid_kit import AidKit @@ -89,6 +91,10 @@ def __init__(self, position: ursina.Vec3): self.shots_left = 5 self.death_message_shown = False + self.lock = False + # self._inventory = None + # self.inventory_opened = False + def hide_reload_warning(self): time.sleep(1) self.reload_warning_text.disable() @@ -146,13 +152,18 @@ def input(self, key): # Inventory key access #if key == 'i': - # inventory() + # if not self.inventory_opened: + # _inventory = inventory() + # inventory_opened = True + # else: + # _inventory = None + # inventory_opened = False # - # if lock == False: - # lock = True + # if self.lock == False: + # self.lock = True # self.on_enable() # else: - # lock = False + # self.lock = False # self.on_disable() if key == "left mouse down" and self.health > 0: diff --git a/vitrix/multiplayer.py b/vitrix/multiplayer.py index c56c5c0..07b28c4 100644 --- a/vitrix/multiplayer.py +++ b/vitrix/multiplayer.py @@ -3,6 +3,7 @@ import socket import threading import ursina +from ursina.shaders.basic_lighting_shader import basic_lighting_shader from lib.UI.notification import notify from lib.classes.network import Network @@ -83,10 +84,11 @@ map = Map() sky = ursina.Entity( model="sphere", - texture=os.path.join("assets", "sky.png"), + texture=os.path.join("assets", "textures", "sky.png"), scale=9999, double_sided=True ) +ursina.Entity.default_shader = basic_lighting_shader player = Player(ursina.Vec3(0, 1, 0))