Merge branch 'devMechanics' into devPlayerStats

This commit is contained in:
Jan Schuffenhauer
2020-04-18 17:16:52 +02:00
parent dbd852190b
commit b0a35659d9
21 changed files with 511 additions and 80 deletions

View File

@@ -0,0 +1,29 @@
[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://testSprites/bannane.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.54726
height = 12.1493
[node name="Banana" type="Node2D"]
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 1.54256, -4.73786 )
texture = ExtResource( 3 )
[node name="Hurtbox" parent="." instance=ExtResource( 1 )]
position = Vector2( 1.54256, -4.73786 )
collision_layer = 32
collision_mask = 0
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -1.65275, 4.84804 )
rotation = 1.5708
shape = SubResource( 1 )
[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"]
[editable path="Hurtbox"]

View File

@@ -0,0 +1,38 @@
[gd_scene load_steps=6 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://testSprites/Bonfire.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.76762
height = 11.2678
[sub_resource type="CapsuleShape2D" id=2]
radius = 7.10652
height = 9.88821
[node name="Bonfire" type="StaticBody2D"]
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.22036, -4.18694 )
texture = ExtResource( 3 )
[node name="Hurtbox" parent="." instance=ExtResource( 1 )]
position = Vector2( 1.54256, -4.73786 )
collision_layer = 8
collision_mask = 0
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -1.54256, 4.73785 )
rotation = 1.5708
shape = SubResource( 1 )
[node name="Body" type="CollisionShape2D" parent="."]
position = Vector2( -3.8147e-06, 0.110184 )
rotation = 1.5708
shape = SubResource( 2 )
[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"]
[editable path="Hurtbox"]

View File

@@ -0,0 +1,29 @@
[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://testSprites/Herz.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.43707
height = 2.89399
[node name="Heart" type="Node2D"]
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.22036, -4.18694 )
texture = ExtResource( 3 )
[node name="Hurtbox" parent="." instance=ExtResource( 1 )]
position = Vector2( 1.54256, -4.73786 )
collision_layer = 32
collision_mask = 0
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -1.54256, 4.73785 )
rotation = 1.5708
shape = SubResource( 1 )
[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"]
[editable path="Hurtbox"]

View File

@@ -0,0 +1,29 @@
[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://testSprites/blue_Rubi.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.43707
height = 2.89399
[node name="Blue" type="Node2D"]
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.22036, -4.18694 )
texture = ExtResource( 3 )
[node name="Hurtbox" parent="." instance=ExtResource( 1 )]
position = Vector2( 1.54256, -4.73786 )
collision_layer = 32
collision_mask = 0
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -1.54256, 4.73785 )
rotation = 1.5708
shape = SubResource( 1 )
[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"]
[editable path="Hurtbox"]

View File

@@ -0,0 +1,29 @@
[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://testSprites/green_Rubi.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.43707
height = 2.89399
[node name="Green" type="Node2D"]
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.22036, -4.18694 )
texture = ExtResource( 3 )
[node name="Hurtbox" parent="." instance=ExtResource( 1 )]
position = Vector2( 1.54256, -4.73786 )
collision_layer = 32
collision_mask = 0
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -1.54256, 4.73785 )
rotation = 1.5708
shape = SubResource( 1 )
[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"]
[editable path="Hurtbox"]

View File

@@ -0,0 +1,29 @@
[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://testSprites/red_Rubi.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
radius = 7.43707
height = 2.89399
[node name="Red" type="Node2D"]
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.22036, -4.18694 )
texture = ExtResource( 3 )
[node name="Hurtbox" parent="." instance=ExtResource( 1 )]
position = Vector2( 1.54256, -4.73786 )
collision_layer = 32
collision_mask = 0
[node name="CollisionShape2D" parent="Hurtbox" index="0"]
position = Vector2( -1.54256, 4.73785 )
rotation = 1.5708
shape = SubResource( 1 )
[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"]
[editable path="Hurtbox"]

View File

@@ -0,0 +1,24 @@
[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://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 )
texture = ExtResource( 3 )
[node name="Hitbox" parent="." instance=ExtResource( 1 )]
collision_layer = 16
[node name="CollisionShape2D" parent="Hitbox" index="0"]
rotation = 1.5708
shape = SubResource( 1 )
[editable path="Hitbox"]

View File

@@ -0,0 +1,24 @@
[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://testSprites/Spike.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
height = 6.36237
[node name="Spike" type="Node2D"]
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.220352, -3.63603 )
texture = ExtResource( 3 )
[node name="Hitbox" parent="." instance=ExtResource( 1 )]
collision_layer = 16
[node name="CollisionShape2D" parent="Hitbox" index="0"]
rotation = 1.5708
shape = SubResource( 1 )
[editable path="Hitbox"]

View File

@@ -0,0 +1,26 @@
[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://testSprites/Sting.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
radius = 6.77597
height = 6.36237
[node name="Sting" type="Node2D"]
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( 0.44072, -9.03499 )
texture = ExtResource( 3 )
[node name="Hitbox" parent="." instance=ExtResource( 1 )]
collision_layer = 16
[node name="CollisionShape2D" parent="Hitbox" index="0"]
position = Vector2( -0.771278, -0.110184 )
rotation = 1.5708
shape = SubResource( 1 )
[editable path="Hitbox"]

View File

@@ -0,0 +1,24 @@
[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://testSprites/falle.png" type="Texture" id=3]
[sub_resource type="CapsuleShape2D" id=1]
height = 6.36237
[node name="Bear_trap" type="Node2D"]
script = ExtResource( 2 )
[node name="Sprite" type="Sprite" parent="."]
position = Vector2( -7.62939e-06, 0 )
texture = ExtResource( 3 )
[node name="Hitbox" parent="." instance=ExtResource( 1 )]
collision_layer = 16
[node name="CollisionShape2D" parent="Hitbox" index="0"]
rotation = 1.5708
shape = SubResource( 1 )
[editable path="Hitbox"]