diff --git a/src/Boss/Boss_template.tscn b/src/Boss/Boss_template.tscn index 93a4a11..d7a53a3 100644 --- a/src/Boss/Boss_template.tscn +++ b/src/Boss/Boss_template.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] [ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=2] [ext_resource path="res://Overlap/Stats/Stats.tscn" type="PackedScene" id=3] [ext_resource path="res://Boss/Boss_template.gd" type="Script" id=4] [ext_resource path="res://testSprites/white_boss_dog.png" type="Texture" id=5] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=6] [sub_resource type="CapsuleShape2D" id=1] radius = 18.0 @@ -21,6 +22,8 @@ height = 15.0 [node name="Boss_template" type="KinematicBody2D"] script = ExtResource( 4 ) +[node name="Kind" parent="." instance=ExtResource( 6 )] + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 3.13451, -20.1418 ) scale = Vector2( 2, 2 ) diff --git a/src/Maps/Grid.gd b/src/Maps/Grid.gd new file mode 100644 index 0000000..fdff42c --- /dev/null +++ b/src/Maps/Grid.gd @@ -0,0 +1,92 @@ +extends Node + +const Kind = preload("res://Overlap/Kind.gd") # Relative pat + + +var object_grid : Array = [] +var prio_grid : Array = [] +var time_passed := 0.0 +var offset +export(float,0,42.0) var refresh_rate = 1.0 + + +func _draw_object_grid(): + for y in range(7): + var stri = "" + for x in range(14): + stri += str(object_grid[x][y]) + " " + print(stri) + print() + +func _draw_prio_grid(): + for y in range(7): + var stri = "" + for x in range(14): + stri += str(prio_grid[x][y]) + " " + print(stri) + print() + +func _reset_grids(): + for x in range(14): + for y in range(7): + var lulul = object_grid[x][y].back() + while (object_grid[x][y].back()!=Kind.FIELD) and (Kind.WALL != object_grid[x][y].back()): + object_grid[x][y].pop_back() + while (prio_grid[x][y].back()!=Kind.TERMINAL_SYMBOL): + prio_grid[x][y].pop_back() + +func _ready(): + var walls = get_tree().current_scene.get_child(1) + offset = walls.global_position + #todo put in grid_lul + for x in range(14): + object_grid.push_back([]) + prio_grid.push_back([]) + for y in range(7): + object_grid[x].push_back([Kind.FIELD]) + prio_grid[x].push_back([Kind.TERMINAL_SYMBOL]) + + + for tile in walls.get_used_cells(): + if(_is_in_grid(tile)): + object_grid[tile.x][tile.y][0] = Kind.WALL + + _update_grid() + + +func _pixel_to_grid_coords(pixel : Vector2) -> Vector2: + var new_coords : Vector2 + new_coords.x = floor((pixel.x-offset.x)/32.0) + new_coords.y = floor((pixel.y-offset.y)/32.0) + return new_coords + +func _is_in_grid(grid_coords : Vector2) -> bool: + if(grid_coords.x<0): + return false + if(grid_coords.x>13): + return false + if(grid_coords.y<0): + return false + if(grid_coords.y>6): + return false + return true + + +func _update_grid(): + _reset_grids() + var world = get_tree().current_scene.get_child(2) + for node in world.get_children(): + var node_kind = node.get_child(0) + var grid_corrds = _pixel_to_grid_coords(node.global_position) + if (_is_in_grid(grid_corrds)): + if(node_kind.general!=Kind.FIELD and node_kind.general!=Kind.WALL): + object_grid[grid_corrds.x][grid_corrds.y].push_back(node_kind.general) + prio_grid[grid_corrds.x][grid_corrds.y].push_back(node_kind.kind) + + +func _physics_process(delta): + if(time_passed > refresh_rate): + time_passed -= refresh_rate + _update_grid() + time_passed += delta + diff --git a/src/Maps/Grid.tscn b/src/Maps/Grid.tscn new file mode 100644 index 0000000..fcea5cc --- /dev/null +++ b/src/Maps/Grid.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Maps/Grid.gd" type="Script" id=1] + +[node name="Grid" type="Node"] +script = ExtResource( 1 ) diff --git a/src/Objects/Banana/Banana.tscn b/src/Objects/Banana/Banana.tscn index 8b4d30e..4e28045 100644 --- a/src/Objects/Banana/Banana.tscn +++ b/src/Objects/Banana/Banana.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 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://testSprites/bannane.png" type="Texture" id=3] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] radius = 7.54726 @@ -11,6 +12,10 @@ height = 12.1493 [node name="Banana" type="Node2D"] script = ExtResource( 2 ) +[node name="Kind" parent="." instance=ExtResource( 4 )] +general = 2 +kind = 10 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 1.54256, -4.73786 ) texture = ExtResource( 3 ) diff --git a/src/Objects/Barrel/Barrel.tscn b/src/Objects/Barrel/Barrel.tscn index a90bebd..942399f 100644 --- a/src/Objects/Barrel/Barrel.tscn +++ b/src/Objects/Barrel/Barrel.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=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] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] radius = 10.7634 @@ -15,6 +16,10 @@ height = 8.78242 [node name="Barrel" type="StaticBody2D"] script = ExtResource( 2 ) +[node name="Kind" parent="." instance=ExtResource( 4 )] +general = 1 +kind = 9 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0.244171, -10.0111 ) texture = ExtResource( 3 ) diff --git a/src/Objects/Bonfire/Bonfire.tscn b/src/Objects/Bonfire/Bonfire.tscn index 99ca9e5..24a2e4d 100644 --- a/src/Objects/Bonfire/Bonfire.tscn +++ b/src/Objects/Bonfire/Bonfire.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] [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] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=5] [sub_resource type="CapsuleShape2D" id=1] radius = 7.76762 @@ -19,6 +20,10 @@ radius = 32.0 [node name="Bonfire" type="StaticBody2D"] script = ExtResource( 2 ) +[node name="Kind" parent="." instance=ExtResource( 5 )] +general = 1 +kind = 8 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0.22036, -4.18694 ) texture = ExtResource( 3 ) diff --git a/src/Objects/Heart/Heart.tscn b/src/Objects/Heart/Heart.tscn index d540388..975d0f7 100644 --- a/src/Objects/Heart/Heart.tscn +++ b/src/Objects/Heart/Heart.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] [ext_resource path="res://Objects/Heart/Heart.gd" type="Script" id=2] [ext_resource path="res://testSprites/Herz.png" type="Texture" id=3] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] radius = 7.43707 @@ -11,6 +12,10 @@ height = 2.89399 [node name="Heart" type="Node2D"] script = ExtResource( 2 ) +[node name="Kind" parent="." instance=ExtResource( 4 )] +general = 1 +kind = 7 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0.22036, -4.18694 ) texture = ExtResource( 3 ) diff --git a/src/Objects/Rubies/Blue.tscn b/src/Objects/Rubies/Blue.tscn index cdc6a76..2826e60 100644 --- a/src/Objects/Rubies/Blue.tscn +++ b/src/Objects/Rubies/Blue.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] [ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2] [ext_resource path="res://testSprites/blue_Rubi.png" type="Texture" id=3] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] radius = 7.43707 @@ -11,6 +12,10 @@ height = 2.89399 [node name="Blue" type="Node2D"] script = ExtResource( 2 ) +[node name="Kind" parent="." instance=ExtResource( 4 )] +general = 1 +kind = 5 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0.22036, -4.18694 ) texture = ExtResource( 3 ) diff --git a/src/Objects/Rubies/Green.tscn b/src/Objects/Rubies/Green.tscn index 2ef1a91..b0a81d1 100644 --- a/src/Objects/Rubies/Green.tscn +++ b/src/Objects/Rubies/Green.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] [ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2] [ext_resource path="res://testSprites/green_Rubi.png" type="Texture" id=3] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] radius = 7.43707 @@ -11,6 +12,10 @@ height = 2.89399 [node name="Green" type="Node2D"] script = ExtResource( 2 ) +[node name="Kind" parent="." instance=ExtResource( 4 )] +general = 1 +kind = 6 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0.22036, -4.18694 ) texture = ExtResource( 3 ) diff --git a/src/Objects/Rubies/Red.tscn b/src/Objects/Rubies/Red.tscn index 2001ecd..bc3bd2f 100644 --- a/src/Objects/Rubies/Red.tscn +++ b/src/Objects/Rubies/Red.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] [ext_resource path="res://Objects/Rubies/Rubies.gd" type="Script" id=2] [ext_resource path="res://testSprites/red_Rubi.png" type="Texture" id=3] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] radius = 7.43707 @@ -11,6 +12,10 @@ height = 2.89399 [node name="Red" type="Node2D"] script = ExtResource( 2 ) +[node name="Kind" parent="." instance=ExtResource( 4 )] +general = 1 +kind = 4 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0.22036, -4.18694 ) texture = ExtResource( 3 ) diff --git a/src/Objects/Slime/Slime.tscn b/src/Objects/Slime/Slime.tscn index 70dc294..1a0c3d4 100644 --- a/src/Objects/Slime/Slime.tscn +++ b/src/Objects/Slime/Slime.tscn @@ -1,13 +1,18 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 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] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=3] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 16, 16 ) [node name="Slime" type="Node2D"] +[node name="Kind" parent="." instance=ExtResource( 3 )] +general = 2 +kind = 10 + [node name="Sprite" type="Sprite" parent="."] texture = ExtResource( 1 ) diff --git a/src/Objects/Torch/Torch.gd b/src/Objects/Torch/Torch.gd index b9c999d..daf5e58 100644 --- a/src/Objects/Torch/Torch.gd +++ b/src/Objects/Torch/Torch.gd @@ -1,4 +1,4 @@ -extends StaticBody2D +extends Node2D export(int, 1, 5) var lifePoints = 3 export(int, 1, 30) var spawnRate = 5 diff --git a/src/Objects/Torch/Torch.tscn b/src/Objects/Torch/Torch.tscn index e07f98e..fec8284 100644 --- a/src/Objects/Torch/Torch.tscn +++ b/src/Objects/Torch/Torch.tscn @@ -1,16 +1,21 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] [ext_resource path="res://testSprites/fackel.png" type="Texture" id=2] [ext_resource path="res://Objects/Torch/Torch.gd" type="Script" id=3] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] radius = 8.0 height = 12.0 -[node name="Torch" type="StaticBody2D"] +[node name="Torch" type="Node2D"] script = ExtResource( 3 ) +[node name="Kind" parent="." instance=ExtResource( 4 )] +general = 4 +kind = 2 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0, -8 ) texture = ExtResource( 2 ) diff --git a/src/Objects/Traps/Flame.tscn b/src/Objects/Traps/Flame.tscn index eed9fd8..153904f 100644 --- a/src/Objects/Traps/Flame.tscn +++ b/src/Objects/Traps/Flame.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=2] [ext_resource path="res://testSprites/flame.png" type="Texture" id=3] [sub_resource type="CapsuleShape2D" id=1] @@ -8,6 +9,9 @@ height = 6.36237 [node name="Flame" type="Node2D"] +[node name="Kind" parent="." instance=ExtResource( 2 )] +kind = 10 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0.44072, -6.06005 ) texture = ExtResource( 3 ) diff --git a/src/Objects/Traps/Spike.tscn b/src/Objects/Traps/Spike.tscn index 024826f..8991297 100644 --- a/src/Objects/Traps/Spike.tscn +++ b/src/Objects/Traps/Spike.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 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/Spike.png" type="Texture" id=3] - - +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] height = 6.36237 @@ -12,6 +11,9 @@ height = 6.36237 [node name="Spike" type="Node2D"] script = ExtResource( 2 ) +[node name="Kind" parent="." instance=ExtResource( 4 )] +kind = 10 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0.220352, -3.63603 ) texture = ExtResource( 3 ) diff --git a/src/Objects/Traps/Sting.tscn b/src/Objects/Traps/Sting.tscn index b102af5..f640195 100644 --- a/src/Objects/Traps/Sting.tscn +++ b/src/Objects/Traps/Sting.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 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/Sting.png" type="Texture" id=3] - - +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] radius = 6.77597 @@ -13,6 +12,9 @@ height = 6.36237 [node name="Sting" type="Node2D"] script = ExtResource( 2 ) +[node name="Kind" parent="." instance=ExtResource( 4 )] +kind = 10 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0.44072, -9.03499 ) texture = ExtResource( 3 ) diff --git a/src/Objects/Traps/bear.tscn b/src/Objects/Traps/bear.tscn index 7d23975..006bbd1 100644 --- a/src/Objects/Traps/bear.tscn +++ b/src/Objects/Traps/bear.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 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://testSprites/falle.png" type="Texture" id=3] -[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=4] +[ext_resource path="res://Objects/Traps/Bear.gd" type="Script" id=1] +[ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=2] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=3] +[ext_resource path="res://testSprites/falle.png" type="Texture" id=4] +[ext_resource path="res://Overlap/HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=5] [sub_resource type="CapsuleShape2D" id=1] height = 9.0 @@ -12,20 +13,23 @@ height = 9.0 height = 9.0 [node name="Bear_trap" type="Node2D"] -script = ExtResource( 2 ) +script = ExtResource( 1 ) + +[node name="Kind" parent="." instance=ExtResource( 3 )] +kind = 10 [node name="Sprite" type="Sprite" parent="."] position = Vector2( -7.62939e-06, 0 ) -texture = ExtResource( 3 ) +texture = ExtResource( 4 ) -[node name="Hitbox" parent="." instance=ExtResource( 1 )] +[node name="Hitbox" parent="." instance=ExtResource( 2 )] collision_layer = 16 [node name="CollisionShape2D" parent="Hitbox" index="0"] rotation = 1.5708 shape = SubResource( 1 ) -[node name="Hurtbox" parent="." instance=ExtResource( 4 )] +[node name="Hurtbox" parent="." instance=ExtResource( 5 )] collision_layer = 32 collision_mask = 0 diff --git a/src/Overlap/AI/AI_Hero.gd b/src/Overlap/AI/AI_Hero.gd index 08c4abc..f29320a 100644 --- a/src/Overlap/AI/AI_Hero.gd +++ b/src/Overlap/AI/AI_Hero.gd @@ -21,6 +21,7 @@ enum{ enum{ DAMAGE, + HEALING, SLOW, WALL, FIELD diff --git a/src/Overlap/Kind.gd b/src/Overlap/Kind.gd new file mode 100644 index 0000000..d37fa85 --- /dev/null +++ b/src/Overlap/Kind.gd @@ -0,0 +1,28 @@ +extends Node + +enum { + BOSS = 0, + PLAYER, + TORCH, + MINION, + RED, + BLUE, + GREEN, + HEART, + BONFIRE, + BARREL, + TERMINAL_SYMBOL +} + +enum{ + DAMAGE = 0, + HEALING, + SLOW, + WALL, + FIELD +} + +export(int, "DAMAGE","HEALING","SLOW","WALL","FIELD") var general = DAMAGE +export(int,"BOSS","PLAYER","TORCH","MINION","RED","BLUE","GREEN","HEART","BONFIRE","BARREL","TERMINAL_SYMBOL") var kind = BOSS + + diff --git a/src/Overlap/Kind.tscn b/src/Overlap/Kind.tscn new file mode 100644 index 0000000..547647d --- /dev/null +++ b/src/Overlap/Kind.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://Overlap/Kind.gd" type="Script" id=1] + +[node name="Kind" type="Node"] +script = ExtResource( 1 ) diff --git a/src/Player/Player.tscn b/src/Player/Player.tscn index 42b3231..c74ea6c 100644 --- a/src/Player/Player.tscn +++ b/src/Player/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=56 format=2] +[gd_scene load_steps=57 format=2] [ext_resource path="res://Player/Player.gd" type="Script" id=1] [ext_resource path="res://Player/Player.png" type="Texture" id=2] @@ -6,6 +6,7 @@ [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] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=7] [sub_resource type="CapsuleShape2D" id=1] radius = 2.15976 @@ -620,6 +621,9 @@ font_data = ExtResource( 6 ) script = ExtResource( 1 ) FRICTION = 270 +[node name="Kind" parent="." instance=ExtResource( 7 )] +kind = 1 + [node name="Sprite" type="Sprite" parent="."] position = Vector2( 0.273621, 3.88423 ) scale = Vector2( 0.5, 0.5 ) diff --git a/src/World.tscn b/src/World.tscn index 0873cb6..6b32ef9 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,22 +1,12 @@ -[gd_scene load_steps=18 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://World.gd" type="Script" 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/Traps/bear.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/Barrel/Barrel.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] -[ext_resource path="res://Objects/Slime/Slime.tscn" type="PackedScene" id=16] [ext_resource path="res://Boss/Boss_template.tscn" type="PackedScene" id=17] +[ext_resource path="res://Maps/Grid.tscn" type="PackedScene" id=18] [node name="World" type="Node2D"] script = ExtResource( 2 ) @@ -28,11 +18,11 @@ region_enabled = true region_rect = Rect2( 0, 0, 1280, 720 ) [node name="FloorTileMap" type="TileMap" parent="."] -position = Vector2( -16, 16 ) +position = Vector2( 16, 16 ) tile_set = ExtResource( 3 ) cell_size = Vector2( 32, 32 ) format = 1 -tile_data = PoolIntArray( -65537, 47, 0, -131072, 47, 1, -131071, 47, 1, -131070, 47, 1, -131069, 47, 1, -131068, 47, 1, -131067, 47, 1, -131066, 47, 1, -131065, 47, 1, -131064, 47, 1, -131063, 47, 1, -131062, 47, 1, -131061, 47, 1, -131060, 47, 1, -131059, 47, 1, -131058, 47, 1, -131057, 47, 1, -131056, 47, 2, -1, 47, 65536, -65536, 47, 65541, -65535, 47, 131073, -65534, 47, 131073, -65533, 47, 131073, -65532, 47, 131073, -65531, 47, 131073, -65530, 47, 131073, -65529, 47, 131073, -65528, 47, 131073, -65527, 47, 131073, -65526, 47, 65544, -65525, 47, 131073, -65524, 47, 131073, -65523, 47, 131073, -65522, 47, 131073, -65521, 47, 65542, -65520, 47, 65538, 65535, 47, 65536, 0, 47, 65538, 10, 47, 65539, 15, 47, 65536, 16, 47, 65538, 131071, 47, 65536, 65536, 47, 65538, 65546, 47, 65539, 65549, 47, 3, 65551, 47, 65536, 65552, 47, 65538, 196607, 47, 65536, 131072, 47, 65538, 131077, 47, 3, 131082, 47, 65539, 131085, 47, 65539, 131087, 47, 65536, 131088, 47, 65538, 262143, 47, 65536, 196608, 47, 65538, 196612, 47, 196608, 196613, 47, 262152, 196614, 47, 196610, 196618, 47, 65539, 196621, 47, 196612, 196622, 47, 196609, 196623, 47, 262150, 196624, 47, 65538, 327679, 47, 65536, 262144, 47, 65538, 262149, 47, 131075, 262154, 47, 65539, 262159, 47, 65536, 262160, 47, 65538, 393215, 47, 65536, 327680, 47, 65538, 327690, 47, 196612, 327691, 47, 196610, 327695, 47, 65536, 327696, 47, 65538, 458751, 47, 65536, 393216, 47, 65538, 393231, 47, 65536, 393232, 47, 65538, 524287, 47, 65536, 458752, 47, 131077, 458753, 47, 1, 458754, 47, 1, 458755, 47, 1, 458756, 47, 1, 458757, 47, 1, 458758, 47, 1, 458759, 47, 1, 458760, 47, 1, 458761, 47, 1, 458762, 47, 1, 458763, 47, 1, 458764, 47, 1, 458765, 47, 1, 458766, 47, 1, 458767, 47, 131078, 458768, 47, 65538, 589823, 47, 131072, 524288, 47, 131073, 524289, 47, 131073, 524290, 47, 131073, 524291, 47, 131073, 524292, 47, 131073, 524293, 47, 131073, 524294, 47, 131073, 524295, 47, 131073, 524296, 47, 131073, 524297, 47, 131073, 524298, 47, 131073, 524299, 47, 131073, 524300, 47, 131073, 524301, 47, 131073, 524302, 47, 131073, 524303, 47, 131073, 524304, 47, 131074 ) +tile_data = PoolIntArray( -1, 47, 4, -65536, 47, 196609, -65535, 47, 196609, -65534, 47, 196609, -65533, 47, 196609, -65532, 47, 196609, -65531, 47, 196609, -65530, 47, 196609, -65529, 47, 196609, -65528, 47, 196609, -65527, 47, 196609, -65526, 47, 196609, -65525, 47, 196609, -65524, 47, 196609, -65523, 47, 196609, -65522, 47, 7, 65535, 47, 65539, 14, 47, 65539, 131071, 47, 65539, 65545, 47, 4, 65546, 47, 196609, 65547, 47, 196610, 65550, 47, 65539, 196607, 47, 65539, 131081, 47, 65539, 131086, 47, 65539, 262143, 47, 65539, 196617, 47, 196612, 196618, 47, 196609, 196619, 47, 7, 196622, 47, 65539, 327679, 47, 65539, 262155, 47, 65539, 262158, 47, 65539, 393215, 47, 65539, 327689, 47, 196608, 327690, 47, 196609, 327691, 47, 196615, 327694, 47, 65539, 458751, 47, 65539, 393230, 47, 65539, 524287, 47, 196612, 458752, 47, 196609, 458753, 47, 196609, 458754, 47, 196609, 458755, 47, 196609, 458756, 47, 196609, 458757, 47, 196609, 458758, 47, 196609, 458759, 47, 196609, 458760, 47, 196609, 458761, 47, 196609, 458762, 47, 196609, 458763, 47, 196609, 458764, 47, 196609, 458765, 47, 196609, 458766, 47, 196615 ) __meta__ = { "_edit_group_": true, "_edit_lock_": true @@ -41,86 +31,17 @@ __meta__ = { [node name="YSort" type="YSort" parent="."] position = Vector2( 152, 120 ) -[node name="Boss_template" parent="YSort" instance=ExtResource( 17 )] -position = Vector2( -107.855, -54.5179 ) - [node name="Player" parent="YSort" instance=ExtResource( 1 )] position = Vector2( 296, -32 ) scale = Vector2( 2, 2 ) debug = true FRICTION = 200 -[node name="minion" parent="YSort" instance=ExtResource( 17 )] -position = Vector2( 88, 24 ) -scale = Vector2( 0.3, 0.3 ) -collision_layer = 8 +[node name="Bonfire" parent="YSort" instance=ExtResource( 7 )] +position = Vector2( 296, -16 ) -[node name="Bear_trap" parent="YSort" instance=ExtResource( 5 )] -position = Vector2( 68.1447, -38.5179 ) +[node name="Boss_template" parent="YSort" instance=ExtResource( 17 )] -[node name="Slime" parent="YSort" instance=ExtResource( 16 )] -position = Vector2( 68.1447, 57.4821 ) +[node name="Grid" parent="." instance=ExtResource( 18 )] -[node name="Flame" parent="YSort" instance=ExtResource( 14 )] -position = Vector2( 124.145, 65.4821 ) - -[node name="Spike" parent="YSort" instance=ExtResource( 15 )] -position = Vector2( 272, 88 ) - -[node name="Sting" parent="YSort" instance=ExtResource( 8 )] -position = Vector2( 132.145, 17.4821 ) - -[node name="Heart" parent="YSort" instance=ExtResource( 11 )] -position = Vector2( -43.8553, 65.4821 ) - -[node name="Blue" parent="YSort" instance=ExtResource( 9 )] -position = Vector2( -3.8553, 81.4821 ) - -[node name="Red" parent="YSort" instance=ExtResource( 12 )] -position = Vector2( -51.8553, 41.4821 ) - -[node name="Green" parent="YSort" instance=ExtResource( 13 )] -position = Vector2( -19.8553, 73.4821 ) - -[node name="Barrel" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( 8.00002, -32 ) - -[node name="Barrel5" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( 8.00002, -96 ) - -[node name="Barrel6" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( -128, 16 ) - -[node name="Barrel7" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( -48, 16 ) - -[node name="Barrel8" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( -64, 16 ) - -[node name="Barrel9" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( -80, 16 ) - -[node name="Barrel10" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( -96, 16 ) - -[node name="Barrel11" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( -112, 16 ) - -[node name="Barrel2" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( 8.00002, -48 ) - -[node name="Barrel3" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( 8.00002, -64 ) - -[node name="Barrel4" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( 8.00002, -80 ) - -[node name="Banana" parent="YSort" instance=ExtResource( 6 )] -position = Vector2( -107.855, 73.4821 ) - -[node name="Bonfire" parent="." instance=ExtResource( 7 )] -position = Vector2( 448, 104 ) - -[editable path="YSort/minion"] - -[editable path="YSort/minion/Hurtbox"] +[editable path="YSort/Boss_template"]