mirror of
https://github.com/RYGhub/the-cold-night.git
synced 2024-11-22 04:34:19 +00:00
💥 Smooth enemy damage
This commit is contained in:
parent
f42c333228
commit
32ca5d2de2
7 changed files with 64 additions and 14 deletions
|
@ -2,4 +2,4 @@ extends KinematicBody2D
|
||||||
|
|
||||||
|
|
||||||
func _on_AttractedToMovement_collided(_origin, collision):
|
func _on_AttractedToMovement_collided(_origin, collision):
|
||||||
$Damaging.do_damage(collision.collider, 1)
|
$Damaging.do_damage(collision.collider, get_physics_process_delta_time())
|
||||||
|
|
|
@ -64,7 +64,6 @@ loot_weights = [ 80.0, 10.0, 10.0 ]
|
||||||
[node name="Damaging" type="Node" parent="." index="5"]
|
[node name="Damaging" type="Node" parent="." index="5"]
|
||||||
script = ExtResource( 11 )
|
script = ExtResource( 11 )
|
||||||
damage = -10.0
|
damage = -10.0
|
||||||
destroy_after_damage = true
|
|
||||||
|
|
||||||
[connection signal="collided" from="AttractedToMovement" to="." method="_on_AttractedToMovement_collided"]
|
[connection signal="collided" from="AttractedToMovement" to="." method="_on_AttractedToMovement_collided"]
|
||||||
[connection signal="moved_in_direction" from="AttractedToMovement" to="Shape/FourSidedSprite" method="_on_AttractedToMovement_moved_in_direction"]
|
[connection signal="moved_in_direction" from="AttractedToMovement" to="Shape/FourSidedSprite" method="_on_AttractedToMovement_moved_in_direction"]
|
||||||
|
|
|
@ -2,12 +2,12 @@ extends Node
|
||||||
class_name Music
|
class_name Music
|
||||||
|
|
||||||
|
|
||||||
export var choir_min: float = 0.05
|
export var choir_min: float = 10
|
||||||
export var choir_max: float = 0.30
|
export var choir_max: float = 60
|
||||||
export var bell_min: float = 0.20
|
export var bell_min: float = 40
|
||||||
export var bell_max: float = 0.60
|
export var bell_max: float = 100
|
||||||
export var drum_min: float = 0.40
|
export var drum_min: float = 100
|
||||||
export var drum_max: float = 0.80
|
export var drum_max: float = 160
|
||||||
export var muted: bool setget set_mute, get_mute
|
export var muted: bool setget set_mute, get_mute
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
[gd_scene load_steps=15 format=2]
|
[gd_scene load_steps=16 format=2]
|
||||||
|
|
||||||
|
[ext_resource path="res://src/pickups/BranchPickup.tscn" type="PackedScene" id=1]
|
||||||
[ext_resource path="res://src/mechanics/GrassDirtTileset.png" type="Texture" id=2]
|
[ext_resource path="res://src/mechanics/GrassDirtTileset.png" type="Texture" id=2]
|
||||||
[ext_resource path="res://src/entities/fire/Fire.tscn" type="PackedScene" id=3]
|
[ext_resource path="res://src/entities/fire/Fire.tscn" type="PackedScene" id=3]
|
||||||
[ext_resource path="res://src/behaviours/spawning/SpawnEveryPeriod.tscn" type="PackedScene" id=4]
|
[ext_resource path="res://src/behaviours/spawning/SpawnEveryPeriod.tscn" type="PackedScene" id=4]
|
||||||
|
@ -151,6 +152,46 @@ bounds = Vector2( 1280, 640 )
|
||||||
|
|
||||||
[node name="Pickups" type="Node" parent="Entities/Containers"]
|
[node name="Pickups" type="Node" parent="Entities/Containers"]
|
||||||
|
|
||||||
|
[node name="BranchPickup" parent="Entities/Containers/Pickups" instance=ExtResource( 1 )]
|
||||||
|
position = Vector2( 594, 322 )
|
||||||
|
scale = Vector2( 1, 1 )
|
||||||
|
|
||||||
|
[node name="Despawn" parent="Entities/Containers/Pickups/BranchPickup" index="2"]
|
||||||
|
autostart = false
|
||||||
|
|
||||||
|
[node name="ChangeFireIntensity" parent="Entities/Containers/Pickups/BranchPickup" index="3"]
|
||||||
|
amount_per_second = 30.0
|
||||||
|
|
||||||
|
[node name="BranchPickup2" parent="Entities/Containers/Pickups" instance=ExtResource( 1 )]
|
||||||
|
position = Vector2( 675, 417 )
|
||||||
|
scale = Vector2( 1, 1 )
|
||||||
|
|
||||||
|
[node name="Despawn" parent="Entities/Containers/Pickups/BranchPickup2" index="2"]
|
||||||
|
autostart = false
|
||||||
|
|
||||||
|
[node name="ChangeFireIntensity" parent="Entities/Containers/Pickups/BranchPickup2" index="3"]
|
||||||
|
amount_per_second = 30.0
|
||||||
|
|
||||||
|
[node name="BranchPickup3" parent="Entities/Containers/Pickups" instance=ExtResource( 1 )]
|
||||||
|
position = Vector2( 742, 115 )
|
||||||
|
scale = Vector2( 1, 1 )
|
||||||
|
|
||||||
|
[node name="Despawn" parent="Entities/Containers/Pickups/BranchPickup3" index="2"]
|
||||||
|
autostart = false
|
||||||
|
|
||||||
|
[node name="ChangeFireIntensity" parent="Entities/Containers/Pickups/BranchPickup3" index="3"]
|
||||||
|
amount_per_second = 30.0
|
||||||
|
|
||||||
|
[node name="BranchPickup4" parent="Entities/Containers/Pickups" instance=ExtResource( 1 )]
|
||||||
|
position = Vector2( 325, 135 )
|
||||||
|
scale = Vector2( 1, 1 )
|
||||||
|
|
||||||
|
[node name="Despawn" parent="Entities/Containers/Pickups/BranchPickup4" index="2"]
|
||||||
|
autostart = false
|
||||||
|
|
||||||
|
[node name="ChangeFireIntensity" parent="Entities/Containers/Pickups/BranchPickup4" index="3"]
|
||||||
|
amount_per_second = 30.0
|
||||||
|
|
||||||
[connection signal="spawned" from="Entities/Containers/Enemies/TowardsFireSpawner/SpawnEveryPeriod" to="Entities/Containers/Enemies/TowardsFireSpawner/SpawnEveryPeriod/SetSpawnedGoalTo" method="_on_SpawnEveryPeriod_spawned"]
|
[connection signal="spawned" from="Entities/Containers/Enemies/TowardsFireSpawner/SpawnEveryPeriod" to="Entities/Containers/Enemies/TowardsFireSpawner/SpawnEveryPeriod/SetSpawnedGoalTo" method="_on_SpawnEveryPeriod_spawned"]
|
||||||
[connection signal="spawned" from="Entities/Containers/Enemies/TowardsFireSpawner/SpawnEveryPeriod" to="Entities/Containers/Enemies/TowardsFireSpawner/TeleportToScreenEdge" method="_on_SpawnEveryPeriod_spawned"]
|
[connection signal="spawned" from="Entities/Containers/Enemies/TowardsFireSpawner/SpawnEveryPeriod" to="Entities/Containers/Enemies/TowardsFireSpawner/TeleportToScreenEdge" method="_on_SpawnEveryPeriod_spawned"]
|
||||||
[connection signal="spawned" from="Entities/Containers/Enemies/TowardsFireSpawner2/SpawnEveryPeriod" to="Entities/Containers/Enemies/TowardsFireSpawner2/SpawnEveryPeriod/SetSpawnedGoalTo" method="_on_SpawnEveryPeriod_spawned"]
|
[connection signal="spawned" from="Entities/Containers/Enemies/TowardsFireSpawner2/SpawnEveryPeriod" to="Entities/Containers/Enemies/TowardsFireSpawner2/SpawnEveryPeriod/SetSpawnedGoalTo" method="_on_SpawnEveryPeriod_spawned"]
|
||||||
|
@ -164,3 +205,7 @@ bounds = Vector2( 1280, 640 )
|
||||||
[editable path="Entities/Containers/Enemies/TowardsFireSpawner2/SpawnEveryPeriod"]
|
[editable path="Entities/Containers/Enemies/TowardsFireSpawner2/SpawnEveryPeriod"]
|
||||||
[editable path="Entities/Containers/Enemies/TowardsFireSpawner3/SpawnEveryPeriod"]
|
[editable path="Entities/Containers/Enemies/TowardsFireSpawner3/SpawnEveryPeriod"]
|
||||||
[editable path="Entities/Containers/Enemies/TowardsPlayerSpawner/SpawnEveryPeriod"]
|
[editable path="Entities/Containers/Enemies/TowardsPlayerSpawner/SpawnEveryPeriod"]
|
||||||
|
[editable path="Entities/Containers/Pickups/BranchPickup"]
|
||||||
|
[editable path="Entities/Containers/Pickups/BranchPickup2"]
|
||||||
|
[editable path="Entities/Containers/Pickups/BranchPickup3"]
|
||||||
|
[editable path="Entities/Containers/Pickups/BranchPickup4"]
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
[gd_scene load_steps=3 format=2]
|
[gd_scene load_steps=4 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://src/pickups/Pickup.tscn" type="PackedScene" id=1]
|
[ext_resource path="res://src/pickups/Pickup.tscn" type="PackedScene" id=1]
|
||||||
[ext_resource path="res://src/entities/bullets/PiercingArrow.png" type="Texture" id=2]
|
[ext_resource path="res://src/entities/bullets/PiercingArrow.png" type="Texture" id=2]
|
||||||
|
[ext_resource path="res://src/pickups/effects/BigArrow.tscn" type="PackedScene" id=3]
|
||||||
|
|
||||||
[node name="BranchPickup" instance=ExtResource( 1 )]
|
[node name="BigArrowPickup" instance=ExtResource( 1 )]
|
||||||
scale = Vector2( 0.5, 0.5 )
|
scale = Vector2( 0.5, 0.5 )
|
||||||
|
|
||||||
[node name="Sprite" parent="Shape" index="0"]
|
[node name="Sprite" parent="Shape" index="0"]
|
||||||
|
@ -14,3 +15,7 @@ texture = ExtResource( 2 )
|
||||||
[node name="Despawn" parent="." index="2"]
|
[node name="Despawn" parent="." index="2"]
|
||||||
wait_time = 10.0
|
wait_time = 10.0
|
||||||
autostart = true
|
autostart = true
|
||||||
|
|
||||||
|
[node name="BigArrow" parent="." index="3" instance=ExtResource( 3 )]
|
||||||
|
|
||||||
|
[connection signal="picked_up" from="." to="BigArrow" method="_on_picked_up"]
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
[gd_scene load_steps=2 format=2]
|
[gd_scene load_steps=3 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://src/pickups/effects/RapidFire.gd" type="Script" id=1]
|
[ext_resource path="res://src/pickups/effects/BigArrow.gd" type="Script" id=1]
|
||||||
|
[ext_resource path="res://src/entities/bullets/PiercingArrow.tscn" type="PackedScene" id=2]
|
||||||
|
|
||||||
[node name="BigArrow" type="Node"]
|
[node name="BigArrow" type="Node"]
|
||||||
script = ExtResource( 1 )
|
script = ExtResource( 1 )
|
||||||
|
new_spawning = ExtResource( 2 )
|
||||||
|
|
|
@ -17,4 +17,3 @@ func _on_picked_up():
|
||||||
func _on_expired():
|
func _on_expired():
|
||||||
target_click.rapid_fire_instances -= 1
|
target_click.rapid_fire_instances -= 1
|
||||||
target_cooldown.wait_time *= 2
|
target_cooldown.wait_time *= 2
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue