From 61f9c43d813ba4ad5d0ab798dd88d56fb6527723 Mon Sep 17 00:00:00 2001 From: Sagi Dayan Date: Fri, 27 Nov 2020 23:08:47 -0500 Subject: [PATCH] Exit for Area11 and Area12 template --- src/Actors/Player.tscn | 1 + src/GameWorld/AmbiantLighting.gd | 3 +- src/GameWorld/GameWorld.gd | 5 +- src/GameWorld/Levels/Area1/Area11.tscn | 7 +- src/GameWorld/Levels/Area1/Area12.gd | 8 ++ src/GameWorld/Levels/Area1/Area12.tscn | 120 +++++++++++++++++++++++++ src/GameWorld/Levels/Level.gd | 14 ++- src/Scripts/WarpZone.gd | 11 ++- 8 files changed, 159 insertions(+), 10 deletions(-) create mode 100644 src/GameWorld/Levels/Area1/Area12.gd create mode 100644 src/GameWorld/Levels/Area1/Area12.tscn diff --git a/src/Actors/Player.tscn b/src/Actors/Player.tscn index 6c80a51..780afee 100644 --- a/src/Actors/Player.tscn +++ b/src/Actors/Player.tscn @@ -744,6 +744,7 @@ wait_time = 0.12 one_shot = true [node name="DashParticlesLeft" parent="." instance=ExtResource( 3 )] +light_mask = 14 [node name="DashParticlesRight" parent="." instance=ExtResource( 1 )] diff --git a/src/GameWorld/AmbiantLighting.gd b/src/GameWorld/AmbiantLighting.gd index 8dff15d..40939a7 100644 --- a/src/GameWorld/AmbiantLighting.gd +++ b/src/GameWorld/AmbiantLighting.gd @@ -4,7 +4,8 @@ extends Node2D var LIGHTS = { "DAY": Color(1, 1, 1, 1), "NIGHT": Color(0.678431, 0.576471, 0.576471), - "AREA1": Color(0.639216, 0.666667, 0.635294) + "AREA1": Color(0.639216, 0.666667, 0.635294), + "AREA2": Color(0.639216, 0.966667, 0.635294) } export var _current_light = 'DAY' diff --git a/src/GameWorld/GameWorld.gd b/src/GameWorld/GameWorld.gd index a035ac3..babd547 100644 --- a/src/GameWorld/GameWorld.gd +++ b/src/GameWorld/GameWorld.gd @@ -8,7 +8,8 @@ var _level_resources := { "hub" : load("res://src/GameWorld/Levels/WorldHub.tscn"), "zones": { 1: [ - load("res://src/GameWorld/Levels/Area1/Area11.tscn") + load("res://src/GameWorld/Levels/Area1/Area11.tscn"), + load("res://src/GameWorld/Levels/Area1/Area12.tscn") ], 2: [ @@ -20,7 +21,7 @@ var _level_resources := { } var _levels = [ - [_level_resources.pre_game, _level_resources.zones[1][0]], + [_level_resources.pre_game, _level_resources.zones[1][0], _level_resources.zones[1][1]], ] diff --git a/src/GameWorld/Levels/Area1/Area11.tscn b/src/GameWorld/Levels/Area1/Area11.tscn index bd12b60..1a89fc2 100644 --- a/src/GameWorld/Levels/Area1/Area11.tscn +++ b/src/GameWorld/Levels/Area1/Area11.tscn @@ -73,11 +73,11 @@ scale = Vector2( 2, 2 ) texture = ExtResource( 12 ) [node name="Light2D" type="Light2D" parent="BG/Sprite"] -position = Vector2( -31.1, 25.3 ) +position = Vector2( -29.425, 25.15 ) texture = ExtResource( 2 ) texture_scale = 5.0 color = Color( 0.227451, 0.419608, 1, 1 ) -energy = 1.566 +energy = 1.628 range_item_cull_mask = 2048 [node name="AnimationPlayer" type="AnimationPlayer" parent="BG/Sprite"] @@ -146,6 +146,9 @@ position = Vector2( 392, 336 ) position = Vector2( -33, -1 ) is_exit = false +[node name="Exit" parent="." instance=ExtResource( 4 )] +position = Vector2( 857, 177 ) + [node name="Enemies" type="Node2D" parent="."] position = Vector2( 417, 320 ) diff --git a/src/GameWorld/Levels/Area1/Area12.gd b/src/GameWorld/Levels/Area1/Area12.gd new file mode 100644 index 0000000..4da1aa9 --- /dev/null +++ b/src/GameWorld/Levels/Area1/Area12.gd @@ -0,0 +1,8 @@ +extends Level + +# func ready() -> void: + + +func _enter_tree() -> void: + AudioManager.play_music(AudioManager.Music.Abandon) + AmbiantLighting.change_light("AREA2") \ No newline at end of file diff --git a/src/GameWorld/Levels/Area1/Area12.tscn b/src/GameWorld/Levels/Area1/Area12.tscn new file mode 100644 index 0000000..044e897 --- /dev/null +++ b/src/GameWorld/Levels/Area1/Area12.tscn @@ -0,0 +1,120 @@ +[gd_scene load_steps=11 format=2] + +[ext_resource path="res://src/GameWorld/Levels/Area1/Area12.gd" type="Script" id=1] +[ext_resource path="res://assets/Items/torch_ligt_texture.png" type="Texture" id=2] +[ext_resource path="res://assets/Tiles/SolidsTileMap.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/Scripts/WarpZone.tscn" type="PackedScene" id=4] +[ext_resource path="res://assets/Tiles/TrapTiles.tscn" type="PackedScene" id=5] +[ext_resource path="res://assets/Tiles/SemiSolidsTileMap.tscn" type="PackedScene" id=6] +[ext_resource path="res://assets/Levels/Test/bg_1.png" type="Texture" id=11] +[ext_resource path="res://assets/Levels/Test/bg_0.png" type="Texture" id=12] +[ext_resource path="res://assets/Tiles/FakeSolidsTileMap.tscn" type="PackedScene" id=19] + +[sub_resource type="Animation" id=1] +resource_name = "idle" +length = 10.0 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Light2D:energy") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 5 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ 1.69, 1.07 ] +} +tracks/1/type = "value" +tracks/1/path = NodePath("Light2D:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0, 5 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 0, +"values": [ Vector2( -27.75, 25 ), Vector2( -44.5, 26.5 ) ] +} + +[node name="Area12" type="Node2D"] +script = ExtResource( 1 ) +__meta__ = { +"_edit_horizontal_guides_": [ 494.0 ], +"_edit_vertical_guides_": [ 1498.0, 835.0 ] +} +camer_limits = { +"bottom": 495, +"left": -10, +"right": 838, +"top": -280 +} + +[node name="BG" type="Node2D" parent="."] +position = Vector2( 391, 111 ) +scale = Vector2( 2, 2 ) + +[node name="Sprite" type="Sprite" parent="BG"] +modulate = Color( 0.266667, 0.360784, 0.411765, 1 ) +light_mask = 2048 +scale = Vector2( 2, 2 ) +texture = ExtResource( 12 ) + +[node name="Light2D" type="Light2D" parent="BG/Sprite"] +position = Vector2( -29.425, 25.15 ) +texture = ExtResource( 2 ) +texture_scale = 5.0 +color = Color( 0.227451, 0.419608, 1, 1 ) +energy = 1.628 +range_item_cull_mask = 2048 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="BG/Sprite"] +autoplay = "idle" +anims/idle = SubResource( 1 ) + +[node name="Sprite2" type="Sprite" parent="BG"] +modulate = Color( 0.266667, 0.360784, 0.411765, 1 ) +light_mask = 0 +scale = Vector2( 2, 2 ) +texture = ExtResource( 11 ) + +[node name="Tiles" type="Node2D" parent="."] + +[node name="SemiSolidsTileMap" parent="Tiles" instance=ExtResource( 6 )] + +[node name="SemiSolidsTileMap2" parent="Tiles" instance=ExtResource( 6 )] + +[node name="TrapTiles" parent="Tiles" instance=ExtResource( 5 )] + +[node name="SolidsTileMap" parent="Tiles" instance=ExtResource( 3 )] +collision_layer = 8 +tile_data = PoolIntArray( 0, 0, 0, 1, 0, 1, 2, 0, 131076, 3, 0, 1, 4, 0, 131076, 5, 0, 131076, 6, 0, 131076, 7, 0, 1, 8, 0, 131076, 9, 0, 131076, 10, 0, 1, 11, 0, 1, 12, 0, 131076, 13, 0, 1, 14, 0, 131076, 15, 0, 131076, 16, 0, 131076, 17, 0, 131076, 18, 0, 131076, 19, 0, 1, 20, 0, 1, 21, 0, 1, 22, 0, 1, 23, 0, 1, 24, 0, 131076, 25, 0, 1, 26, 0, 1, 27, 0, 1, 28, 0, 131076, 29, 0, 1, 30, 0, 1, 31, 0, 131076, 32, 0, 131076, 33, 0, 131076, 34, 0, 131076, 35, 0, 131076, 36, 0, 1, 37, 0, 131076, 38, 0, 1, 39, 0, 131076, 40, 0, 1, 41, 0, 1, 42, 0, 131076, 43, 0, 1, 44, 0, 131076, 45, 0, 131076, 46, 0, 131076, 47, 0, 1, 48, 0, 131076, 49, 0, 1, 50, 0, 1, 51, 0, 2, 65536, 0, 65541, 65537, 0, 65537, 65538, 0, 65537, 65539, 0, 65537, 65540, 0, 65537, 65541, 0, 65537, 65542, 0, 65537, 65543, 0, 65537, 65544, 0, 65537, 65545, 0, 65537, 65546, 0, 65537, 65547, 0, 65537, 65548, 0, 65537, 65549, 0, 65537, 65550, 0, 65537, 65551, 0, 65537, 65552, 0, 65537, 65553, 0, 65537, 65554, 0, 65537, 65555, 0, 65537, 65556, 0, 65537, 65557, 0, 65537, 65558, 0, 65537, 65559, 0, 65537, 65560, 0, 65537, 65561, 0, 65537, 65562, 0, 65537, 65563, 0, 65537, 65564, 0, 65537, 65565, 0, 65537, 65566, 0, 65537, 65567, 0, 65537, 65568, 0, 65537, 65569, 0, 65537, 65570, 0, 65537, 65571, 0, 65537, 65572, 0, 65537, 65573, 0, 65537, 65574, 0, 65537, 65575, 0, 65537, 65576, 0, 65537, 65577, 0, 65537, 65578, 0, 65537, 65579, 0, 65537, 65580, 0, 65537, 65581, 0, 65537, 65582, 0, 65537, 65583, 0, 65537, 65584, 0, 65537, 65585, 0, 65537, 65586, 0, 65537, 65587, 0, 65539, 131072, 0, 65541, 131073, 0, 65537, 131074, 0, 65537, 131075, 0, 65537, 131076, 0, 65537, 131077, 0, 65537, 131078, 0, 65537, 131079, 0, 65537, 131080, 0, 65537, 131081, 0, 65537, 131082, 0, 65537, 131083, 0, 65537, 131084, 0, 65537, 131085, 0, 65537, 131086, 0, 65537, 131087, 0, 65537, 131088, 0, 65537, 131089, 0, 65537, 131090, 0, 65537, 131091, 0, 65537, 131092, 0, 65537, 131093, 0, 65537, 131094, 0, 65537, 131095, 0, 65537, 131096, 0, 65537, 131097, 0, 65537, 131098, 0, 65537, 131099, 0, 65537, 131100, 0, 65537, 131101, 0, 65537, 131102, 0, 65537, 131103, 0, 65537, 131104, 0, 65537, 131105, 0, 65537, 131106, 0, 65537, 131107, 0, 65537, 131108, 0, 65537, 131109, 0, 65537, 131110, 0, 65537, 131111, 0, 65537, 131112, 0, 65537, 131113, 0, 65537, 131114, 0, 65537, 131115, 0, 65537, 131116, 0, 65537, 131117, 0, 65537, 131118, 0, 65537, 131119, 0, 65537, 131120, 0, 65537, 131121, 0, 65537, 131122, 0, 65537, 131123, 0, 65538, 196608, 0, 65541, 196609, 0, 65537, 196610, 0, 65537, 196611, 0, 65537, 196612, 0, 65537, 196613, 0, 65537, 196614, 0, 65537, 196615, 0, 65537, 196616, 0, 65537, 196617, 0, 65537, 196618, 0, 65537, 196619, 0, 65537, 196620, 0, 65537, 196621, 0, 65537, 196622, 0, 65537, 196623, 0, 65537, 196624, 0, 65537, 196625, 0, 65537, 196626, 0, 65537, 196627, 0, 65537, 196628, 0, 65537, 196629, 0, 65537, 196630, 0, 65537, 196631, 0, 65537, 196632, 0, 65537, 196633, 0, 65537, 196634, 0, 65537, 196635, 0, 65537, 196636, 0, 65537, 196637, 0, 65537, 196638, 0, 65537, 196639, 0, 65537, 196640, 0, 65537, 196641, 0, 65537, 196642, 0, 65537, 196643, 0, 65537, 196644, 0, 65537, 196645, 0, 65537, 196646, 0, 65537, 196647, 0, 65537, 196648, 0, 65537, 196649, 0, 65537, 196650, 0, 65537, 196651, 0, 65537, 196652, 0, 65537, 196653, 0, 65537, 196654, 0, 65537, 196655, 0, 65537, 196656, 0, 65537, 196657, 0, 65537, 196658, 0, 65537, 196659, 0, 65538, 262144, 0, 65541, 262145, 0, 65537, 262146, 0, 65537, 262147, 0, 65537, 262148, 0, 65537, 262149, 0, 65537, 262150, 0, 65537, 262151, 0, 65537, 262152, 0, 65537, 262153, 0, 65537, 262154, 0, 65537, 262155, 0, 65537, 262156, 0, 65537, 262157, 0, 65537, 262158, 0, 65537, 262159, 0, 65537, 262160, 0, 65537, 262161, 0, 65537, 262162, 0, 65537, 262163, 0, 65537, 262164, 0, 65537, 262165, 0, 65537, 262166, 0, 65537, 262167, 0, 65537, 262168, 0, 65537, 262169, 0, 65537, 262170, 0, 65537, 262171, 0, 65537, 262172, 0, 65537, 262173, 0, 65537, 262174, 0, 65537, 262175, 0, 65537, 262176, 0, 65537, 262177, 0, 65537, 262178, 0, 65537, 262179, 0, 65537, 262180, 0, 65537, 262181, 0, 65537, 262182, 0, 65537, 262183, 0, 65537, 262184, 0, 65537, 262185, 0, 65537, 262186, 0, 65537, 262187, 0, 65537, 262188, 0, 65537, 262189, 0, 65537, 262190, 0, 65537, 262191, 0, 65537, 262192, 0, 65537, 262193, 0, 65537, 262194, 0, 65537, 262195, 0, 65538, 327680, 0, 65536, 327681, 0, 65537, 327682, 0, 65537, 327683, 0, 65537, 327684, 0, 65537, 327685, 0, 65537, 327686, 0, 65537, 327687, 0, 65537, 327688, 0, 65537, 327689, 0, 65537, 327690, 0, 65537, 327691, 0, 65537, 327692, 0, 65537, 327693, 0, 65537, 327694, 0, 65537, 327695, 0, 65537, 327696, 0, 65537, 327697, 0, 65537, 327698, 0, 65537, 327699, 0, 65537, 327700, 0, 65537, 327701, 0, 65537, 327702, 0, 65537, 327703, 0, 65537, 327704, 0, 65537, 327705, 0, 65537, 327706, 0, 65537, 327707, 0, 65537, 327708, 0, 65537, 327709, 0, 65537, 327710, 0, 65537, 327711, 0, 65537, 327712, 0, 65537, 327713, 0, 65537, 327714, 0, 65537, 327715, 0, 65537, 327716, 0, 65537, 327717, 0, 65537, 327718, 0, 65537, 327719, 0, 65537, 327720, 0, 65537, 327721, 0, 65537, 327722, 0, 65537, 327723, 0, 65537, 327724, 0, 65537, 327725, 0, 65537, 327726, 0, 65537, 327727, 0, 65537, 327728, 0, 65537, 327729, 0, 65537, 327730, 0, 65537, 327731, 0, 65539, 393216, 0, 65536, 393217, 0, 65537, 393218, 0, 3, 393219, 0, 131073, 393220, 0, 131073, 393221, 0, 131073, 393222, 0, 131073, 393223, 0, 131073, 393224, 0, 131073, 393225, 0, 4, 393226, 0, 131073, 393227, 0, 131073, 393228, 0, 4, 393229, 0, 131073, 393230, 0, 4, 393231, 0, 4, 393232, 0, 4, 393233, 0, 131073, 393234, 0, 131073, 393235, 0, 4, 393236, 0, 131073, 393237, 0, 131073, 393238, 0, 4, 393239, 0, 4, 393240, 0, 4, 393241, 0, 4, 393242, 0, 4, 393243, 0, 131073, 393244, 0, 131073, 393245, 0, 131073, 393246, 0, 131073, 393247, 0, 4, 393248, 0, 131073, 393249, 0, 131073, 393250, 0, 131073, 393251, 0, 4, 393252, 0, 4, 393253, 0, 4, 393254, 0, 131073, 393255, 0, 131073, 393256, 0, 131073, 393257, 0, 4, 393258, 0, 4, 393259, 0, 4, 393260, 0, 4, 393261, 0, 4, 393262, 0, 131073, 393263, 0, 4, 393264, 0, 4, 393265, 0, 4, 393266, 0, 5, 393267, 0, 65539, 524282, 0, 0, 524283, 0, 131076, 524284, 0, 1, 524285, 0, 1, 524286, 0, 1, 524287, 0, 1, 458752, 0, 131077, 458753, 0, 65537, 458754, 0, 65538, 458802, 0, 65541, 458803, 0, 65538, 589818, 0, 65536, 589819, 0, 65537, 589820, 0, 65537, 589821, 0, 65537, 589822, 0, 65537, 589823, 0, 65537, 524288, 0, 65537, 524289, 0, 65537, 524290, 0, 65539, 524338, 0, 65541, 524339, 0, 65539, 655354, 0, 65536, 655355, 0, 65537, 655356, 0, 65537, 655357, 0, 65537, 655358, 0, 65537, 655359, 0, 65537, 589824, 0, 65537, 589825, 0, 65537, 589826, 0, 65539, 589874, 0, 65541, 589875, 0, 65539, 720890, 0, 65541, 720891, 0, 65537, 720892, 0, 65537, 720893, 0, 65537, 720894, 0, 65537, 720895, 0, 65537, 655360, 0, 65537, 655361, 0, 65537, 655362, 0, 65538, 655410, 0, 65541, 655411, 0, 65539, 786426, 0, 65541, 786427, 0, 65537, 786428, 0, 65537, 786429, 0, 65537, 786430, 0, 65537, 786431, 0, 65537, 720896, 0, 3, 720897, 0, 4, 720898, 0, 131074, 720946, 0, 65536, 720947, 0, 65539, 851962, 0, 65536, 851963, 0, 65537, 851964, 0, 65537, 851965, 0, 65537, 851966, 0, 65537, 851967, 0, 65537, 786432, 0, 65538, 786482, 0, 65541, 786483, 0, 65538, 917498, 0, 65541, 917499, 0, 65537, 917500, 0, 65537, 917501, 0, 65537, 917502, 0, 65537, 917503, 0, 65537, 851968, 0, 65539, 852018, 0, 65536, 852019, 0, 65539, 983034, 0, 65541, 983035, 0, 65537, 983036, 0, 3, 983037, 0, 4, 983038, 0, 131073, 983039, 0, 4, 917504, 0, 131074, 917554, 0, 65536, 917555, 0, 65538, 1048570, 0, 65536, 1048571, 0, 65537, 1048572, 0, 65538, 983090, 0, 65541, 983091, 0, 65539, 1114106, 0, 65541, 1114107, 0, 65537, 1114108, 0, 65539, 1048626, 0, 65541, 1048627, 0, 65538, 1179642, 0, 65541, 1179643, 0, 65537, 1179644, 0, 131075, 1179645, 0, 131076, 1179646, 0, 131076, 1179647, 0, 1, 1114112, 0, 1, 1114113, 0, 1, 1114114, 0, 1, 1114115, 0, 131076, 1114116, 0, 131076, 1114117, 0, 1, 1114118, 0, 1, 1114119, 0, 1, 1114120, 0, 1, 1114121, 0, 131076, 1114122, 0, 131076, 1114123, 0, 1, 1114124, 0, 131076, 1114125, 0, 131076, 1114126, 0, 131076, 1114127, 0, 131076, 1114128, 0, 1, 1114129, 0, 131076, 1114130, 0, 131076, 1114131, 0, 1, 1114132, 0, 131076, 1114133, 0, 1, 1114134, 0, 131076, 1114135, 0, 131076, 1114136, 0, 131076, 1114137, 0, 131076, 1114138, 0, 131076, 1114139, 0, 1, 1114140, 0, 131076, 1114141, 0, 1, 1114142, 0, 131076, 1114143, 0, 1, 1114144, 0, 131076, 1114145, 0, 131076, 1114146, 0, 131076, 1114147, 0, 1, 1114148, 0, 131076, 1114149, 0, 131076, 1114150, 0, 1, 1114151, 0, 1, 1114152, 0, 1, 1114153, 0, 131076, 1114154, 0, 1, 1114155, 0, 131076, 1114156, 0, 131076, 1114157, 0, 1, 1114158, 0, 1, 1114159, 0, 131076, 1114160, 0, 1, 1114161, 0, 1, 1114162, 0, 131077, 1114163, 0, 65538, 1245178, 0, 65541, 1245179, 0, 65537, 1245180, 0, 65537, 1245181, 0, 65537, 1245182, 0, 65537, 1245183, 0, 65537, 1179648, 0, 65537, 1179649, 0, 65537, 1179650, 0, 65537, 1179651, 0, 65537, 1179652, 0, 65537, 1179653, 0, 65537, 1179654, 0, 65537, 1179655, 0, 65537, 1179656, 0, 65537, 1179657, 0, 65537, 1179658, 0, 65537, 1179659, 0, 65537, 1179660, 0, 65537, 1179661, 0, 65537, 1179662, 0, 65537, 1179663, 0, 65537, 1179664, 0, 65537, 1179665, 0, 65537, 1179666, 0, 65537, 1179667, 0, 65537, 1179668, 0, 65537, 1179669, 0, 65537, 1179670, 0, 65537, 1179671, 0, 65537, 1179672, 0, 65537, 1179673, 0, 65537, 1179674, 0, 65537, 1179675, 0, 65537, 1179676, 0, 65537, 1179677, 0, 65537, 1179678, 0, 65537, 1179679, 0, 65537, 1179680, 0, 65537, 1179681, 0, 65537, 1179682, 0, 65537, 1179683, 0, 65537, 1179684, 0, 65537, 1179685, 0, 65537, 1179686, 0, 65537, 1179687, 0, 65537, 1179688, 0, 65537, 1179689, 0, 65537, 1179690, 0, 65537, 1179691, 0, 65537, 1179692, 0, 65537, 1179693, 0, 65537, 1179694, 0, 65537, 1179695, 0, 65537, 1179696, 0, 65537, 1179697, 0, 65537, 1179698, 0, 65537, 1179699, 0, 65539, 1310714, 0, 131072, 1310715, 0, 4, 1310716, 0, 4, 1310717, 0, 4, 1310718, 0, 4, 1310719, 0, 131073, 1245184, 0, 131073, 1245185, 0, 4, 1245186, 0, 131073, 1245187, 0, 131073, 1245188, 0, 131073, 1245189, 0, 4, 1245190, 0, 131073, 1245191, 0, 131073, 1245192, 0, 4, 1245193, 0, 131073, 1245194, 0, 4, 1245195, 0, 4, 1245196, 0, 131073, 1245197, 0, 131073, 1245198, 0, 131073, 1245199, 0, 4, 1245200, 0, 131073, 1245201, 0, 131073, 1245202, 0, 4, 1245203, 0, 4, 1245204, 0, 131073, 1245205, 0, 4, 1245206, 0, 131073, 1245207, 0, 131073, 1245208, 0, 4, 1245209, 0, 131073, 1245210, 0, 4, 1245211, 0, 131073, 1245212, 0, 131073, 1245213, 0, 131073, 1245214, 0, 4, 1245215, 0, 5, 1245216, 0, 65537, 1245217, 0, 65537, 1245218, 0, 65537, 1245219, 0, 65537, 1245220, 0, 65537, 1245221, 0, 65537, 1245222, 0, 65537, 1245223, 0, 65537, 1245224, 0, 65537, 1245225, 0, 65537, 1245226, 0, 65537, 1245227, 0, 65537, 1245228, 0, 65537, 1245229, 0, 65537, 1245230, 0, 65537, 1245231, 0, 65537, 1245232, 0, 65537, 1245233, 0, 65537, 1245234, 0, 65537, 1245235, 0, 65538, 1310751, 0, 131072, 1310752, 0, 4, 1310753, 0, 131073, 1310754, 0, 4, 1310755, 0, 131073, 1310756, 0, 131073, 1310757, 0, 4, 1310758, 0, 131073, 1310759, 0, 131073, 1310760, 0, 4, 1310761, 0, 131073, 1310762, 0, 4, 1310763, 0, 131073, 1310764, 0, 131073, 1310765, 0, 131073, 1310766, 0, 131073, 1310767, 0, 4, 1310768, 0, 4, 1310769, 0, 131073, 1310770, 0, 4, 1310771, 0, 131074 ) + +[node name="FakeSolidsTileMap" parent="Tiles" instance=ExtResource( 19 )] + +[node name="Coins" type="Node2D" parent="."] + +[node name="Tourches" type="Node2D" parent="."] + +[node name="Entrance" parent="." instance=ExtResource( 4 )] +position = Vector2( -33, 272 ) +is_exit = false + +[node name="Exit" parent="." instance=ExtResource( 4 )] +position = Vector2( 360, -242 ) + +[node name="Enemies" type="Node2D" parent="."] +position = Vector2( 417, 320 ) + +[node name="Hazards" type="Node2D" parent="."] +position = Vector2( 417, 320 ) +z_index = 1 + +[node name="Springs" type="Node2D" parent="."] + +[node name="Vases" type="Node2D" parent="."] +position = Vector2( 153, -16 ) + +[node name="Orbs" type="Node2D" parent="."] diff --git a/src/GameWorld/Levels/Level.gd b/src/GameWorld/Levels/Level.gd index 251cc95..994f885 100644 --- a/src/GameWorld/Levels/Level.gd +++ b/src/GameWorld/Levels/Level.gd @@ -35,6 +35,7 @@ func _ready(): func init_level_config(prev_level_:Vector2, level_coords_:Vector2): print("Initializing [%s]: prev = %s | current = %s" % [self.name, prev_level_, level_coords_]) + _set_warp_enabled(false) self.prev_level = prev_level_ self.level_coords = level_coords_ self.next_level = Vector2(level_coords.x, level_coords.y + 1) @@ -43,9 +44,11 @@ func init_level_config(prev_level_:Vector2, level_coords_:Vector2): func _set_active(activated:bool, is_entering:bool): print("Setting active [%s]: active = %s " % [self.name, activated]) is_active_level = activated + _set_warp_enabled(false) if activated: if _first_time_init: _set_wrap_zones() _set_player_position(is_entering) + _set_warp_enabled(true) emit_signal("level_ready") func set_player(player:Player): @@ -53,6 +56,7 @@ func set_player(player:Player): _player = player _camera = _player.get_camera() _set_camera_limits() + print("Level %s, adding player"% [self.name]) add_child(_player) @@ -94,9 +98,9 @@ func _set_wrap_zones(): if not has_custom_level: if not warp.is_exit: warp.to_level_coord = self.prev_level else: warp.to_level_coord = self.next_level - print("Warp has no costum level set to: %s" % [warp.to_level_coord]) + print("Warp %s has no costum level set to: %s" % [warp.name, warp.to_level_coord]) else: - print("Warp a costum level: %s" % [warp.to_level_coord]) + print("Warp %s a costum level: %s" % [warp.name, warp.to_level_coord]) func _on_WarpZone_player_entered(is_exit, to_level_coord) -> void: print("_on_WarpZone_player_entered is_exit=%s to_level=%s" % [is_exit, to_level_coord]) @@ -112,3 +116,9 @@ func _get_all_warps(): warps.push_back(node) print("_get_all_warps [%s]: #%d of warps found" % [self.name, len(warps)]) return warps + +func _set_warp_enabled(enabled:bool): + var warps = _get_all_warps() + for warp in warps: + print("Settings warp ENABLED=%s" % [enabled]) + warp.enabled(enabled) diff --git a/src/Scripts/WarpZone.gd b/src/Scripts/WarpZone.gd index 9472c33..c7694e5 100644 --- a/src/Scripts/WarpZone.gd +++ b/src/Scripts/WarpZone.gd @@ -7,6 +7,7 @@ export var to_level_coord:Vector2 = Vector2(-1, -1) export var is_exit:bool = true const spawn_offset = 30 +var _enabled:bool = false const NON_SPECIFIED_LEVEL :=Vector2(-1, -1) @@ -14,10 +15,14 @@ const NON_SPECIFIED_LEVEL :=Vector2(-1, -1) func _on_body_entered(body:Node): - if body.name == "Player" and get_parent().is_active_level: - print("Warp - exit=%s to_level=%s" % [is_exit, to_level_coord]) + if _enabled and body.name == "Player" and get_parent().is_active_level: + print("Warp %s in Level %s: exit=%s to_level=%s" % [name, get_parent().name, is_exit, to_level_coord]) + _enabled = false emit_signal("player_entered", is_exit, to_level_coord) func get_checkpoint_position(): var factor = -1 if is_exit else 1 - return position + Vector2(factor * spawn_offset, 0) \ No newline at end of file + return position + Vector2(factor * spawn_offset, 0) + +func enabled(enabled:bool): + _enabled = enabled \ No newline at end of file