From ddaec26915d7c26a8e0510671d6f0d4e5d2e7554 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 5 Apr 2022 02:57:33 +0200 Subject: [PATCH] :boom: aaaaaaaaaaaaaaaaaaaaaaaaaaa --- src/entities/enemies/ChaserEnemy.tscn | 7 +-- src/entities/fire/Fire.tscn | 4 +- src/levels/phaseone/PhaseOne.tscn | 64 +++++++++------------------ src/pickups/LargeBranchPickup.tscn | 11 +++++ 4 files changed, 38 insertions(+), 48 deletions(-) create mode 100644 src/pickups/LargeBranchPickup.tscn diff --git a/src/entities/enemies/ChaserEnemy.tscn b/src/entities/enemies/ChaserEnemy.tscn index 223b869..28e53b2 100644 --- a/src/entities/enemies/ChaserEnemy.tscn +++ b/src/entities/enemies/ChaserEnemy.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://src/entities/enemies/EnemySnowmanLeft.png" type="Texture" id=1] [ext_resource path="res://src/pickups/BranchPickup.tscn" type="PackedScene" id=2] @@ -12,6 +12,7 @@ [ext_resource path="res://src/entities/enemies/ChaserEnemy.gd" type="Script" id=10] [ext_resource path="res://src/behaviours/damage/Damaging.gd" type="Script" id=11] [ext_resource path="res://src/pickups/BigArrowPickup.tscn" type="PackedScene" id=12] +[ext_resource path="res://src/pickups/LargeBranchPickup.tscn" type="PackedScene" id=13] [sub_resource type="CapsuleShape2D" id=1] radius = 9.0 @@ -56,8 +57,8 @@ max_health = 10.0 health = 10.0 [node name="DropLoot" parent="." index="2"] -loot_types = [ ExtResource( 2 ), ExtResource( 5 ), ExtResource( 12 ) ] -loot_weights = [ 80.0, 10.0, 10.0 ] +loot_types = [ ExtResource( 2 ), ExtResource( 5 ), ExtResource( 12 ), ExtResource( 13 ) ] +loot_weights = [ 82.0, 8.0, 8.0, 2.0 ] [node name="AttractedToMovement" parent="." index="4" instance=ExtResource( 3 )] diff --git a/src/entities/fire/Fire.tscn b/src/entities/fire/Fire.tscn index fced33d..e476b6d 100644 --- a/src/entities/fire/Fire.tscn +++ b/src/entities/fire/Fire.tscn @@ -49,7 +49,7 @@ max_health = 200.0 health = 100.0 [node name="Damaging" parent="Firepit" instance=ExtResource( 9 )] -friendly_fire = true +damage = -2.0 [node name="DamageEveryTick" parent="Firepit/Damaging" instance=ExtResource( 6 )] @@ -73,7 +73,7 @@ position = Vector2( 0, -12 ) z_index = 1 frames = SubResource( 4 ) animation = "v1" -frame = 2 +frame = 4 playing = true [connection signal="health_changed" from="Firepit/Damageable" to="." method="_on_Damageable_health_changed"] diff --git a/src/levels/phaseone/PhaseOne.tscn b/src/levels/phaseone/PhaseOne.tscn index 48d517f..3310abf 100644 --- a/src/levels/phaseone/PhaseOne.tscn +++ b/src/levels/phaseone/PhaseOne.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=17 format=2] -[ext_resource path="res://src/pickups/BranchPickup.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/pickups/LargeBranchPickup.tscn" type="PackedScene" id=1] [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/behaviours/spawning/SpawnEveryPeriod.tscn" type="PackedScene" id=4] @@ -8,6 +8,7 @@ [ext_resource path="res://src/behaviours/movement/TeleportToScreenEdge.tscn" type="PackedScene" id=6] [ext_resource path="res://src/mechanics/White.png" type="Texture" id=7] [ext_resource path="res://src/behaviours/spawning/DecreaseEvery.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/pickups/Pickup.gd" type="Script" id=9] [ext_resource path="res://src/behaviours/targeting/SetSpawnedATMGoalTo.tscn" type="PackedScene" id=11] [ext_resource path="res://src/mechanics/Darkness.tscn" type="PackedScene" id=13] [ext_resource path="res://src/mechanics/Background.tscn" type="PackedScene" id=14] @@ -148,45 +149,26 @@ bounds = Vector2( 1280, 640 ) [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="LargeBranchPickup" parent="Entities/Containers/Pickups" instance=ExtResource( 1 )] +position = Vector2( 584, 336 ) +collision_layer = 16 +collision_mask = 16 +input_pickable = false +script = ExtResource( 9 ) -[node name="Despawn" parent="Entities/Containers/Pickups/BranchPickup" index="2"] -autostart = false +[node name="LargeBranchPickup2" parent="Entities/Containers/Pickups" instance=ExtResource( 1 )] +position = Vector2( 649, 441 ) +collision_layer = 16 +collision_mask = 16 +input_pickable = false +script = ExtResource( 9 ) -[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 +[node name="LargeBranchPickup3" parent="Entities/Containers/Pickups" instance=ExtResource( 1 )] +position = Vector2( 801, 343 ) +collision_layer = 16 +collision_mask = 16 +input_pickable = false +script = ExtResource( 9 ) [node name="Particles2D" type="Particles2D" parent="."] position = Vector2( 640, -120 ) @@ -209,7 +191,3 @@ texture = ExtResource( 7 ) [editable path="Entities/Containers/Enemies/TowardsFireSpawner2/SpawnEveryPeriod"] [editable path="Entities/Containers/Enemies/TowardsFireSpawner3/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"] diff --git a/src/pickups/LargeBranchPickup.tscn b/src/pickups/LargeBranchPickup.tscn new file mode 100644 index 0000000..e20502d --- /dev/null +++ b/src/pickups/LargeBranchPickup.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://src/pickups/BranchPickup.tscn" type="PackedScene" id=1] + +[node name="LargeBranchPickup" instance=ExtResource( 1 )] + +[node name="Shape" parent="." index="0"] +scale = Vector2( 2, 2 ) + +[node name="ChangeFireIntensity" parent="." index="3"] +amount_per_second = 30.0