From 37ccf67677478d6cd793b6df1aa009fc6a10da38 Mon Sep 17 00:00:00 2001 From: Jonas Mucke Date: Mon, 20 Apr 2020 13:40:39 +0200 Subject: [PATCH] merge fixes --- src/Boss/SlimeBoss/HeroCloseZone.gd | 3 +++ src/Boss/SlimeBoss/SlimeBoss.tscn | 7 ++++++- src/Maps/Grid.gd | 2 +- src/World.tscn | 15 ++------------- 4 files changed, 12 insertions(+), 15 deletions(-) create mode 100644 src/Boss/SlimeBoss/HeroCloseZone.gd diff --git a/src/Boss/SlimeBoss/HeroCloseZone.gd b/src/Boss/SlimeBoss/HeroCloseZone.gd new file mode 100644 index 0000000..09b9616 --- /dev/null +++ b/src/Boss/SlimeBoss/HeroCloseZone.gd @@ -0,0 +1,3 @@ +extends Area2D + +var damage = 0 diff --git a/src/Boss/SlimeBoss/SlimeBoss.tscn b/src/Boss/SlimeBoss/SlimeBoss.tscn index c9159f0..cd64f46 100644 --- a/src/Boss/SlimeBoss/SlimeBoss.tscn +++ b/src/Boss/SlimeBoss/SlimeBoss.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=29 format=2] +[gd_scene load_steps=31 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] @@ -12,6 +12,8 @@ [ext_resource path="res://Boss/SlimeBoss/Animations/move_down_angry.png" type="Texture" id=10] [ext_resource path="res://Boss/SlimeBoss/Animations/move_up.png" type="Texture" id=11] [ext_resource path="res://Boss/SlimeBoss/States/Roam/MoveToRandomPosition.gd" type="Script" id=12] +[ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=13] +[ext_resource path="res://Boss/SlimeBoss/HeroCloseZone.gd" type="Script" id=14] [sub_resource type="CapsuleShape2D" id=1] radius = 18.0 @@ -452,6 +454,8 @@ __meta__ = { "_edit_group_": true } +[node name="Kind" parent="." instance=ExtResource( 13 )] + [node name="Stats" parent="." instance=ExtResource( 3 )] max_health = 3 @@ -497,6 +501,7 @@ shape = SubResource( 2 ) [node name="HeroCloseZone" type="Area2D" parent="."] collision_layer = 0 +script = ExtResource( 14 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="HeroCloseZone"] shape = SubResource( 3 ) diff --git a/src/Maps/Grid.gd b/src/Maps/Grid.gd index 3c96341..6253da2 100644 --- a/src/Maps/Grid.gd +++ b/src/Maps/Grid.gd @@ -118,7 +118,7 @@ func get_nearest(position, kind): func _update_grid(): _reset_grids() - var world = get_tree().current_scene.get_node("../YSort") + var world = get_tree().current_scene.get_node("YSort") for node in world.get_children(): var node_kind = node.get_node("Kind") var grid_corrds = _pixel_to_grid_coords(node.global_position) diff --git a/src/World.tscn b/src/World.tscn index 3ad40f5..beddf7c 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,5 +1,4 @@ - -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://World.gd" type="Script" id=2] @@ -7,17 +6,11 @@ [ext_resource path="res://testSprites/dark.png" type="Texture" id=4] [ext_resource path="res://Menus/DragNDrop/DragNDropUI.tscn" type="PackedScene" id=5] [ext_resource path="res://Menus/DialogueBox/DialogueBox.tscn" type="PackedScene" id=6] - [ext_resource path="res://Maps/Background/Background.tscn" type="PackedScene" id=7] [ext_resource path="res://Boss/SlimeBoss/SlimeBoss.tscn" type="PackedScene" id=8] -[ext_resource path="res://Debug/BossStateDisplay.gd" type="Script" id=9] [ext_resource path="res://Objects/Bonfire/Bonfire.tscn" type="PackedScene" id=10] -[ext_resource path="res://Fonts/Harmonic/Harmonic12.tres" type="DynamicFont" id=11] - [ext_resource path="res://Maps/Grid.tscn" type="PackedScene" id=18] -[sub_resource type="AnimationNodeStateMachinePlayback" id=1] - [node name="World" type="Node2D"] script = ExtResource( 2 ) @@ -28,7 +21,7 @@ region_enabled = true region_rect = Rect2( 0, 0, 1280, 720 ) [node name="Background" parent="." instance=ExtResource( 7 )] -frame = 49 +frame = 20 [node name="FloorTileMap" type="TileMap" parent="."] visible = false @@ -38,7 +31,6 @@ cell_size = Vector2( 32, 32 ) collision_layer = 2 collision_mask = 0 format = 1 - tile_data = PoolIntArray( -1, -1610612689, 4, -65536, -1610612689, 196609, -65535, -1610612689, 196609, -65534, -1610612689, 196609, -65533, -1610612689, 196609, -65532, -1610612689, 196609, -65531, -1610612689, 196609, -65530, -1610612689, 196609, -65529, -1610612689, 196609, -65528, -1610612689, 196609, -65527, -1610612689, 196609, -65526, -1610612689, 196609, -65525, -1610612689, 196609, -65524, -1610612689, 196609, -65523, -1610612689, 196610, -65522, -1610612720, 131073, 65535, -1610612689, 65539, 14, -1610612689, 3, 131071, 47, 65539, 65550, -1610612689, 65539, 196607, 47, 65539, 131086, -1610612689, 65539, 262143, 47, 65539, 196622, -1610612689, 65539, 327679, 47, 65539, 262158, -1610612689, 65539, 393215, 47, 65539, 327694, -1610612689, 65539, 458751, -1610612689, 131076, 393216, -1610612689, 1, 393217, -1610612689, 1, 393218, -1610612689, 1, 393219, -1610612689, 1, 393220, -1610612689, 1, 393221, -1610612689, 1, 393222, -1610612689, 1, 393223, -1610612689, 1, 393224, -1610612689, 1, 393225, -1610612689, 1, 393226, -1610612689, 1, 393227, -1610612689, 1, 393228, -1610612689, 1, 393229, -1610612689, 1, 393230, -1610612689, 131079, 524287, -1610612689, 131072, 458752, 47, 131073, 458753, 47, 131073, 458754, 47, 131073, 458755, 47, 131073, 458756, 47, 131073, 458757, 47, 131073, 458758, 47, 131073, 458759, 47, 131073, 458760, 47, 131073, 458761, 47, 131073, 458762, 47, 131073, 458763, 47, 131073, 458764, 47, 131073, 458765, 47, 131073, 458766, -1610612689, 131074 ) __meta__ = { "_edit_group_": true, @@ -47,14 +39,12 @@ __meta__ = { [node name="YSort" type="YSort" parent="."] - [node name="Bonfire" parent="YSort" instance=ExtResource( 10 )] position = Vector2( 265.543, -16 ) [node name="Player" parent="YSort" instance=ExtResource( 1 )] position = Vector2( 344, 125.768 ) scale = Vector2( 2, 2 ) -debug = true ROLL_SPEED = 140 FRICTION = 200 @@ -69,4 +59,3 @@ position = Vector2( 104, 80 ) visible = false [node name="DragNDropUI" parent="CanvasLayer" instance=ExtResource( 5 )] -