From f111f75133aecbaccef717dd8316b37327becf69 Mon Sep 17 00:00:00 2001 From: Jonas Mucke Date: Sat, 18 Apr 2020 19:09:22 +0200 Subject: [PATCH] fixed script bugs --- src/Objects/Bonfire/Bonfire.gd | 6 ++++++ src/Objects/Bonfire/Bonfire.tscn | 2 +- src/Objects/Heart/Heart.gd | 5 +++++ src/Objects/Heart/Heart.tscn | 2 +- src/Objects/Rubies/Blue.tscn | 2 +- src/Objects/Rubies/Green.tscn | 2 +- src/Objects/Rubies/Red.tscn | 2 +- src/Objects/Rubies/Rubies.gd | 8 ++++++++ src/Objects/Traps/Flame.tscn | 6 +----- src/Objects/Traps/bear.gd | 2 -- src/Objects/Traps/bear.tscn | 17 +++++++++++++---- src/Player/Player.gd | 2 -- src/Player/Player.tscn | 13 +++++++------ src/World.tscn | 2 +- 14 files changed, 46 insertions(+), 25 deletions(-) create mode 100644 src/Objects/Bonfire/Bonfire.gd create mode 100644 src/Objects/Heart/Heart.gd create mode 100644 src/Objects/Rubies/Rubies.gd diff --git a/src/Objects/Bonfire/Bonfire.gd b/src/Objects/Bonfire/Bonfire.gd new file mode 100644 index 0000000..dbdd835 --- /dev/null +++ b/src/Objects/Bonfire/Bonfire.gd @@ -0,0 +1,6 @@ +extends StaticBody2D + + + +func _on_Hurtbox_area_entered(area): + queue_free() diff --git a/src/Objects/Bonfire/Bonfire.tscn b/src/Objects/Bonfire/Bonfire.tscn index f73ca8b..99ca9e5 100644 --- a/src/Objects/Bonfire/Bonfire.tscn +++ b/src/Objects/Bonfire/Bonfire.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] -[ext_resource path="res://Objects/Banana/Bannana.gd" type="Script" id=2] +[ext_resource path="res://Objects/Bonfire/Bonfire.gd" type="Script" id=2] [ext_resource path="res://testSprites/Bonfire.png" type="Texture" id=3] [ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=4] diff --git a/src/Objects/Heart/Heart.gd b/src/Objects/Heart/Heart.gd new file mode 100644 index 0000000..92da9f6 --- /dev/null +++ b/src/Objects/Heart/Heart.gd @@ -0,0 +1,5 @@ +extends Node2D + + +func _on_Hurtbox_area_entered(area): + queue_free() diff --git a/src/Objects/Heart/Heart.tscn b/src/Objects/Heart/Heart.tscn index 18a5c17..d540388 100644 --- a/src/Objects/Heart/Heart.tscn +++ b/src/Objects/Heart/Heart.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] -[ext_resource path="res://Objects/Banana/Bannana.gd" type="Script" id=2] +[ext_resource path="res://Objects/Heart/Heart.gd" type="Script" id=2] [ext_resource path="res://testSprites/Herz.png" type="Texture" id=3] [sub_resource type="CapsuleShape2D" id=1] diff --git a/src/Objects/Rubies/Blue.tscn b/src/Objects/Rubies/Blue.tscn index d4a5ad2..cdc6a76 100644 --- a/src/Objects/Rubies/Blue.tscn +++ b/src/Objects/Rubies/Blue.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] -[ext_resource path="res://Objects/Banana/Bannana.gd" type="Script" id=2] +[ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2] [ext_resource path="res://testSprites/blue_Rubi.png" type="Texture" id=3] [sub_resource type="CapsuleShape2D" id=1] diff --git a/src/Objects/Rubies/Green.tscn b/src/Objects/Rubies/Green.tscn index 46dbbf8..2ef1a91 100644 --- a/src/Objects/Rubies/Green.tscn +++ b/src/Objects/Rubies/Green.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] -[ext_resource path="res://Objects/Banana/Bannana.gd" type="Script" id=2] +[ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2] [ext_resource path="res://testSprites/green_Rubi.png" type="Texture" id=3] [sub_resource type="CapsuleShape2D" id=1] diff --git a/src/Objects/Rubies/Red.tscn b/src/Objects/Rubies/Red.tscn index d680526..2001ecd 100644 --- a/src/Objects/Rubies/Red.tscn +++ b/src/Objects/Rubies/Red.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] -[ext_resource path="res://Objects/Banana/Bannana.gd" type="Script" id=2] +[ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2] [ext_resource path="res://testSprites/red_Rubi.png" type="Texture" id=3] [sub_resource type="CapsuleShape2D" id=1] diff --git a/src/Objects/Rubies/Rubies.gd b/src/Objects/Rubies/Rubies.gd new file mode 100644 index 0000000..274d93f --- /dev/null +++ b/src/Objects/Rubies/Rubies.gd @@ -0,0 +1,8 @@ +extends Node2D + + + + + +func _on_Hurtbox_area_entered(area): + queue_free() diff --git a/src/Objects/Traps/Flame.tscn b/src/Objects/Traps/Flame.tscn index e7b360f..eed9fd8 100644 --- a/src/Objects/Traps/Flame.tscn +++ b/src/Objects/Traps/Flame.tscn @@ -1,16 +1,12 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1] -[ext_resource path="res://Objects/Banana/Bannana.gd" type="Script" id=2] [ext_resource path="res://testSprites/flame.png" type="Texture" id=3] - - [sub_resource type="CapsuleShape2D" id=1] height = 6.36237 [node name="Flame" type="Node2D"] -script = ExtResource( 2 ) [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0.44072, -6.06005 ) diff --git a/src/Objects/Traps/bear.gd b/src/Objects/Traps/bear.gd index b408550..bb72cf4 100644 --- a/src/Objects/Traps/bear.gd +++ b/src/Objects/Traps/bear.gd @@ -1,6 +1,4 @@ extends Node2D - - func _on_Hurtbox_area_entered(area): queue_free() diff --git a/src/Objects/Traps/bear.tscn b/src/Objects/Traps/bear.tscn index 41ba474..7d23975 100644 --- a/src/Objects/Traps/bear.tscn +++ b/src/Objects/Traps/bear.tscn @@ -1,13 +1,16 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1] -[ext_resource path="res://Objects/Traps/bear.gd" type="Script" id=2] +[ext_resource path="res://Objects/Traps/Bear.gd" type="Script" id=2] [ext_resource path="res://testSprites/falle.png" type="Texture" id=3] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] height = 9.0 +[sub_resource type="CapsuleShape2D" id=2] +height = 9.0 + [node name="Bear_trap" type="Node2D"] script = ExtResource( 2 ) @@ -22,9 +25,15 @@ collision_layer = 16 rotation = 1.5708 shape = SubResource( 1 ) -[node name="Hurtbox" parent="Hitbox" instance=ExtResource( 4 )] +[node name="Hurtbox" parent="." instance=ExtResource( 4 )] collision_layer = 32 collision_mask = 0 -[connection signal="area_entered" from="Hitbox/Hurtbox" to="." method="_on_Hurtbox_area_entered"] + +[node name="CollisionShape2D" parent="Hurtbox" index="0"] +rotation = 1.5708 +shape = SubResource( 2 ) +[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] [editable path="Hitbox"] + +[editable path="Hurtbox"] diff --git a/src/Player/Player.gd b/src/Player/Player.gd index 065742d..70031c6 100644 --- a/src/Player/Player.gd +++ b/src/Player/Player.gd @@ -116,8 +116,6 @@ func _on_Stats_no_health(): get_tree().change_scene("res://Menus/TitleScreen/TitleScreen.tscn") - - func _on_Hitbox_area_entered(area): currency += area.currency_value player_stats.health = player_stats.health+area.health_value diff --git a/src/Player/Player.tscn b/src/Player/Player.tscn index 71b13e0..5c33152 100644 --- a/src/Player/Player.tscn +++ b/src/Player/Player.tscn @@ -601,12 +601,12 @@ start_node = "idle" [sub_resource type="AnimationNodeStateMachinePlayback" id=45] [sub_resource type="CapsuleShape2D" id=46] -radius = 3.36373 -height = 6.59445 +radius = 4.5 +height = 0.2 [sub_resource type="CapsuleShape2D" id=47] -radius = 3.40253 -height = 0.175497 +radius = 4.5 +height = 0.2 [sub_resource type="CapsuleShape2D" id=48] radius = 4.03497 @@ -667,7 +667,7 @@ collision_layer = 0 collision_mask = 32 [node name="CollisionShape2D" parent="Hitbox" index="0"] -position = Vector2( 0.420105, -4.84456 ) +position = Vector2( 0, -0.5 ) shape = SubResource( 46 ) [node name="Hurtbox" parent="." instance=ExtResource( 3 )] @@ -675,7 +675,7 @@ position = Vector2( 0, 0.0375252 ) collision_mask = 0 [node name="CollisionShape2D" parent="Hurtbox" index="0"] -position = Vector2( 0.0781527, -0.822231 ) +position = Vector2( 0, -0.5 ) shape = SubResource( 47 ) [node name="Pivot" type="Position2D" parent="."] @@ -710,6 +710,7 @@ max_health = 5 [connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] [connection signal="area_exited" from="Hurtbox" to="." method="_on_Hurtbox_area_exited"] +[connection signal="no_health" from="Stats" to="." method="_on_Stats_no_health"] [editable path="Hitbox"] diff --git a/src/World.tscn b/src/World.tscn index 36c449e..16bf630 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -8,7 +8,7 @@ [ext_resource path="res://Objects/Bonfire/Bonfire.tscn" type="PackedScene" id=7] [ext_resource path="res://Objects/Traps/Sting.tscn" type="PackedScene" id=8] [ext_resource path="res://Objects/Rubies/Blue.tscn" type="PackedScene" id=9] -[ext_resource path="res://Objects/Traps/bear.tscn" type="PackedScene" id=10] +[ext_resource path="res://Objects/Traps/Bear.tscn" type="PackedScene" id=10] [ext_resource path="res://Objects/Heart/Heart.tscn" type="PackedScene" id=11] [ext_resource path="res://Objects/Rubies/Red.tscn" type="PackedScene" id=12] [ext_resource path="res://Objects/Rubies/Green.tscn" type="PackedScene" id=13]