diff --git a/Asteroid.tscn b/Asteroid.tscn index d17819e..8db07fa 100644 --- a/Asteroid.tscn +++ b/Asteroid.tscn @@ -1,18 +1,19 @@ [gd_scene load_steps=4 format=1] [ext_resource path="res://Asteroid.gd" type="Script" id=1] -[ext_resource path="res://raw/asteroid.png" type="Texture" id=2] +[ext_resource path="res://raw/asteroid_small.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1] custom_solver_bias = 0.0 -extents = Vector2( 25.1672, 26.3172 ) +extents = Vector2( 12.234, 13.1952 ) [node name="Asteroid" type="KinematicBody2D"] +transform/scale = Vector2( 2, 2 ) input/pickable = false shapes/0/shape = SubResource( 1 ) -shapes/0/transform = Matrix32( 1, 0, 0, 1, -0.17482, 3.67132 ) +shapes/0/transform = Matrix32( 1, 0, 0, 1, -0.17482, 1.87222 ) shapes/0/trigger = false collision/layers = 1 collision/mask = 1 @@ -25,7 +26,7 @@ texture = ExtResource( 2 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -transform/pos = Vector2( -0.17482, 3.67132 ) +transform/pos = Vector2( -0.17482, 1.87222 ) shape = SubResource( 1 ) trigger = false _update_shape_index = 0 diff --git a/Bullet.tscn b/Bullet.tscn index 3a38543..4270b7c 100644 --- a/Bullet.tscn +++ b/Bullet.tscn @@ -10,6 +10,7 @@ extents = Vector2( 0.99762, 3.98857 ) [node name="Bullet" type="KinematicBody2D"] +transform/rot = 180.0 input/pickable = false shapes/0/shape = SubResource( 1 ) shapes/0/transform = Matrix32( 1, 0, 0, 1, 0, 0 ) diff --git a/Game.tscn b/Game.tscn index 2e750c2..1c056f1 100644 --- a/Game.tscn +++ b/Game.tscn @@ -69,5 +69,6 @@ region_rect = Rect2( 0, 0, 8192, 8192 ) [node name="EnemyGrunt" parent="." instance=ExtResource( 7 )] transform/pos = Vector2( 127.878, -20.3627 ) +transform/scale = Vector2( 1.5, 1.5 ) diff --git a/Gun.gd b/Gun.gd index b7825f8..6902900 100644 --- a/Gun.gd +++ b/Gun.gd @@ -4,18 +4,20 @@ var Bullet = load("res://Bullet.tscn") var gun_cooldown = 0 var gun_delay = 0.1125 +var gun_spread_max = deg2rad(1) # degrees max func _ready(): set_fixed_process(true) - + func _fixed_process(delta): gun_cooldown = clamp(gun_cooldown - delta, 0, 1) - + func fire(delta, vel, dir): if gun_cooldown <= 0: var new_bullet = Bullet.instance() var gun_pos = get_global_pos() new_bullet.set_pos(gun_pos + vel) get_tree().get_root().add_child(new_bullet) - new_bullet.fire(delta, vel, dir, 512) + var rot = rand_range(-gun_spread_max, gun_spread_max) + new_bullet.fire(delta, vel, dir.rotated(rot), 512) gun_cooldown += gun_delay diff --git a/Player.gd b/Player.gd index ea7bc20..5a583d9 100644 --- a/Player.gd +++ b/Player.gd @@ -22,7 +22,7 @@ func _ready(): set_fixed_process(true) left_particles.set_emitting(false) right_particles.set_emitting(false) - + func turn_towards(delta, pos): var target_dir = (pos - get_global_pos()).normalized() @@ -45,12 +45,12 @@ func turn_towards(delta, pos): right_particles.set_emitting(false) ship_dir = ship_dir.rotated(-ca) - + func _fixed_process(delta): var mov_delta = Vector2(0, 0) turn_towards(delta, get_global_mouse_pos()) - + if Input.is_action_pressed("player_move_forwards"): is_moving = true mov_delta += -ship_dir @@ -58,7 +58,7 @@ func _fixed_process(delta): mov_delta += ship_dir else: is_moving = false - + if Input.is_action_pressed("player_attack_primary"): left_gun.fire(delta, ship_vel, -ship_dir) right_gun.fire(delta, ship_vel, -ship_dir) diff --git a/raw/asteroid.ase b/raw/asteroid.ase index a686edb..ee2b410 100644 --- a/raw/asteroid.ase +++ b/raw/asteroid.ase @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b29034b94d6c4daf9e8b33e12b0a7b0640ec0dc6e3938974a1cc03d00c460445 -size 1303 +oid sha256:d519b8966164e3bbb538a80907c06ad017d688e2ea4e6a379f7748927082a55b +size 1043 diff --git a/raw/asteroid.png b/raw/asteroid.png index d5f5fa3..d854846 100644 Binary files a/raw/asteroid.png and b/raw/asteroid.png differ diff --git a/raw/asteroid_medium.ase b/raw/asteroid_medium.ase new file mode 100644 index 0000000..ee2b410 --- /dev/null +++ b/raw/asteroid_medium.ase @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d519b8966164e3bbb538a80907c06ad017d688e2ea4e6a379f7748927082a55b +size 1043 diff --git a/raw/asteroid_medium.png b/raw/asteroid_medium.png new file mode 100644 index 0000000..d854846 Binary files /dev/null and b/raw/asteroid_medium.png differ diff --git a/raw/asteroid_medium.png.flags b/raw/asteroid_medium.png.flags new file mode 100644 index 0000000..226e8a3 --- /dev/null +++ b/raw/asteroid_medium.png.flags @@ -0,0 +1,2 @@ +filter=false +gen_mipmaps=false diff --git a/raw/asteroid_small.ase b/raw/asteroid_small.ase new file mode 100644 index 0000000..f968591 --- /dev/null +++ b/raw/asteroid_small.ase @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b53a5fab77832a19f681a0334a8da20bea29ebb9bc4d614af8e0acd5120fddf +size 582 diff --git a/raw/asteroid_small.png b/raw/asteroid_small.png new file mode 100644 index 0000000..9fa8659 Binary files /dev/null and b/raw/asteroid_small.png differ diff --git a/raw/asteroid_small.png.flags b/raw/asteroid_small.png.flags new file mode 100644 index 0000000..226e8a3 --- /dev/null +++ b/raw/asteroid_small.png.flags @@ -0,0 +1,2 @@ +filter=false +gen_mipmaps=false diff --git a/raw/enemy_grunt.ase b/raw/enemy_grunt.ase index b8ac8b3..2a42471 100644 --- a/raw/enemy_grunt.ase +++ b/raw/enemy_grunt.ase @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6e3a7b919b49e87d3da8417ad90062c3be75fd3b0a8ee7180c86f49a54f3c64 -size 750 +oid sha256:52b3033ec0c21ef00d619185a7fe8209461a64e39e94b4d4606d99de35ba743f +size 656 diff --git a/raw/enemy_grunt.png b/raw/enemy_grunt.png index cc04408..266056a 100644 Binary files a/raw/enemy_grunt.png and b/raw/enemy_grunt.png differ diff --git a/raw/enemy_grunt.png.flags b/raw/enemy_grunt.png.flags index b9c31db..226e8a3 100644 --- a/raw/enemy_grunt.png.flags +++ b/raw/enemy_grunt.png.flags @@ -1,3 +1,2 @@ filter=false gen_mipmaps=false -anisotropic=true diff --git a/raw/minimap.ase b/raw/minimap.ase index 04612b2..f7c4026 100644 --- a/raw/minimap.ase +++ b/raw/minimap.ase @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f3e61a8c2412de50a0148ec89a179462304b044ff39ee77a2dd70cdb4eb8a9f -size 990 +oid sha256:a4ee2a229e536843a7614db4df999ffb22a4dd382176d4dd24a333870dcd8304 +size 1047 diff --git a/raw/minimap.png b/raw/minimap.png index 134d88f..14c44aa 100644 Binary files a/raw/minimap.png and b/raw/minimap.png differ diff --git a/raw/simple_bullet.ase b/raw/simple_bullet.ase index 2a4f26e..23c687b 100644 --- a/raw/simple_bullet.ase +++ b/raw/simple_bullet.ase @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e527fef8ec783c4d0fe4da31c38011107940600b9db3df77621c815f35166e0a -size 578 +oid sha256:4d43c431b9848d37f00b63f37a5f0a4a72b482591f925ffe609a723f6fe06ad5 +size 552 diff --git a/raw/simple_bullet.png b/raw/simple_bullet.png index bd5710b..9e33a2c 100644 Binary files a/raw/simple_bullet.png and b/raw/simple_bullet.png differ