j/Boat-Battle
1
0
Fork 0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2024-11-15 05:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Bug Fix: Rotating ships at the original position would move the other ships left for some reason

Browse Source 
- Issue fixed
- Now the ships won't move when rotated in the original position
- might make it so that the ships don't rotate in the original position in general
This commit is contained in:
tommy-l-ngo 2021-11-01 15:22:03 -05:00
parent 254a9d86d4
commit 223944523d
1 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
godot_ship/script/game/moveShip.gd
View File

@ -107,73 +107,74 @@ func _input(event):
rotate(PI/2) rotate(PI/2)
vertical = true vertical = true
# 2-Ship if(position.x > 17.4 and position.x < 337.5) and (position.y > 20.2 and position.y < 335.5):
if (get_parent().get_node("2Ship").rotation_degrees == 0): # 2-Ship
if (get_parent().get_node("2Ship").position.y > 308): if (get_parent().get_node("2Ship").rotation_degrees == 0):
get_parent().get_node("2Ship").position.y -= 32 if (get_parent().get_node("2Ship").position.y > 308):
if (get_parent().get_node("2Ship").rotation_degrees == -90): get_parent().get_node("2Ship").position.y -= 32
if (get_parent().get_node("2Ship").position.x > 308): if (get_parent().get_node("2Ship").rotation_degrees == -90):
get_parent().get_node("2Ship").position.x -= 32 if (get_parent().get_node("2Ship").position.x > 308):
get_parent().get_node("2Ship").position.x -= 32
# 3-Ship A # 3-Ship A
if (get_parent().get_node("3ShipA").rotation_degrees == 0): if (get_parent().get_node("3ShipA").rotation_degrees == 0):
if (get_parent().get_node("3ShipA").position.y > 308): if (get_parent().get_node("3ShipA").position.y > 308):
get_parent().get_node("3ShipA").position.y -= 32 get_parent().get_node("3ShipA").position.y -= 32
if (get_parent().get_node("3ShipA").position.y < 52): if (get_parent().get_node("3ShipA").position.y < 52):
get_parent().get_node("3ShipA").position.y += 32 get_parent().get_node("3ShipA").position.y += 32
if (get_parent().get_node("3ShipA").rotation_degrees == -90): if (get_parent().get_node("3ShipA").rotation_degrees == -90):
if (get_parent().get_node("3ShipA").position.x > 308): if (get_parent().get_node("3ShipA").position.x > 308):
get_parent().get_node("3ShipA").position.x -= 32 get_parent().get_node("3ShipA").position.x -= 32
if (get_parent().get_node("3ShipA").position.x < 52): if (get_parent().get_node("3ShipA").position.x < 52):
get_parent().get_node("3ShipA").position.x += 32 get_parent().get_node("3ShipA").position.x += 32
# 3-Ship B # 3-Ship B
if (get_parent().get_node("3ShipB").rotation_degrees == 0): if (get_parent().get_node("3ShipB").rotation_degrees == 0):
if (get_parent().get_node("3ShipB").position.y > 308): if (get_parent().get_node("3ShipB").position.y > 308):
get_parent().get_node("3ShipB").position.y -= 32 get_parent().get_node("3ShipB").position.y -= 32
if (get_parent().get_node("3ShipB").position.y < 52): if (get_parent().get_node("3ShipB").position.y < 52):
get_parent().get_node("3ShipB").position.y += 32 get_parent().get_node("3ShipB").position.y += 32
if (get_parent().get_node("3ShipB").rotation_degrees == -90): if (get_parent().get_node("3ShipB").rotation_degrees == -90):
if (get_parent().get_node("3ShipB").position.x > 308): if (get_parent().get_node("3ShipB").position.x > 308):
get_parent().get_node("3ShipB").position.x -= 32 get_parent().get_node("3ShipB").position.x -= 32
if (get_parent().get_node("3ShipB").position.x < 52): if (get_parent().get_node("3ShipB").position.x < 52):
get_parent().get_node("3ShipB").position.x += 32 get_parent().get_node("3ShipB").position.x += 32
# 4-Ship # 4-Ship
if (get_parent().get_node("4Ship").rotation_degrees == 0): if (get_parent().get_node("4Ship").rotation_degrees == 0):
if (get_parent().get_node("4Ship").position.y > 276.8): if (get_parent().get_node("4Ship").position.y > 276.8):
get_parent().get_node("4Ship").position.y -= 32
if (get_parent().get_node("4Ship").position.y > 308.8):
get_parent().get_node("4Ship").position.y -= 32 get_parent().get_node("4Ship").position.y -= 32
if (get_parent().get_node("4Ship").position.y < 52): if (get_parent().get_node("4Ship").position.y > 308.8):
get_parent().get_node("4Ship").position.y += 32 get_parent().get_node("4Ship").position.y -= 32
if (get_parent().get_node("4Ship").rotation_degrees == -90): if (get_parent().get_node("4Ship").position.y < 52):
if (get_parent().get_node("4Ship").position.x > 276.8): get_parent().get_node("4Ship").position.y += 32
get_parent().get_node("4Ship").position.x -= 32 if (get_parent().get_node("4Ship").rotation_degrees == -90):
if (get_parent().get_node("4Ship").position.y > 308.8): if (get_parent().get_node("4Ship").position.x > 276.8):
get_parent().get_node("4Ship").position.x -= 32 get_parent().get_node("4Ship").position.x -= 32
if (get_parent().get_node("4Ship").position.x < 52): if (get_parent().get_node("4Ship").position.y > 308.8):
get_parent().get_node("4Ship").position.x += 32 get_parent().get_node("4Ship").position.x -= 32
if (get_parent().get_node("4Ship").position.x < 52):
get_parent().get_node("4Ship").position.x += 32
# 5-Ship # 5-Ship
if (get_parent().get_node("5Ship").rotation_degrees == 0): if (get_parent().get_node("5Ship").rotation_degrees == 0):
if (get_parent().get_node("5Ship").position.y > 276.8): if (get_parent().get_node("5Ship").position.y > 276.8):
get_parent().get_node("5Ship").position.y -= 32
if (get_parent().get_node("5Ship").position.y > 308.8):
get_parent().get_node("5Ship").position.y -= 32 get_parent().get_node("5Ship").position.y -= 32
if (get_parent().get_node("5Ship").position.y < 84.8): if (get_parent().get_node("5Ship").position.y > 308.8):
get_parent().get_node("5Ship").position.y += 32 get_parent().get_node("5Ship").position.y -= 32
if (get_parent().get_node("5Ship").position.y < 52): if (get_parent().get_node("5Ship").position.y < 84.8):
get_parent().get_node("5Ship").position.y += 32 get_parent().get_node("5Ship").position.y += 32
if (get_parent().get_node("5Ship").rotation_degrees == -90): if (get_parent().get_node("5Ship").position.y < 52):
if (get_parent().get_node("5Ship").position.x > 276.8): get_parent().get_node("5Ship").position.y += 32
get_parent().get_node("5Ship").position.x -= 32 if (get_parent().get_node("5Ship").rotation_degrees == -90):
if (get_parent().get_node("5Ship").position.x > 308.8): if (get_parent().get_node("5Ship").position.x > 276.8):
get_parent().get_node("5Ship").position.x -= 32 get_parent().get_node("5Ship").position.x -= 32
if (get_parent().get_node("5Ship").position.x < 84.8): if (get_parent().get_node("5Ship").position.x > 308.8):
get_parent().get_node("5Ship").position.x += 32 get_parent().get_node("5Ship").position.x -= 32
if (get_parent().get_node("5Ship").position.x < 52): if (get_parent().get_node("5Ship").position.x < 84.8):
get_parent().get_node("5Ship").position.x += 32 get_parent().get_node("5Ship").position.x += 32
if (get_parent().get_node("5Ship").position.x < 52):
get_parent().get_node("5Ship").position.x += 32
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta): #func _process(delta):