From b0a35659d9c8cac206cd13f025b781aa54ab1a8e Mon Sep 17 00:00:00 2001 From: Jan Schuffenhauer Date: Sat, 18 Apr 2020 17:16:52 +0200 Subject: [PATCH] Merge branch 'devMechanics' into devPlayerStats --- src/Bannana.gd | 5 ++ src/Objects/Banana/Banana.tscn | 29 +++++++ src/Objects/Bonfire/Bonfire.tscn | 38 +++++++++ src/Objects/Heart/Heart.tscn | 29 +++++++ src/Objects/Rubies/Blue.tscn | 29 +++++++ src/Objects/Rubies/Green.tscn | 29 +++++++ src/Objects/Rubies/Red.tscn | 29 +++++++ src/Objects/Traps/Flame.tscn | 24 ++++++ src/Objects/Traps/Spike.tscn | 24 ++++++ src/Objects/Traps/Sting.tscn | 26 +++++++ src/Objects/Traps/bear.tscn | 24 ++++++ src/Player/Player.gd | 9 ++- src/Player/Player.tscn | 45 ++++++----- src/World.tscn | 115 +++++++++++++++------------- src/testSprites/Bonfire.png | Bin 0 -> 1037 bytes src/testSprites/Bonfire.png.import | 34 ++++++++ src/testSprites/Spike.png | Bin 0 -> 740 bytes src/testSprites/Spike.png.import | 34 ++++++++ src/testSprites/Stacheln.png.import | 34 ++++++++ src/testSprites/Sting.png | Bin 0 -> 737 bytes src/testSprites/Sting.png.import | 34 ++++++++ 21 files changed, 511 insertions(+), 80 deletions(-) create mode 100644 src/Bannana.gd create mode 100644 src/Objects/Banana/Banana.tscn create mode 100644 src/Objects/Bonfire/Bonfire.tscn create mode 100644 src/Objects/Heart/Heart.tscn create mode 100644 src/Objects/Rubies/Blue.tscn create mode 100644 src/Objects/Rubies/Green.tscn create mode 100644 src/Objects/Rubies/Red.tscn create mode 100644 src/Objects/Traps/Flame.tscn create mode 100644 src/Objects/Traps/Spike.tscn create mode 100644 src/Objects/Traps/Sting.tscn create mode 100644 src/Objects/Traps/bear.tscn create mode 100644 src/testSprites/Bonfire.png create mode 100644 src/testSprites/Bonfire.png.import create mode 100644 src/testSprites/Spike.png create mode 100644 src/testSprites/Spike.png.import create mode 100644 src/testSprites/Stacheln.png.import create mode 100644 src/testSprites/Sting.png create mode 100644 src/testSprites/Sting.png.import diff --git a/src/Bannana.gd b/src/Bannana.gd new file mode 100644 index 0000000..92da9f6 --- /dev/null +++ b/src/Bannana.gd @@ -0,0 +1,5 @@ +extends Node2D + + +func _on_Hurtbox_area_entered(area): + queue_free() diff --git a/src/Objects/Banana/Banana.tscn b/src/Objects/Banana/Banana.tscn new file mode 100644 index 0000000..3367fe4 --- /dev/null +++ b/src/Objects/Banana/Banana.tscn @@ -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"] diff --git a/src/Objects/Bonfire/Bonfire.tscn b/src/Objects/Bonfire/Bonfire.tscn new file mode 100644 index 0000000..ce4c4bc --- /dev/null +++ b/src/Objects/Bonfire/Bonfire.tscn @@ -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"] diff --git a/src/Objects/Heart/Heart.tscn b/src/Objects/Heart/Heart.tscn new file mode 100644 index 0000000..d2dd89f --- /dev/null +++ b/src/Objects/Heart/Heart.tscn @@ -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"] diff --git a/src/Objects/Rubies/Blue.tscn b/src/Objects/Rubies/Blue.tscn new file mode 100644 index 0000000..4754ca2 --- /dev/null +++ b/src/Objects/Rubies/Blue.tscn @@ -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"] diff --git a/src/Objects/Rubies/Green.tscn b/src/Objects/Rubies/Green.tscn new file mode 100644 index 0000000..89ece79 --- /dev/null +++ b/src/Objects/Rubies/Green.tscn @@ -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"] diff --git a/src/Objects/Rubies/Red.tscn b/src/Objects/Rubies/Red.tscn new file mode 100644 index 0000000..3a0dffb --- /dev/null +++ b/src/Objects/Rubies/Red.tscn @@ -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"] diff --git a/src/Objects/Traps/Flame.tscn b/src/Objects/Traps/Flame.tscn new file mode 100644 index 0000000..a19a8e1 --- /dev/null +++ b/src/Objects/Traps/Flame.tscn @@ -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"] diff --git a/src/Objects/Traps/Spike.tscn b/src/Objects/Traps/Spike.tscn new file mode 100644 index 0000000..a6a5ecc --- /dev/null +++ b/src/Objects/Traps/Spike.tscn @@ -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"] diff --git a/src/Objects/Traps/Sting.tscn b/src/Objects/Traps/Sting.tscn new file mode 100644 index 0000000..7a58eaf --- /dev/null +++ b/src/Objects/Traps/Sting.tscn @@ -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"] diff --git a/src/Objects/Traps/bear.tscn b/src/Objects/Traps/bear.tscn new file mode 100644 index 0000000..2ed8fbb --- /dev/null +++ b/src/Objects/Traps/bear.tscn @@ -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"] diff --git a/src/Player/Player.gd b/src/Player/Player.gd index d9fea6e..5c9c9cf 100644 --- a/src/Player/Player.gd +++ b/src/Player/Player.gd @@ -11,7 +11,7 @@ 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 debug_label := $DebugLabel + onready var player_stats := $Stats onready var animation_player := $AnimationPlayer onready var animation_tree := $AnimationTree @@ -25,12 +25,9 @@ enum moveState{ var movementState = moveState.MOVE -func _debug_update(): - debug_label.text = str(player_stats.health) + "/" + str(player_stats.max_health) + " HP" func _physics_process(delta): - _debug_update() match movementState: moveState.MOVE: movement_move(delta) @@ -91,3 +88,7 @@ func roll_finished(): func _on_Hurtbox_area_entered(area): queue_free() + + +func _on_Hitbox_area_entered(area): + pass diff --git a/src/Player/Player.tscn b/src/Player/Player.tscn index 3f4f81b..fc012b0 100644 --- a/src/Player/Player.tscn +++ b/src/Player/Player.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=55 format=2] +[gd_scene load_steps=54 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://Fonts/Harmonic/Harmonic.ttf" type="DynamicFontData" id=6] [sub_resource type="CapsuleShape2D" id=1] radius = 2.15976 @@ -601,17 +600,17 @@ start_node = "idle" [sub_resource type="AnimationNodeStateMachinePlayback" id=45] [sub_resource type="CapsuleShape2D" id=46] -radius = 3.40253 -height = 6.72939 +radius = 3.36373 +height = 6.59445 [sub_resource type="CapsuleShape2D" id=47] +radius = 3.40253 +height = 0.175497 + +[sub_resource type="CapsuleShape2D" id=48] radius = 4.03497 height = 6.99104 -[sub_resource type="DynamicFont" id=48] -size = 12 -font_data = ExtResource( 6 ) - [node name="Player" type="KinematicBody2D"] script = ExtResource( 1 ) FRICTION = 270 @@ -657,13 +656,22 @@ parameters/idle/blend_position = Vector2( -0.646202, 0.122222 ) parameters/roll/blend_position = Vector2( 0.0166494, -0.387619 ) parameters/run/blend_position = Vector2( 0.0697191, -0.967302 ) +[node name="Hitbox" parent="." instance=ExtResource( 4 )] +position = Vector2( 0, 0.0375252 ) +collision_layer = 0 +collision_mask = 32 + +[node name="CollisionShape2D" parent="Hitbox" index="0"] +position = Vector2( 0.420105, -4.84456 ) +shape = SubResource( 46 ) + [node name="Hurtbox" parent="." instance=ExtResource( 3 )] position = Vector2( 0, 0.0375252 ) collision_mask = 0 [node name="CollisionShape2D" parent="Hurtbox" index="0"] -position = Vector2( -0.00503922, -4.92183 ) -shape = SubResource( 46 ) +position = Vector2( 0.0781527, -0.822231 ) +shape = SubResource( 47 ) [node name="Pivot" type="Position2D" parent="."] position = Vector2( 0, -4.16248 ) @@ -678,24 +686,15 @@ collision_mask = 12 [node name="CollisionShape2D" parent="Pivot/SwordHitbox" index="0"] position = Vector2( 8.43416, 0.0698299 ) -shape = SubResource( 47 ) +shape = SubResource( 48 ) disabled = true [node name="Stats" parent="." instance=ExtResource( 5 )] -max_health = 3 - -[node name="DebugLabel" type="Label" parent="."] -margin_left = -8.0 -margin_top = -21.0 -margin_right = 10.0 -margin_bottom = -9.0 -custom_fonts/font = SubResource( 48 ) -text = "BLa" -__meta__ = { -"_edit_use_anchors_": false -} +[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] [connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] +[editable path="Hitbox"] + [editable path="Hurtbox"] [editable path="Pivot/SwordHitbox"] diff --git a/src/World.tscn b/src/World.tscn index 71e2c4d..01a5165 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,15 +1,25 @@ -[gd_scene load_steps=6 format=2] +[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] +[ext_resource path="res://Objects/Banana/Banana.tscn" type="PackedScene" id=6] +[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/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] +[ext_resource path="res://Objects/Traps/Flame.tscn" type="PackedScene" id=14] +[ext_resource path="res://Objects/Traps/Spike.tscn" type="PackedScene" id=15] [node name="World" type="Node2D"] [node name="WallSprite" type="Sprite" parent="."] -position = Vector2( 98.1828, 136.399 ) +position = Vector2( 101.087, 144.871 ) texture = ExtResource( 4 ) region_enabled = true region_rect = Rect2( 0, 0, 1280, 720 ) @@ -18,7 +28,7 @@ region_rect = Rect2( 0, 0, 1280, 720 ) tile_set = ExtResource( 3 ) 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, 7, 65536, 47, 65539, 65544, 47, 196612, 65545, 47, 7, 65548, 47, 65539, 65551, 47, 65539, 131072, 47, 262148, 131073, 47, 196610, 131081, 47, 65539, 131084, 47, 65539, 131087, 47, 65539, 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 ) +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 @@ -26,73 +36,72 @@ visible = false [node name="YSort" type="YSort" parent="."] position = Vector2( 170.007, 112.118 ) +[node name="Barrel2" parent="YSort" instance=ExtResource( 5 )] +position = Vector2( -118.826, -74.2431 ) + +[node name="Barrel3" parent="YSort" instance=ExtResource( 5 )] +position = Vector2( -119.425, -59.8735 ) + [node name="Barrel" parent="YSort" instance=ExtResource( 5 )] -position = Vector2( -75.7991, -70.2346 ) +position = Vector2( -118.865, -87.3775 ) [node name="Player" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( -18.3394, -55.4925 ) +position = Vector2( 30.9156, 105.927 ) scale = Vector2( 2, 2 ) -[node name="Player2" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( -38.722, -70.0515 ) -ROLL_SPEED = 300 +[node name="Banana" parent="YSort" instance=ExtResource( 6 )] +position = Vector2( -121.577, 4.57831 ) -[node name="Player3" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( -46.8102, -53.8748 ) -ROLL_SPEED = 300 +[node name="Bonfire" parent="YSort" instance=ExtResource( 7 )] +position = Vector2( 283.515, -47.7461 ) -[node name="Player4" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( -51.3397, -35.4335 ) -ROLL_SPEED = 300 +[node name="Sting" parent="YSort" instance=ExtResource( 8 )] +position = Vector2( 68.6066, -28.1109 ) -[node name="Player5" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( -56.8398, -20.8745 ) -ROLL_SPEED = 300 +[node name="Sting2" parent="YSort" instance=ExtResource( 8 )] +position = Vector2( 68.6066, -18.9158 ) -[node name="Player6" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( -60.7221, -6.96263 ) -ROLL_SPEED = 300 +[node name="Sting3" parent="YSort" instance=ExtResource( 8 )] +position = Vector2( 108.936, 2.03768 ) -[node name="Player7" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( -27.0748, 6.30219 ) -ROLL_SPEED = 300 +[node name="Sting4" parent="YSort" instance=ExtResource( 8 )] +position = Vector2( 92.0694, 1.87637 ) -[node name="Player8" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( 10.7785, -23.1393 ) -ROLL_SPEED = 300 +[node name="Sting5" parent="YSort" instance=ExtResource( 8 )] +position = Vector2( 101.981, 2.46786 ) -[node name="Player9" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( 20.808, -10.5215 ) -ROLL_SPEED = 300 +[node name="Flame2" parent="YSort" instance=ExtResource( 14 )] +position = Vector2( -31.1322, 103.722 ) -[node name="Player10" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( -22.8689, -23.7863 ) -ROLL_SPEED = 300 +[node name="Bear_trap" parent="YSort" instance=ExtResource( 10 )] +position = Vector2( 197.579, -28.4036 ) -[node name="Player11" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( 9.80794, -43.1983 ) -ROLL_SPEED = 300 +[node name="Flame" parent="YSort" instance=ExtResource( 14 )] +position = Vector2( -30.7141, 88.6697 ) -[node name="Player12" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( 42.1612, -11.4921 ) -ROLL_SPEED = 300 +[node name="Spike" parent="YSort" instance=ExtResource( 15 )] +position = Vector2( 225.593, 102.049 ) -[node name="Player13" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( 58.9849, -37.3747 ) -ROLL_SPEED = 300 +[node name="Red" parent="YSort" instance=ExtResource( 12 )] +position = Vector2( -128.136, 91.1784 ) -[node name="Player14" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( 43.4553, -59.6984 ) -ROLL_SPEED = 300 +[node name="Green" parent="YSort" instance=ExtResource( 13 )] +position = Vector2( -105.975, 105.394 ) -[node name="Player15" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( -6.69225, 23.4494 ) -ROLL_SPEED = 300 +[node name="Blue" parent="YSort" instance=ExtResource( 9 )] +position = Vector2( -89.2507, 105.394 ) -[node name="Player16" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( 19.1904, -66.4926 ) -ROLL_SPEED = 300 +[node name="Green2" parent="YSort" instance=ExtResource( 13 )] +position = Vector2( -95.5225, 89.5059 ) -[node name="Player17" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( -12.1923, -12.4627 ) -ROLL_SPEED = 300 +[node name="Green3" parent="YSort" instance=ExtResource( 13 )] +position = Vector2( -127.718, 103.722 ) + +[node name="Green4" parent="YSort" instance=ExtResource( 13 )] +position = Vector2( -116.428, 91.5965 ) + +[node name="Heart" parent="YSort" instance=ExtResource( 11 )] +position = Vector2( 201.342, -60.5988 ) + +[node name="Blue2" parent="YSort" instance=ExtResource( 9 )] +position = Vector2( 66.0861, -56.9466 ) diff --git a/src/testSprites/Bonfire.png b/src/testSprites/Bonfire.png new file mode 100644 index 0000000000000000000000000000000000000000..50bdaeef0ec2f1f801bf17d02696289e79391888 GIT binary patch literal 1037 zcmV+o1oHcdP)Px&$4Nv%R9J=WmPt%oM;OO{Z}GDY#!DQM0HrD-s^T>3Gc{0()I+79oT+nYDv?W7 z^_EMes)tsp+Eb;d*Q$q{Bll2sQBJ+I=@J=p2oX^hAOb>alVUq~d)xG28w@chKopd! zpY-X?XlDN3Z)U!kH}GGuSZ`3gu)*bL1@giIsJj@ucl!>AWPGGO=yr)3NZq$>JKX}Q zUWoMu>vd@-5WC6&{gnW>=L;m`Bkdc(o(n*$qLQtc0O6f#>hXq;HRT%Qxe1U<&~?Uh&sVZKzq^|DDlLLR zU)a_($uaZJN@c|fm1RMTUqU$uH*PpgE6rzKhiICFmw)|hjnD(;eF#|K_W<|Hy_reN zn>I=SI5u)2Effew2lQ%1V`GD#M z%?F|kf0$;m6Vkp)Rth-= zjwC^85n1tqs||iU8zZCmSkmC|YbC5%o5CI0sVG!@UT0CY9D;E9Vk-6dRxz3ajHXiK zyvw+mkIiOpGgMe~Cc|NA-e<06i)9%aM%SmOfLunFNMzxz!IcGIZNjjX4FrzIJ`f zH^LK*m*PWWYOV;ZW$%C?_0@t-HFS*tJq`7rM^mZsgsw*?JZf@9f}FfwzVUR`ZQT}J ziVq2ZNOubWc?rJybM?qfjiyrLb#E9pQ*)r2KVSTQUD_D@WQWSwaQ_oewspPg000-S zT-)~Zs+o-q_luJqYq`Ercijrq8=qBhXuj-wVvVc&zct#wc;t5SD9k+O00000NkvXX Hu0mjf3fJRR literal 0 HcmV?d00001 diff --git a/src/testSprites/Bonfire.png.import b/src/testSprites/Bonfire.png.import new file mode 100644 index 0000000..84ccfe1 --- /dev/null +++ b/src/testSprites/Bonfire.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Bonfire.png-0056030a521835d2d33fb9bceb6d8997.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/Bonfire.png" +dest_files=[ "res://.import/Bonfire.png-0056030a521835d2d33fb9bceb6d8997.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/Spike.png b/src/testSprites/Spike.png new file mode 100644 index 0000000000000000000000000000000000000000..f8add3317e0cd262a6c647b0645829ec1f9f8d10 GIT binary patch literal 740 zcmVPx%o=HSOR9J=WRy}A_Q560x4!%@)Y3lG2khG~&5;0^5B}#`5bqH^GRJT9_0iA?8 z=pfE64vvBlNTFjTL&)MN;@?nOY$Am=i5Suh=I5b#4=VT^?7e+?fA_rvoboNX+;h+Q zzH{!m=LMKziV5)Y{sZmt?Tj`_jG1vApFew{0l=?t1i5T}Y!OTWo2zTuPBOV++?PMR zrR!KUZt~knCO0-$*OR*6G*~X1*IIl4Z`y4vE=1^_Ui4NlT)d_ZnXxaj z4jgl{0DvWR2)zgZ2nIs{fJU>9STufaSBF?qhd4U(ok)NY^K${ZUR;Qv(X2yJ6l&}C zdsMU=Ft4CoDO~_y8MInEpyW=z6A93RWdHH=dy}nDd^K{$EnHoJG3atCZ4$AZO4Ieq z%@tH@2d)G-mWXt=EDyl*eoCq*(}URaxqARWMHIISwmg=Gr=p~__y9VcHaN})p7)!G zj3SJCR)*KR34@g;Z_jpi}9OB@6tL@QvGErDHCh?vXY>i9HN5R1k~ zgp4#{41dt~%_4BpLSSwl9Ot7pSsvID7|Ha%z}ag#I{X($H$ef1E2v@yJnx4r51^_F z1R+H2tSg8`>XSUz^T| z8EKF8Np|ypz%nD_Xx3q$Px%n@L1LR9J=WmOp43Q5?s=N|W7M~?EUwVb@%r)_9rUgytC`8)S0qEpM+OLoBJ}0_{J;d^ zP=o@&&sq1Sv965*;3(#CWVd(ComBs>{zj>Q&tE>_?ar3vvRJ0HU}JHG7J0sFF3+;M zzBLRG4n^omRRTZF_dQD{la}@6H7dzv-SG?qIEr}`c^0DvTy@%5%- zJOBwomeN!~ty*i(X@)CVTcPZC9~cQ~-ZmUnh5*X;uXb#IBMn&YAH6bUNKk=?2i8uBo@&Z=SuNy;U*|KnR$Jst#=+RIUiX6B5So#j2RsOltQ-~b53jnKv5LXz6h*ML}TtP&x(P;mW z{C>Z#6EOe`HA{k!O#pWQ+ybDTI-`M1Ccf?S3EbJ4N3~kTUz3v_tE&D`7-k>9;i@3S z^#Tm7Kp>NO4&Wnz*XP%0Ad}I8N1vop?xzO_zTXoQqQWrywq_Fm9_megB>?yX9