Compare commits
No commits in common. "1794abe50a01760fc71843c8304d2f81d7834013" and "6431259f7f8b1498208a9ed66371b2a0ea8b811b" have entirely different histories.
1794abe50a
...
6431259f7f
9 changed files with 14 additions and 45 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 766 B After Width: | Height: | Size: 760 B |
|
|
@ -6,8 +6,6 @@
|
|||
[resource]
|
||||
script = ExtResource("1_dpne1")
|
||||
shot_name = "Stock"
|
||||
damage = 3
|
||||
speed = -350
|
||||
projectiles = 1
|
||||
cooldown = 0.0
|
||||
metadata/_custom_type_script = "uid://ccdohs4gduee5"
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ size = Vector2(6, 5.75)
|
|||
|
||||
[node name="Player" type="Area2D" unique_id=652131079]
|
||||
script = ExtResource("1_g2els")
|
||||
speed = 275
|
||||
speed = 165
|
||||
weapon_current = ExtResource("2_dqkch")
|
||||
|
||||
[node name="Ship" type="Sprite2D" parent="." unique_id=1155866924]
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
[ext_resource type="Texture2D" uid="uid://ti1uy42vnnhw" path="res://graphics/shot.png" id="3_mvdrj"]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_mvdrj"]
|
||||
size = Vector2(6, 14)
|
||||
size = Vector2(12, 8)
|
||||
|
||||
[node name="StockWeapon" type="Area2D" unique_id=1832200900]
|
||||
script = ExtResource("1_hsma2")
|
||||
|
|
@ -13,13 +13,10 @@ shot_data = ExtResource("2_ckjv1")
|
|||
|
||||
[node name="Sprite2D" type="Sprite2D" parent="." unique_id=2134507225]
|
||||
texture = ExtResource("3_mvdrj")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(7, 6, 4, 12)
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1890946059]
|
||||
shape = SubResource("RectangleShape2D_mvdrj")
|
||||
|
||||
[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="." unique_id=985862716]
|
||||
rect = Rect2(-3, -7, 6, 14)
|
||||
|
||||
[connection signal="screen_exited" from="VisibleOnScreenNotifier2D" to="." method="_on_visible_on_screen_notifier_2d_screen_exited"]
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
[gd_scene format=3 uid="uid://b2ltmeb14nc17"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://d1rwqotmrag1r" path="res://scripts/stock_weapon.gd" id="1_kx6bj"]
|
||||
[ext_resource type="Resource" uid="uid://cels8t3hqjtsu" path="res://resources/shot_stock.tres" id="2_hefae"]
|
||||
[ext_resource type="Texture2D" uid="uid://ti1uy42vnnhw" path="res://graphics/shot.png" id="3_58qml"]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_mvdrj"]
|
||||
size = Vector2(12, 8)
|
||||
|
||||
[node name="StockWeapon" type="Area2D" unique_id=1832200900]
|
||||
script = ExtResource("1_kx6bj")
|
||||
shot_data = ExtResource("2_hefae")
|
||||
|
||||
[node name="Sprite2D" type="Sprite2D" parent="." unique_id=2134507225]
|
||||
texture = ExtResource("3_58qml")
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1890946059]
|
||||
shape = SubResource("RectangleShape2D_mvdrj")
|
||||
|
||||
[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="." unique_id=985862716]
|
||||
|
||||
[connection signal="screen_exited" from="VisibleOnScreenNotifier2D" to="." method="_on_visible_on_screen_notifier_2d_screen_exited"]
|
||||
|
|
@ -13,7 +13,6 @@
|
|||
[node name="Player" parent="Level" unique_id=652131079 instance=ExtResource("2_rwgxs")]
|
||||
z_index = 1
|
||||
position = Vector2(97, 173)
|
||||
speed = 200
|
||||
|
||||
[node name="Background" type="Node2D" parent="Level" unique_id=485120278]
|
||||
z_index = -1
|
||||
|
|
|
|||
|
|
@ -87,13 +87,10 @@ func _on_weapon_cooldown_timeout() -> void:
|
|||
|
||||
|
||||
func shoot():
|
||||
var projectiles: int = 2
|
||||
for b in projectiles:
|
||||
|
||||
# Instantiate the bullets
|
||||
# Instantiate the bullet
|
||||
var bullet = weapon_current.instantiate()
|
||||
get_tree().root.add_child(bullet)
|
||||
bullet.position = position + Vector2((b * 10) - (projectiles * projectiles),-23)
|
||||
bullet.position = position + Vector2(0,-23)
|
||||
|
||||
# Get weapon speed and spacing for equidistant calculations
|
||||
weapon_rate = bullet.shot_data.rate
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ extends Resource
|
|||
@export var shot_name: String
|
||||
@export var damage: int = 1
|
||||
@export var speed: int = 135
|
||||
@export var projectiles: int = 2
|
||||
@export var rate: float = 0.1
|
||||
@export var cooldown: float = 0.25
|
||||
@export var sprite: Texture2D = preload("res://graphics/shot.png")
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ extends Area2D
|
|||
@onready var bullet = load("res://scenes/stock_weapon.tscn")
|
||||
|
||||
@export var shot_data: PlayerShot
|
||||
@onready var player = get_node("../Player")
|
||||
|
||||
|
||||
func _process(delta):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue