Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

Added second fight with mavkha

Browse Source
This commit is contained in:
cblech
2025-07-10 19:30:57 +02:00
parent 4752002caf
commit c6fc400994
4 changed files with 219 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/Babushka_scene_forest_fight_1_2d.tscn
+76 -24
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=68 format=3 uid="uid://dfyb4dckoltpw"]
[gd_scene load_steps=69 format=3 uid="uid://dfyb4dckoltpw"]
[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_vl6d5"]
[ext_resource type="PackedScene" uid="uid://bm21nqepnwaik" path="res://scenes/Babushka_scene_indoor_common_room.tscn" id="2_5evxf"]
@@ -29,6 +29,7 @@
[ext_resource type="PackedScene" uid="uid://hk8ahyp6dgl6" path="res://prefabs/fight/fight_base_scene.tscn" id="27_55b52"]
[ext_resource type="PackedScene" uid="uid://bp64p6y72j71w" path="res://prefabs/fight/fighters/enemy_blob_fighter.tscn" id="27_hfhye"]
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Player2D.tscn" id="29_3jjxs"]
[ext_resource type="PackedScene" uid="uid://cr66tpdr5rma5" path="res://prefabs/fight/fighters/enemy_mavkha_fighter.tscn" id="29_hfhye"]
[ext_resource type="Resource" uid="uid://dlcmqfjvgphqu" path="res://resources/items/rake.tres" id="30_l10vl"]
[ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/wateringcan.tres" id="31_c2gvt"]
[ext_resource type="Texture2D" uid="uid://dyueumlr5ltvr" path="res://art/nature/baum märz 2025/megaeichel megaast.png" id="37_gg38r"]
@@ -763,46 +764,91 @@ texture = SubResource("NoiseTexture2D_e5alv")
[node name="Fence" type="Node2D" parent="."]
[node name="Fight" type="Node2D" parent="."]
[node name="Fight1" type="Node2D" parent="."]
[node name="FightStarter" type="Node2D" parent="Fight" node_paths=PackedStringArray("_fightInstance")]
[node name="FightStarter" type="Node2D" parent="Fight1" node_paths=PackedStringArray("_fightInstance")]
position = Vector2(-1669, 72)
script = ExtResource("26_gg38r")
enemies = Array[PackedScene]([null, ExtResource("27_hfhye"), ExtResource("27_hfhye")])
_fightInstance = NodePath("../FightBaseScene")
[node name="TriggerArea" type="Area2D" parent="Fight/FightStarter"]
position = Vector2(8681, 2487)
[node name="TriggerArea" type="Area2D" parent="Fight1/FightStarter"]
position = Vector2(10962, 2487)
collision_mask = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="Fight/FightStarter/TriggerArea"]
position = Vector2(2425.75, -4.75)
[node name="CollisionShape2D" type="CollisionShape2D" parent="Fight1/FightStarter/TriggerArea"]
position = Vector2(90, -1)
shape = SubResource("RectangleShape2D_hfhye")
[node name="FightBaseScene" parent="Fight" instance=ExtResource("27_55b52")]
position = Vector2(11249, 2494)
[node name="FightBaseScene" parent="Fight1" instance=ExtResource("27_55b52")]
position = Vector2(9827, 2566)
[node name="FriendlyPositions" parent="Fight/FightBaseScene" index="0"]
[node name="FriendlyPositions" parent="Fight1/FightBaseScene" index="0"]
position = Vector2(-1048, 3)
[node name="FriendPos1" parent="Fight/FightBaseScene/FriendlyPositions" index="0"]
[node name="FriendPos1" parent="Fight1/FightBaseScene/FriendlyPositions" index="0"]
position = Vector2(0, -464)
[node name="FriendPos2" parent="Fight/FightBaseScene/FriendlyPositions" index="1"]
[node name="FriendPos2" parent="Fight1/FightBaseScene/FriendlyPositions" index="1"]
position = Vector2(69, 9)
[node name="FriendPos3" parent="Fight/FightBaseScene/FriendlyPositions" index="2"]
[node name="FriendPos3" parent="Fight1/FightBaseScene/FriendlyPositions" index="2"]
position = Vector2(0, 525)
[node name="EnemyPositions" parent="Fight/FightBaseScene" index="1"]
[node name="EnemyPositions" parent="Fight1/FightBaseScene" index="1"]
position = Vector2(1162, -12)
[node name="EnemyPos1" parent="Fight/FightBaseScene/EnemyPositions" index="0"]
[node name="EnemyPos1" parent="Fight1/FightBaseScene/EnemyPositions" index="0"]
position = Vector2(-18, -482)
[node name="EnemyPos2" parent="Fight/FightBaseScene/EnemyPositions" index="1"]
[node name="EnemyPos2" parent="Fight1/FightBaseScene/EnemyPositions" index="1"]
position = Vector2(-133, 19)
[node name="EnemyPos3" parent="Fight/FightBaseScene/EnemyPositions" index="2"]
[node name="EnemyPos3" parent="Fight1/FightBaseScene/EnemyPositions" index="2"]
position = Vector2(32, 562)
[node name="Fight2" type="Node2D" parent="."]
position = Vector2(3706, 0)
[node name="FightStarter" type="Node2D" parent="Fight2" node_paths=PackedStringArray("_fightInstance")]
position = Vector2(-1669, 72)
script = ExtResource("26_gg38r")
enemies = Array[PackedScene]([ExtResource("27_hfhye"), ExtResource("29_hfhye"), ExtResource("27_hfhye")])
_fightInstance = NodePath("../FightBaseScene")
[node name="TriggerArea" type="Area2D" parent="Fight2/FightStarter"]
position = Vector2(10962, 2487)
collision_mask = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="Fight2/FightStarter/TriggerArea"]
position = Vector2(90, -1)
shape = SubResource("RectangleShape2D_hfhye")
[node name="FightBaseScene" parent="Fight2" instance=ExtResource("27_55b52")]
position = Vector2(9827, 2566)
[node name="FriendlyPositions" parent="Fight2/FightBaseScene" index="0"]
position = Vector2(-1048, 3)
[node name="FriendPos1" parent="Fight2/FightBaseScene/FriendlyPositions" index="0"]
position = Vector2(0, -464)
[node name="FriendPos2" parent="Fight2/FightBaseScene/FriendlyPositions" index="1"]
position = Vector2(69, 9)
[node name="FriendPos3" parent="Fight2/FightBaseScene/FriendlyPositions" index="2"]
position = Vector2(0, 525)
[node name="EnemyPositions" parent="Fight2/FightBaseScene" index="1"]
position = Vector2(1162, -12)
[node name="EnemyPos1" parent="Fight2/FightBaseScene/EnemyPositions" index="0"]
position = Vector2(-18, -482)
[node name="EnemyPos2" parent="Fight2/FightBaseScene/EnemyPositions" index="1"]
position = Vector2(-133, 19)
[node name="EnemyPos3" parent="Fight2/FightBaseScene/EnemyPositions" index="2"]
position = Vector2(32, 562)
[node name="YSorted" type="Node2D" parent="."]
@@ -2007,7 +2053,7 @@ region_rect = Rect2(1483.92, 1280.2, 1139.55, 367.598)
[node name="BorderCollisionBody" type="StaticBody2D" parent="YSorted/ForestVisuals"]
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="YSorted/ForestVisuals/BorderCollisionBody"]
polygon = PackedVector2Array(5543, 1787, 8663, 1938, 15008, 1914, 15107, 3572, 14122, 3569, 12930, 3737, 11502, 3599, 9887, 3658, 7936, 3924, 7712, 2967, 4629, 2917, 3880, 3351, 3891, 3646, 3919, 4843, 7970, 4459, 16532, 4289, 16365, 821, 1765, 1202, 1437, 4559, 3142, 4814, 3154, 4225, 2749, 3323, 2196, 2523, 2379, 1787)
polygon = PackedVector2Array(5543, 1787, 8663, 1938, 15008, 1914, 15121, 2882, 15601, 3074, 15636, 3574, 14122, 3569, 12930, 3737, 11502, 3599, 9887, 3658, 7936, 3924, 7712, 2967, 4629, 2917, 3880, 3351, 3891, 3646, 3919, 4843, 7970, 4459, 16532, 4289, 16365, 821, 1765, 1202, 1437, 4559, 3142, 4814, 3154, 4225, 2749, 3323, 2196, 2523, 2379, 1787)
[node name="Blocker" type="Node2D" parent="YSorted"]
@@ -2129,15 +2175,21 @@ max_distance = 2e+07
playback_type = 2
script = ExtResource("56_bjj0f")
[connection signal="body_entered" from="Fight/FightStarter/TriggerArea" to="Fight/FightStarter" method="Start"]
[connection signal="FightEnded" from="Fight/FightBaseScene" to="YSorted/Vesna" method="show"]
[connection signal="FightEnded" from="Fight/FightBaseScene" to="YSorted/Vesna" method="EnableMovement"]
[connection signal="FightStarted" from="Fight/FightBaseScene" to="YSorted/Vesna" method="hide"]
[connection signal="FightStarted" from="Fight/FightBaseScene" to="YSorted/Vesna" method="DisableMovement"]
[connection signal="body_entered" from="Fight1/FightStarter/TriggerArea" to="Fight1/FightStarter" method="Start"]
[connection signal="FightEnded" from="Fight1/FightBaseScene" to="YSorted/Vesna" method="show"]
[connection signal="FightEnded" from="Fight1/FightBaseScene" to="YSorted/Vesna" method="EnableMovement"]
[connection signal="FightStarted" from="Fight1/FightBaseScene" to="YSorted/Vesna" method="hide"]
[connection signal="FightStarted" from="Fight1/FightBaseScene" to="YSorted/Vesna" method="DisableMovement"]
[connection signal="body_entered" from="Fight2/FightStarter/TriggerArea" to="Fight2/FightStarter" method="Start"]
[connection signal="FightEnded" from="Fight2/FightBaseScene" to="YSorted/Vesna" method="show"]
[connection signal="FightEnded" from="Fight2/FightBaseScene" to="YSorted/Vesna" method="EnableMovement"]
[connection signal="FightStarted" from="Fight2/FightBaseScene" to="YSorted/Vesna" method="hide"]
[connection signal="FightStarted" from="Fight2/FightBaseScene" to="YSorted/Vesna" method="DisableMovement"]
[connection signal="FilledWateringCan" from="YSorted/Vesna" to="Audio/SFX/FillWater SFX2" method="PlayOneShot"]
[connection signal="WateringField" from="YSorted/Vesna/FarmingControls" to="Audio/SFX/Watering SFX" method="PlayOneShot"]
[connection signal="finished" from="Audio/Background Music Ramp up" to="Audio/Background Music loop" method="PlayFromOffset"]
[editable path="Fight/FightBaseScene"]
[editable path="Fight1/FightBaseScene"]
[editable path="Fight2/FightBaseScene"]
[editable path="YSorted/Vesna"]
[editable path="CanvasLayer"]