Traps updated, Live and Collactables added

This commit is contained in:
Jan Schuffenhauer
2020-04-18 18:56:05 +02:00
parent b0a35659d9
commit dd01067dac
30 changed files with 240 additions and 103 deletions

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Bannana.gd" type="Script" id=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://testSprites/bannane.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
@@ -19,6 +19,7 @@ texture = ExtResource( 3 )
position = Vector2( 1.54256, -4.73786 )
collision_layer = 32
collision_mask = 0
slowdown_value = 300
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -1.65275, 4.84804 )

View File

@@ -0,0 +1,5 @@
extends Node2D
func _on_Hurtbox_area_entered(area):
queue_free()

View File

@@ -0,0 +1,6 @@
extends StaticBody2D
func _on_Hurtbox_area_entered(area):
queue_free()

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Fass.gd" type="Script" id=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Objects/Barrel/Barrel.gd" type="Script" id=2]
[ext_resource path="res://testSprites/Fass.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]

View File

@@ -1,8 +1,9 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=8 format=2]
[ext_resource path="res://HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Bannana.gd" type="Script" id=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://testSprites/Bonfire.png" type="Texture" id=3]
[ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=4]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.76762
@@ -12,6 +13,9 @@ height = 11.2678
radius = 7.10652
height = 9.88821
[sub_resource type="CircleShape2D" id=3]
radius = 32.0
[node name="Bonfire" type="StaticBody2D"]
script = ExtResource( 2 )
@@ -33,6 +37,16 @@ shape = SubResource( 1 )
position = Vector2( -3.8147e-06, 0.110184 )
rotation = 1.5708
shape = SubResource( 2 )
[node name="Hitbox" parent="." instance=ExtResource( 4 )]
collision_layer = 16
damage = -0.5
[node name="CollisionShape2D" parent="Hitbox" index="0"]
position = Vector2( 0, -2 )
shape = SubResource( 3 )
[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"]
[editable path="Hurtbox"]
[editable path="Hitbox"]

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Bannana.gd" type="Script" id=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://testSprites/Herz.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
@@ -19,6 +19,7 @@ texture = ExtResource( 3 )
position = Vector2( 1.54256, -4.73786 )
collision_layer = 32
collision_mask = 0
health_value = 1
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -1.54256, 4.73785 )

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Bannana.gd" type="Script" id=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://testSprites/blue_Rubi.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
@@ -19,6 +19,7 @@ texture = ExtResource( 3 )
position = Vector2( 1.54256, -4.73786 )
collision_layer = 32
collision_mask = 0
currency_value = 5
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -1.54256, 4.73785 )

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Bannana.gd" type="Script" id=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://testSprites/green_Rubi.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
@@ -19,6 +19,7 @@ texture = ExtResource( 3 )
position = Vector2( 1.54256, -4.73786 )
collision_layer = 32
collision_mask = 0
currency_value = 1
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -1.54256, 4.73785 )

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Bannana.gd" type="Script" id=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://testSprites/red_Rubi.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
@@ -19,6 +19,7 @@ texture = ExtResource( 3 )
position = Vector2( 1.54256, -4.73786 )
collision_layer = 32
collision_mask = 0
currency_value = 20
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -1.54256, 4.73785 )

View File

@@ -0,0 +1,26 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://testSprites/slime.png" type="Texture" id=1]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 16, 16 )
[node name="Slime" type="Node2D"]
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 1 )
[node name="Hurtbox" parent="." instance=ExtResource( 2 )]
position = Vector2( 19.1136, -7.76083 )
collision_layer = 32
collision_mask = 0
slowdown_value = 80
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -19.0825, 7.65191 )
rotation = 1.5708
shape = SubResource( 1 )
[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"]
[editable path="Hurtbox"]

View File

@@ -1,9 +1,11 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Bannana.gd" type="Script" id=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

View File

@@ -1,9 +1,11 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Bannana.gd" type="Script" id=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/Spike.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
height = 6.36237

View File

@@ -1,9 +1,11 @@
[gd_scene load_steps=5 format=2]
[ext_resource path="res://HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Bannana.gd" type="Script" id=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/Sting.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
radius = 6.77597
height = 6.36237

View File

@@ -0,0 +1,6 @@
extends Node2D
func _on_Hurtbox_area_entered(area):
queue_free()

View File

@@ -1,11 +1,12 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=6 format=2]
[ext_resource path="res://HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1]
[ext_resource path="res://Bannana.gd" type="Script" id=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://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 = 6.36237
height = 9.0
[node name="Bear_trap" type="Node2D"]
script = ExtResource( 2 )
@@ -21,4 +22,9 @@ collision_layer = 16
rotation = 1.5708
shape = SubResource( 1 )
[node name="Hurtbox" parent="Hitbox" instance=ExtResource( 4 )]
collision_layer = 32
collision_mask = 0
[connection signal="area_entered" from="Hitbox/Hurtbox" to="." method="_on_Hurtbox_area_entered"]
[editable path="Hitbox"]