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,5 +0,0 @@
[gd_scene format=2]
[node name="Hitbox" type="Area2D"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]

View File

@@ -1,5 +0,0 @@
[gd_scene format=2]
[node name="Hurtbox" type="Area2D"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]

View File

@@ -41,6 +41,9 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
[sub_resource type="ConvexPolygonShape2D" id=13]
points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
[sub_resource type="ConvexPolygonShape2D" id=14]
points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
[sub_resource type="ConvexPolygonShape2D" id=15]
points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
@@ -164,9 +167,6 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
[sub_resource type="ConvexPolygonShape2D" id=55]
points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
[sub_resource type="ConvexPolygonShape2D" id=56]
points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
[resource]
16/name = "tileset_room.png 16"
16/texture = ExtResource( 1 )
@@ -319,253 +319,253 @@ points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
"autotile_coord": Vector2( 3, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 15 ),
"shape": SubResource( 14 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 4, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 16 ),
"shape": SubResource( 15 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 5, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 17 ),
"shape": SubResource( 16 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 6, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 18 ),
"shape": SubResource( 17 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 7, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 19 ),
"shape": SubResource( 18 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 8, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 20 ),
"shape": SubResource( 19 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 9, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 21 ),
"shape": SubResource( 20 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 4, 1 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 22 ),
"shape": SubResource( 21 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 5, 1 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 23 ),
"shape": SubResource( 22 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 6, 1 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 24 ),
"shape": SubResource( 23 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 7, 1 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 25 ),
"shape": SubResource( 24 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 8, 1 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 26 ),
"shape": SubResource( 25 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 9, 1 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 27 ),
"shape": SubResource( 26 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 0, 2 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 28 ),
"shape": SubResource( 27 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 1, 2 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 29 ),
"shape": SubResource( 28 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 2, 2 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 30 ),
"shape": SubResource( 29 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 3, 2 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 31 ),
"shape": SubResource( 30 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 4, 2 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 32 ),
"shape": SubResource( 31 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 5, 2 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 33 ),
"shape": SubResource( 32 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 6, 2 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 34 ),
"shape": SubResource( 33 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 7, 2 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 35 ),
"shape": SubResource( 34 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 8, 2 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 36 ),
"shape": SubResource( 35 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 9, 2 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 37 ),
"shape": SubResource( 36 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 10, 2 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 38 ),
"shape": SubResource( 37 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 10, 3 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 39 ),
"shape": SubResource( 38 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 9, 3 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 40 ),
"shape": SubResource( 39 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 8, 3 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 41 ),
"shape": SubResource( 40 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 7, 3 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 42 ),
"shape": SubResource( 41 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 6, 3 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 43 ),
"shape": SubResource( 42 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 5, 3 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 44 ),
"shape": SubResource( 43 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 4, 3 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 45 ),
"shape": SubResource( 44 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 3, 3 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 46 ),
"shape": SubResource( 45 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 2, 3 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 47 ),
"shape": SubResource( 46 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 1, 3 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 48 ),
"shape": SubResource( 47 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 0, 3 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 49 ),
"shape": SubResource( 48 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 4, 4 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 50 ),
"shape": SubResource( 49 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 5, 4 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 51 ),
"shape": SubResource( 50 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 6, 4 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 52 ),
"shape": SubResource( 51 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 7, 4 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 53 ),
"shape": SubResource( 52 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 8, 4 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 54 ),
"shape": SubResource( 53 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 0, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 55 ),
"shape": SubResource( 54 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
}, {
"autotile_coord": Vector2( 2, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 56 ),
"shape": SubResource( 55 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
47/z_index = 0

View File

@@ -12,6 +12,9 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="DragSource" parent="." instance=ExtResource( 1 )]
[node name="DragSink" parent="." instance=ExtResource( 2 )]
margin_left = 1.19746
margin_right = 1.19745
[node name="DragSource" parent="." instance=ExtResource( 1 )]
PreviewIcon = "res://icon.png"

View File

@@ -45,10 +45,10 @@ func get_resized_texture(t: Texture, width: int = 0, height: int = 0):
"
[node name="DragSource" type="TextureRect"]
margin_left = 8.34148
margin_top = 147.561
margin_right = 40.3415
margin_bottom = 179.561
margin_left = 10.7364
margin_top = 227.792
margin_right = 42.7364
margin_bottom = 259.792
texture = ExtResource( 1 )
expand = true
script = SubResource( 1 )

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

@@ -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"]

View File

@@ -0,0 +1,3 @@
extends Area2D
export(float,-42.0,42.0) var damage := 1.0

View File

@@ -0,0 +1,8 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hitbox.gd" type="Script" id=1]
[node name="Hitbox" type="Area2D"]
script = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]

View File

@@ -0,0 +1,5 @@
extends Area2D
export(int, 0, 20) var currency_value:=0
export(int, 0, 2) var health_value:=0
export(int, 0, 300) var slowdown_value:=0

View File

@@ -0,0 +1,8 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.gd" type="Script" id=1]
[node name="Hurtbox" type="Area2D"]
script = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]

View File

@@ -3,20 +3,26 @@ extends Node
export(int) var max_health := 1
onready var health := max_health setget set_health
export(int) var max_speed := 125
export(float) var max_speed := 125.0
onready var speed := max_speed setget set_speed
signal no_health
func set_health(value):
health = value
if value > max_health:
health = max_health
else:
health = value
if health < 1:
emit_signal("no_health")
func set_speed(value):
if value > max_speed:
speed = max_speed
elif value<0.0:
speed = 0.0
else:
speed = value

View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Overlap/Stats.gd" type="Script" id=1]
[ext_resource path="res://Overlap/Stats/Stats.gd" type="Script" id=1]
[node name="Stats" type="Node"]
script = ExtResource( 1 )

View File

@@ -6,13 +6,13 @@ This is an example player controller script created by Paul
var velocity := Vector2.ZERO
var rollvector := Vector2.ZERO
# This is how you export variables with ranges to the editor window
export(int, 0, 500) var MAX_SPEED := 125
export(int, 0, 500) var ROLL_SPEED := 150
export(int, 0, 500) var FRICTION := 200 # Speed at which the player deaccelarates
export(int, 0, 500) var ACCELERATION := 450
# Reference for the current player
onready var player_stats := $Stats
onready var debug_label := $DebugLabel
onready var animation_player := $AnimationPlayer
onready var animation_tree := $AnimationTree
onready var animation_state = animation_tree.get("parameters/playback")
@@ -25,9 +25,26 @@ enum moveState{
var movementState = moveState.MOVE
var damage_per_second := 0.0
var totaldamage := 0.0
var currency := 0
var experience := 0.0
func _debug_update():
debug_label.text = str(player_stats.health) + "/" + str(player_stats.max_health) + " HP\n" + str(currency) + ""
func _physics_process(delta):
totaldamage+=damage_per_second*delta
player_stats.speed+=10*delta
while(totaldamage>1):
totaldamage-=1
player_stats.health-=1
while(totaldamage<-1):
totaldamage+=1
player_stats.health+=1
_debug_update()
match movementState:
moveState.MOVE:
movement_move(delta)
@@ -65,7 +82,7 @@ func movement_move(delta):
animation_tree.set("parameters/roll/blend_position", input_vector)
animation_tree.set("parameters/run/blend_position", input_vector)
animation_state.travel("run")
velocity = velocity.move_toward(MAX_SPEED * input_vector, ACCELERATION * delta)
velocity = velocity.move_toward(player_stats.speed * input_vector, ACCELERATION * delta)
if Input.is_action_just_pressed("roll"):
movementState = moveState.ROLL
elif Input.is_action_just_pressed("attack"):
@@ -87,8 +104,21 @@ func roll_finished():
func _on_Hurtbox_area_entered(area):
player_stats.health-=area.damage
damage_per_second = damage_per_second + area.damage
func _on_Hurtbox_area_exited(area):
damage_per_second = damage_per_second - area.damage
func _on_Stats_no_health():
queue_free()
get_tree().change_scene("res://Menus/TitleScreen/TitleScreen.tscn")
func _on_Hitbox_area_entered(area):
pass
currency += area.currency_value
player_stats.health = player_stats.health+area.health_value
player_stats.speed -= area.slowdown_value

View File

@@ -1,10 +1,11 @@
[gd_scene load_steps=54 format=2]
[gd_scene load_steps=56 format=2]
[ext_resource path="res://Player/Player.gd" type="Script" id=1]
[ext_resource path="res://Player/Player.png" type="Texture" id=2]
[ext_resource path="res://HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=3]
[ext_resource path="res://HurtHit_Box/Hitbox.tscn" type="PackedScene" id=4]
[ext_resource path="res://Overlap/Stats.tscn" type="PackedScene" id=5]
[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=3]
[ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=4]
[ext_resource path="res://Overlap/Stats/Stats.tscn" type="PackedScene" id=5]
[ext_resource path="res://Fonts/Harmonic/Harmonic.ttf" type="DynamicFontData" id=6]
[sub_resource type="CapsuleShape2D" id=1]
radius = 2.15976
@@ -611,6 +612,10 @@ height = 0.175497
radius = 4.03497
height = 6.99104
[sub_resource type="DynamicFont" id=49]
size = 12
font_data = ExtResource( 6 )
[node name="Player" type="KinematicBody2D"]
script = ExtResource( 1 )
FRICTION = 270
@@ -689,9 +694,22 @@ position = Vector2( 8.43416, 0.0698299 )
shape = SubResource( 48 )
disabled = true
[node name="DebugLabel" type="Label" parent="."]
margin_left = -8.01196
margin_top = -21.2223
margin_right = 8.98804
margin_bottom = -9.22228
custom_fonts/font = SubResource( 49 )
text = "Ahh"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Stats" parent="." instance=ExtResource( 5 )]
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"]
[editable path="Hitbox"]

View File

@@ -1,7 +1,6 @@
[gd_scene load_steps=16 format=2]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://Menus/Startup/Startup.tscn" type="PackedScene" id=2]
[ext_resource path="res://Maps/Tilesets/Room/tileset_room.tres" type="TileSet" id=3]
[ext_resource path="res://testSprites/dark.png" type="Texture" id=4]
[ext_resource path="res://Objects/Barrel/Barrel.tscn" type="PackedScene" id=5]
@@ -15,11 +14,12 @@
[ext_resource path="res://Objects/Rubies/Green.tscn" type="PackedScene" id=13]
[ext_resource path="res://Objects/Traps/Flame.tscn" type="PackedScene" id=14]
[ext_resource path="res://Objects/Traps/Spike.tscn" type="PackedScene" id=15]
[ext_resource path="res://Objects/Slime/Slime.tscn" type="PackedScene" id=16]
[node name="World" type="Node2D"]
[node name="WallSprite" type="Sprite" parent="."]
position = Vector2( 101.087, 144.871 )
position = Vector2( 100.332, 144.871 )
texture = ExtResource( 4 )
region_enabled = true
region_rect = Rect2( 0, 0, 1280, 720 )
@@ -30,8 +30,11 @@ cell_size = Vector2( 32, 32 )
format = 1
tile_data = PoolIntArray( -131063, 47, 0, -131062, 47, 2, -65536, 47, 4, -65535, 47, 196609, -65534, 47, 196609, -65533, 47, 196609, -65532, 47, 196609, -65531, 47, 196609, -65530, 47, 196609, -65529, 47, 6, -65528, 47, 5, -65527, 47, 196614, -65526, 47, 196613, -65525, 47, 6, -65524, 47, 5, -65523, 47, 196609, -65522, 47, 7, 0, 47, 65539, 7, 47, 131072, 8, 47, 65543, 11, 47, 131072, 12, 47, 65543, 14, 47, 196612, 15, 47, 196610, 65536, 47, 65539, 65544, 47, 196612, 65545, 47, 7, 65548, 47, 65539, 131072, 47, 262148, 131073, 47, 196610, 131081, 47, 65539, 131084, 47, 65539, 131087, 47, 3, 196608, 47, 65539, 196615, 47, 196611, 196617, 47, 131075, 196619, 47, 4, 196620, 47, 196615, 196622, 47, 4, 196623, 47, 196615, 262144, 47, 65539, 262146, 47, 3, 262155, 47, 65539, 262158, 47, 65539, 327680, 47, 262148, 327681, 47, 196609, 327682, 47, 196616, 327683, 47, 196609, 327684, 47, 196609, 327685, 47, 196609, 327686, 47, 196609, 327687, 47, 7, 327691, 47, 131075, 327694, 47, 65539, 393216, 47, 65539, 393223, 47, 196612, 393224, 47, 196610, 393230, 47, 65539, 458752, 47, 196612, 458753, 47, 196609, 458754, 47, 7, 458766, 47, 65539, 524290, 47, 196612, 524291, 47, 196609, 524292, 47, 196609, 524293, 47, 196609, 524294, 47, 196609, 524295, 47, 196609, 524296, 47, 196609, 524297, 47, 196609, 524298, 47, 196609, 524299, 47, 196609, 524300, 47, 196609, 524301, 47, 196609, 524302, 47, 196615 )
[node name="Startup" parent="." instance=ExtResource( 2 )]
visible = false
[node name="Slime" parent="." instance=ExtResource( 16 )]
position = Vector2( 207.164, 143.978 )
[node name="Slime2" parent="." instance=ExtResource( 16 )]
position = Vector2( 239.993, 144.355 )
[node name="YSort" type="YSort" parent="."]
position = Vector2( 170.007, 112.118 )
@@ -50,7 +53,7 @@ position = Vector2( 30.9156, 105.927 )
scale = Vector2( 2, 2 )
[node name="Banana" parent="YSort" instance=ExtResource( 6 )]
position = Vector2( -121.577, 4.57831 )
position = Vector2( -26.4842, -48.6284 )
[node name="Bonfire" parent="YSort" instance=ExtResource( 7 )]
position = Vector2( 283.515, -47.7461 )

View File

@@ -33,7 +33,7 @@ _global_script_class_icons={
[application]
config/name="LD46 Game"
run/main_scene="res://Menus/TitleScreen/TitleScreen.tscn"
run/main_scene="res://World.tscn"
config/icon="res://icon.png"
[autoload]