Rework projectiles and fix some demon wall attacks
Still working on Demon Wall boss fight overall
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=1574 format=3 uid="uid://cfecvvav8kkp6"]
|
||||
[gd_scene load_steps=1569 format=3 uid="uid://cfecvvav8kkp6"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://yxmiqy7i0t7r" path="res://src/player/Player.cs" id="1_xcol5"]
|
||||
[ext_resource type="PackedScene" uid="uid://dqvlemme0iwa" path="res://src/camera/ShakeCamera.tscn" id="2_jtmj1"]
|
||||
@@ -7,7 +7,6 @@
|
||||
[ext_resource type="Shader" uid="uid://dfk3eps71yyyl" path="res://src/player/InvertColors.gdshader" id="4_v5qoq"]
|
||||
[ext_resource type="Texture2D" uid="uid://ddmjhevb5ksl" path="res://src/vfx/Items Etc/geomantic_reactor_AIR.png" id="5_bngr8"]
|
||||
[ext_resource type="AudioStream" uid="uid://bsprdc3ka6am0" path="res://src/audio/sfx/player_steps_concrete.ogg" id="6_v7rlw"]
|
||||
[ext_resource type="AudioStream" uid="uid://dfwydlvy7gg4n" path="res://src/audio/sfx/ENEMY_PILLAR_FIRE.ogg" id="7_cqsul"]
|
||||
[ext_resource type="Texture2D" uid="uid://jgfksn01g0ht" path="res://src/vfx/Items Etc/salmon/salmon001.png" id="7_rmwaq"]
|
||||
[ext_resource type="AudioStream" uid="uid://cth2xgoqhdf0m" path="res://src/audio/sfx/player_hit_wall.ogg" id="8_ajbah"]
|
||||
[ext_resource type="Texture2D" uid="uid://drk8jp22p41f4" path="res://src/vfx/Items Etc/divinity/divinity000.png" id="8_majw8"]
|
||||
@@ -518,11 +517,11 @@
|
||||
[ext_resource type="Texture2D" uid="uid://oa6dmpe31efs" path="res://src/vfx/Weapon Strikes/hydric_attack/tile008.png" id="508_ajbah"]
|
||||
[ext_resource type="Texture2D" uid="uid://pv56eou8fuw6" path="res://src/vfx/Items Etc/crosshair.png" id="508_sq73w"]
|
||||
[ext_resource type="Texture2D" uid="uid://dxnata78dcvlg" path="res://src/vfx/Weapon Strikes/hydric_attack/tile009.png" id="509_7rguc"]
|
||||
[ext_resource type="PackedScene" uid="uid://bredkcfalakdp" path="res://src/items/weapons/FireReactorProjectile.tscn" id="509_14f5p"]
|
||||
[ext_resource type="PackedScene" uid="uid://bnl6oc6yu7nx4" path="res://src/items/weapons/FireReactorProjectile.tscn" id="509_14f5p"]
|
||||
[ext_resource type="PackedScene" uid="uid://ddcw0xw7pxk8r" path="res://src/items/weapons/AirReactorProjectile.tscn" id="510_k6pkx"]
|
||||
[ext_resource type="Texture2D" uid="uid://cqsj88qfctx7p" path="res://src/vfx/Weapon Strikes/hydric_attack/tile010.png" id="510_w5dir"]
|
||||
[ext_resource type="Texture2D" uid="uid://c8dy8b1jm7vfp" path="res://src/vfx/Weapon Strikes/hydric_attack/tile011.png" id="511_34gm2"]
|
||||
[ext_resource type="PackedScene" uid="uid://dluot8v3m0drs" path="res://src/items/weapons/WaterReactorProjectile.tscn" id="511_sq73w"]
|
||||
[ext_resource type="PackedScene" uid="uid://dmrmcvkxqjb5g" path="res://src/items/weapons/WaterReactorProjectile.tscn" id="511_sq73w"]
|
||||
[ext_resource type="Texture2D" uid="uid://bk4nbdw5vwu4f" path="res://src/vfx/Weapon Strikes/hydric_attack/tile012.png" id="512_fsw4h"]
|
||||
[ext_resource type="PackedScene" uid="uid://c4kc2vybdy5t" path="res://src/items/weapons/PersuaderProjectile.tscn" id="512_k6pkx"]
|
||||
[ext_resource type="Texture2D" uid="uid://b6eehqy4ir6xi" path="res://src/vfx/Weapon Strikes/hydric_attack/tile013.png" id="513_aodty"]
|
||||
@@ -542,7 +541,7 @@
|
||||
[ext_resource type="Texture2D" uid="uid://cl2woq73pn2ab" path="res://src/vfx/Weapon Strikes/hydric_attack/tile027.png" id="527_nilvr"]
|
||||
[ext_resource type="Texture2D" uid="uid://d3e8jnj7q6sdk" path="res://src/vfx/Weapon Strikes/hydric_attack/tile028.png" id="528_ynv1q"]
|
||||
[ext_resource type="Texture2D" uid="uid://def40t23awj4c" path="res://src/vfx/Weapon Strikes/hydric_attack/tile029.png" id="529_3e7br"]
|
||||
[ext_resource type="Script" uid="uid://ctshiyffvt4y5" path="res://src/system/AttackDataResource.cs" id="543_cqsul"]
|
||||
[ext_resource type="Script" uid="uid://chxka5g7yvcg" path="res://src/projectile/ProjectileSystem.cs" id="538_nb4cq"]
|
||||
|
||||
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_dw45s"]
|
||||
radius = 1.0
|
||||
@@ -1493,21 +1492,6 @@ tracks/1/keys = {
|
||||
"update": 0,
|
||||
"values": [0, 63]
|
||||
}
|
||||
tracks/2/type = "audio"
|
||||
tracks/2/imported = false
|
||||
tracks/2/enabled = true
|
||||
tracks/2/path = NodePath("../Projectiles/PersuaderBullet/Bullet/ProjectileHitbox/BulletSFX")
|
||||
tracks/2/interp = 1
|
||||
tracks/2/loop_wrap = true
|
||||
tracks/2/keys = {
|
||||
"clips": [{
|
||||
"end_offset": 0.0,
|
||||
"start_offset": 0.0,
|
||||
"stream": ExtResource("7_cqsul")
|
||||
}],
|
||||
"times": PackedFloat32Array(0)
|
||||
}
|
||||
tracks/2/use_blend = true
|
||||
|
||||
[sub_resource type="Animation" id="Animation_w5dir"]
|
||||
resource_name = "Plasma Sword"
|
||||
@@ -10289,30 +10273,6 @@ animations = [{
|
||||
"speed": 24.0
|
||||
}]
|
||||
|
||||
[sub_resource type="Resource" id="Resource_w5dir"]
|
||||
script = ExtResource("543_cqsul")
|
||||
Damage = 25
|
||||
ElementType = 4
|
||||
metadata/_custom_type_script = "uid://ctshiyffvt4y5"
|
||||
|
||||
[sub_resource type="Resource" id="Resource_7rguc"]
|
||||
script = ExtResource("543_cqsul")
|
||||
Damage = 25
|
||||
ElementType = 1
|
||||
metadata/_custom_type_script = "uid://ctshiyffvt4y5"
|
||||
|
||||
[sub_resource type="Resource" id="Resource_cqsul"]
|
||||
script = ExtResource("543_cqsul")
|
||||
Damage = 25
|
||||
ElementType = 3
|
||||
metadata/_custom_type_script = "uid://ctshiyffvt4y5"
|
||||
|
||||
[sub_resource type="Resource" id="Resource_ajbah"]
|
||||
script = ExtResource("543_cqsul")
|
||||
Damage = 99
|
||||
ElementType = 0
|
||||
metadata/_custom_type_script = "uid://ctshiyffvt4y5"
|
||||
|
||||
[node name="Player" type="CharacterBody3D"]
|
||||
collision_layer = 802
|
||||
collision_mask = 775
|
||||
@@ -10344,10 +10304,10 @@ mesh = SubResource("QuadMesh_ebyyx")
|
||||
|
||||
[node name="player_model" type="Node3D" parent="Camera"]
|
||||
transform = Transform3D(-0.015, 0, -2.26494e-09, 0, 0.015, 0, 2.26494e-09, 0, -0.015, 0, -0.268445, -0.00941753)
|
||||
visible = false
|
||||
|
||||
[node name="tendomaya" parent="Camera/player_model" instance=ExtResource("3_74hqa")]
|
||||
transform = Transform3D(1.355, 0, 2.84217e-14, 0, 1.355, 0, -2.84217e-14, 0, 1.355, 3.57499e-06, 0, -23.676)
|
||||
visible = false
|
||||
|
||||
[node name="Lights" type="Node3D" parent="Camera"]
|
||||
|
||||
@@ -10525,26 +10485,38 @@ stream = ExtResource("6_v7rlw")
|
||||
|
||||
[node name="Projectiles" type="Node3D" parent="."]
|
||||
|
||||
[node name="FireReactor" parent="Projectiles" instance=ExtResource("509_14f5p")]
|
||||
[node name="AirReactorProjectileSystem" type="Node3D" parent="Projectiles"]
|
||||
unique_name_in_owner = true
|
||||
AttackData = SubResource("Resource_w5dir")
|
||||
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2.1, -1)
|
||||
script = ExtResource("538_nb4cq")
|
||||
ProjectileScene = ExtResource("510_k6pkx")
|
||||
_projectileForce = 10.0
|
||||
|
||||
[node name="AirReactor" parent="Projectiles" instance=ExtResource("510_k6pkx")]
|
||||
[node name="Marker3D" type="Marker3D" parent="Projectiles/AirReactorProjectileSystem"]
|
||||
|
||||
[node name="FireReactorProjectileSystem" type="Node3D" parent="Projectiles"]
|
||||
unique_name_in_owner = true
|
||||
AttackData = SubResource("Resource_7rguc")
|
||||
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2.1, -1)
|
||||
script = ExtResource("538_nb4cq")
|
||||
ProjectileScene = ExtResource("509_14f5p")
|
||||
_projectileForce = 10.0
|
||||
|
||||
[node name="WaterReactor" parent="Projectiles" instance=ExtResource("511_sq73w")]
|
||||
[node name="Marker3D" type="Marker3D" parent="Projectiles/FireReactorProjectileSystem"]
|
||||
|
||||
[node name="WaterReactorProjectileSystem" type="Node3D" parent="Projectiles"]
|
||||
unique_name_in_owner = true
|
||||
AttackData = SubResource("Resource_cqsul")
|
||||
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2.1, -1)
|
||||
script = ExtResource("538_nb4cq")
|
||||
ProjectileScene = ExtResource("511_sq73w")
|
||||
_projectileForce = 10.0
|
||||
|
||||
[node name="PersuaderBullet" parent="Projectiles" instance=ExtResource("512_k6pkx")]
|
||||
[node name="Marker3D" type="Marker3D" parent="Projectiles/WaterReactorProjectileSystem"]
|
||||
|
||||
[node name="KineticProjectileSystem" type="Node3D" parent="Projectiles"]
|
||||
unique_name_in_owner = true
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.125)
|
||||
AttackData = SubResource("Resource_ajbah")
|
||||
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2.1, -1)
|
||||
script = ExtResource("538_nb4cq")
|
||||
ProjectileScene = ExtResource("512_k6pkx")
|
||||
_projectileForce = 100.0
|
||||
|
||||
[node name="BulletSFX" type="AudioStreamPlayer3D" parent="Projectiles/PersuaderBullet/Bullet/ProjectileHitbox" index="1"]
|
||||
process_mode = 3
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -2.1, 0)
|
||||
bus = &"SFX"
|
||||
|
||||
[editable path="Projectiles/PersuaderBullet"]
|
||||
[node name="Marker3D" type="Marker3D" parent="Projectiles/KineticProjectileSystem"]
|
||||
|
||||
Reference in New Issue
Block a user