diff options
Diffstat (limited to 'Scenes/Components')
| -rw-r--r-- | Scenes/Components/MapArea.gd | 6 | ||||
| -rw-r--r-- | Scenes/Components/TileMap.tscn | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Scenes/Components/MapArea.gd b/Scenes/Components/MapArea.gd index 31e567a..080a3f7 100644 --- a/Scenes/Components/MapArea.gd +++ b/Scenes/Components/MapArea.gd @@ -1,6 +1,8 @@ extends Area2D +signal transitioned_to + @export var can_plant_bomb: bool = true @@ -80,13 +82,15 @@ func _on_player_entered(player: Player): position_tween = get_tree().create_tween() position_tween.tween_property( - player, "global_position", player.global_position + player.DIRECTION * 16, 1.25 + player, "global_position", player.global_position + player.DIRECTION * (16 + 8), 1.25 ) position_tween.tween_callback(func(): exited_area.get_node("TileMap").visible = false sprite_tween.kill() sprite.play("idle_" + sprite_direction) exited_area.set_collision_mask_value(Utilities.Collision.Layer.PLAYER, true) + + transitioned_to.emit() ) Global.last_area = self diff --git a/Scenes/Components/TileMap.tscn b/Scenes/Components/TileMap.tscn index 469c501..2c2cd07 100644 --- a/Scenes/Components/TileMap.tscn +++ b/Scenes/Components/TileMap.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=34 format=3 uid="uid://d0t04jox4oxsv"] +[gd_scene load_steps=36 format=3 uid="uid://d0t04jox4oxsv"] [ext_resource type="Texture2D" uid="uid://5dk0c1kpvdgs" path="res://Assets/bomb_party_v4.png" id="1_aov43"] [ext_resource type="PackedScene" uid="uid://bugyo0c505kdw" path="res://Scenes/Entities/Objects/Box.tscn" id="1_fy8qx"] @@ -9,8 +9,10 @@ [ext_resource type="Texture2D" uid="uid://dnsxr8sq7ap0j" path="res://Assets/Stages/core_buildings.png" id="4_gspqb"] [ext_resource type="PackedScene" uid="uid://cv64e7fpdi2a2" path="res://Scenes/Components/Teleport.tscn" id="4_kheyh"] [ext_resource type="Texture2D" uid="uid://cctukh2hhfgty" path="res://Assets/Stages/core_outdoor_nature.png" id="5_8fova"] +[ext_resource type="PackedScene" uid="uid://bpg6ye1abah3g" path="res://Scenes/Entities/Enemies/Snake.tscn" id="5_8wsnm"] [ext_resource type="PackedScene" uid="uid://ccolri3egf8rk" path="res://Scenes/Entities/Enemies/Balloon.tscn" id="5_cpm0i"] [ext_resource type="Texture2D" uid="uid://b6ce2eihxulqb" path="res://Assets/Stages/core_set pieces.png" id="6_gvcvm"] +[ext_resource type="PackedScene" uid="uid://c2l6n3sjgpy5" path="res://Scenes/Entities/Enemies/Statue.tscn" id="6_id2ef"] [ext_resource type="PackedScene" uid="uid://d3evry1ketf0s" path="res://Scenes/Entities/Enemies/Slime.tscn" id="6_qh3x8"] [ext_resource type="PackedScene" uid="uid://bjgcrqdntj5hl" path="res://Scenes/Entities/Enemies/Tree.tscn" id="7_1lwuk"] [ext_resource type="PackedScene" uid="uid://12suyw87jcsi" path="res://Scenes/Entities/Objects/Grass.tscn" id="8_7pjkp"] @@ -5671,6 +5673,8 @@ scenes/7/scene = ExtResource("9_iejml") scenes/8/scene = ExtResource("10_6syxy") scenes/9/scene = ExtResource("12_tsgx0") scenes/10/scene = ExtResource("4_5twow") +scenes/11/scene = ExtResource("5_8wsnm") +scenes/12/scene = ExtResource("6_id2ef") [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_6k602"] texture = ExtResource("4_gspqb") @@ -12896,6 +12900,7 @@ texture = ExtResource("5_8fova") 13:0/0/physics_layer_1/linear_velocity = Vector2(0, 0) 13:0/0/physics_layer_1/angular_velocity = 0.0 14:0/0 = 0 +14:0/0/y_sort_origin = -5 14:0/0/physics_layer_0/linear_velocity = Vector2(0, 0) 14:0/0/physics_layer_0/angular_velocity = 0.0 14:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -5.25, 8, -5.125, 8, -8, -8, -8) @@ -13222,6 +13227,7 @@ texture = ExtResource("5_8fova") 13:1/0/physics_layer_1/linear_velocity = Vector2(0, 0) 13:1/0/physics_layer_1/angular_velocity = 0.0 14:1/0 = 0 +14:1/0/y_sort_origin = -8 14:1/0/physics_layer_0/linear_velocity = Vector2(0, 0) 14:1/0/physics_layer_0/angular_velocity = 0.0 14:1/0/physics_layer_1/linear_velocity = Vector2(0, 0) @@ -13840,6 +13846,7 @@ texture = ExtResource("5_8fova") 13:3/0/physics_layer_1/linear_velocity = Vector2(0, 0) 13:3/0/physics_layer_1/angular_velocity = 0.0 14:3/0 = 0 +14:3/0/y_sort_origin = -8 14:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) 14:3/0/physics_layer_0/angular_velocity = 0.0 14:3/0/physics_layer_1/linear_velocity = Vector2(0, 0) |