diff --git a/game/entities/weapons/abstract_weapon.gd b/game/entities/weapons/abstract_weapon.gd index b715a5b..11cc200 100644 --- a/game/entities/weapons/abstract_weapon.gd +++ b/game/entities/weapons/abstract_weapon.gd @@ -3,12 +3,14 @@ extends Node2D enum Belonging { PLAYER, ENEMY } +enum Type { SHORT_RANGE, MEDIUM_RANGE, LONG_RANGE, HOMING, MINES } @export_range(1, 100) var bullet_per_shot : int = 1 @export_range(0, 360) var sector_angle : int = 0 @export var Projectile : PackedScene +@export var type := Type.MEDIUM_RANGE const PREFIXES := { diff --git a/game/entities/weapons/cannon/cannon_weapon.tscn b/game/entities/weapons/cannon/cannon_weapon.tscn index cb454dc..84c45cc 100644 --- a/game/entities/weapons/cannon/cannon_weapon.tscn +++ b/game/entities/weapons/cannon/cannon_weapon.tscn @@ -155,6 +155,7 @@ gravity = Vector3(0, 0, 0) script = ExtResource("2_ew5um") sector_angle = 1 Projectile = ExtResource("2_2bjeu") +type = 2 [node name="ShotParticles" type="Node2D" parent="." index="0"] diff --git a/game/entities/weapons/laser/laser_weapon.tscn b/game/entities/weapons/laser/laser_weapon.tscn index f3eef1f..324eb5a 100644 --- a/game/entities/weapons/laser/laser_weapon.tscn +++ b/game/entities/weapons/laser/laser_weapon.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=3 uid="uid://def1alrel4ioo"] +[gd_scene load_steps=24 format=3 uid="uid://def1alrel4ioo"] [ext_resource type="PackedScene" uid="uid://1o2ta17yc5bp" path="res://game/entities/weapons/abstract_weapon.tscn" id="1_pki4x"] [ext_resource type="PackedScene" uid="uid://cmni0xrbbfcy5" path="res://game/entities/weapons/laser/laser_projectile.tscn" id="2_fecho"] @@ -150,6 +150,7 @@ animations = [{ script = ExtResource("2_lbdvb") bullet_per_shot = 2 Projectile = ExtResource("2_fecho") +type = 2 [node name="Sprite2D" type="Sprite2D" parent="." index="0"] texture = SubResource("PlaceholderTexture2D_dra6h") diff --git a/game/entities/weapons/launcher/launcher_weapon.tscn b/game/entities/weapons/launcher/launcher_weapon.tscn index 07c14de..be9e7d4 100644 --- a/game/entities/weapons/launcher/launcher_weapon.tscn +++ b/game/entities/weapons/launcher/launcher_weapon.tscn @@ -76,6 +76,7 @@ region = Rect2(224, 144, 32, 16) script = ExtResource("2_mxjpe") sector_angle = 5 Projectile = ExtResource("3_fsoo2") +type = 3 [node name="ShotProjectiles" type="Node2D" parent="." index="0"] diff --git a/game/entities/weapons/minelayer/minelayer_weapon.tscn b/game/entities/weapons/minelayer/minelayer_weapon.tscn index 446eba9..c7972f5 100644 --- a/game/entities/weapons/minelayer/minelayer_weapon.tscn +++ b/game/entities/weapons/minelayer/minelayer_weapon.tscn @@ -116,6 +116,7 @@ animations = [{ script = ExtResource("2_mmhtn") sector_angle = 10 Projectile = ExtResource("2_7y446") +type = 4 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." index="0"] sprite_frames = SubResource("SpriteFrames_wwpdh") diff --git a/game/entities/weapons/railgun/railgun_weapon.tscn b/game/entities/weapons/railgun/railgun_weapon.tscn index 76eeafb..7f31763 100644 --- a/game/entities/weapons/railgun/railgun_weapon.tscn +++ b/game/entities/weapons/railgun/railgun_weapon.tscn @@ -157,6 +157,7 @@ animations = [{ [node name="RailgunWeapon" instance=ExtResource("1_0nxvu")] script = ExtResource("1_5nhwg") Projectile = ExtResource("2_cbsia") +type = 2 [node name="Sprite2D" type="Sprite2D" parent="." index="0"] texture = SubResource("PlaceholderTexture2D_dra6h") diff --git a/game/entities/weapons/shrapnel/shrapnel_weapon.tscn b/game/entities/weapons/shrapnel/shrapnel_weapon.tscn index 0289b3d..166628e 100644 --- a/game/entities/weapons/shrapnel/shrapnel_weapon.tscn +++ b/game/entities/weapons/shrapnel/shrapnel_weapon.tscn @@ -114,6 +114,7 @@ script = ExtResource("2_1bd18") bullet_per_shot = 20 sector_angle = 30 Projectile = ExtResource("2_xvd4y") +type = 0 [node name="ShotParticles" type="GPUParticles2D" parent="." index="0"] emitting = false diff --git a/game/entities/weapons/tesla/tesla_weapon.tscn b/game/entities/weapons/tesla/tesla_weapon.tscn index 12c18f7..ec5f90b 100644 --- a/game/entities/weapons/tesla/tesla_weapon.tscn +++ b/game/entities/weapons/tesla/tesla_weapon.tscn @@ -149,6 +149,7 @@ gravity = Vector3(0, 0, 0) script = ExtResource("2_08si3") sector_angle = 10 Projectile = ExtResource("2_1rrdy") +type = 3 [node name="Sprite2D" type="Sprite2D" parent="." index="0"] texture = SubResource("PlaceholderTexture2D_dra6h")