Compare commits
10 Commits
63253b69eb
...
41ce304a76
| Author | SHA1 | Date | |
|---|---|---|---|
| 41ce304a76 | |||
| 349ee7a520 | |||
| b462f3e66a | |||
| bda701948b | |||
| f5580a6eda | |||
| f59b0895bb | |||
| 96a8b4d8e5 | |||
| c353b5645e | |||
| 019a674cac | |||
| 6b02b8390c |
39
main.py
39
main.py
@@ -73,14 +73,14 @@ def init_sounds():
|
||||
|
||||
case_images = {}
|
||||
|
||||
async def touch(event):
|
||||
def touch(event):
|
||||
global touch_start, touch_start_time
|
||||
|
||||
if event.type == pygame.FINGERDOWN and not touch_start:
|
||||
touch_start = (event.x * SCREEN_WIDTH, event.y * SCREEN_HEIGHT)
|
||||
touch_start_time = time.time()
|
||||
print("touch_start")
|
||||
return None
|
||||
return False
|
||||
|
||||
elif event.type == pygame.FINGERUP and touch_start:
|
||||
end = (event.x * SCREEN_WIDTH, event.y * SCREEN_HEIGHT)
|
||||
@@ -101,10 +101,10 @@ async def touch(event):
|
||||
return "ontop"
|
||||
else:
|
||||
print("touch problem")
|
||||
return None
|
||||
return None
|
||||
return False
|
||||
return False
|
||||
|
||||
async def is_SPACE_event(event):
|
||||
def is_SPACE_event(event):
|
||||
|
||||
# Tastatur oder Joystick A
|
||||
if (event.type == pygame.KEYDOWN and event.key == pygame.K_SPACE) or \
|
||||
@@ -117,7 +117,7 @@ async def is_SPACE_event(event):
|
||||
|
||||
return False
|
||||
|
||||
async def is_LEFT_event(event):
|
||||
def is_LEFT_event(event):
|
||||
# Tastatur oder Joystick links
|
||||
if ((event.type == pygame.KEYDOWN and event.key == pygame.K_LEFT) or
|
||||
(event.type == pygame.JOYHATMOTION and event.value[0] == -1) or
|
||||
@@ -127,9 +127,8 @@ async def is_LEFT_event(event):
|
||||
return False
|
||||
|
||||
|
||||
async def is_UP_event(event):
|
||||
global touch_start, touch_start_time
|
||||
|
||||
def is_UP_event(event):
|
||||
# Tastatur oder Joystick oben
|
||||
if ((event.type == pygame.KEYDOWN and event.key == pygame.K_UP) or
|
||||
(event.type == pygame.JOYHATMOTION and event.value[1] == 1) or
|
||||
(event.type == pygame.JOYBUTTONDOWN and event.button == 3)):
|
||||
@@ -497,12 +496,12 @@ async def show_instruction_screen(image):
|
||||
pygame.display.flip()
|
||||
await asyncio.sleep(0)
|
||||
for event in pygame.event.get():
|
||||
result = await touch(event)
|
||||
await asyncio.sleep(0)
|
||||
result = touch(event)
|
||||
if event.type == pygame.QUIT:
|
||||
pygame.quit()
|
||||
sys.exit()
|
||||
elif await is_SPACE_event(event) or result == "snap":
|
||||
print (result)
|
||||
elif is_SPACE_event(event) or (result == "snap"):
|
||||
waiting = False
|
||||
|
||||
async def fail_current_case():
|
||||
@@ -651,7 +650,7 @@ async def show_game_over(score):
|
||||
if event.type == pygame.QUIT:
|
||||
pygame.quit()
|
||||
sys.exit()
|
||||
elif await is_SPACE_event(event) or await touch(event) == "snap":
|
||||
elif is_SPACE_event(event) or (touch(event) == "snap"):
|
||||
if ready_to_submit and prepared_form:
|
||||
print("Benutzer bestätigt, Punkte werden jetzt gesendet.")
|
||||
prepared_form.submit()
|
||||
@@ -712,17 +711,16 @@ async def main():
|
||||
if state == 1: # PLAYING
|
||||
result = "none"
|
||||
if event.type == pygame.FINGERUP and touch_start:
|
||||
result = await touch(event)
|
||||
print(result)
|
||||
result = touch(event)
|
||||
elif event.type == pygame.FINGERDOWN and not touch_start:
|
||||
await touch(event)
|
||||
|
||||
if await is_LEFT_event(event) or result == "ontop":
|
||||
touch(event)
|
||||
print(result)
|
||||
if is_LEFT_event(event) or (result == "ontop"):
|
||||
can_tip = current_case.length_units * UNIT_HEIGHT <= TRAILER_HEIGHT
|
||||
if current_case and current_case.allow_snap and can_use_tilt and can_tip:
|
||||
await current_case.animate_tip()
|
||||
can_use_tilt = False
|
||||
elif await is_UP_event(event) or result == "tilt":
|
||||
elif is_UP_event(event) or (result == "tilt"):
|
||||
if current_case and current_case.allow_snap and can_use_on_top and current_case.can_place_on_top():
|
||||
if await current_case.animate_place_on_top():
|
||||
transition_counter = transition_fps
|
||||
@@ -739,7 +737,8 @@ async def main():
|
||||
stacked_cases.append(current_case)
|
||||
spawn_case_in_game()
|
||||
shake_timer = 10
|
||||
elif await is_SPACE_event(event) or result == "snap":
|
||||
elif is_SPACE_event(event) or (result == "snap"):
|
||||
|
||||
if current_case and current_case.allow_snap:
|
||||
await current_case.animate_snap()
|
||||
can_use_tilt = True
|
||||
|
||||
Reference in New Issue
Block a user