This commit is contained in:
MaddoScientisto 2025-02-25 00:16:05 +01:00
commit d07fe420dd
6 changed files with 35 additions and 11 deletions

View file

@ -12,8 +12,8 @@ script = ExtResource("1_31o2l")
ItemName = "Ammo 1"
ItemKey = "Ammo1"
Item = 3
Amount = 100
Max = 800
Amount = 25
Max = 400
PickupIfMaxed = false
ConsumeOnUse = true
UiType = 2

View file

@ -12,8 +12,8 @@ BulletCapacity = 4
ReloadTime = 1.0
AutoReload = true
InfiniteAmmo = true
BulletsPerShot = 1
SpreadAngle = 0.0
BulletsPerShot = 5
SpreadAngle = 180.0
RandomSpread = 0.0
AmmoKey = ""
_rotationOffset = 0.0

View file

@ -0,0 +1,19 @@
[gd_resource type="Resource" script_class="WeaponResource" load_steps=3 format=3 uid="uid://csdlihliv4cr8"]
[ext_resource type="Resource" uid="uid://dqnvesdj0dk3v" path="res://Resources/Bullets/simple_enemy_bullet.tres" id="1_gsalt"]
[ext_resource type="Script" uid="uid://b6fmrnipv88bk" path="res://Scripts/Resources/WeaponResource.cs" id="2_vddmk"]
[resource]
script = ExtResource("2_vddmk")
Name = "Enemy Weapon"
BulletData = ExtResource("1_gsalt")
RateOfFire = 0.4
BulletCapacity = 4
ReloadTime = 1.0
AutoReload = true
InfiniteAmmo = true
BulletsPerShot = 1
SpreadAngle = 0.0
RandomSpread = 0.0
AmmoKey = ""
_rotationOffset = 0.0

View file

@ -10,7 +10,7 @@
[ext_resource type="Script" uid="uid://c4qmuxjhheahr" path="res://Scripts/Components/ProximityPlayerDetection.cs" id="8_j0gdf"]
[ext_resource type="Script" uid="uid://cqwvssstkrdmw" path="res://Scripts/Components/Actors/ActorResourceProvider.cs" id="9_4h871"]
[ext_resource type="PackedScene" uid="uid://cj63k0dmk7tl1" path="res://Scenes/Weapons/enemy_weapon_base.tscn" id="10_nc74c"]
[ext_resource type="Resource" uid="uid://cdfmedtgp2rcn" path="res://Resources/Weapons/EnemyWeapon.tres" id="11_ksqei"]
[ext_resource type="Resource" uid="uid://csdlihliv4cr8" path="res://Resources/Weapons/EnemyWeapon_simple.tres" id="11_y6dmo"]
[ext_resource type="Script" uid="uid://2cijskgyt2xb" path="res://Scripts/Components/Actors/DamageReceiverActorModule.cs" id="12_ubjf1"]
[ext_resource type="Script" uid="uid://m0ag88kn0c40" path="res://Scripts/Components/Actors/DeathAnimationHandler.cs" id="13_pc4bh"]
[ext_resource type="Resource" uid="uid://dk2rbf88a5irh" path="res://Resources/Bullets/Explosion_Harmless.tres" id="14_bjjn4"]
@ -82,7 +82,7 @@ ResourceName = "Health"
MaxResource = 6.0
[node name="EnemyWeapon" parent="." instance=ExtResource("10_nc74c")]
WeaponData = ExtResource("11_ksqei")
WeaponData = ExtResource("11_y6dmo")
[node name="DamageReceiver" type="Node2D" parent="." node_paths=PackedStringArray("HealthProvider")]
script = ExtResource("12_ubjf1")

View file

@ -7,8 +7,8 @@
radius = 2.23607
[node name="Bullet" type="Area2D" groups=["bullets"]]
collision_layer = 128
collision_mask = 71
collision_layer = 136
collision_mask = 87
script = ExtResource("1_s0j1e")
Speed = 200.0
metadata/_edit_group_ = true

View file

@ -450,7 +450,7 @@ SpawnMarkers = Dictionary[int, NodePath]({
255: NodePath("Factory Tilemaps/Debug Room/DebugRoomStartPosition")
})
WeaponTemplate = ExtResource("3_2wlhc")
StartingEquipment = Array[ExtResource("6_8tdlb")]([ExtResource("4_swym2"), ExtResource("5_nqier")])
StartingEquipment = [ExtResource("4_swym2"), ExtResource("5_nqier")]
MapStartData = SubResource("Resource_6sau4")
metadata/_edit_lock_ = true
@ -908,9 +908,8 @@ metadata/_edit_group_ = true
visible = false
_trackName = "computer1"
[node name="Computer2" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target", "Targets") instance=ExtResource("31_243ec")]
[node name="Computer2" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")]
position = Vector2(-1464, -276)
Target = NodePath("")
Targets = [NodePath("Script2")]
[node name="Script2" type="Node2D" parent="Factory Tilemaps/LevelProps/Computer2"]
@ -1081,6 +1080,12 @@ position = Vector2(-1131, -398)
[node name="FairyGuard3" parent="Factory Tilemaps/LevelProps/ServerRoom" instance=ExtResource("73_cfpaq")]
position = Vector2(-1067, -363)
[node name="HealthStation" parent="Factory Tilemaps/LevelProps" instance=ExtResource("38_kuhg5")]
position = Vector2(-654, -136)
[node name="Ammo1" parent="Factory Tilemaps" instance=ExtResource("34_17pjh")]
position = Vector2(-872, -220)
[node name="CameraController" type="Camera2D" parent="."]
process_mode = 1
script = ExtResource("6_t8ide")