From 87e35fa40dfbcb644ec8f6e80472254ffca0e20a Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Mon, 9 Oct 2023 09:37:51 -0700 Subject: [PATCH] fix crash animation --- levels/ast1.gd | 43 ++++++++++++++++++++++--------------------- levels/ast2.gd | 31 ++++++++++++++++--------------- levels/ast3.gd | 33 +++++++++++++++++---------------- levels/css1.gd | 39 ++++++++++++++++++++------------------- levels/wall1.gd | 37 +++++++++++++++++++------------------ levels/wall2.gd | 37 +++++++++++++++++++------------------ levels/wall3.gd | 37 +++++++++++++++++++------------------ levels/wall4.gd | 37 +++++++++++++++++++------------------ 8 files changed, 151 insertions(+), 143 deletions(-) diff --git a/levels/ast1.gd b/levels/ast1.gd index 0b19f47..347c7be 100644 --- a/levels/ast1.gd +++ b/levels/ast1.gd @@ -17,28 +17,29 @@ func _process(delta): var xm = 0 var ym = 0 var velocity = Vector2.ZERO - if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: - velocity = (Vector2.RIGHT.rotated(rotation) * -10000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -10000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): - if (Time.get_ticks_msec() - ctime) <= 67: + if Global.live == 1: + if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: + velocity = (Vector2.RIGHT.rotated(rotation) * -10000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -10000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) + elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): + if (Time.get_ticks_msec() - ctime) <= 67: + Global.origmpos = get_viewport().get_mouse_position() + Global.mousepos = get_viewport().get_mouse_position() - Global.origmpos + else : + Global.mousepos = get_viewport().get_mouse_position() - Global.origmpos + self.position = Vector2(origpos.x+Global.mousepos.x, origpos.y+Global.mousepos.y) + else: + if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): + xm = -1 + if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): + xm = 1 + if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): + ym = -1 + if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): + ym = 1 + velocity = (Vector2.RIGHT.rotated(rotation) * -10000 * xm * delta)-Vector2.UP.rotated(rotation) * -10000 * ym * delta + origpos = self.position Global.origmpos = get_viewport().get_mouse_position() - Global.mousepos = get_viewport().get_mouse_position() - Global.origmpos - else : - Global.mousepos = get_viewport().get_mouse_position() - Global.origmpos - self.position = Vector2(origpos.x+Global.mousepos.x, origpos.y+Global.mousepos.y) - else: - if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): - xm = -1 - if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): - xm = 1 - if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): - ym = -1 - if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): - ym = 1 - velocity = (Vector2.RIGHT.rotated(rotation) * -10000 * xm * delta)-Vector2.UP.rotated(rotation) * -10000 * ym * delta - origpos = self.position - Global.origmpos = get_viewport().get_mouse_position() - ctime = Time.get_ticks_msec() + ctime = Time.get_ticks_msec() #if Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) != 0: # velocity = Vector2.UP.rotated(rotation) * -400 * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) position += velocity * delta diff --git a/levels/ast2.gd b/levels/ast2.gd index b07b863..77632bb 100644 --- a/levels/ast2.gd +++ b/levels/ast2.gd @@ -15,22 +15,23 @@ func _process(delta): var xm = 0 var ym = 0 var velocity = Vector2.ZERO - if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: - velocity = (Vector2.RIGHT.rotated(rotation) * -20000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -20000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): + if Global.live == 1: + if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: + velocity = (Vector2.RIGHT.rotated(rotation) * -20000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -20000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) + elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): #var mousepos = get_viewport().get_mouse_position() - origmpos - self.position = Vector2(origpos.x+(Global.mousepos.x*2), origpos.y+(Global.mousepos.y*2)) - else: - if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): - xm = -1 - if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): - xm = 1 - if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): - ym = -1 - if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): - ym = 1 - velocity = (Vector2.RIGHT.rotated(rotation) * -20000 * xm * delta)-Vector2.UP.rotated(rotation) * -20000 * ym * delta - origpos = self.position + self.position = Vector2(origpos.x+(Global.mousepos.x*2), origpos.y+(Global.mousepos.y*2)) + else: + if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): + xm = -1 + if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): + xm = 1 + if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): + ym = -1 + if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): + ym = 1 + velocity = (Vector2.RIGHT.rotated(rotation) * -20000 * xm * delta)-Vector2.UP.rotated(rotation) * -20000 * ym * delta + origpos = self.position #origmpos = get_viewport().get_mouse_position() #if Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) != 0: # velocity = Vector2.UP.rotated(rotation) * -400 * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) diff --git a/levels/ast3.gd b/levels/ast3.gd index 6ba75ff..78e68f1 100644 --- a/levels/ast3.gd +++ b/levels/ast3.gd @@ -15,23 +15,24 @@ func _process(delta): var xm = 0 var ym = 0 var velocity = Vector2.ZERO - if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: - velocity = (Vector2.RIGHT.rotated(rotation) * -30000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -30000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): + if Global.live == 1: + if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: + velocity = (Vector2.RIGHT.rotated(rotation) * -30000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -30000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) + elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): #var mousepos = get_viewport().get_mouse_position() - origmpos - self.position = Vector2(origpos.x+(Global.mousepos.x*3), origpos.y+(Global.mousepos.y*3)) - else: - if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): - xm = -1 - if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): - xm = 1 - if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): - ym = -1 - if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): - ym = 1 - velocity = (Vector2.RIGHT.rotated(rotation) * -30000 * xm * delta)-Vector2.UP.rotated(rotation) * -30000 * ym * delta - origpos = self.position - #origmpos = get_viewport().get_mouse_position() + self.position = Vector2(origpos.x+(Global.mousepos.x*3), origpos.y+(Global.mousepos.y*3)) + else: + if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): + xm = -1 + if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): + xm = 1 + if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): + ym = -1 + if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): + ym = 1 + velocity = (Vector2.RIGHT.rotated(rotation) * -30000 * xm * delta)-Vector2.UP.rotated(rotation) * -30000 * ym * delta + origpos = self.position + #origmpos = get_viewport().get_mouse_position() #if Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) != 0: # velocity = Vector2.UP.rotated(rotation) * -400 * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) position += velocity * delta diff --git a/levels/css1.gd b/levels/css1.gd index 7c31f43..80eff75 100644 --- a/levels/css1.gd +++ b/levels/css1.gd @@ -15,27 +15,28 @@ func _process(delta): var xm = 0 var ym = 0 var velocity = Vector2.ZERO - if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: - velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -50000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): + if Global.live == 1: + if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: + velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -50000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) + elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): #var mousepos = get_viewport().get_mouse_position() - origmpos - self.position = Vector2(origpos.x+(Global.mousepos.x*5), origpos.y+(Global.mousepos.y*5)) - else: - if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): - xm = -1 - if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): - xm = 1 - if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): - ym = -1 - if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): - ym = 1 - velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * xm * delta)-Vector2.UP.rotated(rotation) * -50000 * ym * delta - origpos = self.position + self.position = Vector2(origpos.x+(Global.mousepos.x*5), origpos.y+(Global.mousepos.y*5)) + else: + if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): + xm = -1 + if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): + xm = 1 + if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): + ym = -1 + if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): + ym = 1 + velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * xm * delta)-Vector2.UP.rotated(rotation) * -50000 * ym * delta + origpos = self.position #origmpos = get_viewport().get_mouse_position() #if Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) != 0: # velocity = Vector2.UP.rotated(rotation) * -400 * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - position += velocity * delta - if position.x < 782 && position.x > 496: - if position.y < 468 && position.y > 270: - Global.live = 2 + position += velocity * delta + if position.x < 782 && position.x > 496: + if position.y < 468 && position.y > 270: + Global.live = 2 #pass diff --git a/levels/wall1.gd b/levels/wall1.gd index 85cf3a2..06fbb43 100644 --- a/levels/wall1.gd +++ b/levels/wall1.gd @@ -15,26 +15,27 @@ func _process(delta): var xm = 0 var ym = 0 var velocity = Vector2.ZERO - if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: - velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -50000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): + if Global.live == 1: + if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: + velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -50000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) + elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): #var mousepos = get_viewport().get_mouse_position() - origmpos - self.position = Vector2(origpos.x+(Global.mousepos.x*5), origpos.y+(Global.mousepos.y*5)) - else: - if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): - xm = -1 - if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): - xm = 1 - if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): - ym = -1 - if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): - ym = 1 - velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * xm * delta)-Vector2.UP.rotated(rotation) * -50000 * ym * delta - origpos = self.position + self.position = Vector2(origpos.x+(Global.mousepos.x*5), origpos.y+(Global.mousepos.y*5)) + else: + if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): + xm = -1 + if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): + xm = 1 + if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): + ym = -1 + if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): + ym = 1 + velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * xm * delta)-Vector2.UP.rotated(rotation) * -50000 * ym * delta + origpos = self.position #origmpos = get_viewport().get_mouse_position() #if Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) != 0: # velocity = Vector2.UP.rotated(rotation) * -400 * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - position += velocity * delta - if position.x > 496: - Global.live = 2 + position += velocity * delta + if position.x > 496: + Global.live = 2 #pass diff --git a/levels/wall2.gd b/levels/wall2.gd index 2fe9764..840ff5b 100644 --- a/levels/wall2.gd +++ b/levels/wall2.gd @@ -15,26 +15,27 @@ func _process(delta): var xm = 0 var ym = 0 var velocity = Vector2.ZERO - if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: - velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -50000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): + if Global.live == 1: + if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: + velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -50000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) + elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): #var mousepos = get_viewport().get_mouse_position() - origmpos - self.position = Vector2(origpos.x+(Global.mousepos.x*5), origpos.y+(Global.mousepos.y*5)) - else: - if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): - xm = -1 - if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): - xm = 1 - if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): - ym = -1 - if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): - ym = 1 - velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * xm * delta)-Vector2.UP.rotated(rotation) * -50000 * ym * delta - origpos = self.position + self.position = Vector2(origpos.x+(Global.mousepos.x*5), origpos.y+(Global.mousepos.y*5)) + else: + if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): + xm = -1 + if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): + xm = 1 + if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): + ym = -1 + if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): + ym = 1 + velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * xm * delta)-Vector2.UP.rotated(rotation) * -50000 * ym * delta + origpos = self.position #origmpos = get_viewport().get_mouse_position() #if Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) != 0: # velocity = Vector2.UP.rotated(rotation) * -400 * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - position += velocity * delta - if position.x < 782: - Global.live = 2 + position += velocity * delta + if position.x < 782: + Global.live = 2 #pass diff --git a/levels/wall3.gd b/levels/wall3.gd index f71d673..9d23489 100644 --- a/levels/wall3.gd +++ b/levels/wall3.gd @@ -15,26 +15,27 @@ func _process(delta): var xm = 0 var ym = 0 var velocity = Vector2.ZERO - if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: - velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -50000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): + if Global.live == 1: + if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: + velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -50000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) + elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): #var mousepos = get_viewport().get_mouse_position() - origmpos - self.position = Vector2(origpos.x+(Global.mousepos.x*5), origpos.y+(Global.mousepos.y*5)) - else: - if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): - xm = -1 - if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): - xm = 1 - if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): - ym = -1 - if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): - ym = 1 - velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * xm * delta)-Vector2.UP.rotated(rotation) * -50000 * ym * delta - origpos = self.position + self.position = Vector2(origpos.x+(Global.mousepos.x*5), origpos.y+(Global.mousepos.y*5)) + else: + if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): + xm = -1 + if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): + xm = 1 + if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): + ym = -1 + if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): + ym = 1 + velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * xm * delta)-Vector2.UP.rotated(rotation) * -50000 * ym * delta + origpos = self.position #origmpos = get_viewport().get_mouse_position() #if Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) != 0: # velocity = Vector2.UP.rotated(rotation) * -400 * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - position += velocity * delta - if position.y > 270: - Global.live = 2 + position += velocity * delta + if position.y > 270: + Global.live = 2 #pass diff --git a/levels/wall4.gd b/levels/wall4.gd index ce8a438..bd0891c 100644 --- a/levels/wall4.gd +++ b/levels/wall4.gd @@ -15,26 +15,27 @@ func _process(delta): var xm = 0 var ym = 0 var velocity = Vector2.ZERO - if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: - velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -50000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): + if Global.live == 1: + if Input.get_joy_axis(0,JOY_AXIS_LEFT_X) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) > 0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_X) < -0.2 || Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) < -0.2: + velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_X))-Vector2.UP.rotated(rotation) * -50000 *delta * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) + elif Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT): #var mousepos = get_viewport().get_mouse_position() - origmpos - self.position = Vector2(origpos.x+(Global.mousepos.x*5), origpos.y+(Global.mousepos.y*5)) - else: - if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): - xm = -1 - if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): - xm = 1 - if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): - ym = -1 - if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): - ym = 1 - velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * xm * delta)-Vector2.UP.rotated(rotation) * -50000 * ym * delta - origpos = self.position + self.position = Vector2(origpos.x+(Global.mousepos.x*5), origpos.y+(Global.mousepos.y*5)) + else: + if Input.is_action_pressed("ui_left") || Input.is_key_pressed(KEY_A): + xm = -1 + if Input.is_action_pressed("ui_right") || Input.is_key_pressed(KEY_D): + xm = 1 + if Input.is_action_pressed("ui_up") || Input.is_key_pressed(KEY_W): + ym = -1 + if Input.is_action_pressed("ui_down") || Input.is_key_pressed(KEY_S): + ym = 1 + velocity = (Vector2.RIGHT.rotated(rotation) * -50000 * xm * delta)-Vector2.UP.rotated(rotation) * -50000 * ym * delta + origpos = self.position #origmpos = get_viewport().get_mouse_position() #if Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) != 0: # velocity = Vector2.UP.rotated(rotation) * -400 * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) - position += velocity * delta - if position.y < 468: - Global.live = 2 + position += velocity * delta + if position.y < 468: + Global.live = 2 #pass