diff --git a/Map/map0.tscn b/Map/map0.tscn index f4fcab0..a7a85ea 100644 --- a/Map/map0.tscn +++ b/Map/map0.tscn @@ -1,22 +1,38 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=8 format=2] -[ext_resource path="res://Scene/Stage/Stage.tscn" type="PackedScene" id=1] +[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=1] [ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=3] +[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=5] +[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=8] -[node name="Stage" instance=ExtResource( 1 )] +[node name="Stage" type="Node2D"] +script = ExtResource( 1 ) -[node name="SolidTileMap" parent="." index="0"] +[node name="SolidTileMap" parent="." instance=ExtResource( 3 )] tile_data = PoolIntArray( 65529, 0, 65538, 65530, 0, 65536, 65531, 0, 65538, 65532, 0, 0, 65533, 0, 0, 65534, 0, 65537, 65535, 0, 0, 0, 0, 0, 1, 0, 65538, 2, 0, 0, 3, 0, 65537, 4, 0, 0, 5, 0, 0, 6, 0, 196609 ) -[node name="DetailTileMap" parent="." index="2"] +[node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] +z_as_relative = false + +[node name="DetailTileMap" parent="." instance=ExtResource( 6 )] tile_data = PoolIntArray( -262145, 2, 0, -327680, 0, 0, -327679, -1610612734, 0, -196609, 0, 0, -262144, 0, 0, -262143, 0, 0, -131073, -1073741822, 0, -196608, 0, 0, -196607, 1610612738, 0, -131072, 1, 0, -7, 2, 0, -6, 0, 0, -5, -1610612734, 0, -65536, 1, 0, -65535, -1610612734, 0, 131070, 1, 0, 196606, 1610612736, 0 ) -[node name="DetailTileMap2" parent="." index="3"] +[node name="DetailTileMap2" parent="." instance=ExtResource( 6 )] +z_index = -11 tile_data = PoolIntArray( -131075, 4, 4, -196604, 4, 4, -65540, 4, 65539, -65539, 4, 196608, -65538, 4, 6, -131069, 4, 196613, -131068, 4, 0, -131067, 4, 131078, -4, 4, 131075, -3, 4, 131072, -2, 4, 131078, -65533, 4, 131077, -65532, 4, 0, -65531, 4, 131076, 131066, 4, 65541, 131067, 4, 131073, 131068, 4, 65537, 131069, 4, 0, 131070, 4, 65538, 131071, 4, 65537, 65536, 4, 0, 65537, 4, 65536, 65538, 4, 0, 65539, 4, 65537, 65540, 4, 65538, 65541, 4, 196608, 65542, 4, 196614, 196604, 4, 5, 196605, 4, 0, 196606, 4, 0, 196607, 4, 131073, 131072, 4, 0, 131073, 4, 65538, 131074, 4, 0, 131075, 4, 196609, 131076, 4, 196612 ) -[node name="Player" parent="Actors" index="0" instance=ExtResource( 2 )] +[node name="GameCamera" parent="." instance=ExtResource( 4 )] +smoothing_enabled = false +editor_draw_drag_margin = false +target_influence = 0.3 + +[node name="Actors" type="Node2D" parent="."] + +[node name="Player" parent="Actors" instance=ExtResource( 2 )] position = Vector2( -37, -8 ) -[node name="Exit" parent="Actors" index="1" instance=ExtResource( 8 )] +[node name="Exit" parent="Actors" instance=ExtResource( 8 )] position = Vector2( 33, -11 ) diff --git a/Map/map1.tscn b/Map/map1.tscn index 42dc37a..10ca3ff 100644 --- a/Map/map1.tscn +++ b/Map/map1.tscn @@ -1,25 +1,39 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=8 format=2] -[ext_resource path="res://Scene/Stage/Stage.tscn" type="PackedScene" id=1] +[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=1] [ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=3] +[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=5] +[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=8] -[node name="Stage" instance=ExtResource( 1 )] +[node name="Stage" type="Node2D"] +script = ExtResource( 1 ) -[node name="SolidTileMap" parent="." index="0"] +[node name="SolidTileMap" parent="." instance=ExtResource( 3 )] tile_data = PoolIntArray( 65528, 0, 65538, 65529, 0, 65536, 65530, 0, 65538, 65531, 0, 196609, 65532, 0, 65538, 65533, 0, 1, 2, 0, 65538, 3, 0, 65536, 4, 0, 1, 5, 0, 196608, 6, 0, 65538, 7, 0, 65536, 131069, 0, 131073, 131070, 0, 1, 131071, 0, 65536, 65536, 0, 65538, 65537, 0, 2, 65538, 0, 196609 ) -[node name="SpikeTileMap" parent="." index="1"] +[node name="SpikeTileMap" parent="." instance=ExtResource( 6 )] +z_as_relative = false tile_data = PoolIntArray( 65534, 0, 0, 65535, 0, 0, 0, 0, 0, 1, 0, 0 ) -[node name="DetailTileMap" parent="." index="2"] +[node name="DetailTileMap" parent="." instance=ExtResource( 4 )] tile_data = PoolIntArray( -262141, 2, 0, -262140, 0, 0, -262139, -1610612734, 0, -196605, -1073741822, 0, -196604, 0, 0, -196603, 1610612738, 0, -131068, 1, 0, -65536, 0, 0, -65532, 1, 0, -65531, 2, 0, -65530, 0, 0, -65529, -1610612734, 0, 0, 1, 0 ) -[node name="DetailTileMap2" parent="." index="3"] +[node name="DetailTileMap2" parent="." instance=ExtResource( 4 )] +z_index = -11 tile_data = PoolIntArray( -131078, 4, 4, -65543, 4, 65539, -65542, 4, 131072, -65541, 4, 65540, -7, 4, 131075, -6, 4, 1, -5, 4, 131076, 131065, 4, 5, 131066, 4, 1, 131067, 4, 65538, 131068, 4, 1, 65539, 4, 65538, 65540, 4, 1, 65541, 4, 65537, 65542, 4, 196614, 196603, 4, 196611, 196604, 4, 1, 196605, 4, 65536, 196606, 4, 2, 196607, 4, 1, 131072, 4, 131072, 131073, 4, 1, 131074, 4, 2, 131075, 4, 65538, 131076, 4, 65540, 262141, 4, 65539, 262142, 4, 196609, 262143, 4, 65537, 196608, 4, 0, 196609, 4, 0, 196610, 4, 131076 ) -[node name="Player" parent="Actors" index="0" instance=ExtResource( 2 )] +[node name="GameCamera" parent="." instance=ExtResource( 5 )] +smoothing_enabled = false +editor_draw_drag_margin = false +target_influence = 0.3 + +[node name="Actors" type="Node2D" parent="."] + +[node name="Player" parent="Actors" instance=ExtResource( 2 )] position = Vector2( -48, -8 ) -[node name="Exit" parent="Actors" index="1" instance=ExtResource( 8 )] +[node name="Exit" parent="Actors" instance=ExtResource( 8 )] position = Vector2( 45, -11 ) diff --git a/Map/map2.tscn b/Map/map2.tscn index 8e4da95..ab23f64 100644 --- a/Map/map2.tscn +++ b/Map/map2.tscn @@ -1,29 +1,42 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://Scene/Actor/Box.tscn" type="PackedScene" id=1] [ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Stage/Stage.tscn" type="PackedScene" id=3] +[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=3] +[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=5] +[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=6] +[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=7] [ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=8] -[node name="Stage" instance=ExtResource( 3 )] +[node name="Stage" type="Node2D"] +script = ExtResource( 3 ) -[node name="SolidTileMap" parent="." index="0"] +[node name="SolidTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( 65530, 0, 65538, 65531, 0, 65536, 65532, 0, 131074, 65533, 0, 1, 65534, 0, 1, 65535, 0, 65537, 0, 0, 1, 1, 0, 196608, 2, 0, 65538, 3, 0, 65536, 4, 0, 2, 5, 0, 65536 ) -[node name="DetailTileMap" parent="." index="2"] +[node name="SpikeTileMap" parent="." instance=ExtResource( 6 )] +z_as_relative = false + +[node name="DetailTileMap" parent="." instance=ExtResource( 4 )] tile_data = PoolIntArray( -131067, 0, 0, -5, 2, 0, -4, 0, 0, -3, -1610612734, 0, -65531, 1, 0 ) -[node name="DetailTileMap2" parent="." index="3"] +[node name="DetailTileMap2" parent="." instance=ExtResource( 4 )] +z_index = -11 tile_data = PoolIntArray( -524285, 4, 4, -458750, 4, 131075, -458749, 4, 65536, -458748, 4, 131076, -393214, 4, 65541, -393213, 4, 1, -393212, 4, 6, -327678, 4, 131077, -327677, 4, 131073, -327676, 4, 65542, -262143, 4, 131075, -262142, 4, 65537, -262141, 4, 196614, -196607, 4, 196611, -196606, 4, 65538, -196605, 4, 6, -131072, 4, 131077, -131071, 4, 196608, -131070, 4, 65537, -131069, 4, 196612, -65536, 4, 65541, -65535, 4, 65536, -65534, 4, 196609, -65533, 4, 65536, -65532, 4, 65540, 131067, 4, 196613, 131068, 4, 65537, 131069, 4, 196609, 131070, 4, 65538, 131071, 4, 196610, 65536, 4, 65538, 65537, 4, 65536, 65538, 4, 1, 65539, 4, 65538, 65540, 4, 196614, 196604, 4, 65539, 196605, 4, 1, 196606, 4, 65537, 196607, 4, 1, 131072, 4, 1, 131073, 4, 65538, 131074, 4, 196608, 131075, 4, 196612, 262142, 4, 3 ) -[node name="Actors" parent="." index="5"] -position = Vector2( -2, 2 ) +[node name="GameCamera" parent="." instance=ExtResource( 7 )] +smoothing_enabled = false +editor_draw_drag_margin = false +target_influence = 0.3 -[node name="Exit" parent="Actors" index="0" instance=ExtResource( 8 )] -position = Vector2( 27, -49 ) +[node name="Actors" type="Node2D" parent="."] -[node name="Player" parent="Actors" index="1" instance=ExtResource( 2 )] -position = Vector2( -6, -10 ) +[node name="Exit" parent="Actors" instance=ExtResource( 8 )] +position = Vector2( 25, -47 ) -[node name="Box" parent="Actors" index="2" instance=ExtResource( 1 )] -position = Vector2( -30, -10 ) +[node name="Player" parent="Actors" instance=ExtResource( 2 )] +position = Vector2( -8, -8 ) + +[node name="Box" parent="Actors" instance=ExtResource( 1 )] +position = Vector2( -32, -8 ) diff --git a/Scene/Stage/Stage.tscn b/Scene/Stage/Stage.tscn deleted file mode 100644 index 9f244af..0000000 --- a/Scene/Stage/Stage.tscn +++ /dev/null @@ -1,28 +0,0 @@ -[gd_scene load_steps=6 format=2] - -[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=1] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=5] - - -[node name="Stage" type="Node2D"] -script = ExtResource( 1 ) - -[node name="SolidTileMap" parent="." instance=ExtResource( 2 )] - -[node name="SpikeTileMap" parent="." instance=ExtResource( 3 )] -z_as_relative = false - -[node name="DetailTileMap" parent="." instance=ExtResource( 4 )] - -[node name="DetailTileMap2" parent="." instance=ExtResource( 4 )] -z_index = -11 - -[node name="GameCamera" parent="." instance=ExtResource( 5 )] -smoothing_enabled = false -editor_draw_drag_margin = false -target_influence = 0.3 - -[node name="Actors" type="Node2D" parent="."] diff --git a/Script/Actor/Player.gd b/Script/Actor/Player.gd index 2eabfa5..22ec0d0 100644 --- a/Script/Actor/Player.gd +++ b/Script/Actor/Player.gd @@ -260,6 +260,7 @@ func win(): Shared.start_reset("hub") queue_free() dev.out("map complete") + Shared.stage.stop_timer() func open_door(): # explosion diff --git a/Script/AutoLoad/Shared.gd b/Script/AutoLoad/Shared.gd index d0a6cbe..0d7f022 100644 --- a/Script/AutoLoad/Shared.gd +++ b/Script/AutoLoad/Shared.gd @@ -5,6 +5,8 @@ var node_map_solid : TileMap var node_map_spike : TileMap var node_camera_game : Camera2D +var stage : Stage + var is_reset = false var reset_clock := 0.0 var reset_time := 1.0 @@ -15,8 +17,6 @@ var map_name := "hub" var hub_pos := Vector2(-16, -16) -var map_timer := 0.0 - func _ready(): # _window_scale window @@ -46,11 +46,6 @@ func _process(delta): dev.out("loading scene: " + "res://Map/" + map_name + ".tscn") get_tree().change_scene("res://Map/" + map_name + ".tscn") #get_tree().reload_current_scene() - - map_timer += delta - HUD.node_timer.text = "time: " + String(map_timer) - - func start_reset(arg = ""): if !is_reset: diff --git a/Script/Stage/Stage.gd b/Script/Stage/Stage.gd index 2b2c8fc..6637efa 100644 --- a/Script/Stage/Stage.gd +++ b/Script/Stage/Stage.gd @@ -1,5 +1,16 @@ extends Node2D class_name Stage +var timer := 0.0 +var is_timer = true + func _ready(): - pass + Shared.stage = self + +func _process(delta): + if is_timer: + timer += delta + HUD.node_timer.text = "timer: " + str(timer) + +func stop_timer(): + is_timer = false