waylon/creeper-adventure
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix menus not working when there is no controller

Browse source
This commit is contained in:
Waylon Walker 2023-01-04 12:01:59 -06:00
parent eb95eaa36d
commit 1414c30a4a
No known key found for this signature in database
GPG key ID: 66E2BF2B4190EFE4
1 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
creeper_adventure/creeper.py
View file

@ -479,6 +479,20 @@ class Creeper(Game):
if event.type == pygame.JOYDEVICEREMOVED: if event.type == pygame.JOYDEVICEREMOVED:
del self.joysticks[event.instance_id] del self.joysticks[event.instance_id]
if not self.joysticks:
if (keys[pygame.K_ESCAPE]) and self.main_open_debounce:
print("opens")
self.main_menu.is_open = not self.main_menu.is_open
self.main_open_debounce = 0
elif not keys[pygame.K_ESCAPE]:
self.main_open_debounce = 1
if keys[pygame.K_e] and self.inventory_open_debounce:
self.inventory_menu.is_open = not self.inventory_menu.is_open
self.inventory_open_debounce = 0
elif not keys[pygame.K_e]:
self.inventory_open_debounce = 1
for joystick in self.joysticks.values(): for joystick in self.joysticks.values():
if joystick.get_button(4) and self.hotbar_back_debounce: if joystick.get_button(4) and self.hotbar_back_debounce:
@ -537,6 +551,13 @@ class Creeper(Game):
def inventory_keys(self): def inventory_keys(self):
keys = self.keys keys = self.keys
if not self.joysticks:
if keys[pygame.K_e] and self.inventory_open_debounce:
self.inventory_menu.is_open = not self.inventory_menu.is_open
self.inventory_open_debounce = 0
elif not keys[pygame.K_e]:
self.inventory_open_debounce = 1
for joystick in self.joysticks.values(): for joystick in self.joysticks.values():
if ( if (
keys[pygame.K_e] or joystick.get_button(2) keys[pygame.K_e] or joystick.get_button(2)
@ -548,6 +569,15 @@ class Creeper(Game):
def main_keys(self): def main_keys(self):
keys = self.keys keys = self.keys
if not self.joysticks:
if (keys[pygame.K_ESCAPE]) and self.main_open_debounce:
print("opens")
self.main_menu.is_open = not self.main_menu.is_open
self.main_open_debounce = 0
elif not keys[pygame.K_ESCAPE]:
self.main_open_debounce = 1
for joystick in self.joysticks.values(): for joystick in self.joysticks.values():
if ( if (
keys[pygame.K_ESCAPE] or joystick.get_button(9) keys[pygame.K_ESCAPE] or joystick.get_button(9)