From 8d99147739d50f7dd8ccc495219a8e4cf1942c18 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Mon, 24 Feb 2025 20:19:13 -0500 Subject: [PATCH 01/19] CamBounds.gd ... almost working select preview --- src/actor/Note.gd | 1 + src/autoload/Shared.gd | 10 +- src/map/1-1.tscn | 7 +- src/map/1-2.tscn | 7 +- src/map/1-3.tscn | 7 +- src/map/1-4.tscn | 7 +- src/map/1-5.tscn | 7 +- src/map/1-6.tscn | 9 +- src/map/1-7.tscn | 9 +- src/map/1-8.tscn | 9 +- src/map/2-1.tscn | 7 +- src/map/2-2.tscn | 7 +- src/map/2-3.tscn | 8 +- src/map/2-4.tscn | 9 +- src/map/2-5.tscn | 7 +- src/map/2-6.tscn | 9 +- src/map/2-7.tscn | 9 +- src/map/2-8.tscn | 9 +- src/map/3-1.tscn | 7 +- src/map/3-2.tscn | 35 ++++--- src/map/3-3.tscn | 35 ++++--- src/map/3-4.tscn | 35 ++++--- src/map/3-5.tscn | 29 +++--- src/map/3-6.tscn | 29 +++--- src/map/3-7.tscn | 29 +++--- src/map/3-8.tscn | 21 +++-- src/map/4-1.tscn | 7 +- src/map/4-2.tscn | 27 +++--- src/map/4-3.tscn | 35 ++++--- src/map/4-4.tscn | 27 +++--- src/map/4-5.tscn | 7 +- src/map/4-6.tscn | 7 +- src/map/4-7.tscn | 7 +- src/map/4-8.tscn | 7 +- src/map/5-1.tscn | 15 ++- src/map/5-2.tscn | 13 ++- src/map/5-3.tscn | 7 +- src/map/5-4.tscn | 7 +- src/map/win.tscn | 7 +- src/menu/select.gd | 11 ++- src/menu/select.tscn | 187 +------------------------------------- src/stage/CamBounds.gd | 31 +++++++ src/stage/GameCamera.tscn | 4 +- 43 files changed, 307 insertions(+), 457 deletions(-) create mode 100644 src/stage/CamBounds.gd diff --git a/src/actor/Note.gd b/src/actor/Note.gd index e38c12e..f15ef4d 100644 --- a/src/actor/Note.gd +++ b/src/actor/Note.gd @@ -12,6 +12,7 @@ export var palette : PoolColorArray func _ready(): if Shared.is_level_select: visible = false + queue_free() return if Engine.editor_hint: return diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index 2a7fc53..84df606 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -110,14 +110,8 @@ func _ready(): # get all maps for i in dir_list(map_dir): - var lm = load(map_dir + i) - var map_short = str(i.split(".")[0]) - - scene_dict[map_dir + i] = lm - maps.append(map_short) - - var inst = lm.instance() - make_preview(inst, map_short) + scene_dict[map_dir + i] = load(map_dir + i) + maps.append(i.split(".")[0]) #print("maps: ", maps, " ", maps.size(), " ", scene_dict) diff --git a/src/map/1-1.tscn b/src/map/1-1.tscn index 2f4ec2d..52fcad0 100644 --- a/src/map/1-1.tscn +++ b/src/map/1-1.tscn @@ -2,7 +2,6 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -16,6 +15,7 @@ [ext_resource path="res://media/image/8pixel.png" type="Texture" id=14] [ext_resource path="res://media/image/solid_bricks.png" type="Texture" id=15] [ext_resource path="res://media/image/bricks.png" type="Texture" id=16] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=17] [sub_resource type="TileSet" id=1] 0/name = "solid_bricks.png 0" @@ -176,7 +176,8 @@ tile_data = PoolIntArray( -393212, 5, 2, -393211, 536870917, 0, -393210, -161061 tile_set = SubResource( 6 ) tile_data = PoolIntArray( -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -327694, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -327686, 536870912, 0, -327685, 536870912, 0, -327684, 536870912, 0, -327683, 536870912, 0, -327682, 536870912, 0, -327681, 536870912, 0, -393216, 536870912, 0, -393215, 536870912, 0, -393214, 536870912, 0, -393213, 536870912, 0, -393212, 536870912, 0, -393211, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -262158, 536870912, 0, -262157, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -262154, 536870912, 0, -262153, 536870912, 0, -262152, 536870912, 0, -262151, 536870912, 0, -262150, 536870912, 0, -262149, 536870912, 0, -262148, 536870912, 0, -262147, 536870912, 0, -262146, 536870912, 0, -262145, 0, 0, -327680, 0, 0, -327679, 536870912, 0, -327678, 536870912, 0, -327677, 536870912, 0, -327676, 536870912, 0, -327675, 536870912, 0, -327674, 536870912, 0, -327673, 536870912, 0, -327672, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 536870912, 0, -327668, 536870912, 0, -327667, 536870912, 0, -196622, 536870912, 0, -196621, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -196617, 536870912, 0, -196616, 536870912, 0, -196615, 536870912, 0, -196614, 536870912, 0, -196613, 536870912, 0, -196612, 536870912, 0, -196611, 536870912, 0, -196610, 536870912, 0, -196609, 0, 0, -262144, 0, 0, -262143, 536870912, 0, -262142, 536870912, 0, -262141, 536870912, 0, -262140, 536870912, 0, -262139, 536870912, 0, -262138, 536870912, 0, -262137, 536870912, 0, -262136, 536870912, 0, -262135, 536870912, 0, -262134, 536870912, 0, -262133, 536870912, 0, -262132, 536870912, 0, -262131, 536870912, 0, -131086, 536870912, 0, -131085, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 536870912, 0, -131080, 536870912, 0, -131079, 536870912, 0, -131078, 536870912, 0, -131077, 536870912, 0, -131076, 536870912, 0, -131075, 536870912, 0, -131074, 536870912, 0, -131073, 536870912, 0, -196608, 536870912, 0, -196607, 536870912, 0, -196606, 536870912, 0, -196605, 536870912, 0, -196604, 536870912, 0, -196603, 536870912, 0, -196602, 536870912, 0, -196601, 536870912, 0, -196600, 536870912, 0, -196599, 536870912, 0, -196598, 536870912, 0, -196597, 536870912, 0, -196596, 536870912, 0, -196595, 536870912, 0, -65550, 536870912, 0, -65549, 536870912, 0, -65548, 536870912, 0, -65547, 536870912, 0, -65546, 536870912, 0, -65545, 536870912, 0, -65544, 536870914, 2, -65543, 2, 3, -131063, 536870912, 0, -131062, 536870912, 0, -131061, 536870912, 0, -131060, 536870912, 0, -131059, 536870912, 0, -65527, 536870912, 0, -65526, 536870912, 0, -65525, 536870912, 0, -65524, 536870912, 0, -65523, 536870912, 0, 8, 2, 3, 9, 536870912, 0, 10, 536870912, 0, 11, 536870912, 0, 12, 536870912, 0, 13, 536870912, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] +script = ExtResource( 17 ) [node name="Actors" type="Node2D" parent="."] @@ -239,5 +240,3 @@ margin_right = 50.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 4 ) text = "move" - -[editable path="GameCamera"] diff --git a/src/map/1-2.tscn b/src/map/1-2.tscn index dd01921..3f583df 100644 --- a/src/map/1-2.tscn +++ b/src/map/1-2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -176,7 +176,8 @@ tile_data = PoolIntArray( -458747, 2, 0, -458746, 0, 0, -458745, -1610612734, 0, tile_set = SubResource( 10 ) tile_data = PoolIntArray( -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -327694, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 0, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -327686, 536870912, 0, -327685, 536870912, 0, -327684, 536870912, 0, -327683, 536870912, 0, -327682, 536870912, 0, -327681, 536870912, 0, -393216, 536870912, 0, -393215, 536870912, 0, -393214, 536870912, 0, -393213, 536870912, 0, -393212, 536870912, 0, -393211, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -262158, 536870912, 0, -262157, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -262154, 0, 0, -262153, 536870912, 0, -262152, 536870912, 0, -262151, 536870912, 0, -262150, 536870912, 0, -262149, 536870912, 0, -262148, 536870912, 0, -262147, 536870912, 0, -262146, 536870912, 0, -262145, 536870912, 0, -327680, 536870912, 0, -327679, 536870912, 0, -327678, 536870912, 0, -327677, 536870912, 0, -327676, 536870912, 0, -327675, 536870912, 0, -327674, 536870912, 0, -327673, 536870912, 0, -327672, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 536870912, 0, -327668, 536870912, 0, -327667, 536870912, 0, -196622, 536870912, 0, -196621, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -196617, 536870912, 0, -196616, 536870912, 0, -196615, 536870912, 0, -196614, 536870912, 0, -262144, 536870914, 3, -262143, 2, 2, -262142, 2, 1, -262136, 536870912, 0, -262135, 536870912, 0, -262134, 536870912, 0, -262133, 536870912, 0, -262132, 536870912, 0, -262131, 536870912, 0, -131086, 536870912, 0, -131085, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 536870912, 0, -131080, 536870912, 0, -131079, 536870912, 0, -131078, 536870912, 0, -196600, 536870912, 0, -196599, 536870912, 0, -196598, 536870912, 0, -196597, 536870912, 0, -196596, 536870912, 0, -196595, 536870912, 0, -131064, 536870912, 0, -131063, 536870912, 0, -131062, 536870912, 0, -131061, 536870912, 0, -131060, 536870912, 0, -131059, 536870912, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -215,5 +216,3 @@ margin_right = 34.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 8 ) text = "jump" - -[editable path="GameCamera"] diff --git a/src/map/1-3.tscn b/src/map/1-3.tscn index 525e652..99699c9 100644 --- a/src/map/1-3.tscn +++ b/src/map/1-3.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -177,8 +177,9 @@ tile_data = PoolIntArray( -524295, 536870916, 3, -524294, 536870916, 0, -524293, tile_set = SubResource( 10 ) tile_data = PoolIntArray( -524305, 536870912, 0, -524304, 536870912, 0, -524303, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -458769, 536870912, 0, -458768, 536870912, 0, -458767, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -393233, 536870912, 0, -393232, 536870912, 0, -393231, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -327697, 536870912, 0, -327696, 536870912, 0, -327695, 536870912, 0, -327694, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -262161, 536870912, 0, -262160, 0, 0, -262159, 0, 0, -262158, 536870912, 0, -262157, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -196625, 536870912, 0, -196624, 0, 0, -196623, 0, 0, -196622, 536870912, 0, -196621, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -196617, 536870912, 0, -196616, 536870914, 2, -131089, 536870912, 0, -131088, 536870912, 0, -131087, 536870912, 0, -131086, 536870912, 0, -131085, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 536870912, 0, -131080, 536870914, 3 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -24, -16 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] @@ -229,5 +230,3 @@ margin_right = 64.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 8 ) text = "pause" - -[editable path="GameCamera"] diff --git a/src/map/1-4.tscn b/src/map/1-4.tscn index 63c49c1..456c7cd 100644 --- a/src/map/1-4.tscn +++ b/src/map/1-4.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -177,8 +177,9 @@ tile_data = PoolIntArray( -393211, 536870916, 3, -393210, 4, 0, -393209, 4, 3, - tile_set = SubResource( 10 ) tile_data = PoolIntArray( -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524274, 536870912, 0, -524273, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -458738, 536870912, 0, -458737, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -327686, 536870912, 0, -393216, 536870914, 3, -393215, 2, 2, -393213, 536870912, 0, -393212, 536870912, 0, -393211, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 0, 0, -393204, 0, 0, -393203, 536870912, 0, -393202, 536870912, 0, -393201, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -262154, 536870912, 0, -262153, 536870912, 0, -327677, 536870912, 0, -327676, 536870912, 0, -327675, 536870912, 0, -327674, 536870912, 0, -327673, 536870912, 0, -327672, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 0, 0, -327668, 0, 0, -327667, 536870912, 0, -327666, 536870912, 0, -327665, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -196617, 536870912, 0, -262138, 536870912, 0, -262137, 536870912, 0, -262136, 536870912, 0, -262135, 536870912, 0, -262134, 536870912, 0, -262133, 536870912, 0, -262132, 536870912, 0, -262131, 536870912, 0, -262130, 536870912, 0, -262129, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 536870912, 0, -196602, 536870912, 0, -196601, 536870912, 0, -196600, 536870912, 0, -196599, 536870912, 0, -196598, 536870912, 0, -196597, 536870912, 0, -196596, 536870912, 0, -196595, 536870912, 0, -196594, 536870912, 0, -196593, 536870912, 0, -131066, 536870912, 0, -131065, 536870912, 0, -131064, 536870912, 0, -131063, 536870912, 0, -131062, 536870912, 0, -131061, 536870912, 0, -131060, 536870912, 0, -131059, 536870912, 0, -131058, 536870912, 0, -131057, 536870912, 0, -65524, 0, 0, -65523, 0, 0, -65522, 0, 0, -65521, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 16, 0 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] @@ -224,5 +225,3 @@ margin_right = 34.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 8 ) text = "lift" - -[editable path="GameCamera"] diff --git a/src/map/1-5.tscn b/src/map/1-5.tscn index fa0a863..0cf43dd 100644 --- a/src/map/1-5.tscn +++ b/src/map/1-5.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -166,8 +166,9 @@ tile_data = PoolIntArray( -524289, 5, 2, -589824, 5, 0, -589823, -1610612731, 2, tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -983025, 536870912, 0, -983024, 536870912, 0, -983023, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -917488, 536870912, 0, -917487, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -393214, 536870912, 0, -393213, 536870912, 0, -393212, 2, 3 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 32, -24 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] diff --git a/src/map/1-6.tscn b/src/map/1-6.tscn index 6f65b83..4d65da3 100644 --- a/src/map/1-6.tscn +++ b/src/map/1-6.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -166,8 +166,9 @@ tile_data = PoolIntArray( -524297, 5, 2, -524296, -1610612731, 2, -524292, 10737 tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917517, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 0, 0, -524276, 0, 0, -524275, 536870912, 0, -524274, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 0, 0, -458740, 0, 0, -458739, 536870912, 0, -458738, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -393202, 536870912, 0, -262152, 2, 3, -262151, 536870914, 2, -327674, 536870912, 0, -327673, 536870912, 0, -327672, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 536870912, 0, -327668, 536870912, 0, -327667, 536870912, 0, -327666, 536870912, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 8, -24 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] @@ -191,5 +192,3 @@ position = Vector2( -35, 16 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 91, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/1-7.tscn b/src/map/1-7.tscn index a9c677d..2ce8e7c 100644 --- a/src/map/1-7.tscn +++ b/src/map/1-7.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -166,8 +166,9 @@ tile_data = PoolIntArray( -589834, 536870916, 3, -589833, 4, 0, -589832, 4, 1, - tile_set = SubResource( 3 ) tile_data = PoolIntArray( -983052, 536870912, 0, -983051, 536870912, 0, -983050, 536870912, 0, -983049, 536870912, 0, -983048, 536870912, 0, -983047, 536870912, 0, -983046, 536870912, 0, -983045, 536870912, 0, -983044, 536870912, 0, -983043, 536870912, 0, -983042, 536870912, 0, -983041, 536870912, 0, -1048576, 536870912, 0, -1048575, 536870912, 0, -1048574, 536870912, 0, -1048573, 536870912, 0, -1048572, 536870912, 0, -1048571, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -1048564, 536870912, 0, -1048563, 536870912, 0, -1048562, 536870912, 0, -1048561, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -983025, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -524277, 2, 3, -524276, 536870914, 2, -524275, 536870912, 0, -524274, 536870912, 0, -524273, 536870912, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 16, -40 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] @@ -194,5 +195,3 @@ position = Vector2( 82, -48 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -69, -93 ) - -[editable path="GameCamera"] diff --git a/src/map/1-8.tscn b/src/map/1-8.tscn index 3078ef4..906391f 100644 --- a/src/map/1-8.tscn +++ b/src/map/1-8.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -166,8 +166,9 @@ tile_data = PoolIntArray( -786436, 5, 2, -786435, 536870917, 0, -786434, 5368709 tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1048590, 536870912, 0, -1048589, 536870912, 0, -1048588, 536870912, 0, -1048587, 536870912, 0, -1048586, 536870912, 0, -1048585, 536870912, 0, -1048584, 536870912, 0, -1048583, 536870912, 0, -1048582, 536870912, 0, -1048581, 536870912, 0, -1048580, 536870912, 0, -1048579, 536870912, 0, -1048578, 536870912, 0, -1048577, 536870912, 0, -1114112, 536870912, 0, -1114111, 536870912, 0, -1114110, 536870912, 0, -1114109, 536870912, 0, -1114108, 536870912, 0, -1114107, 536870912, 0, -1114106, 536870912, 0, -1114105, 536870912, 0, -1114104, 536870912, 0, -1114103, 536870912, 0, -1114102, 536870912, 0, -1114101, 536870912, 0, -1114100, 536870912, 0, -1114099, 536870912, 0, -983054, 536870912, 0, -983053, 536870912, 0, -983052, 536870912, 0, -983051, 536870912, 0, -983050, 536870912, 0, -983049, 536870912, 0, -983048, 536870912, 0, -983047, 536870912, 0, -983046, 536870912, 0, -983045, 536870912, 0, -983044, 536870912, 0, -983043, 536870912, 0, -983042, 536870912, 0, -983041, 536870912, 0, -1048576, 536870912, 0, -1048575, 536870912, 0, -1048574, 536870912, 0, -1048573, 536870912, 0, -1048572, 536870912, 0, -1048571, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -1048564, 536870912, 0, -1048563, 536870912, 0, -917518, 536870912, 0, -917517, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -851982, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -524297, 2, 3, -524296, 536870914, 2 ) -[node name="GameCamera" parent="." instance=ExtResource( 4 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 0, -48 ) +script = ExtResource( 4 ) [node name="Actors" type="Node2D" parent="."] @@ -197,5 +198,3 @@ position = Vector2( 56, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 67, -93 ) - -[editable path="GameCamera"] diff --git a/src/map/2-1.tscn b/src/map/2-1.tscn index e0723d6..f654b75 100644 --- a/src/map/2-1.tscn +++ b/src/map/2-1.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -173,8 +173,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524274, 536870912, 0, -524273, 536870912, 0, -524272, 536870912, 0, -524271, 536870912, 0, -524270, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -458738, 536870912, 0, -458737, 536870912, 0, -458736, 536870912, 0, -458735, 536870912, 0, -458734, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -327686, 536870912, 0, -393212, 536870912, 0, -393201, 536870912, 0, -393200, 536870912, 0, -393199, 536870912, 0, -393198, 536870912, 0, -262153, 536870912, 0, -262152, 536870912, 0, -262151, 536870912, 0, -262150, 536870912, 0, -262149, 536870914, 3, -327677, 536870914, 2, -327676, 536870912, 0, -327675, 2, 2, -327665, 536870912, 0, -327664, 536870912, 0, -327663, 536870912, 0, -327662, 536870912, 0, -196617, 536870912, 0, -196616, 536870912, 0, -196615, 536870912, 0, -196614, 536870912, 0, -196613, 2, 3, -262129, 536870912, 0, -262128, 536870912, 0, -262127, 536870912, 0, -262126, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 40, -16 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -186,5 +187,3 @@ position = Vector2( 125, -11 ) [node name="Note" parent="Actors" instance=ExtResource( 9 )] position = Vector2( 67, -69 ) - -[editable path="GameCamera"] diff --git a/src/map/2-2.tscn b/src/map/2-2.tscn index 41f7df1..ba06484 100644 --- a/src/map/2-2.tscn +++ b/src/map/2-2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -917488, 536870912, 0, -917487, 536870912, 0, -917486, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -786414, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524274, 536870914, 2, -524273, 536870912, 0, -524272, 536870912, 0, -524271, 536870912, 0, -524270, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -458738, 2, 3, -458737, 536870912, 0, -458736, 536870912, 0, -458735, 536870912, 0, -458734, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -393202, 536870914, 2, -393201, 536870912, 0, -393200, 536870912, 0, -393199, 536870912, 0, -393198, 536870912, 0, -262153, 536870912, 0, -262152, 536870912, 0, -262151, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 40, -20 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -193,5 +194,3 @@ position = Vector2( -51, -8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -61, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/2-3.tscn b/src/map/2-3.tscn index 9c5c64e..2049686 100644 --- a/src/map/2-3.tscn +++ b/src/map/2-3.tscn @@ -2,7 +2,6 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -14,6 +13,7 @@ [ext_resource path="res://media/image/8pixel.png" type="Texture" id=12] [ext_resource path="res://media/image/solid_bricks.png" type="Texture" id=13] [ext_resource path="res://media/image/bricks.png" type="Texture" id=14] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=15] [sub_resource type="TileSet" id=1] 0/name = "solid_bricks.png 0" @@ -171,15 +171,15 @@ tile_set = SubResource( 2 ) tile_data = PoolIntArray( -458766, 536870916, 3, -458765, 536870916, 0, -458764, 4, 1, -458763, 4, 3, -458758, 5, 2, -458757, 5, 0, -458756, 536870917, 2, -524282, 5, 2, -524281, 5, 0, -524280, 5, 0, -524279, 5, 0, -524278, 5, 0, -524277, 536870917, 2, -393230, 4, 0, -393217, 5, 2, -458752, 536870917, 2, -458737, 536870916, 1, -458736, 536870916, 0, -458735, 4, 3, -327694, 4, 2, -327692, 4, 1, -327691, 4, 3, -327688, 6, 0, -327685, 1073741829, 2, -327684, 5, 0, -327683, 1610612741, 2, -393211, 1073741829, 2, -393210, 5, 0, -393209, 1610612741, 2, -393206, 1073741829, 2, -393205, 6, 0, -393204, 5, 0, -393203, 1610612741, 2, -393201, 4, 0, -393200, 536870916, 1, -393199, 536870916, 2, -393197, -2147483643, 2, -262156, 4, 0, -262155, 536870916, 2, -262153, 5, 2, -262152, 5, 0, -262151, -1610612731, 2, -262145, 4, 2, -327680, 536870916, 0, -327679, 4, 3, -327669, 6, 0, -327661, -1073741819, 0, -196617, -1073741819, 0, -196616, -1073741819, 0, -196615, -1073741819, 0, -196613, 4, 2, -196612, 4, 3, -196610, 536870916, 3, -196609, 4, 0, -262144, 536870916, 1, -262143, 4, 3, -262141, 5, 2, -262140, 5, 0, -262139, -1610612731, 2, -262134, 5, 2, -262133, 5, 0, -262132, -1610612731, 2, -262130, 536870916, 3, -262129, 4, 0, -262128, 4, 0, -262127, 4, 3, -262125, -1073741819, 2, -131081, -1073741819, 2, -131080, -1073741819, 0, -131079, 1610612741, 2, -131077, 4, 2, -131076, 4, 3, -131074, 4, 2, -131073, 536870916, 2, -196608, 536870916, 3, -196607, 4, 3, -196605, 5, 0, -196604, 5, 0, -196603, 5, 0, -196601, 536870916, 3, -196600, 536870916, 2, -196598, -1073741819, 2, -196597, 5, 0, -196596, 1610612741, 2, -196594, 4, 2, -196593, 536870916, 2, -196592, 4, 2, -196591, 4, 3, -65550, 536870916, 3, -65549, 536870916, 1, -65548, 4, 0, -65547, 4, 3, -65538, 4, 2, -65537, 536870916, 0, -131072, 536870916, 1, -131071, 4, 3, -131069, -1073741819, 2, -131068, 5, 0, -131067, 1610612741, 2, -131065, 536870916, 3, -131064, 536870916, 2, -131058, 4, 2, -131057, 4, 3, -131056, 536870916, 3, -131055, 536870916, 2, -14, 536870916, 1, -13, 4, 0, -12, 536870916, 1, -11, 4, 0, -10, 4, 3, -5, 5, 0, -2, 4, 2, -1, 536870916, 1, -65536, 4, 0, -65535, 4, 3, -65532, 6, 0, -65522, 536870916, 3, -65521, 4, 0, -65520, 4, 0, -65519, 4, 3, 65531, 6, 0, 4, 6, 0, 5, -1610612731, 2, 9, 5, 2, 131058, 4, 2, 131059, 536870916, 1, 131060, 4, 0, 131061, 536870916, 1, 131062, 536870916, 2, 131067, 6, 0, 131071, 1073741829, 2, 65536, 1610612741, 2, 65540, 6, 0, 65545, 6, 0, 196594, 4, 2, 196595, 4, 0, 196596, 4, 1, 196597, 536870916, 2, 262136, 1073741829, 2, 262137, 5, 0, 262138, 5, 0, 262139, 5, 0, 262140, 1610612741, 2, 196612, 1073741829, 2, 196613, 5, 0, 196614, 5, 0, 196615, 5, 0, 196616, 5, 0, 196617, 1610612741, 2 ) brick_color = Color( 0.239216, 0.109804, 0.184314, 1 ) grass_color = Color( 0.741176, 0.580392, 0, 1 ) -wood_color = Color( 0.678431, 0, 0.156863, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 9 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -786448, 536870912, 0, -786447, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -851949, 536870912, 0, -851948, 536870912, 0, -851947, 536870912, 0, -720912, 536870912, 0, -720911, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -786414, 536870912, 0, -786413, 536870912, 0, -786412, 536870912, 0, -786411, 536870912, 0, -655376, 536870912, 0, -655375, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -720877, 536870912, 0, -720876, 536870912, 0, -720875, 536870912, 0, -589840, 536870912, 0, -589839, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -655341, 536870912, 0, -655340, 536870912, 0, -655339, 536870912, 0, -524304, 536870912, 0, -524303, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -589805, 536870912, 0, -589804, 536870912, 0, -589803, 536870912, 0, -458768, 536870912, 0, -458767, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524267, 536870912, 0, -393232, 536870912, 0, -393231, 536870912, 0, -393230, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458732, 2, 2, -458731, 536870912, 0, -327696, 536870912, 0, -327695, 536870912, 0, -327694, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -14, -24 ) +script = ExtResource( 15 ) bounds = Rect2( 0, 0, 76, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -201,5 +201,3 @@ position = Vector2( -100, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -5, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/2-4.tscn b/src/map/2-4.tscn index bc402b0..8799e3b 100644 --- a/src/map/2-4.tscn +++ b/src/map/2-4.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1245181, 536870912, 0, -1245180, 536870912, 0, -1245179, 536870912, 0, -1245178, 536870912, 0, -1245177, 536870912, 0, -1245176, 536870912, 0, -1245175, 536870912, 0, -1245174, 536870912, 0, -1245173, 536870912, 0, -1245172, 536870912, 0, -1245171, 536870912, 0, -1245170, 536870912, 0, -1245169, 536870912, 0, -1245168, 536870912, 0, -1179645, 536870912, 0, -1179644, 536870912, 0, -1179643, 536870912, 0, -1179642, 536870912, 0, -1179641, 536870912, 0, -1179640, 536870912, 0, -1179639, 536870912, 0, -1179638, 536870912, 0, -1179637, 536870912, 0, -1179636, 536870912, 0, -1179635, 536870912, 0, -1179634, 536870912, 0, -1179633, 536870912, 0, -1179632, 536870912, 0, -1114106, 536870912, 0, -1114105, 536870912, 0, -1114104, 536870912, 0, -1114103, 536870912, 0, -1114102, 536870912, 0, -1114101, 536870912, 0, -1114100, 536870912, 0, -1114099, 536870912, 0, -1114098, 536870912, 0, -1114097, 536870912, 0, -1114096, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -1048564, 536870912, 0, -1048563, 536870912, 0, -1048562, 536870912, 0, -1048561, 536870912, 0, -1048560, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -983025, 536870912, 0, -983024, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -917488, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -524285, 536870914, 2, -524284, 2, 3, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524274, 536870912, 0, -524273, 536870912, 0, -524272, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -458738, 536870912, 0, -458737, 536870912, 0, -458736, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -393202, 536870912, 0, -393201, 536870912, 0, -393200, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 536870912, 0, -327668, 536870912, 0, -327667, 536870912, 0, -327666, 536870912, 0, -327665, 536870912, 0, -327664, 536870912, 0, -262135, 536870912, 0, -262134, 536870912, 0, -262133, 536870912, 0, -262132, 536870912, 0, -262131, 536870912, 0, -262130, 536870912, 0, -262129, 536870912, 0, -262128, 536870912, 0, -196599, 536870912, 0, -196598, 536870912, 0, -196597, 536870912, 0, -196596, 536870912, 0, -196595, 536870912, 0, -196594, 536870912, 0, -196593, 536870912, 0, -196592, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 20, -24 ) +script = ExtResource( 3 ) bounds = Rect2( 0, 64, 0, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -206,5 +207,3 @@ position = Vector2( 67, 8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 71, -94 ) - -[editable path="GameCamera"] diff --git a/src/map/2-5.tscn b/src/map/2-5.tscn index b573edb..21ebe28 100644 --- a/src/map/2-5.tscn +++ b/src/map/2-5.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -851949, 536870912, 0, -851948, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -786414, 536870912, 0, -786413, 536870912, 0, -786412, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -720877, 536870912, 0, -720876, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -655341, 536870912, 0, -655340, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -589805, 536870912, 0, -589804, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524272, 536870912, 0, -524271, 536870912, 0, -524270, 536870912, 0, -524269, 536870912, 0, -524268, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458736, 536870912, 0, -458735, 536870912, 0, -458734, 536870912, 0, -458733, 536870912, 0, -458732, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -327686, 536870912, 0, -327685, 536870912, 0, -327684, 536870912, 0, -393214, 2, 3, -393213, 536870914, 2, -393212, 536870914, 3, -393211, 2, 2 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 52, -20 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -202,5 +203,3 @@ position = Vector2( -36, -8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 139, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/2-6.tscn b/src/map/2-6.tscn index 39f9504..d795c3f 100644 --- a/src/map/2-6.tscn +++ b/src/map/2-6.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524274, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -458738, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -393210, 536870912, 0, -393209, 536870912, 0, -393208, 536870912, 0, -393207, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -393202, 536870912, 0, -262157, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -262154, 536870912, 0, -262153, 536870912, 0, -262152, 536870912, 0, -327674, 536870912, 0, -327673, 536870912, 0, -327672, 536870912, 0, -327671, 536870912, 0, -327670, 536870912, 0, -327669, 536870912, 0, -327668, 536870912, 0, -327667, 536870912, 0, -327666, 536870912, 0, -196621, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -196617, 536870912, 0, -196616, 536870912, 0, -262136, 536870912, 0, -262135, 536870912, 0, -262134, 536870912, 0, -262133, 536870912, 0, -262132, 536870912, 0, -262131, 536870912, 0, -262130, 536870912, 0, -131085, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 536870912, 0, -131080, 536870912, 0, -196600, 536870912, 0, -196599, 536870912, 0, -196598, 536870912, 0, -196597, 536870912, 0, -196596, 536870912, 0, -196595, 536870912, 0, -196594, 536870912, 0, -65549, 536870912, 0, -65548, 536870912, 0, -65547, 536870912, 0, -65546, 536870912, 0, -65545, 536870912, 0, -65544, 536870912, 0, -131063, 536870912, 0, -131062, 536870912, 0, -131061, 536870912, 0, -131060, 536870912, 0, -131059, 536870912, 0, -131058, 536870912, 0, -13, 536870912, 0, -12, 536870912, 0, -11, 536870912, 0, -10, 536870912, 0, -9, 536870912, 0, -8, 536870912, 0, -7, 536870912, 0, -6, 536870912, 0, -5, 536870912, 0, -4, 536870912, 0, -65528, 536870912, 0, -65527, 536870912, 0, -65526, 536870912, 0, -65525, 536870912, 0, -65524, 536870912, 0, -65523, 536870912, 0, -65522, 536870912, 0, 65523, 536870912, 0, 65524, 536870912, 0, 65525, 536870912, 0, 65526, 536870912, 0, 65527, 536870912, 0, 65528, 536870912, 0, 65529, 536870912, 0, 8, 536870912, 0, 9, 536870912, 0, 10, 536870912, 0, 11, 536870912, 0, 12, 536870912, 0, 13, 536870912, 0, 14, 536870912, 0, 131059, 536870912, 0, 131060, 536870912, 0, 131061, 536870912, 0, 131062, 536870912, 0, 131063, 536870912, 0, 131064, 536870912, 0, 131065, 536870912, 0, 65545, 536870912, 0, 65546, 536870912, 0, 65547, 536870912, 0, 65548, 536870912, 0, 65549, 536870912, 0, 65550, 536870912, 0, 196601, 2, 2, 131080, 536870912, 0, 131081, 536870912, 0, 131082, 536870912, 0, 131083, 536870912, 0, 131084, 536870912, 0, 131085, 536870912, 0, 131086, 536870912, 0, 196616, 536870912, 0, 196617, 536870912, 0, 196618, 536870912, 0, 196619, 536870912, 0, 196620, 536870912, 0, 196621, 536870912, 0, 196622, 536870912, 0, 262154, 536870912, 0, 262155, 536870912, 0, 262156, 536870912, 0, 262157, 536870912, 0, 262158, 536870912, 0, 327689, 536870914, 2, 327690, 536870912, 0, 327691, 536870912, 0, 327692, 536870912, 0, 327693, 536870912, 0, 327694, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 8, 8 ) +script = ExtResource( 3 ) bounds = Rect2( 0, 0, 0, 40 ) [node name="Actors" type="Node2D" parent="."] @@ -203,5 +204,3 @@ position = Vector2( -47, -32 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -69, -5 ) - -[editable path="GameCamera"] diff --git a/src/map/2-7.tscn b/src/map/2-7.tscn index 70a0423..38d5108 100644 --- a/src/map/2-7.tscn +++ b/src/map/2-7.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -851982, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524292, 2, 2, -524291, 536870914, 3, -524290, 2, 2, -524289, 536870914, 3, -589824, 536870914, 2, -589823, 2, 3, -589822, 2, 2, -589821, 536870914, 3, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 0, -24 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -208,5 +209,3 @@ position = Vector2( 78, -8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -101, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/2-8.tscn b/src/map/2-8.tscn index 6c82fdb..77351f0 100644 --- a/src/map/2-8.tscn +++ b/src/map/2-8.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.678431, 0, 0.156863, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -177,8 +177,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1114128, 536870912, 0, -1114127, 536870912, 0, -1114126, 536870912, 0, -1114125, 536870912, 0, -1114124, 536870912, 0, -1114123, 536870912, 0, -1114122, 536870912, 0, -1114121, 536870912, 0, -1114120, 536870912, 0, -1114119, 536870912, 0, -1114118, 536870912, 0, -1114117, 536870912, 0, -1114116, 536870912, 0, -1114115, 536870912, 0, -1114114, 536870912, 0, -1114113, 536870912, 0, -1179648, 536870912, 0, -1179647, 536870912, 0, -1179646, 536870912, 0, -1179645, 536870912, 0, -1179644, 536870912, 0, -1179643, 536870912, 0, -1179642, 536870912, 0, -1179641, 536870912, 0, -1179640, 536870912, 0, -1179639, 536870912, 0, -1179638, 536870912, 0, -1179637, 536870912, 0, -1048592, 536870912, 0, -1048591, 536870912, 0, -1048590, 536870912, 0, -1048589, 536870912, 0, -1048588, 536870912, 0, -1048587, 536870912, 0, -1048586, 536870912, 0, -1048585, 536870912, 0, -1048584, 536870912, 0, -1048583, 536870912, 0, -1048582, 536870912, 0, -1048581, 536870912, 0, -1048580, 536870912, 0, -1048579, 536870912, 0, -1048578, 536870912, 0, -1048577, 536870912, 0, -1114112, 536870912, 0, -1114111, 536870912, 0, -1114110, 536870912, 0, -1114109, 536870912, 0, -1114108, 536870912, 0, -1114107, 536870912, 0, -1114106, 536870912, 0, -1114105, 536870912, 0, -1114104, 536870912, 0, -1114103, 536870912, 0, -1114102, 536870912, 0, -1114101, 536870912, 0, -983056, 536870912, 0, -983055, 536870912, 0, -983054, 536870912, 0, -983053, 536870912, 0, -983052, 536870912, 0, -983051, 536870912, 0, -983050, 536870912, 0, -983049, 536870912, 0, -983048, 536870912, 0, -983047, 536870912, 0, -983046, 536870912, 0, -983045, 536870912, 0, -983044, 536870912, 0, -983043, 536870912, 0, -983042, 536870912, 0, -983041, 536870912, 0, -1048576, 536870912, 0, -1048575, 536870912, 0, -1048574, 536870912, 0, -1048573, 536870912, 0, -1048572, 536870912, 0, -1048571, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -917520, 536870912, 0, -917519, 536870912, 0, -917518, 536870912, 0, -917517, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -851984, 536870912, 0, -851983, 536870912, 0, -851982, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -786448, 536870912, 0, -786447, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -851962, 536870914, 2, -851961, 2, 3, -720912, 536870912, 0, -720911, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -655376, 536870912, 0, -655375, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -589840, 536870912, 0, -589839, 536870912, 0, -589838, 536870912, 0, -524304, 536870912, 0, -524303, 536870912, 0, -524302, 536870912, 0, -458768, 536870912, 0, -458767, 536870912, 0, -458766, 536870912, 0 ) tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -16, -32 ) +script = ExtResource( 3 ) bounds = Rect2( 0, 16, 0, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -212,5 +213,3 @@ position = Vector2( -83, 0 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -93, -101 ) - -[editable path="GameCamera"] diff --git a/src/map/3-1.tscn b/src/map/3-1.tscn index 288e7cd..8fa2e09 100644 --- a/src/map/3-1.tscn +++ b/src/map/3-1.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -180,8 +180,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -655373, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720895, 0, 0, -720894, 0, 0, -720893, 0, 0, -720892, 0, 0, -720891, 0, 0, -720890, 0, 0, -720889, 0, 0, -720888, 0, 0, -720887, 0, 0, -720886, 0, 0, -720885, 0, 0, -720884, 0, 0, -720883, 0, 0, -720882, 0, 0, -589837, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -589827, 0, 0, -589826, 0, 0, -589825, 0, 0, -655360, 0, 0, -655359, 0, 0, -655358, 0, 0, -655357, 0, 0, -655356, 0, 0, -655355, 0, 0, -655354, 0, 0, -655353, 0, 0, -655352, 0, 0, -655351, 0, 0, -655350, 0, 0, -655349, 0, 0, -655348, 0, 0, -655347, 0, 0, -655346, 0, 0, -524301, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -524294, 0, 0, -524293, 0, 0, -524292, 0, 0, -524291, 0, 0, -524290, 0, 0, -524289, 0, 0, -589824, 0, 0, -589823, 0, 0, -589822, 0, 0, -589821, 0, 0, -589820, 0, 0, -589819, 0, 0, -589818, 0, 0, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -589812, 0, 0, -589811, 0, 0, -589810, 0, 0, -458765, 0, 0, -458764, 0, 0, -458763, 0, 0, -458762, 0, 0, -458761, 0, 0, -458760, 0, 0, -458759, 0, 0, -458758, 0, 0, -458757, 0, 0, -458756, 0, 0, -458755, 0, 0, -458754, 0, 0, -458753, 0, 0, -524288, 0, 0, -524287, 0, 0, -524286, 0, 0, -524285, 0, 0, -524284, 0, 0, -524283, 0, 0, -524282, 0, 0, -524281, 0, 0, -524280, 0, 0, -524279, 0, 0, -524278, 0, 0, -524277, 0, 0, -524276, 0, 0, -524275, 0, 0, -524274, 0, 0, -393229, 0, 0, -393228, 0, 0, -393227, 0, 0, -393226, 0, 0, -393225, 0, 0, -393224, 0, 0, -393223, 0, 0, -393222, 0, 0, -393221, 0, 0, -393220, 0, 0, -393219, 0, 0, -393218, 0, 0, -393217, 0, 0, -458752, 0, 0, -458751, 0, 0, -458750, 0, 0, -458749, 0, 0, -458748, 0, 0, -458747, 0, 0, -458746, 0, 0, -458745, 0, 0, -458744, 0, 0, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -458740, 0, 0, -458739, 0, 0, -458738, 0, 0, -327693, 0, 0, -327692, 0, 0, -327691, 0, 0, -327690, 0, 0, -327689, 0, 0, -327688, 0, 0, -327687, 0, 0, -327686, 0, 0, -327685, 0, 0, -327684, 0, 0, -327683, 0, 0, -327682, 0, 0, -393206, 0, 0, -393205, 0, 0, -393204, 0, 0, -393203, 0, 0, -393202, 0, 0, -262157, 0, 0, -262156, 0, 0, -262155, 0, 0, -262154, 0, 0, -262153, 0, 0, -262152, 2, 2, -262151, 536870914, 3, -327670, 0, 0, -327669, 0, 0, -327668, 0, 0, -327667, 0, 0, -327666, 0, 0, -262134, 0, 0, -262133, 0, 0, -262132, 0, 0, -262131, 0, 0, -262130, 0, 0 ) tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 8, -8 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -208,5 +209,3 @@ position = Vector2( 29, 16 ) [node name="Note" parent="Actors" instance=ExtResource( 12 )] position = Vector2( 99, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/3-2.tscn b/src/map/3-2.tscn index f0e5029..bd4ab44 100644 --- a/src/map/3-2.tscn +++ b/src/map/3-2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -23,7 +23,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 17 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -60,7 +60,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 18 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.219608, 0.172549, 0.411765, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -81,7 +81,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 15 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 1, 0.509804, 0.713726, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -102,7 +102,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 15 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0, 0.77, 0.462, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -132,7 +132,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 17 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -157,15 +157,15 @@ __meta__ = { "_editor_description_": "" } palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) -color_wood = Color( 0, 0.77, 0.462, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -524299, 0, 0, -524298, 0, 1, -524297, 536870912, 0, -524296, 0, 1, -524295, 0, 1, -524294, 0, 0, -524293, 0, 1, -524292, 536870912, 0, -524291, 0, 1, -524290, 0, 1, -524289, 0, 0, -589824, 0, 1, -589823, 0, 1, -589822, 536870912, 0, -458763, 0, 1, -524286, 0, 1, -393229, 0, 0, -393228, 0, 1, -393227, 536870912, 0, -458750, 0, 0, -327693, 0, 1, -327681, 0, 0, -393216, 0, 1, -393215, 536870912, 0, -393214, 0, 1, -393213, 0, 0, -393212, 0, 1, -393211, 536870912, 0, -393210, 0, 1, -393209, 0, 1, -393208, 0, 0, -393207, 0, 1, -393206, 0, 1, -393205, 536870912, 0, -393204, 536870913, 0, -393203, 536870913, 0, -393202, 536870913, 0, -262157, 536870912, 0, -327669, 0, 1, -327666, 536870913, 0, -196621, 0, 1, -262133, 0, 0, -262130, 536870913, 0, -131085, 0, 0, -196597, 0, 1, -196594, 536870913, 0, -65549, 0, 1, -65548, 0, 0, -65547, 0, 1, -65546, 536870912, 0, -131064, 0, 0, -131063, 0, 1, -131062, 0, 1, -131061, 536870912, 0, -131058, 536870913, 0, -12, 0, 1, -65528, 0, 1, -65522, 536870913, 0, 65524, 536870912, 0, 65530, 0, 1, 65531, 536870912, 0, 65532, 0, 1, 14, 536870913, 0, 131060, 0, 1, 131066, 0, 0, 131068, 536870912, 0, 65544, 0, 1, 65550, 536870913, 0, 196596, 0, 0, 196597, 0, 1, 196598, 0, 1, 196599, 0, 0, 196600, 0, 1, 196601, 536870912, 0, 196602, 0, 1, 196604, 0, 1, 131080, 0, 0, 131086, 536870913, 0, 262140, 0, 0, 262141, 0, 1, 262142, 0, 0, 262143, 0, 1, 196608, 536870912, 0, 196609, 0, 1, 196612, 0, 1, 196613, 0, 0, 196614, 0, 1, 196615, 536870912, 0, 196616, 0, 1, 196622, 536870913, 0, 262145, 0, 0, 262146, 0, 1, 262147, 0, 1, 262148, 536870912, 0, 262152, 536870913, 0, 262153, 536870913, 0, 262154, 536870913, 0, 262155, 536870913, 0, 262156, 536870913, 0, 262157, 536870913, 0, 262158, 536870913, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( 196605, 0, 0, 196606, 0, 0, 196607, 0, 0, 131072, 0, 0, 131073, 0, 0, 131076, 0, 0, 131077, 0, 0, 131078, 0, 0, 131079, 0, 0 ) @@ -174,17 +174,18 @@ tile_data = PoolIntArray( 196605, 0, 0, 196606, 0, 0, 196607, 0, 0, 131072, 0, 0 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -589834, 5, 2, -589833, 5, 0, -589832, 5, 0, -589831, 5, 0, -589830, 536870917, 2, -589825, 5, 2, -655360, 5, 0, -655359, 5, 0, -655358, 5, 0, -655357, -1610612731, 2, -589821, 5, 0, -458766, 5, 2, -458765, 5, 0, -458764, 5, 0, -458762, 1610612741, 2, -458758, 1073741829, 2, -458757, 5, 0, -458756, 5, 0, -458755, 5, 0, -458754, 5, 0, -458753, 1610612741, 2, -524285, 5, 0, -524284, 536870917, 2, -524281, 5, 2, -524280, 536870917, 2, -393230, -1073741819, 0, -458749, 5, 0, -458748, 1073741829, 0, -458747, 1073741829, 0, -458746, 1073741829, 0, -458745, 5, 0, -458744, 5, 0, -458743, 5, 0, -327694, -1073741819, 0, -327691, 536870917, 2, -327689, 5, 2, -327688, -1610612731, 2, -262158, -1073741819, 2, -262156, -1073741818, 0, -262155, -1073741818, 0, -262154, -1073741818, 0, -262153, -1610612731, 0, -262152, -1610612731, 0, -327679, 4, 2, -327678, 536870916, 0, -327677, 536870916, 2, -327675, 1610612742, 0, -327674, 1610612741, 2, -327673, 4, 2, -327672, 4, 3, -327671, 1073741829, 2, -327670, 5, 0, -327668, -1610612731, 2, -196617, -1073741819, 2, -196616, 1610612741, 2, -196613, 4, 2, -196612, 4, 1, -196611, 4, 3, -196609, 5, 2, -262144, 5, 0, -262143, -1610612731, 2, -262139, 1610612742, 0, -262137, 536870916, 3, -262136, 536870916, 2, -262132, -1610612731, 0, -131077, 4, 2, -131076, 4, 0, -131075, 536870916, 2, -131073, 5, 0, -196608, 5, 0, -196607, 5, 0, -196604, 5, 2, -196603, 5, 0, -196602, -1610612731, 2, -196601, 4, 2, -196600, 4, 3, -196596, -1610612731, 0, -65544, 536870916, 3, -65543, 536870916, 2, -65537, -1073741819, 2, -131072, 5, 0, -131071, 1610612741, 2, -131068, -1073741819, 2, -131067, 5, 0, -131066, 1610612741, 2, -131060, -1610612731, 0, -13, 4, 2, -10, 6, 0, -6, 5, 2, -5, 5, 0, -4, 536870917, 2, -65536, 6, 0, -65527, 5, 0, -65526, 5, 0, -65525, 5, 0, -65524, 1610612741, 2, 65526, 1610612741, 0, 0, 1610612742, 0, 9, -1610612731, 0, 131067, 536870916, 1, 65536, 1610612742, 0, 65545, -536870907, 2, 196603, 536870916, 2, 131072, 1610612742, 0, 262132, 4, 2, 262133, 536870916, 1, 262134, 4, 0, 262135, 536870916, 1, 262136, 536870916, 0, 262137, 536870916, 1, 262138, 536870916, 2, 327669, 4, 2, 327670, 536870916, 1, 327671, 4, 0, 327672, 536870916, 1, 327673, 536870916, 2, 262144, 4, 2, 262149, 536870916, 2 ) -brick_color = Color( 0.219608, 0.172549, 0.411765, 1 ) -grass_color = Color( 1, 0.509804, 0.713726, 1 ) -wood_color = Color( 0, 0.77, 0.462, 1 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 13 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -327668, 0, 0, -327667, 0, 0, -262132, 0, 0, -262131, 0, 0, -196596, 0, 0, -196595, 0, 0, -131060, 0, 0, -131059, 0, 0, -65527, 0, 0, -65526, 0, 0, -65525, 0, 0, -65524, 0, 0, -65523, 0, 0, 8, 536870914, 2, 9, 0, 0, 10, 0, 0, 11, 0, 0, 12, 0, 0, 13, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 536870912, 0, 65548, 536870912, 0, 65549, 0, 0, 131081, 0, 0, 131082, 0, 0, 131083, 536870912, 0, 131084, 536870912, 0, 131085, 0, 0, 196617, 0, 0, 196618, 0, 0, 196619, 0, 0, 196620, 0, 0, 196621, 0, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -4, -16 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -255,5 +256,3 @@ position = Vector2( 76, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 14 )] position = Vector2( 91, 11 ) - -[editable path="GameCamera"] diff --git a/src/map/3-3.tscn b/src/map/3-3.tscn index 1798cfb..417f159 100644 --- a/src/map/3-3.tscn +++ b/src/map/3-3.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -23,7 +23,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 17 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -60,7 +60,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 18 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.219608, 0.172549, 0.411765, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -81,7 +81,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 15 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 1, 0.509804, 0.713726, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -102,7 +102,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 15 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0, 0.77, 0.462, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -132,7 +132,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 17 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -157,15 +157,15 @@ __meta__ = { "_editor_description_": "" } palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) -color_wood = Color( 0, 0.77, 0.462, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -983056, 1, 0, -983055, 1, 0, -983054, 1, 0, -983053, 1, 0, -983052, 1, 0, -983051, 1, 0, -983050, 1, 0, -983049, 1, 0, -983048, 1, 0, -983047, 1, 0, -983046, 1, 0, -983045, 1, 0, -983044, 1, 0, -983043, 1, 0, -983042, 1, 0, -983041, 1, 0, -1048576, 1, 0, -1048575, 1, 0, -1048574, 1, 0, -1048573, 1, 0, -1048572, 1, 0, -1048571, 1, 0, -1048570, 1, 0, -1048569, 1, 0, -1048568, 1, 0, -1048567, 1, 0, -1048566, 1, 0, -1048565, 1, 0, -1048564, 1, 0, -1048563, 1, 0, -917520, 1, 0, -983027, 1, 0, -851984, 1, 0, -917491, 1, 0, -786448, 1, 0, -851955, 1, 0, -720912, 1, 0, -786419, 1, 0, -655376, 1, 0, -720883, 1, 0, -589840, 1, 0, -589830, 0, 1, -589829, 0, 0, -589828, 0, 1, -589827, 536870912, 0, -589826, 0, 1, -589825, 0, 0, -655360, 0, 1, -655359, 536870912, 0, -655358, 0, 1, -655357, 0, 1, -655356, 536870912, 0, -655347, 1, 0, -524304, 1, 0, -524294, 536870912, 0, -589820, 0, 1, -589811, 1, 0, -458768, 1, 0, -458767, 1, 0, -458766, 1, 0, -458765, 1, 0, -458764, 1, 0, -458763, 1, 0, -458762, 0, 1, -458761, 0, 0, -458760, 0, 1, -458759, 536870912, 0, -458758, 0, 1, -524284, 0, 0, -524275, 1, 0, -393226, 536870912, 0, -393222, 0, 0, -393221, 0, 1, -393220, 536870912, 0, -393219, 536870912, 1, -458748, 0, 1, -458747, 0, 0, -458746, 0, 1, -458745, 536870912, 0, -458739, 1, 0, -327690, 0, 1, -393203, 1, 0, -262154, 0, 0, -262153, 0, 1, -327667, 1, 0, -196617, 536870912, 0, -262137, 0, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -262131, 1, 0, -131081, 0, 1, -196601, 0, 1, -65545, 0, 0, -131065, 536870912, 0, -9, 0, 0, -8, 0, 1, -7, 536870912, 0, -6, 0, 1, -5, 0, 0, -4, 0, 1, -3, 536870912, 0, -65529, 0, 1, 65533, 0, 1, 7, 536870912, 0, 131069, 0, 0, 131070, 0, 1, 131071, 536870912, 0, 65536, 0, 1, 65537, 0, 0, 65538, 0, 1, 65539, 536870912, 0, 65540, 0, 1, 65543, 536870912, 0, 131076, 0, 0, 131079, 0, 1, 196612, 0, 1, 196613, 0, 0, 196614, 0, 1, 196615, 536870912, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( 65534, 0, 0, 65535, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 3, 0, 0, 4, 0, 0 ) @@ -174,17 +174,18 @@ tile_data = PoolIntArray( 65534, 0, 0, 65535, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 3 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -720895, 5, 2, -720894, 5, 0, -720893, 5, 0, -720892, 5, 0, -720891, 536870917, 2, -655355, -1610612731, 0, -524299, 5, 2, -524298, 5, 0, -524297, 5, 0, -524296, 5, 0, -524295, 536870917, 2, -524292, 536870916, 3, -524291, 536870916, 1, -524290, 536870916, 2, -589823, 1610612742, 0, -589819, -1610612731, 0, -458763, -1073741819, 0, -458756, 536870916, 3, -458755, 536870916, 0, -458754, 536870916, 2, -524288, 5, 2, -524287, 5, 0, -524286, -1610612731, 2, -524283, -1610612731, 0, -524282, 5, 0, -524281, 5, 0, -524280, 536870917, 2, -393228, -2147483643, 2, -393227, -1073741819, 0, -393224, 4, 2, -393223, 4, 3, -458752, -1073741819, 2, -458751, 5, 0, -458750, 1610612741, 2, -458744, -536870907, 0, -327692, -1073741819, 2, -327691, -1073741819, 0, -327688, 4, 2, -327687, 4, 0, -327686, 4, 3, -393208, -536870907, 0, -262155, -1073741819, 0, -262152, 4, 2, -262151, 4, 3, -262150, 5, 2, -262149, 5, 0, -262148, -1610612731, 2, -327674, -2147483643, 2, -327673, 536870917, 0, -327672, -536870907, 2, -196619, -1073741819, 2, -196618, 5, 0, -196614, -1073741819, 2, -196613, 5, 0, -196612, 1610612741, 2, -262138, -1073741819, 0, -131082, 5, 0, -131080, 4, 0, -131079, 536870916, 2, -131077, 1610612742, 0, -131074, 536870916, 3, -131073, 536870916, 2, -196602, -1073741819, 0, -65547, -2147483643, 2, -65546, 5, 0, -65544, 536870916, 1, -65543, 536870916, 2, -65541, 1610612742, 0, -131068, 5, 0, -131066, -1073741819, 0, -11, -1073741819, 2, -10, 5, 0, -65532, 1610612742, 0, -65530, -1073741819, 2, -65528, -1610612731, 2, 65526, 1073741829, 2, 65527, 5, 0, 65528, 5, 0, 65529, 1610612741, 2, 4, 1610612742, 0, 8, -1610612731, 0, 65544, -1610612731, 0, 196606, 1073741829, 2, 196607, 5, 0, 131072, 5, 0, 131073, 5, 0, 131074, 1610612741, 2, 131080, -536870907, 2 ) -brick_color = Color( 0.219608, 0.172549, 0.411765, 1 ) -grass_color = Color( 1, 0.509804, 0.713726, 1 ) -wood_color = Color( 0, 0.77, 0.462, 1 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 13 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917519, 0, 0, -917518, 0, 0, -917517, 0, 0, -917516, 0, 0, -917515, 0, 0, -917514, 0, 0, -917513, 0, 0, -917512, 0, 0, -917511, 0, 0, -917510, 0, 0, -917509, 0, 0, -917508, 0, 0, -917507, 0, 0, -917506, 0, 0, -917505, 0, 0, -983040, 0, 0, -983039, 0, 0, -983038, 0, 0, -983037, 0, 0, -983036, 0, 0, -983035, 0, 0, -983034, 0, 0, -983033, 0, 0, -983032, 0, 0, -983031, 0, 0, -983030, 0, 0, -983029, 0, 0, -983028, 0, 0, -851983, 0, 0, -851982, 0, 0, -851981, 0, 0, -851980, 0, 0, -851979, 0, 0, -851978, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -786447, 0, 0, -786446, 0, 0, -786445, 0, 0, -786444, 0, 0, -786443, 0, 0, -786442, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -786433, 0, 0, -851968, 0, 0, -851967, 0, 0, -851966, 0, 0, -851965, 0, 0, -851964, 0, 0, -851963, 0, 0, -851962, 0, 0, -851961, 0, 0, -851960, 0, 0, -851959, 0, 0, -851958, 0, 0, -851957, 0, 0, -851956, 0, 0, -720911, 0, 0, -720910, 0, 0, -720909, 0, 0, -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -720898, 0, 0, -720897, 0, 0, -786432, 0, 0, -786431, 0, 0, -786430, 0, 0, -786429, 0, 0, -786428, 0, 0, -786427, 0, 0, -786426, 0, 0, -786425, 0, 0, -786424, 0, 0, -786423, 0, 0, -786422, 0, 0, -786421, 0, 0, -786420, 0, 0, -655375, 0, 0, -655374, 0, 0, -655373, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720895, 0, 0, -720894, 0, 0, -720893, 0, 0, -720892, 0, 0, -720891, 0, 0, -720890, 0, 0, -720889, 0, 0, -720888, 0, 0, -720887, 0, 0, -720886, 0, 0, -720885, 0, 0, -720884, 0, 0, -589839, 0, 0, -589838, 0, 0, -589837, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -655355, 0, 0, -655354, 0, 0, -655353, 0, 0, -655352, 0, 0, -655351, 0, 0, -655350, 0, 0, -655349, 0, 0, -655348, 0, 0, -524303, 0, 0, -524302, 0, 0, -524301, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -589819, 0, 0, -589818, 0, 0, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -589812, 0, 0, -524283, 0, 0, -524282, 0, 0, -524281, 0, 0, -524280, 0, 0, -524279, 0, 0, -524278, 0, 0, -524277, 0, 0, -524276, 0, 0, -458744, 0, 0, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -458740, 0, 0, -393209, 536870914, 3, -393208, 0, 0, -393207, 0, 0, -393206, 0, 0, -393205, 0, 0, -393204, 0, 0, -327673, 2, 2, -327672, 0, 0, -327671, 0, 0, -327670, 0, 0, -327669, 0, 0, -327668, 0, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -8, -24 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -232,5 +233,3 @@ position = Vector2( -30, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 14 )] position = Vector2( -109, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/3-4.tscn b/src/map/3-4.tscn index 0e0ae99..b7164df 100644 --- a/src/map/3-4.tscn +++ b/src/map/3-4.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -23,7 +23,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 17 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -60,7 +60,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 18 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.219608, 0.172549, 0.411765, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -81,7 +81,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 15 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 1, 0.509804, 0.713726, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -102,7 +102,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 15 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0, 0.77, 0.462, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -132,7 +132,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 17 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.792157, 0.576471, 0.85098, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -154,15 +154,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) -color_wood = Color( 0, 0.77, 0.462, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -851981, 536870913, 0, -851980, 536870913, 0, -851979, 536870913, 0, -851978, 536870913, 0, -851977, 536870913, 0, -851976, 536870913, 0, -851975, 536870913, 0, -851974, 536870913, 0, -851973, 536870913, 0, -851972, 536870913, 0, -851971, 536870913, 0, -851970, 536870913, 0, -851969, 536870913, 0, -917504, 536870913, 0, -917503, 536870913, 0, -917502, 536870913, 0, -917501, 536870913, 0, -917500, 536870913, 0, -917499, 536870913, 0, -917498, 536870913, 0, -917497, 536870913, 0, -917496, 536870913, 0, -917495, 536870913, 0, -917494, 536870913, 0, -917493, 536870913, 0, -917492, 536870913, 0, -917491, 536870913, 0, -917490, 536870913, 0, -917489, 536870913, 0, -917488, 536870913, 0, -917487, 536870913, 0, -917486, 536870913, 0, -917485, 536870913, 0, -917484, 536870913, 0, -917483, 536870913, 0, -917482, 536870913, 0, -786445, 536870913, 0, -851946, 536870913, 0, -720909, 536870913, 0, -786410, 536870913, 0, -655373, 536870913, 0, -720874, 536870913, 0, -589837, 536870913, 0, -655338, 536870913, 0, -524301, 536870913, 0, -589802, 536870913, 0, -458765, 536870913, 0, -458764, 536870913, 0, -458763, 0, 0, -458762, 0, 1, -458761, 536870912, 0, -458760, 0, 1, -458759, 536870912, 0, -458758, 0, 1, -524284, 0, 1, -524283, 0, 0, -524282, 536870912, 1, -524281, 536870912, 1, -524280, 536870912, 1, -524279, 536870912, 0, -524278, 0, 1, -524277, 0, 1, -524276, 0, 0, -524275, 0, 1, -524274, 536870912, 0, -524266, 536870913, 0, -393227, 0, 0, -393222, 0, 0, -393221, 0, 1, -393220, 536870912, 0, -393219, 0, 1, -393218, 0, 0, -393217, 0, 1, -458752, 536870912, 0, -458751, 0, 1, -458738, 0, 1, -458730, 536870913, 0, -327691, 0, 1, -327686, 0, 1, -393202, 0, 0, -393201, 0, 1, -393200, 536870912, 0, -393199, 0, 1, -393198, 0, 0, -393197, 0, 1, -393196, 536870912, 0, -393195, 536870913, 0, -393194, 536870913, 0, -262155, 0, 0, -262151, 0, 1, -262150, 536870912, 0, -327660, 0, 1, -196619, 0, 1, -196614, 0, 1, -262124, 536870912, 0, -131083, 536870912, 0, -131078, 0, 0, -131077, 0, 1, -131076, 536870912, 0, -131075, 0, 1, -196591, 0, 0, -196590, 0, 1, -196589, 536870912, 0, -196588, 0, 1, -65547, 536870912, 0, -131069, 0, 0, -131068, 0, 1, -131055, 0, 1, -11, 0, 1, -65519, 536870912, 0, 65525, 536870912, 0, 17, 0, 1, 131061, 0, 1, 65547, 0, 0, 65548, 0, 1, 65549, 536870912, 0, 65550, 0, 1, 65551, 0, 0, 65552, 0, 1, 65553, 536870912, 0, 196597, 0, 0, 131083, 0, 1, 262133, 0, 0, 262134, 0, 1, 262135, 0, 1, 262136, 536870912, 0, 262137, 0, 1, 262138, 0, 0, 262139, 0, 1, 262140, 536870912, 0, 262141, 0, 1, 196619, 536870912, 0, 327677, 536870912, 0, 262155, 0, 1, 393213, 0, 1, 393214, 0, 0, 393215, 0, 1, 327680, 536870912, 0, 327681, 0, 1, 327682, 0, 0, 327683, 0, 1, 327684, 0, 1, 327685, 0, 1, 327686, 0, 1, 327687, 536870912, 0, 327688, 0, 1, 327689, 0, 0, 327690, 0, 1, 327691, 536870912, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, 0, 0, 327678, 0, 0, 327679, 0, 0, 262144, 0, 0, 262145, 0, 0, 262146, 0, 0, 262147, 0, 0, 262148, 0, 0, 262149, 0, 0, 262150, 0, 0, 262151, 0, 0, 262152, 0, 0, 262153, 0, 0, 262154, 0, 0 ) @@ -171,17 +171,18 @@ tile_data = PoolIntArray( 11, 0, 0, 12, 0, 0, 13, 0, 0, 14, 0, 0, 15, 0, 0, 16, z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -524296, 5, 2, -524295, 5, 0, -524294, 5, 0, -524293, 536870917, 2, -589819, 5, 2, -589818, 5, 0, -589817, 5, 2, -589816, 5, 0, -589815, 5, 0, -589814, 536870917, 2, -589813, 5, 0, -589812, 536870917, 2, -458757, -536870907, 0, -458755, 5, 2, -458754, 5, 0, -458753, 5, 0, -524288, 536870917, 2, -393226, 5, 0, -393225, 5, 0, -393224, 1610612741, 2, -458746, 1610612742, 0, -458741, 1610612742, 0, -327690, -1073741819, 0, -327685, 1073741829, 2, -327684, 5, 0, -327683, 1610612741, 2, -393216, 1610612742, 0, -393210, 1610612742, 0, -393206, 5, 2, -393205, 5, 0, -393204, -1610612731, 2, -262156, -2147483643, 2, -262154, -536870907, 2, -327680, 1610612742, 0, -327677, 4, 2, -327676, 4, 3, -327674, 5, 0, -327670, 5, 0, -327669, 5, 0, -327668, 5, 0, -327665, 536870916, 3, -327664, 536870916, 1, -327663, 536870916, 2, -196620, -1073741819, 0, -196609, 5, 2, -262144, 5, 0, -262143, -1610612731, 2, -262141, 4, 2, -262140, 4, 3, -262134, -1073741819, 2, -262133, 5, 0, -262132, 1610612741, 2, -262129, 536870916, 3, -262128, 536870916, 0, -262127, 536870916, 2, -131084, -1073741819, 0, -131081, 5, 2, -131080, -1610612731, 2, -131073, 5, 0, -196608, 5, 0, -196607, 5, 0, -65548, -1073741819, 2, -65546, -1610612730, 0, -65545, 5, 0, -65544, 5, 0, -65537, -1073741819, 2, -131072, 5, 0, -131071, 1610612741, 2, -131059, 5, 0, -9, -1073741819, 2, -8, 1610612741, 2, -5, 4, 2, -4, 4, 1, -3, 536870916, 0, -2, 4, 3, -65532, 1610612742, 0, -65524, -1073741819, 2, -65523, 1610612742, 0, -65522, -536870907, 2, -65518, -1610612731, 2, 65531, 4, 2, 65532, 4, 0, 65533, 4, 1, 65534, 4, 3, 4, 1610612741, 0, 7, 5, 2, 8, 5, 0, 9, -1610612731, 2, 13, 1610612742, 0, 18, 5, 0, 131067, 4, 2, 131068, 4, 1, 131069, 536870916, 0, 131070, 536870916, 2, 65543, 5, 0, 65544, 5, 0, 65545, 5, 0, 65554, 5, 0, 131076, 536870916, 3, 131077, 536870916, 0, 131078, 4, 3, 131079, -1073741819, 2, 131080, 5, 0, 131081, 1610612741, 2, 131084, 5, 2, 131085, 1610612741, 0, 131086, 1610612741, 0, 131087, 1610612741, 0, 131088, 1610612741, 0, 131089, 1610612741, 0, 131090, -536870907, 2, 196609, 5, 0, 196612, 4, 2, 196613, 4, 1, 196614, 4, 3, 196616, 1610612742, 0, 196620, -1610612731, 0, 196623, 1073741829, 2, 196624, 1610612741, 2, 327671, 1073741829, 2, 327672, 5, 0, 327673, 5, 0, 327674, 5, 0, 327675, 5, 0, 327676, -1610612731, 2, 262145, 1610612742, 0, 262152, 1610612742, 0, 262156, -1610612731, 0, 393212, -1073741819, 0, 327692, -1610612731, 0, 458748, 1073741829, 2, 458749, 5, 0, 458750, 5, 0, 458751, 5, 0, 393216, 5, 0, 393217, 1610612741, 2, 393224, 1073741829, 2, 393225, 5, 0, 393226, 5, 0, 393227, 5, 0, 393228, 1610612741, 2 ) -brick_color = Color( 0.219608, 0.172549, 0.411765, 1 ) -grass_color = Color( 1, 0.509804, 0.713726, 1 ) -wood_color = Color( 0, 0.77, 0.462, 1 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 13 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -786444, 0, 0, -786443, 0, 0, -786442, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -786433, 0, 0, -851968, 0, 0, -851967, 0, 0, -851966, 0, 0, -851965, 0, 0, -851964, 0, 0, -851963, 0, 0, -851962, 0, 0, -851961, 0, 0, -851960, 0, 0, -851959, 0, 0, -851958, 0, 0, -851957, 0, 0, -851956, 0, 0, -851955, 0, 0, -851954, 0, 0, -851953, 0, 0, -851952, 0, 0, -851951, 0, 0, -851950, 0, 0, -851949, 0, 0, -851948, 0, 0, -851947, 0, 0, -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -720898, 0, 0, -720897, 0, 0, -786432, 0, 0, -786431, 0, 0, -786430, 0, 0, -786429, 0, 0, -786428, 0, 0, -786427, 0, 0, -786426, 0, 0, -786425, 0, 0, -786424, 0, 0, -786423, 0, 0, -786422, 0, 0, -786421, 0, 0, -786420, 0, 0, -786419, 0, 0, -786418, 0, 0, -786417, 0, 0, -786416, 0, 0, -786415, 0, 0, -786414, 0, 0, -786413, 0, 0, -786412, 0, 0, -786411, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720895, 0, 0, -720894, 0, 0, -720893, 0, 0, -720892, 0, 0, -720891, 0, 0, -720890, 0, 0, -720889, 0, 0, -720888, 0, 0, -720887, 0, 0, -720886, 0, 0, -720885, 0, 0, -720884, 0, 0, -720883, 0, 0, -720882, 0, 0, -720881, 0, 0, -720880, 0, 0, -720879, 0, 0, -720878, 0, 0, -720877, 0, 0, -720876, 0, 0, -720875, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -589827, 0, 0, -589826, 0, 0, -589825, 0, 0, -655360, 0, 0, -655359, 0, 0, -655358, 0, 0, -655357, 0, 0, -655356, 0, 0, -655355, 0, 0, -655354, 0, 0, -655353, 0, 0, -655352, 0, 0, -655351, 0, 0, -655350, 0, 0, -655349, 0, 0, -655348, 0, 0, -655347, 0, 0, -655346, 0, 0, -655345, 0, 0, -655344, 0, 0, -655343, 0, 0, -655342, 0, 0, -655341, 0, 0, -655340, 0, 0, -655339, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -524294, 0, 0, -524293, 0, 0, -524292, 0, 0, -524291, 0, 0, -524290, 0, 0, -524289, 0, 0, -589824, 0, 0, -589823, 0, 0, -589822, 0, 0, -589821, 0, 0, -589820, 0, 0, -589819, 0, 0, -589818, 0, 0, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -589812, 0, 0, -589811, 0, 0, -589810, 0, 0, -589809, 0, 0, -589808, 0, 0, -589807, 0, 0, -589806, 0, 0, -589805, 0, 0, -589804, 0, 0, -589803, 0, 0, -458757, 0, 0, -458756, 0, 0, -458755, 0, 0, -458754, 0, 0, -458753, 0, 0, -524288, 0, 0, -524287, 2, 2, -524286, 536870914, 3, -524285, 2, 2, -524273, 536870912, 0, -524272, 536870912, 0, -524271, 0, 0, -524270, 0, 0, -524269, 0, 0, -524268, 0, 0, -524267, 0, 0, -458737, 536870912, 0, -458736, 536870912, 0, -458735, 0, 0, -458734, 0, 0, -458733, 0, 0, -458732, 0, 0, -458731, 0, 0 ) -tile_color = Color( 0.792157, 0.576471, 0.85098, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 16, -8 ) +script = ExtResource( 3 ) bounds = Rect2( 0, 0, 48, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -227,5 +228,3 @@ position = Vector2( -80, 16 ) [node name="Note" parent="Actors" instance=ExtResource( 14 )] position = Vector2( 123, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/3-5.tscn b/src/map/3-5.tscn index cd4f6af..bfb913e 100644 --- a/src/map/3-5.tscn +++ b/src/map/3-5.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -20,7 +20,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 14 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -57,7 +57,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 15 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -78,7 +78,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 12 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0, 0.529412, 0.317647, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -99,7 +99,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 12 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -129,7 +129,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 14 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,13 +151,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -786449, 1, 0, -786448, 1, 0, -786447, 1, 0, -786446, 1, 0, -786445, 1, 0, -786444, 1, 0, -786443, 1, 0, -786442, 1, 0, -786441, 1, 0, -786440, 1, 0, -786439, 1, 0, -786438, 1, 0, -786437, 1, 0, -786436, 1, 0, -786435, 1, 0, -786434, 1, 0, -786433, 1, 0, -851968, 1, 0, -851967, 1, 0, -851966, 1, 0, -851965, 1, 0, -851964, 1, 0, -851963, 1, 0, -851962, 1, 0, -851961, 1, 0, -851960, 1, 0, -851959, 1, 0, -851958, 1, 0, -851957, 1, 0, -851956, 1, 0, -720913, 1, 0, -786420, 1, 0, -655377, 1, 0, -720884, 1, 0, -589841, 1, 0, -655348, 1, 0, -524305, 1, 0, -589812, 1, 0, -458769, 1, 0, -524276, 1, 0, -393233, 1, 0, -393226, 0, 0, -393225, 536870912, 1, -393224, 536870912, 0, -393223, 536870912, 1, -393222, 536870912, 1, -393221, 536870912, 1, -393220, 536870912, 1, -393219, 0, 0, -393218, 536870912, 1, -393217, 536870912, 1, -458752, 536870912, 0, -458749, 0, 0, -458748, 536870912, 1, -458747, 536870912, 0, -458740, 1, 0, -327697, 1, 0, -327690, 0, 0, -393211, 536870912, 1, -393204, 1, 0, -262161, 1, 0, -262154, 536870912, 1, -327675, 0, 0, -327668, 1, 0, -196625, 1, 0, -196624, 1, 0, -196623, 1, 0, -196622, 1, 0, -196621, 1, 0, -196620, 1, 0, -196619, 536870912, 1, -196618, 536870912, 0, -196615, 0, 0, -196614, 536870912, 1, -196613, 0, 0, -196612, 536870912, 1, -196611, 536870912, 0, -196610, 536870912, 1, -196609, 0, 0, -262144, 536870912, 1, -262143, 536870912, 1, -262142, 536870912, 0, -262141, 536870912, 1, -262140, 0, 0, -262139, 536870912, 1, -262138, 536870912, 0, -262137, 1, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -131083, 0, 0, -196602, 536870912, 1, -65547, 536870912, 1, -65540, 0, 0, -131072, 0, 1, -131066, 0, 0, -11, 536870912, 0, -65530, 536870912, 1, 65525, 536870912, 1, 65526, 0, 0, 65527, 536870912, 1, 65528, 536870912, 0, 65529, 536870912, 1, 65530, 536870912, 1, 65531, 0, 0, 65532, 536870912, 1, 65533, 536870912, 1, 65534, 536870912, 0, 65535, 536870912, 1, 0, 536870912, 1, 1, 0, 0, 2, 536870912, 1, 3, 536870912, 1, 4, 536870912, 0, 5, 536870912, 1, 6, 536870912, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] @@ -165,13 +167,18 @@ tile_data = PoolIntArray( -786449, 1, 0, -786448, 1, 0, -786447, 1, 0, -786446, z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -524297, 5, 2, -524296, 536870917, 0, -524295, 536870917, 0, -524294, 536870917, 2, -458763, 5, 2, -458762, 5, 0, -458761, 5, 0, -458760, 5, 0, -458759, 5, 0, -458758, 5, 0, -458757, 5, 0, -458756, 536870917, 2, -524288, 5, 2, -524287, 5, 0, -524286, 5, 0, -524285, 536870917, 2, -393227, -1073741819, 0, -458746, 4, 3, -327691, -1073741819, 0, -327688, 1610612742, 0, -327686, 536870916, 3, -327685, 536870916, 2, -327684, 1073741829, 2, -327683, 5, 0, -327682, 5, 0, -327681, 5, 0, -393216, 1610612741, 2, -393215, 4, 2, -393214, 4, 3, -393210, 4, 0, -393209, 4, 3, -262156, -2147483643, 2, -262155, 536870917, 0, -262152, 1610612741, 0, -262150, 536870916, 3, -262149, 536870916, 2, -327679, 4, 2, -327678, 4, 3, -327674, 4, 1, -327673, 536870916, 2, -196620, -1073741819, 0, -131084, -1073741819, 0, -131080, 4, 2, -131079, 4, 1, -131078, 4, 3, -196606, 1073741829, 2, -196605, 5, 0, -196604, 5, 0, -196603, 5, 0, -196601, -1610612731, 2, -65548, -1073741819, 2, -65546, -1610612731, 2, -65544, 4, 2, -65543, 536870916, 0, -65542, 4, 3, -65538, 5, 0, -131065, -1610612731, 0, -10, -1073741819, 0, -7, 536870916, 3, -6, 536870916, 2, -2, 1610612742, 0, -65534, 5, 2, -65533, 5, 0, -65532, 536870917, 2, -65529, -1610612731, 0, 7, -1610612731, 0, 131062, 1073741829, 2, 131063, 536870917, 0, 131064, 536870917, 0, 131065, 1610612741, 2, 131070, 1073741829, 2, 131071, 5, 0, 65536, 5, 0, 65537, 5, 0, 65538, 1610612741, 2, 65540, 5, 0, 65541, 5, 0, 65542, 5, 0, 65543, 1610612741, 2 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 10 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -720912, 0, 0, -720911, 0, 0, -720910, 0, 0, -720909, 0, 0, -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -720898, 0, 0, -720897, 0, 0, -786432, 0, 0, -786431, 0, 0, -786430, 0, 0, -786429, 0, 0, -786428, 0, 0, -786427, 0, 0, -786426, 0, 0, -786425, 0, 0, -786424, 0, 0, -786423, 0, 0, -786422, 0, 0, -786421, 0, 0, -655376, 0, 0, -655375, 0, 0, -655374, 0, 0, -655373, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720895, 0, 0, -720894, 0, 0, -720893, 0, 0, -720892, 0, 0, -720891, 0, 0, -720890, 0, 0, -720889, 0, 0, -720888, 0, 0, -720887, 0, 0, -720886, 0, 0, -720885, 0, 0, -589840, 0, 0, -589839, 0, 0, -589838, 0, 0, -589837, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -589827, 0, 0, -589826, 0, 0, -589825, 0, 0, -655360, 0, 0, -655359, 0, 0, -655358, 0, 0, -655357, 0, 0, -655356, 0, 0, -655355, 0, 0, -655354, 0, 0, -655353, 0, 0, -655352, 0, 0, -655351, 0, 0, -655350, 0, 0, -655349, 0, 0, -524304, 0, 0, -524303, 0, 0, -524302, 0, 0, -524301, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -524294, 0, 0, -524293, 0, 0, -524292, 0, 0, -524291, 0, 0, -524290, 0, 0, -524289, 0, 0, -589824, 0, 0, -589823, 0, 0, -589822, 0, 0, -589821, 0, 0, -589820, 0, 0, -589819, 0, 0, -589818, 0, 0, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -458768, 0, 0, -458767, 0, 0, -458766, 0, 0, -458765, 0, 0, -458764, 0, 0, -458763, 0, 0, -458762, 0, 0, -458761, 0, 0, -458760, 0, 0, -458759, 0, 0, -458758, 0, 0, -458757, 0, 0, -458756, 0, 0, -458755, 0, 0, -458754, 0, 0, -458753, 0, 0, -524288, 0, 0, -524287, 0, 0, -524286, 0, 0, -524285, 0, 0, -524284, 0, 0, -524283, 0, 0, -524282, 0, 0, -524281, 0, 0, -524280, 0, 0, -524279, 0, 0, -524278, 0, 0, -524277, 0, 0, -393232, 0, 0, -393231, 0, 0, -393230, 0, 0, -393229, 0, 0, -393228, 0, 0, -393227, 0, 0, -458751, 536870914, 3, -458750, 2, 3, -458746, 0, 0, -458745, 0, 0, -458744, 0, 0, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -327696, 0, 0, -327695, 0, 0, -327694, 0, 0, -327693, 0, 0, -327692, 0, 0, -327691, 0, 0, -393210, 0, 0, -393209, 0, 0, -393208, 0, 0, -393207, 0, 0, -393206, 0, 0, -393205, 0, 0, -262160, 0, 0, -262159, 0, 0, -262158, 0, 0, -262157, 0, 0, -262156, 0, 0, -262155, 0, 0, -327674, 0, 0, -327673, 0, 0, -327672, 0, 0, -327671, 0, 0, -327670, 0, 0, -327669, 0, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -16, -24 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -198,5 +205,3 @@ position = Vector2( 28, -8 ) [node name="Note" parent="Actors" instance=ExtResource( 11 )] position = Vector2( -117, -53 ) - -[editable path="GameCamera"] diff --git a/src/map/3-6.tscn b/src/map/3-6.tscn index e761741..26af97a 100644 --- a/src/map/3-6.tscn +++ b/src/map/3-6.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -20,7 +20,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 14 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -57,7 +57,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 15 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -78,7 +78,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 12 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0, 0.529412, 0.317647, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -99,7 +99,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 12 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -129,7 +129,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 14 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,13 +151,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -589841, 536870913, 0, -589840, 536870913, 0, -589839, 536870913, 0, -589838, 536870913, 0, -589837, 536870913, 0, -589835, 536870912, 1, -589834, 0, 0, -589833, 536870912, 1, -589832, 536870912, 1, -589831, 536870912, 0, -589830, 536870912, 1, -589829, 536870912, 1, -589828, 0, 0, -589827, 536870912, 1, -589826, 536870912, 1, -589825, 536870912, 0, -655360, 536870912, 1, -655359, 0, 0, -655358, 536870912, 1, -655357, 536870912, 0, -655356, 536870912, 1, -655355, 536870912, 0, -655354, 536870912, 1, -524305, 536870913, 0, -524301, 0, 0, -524300, 536870912, 1, -524299, 536870912, 0, -589818, 0, 0, -589817, 536870912, 1, -589816, 536870912, 0, -458769, 536870913, 0, -458765, 536870912, 1, -524280, 536870912, 1, -393233, 536870913, 0, -393229, 0, 0, -458744, 0, 0, -327697, 536870913, 0, -327693, 0, 0, -393211, 0, 0, -393210, 536870912, 1, -393209, 536870912, 0, -393208, 536870912, 1, -262161, 536870913, 0, -262157, 536870912, 1, -262156, 0, 0, -262155, 536870912, 1, -262154, 536870912, 0, -327675, 0, 0, -196625, 536870913, 0, -196618, 536870912, 1, -262139, 536870912, 1, -131089, 536870913, 0, -131082, 0, 0, -131081, 536870912, 1, -131080, 536870912, 1, -131079, 536870912, 0, -131078, 536870912, 1, -196603, 536870912, 0, -65553, 536870913, 0, -131067, 536870912, 0, -17, 536870913, 0, -6, 536870912, 1, -65531, 536870912, 1, 65519, 536870913, 0, 65520, 536870913, 0, 65521, 536870913, 0, 65522, 536870913, 0, 65523, 536870913, 0, 65524, 536870913, 0, 65525, 536870913, 0, 65526, 536870913, 0, 65527, 536870913, 0, 65528, 536870913, 0, 65529, 536870913, 0, 65530, 0, 0, 65531, 536870912, 1, 65532, 536870912, 1, 65533, 0, 0, 65534, 536870912, 1, 65535, 536870912, 1, 0, 536870912, 0, 1, 536870912, 1, 2, 536870912, 1, 3, 0, 0, 4, 536870912, 1, 5, 536870912, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( -5, 0, 0, -4, 0, 0, -3, 0, 0, -2, 0, 0, -1, 0, 0, -65536, 0, 0, -65535, 0, 0, -65534, 0, 0, -65533, 0, 0, -65532, 0, 0 ) @@ -166,13 +168,18 @@ tile_data = PoolIntArray( -5, 0, 0, -4, 0, 0, -3, 0, 0, -2, 0, 0, -1, 0, 0, -655 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -655372, 5, 2, -655371, 5, 0, -655370, 5, 0, -655369, 5, 0, -655368, 5, 0, -655367, 5, 0, -655366, 5, 0, -655365, 536870917, 2, -655362, 5, 2, -655361, 5, 0, -720896, 5, 0, -720895, 5, 0, -720894, 536870917, 2, -589836, -1073741819, 0, -655353, 536870916, 3, -655352, 536870916, 1, -655351, 4, 3, -524296, 1610612742, 0, -524293, 1073741829, 2, -524292, 1610612742, 0, -524291, 5, 0, -524290, 1610612741, 2, -589822, 1610612742, 0, -589815, 536870916, 1, -589814, 4, 3, -458766, -2147483643, 2, -458764, 1610612741, 2, -458760, 1610612741, 0, -458756, 1610612742, 0, -524287, 5, 2, -524286, 5, 0, -524285, -1610612731, 2, -524284, 4, 2, -524283, 4, 3, -524279, 4, 0, -524278, 4, 3, -393230, -1073741819, 0, -393221, 5, 2, -393220, 5, 0, -393219, -1610612731, 2, -458751, -1073741819, 2, -458750, 5, 0, -458749, 1610612741, 2, -458743, 536870916, 1, -458742, 4, 3, -327694, -1073741819, 0, -327685, 5, 0, -327684, 5, 0, -327683, 5, 0, -327681, 536870916, 3, -393216, 536870916, 2, -393207, 536870916, 0, -393206, 536870916, 2, -262158, -1073741819, 0, -262149, -1073741819, 2, -262148, 5, 0, -262147, 1610612741, 2, -262145, 536870916, 3, -327680, 536870916, 2, -327673, 4, 2, -327672, 4, 0, -327671, 536870916, 2, -196622, -1073741819, 2, -196621, 1610612741, 0, -196620, 1610612741, 0, -196619, 1610612741, 0, -196617, -1610612731, 2, -262140, -2147483643, 2, -196604, -1073741819, 0, -65545, 1073741829, 2, -65544, 5, 0, -65543, 1610612741, 2, -131072, 5, 0, -131068, -1073741819, 2, -131066, -1610612731, 2, -14, 4, 2, -13, 4, 0, -12, 4, 3, -65536, 1610612742, 0, -65530, -1610612731, 0, 65521, 536870916, 3, 65522, 536870916, 0, 65523, 536870916, 1, 65524, 536870916, 0, 65525, 536870916, 2, 6, -1610612731, 0, 131058, 4, 2, 131059, 4, 0, 131060, 4, 3, 131068, 1073741829, 2, 131069, 1610612741, 0, 131070, 1610612741, 2, 65537, 1073741829, 2, 65538, 1610612741, 0, 65539, 1610612741, 0, 65540, 1610612741, 0, 65541, 1610612741, 0, 65542, 1610612741, 2 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 10 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -524304, 0, 0, -524303, 0, 0, -524302, 0, 0, -458768, 536870912, 0, -458767, 536870912, 0, -458766, 0, 0, -393232, 536870912, 0, -393231, 536870912, 0, -393230, 0, 0, -327696, 0, 0, -327695, 0, 0, -327694, 0, 0, -262160, 0, 0, -262159, 0, 0, -262158, 0, 0, -196624, 0, 0, -196623, 0, 0, -196622, 0, 0, -196621, 0, 0, -196620, 0, 0, -196619, 0, 0, -131088, 0, 0, -131087, 0, 0, -131086, 0, 0, -131085, 0, 0, -131084, 0, 0, -131083, 0, 0, -65552, 0, 0, -65551, 0, 0, -65550, 0, 0, -65549, 0, 0, -65548, 0, 0, -65547, 0, 0, -65546, 0, 0, -65545, 0, 0, -65544, 0, 0, -65543, 0, 0, -65542, 536870914, 2, -16, 0, 0, -15, 0, 0, -14, 0, 0, -13, 0, 0, -12, 0, 0, -11, 0, 0, -10, 0, 0, -9, 0, 0, -8, 0, 0, -7, 0, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -16, -36 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -202,5 +209,3 @@ position = Vector2( -89, -48 ) [node name="Note" parent="Actors" instance=ExtResource( 11 )] position = Vector2( -125, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/3-7.tscn b/src/map/3-7.tscn index a15fbf4..a739ca5 100644 --- a/src/map/3-7.tscn +++ b/src/map/3-7.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -20,7 +20,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 14 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -57,7 +57,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 15 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -78,7 +78,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 12 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0, 0.529412, 0.317647, 1 ) +5/modulate = Color( 0.513726, 0.529412, 0, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -99,7 +99,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 12 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.670588, 0.215686, 0.541176, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -129,7 +129,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 14 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,13 +151,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 2 -color_solid = Color( 0.792157, 0.576471, 0.85098, 1 ) -color_back = Color( 0.219608, 0.172549, 0.411765, 1 ) -color_grass = Color( 1, 0.509804, 0.713726, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) +color_grass = Color( 0.513726, 0.529412, 0, 1 ) +color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -1114125, 1, 0, -1114124, 1, 0, -1114123, 1, 0, -1114122, 1, 0, -1114121, 1, 0, -1114120, 1, 0, -1114119, 1, 0, -1114118, 1, 0, -1114117, 1, 0, -1114116, 1, 0, -1114115, 1, 0, -1114114, 1, 0, -1114113, 1, 0, -1179648, 1, 0, -1179647, 1, 0, -1179646, 1, 0, -1179645, 1, 0, -1179644, 1, 0, -1179643, 1, 0, -1179642, 1, 0, -1179641, 1, 0, -1179640, 1, 0, -1179639, 1, 0, -1179638, 1, 0, -1179637, 1, 0, -1179636, 1, 0, -1179635, 1, 0, -1179634, 1, 0, -1179633, 1, 0, -1179632, 1, 0, -1048589, 1, 0, -1114096, 1, 0, -983053, 1, 0, -1048560, 1, 0, -917517, 1, 0, -983024, 1, 0, -851981, 1, 0, -917488, 1, 0, -786445, 1, 0, -851952, 1, 0, -720909, 1, 0, -720898, 0, 0, -720897, 536870912, 1, -786432, 536870912, 0, -786431, 536870912, 1, -786430, 0, 0, -786429, 536870912, 1, -786428, 536870912, 0, -786427, 536870912, 1, -786426, 0, 0, -786425, 536870912, 1, -786424, 536870912, 0, -786423, 536870912, 1, -786416, 1, 0, -655373, 1, 0, -655362, 536870912, 1, -720887, 536870912, 0, -720880, 1, 0, -589837, 1, 0, -589826, 536870912, 0, -655351, 536870912, 1, -655350, 0, 0, -655349, 536870912, 1, -655348, 536870912, 0, -655347, 536870912, 1, -655344, 1, 0, -524301, 1, 0, -524295, 0, 0, -524291, 0, 0, -524290, 536870912, 1, -524289, 536870912, 1, -589824, 536870912, 0, -589811, 536870912, 0, -589808, 1, 0, -458765, 1, 0, -458764, 1, 0, -458763, 1, 0, -458762, 0, 0, -458761, 536870912, 1, -458760, 536870912, 0, -458759, 536870912, 1, -524275, 536870912, 1, -524272, 1, 0, -393226, 536870912, 1, -458743, 0, 0, -458742, 536870912, 1, -458741, 0, 0, -458740, 536870912, 1, -458739, 536870912, 0, -458738, 1, 0, -458737, 1, 0, -458736, 1, 0, -327690, 536870912, 0, -393207, 536870912, 1, -262154, 536870912, 1, -327671, 0, 0, -196618, 0, 0, -262135, 536870912, 1, -131082, 0, 0, -131081, 536870912, 1, -131080, 0, 0, -131079, 0, 1, -131078, 536870912, 0, -196599, 536870912, 0, -65542, 536870912, 0, -131063, 536870912, 1, -6, 536870912, 1, -65527, 536870912, 0, 65530, 0, 0, 65531, 536870912, 1, 65532, 536870912, 1, 65533, 0, 0, 65534, 536870912, 1, 65535, 536870912, 0, 0, 536870912, 1, 1, 536870912, 1, 2, 0, 0, 3, 536870912, 1, 4, 536870912, 0, 5, 536870912, 1, 6, 536870912, 1, 7, 0, 0, 8, 536870912, 1, 9, 536870912, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( -5, 0, 0, -4, 0, 0, -3, 0, 0, -2, 0, 0, -1, 0, 0, -65536, 0, 0, -65535, 0, 0, -65534, 0, 0, -65533, 0, 0, -65532, 0, 0, -65531, 0, 0, -65530, 0, 0, -65529, 0, 0, -65528, 0, 0 ) @@ -166,13 +168,18 @@ tile_data = PoolIntArray( -5, 0, 0, -4, 0, 0, -3, 0, 0, -2, 0, 0, -1, 0, 0, -655 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -786443, 536870916, 3, -786442, 4, 1, -786441, 4, 0, -786440, 4, 3, -786435, -2147483643, 2, -786434, 5, 0, -786433, 5, 0, -851968, 5, 0, -851967, 5, 0, -851966, 5, 0, -851965, 536870917, 2, -851961, 5, 2, -851960, 5, 0, -851959, 5, 0, -851958, -1610612731, 2, -720907, 536870916, 1, -720906, 536870916, 0, -720905, 4, 1, -720904, 536870916, 0, -720899, 5, 0, -786422, -1610612731, 0, -655371, 4, 2, -655370, 4, 1, -655369, 536870916, 0, -655368, 536870916, 2, -655363, 5, 0, -720896, 4, 2, -720895, 4, 0, -720894, 4, 3, -720893, 1073741829, 2, -720892, 1610612742, 0, -720891, 5, 0, -720890, 1610612742, 0, -720889, 1610612741, 2, -720886, -1073741819, 2, -720885, 5, 0, -720884, -1610612731, 2, -589834, 4, 2, -589833, 4, 1, -589832, 4, 3, -589830, 5, 2, -589829, 5, 0, -589828, 5, 0, -589827, 1610612741, 2, -655360, 4, 2, -655359, 4, 1, -655358, 4, 3, -655356, 1610612742, 0, -655354, 1610612742, 0, -524298, 4, 2, -524297, 4, 0, -524296, 536870916, 2, -589820, 1610612742, 0, -589818, 1610612741, 2, -589816, 536870916, 3, -589815, 536870916, 0, -589814, 536870916, 2, -589812, -1073741819, 0, -458758, 5, 0, -458755, 1610612742, 0, -524287, 536870916, 3, -524286, 536870916, 2, -524284, 1610612741, 0, -524280, 536870916, 3, -524279, 536870916, 1, -524278, 536870916, 2, -524276, -1073741819, 0, -393227, -2147483643, 2, -393225, 5, 0, -393224, 5, 0, -393223, 5, 0, -393222, 1610612741, 2, -393220, 5, 2, -393219, 5, 0, -393218, -1610612731, 2, -458747, 536870916, 3, -458746, 536870916, 2, -327691, -1073741819, 0, -327687, 4, 2, -327686, 4, 3, -327684, 5, 0, -327683, 5, 0, -327682, 5, 0, -393211, 536870916, 3, -393210, 536870916, 2, -393208, -2147483643, 2, -393206, 5, 0, -393205, 5, 0, -393204, 1610612741, 2, -262155, -1073741819, 0, -262148, -1073741819, 2, -262147, 5, 0, -262146, 1610612741, 2, -327672, -2147483643, 0, -196619, -1073741819, 2, -196617, 5, 0, -196616, -1610612731, 2, -262143, 5, 2, -262142, 5, 0, -262141, -1610612731, 2, -262136, -2147483643, 0, -196607, -1073741819, 2, -196606, 5, 0, -196605, 1610612741, 2, -196600, -1073741819, 2, -196598, -1610612731, 2, -65544, -1073741819, 2, -65543, 5, 0, -131070, 1610612742, 0, -131062, -1610612731, 0, -7, -1073741819, 0, -65534, 1610612742, 0, -65526, -1610612731, 0, 65529, -1073741819, 0, 10, -1610612731, 0, 131065, 1073741829, 2, 131066, 5, 0, 131067, 5, 0, 131068, 5, 0, 131069, 1610612741, 2, 65536, 4, 2, 65537, 536870916, 0, 65538, 536870916, 1, 65539, 536870916, 0, 65540, 536870916, 2, 65542, 1073741829, 2, 65543, 1610612741, 0, 65544, 1610612741, 0, 65545, 1610612741, 0, 65546, 1610612741, 2 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) +grass_color = Color( 0.513726, 0.529412, 0, 1 ) +wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 10 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1048588, 0, 0, -1048587, 0, 0, -1048586, 0, 0, -1048585, 0, 0, -1048584, 0, 0, -1048583, 0, 0, -1048582, 0, 0, -1048581, 0, 0, -1048580, 0, 0, -1048579, 0, 0, -1048578, 0, 0, -1048577, 0, 0, -1114112, 0, 0, -1114111, 0, 0, -1114110, 0, 0, -1114109, 0, 0, -1114108, 0, 0, -1114107, 0, 0, -1114106, 0, 0, -1114105, 0, 0, -1114104, 0, 0, -1114103, 0, 0, -1114102, 0, 0, -1114101, 0, 0, -1114100, 0, 0, -1114099, 0, 0, -1114098, 0, 0, -1114097, 0, 0, -983052, 0, 0, -983051, 0, 0, -983050, 0, 0, -983049, 0, 0, -983048, 0, 0, -983047, 0, 0, -983046, 0, 0, -983045, 0, 0, -983044, 0, 0, -983043, 0, 0, -983042, 0, 0, -983041, 0, 0, -1048576, 0, 0, -1048575, 0, 0, -1048574, 0, 0, -1048573, 0, 0, -1048572, 0, 0, -1048571, 0, 0, -1048570, 0, 0, -1048569, 0, 0, -1048568, 0, 0, -1048567, 0, 0, -1048566, 0, 0, -1048565, 0, 0, -1048564, 0, 0, -1048563, 0, 0, -1048562, 0, 0, -1048561, 0, 0, -917516, 0, 0, -917515, 0, 0, -917514, 0, 0, -917513, 0, 0, -917512, 0, 0, -917511, 0, 0, -917510, 0, 0, -917509, 0, 0, -917508, 0, 0, -917507, 0, 0, -917506, 0, 0, -917505, 0, 0, -983040, 0, 0, -983039, 0, 0, -983038, 0, 0, -983037, 0, 0, -983036, 0, 0, -983035, 0, 0, -983034, 0, 0, -983033, 0, 0, -983032, 0, 0, -983031, 0, 0, -983030, 0, 0, -983029, 0, 0, -983028, 0, 0, -983027, 0, 0, -983026, 0, 0, -983025, 0, 0, -851980, 0, 0, -851979, 0, 0, -851978, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -917491, 0, 0, -917490, 0, 0, -917489, 0, 0, -786444, 0, 0, -786443, 0, 0, -786442, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -786433, 0, 0, -851968, 0, 0, -851967, 0, 0, -851966, 0, 0, -851965, 0, 0, -851964, 0, 0, -851963, 0, 0, -851962, 0, 0, -851961, 0, 0, -851960, 0, 0, -851959, 0, 0, -851958, 0, 0, -851957, 0, 0, -851956, 0, 0, -851955, 0, 0, -851954, 0, 0, -851953, 0, 0, -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -786422, 0, 0, -786421, 0, 0, -786420, 0, 0, -786419, 0, 0, -786418, 0, 0, -786417, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -720886, 0, 0, -720885, 0, 0, -720884, 0, 0, -720883, 0, 0, -720882, 0, 0, -720881, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -589827, 0, 0, -655346, 0, 0, -655345, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -524297, 0, 0, -524296, 0, 0, -524294, 2, 3, -524293, 536870914, 2, -524292, 2, 3, -589810, 0, 0, -589809, 0, 0, -524274, 0, 0, -524273, 0, 0 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 16, -44 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -211,5 +218,3 @@ position = Vector2( -4, -80 ) [node name="Note" parent="Actors" instance=ExtResource( 11 )] position = Vector2( 107, -101 ) - -[editable path="GameCamera"] diff --git a/src/map/3-8.tscn b/src/map/3-8.tscn index b0a3643..6f85848 100644 --- a/src/map/3-8.tscn +++ b/src/map/3-8.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -24,7 +24,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 18 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.690196, 0.623529, 0.8, 1 ) +0/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -61,7 +61,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 19 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.223529, 0.223529, 0.309804, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -133,7 +133,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 18 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.690196, 0.623529, 0.8, 1 ) +2/modulate = Color( 0.698039, 0.698039, 0.858824, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -155,14 +155,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 2 -color_solid = Color( 0.690196, 0.623529, 0.8, 1 ) +color_solid = Color( 0.698039, 0.698039, 0.858824, 1 ) +color_back = Color( 0.223529, 0.223529, 0.309804, 1 ) color_grass = Color( 0.513726, 0.529412, 0, 1 ) color_wood = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -786421, 1, 0, -786420, 1, 0, -786419, 1, 0, -786418, 1, 0, -786417, 1, 0, -655369, 536870912, 1, -655368, 0, 0, -655367, 536870912, 1, -655366, 536870912, 0, -655365, 536870912, 1, -655364, 536870912, 1, -655363, 536870912, 1, -655362, 0, 0, -655361, 536870912, 1, -720896, 536870912, 1, -720895, 536870912, 1, -720894, 536870912, 0, -720893, 536870912, 1, -720892, 536870912, 1, -720891, 536870912, 1, -720890, 0, 0, -720889, 536870912, 1, -720888, 536870912, 0, -720887, 536870912, 1, -720886, 0, 0, -720885, 536870912, 1, -720881, 1, 0, -589834, 536870912, 1, -589833, 0, 0, -655349, 536870912, 0, -655345, 1, 0, -524298, 536870912, 0, -589813, 536870912, 1, -589809, 1, 0, -458762, 536870912, 1, -524281, 0, 0, -524280, 536870912, 1, -524279, 0, 0, -524278, 536870912, 1, -524277, 536870912, 0, -524273, 1, 0, -393226, 0, 0, -458737, 1, 0, -327690, 536870912, 1, -393201, 1, 0, -262154, 536870912, 0, -327672, 1, 0, -327671, 1, 0, -327670, 536870912, 1, -327669, 1, 0, -327668, 1, 0, -327667, 1, 0, -327666, 1, 0, -327665, 1, 0, -196619, 0, 0, -196618, 536870912, 1, -196617, 536870912, 1, -196616, 536870912, 0, -196611, 0, 0, -196610, 536870912, 1, -196609, 536870912, 1, -262144, 536870912, 1, -262143, 536870912, 0, -262142, 536870912, 1, -262141, 536870912, 1, -262140, 0, 0, -262139, 536870912, 1, -262138, 536870912, 0, -262137, 536870912, 1, -262136, 0, 0, -262135, 536870912, 1, -262134, 536870912, 0, -131083, 536870912, 1, -196599, 536870912, 0, -65547, 536870912, 0, -131063, 536870912, 1, -11, 536870912, 1, -10, 0, 0, -9, 536870912, 1, -8, 536870912, 1, -7, 536870912, 0, -6, 536870912, 1, -65530, 0, 0, -65529, 536870912, 1, -65528, 536870912, 1, -65527, 536870912, 0, 65530, 536870912, 0, 6, 536870912, 1, 131066, 536870912, 1, 65542, 536870912, 0, 196602, 0, 0, 196603, 536870912, 1, 196604, 536870912, 1, 196605, 0, 0, 196606, 536870912, 1, 196607, 536870912, 0, 131072, 536870912, 1, 131073, 536870912, 1, 131074, 0, 0, 131075, 536870912, 1, 131076, 536870912, 1, 131077, 536870912, 0, 131078, 536870912, 1 ) -tile_color = Color( 0.690196, 0.623529, 0.8, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( -262147, 0, 0, -262146, 0, 0, -262145, 0, 0, -327680, 0, 0, -327679, 0, 0, -327678, 0, 0, -327677, 0, 0, -327676, 0, 0, -327675, 0, 0, -327674, 0, 0, -327673, 0, 0, -327672, 0, 0, -327671, 0, 0, 131067, 536870912, 0, 131068, 0, 0, 131069, 0, 0, 131070, 0, 0, 131071, 0, 0, 65536, 0, 0, 65537, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 0, 0, 65541, 0, 0 ) @@ -171,16 +172,18 @@ tile_data = PoolIntArray( -262147, 0, 0, -262146, 0, 0, -262145, 0, 0, -327680, z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -720906, 5, 2, -720905, 5, 0, -720904, 5, 0, -720903, 5, 0, -720902, 5, 0, -720898, 5, 2, -720897, 5, 0, -786432, 5, 0, -786430, 5, 2, -786429, 5, 0, -786428, 5, 0, -786427, 5, 0, -786426, 5, 0, -786425, 5, 0, -786424, 536870917, 2, -655371, 5, 2, -655370, -1610612731, 0, -589835, -1073741819, 0, -589830, 1073741829, 2, -589829, 5, 0, -589828, 5, 0, -589827, 1610612742, 0, -589826, 1610612741, 2, -655360, 1073741829, 2, -655359, 5, 0, -655358, 1610612741, 2, -655352, 5, 0, -524299, -1073741819, 0, -524296, 536870916, 3, -524295, 536870916, 2, -524291, 1610612741, 0, -589821, 5, 2, -589820, 5, 0, -589819, -1610612731, 2, -589816, 5, 0, -458763, -1073741819, 2, -458761, -1610612731, 2, -524285, 5, 0, -524284, 5, 0, -524283, 5, 0, -393225, -1610612730, 0, -393224, -1610612730, 0, -393223, -1610612731, 0, -458749, -1073741819, 2, -458748, 5, 0, -458747, 1610612741, 2, -458744, 1073741829, 2, -458743, 5, 0, -458741, -1610612731, 2, -327691, -2147483643, 2, -327689, -536870907, 2, -393212, 6, 0, -393210, 536870916, 3, -393209, 536870916, 2, -393205, 5, 0, -262156, 5, 2, -262155, 1610612741, 0, -327676, 6, 0, -327669, 5, 0, -196620, -1073741819, 0, -196614, 4, 2, -196613, 4, 3, -262133, 5, 0, -131084, -1073741819, 0, -131078, 4, 2, -131077, 4, 3, -131074, 6, 0, -196606, 4, 2, -196605, 536870916, 0, -196604, 536870916, 2, -196603, 6, 0, -196600, -2147483643, 2, -196598, 5, 0, -196597, 1610612741, 2, -65548, -1073741819, 0, -65544, 5, 2, -65543, 5, 0, -65542, 536870917, 2, -65538, 1073741829, 2, -131071, 5, 0, -131067, 1610612741, 2, -131064, -1073741819, 0, -12, -1073741819, 0, -65535, 1610612742, 0, 65524, 1073741829, 2, 65525, 1073741829, 0, 65526, 1073741829, 0, 65527, 1073741829, 0, 65528, -536870907, 2, 1, 1610612742, 0, 7, 5, 0, 8, 1610612741, 2, 65537, 1610612742, 0, 65543, 5, 0, 131079, 5, 0, 196609, 1073741829, 2, 196610, 5, 0, 196611, 5, 0, 196612, 5, 0, 196613, 5, 0, 196614, 5, 0, 196615, 1610612741, 2 ) +brick_color = Color( 0.223529, 0.223529, 0.309804, 1 ) grass_color = Color( 0.513726, 0.529412, 0, 1 ) wood_color = Color( 0.670588, 0.215686, 0.541176, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 14 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -720884, 0, 0, -720883, 0, 0, -720882, 0, 0, -655348, 0, 0, -655347, 0, 0, -655346, 0, 0, -589812, 0, 0, -589811, 0, 0, -589810, 0, 0, -524276, 0, 0, -524275, 0, 0, -524274, 0, 0, -458742, 2, 2, -458741, 0, 0, -458740, 0, 0, -458739, 0, 0, -458738, 0, 0, -393206, 536870914, 2, -393205, 0, 0, -393204, 0, 0, -393203, 0, 0, -393202, 0, 0 ) -tile_color = Color( 0.690196, 0.623529, 0.8, 1 ) +tile_color = Color( 0.698039, 0.698039, 0.858824, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 4, -33 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -272,5 +275,3 @@ position = Vector2( -76, -12 ) [node name="Note" parent="Actors" instance=ExtResource( 15 )] position = Vector2( 99, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/4-1.tscn b/src/map/4-1.tscn index 578d42d..9a76125 100644 --- a/src/map/4-1.tscn +++ b/src/map/4-1.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=6] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=7] [ext_resource path="res://src/stage/Stage.gd" type="Script" id=8] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=9] @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 0, 0, -458753, 0, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0, -393226, 536870912, 0, -393225, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -393222, 536870912, 0, -393221, 536870912, 0, -393220, 536870912, 0, -393219, 536870912, 0, -393218, 0, 0, -393217, 0, 0, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458748, 536870912, 0, -458747, 536870912, 0, -458746, 536870912, 0, -458745, 536870912, 0, -458744, 536870912, 0, -458743, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -327694, 536870912, 0, -327693, 536870912, 0, -327692, 536870912, 0, -327691, 536870912, 0, -327690, 536870912, 0, -327689, 536870912, 0, -327688, 536870912, 0, -262158, 536870912, 0, -262157, 536870912, 0, -262156, 536870912, 0, -262155, 536870912, 0, -262154, 536870912, 0, -262153, 536870912, 0, -262152, 536870912, 0, -196622, 536870912, 0, -196621, 536870912, 0, -196620, 536870912, 0, -196619, 536870912, 0, -196618, 536870912, 0, -131086, 536870912, 0, -131085, 536870912, 0, -131084, 536870912, 0, -131083, 536870912, 0, -131082, 536870912, 0, -131081, 2, 2 ) tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 6 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 0, -4 ) +script = ExtResource( 6 ) [node name="Actors" type="Node2D" parent="."] @@ -192,5 +193,3 @@ position = Vector2( -61, 8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -13, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/4-2.tscn b/src/map/4-2.tscn index b38c4ff..8e5b132 100644 --- a/src/map/4-2.tscn +++ b/src/map/4-2.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=5] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=6] @@ -19,7 +19,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 13 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +0/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -56,7 +56,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 14 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.219608, 0.180392, 0.121569, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -77,7 +77,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 11 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0, 0.529412, 0.317647, 1 ) +5/modulate = Color( 0.670588, 0.172549, 0.34902, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.294118, 0.431373, 0.180392, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -128,7 +128,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 13 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +2/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,12 +151,14 @@ script = ExtResource( 8 ) palette = 3 color_solid = Color( 0.760784, 0.654902, 0.509804, 1 ) -color_grass = Color( 0, 0.560784, 0.909804, 1 ) -color_wood = Color( 0, 0.509804, 0.0784314, 1 ) +color_back = Color( 0.219608, 0.180392, 0.121569, 1 ) +color_grass = Color( 0.670588, 0.172549, 0.34902, 1 ) +color_wood = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 6 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -1245199, 1, 0, -1245198, 1, 0, -1245197, 1, 0, -1245196, 1, 0, -1245195, 1, 0, -1245194, 1, 0, -1245193, 1, 0, -1245192, 1, 0, -1245191, 1, 0, -1245190, 1, 0, -1245189, 1, 0, -1245188, 1, 0, -1245187, 1, 0, -1245186, 1, 0, -1245185, 1, 0, -1310720, 1, 0, -1310719, 1, 0, -1310718, 1, 0, -1310717, 1, 0, -1310716, 1, 0, -1310715, 1, 0, -1310714, 1, 0, -1310713, 1, 0, -1310712, 1, 0, -1310711, 1, 0, -1310710, 1, 0, -1310709, 1, 0, -1310708, 1, 0, -1310707, 1, 0, -1310706, 1, 0, -1179663, 1, 0, -1245170, 1, 0, -1114127, 1, 0, -1179634, 1, 0, -1048591, 1, 0, -1114098, 1, 0, -983055, 1, 0, -1048562, 1, 0, -917519, 1, 0, -983026, 1, 0, -851983, 1, 0, -851974, 0, 1, -851973, 536870912, 0, -851972, 0, 1, -851971, 0, 1, -851970, 0, 0, -851969, 0, 1, -917504, 536870912, 0, -917503, 0, 1, -917502, 0, 0, -917501, 0, 1, -917500, 0, 1, -917499, 536870912, 0, -917498, 0, 1, -917490, 1, 0, -786447, 1, 0, -786439, 0, 1, -851962, 0, 0, -851954, 1, 0, -720911, 1, 0, -720903, 0, 0, -786426, 0, 0, -786418, 1, 0, -655375, 1, 0, -655367, 0, 1, -655362, 0, 0, -655361, 0, 1, -720896, 0, 1, -720895, 536870912, 0, -720890, 0, 1, -720882, 1, 0, -589839, 1, 0, -589833, 0, 0, -589832, 0, 1, -589831, 536870912, 0, -655354, 0, 0, -655352, 536870912, 0, -655346, 1, 0, -524303, 1, 0, -524297, 0, 1, -589816, 536870912, 0, -589810, 1, 0, -458767, 1, 0, -458761, 536870912, 0, -524280, 0, 1, -524274, 1, 0, -393231, 1, 0, -393230, 1, 0, -393229, 1, 0, -393228, 1, 0, -393227, 1, 0, -393226, 0, 0, -393225, 0, 1, -458744, 0, 0, -458743, 0, 1, -458742, 1, 0, -458741, 1, 0, -458740, 1, 0, -458739, 1, 0, -458738, 1, 0, -327690, 0, 1, -393207, 536870912, 0, -262154, 0, 0, -327671, 0, 1, -196618, 0, 1, -262135, 0, 0, -131082, 536870912, 0, -196599, 0, 0, -65546, 536870912, 0, -131063, 0, 1, -10, 0, 1, -65527, 536870912, 0, 65526, 0, 0, 65527, 0, 1, 65528, 0, 1, 65529, 536870912, 0, 65530, 0, 1, 65531, 0, 1, 65532, 0, 0, 65533, 0, 1, 65534, 0, 1, 65535, 536870912, 0, 0, 0, 1, 1, 0, 1, 2, 0, 0, 3, 0, 1, 4, 0, 1, 5, 536870912, 0, 6, 0, 1, 7, 0, 1, 8, 0, 0, 9, 0, 1 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 4 )] @@ -164,13 +166,18 @@ tile_data = PoolIntArray( -1245199, 1, 0, -1245198, 1, 0, -1245197, 1, 0, -12451 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -917508, 5, 2, -917507, 5, 0, -917506, 536870917, 2, -983038, 5, 2, -983037, 536870917, 0, -983036, 5, 2, -983035, 536870917, 0, -983034, 536870917, 0, -983033, 536870917, 2, -917497, 536870917, 0, -786440, -2147483643, 2, -786438, 5, 0, -786437, 1610612742, 0, -786436, 1610612741, 2, -786434, 1073741829, 2, -786433, 5, 0, -851968, 5, 0, -851967, 5, 0, -851966, 1610612741, 2, -851963, 5, 2, -851961, -536870907, 2, -720904, -1073741819, 0, -720901, 1610612742, 0, -786429, 4, 2, -786428, 4, 3, -786427, -1073741819, 0, -655368, -1073741819, 0, -655365, 1073741829, 0, -720891, -1073741819, 2, -720889, -1610612731, 2, -655357, 5, 0, -524298, -2147483643, 2, -524296, 1610612741, 2, -524294, 536870916, 3, -524293, 536870916, 2, -524291, 5, 2, -524290, 536870917, 0, -524289, 536870917, 0, -589824, 536870917, 0, -589823, -1610612731, 2, -589821, 1610612742, 0, -589817, -1073741819, 0, -458763, -2147483643, 2, -458762, 1610612741, 0, -458756, 5, 2, -458755, 536870917, 0, -458754, 536870917, 0, -458753, 536870917, 0, -524288, 536870917, 0, -524287, 536870917, 0, -524286, -1610612731, 2, -524285, 1610612742, 0, -524284, 5, 2, -524283, -1610612731, 2, -524281, -1073741819, 2, -524279, 536870917, 0, -524278, 536870917, 2, -393227, -1073741819, 0, -393222, 5, 2, -393221, 536870917, 0, -393220, -2147483643, 0, -393219, 536870917, 0, -393218, 536870917, 0, -393217, 536870917, 0, -458752, -1610612730, 0, -458751, 536870917, 0, -458750, -1610612730, 0, -458749, -1610612730, 0, -458748, -1073741819, 0, -458747, -1073741819, 0, -458742, -536870907, 0, -327691, -1073741819, 0, -327687, -536870907, 0, -327686, -1073741818, 0, -327685, -1073741818, 0, -327684, -1073741818, 0, -327683, 536870917, 0, -327682, -1610612730, 0, -327681, 536870917, 0, -393216, 536870917, 0, -393215, 536870917, 0, -393214, 536870917, 0, -393212, -1073741819, 2, -393211, 1610612741, 2, -393206, -536870907, 0, -262155, -1073741819, 2, -262153, -1610612731, 2, -262150, 1073741829, 2, -262149, 6, 0, -262147, -1073741819, 2, -262146, 536870917, 0, -262145, 1610612742, 0, -327680, 536870917, 0, -327679, 536870917, 0, -327678, 1610612741, 2, -327673, -2147483643, 0, -327672, -1073741818, 0, -327670, -536870907, 2, -196617, -1610612731, 0, -196613, 1073741829, 2, -196609, 1610612742, 0, -262143, 1610612741, 2, -262139, 4, 2, -262138, 4, 3, -262136, -1073741819, 0, -131081, -1610612731, 0, -131079, 536870916, 3, -131078, 536870916, 2, -131075, 5, 2, -131074, -1073741818, 0, -131073, -1073741818, 0, -196608, -1073741818, 0, -196607, -1073741818, 0, -196606, -1073741818, 0, -196605, -2147483643, 0, -196603, 4, 2, -196602, 4, 3, -196600, -1073741819, 0, -65547, -2147483643, 2, -65545, -536870907, 2, -65540, 536870917, 0, -65539, -2147483643, 1, -65538, 1610612742, 0, -131072, 1610612742, 0, -131071, 1610612741, 2, -131064, -1073741819, 2, -131062, 5, 0, -11, -1073741819, 0, -7, 5, 2, -6, 5, 0, -5, 536870917, 2, -3, 1610612742, 0, -65536, 1610612742, 0, -65533, 5, 2, -65532, 5, 0, -65531, 5, 0, -65530, 5, 0, -65529, 536870917, 2, -65526, 5, 0, 65525, -1073741819, 0, 10, 5, 0, 131061, 1073741829, 2, 131062, 1610612741, 0, 131063, 1610612741, 0, 131064, 1610612741, 0, 131065, 1610612741, 0, 131067, 1073741829, 2, 131068, 5, 0, 131069, 5, 0, 131070, 1610612741, 2, 131071, 5, 0, 65536, 1073741829, 2, 65537, 5, 0, 65538, 5, 0, 65539, 1610612741, 2, 65543, 1073741829, 2, 65544, 5, 0, 65545, 5, 0, 65546, -536870907, 2 ) +brick_color = Color( 0.219608, 0.180392, 0.121569, 1 ) +grass_color = Color( 0.670588, 0.172549, 0.34902, 1 ) +wood_color = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 9 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1179662, 536870912, 0, -1179661, 536870912, 0, -1179660, 536870912, 0, -1179659, 536870912, 0, -1179658, 536870912, 0, -1179657, 536870912, 0, -1179656, 536870912, 0, -1179655, 536870912, 0, -1179654, 536870912, 0, -1179653, 536870912, 0, -1179652, 536870912, 0, -1179651, 536870912, 0, -1179650, 536870912, 0, -1179649, 536870912, 0, -1245184, 536870912, 0, -1245183, 536870912, 0, -1245182, 536870912, 0, -1245181, 536870912, 0, -1245180, 536870912, 0, -1245179, 536870912, 0, -1245178, 536870912, 0, -1245177, 536870912, 0, -1245176, 536870912, 0, -1245175, 536870912, 0, -1245174, 536870912, 0, -1245173, 536870912, 0, -1245172, 536870912, 0, -1245171, 536870912, 0, -1114126, 536870912, 0, -1114125, 536870912, 0, -1114124, 536870912, 0, -1114123, 536870912, 0, -1114122, 536870912, 0, -1114121, 536870912, 0, -1114120, 536870912, 0, -1114119, 536870912, 0, -1114118, 536870912, 0, -1114117, 536870912, 0, -1114116, 536870912, 0, -1114115, 536870912, 0, -1114114, 536870912, 0, -1114113, 536870912, 0, -1179648, 536870912, 0, -1179647, 536870912, 0, -1179646, 536870912, 0, -1179645, 536870912, 0, -1179644, 536870912, 0, -1179643, 536870912, 0, -1179642, 536870912, 0, -1179641, 536870912, 0, -1179640, 536870912, 0, -1179639, 536870912, 0, -1179638, 536870912, 0, -1179637, 536870912, 0, -1179636, 536870912, 0, -1179635, 536870912, 0, -1048590, 536870912, 0, -1048589, 536870912, 0, -1048588, 536870912, 0, -1048587, 536870912, 0, -1048586, 536870912, 0, -1048585, 536870912, 0, -1048584, 536870912, 0, -1048583, 536870912, 0, -1048582, 536870912, 0, -1048581, 536870912, 0, -1048580, 536870912, 0, -1048579, 536870912, 0, -1048578, 536870912, 0, -1048577, 536870912, 0, -1114112, 536870912, 0, -1114111, 536870912, 0, -1114110, 536870912, 0, -1114109, 536870912, 0, -1114108, 536870912, 0, -1114107, 536870912, 0, -1114106, 536870912, 0, -1114105, 536870912, 0, -1114104, 536870912, 0, -1114103, 536870912, 0, -1114102, 536870912, 0, -1114101, 536870912, 0, -1114100, 536870912, 0, -1114099, 536870912, 0, -983054, 536870912, 0, -983053, 536870912, 0, -983052, 536870912, 0, -983051, 536870912, 0, -983050, 536870912, 0, -983049, 536870912, 0, -983048, 536870912, 0, -983047, 536870912, 0, -983046, 536870912, 0, -983045, 536870912, 0, -983044, 536870912, 0, -983043, 536870912, 0, -983042, 536870912, 0, -983041, 536870912, 0, -1048576, 536870912, 0, -1048575, 536870912, 0, -1048574, 536870912, 0, -1048573, 536870912, 0, -1048572, 536870912, 0, -1048571, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -1048564, 536870912, 0, -1048563, 536870912, 0, -917518, 536870912, 0, -917517, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -851982, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 2, 2, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -589838, 536870912, 0, -589837, 0, 0, -589836, 0, 0, -589835, 536870912, 0, -589834, 536870912, 0, -655353, 536870914, 3, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -524302, 536870912, 0, -524301, 0, 0, -524300, 0, 0, -524299, 536870912, 0, -524298, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 0, -52 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -206,5 +213,3 @@ position = Vector2( -69, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( -101, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/4-3.tscn b/src/map/4-3.tscn index 639d448..ab9f8f9 100644 --- a/src/map/4-3.tscn +++ b/src/map/4-3.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] @@ -19,7 +19,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 13 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.4, 0.741176, 0.415686, 1 ) +0/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -56,7 +56,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 14 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.0823529, 0.239216, 0.0901961, 1 ) +4/modulate = Color( 0.219608, 0.180392, 0.121569, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -77,7 +77,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 11 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0.0392157, 0.411765, 0.941176, 1 ) +5/modulate = Color( 0.670588, 0.172549, 0.34902, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.658824, 0.176471, 0.176471, 1 ) +6/modulate = Color( 0.294118, 0.431373, 0.180392, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -128,7 +128,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 13 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.4, 0.741176, 0.415686, 1 ) +2/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -150,15 +150,15 @@ [node name="Stage" type="Node2D"] script = ExtResource( 7 ) palette = 3 -color_solid = Color( 0.4, 0.741176, 0.415686, 1 ) -color_back = Color( 0.0823529, 0.239216, 0.0901961, 1 ) -color_grass = Color( 0.0392157, 0.411765, 0.941176, 1 ) -color_wood = Color( 0.658824, 0.176471, 0.176471, 1 ) +color_solid = Color( 0.760784, 0.654902, 0.509804, 1 ) +color_back = Color( 0.219608, 0.180392, 0.121569, 1 ) +color_grass = Color( 0.670588, 0.172549, 0.34902, 1 ) +color_wood = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 1 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -851981, 536870913, 0, -851980, 536870913, 0, -851979, 536870913, 0, -851978, 536870913, 0, -851977, 536870913, 0, -851976, 536870913, 0, -851975, 536870913, 0, -851974, 536870913, 0, -851973, 536870913, 0, -851972, 536870913, 0, -851971, 536870913, 0, -851970, 536870913, 0, -851969, 536870913, 0, -917504, 536870913, 0, -917503, 536870913, 0, -917502, 536870913, 0, -917501, 536870913, 0, -917500, 536870913, 0, -917499, 536870913, 0, -917498, 536870913, 0, -917497, 536870913, 0, -917496, 536870913, 0, -917495, 536870913, 0, -917494, 536870913, 0, -917493, 536870913, 0, -917492, 536870913, 0, -917491, 536870913, 0, -917490, 536870913, 0, -917489, 536870913, 0, -917488, 536870913, 0, -786445, 536870913, 0, -851952, 536870913, 0, -720909, 536870913, 0, -786416, 536870913, 0, -655373, 536870913, 0, -720880, 536870913, 0, -589837, 536870913, 0, -655344, 536870913, 0, -524301, 536870913, 0, -589808, 536870913, 0, -458765, 536870913, 0, -458764, 536870913, 0, -458763, 536870913, 0, -458762, 536870913, 0, -458761, 0, 0, -458760, 0, 1, -458759, 536870912, 0, -458758, 0, 1, -458757, 0, 0, -458756, 0, 1, -458755, 0, 1, -458754, 536870912, 0, -458753, 0, 1, -524284, 0, 0, -524283, 0, 1, -524282, 536870912, 0, -524281, 0, 1, -524280, 0, 1, -524279, 536870912, 0, -524272, 536870913, 0, -393225, 0, 1, -458748, 0, 1, -458743, 536870912, 0, -458736, 536870913, 0, -327689, 536870912, 0, -327681, 0, 1, -393216, 0, 0, -393215, 0, 1, -393214, 536870912, 0, -393213, 0, 1, -393212, 536870912, 0, -393207, 0, 1, -393200, 536870913, 0, -262153, 536870912, 0, -327671, 0, 0, -327670, 0, 1, -327669, 536870912, 0, -327668, 0, 1, -327667, 536870913, 0, -327666, 536870913, 0, -327665, 536870913, 0, -327664, 536870913, 0, -196617, 0, 1, -262132, 0, 0, -131081, 0, 0, -196596, 0, 0, -65545, 0, 1, -131060, 0, 1, -9, 0, 0, -65524, 536870912, 0, 65527, 0, 0, 12, 0, 1, 131063, 0, 1, 65548, 536870912, 0, 196599, 536870912, 0, 131084, 536870912, 0, 262135, 0, 1, 196620, 0, 1, 327671, 536870912, 0, 262151, 0, 0, 262152, 0, 1, 262153, 0, 1, 262154, 0, 0, 262155, 0, 1, 262156, 536870912, 0, 393207, 536870912, 0, 327687, 0, 1, 458743, 0, 1, 458744, 0, 0, 458745, 0, 1, 458746, 0, 1, 458747, 536870912, 0, 458748, 0, 1, 458749, 0, 1, 458750, 0, 1, 458751, 0, 0, 393216, 0, 1, 393217, 0, 1, 393218, 536870912, 0, 393219, 0, 1, 393220, 0, 1, 393221, 0, 0, 393222, 0, 1, 393223, 536870912, 0 ) -tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 5 )] tile_data = PoolIntArray( 393208, 0, 0, 393209, 0, 0, 393210, 0, 0, 393211, 0, 0, 393212, 0, 0, 393213, 0, 0, 393214, 0, 0, 393215, 0, 0, 327680, 0, 0, 327681, 0, 0, 327682, 0, 0, 327683, 0, 0, 327684, 0, 0, 327685, 0, 0, 327686, 0, 0 ) @@ -167,17 +167,18 @@ tile_data = PoolIntArray( 393208, 0, 0, 393209, 0, 0, 393210, 0, 0, 393211, 0, 0 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -524296, 5, 2, -524295, 5, 0, -524294, 5, 0, -524293, 536870917, 2, -589819, 5, 2, -589818, 5, 0, -589817, 5, 0, -589816, 5, 0, -589815, 5, 0, -589814, 536870917, 2, -524278, -1610612731, 0, -393224, 5, 0, -393221, 1073741829, 2, -393220, 5, 0, -393219, 5, 0, -393218, 5, 0, -458752, 536870917, 2, -458749, 5, 2, -458747, 1610612741, 2, -458742, -1610612731, 0, -327688, 5, 0, -327686, 536870916, 3, -327685, 536870916, 2, -393206, -1610612731, 0, -262154, -2147483643, 2, -262152, -536870907, 2, -262151, 536870916, 3, -262150, 536870916, 2, -262147, 4, 2, -262146, 4, 3, -327680, 1073741829, 2, -327679, 1610612742, 0, -327678, 1610612741, 0, -327677, 1610612742, 0, -327674, 5, 2, -327673, -1610612731, 2, -196618, -1073741819, 0, -196613, 5, 2, -196612, -1610612731, 2, -196611, 4, 2, -196610, 4, 0, -196609, 4, 3, -262143, 1610612742, 0, -262141, 1610612741, 0, -262138, -1073741819, 2, -262137, -1610612731, 0, -262134, 1073741829, 2, -262133, 5, 0, -262131, -1610612731, 2, -131082, -2147483643, 2, -131078, 5, 2, -131077, -1610612731, 0, -131076, -1610612731, 0, -131074, 4, 2, -131073, 4, 3, -196608, 5, 2, -196607, 1610612741, 0, -196606, 1610612741, 0, -196605, 1610612741, 0, -196604, -1610612731, 2, -196601, 6, 0, -196600, 536870916, 3, -196599, 4, 0, -196598, 536870916, 2, -196595, -1610612731, 0, -65547, -2147483643, 2, -65546, -1610612731, 0, -65542, -1073741819, 0, -65541, 5, 0, -65540, 5, 0, -65539, -1610612731, 2, -131072, 1610612741, 0, -131071, 1610612741, 0, -131070, 1610612741, 0, -131069, 1610612741, 0, -131068, -1610612730, 0, -131067, -1610612731, 2, -131066, -1610612730, 0, -131065, 6, 0, -131059, -1610612731, 0, -11, -1610612731, 0, -10, 5, 0, -7, -2147483643, 2, -6, 5, 0, -5, 5, 0, -4, 5, 0, -3, -2147483643, 0, -65536, 1610612741, 0, -65535, 1610612742, 0, -65534, 1610612741, 0, -65533, 1610612741, 0, -65532, 1610612741, 0, -65531, 1610612741, 0, -65529, 1610612741, 2, -65523, -1610612731, 0, 65525, -1073741819, 2, 65526, 5, 0, 65529, 5, 0, 65530, 5, 0, 65531, 5, 0, 65532, 5, 0, 65533, -536870907, 2, 0, -1073741819, 2, 1, -1610612731, 0, 2, 1610612741, 0, 3, 1610612741, 0, 4, 1610612742, 0, 5, 1610612741, 0, 7, 536870916, 3, 8, 4, 1, 9, 536870916, 2, 11, -2147483643, 2, 13, 1610612741, 2, 131062, -1073741819, 2, 131065, -1073741819, 2, 131066, 5, 0, 131067, 5, 0, 131068, 1610612741, 2, 131070, -2147483643, 2, 131071, -1073741818, 0, 65536, -1073741818, 0, 65537, 1610612741, 2, 65539, -1610612731, 0, 65540, 1610612741, 0, 65541, -1073741819, 0, 65543, 536870916, 3, 65544, 536870916, 0, 65545, 536870916, 2, 65547, -1073741819, 0, 196598, 5, 0, 196603, 6, 0, 196606, -1610612731, 0, 196607, 1610612742, 0, 131075, 1073741829, 2, 131076, 1610612741, 0, 131077, 1610612741, 2, 131079, 536870916, 3, 131080, 536870916, 2, 131083, -1073741819, 0, 262134, -1073741819, 2, 262136, 5, 0, 262137, -1073741819, 1, 262138, -1073741819, 1, 262139, 6, 0, 262140, -536870907, 2, 262142, -1073741819, 2, 262143, 1610612742, 0, 196608, -1610612731, 2, 196609, 4, 2, 196610, 4, 3, 196612, 1610612742, 0, 196619, -1073741819, 2, 196621, -1610612731, 2, 327674, -1073741819, 2, 327675, 6, 0, 327679, 1610612742, 0, 262144, -1610612731, 0, 262148, 1610612742, 0, 262149, -536870907, 2, 262157, -1610612731, 0, 393211, 6, 0, 393215, 1610612742, 0, 327680, -1610612731, 0, 327684, 1610612742, 0, 327688, 5, 2, 327689, 5, 0, 327690, 5, 0, 327691, 5, 0, 327692, 5, 0, 327693, 1610612741, 2, 393224, -1610612731, 0, 524283, 1073741829, 2, 524284, 5, 0, 524285, 5, 0, 524286, 5, 0, 524287, 5, 0, 458752, 1610612741, 2, 458756, 1073741829, 2, 458757, 5, 0, 458758, 5, 0, 458759, 5, 0, 458760, 1610612741, 2 ) -brick_color = Color( 0.0823529, 0.239216, 0.0901961, 1 ) -grass_color = Color( 0.0392157, 0.411765, 0.941176, 1 ) -wood_color = Color( 0.658824, 0.176471, 0.176471, 1 ) +brick_color = Color( 0.219608, 0.180392, 0.121569, 1 ) +grass_color = Color( 0.670588, 0.172549, 0.34902, 1 ) +wood_color = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 9 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524274, 536870912, 0, -524273, 536870912, 0, -393217, 536870914, 2, -458752, 536870912, 0, -458751, 536870912, 0, -458750, 536870912, 0, -458749, 536870912, 0, -458742, 536870912, 0, -458741, 536870912, 0, -458740, 536870912, 0, -458739, 536870912, 0, -458738, 536870912, 0, -458737, 536870912, 0, -393206, 536870912, 0, -393205, 536870912, 0, -393204, 536870912, 0, -393203, 536870912, 0, -393202, 536870912, 0, -393201, 536870912, 0 ) -tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 16, -4 ) +script = ExtResource( 3 ) [node name="Actors" type="Node2D" parent="."] @@ -219,5 +220,3 @@ position = Vector2( 84, -8 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 107, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/4-4.tscn b/src/map/4-4.tscn index 86b25cc..988c461 100644 --- a/src/map/4-4.tscn +++ b/src/map/4-4.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=6] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=7] [ext_resource path="res://src/stage/Stage.gd" type="Script" id=8] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=9] @@ -19,7 +19,7 @@ 0/name = "solid_bricks.png 0" 0/texture = ExtResource( 13 ) 0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +0/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 0/region = Rect2( 0, 0, 16, 8 ) 0/tile_mode = 2 0/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -56,7 +56,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 14 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.372549, 0.341176, 0.309804, 1 ) +4/modulate = Color( 0.219608, 0.180392, 0.121569, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -77,7 +77,7 @@ 5/name = "crate_tiles.png 5" 5/texture = ExtResource( 11 ) 5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0, 0.529412, 0.317647, 1 ) +5/modulate = Color( 0.670588, 0.172549, 0.34902, 1 ) 5/region = Rect2( 0, 16, 24, 8 ) 5/tile_mode = 2 5/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -98,7 +98,7 @@ 6/name = "crate_tiles.png 6" 6/texture = ExtResource( 11 ) 6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.670588, 0.321569, 0.211765, 1 ) +6/modulate = Color( 0.294118, 0.431373, 0.180392, 1 ) 6/region = Rect2( 0, 24, 8, 8 ) 6/tile_mode = 0 6/occluder_offset = Vector2( 0, 0 ) @@ -128,7 +128,7 @@ 2/name = "solid_bricks.png 2" 2/texture = ExtResource( 13 ) 2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.760784, 0.764706, 0.780392, 1 ) +2/modulate = Color( 0.760784, 0.654902, 0.509804, 1 ) 2/region = Rect2( 0, 0, 32, 8 ) 2/tile_mode = 2 2/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,12 +151,14 @@ script = ExtResource( 8 ) palette = 3 color_solid = Color( 0.760784, 0.654902, 0.509804, 1 ) -color_grass = Color( 0, 0.560784, 0.909804, 1 ) -color_wood = Color( 0, 0.509804, 0.0784314, 1 ) +color_back = Color( 0.219608, 0.180392, 0.121569, 1 ) +color_grass = Color( 0.670588, 0.172549, 0.34902, 1 ) +color_wood = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="SolidTileMap" parent="." instance=ExtResource( 2 )] tile_set = SubResource( 1 ) tile_data = PoolIntArray( -983052, 1, 0, -983051, 1, 0, -983050, 1, 0, -983049, 1, 0, -983048, 1, 0, -983047, 1, 0, -983046, 1, 0, -983045, 1, 0, -983044, 1, 0, -983043, 1, 0, -983042, 1, 0, -983041, 1, 0, -1048576, 1, 0, -1048575, 1, 0, -1048574, 1, 0, -1048573, 1, 0, -1048572, 1, 0, -1048571, 1, 0, -1048570, 1, 0, -1048569, 1, 0, -1048568, 1, 0, -1048567, 1, 0, -1048566, 1, 0, -1048565, 1, 0, -1048564, 1, 0, -1048563, 1, 0, -1048562, 1, 0, -1048561, 1, 0, -1048560, 1, 0, -1048559, 1, 0, -1048558, 1, 0, -917516, 1, 0, -983022, 1, 0, -851980, 1, 0, -917486, 1, 0, -786444, 1, 0, -851950, 1, 0, -720908, 1, 0, -786414, 1, 0, -655372, 1, 0, -720878, 1, 0, -589836, 1, 0, -655359, 536870912, 1, -655358, 536870912, 0, -655357, 0, 1, -655356, 536870912, 0, -655355, 0, 1, -655354, 0, 1, -655353, 536870912, 0, -655352, 0, 1, -655351, 0, 0, -655350, 0, 1, -655349, 536870912, 0, -655342, 1, 0, -524300, 1, 0, -589813, 536870912, 1, -589812, 0, 0, -589811, 1, 0, -589810, 1, 0, -589809, 1, 0, -589808, 1, 0, -589807, 1, 0, -589806, 1, 0, -458764, 1, 0, -458757, 0, 1, -458756, 0, 0, -458755, 0, 1, -458754, 0, 1, -458753, 536870912, 0, -524288, 0, 1, -524287, 536870912, 1, -524276, 536870912, 0, -393228, 1, 0, -393227, 1, 0, -393226, 1, 0, -393225, 1, 0, -393224, 1, 0, -393223, 1, 0, -393222, 536870912, 1, -393221, 536870912, 0, -458751, 536870912, 0, -458740, 0, 1, -327686, 0, 1, -393215, 0, 0, -393208, 0, 0, -393204, 536870912, 0, -262150, 536870912, 0, -327679, 0, 1, -327672, 0, 1, -327668, 0, 1, -196614, 0, 0, -262143, 0, 0, -262142, 0, 1, -262141, 536870912, 0, -262140, 0, 1, -262139, 0, 1, -262138, 0, 0, -262137, 0, 1, -262136, 536870912, 0, -262132, 0, 0, -131078, 0, 1, -196596, 0, 1, -65542, 0, 0, -65541, 0, 1, -65540, 536870912, 0, -65539, 0, 1, -65538, 0, 1, -65537, 0, 0, -131072, 0, 1, -131071, 0, 1, -131070, 536870912, 0, -131069, 0, 1, -131066, 536870912, 1, -131065, 0, 0, -131064, 0, 1, -131063, 0, 1, -131062, 536870912, 0, -131061, 0, 1, -131060, 536870912, 0, -65533, 0, 0, -65532, 0, 1, -65531, 0, 1, -65530, 536870912, 0 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) [node name="SpikeTileMap" parent="." instance=ExtResource( 3 )] tile_data = PoolIntArray( -131068, 0, 0, -131067, 0, 0 ) @@ -165,13 +167,18 @@ tile_data = PoolIntArray( -131068, 0, 0, -131067, 0, 0 ) z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -917496, 536870917, 0, -917495, 536870917, 0, -917494, 536870917, 0, -917493, 536870917, 0, -917492, 536870917, 0, -917491, 536870917, 0, -917490, 536870917, 0, -917489, 536870917, 0, -917488, 536870917, 0, -917487, 536870917, 0, -786436, 5, 2, -786435, 1610612741, 0, -786434, -1610612731, 2, -851960, 1073741829, 2, -851959, -1610612731, 0, -851958, 536870917, 0, -851957, -1610612731, 0, -851956, -1610612731, 0, -851955, -1610612731, 0, -851954, 536870917, 0, -851953, -1610612731, 0, -851952, 536870917, 0, -851951, 536870917, 0, -720900, 5, 0, -720899, 1610612741, 0, -720898, 5, 0, -786422, 1610612742, 0, -786416, 1073741829, 2, -786415, -1610612731, 0, -655369, 536870916, 3, -655368, 4, 0, -655367, 4, 3, -655364, -1073741819, 2, -655363, -1610612731, 0, -655362, 1610612741, 2, -720893, 5, 2, -720892, -1610612731, 2, -720890, 536870916, 3, -720889, 4, 0, -720888, 4, 3, -720886, 1610612742, 0, -720879, 5, 0, -589834, 536870916, 3, -589833, 536870916, 2, -589832, 536870916, 3, -589831, 536870916, 2, -589827, 1610612742, 0, -655346, 536870917, 2, -655344, -2147483643, 2, -655343, 5, 0, -524298, 4, 2, -524297, 4, 0, -524296, 536870916, 2, -524291, 1610612742, 0, -524290, -1610612731, 2, -589821, -1073741819, 2, -589820, 1610612741, 2, -589819, 4, 2, -589818, 4, 0, -589817, 536870916, 1, -589816, 536870916, 2, -589811, -1073741818, 0, -589810, -1073741818, 0, -589809, -1073741818, 0, -589808, -1610612731, 0, -589807, -1610612731, 0, -524275, 5, 0, -524272, 1073741829, 2, -524271, 5, 0, -393219, 1610612741, 2, -458741, 5, 2, -458739, 1610612741, 2, -458735, -1073741819, 0, -393212, 536870916, 3, -393211, 4, 3, -393205, 5, 0, -393199, 5, 0, -327677, 536870916, 3, -327676, 4, 0, -327675, 4, 3, -327673, 5, 2, -327669, 5, 0, -327664, -2147483643, 2, -327663, 5, 0, -196616, 536870916, 3, -196615, 4, 1, -196613, 536870916, 3, -196612, 4, 3, -262140, 4, 1, -262139, 4, 1, -262133, -1073741819, 2, -262131, -1610612731, 2, -262129, -2147483643, 2, -262128, 5, 0, -262127, -1073741819, 0, -131080, 4, 0, -131079, 536870916, 2, -131077, 536870916, 3, -131076, 4, 0, -131075, 4, 3, -196605, 4, 2, -196604, 4, 1, -196603, 536870916, 0, -196602, 4, 3, -196595, -1073741818, 0, -196594, -1073741818, 0, -196593, -1610612731, 0, -196592, -1610612731, 0, -196591, -1610612731, 0, -65544, 536870916, 3, -65543, 4, 1, -131057, 1073741829, 2, -131056, 5, 0, -131055, 5, 0, -8, 4, 2, -7, 4, 3, -6, 4, 2, -5, 4, 1, -4, 4, 0, -3, 536870916, 2, -2, 5, 0, -1, -1610612731, 0, -65536, -1610612731, 0, -65535, 5, 0, -65526, 6, 0, -65520, 5, 0, -65519, -1073741819, 0, 65528, 4, 2, 65529, 4, 3, 65530, 536870916, 0, 65531, 536870916, 2, 65534, 1073741829, 2, 65535, 5, 0, 0, 5, 0, 1, 1610612741, 2, 3, 536870916, 3, 4, 536870916, 0, 5, 4, 1, 6, 536870916, 2, 9, 5, 2, 10, 1610612741, 0, 11, -1610612731, 2, 17, 5, 0, 65539, 4, 2, 65540, 536870916, 2, 65541, 536870916, 3, 65542, 536870916, 2, 65545, -1073741819, 2, 65546, 1610612741, 0, 65547, 1610612741, 2, 131076, 4, 2, 131077, 536870916, 2 ) +brick_color = Color( 0.219608, 0.180392, 0.121569, 1 ) +grass_color = Color( 0.670588, 0.172549, 0.34902, 1 ) +wood_color = Color( 0.294118, 0.431373, 0.180392, 1 ) [node name="ObscureMap" parent="." instance=ExtResource( 9 )] tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -983025, 536870912, 0, -983024, 536870912, 0, -983023, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -917488, 536870912, 0, -917487, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 2, 2, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0 ) +tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 6 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 28, -40 ) +script = ExtResource( 6 ) [node name="Actors" type="Node2D" parent="."] @@ -186,5 +193,3 @@ position = Vector2( -35, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 10 )] position = Vector2( 115, -93 ) - -[editable path="GameCamera"] diff --git a/src/map/4-5.tscn b/src/map/4-5.tscn index eb319fc..8bb8f39 100644 --- a/src/map/4-5.tscn +++ b/src/map/4-5.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=18 format=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=1] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=2] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=4] @@ -175,8 +175,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917519, 536870912, 0, -917518, 536870912, 0, -917517, 536870912, 0, -917516, 536870912, 0, -917515, 536870912, 0, -917514, 536870912, 0, -917513, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -851983, 536870912, 0, -851982, 536870912, 0, -851981, 536870912, 0, -851980, 536870912, 0, -851979, 536870912, 0, -851978, 536870912, 0, -851977, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -786447, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -720911, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -655375, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -589839, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -655354, 2, 3, -655353, 536870914, 3, -524303, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -458767, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -393231, 536870912, 0, -393230, 536870912, 0, -393229, 536870912, 0, -393228, 536870912, 0, -393227, 536870912, 0 ) tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 1 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -8, -28 ) +script = ExtResource( 1 ) [node name="Actors" type="Node2D" parent="."] @@ -191,5 +192,3 @@ position = Vector2( -76, 8 ) [node name="Note" parent="Actors" instance=ExtResource( 9 )] position = Vector2( -109, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/4-6.tscn b/src/map/4-6.tscn index 2e3d176..c529a3b 100644 --- a/src/map/4-6.tscn +++ b/src/map/4-6.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=18 format=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=1] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=2] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=4] @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -983048, 536870912, 0, -983047, 536870912, 0, -983046, 536870912, 0, -983045, 536870912, 0, -983044, 536870912, 0, -983043, 536870912, 0, -983042, 536870912, 0, -983041, 536870912, 0, -1048576, 536870912, 0, -1048575, 536870912, 0, -1048574, 536870912, 0, -1048573, 536870912, 0, -1048572, 536870912, 0, -1048571, 536870912, 0, -1048570, 536870912, 0, -1048569, 536870912, 0, -1048568, 536870912, 0, -1048567, 536870912, 0, -1048566, 536870912, 0, -1048565, 536870912, 0, -1048564, 536870912, 0, -1048563, 536870912, 0, -1048562, 536870912, 0, -1048561, 536870912, 0, -1048560, 536870912, 0, -1048559, 536870912, 0, -1048558, 536870912, 0, -1048557, 536870912, 0, -917512, 536870912, 0, -917511, 536870912, 0, -917510, 536870912, 0, -917509, 536870912, 0, -917508, 536870912, 0, -917507, 536870912, 0, -917506, 536870912, 0, -917505, 536870912, 0, -983040, 536870912, 0, -983039, 536870912, 0, -983038, 536870912, 0, -983037, 536870912, 0, -983036, 536870912, 0, -983035, 536870912, 0, -983034, 536870912, 0, -983033, 536870912, 0, -983032, 536870912, 0, -983031, 536870912, 0, -983030, 536870912, 0, -983029, 536870912, 0, -983028, 536870912, 0, -983027, 536870912, 0, -983026, 536870912, 0, -983025, 536870912, 0, -983024, 536870912, 0, -983023, 536870912, 0, -983022, 536870912, 0, -983021, 536870912, 0, -851976, 536870912, 0, -851975, 536870912, 0, -851974, 536870912, 0, -851973, 536870912, 0, -851972, 536870912, 0, -851971, 536870912, 0, -851970, 536870912, 0, -851969, 536870912, 0, -917504, 536870912, 0, -917503, 536870912, 0, -917502, 536870912, 0, -917501, 536870912, 0, -917500, 536870912, 0, -917499, 536870912, 0, -917498, 536870912, 0, -917497, 536870912, 0, -917496, 536870912, 0, -917495, 536870912, 0, -917494, 536870912, 0, -917493, 536870912, 0, -917492, 536870912, 0, -917491, 536870912, 0, -917490, 536870912, 0, -917489, 536870912, 0, -917488, 536870912, 0, -917487, 536870912, 0, -917486, 536870912, 0, -917485, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -851949, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -786414, 536870912, 0, -786413, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -720877, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -655341, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -589805, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458755, 536870914, 2, -458754, 2, 2, -524274, 536870912, 0, -524273, 536870912, 0, -524272, 536870912, 0, -524271, 536870912, 0, -524270, 536870912, 0, -524269, 536870912, 0, -393224, 536870912, 0, -393223, 536870912, 0, -458738, 536870912, 0, -458737, 536870912, 0, -458736, 536870912, 0, -458735, 536870912, 0, -458734, 536870912, 0, -458733, 536870912, 0, -327688, 536870912, 0, -327687, 536870912, 0, -393199, 536870912, 0, -393198, 536870912, 0, -393197, 536870912, 0, -327663, 536870912, 0, -327662, 536870912, 0, -327661, 536870912, 0 ) tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 1 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 48, -44 ) +script = ExtResource( 1 ) [node name="Actors" type="Node2D" parent="."] @@ -192,5 +193,3 @@ position = Vector2( 117, -16 ) [node name="Note" parent="Actors" instance=ExtResource( 9 )] position = Vector2( 147, -61 ) - -[editable path="GameCamera"] diff --git a/src/map/4-7.tscn b/src/map/4-7.tscn index 8eaefbc..f943fb3 100644 --- a/src/map/4-7.tscn +++ b/src/map/4-7.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=18 format=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Note.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=4] @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917527, 0, 0, -917526, 0, 0, -917525, 0, 0, -917524, 0, 0, -917523, 0, 0, -917522, 0, 0, -917521, 0, 0, -917520, 0, 0, -917519, 0, 0, -917518, 0, 0, -917517, 0, 0, -917516, 0, 0, -917515, 0, 0, -917514, 0, 0, -917513, 0, 0, -917512, 0, 0, -917511, 0, 0, -917510, 0, 0, -917509, 0, 0, -917508, 0, 0, -917507, 0, 0, -917506, 0, 0, -917505, 0, 0, -983040, 0, 0, -983039, 0, 0, -983038, 0, 0, -983037, 0, 0, -983036, 0, 0, -983035, 0, 0, -983034, 0, 0, -983033, 0, 0, -983032, 0, 0, -983031, 0, 0, -983030, 0, 0, -983029, 0, 0, -983028, 0, 0, -983027, 0, 0, -983026, 0, 0, -983025, 0, 0, -983024, 0, 0, -983023, 0, 0, -983022, 0, 0, -851991, 0, 0, -851990, 0, 0, -851989, 0, 0, -851988, 0, 0, -851987, 0, 0, -851986, 0, 0, -851985, 0, 0, -851984, 0, 0, -851983, 0, 0, -851982, 0, 0, -851981, 0, 0, -851980, 0, 0, -851979, 0, 0, -851978, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -917491, 0, 0, -917490, 0, 0, -917489, 0, 0, -917488, 0, 0, -917487, 0, 0, -917486, 0, 0, -786455, 536870912, 0, -786454, 536870912, 0, -786453, 536870912, 0, -786452, 536870912, 0, -786451, 536870912, 0, -786450, 536870912, 0, -786449, 536870912, 0, -786448, 536870912, 0, -786447, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -720919, 536870912, 0, -720918, 536870912, 0, -720917, 536870912, 0, -720916, 536870912, 0, -720915, 536870912, 0, -720914, 536870912, 0, -720913, 536870912, 0, -720912, 536870912, 0, -720911, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 0, 0, -786414, 0, 0, -655383, 536870912, 0, -655382, 536870912, 0, -655381, 536870912, 0, -655380, 536870912, 0, -655379, 536870912, 0, -655378, 536870912, 0, -655377, 536870912, 0, -655376, 536870912, 0, -655375, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 0, 0, -720878, 0, 0, -589847, 536870912, 0, -589846, 536870912, 0, -589845, 536870912, 0, -589844, 536870912, 0, -589843, 536870912, 0, -589842, 536870912, 0, -589841, 536870912, 0, -589840, 536870912, 0, -589839, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -655344, 536870912, 0, -655343, 0, 0, -655342, 0, 0, -524311, 0, 0, -524310, 0, 0, -524308, 2, 3, -524307, 536870914, 2, -589807, 0, 0, -589806, 0, 0, -458775, 0, 0, -458774, 0, 0, -524271, 0, 0, -524270, 0, 0, -458735, 0, 0, -458734, 0, 0 ) tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 1 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 40, -36 ) +script = ExtResource( 1 ) bounds = Rect2( 112, 0, 0, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -193,5 +194,3 @@ position = Vector2( 117, -16 ) [node name="Note" parent="Actors" instance=ExtResource( 3 )] position = Vector2( 139, -77 ) - -[editable path="GameCamera"] diff --git a/src/map/4-8.tscn b/src/map/4-8.tscn index 5047648..61cd227 100644 --- a/src/map/4-8.tscn +++ b/src/map/4-8.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=18 format=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=1] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=2] [ext_resource path="res://src/actor/Note.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=4] @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -393198, 536870912, 0, -327662, 536870912, 0, -262130, 536870914, 3, -262129, 536870912, 0, -262128, 536870912, 0, -262127, 536870912, 0, -262126, 536870912, 0, -196593, 536870912, 0, -196592, 536870912, 0, -196591, 536870912, 0, -196590, 536870912, 0, -131057, 536870912, 0, -131056, 536870912, 0, -131055, 536870912, 0, -131054, 536870912, 0, -65521, 536870912, 0, -65520, 536870912, 0, -65519, 536870912, 0, -65518, 536870912, 0, 13, -536870912, 0, 14, -536870912, 0, 15, -536870912, 0, 16, -536870912, 0, 17, -536870912, 0, 18, -536870912, 0 ) tile_color = Color( 0.760784, 0.654902, 0.509804, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 1 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 40, -44 ) +script = ExtResource( 1 ) [node name="Actors" type="Node2D" parent="."] @@ -192,5 +193,3 @@ position = Vector2( -37, -16 ) [node name="Note" parent="Actors" instance=ExtResource( 3 )] position = Vector2( 139, -29 ) - -[editable path="GameCamera"] diff --git a/src/map/5-1.tscn b/src/map/5-1.tscn index c2774ce..2fac916 100644 --- a/src/map/5-1.tscn +++ b/src/map/5-1.tscn @@ -7,7 +7,7 @@ [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=5] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=6] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=8] [ext_resource path="res://src/actor/Note.tscn" type="PackedScene" id=9] [ext_resource path="res://src/stage/Stage.gd" type="Script" id=10] [ext_resource path="res://media/image/crate_tiles.png" type="Texture" id=11] @@ -56,7 +56,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 14 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +4/modulate = Color( 0.12549, 0.188235, 0.129412, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,7 +151,7 @@ script = ExtResource( 10 ) palette = 4 color_solid = Color( 0.4, 0.741176, 0.415686, 1 ) -color_back = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +color_back = Color( 0.12549, 0.188235, 0.129412, 1 ) color_grass = Color( 0.0392157, 0.411765, 0.941176, 1 ) color_wood = Color( 0.658824, 0.176471, 0.176471, 1 ) @@ -167,7 +167,7 @@ tile_data = PoolIntArray( -65536, 0, 0, -65535, 0, 0, -65534, 0, 0, -65533, 0, 0 z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -851980, -1073741819, 0, -851979, -1073741819, 0, -851978, 5, 0, -851977, 5, 0, -851975, 4, 1, -851974, 4, 0, -851973, 4, 1, -851969, 1610612742, 0, -917503, 4, 1, -917502, 4, 1, -917501, 4, 3, -917500, 1610612742, 0, -917496, 1610612742, 0, -917492, 1610612742, 0, -917490, 536870917, 0, -917489, 536870917, 0, -917488, 536870917, 0, -917485, 536870916, 3, -917484, 4, 0, -917483, 4, 1, -917482, 4, 3, -786444, -1610612731, 0, -786443, -536870907, 2, -786442, 1073741829, 2, -786441, 5, 0, -786439, 4, 2, -786438, 4, 1, -786437, 4, 1, -786436, 4, 3, -786433, 1610612742, 0, -851967, 4, 2, -851966, 4, 0, -851965, 4, 3, -851964, 1610612742, 0, -851960, 6, 0, -851959, -1610612731, 2, -851956, 6, 0, -851954, 1073741829, 2, -851953, 536870917, 0, -851952, 1610612741, 2, -851950, 536870916, 3, -851949, 4, 0, -851948, 4, 1, -851947, 536870916, 0, -851946, 4, 3, -720908, -1610612731, 0, -720907, 1073741829, 2, -720906, 1610612741, 0, -720905, -536870907, 2, -720902, 4, 2, -720901, 536870916, 0, -720900, 4, 3, -720898, -2147483643, 2, -720897, 1610612742, 0, -786431, 536870916, 3, -786430, 4, 1, -786429, 536870916, 2, -786428, 1610612742, 0, -786424, 6, 0, -786420, 6, 0, -786416, 536870916, 3, -786415, 4, 0, -786414, 4, 0, -786413, 4, 1, -786412, 536870916, 0, -786411, 536870916, 2, -655366, 4, 2, -655365, 4, 1, -655364, 4, 0, -655363, 536870916, 2, -655361, 1610612742, 0, -720896, 536870916, 3, -720878, 4, 1, -720877, 536870916, 0, -720876, 536870916, 2, -720871, -2147483643, 2, -720870, 5, 0, -655358, 4, 1, -655357, 536870916, 2, -655356, 1610612742, 0, -655352, 6, 0, -655348, 6, 0, -655345, 536870916, 3, -655344, 4, 1, -655342, 4, 1, -655341, 536870916, 2, -655335, -1073741819, 0, -655334, -1073741819, 0, -524294, 536870916, 3, -524293, 536870916, 0, -524292, 4, 1, -524291, 536870916, 2, -524289, 1610612742, 0, -589824, 536870916, 3, -589823, 4, 1, -589822, 536870916, 0, -589821, 4, 3, -589820, 1073741829, 2, -589816, 6, 0, -589812, 5, 2, -589811, -1610612731, 2, -589809, 4, 2, -589808, 4, 0, -589799, -1073741819, 2, -589798, 5, 0, -458764, 536870916, 3, -458763, 536870916, 0, -458762, 4, 3, -458757, 4, 2, -458756, 4, 1, -458755, 4, 3, -458753, 1610612742, 0, -524288, 4, 2, -524287, 4, 0, -524286, 4, 1, -524285, 4, 0, -524284, 4, 3, -524281, -2147483643, 2, -524280, 5, 0, -524279, 536870917, 2, -524276, -1073741819, 2, -524275, 1610612741, 2, -524273, 536870916, 3, -524272, 4, 1, -524271, 536870916, 0, -524270, 4, 1, -524269, 536870916, 2, -393228, 4, 0, -393227, 536870916, 0, -393226, 4, 1, -393224, 4, 3, -393222, 536870916, 3, -393221, 4, 0, -393220, 4, 3, -393217, 1073741829, 0, -458751, 536870916, 3, -458750, 4, 1, -458749, 4, 1, -458748, 536870916, 0, -458747, 536870916, 2, -458745, -2147483643, 0, -458744, 536870917, 0, -458743, -1610612731, 0, -458739, 6, 0, -458736, 4, 2, -458735, 4, 1, -458734, 536870916, 0, -458733, 4, 3, -327692, 4, 2, -327691, 4, 1, -327690, 4, 0, -327688, 536870916, 0, -327687, 536870916, 2, -327686, 4, 2, -327685, 4, 1, -327684, 536870916, 0, -327683, 536870916, 2, -393215, 4, 2, -393214, 4, 0, -393213, 4, 1, -393212, 4, 1, -393211, 4, 3, -393209, 1073741829, 2, -393208, 5, 0, -393207, -536870907, 2, -393203, 5, 2, -393202, 5, 0, -393201, -1610612731, 2, -393200, 536870916, 3, -393199, 4, 0, -393198, 4, 1, -262154, 4, 2, -262152, 4, 0, -262151, 4, 1, -262150, 4, 0, -262149, 4, 1, -262148, 4, 1, -262147, 536870916, 0, -262146, 4, 3, -327678, 4, 2, -327677, 4, 1, -327676, 536870916, 0, -327675, 536870916, 2, -327672, 6, 0, -327667, -1073741819, 0, -327666, -536870907, 0, -327665, -1610612731, 0, -327663, 4, 2, -327662, 4, 1, -327660, 4, 1, -327659, 4, 3, -327655, -2147483643, 2, -327654, 5, 0, -196615, 4, 2, -196614, 4, 1, -196613, 4, 1, -196612, 4, 0, -196611, 4, 1, -196610, 536870916, 2, -262143, 5, 2, -262142, 4, 2, -262141, 4, 0, -262140, 536870916, 2, -262136, 6, 0, -262134, -1073741819, 2, -262133, -1610612730, 0, -262132, -1610612730, 0, -262131, -1073741819, 2, -262130, 1610612741, 0, -262129, 1610612741, 2, -262127, 4, 2, -262126, 536870916, 0, -262124, 536870916, 0, -262123, 4, 1, -262122, 4, 0, -262121, 4, 3, -262119, -1073741819, 2, -262118, 5, 0, -131078, 4, 2, -131077, 536870916, 0, -131076, 4, 1, -131075, 536870916, 2, -196607, 6, 0, -196603, 5, 0, -196601, -1073741819, 2, -196600, 6, 0, -196597, 1610612742, 0, -196590, 4, 2, -196588, 4, 1, -196587, 536870916, 0, -196586, 4, 1, -196585, 4, 1, -196584, 4, 3, -65542, 536870916, 3, -65541, 4, 1, -65540, 536870916, 0, -65539, 536870916, 2, -131071, 6, 0, -131069, 536870917, 2, -131067, 6, 0, -131064, 6, 0, -131061, 1610612742, 0, -131058, 5, 2, -131051, 4, 2, -131050, 4, 0, -131049, 4, 1, -131048, 536870916, 0, -131047, 536870916, 2, -65535, 6, 0, -65533, 6, 0, -65531, 6, 0, -65528, 6, 0, -65525, 1610612742, 0, -65522, 1610612742, 0, -65514, 4, 2, -65513, 4, 0, -65512, 4, 1, -65511, 4, 3, 65530, 4, 2, 65531, 4, 1, 65532, 4, 0, 65533, 536870916, 2, 23, 4, 2, 24, 536870916, 0, 25, 4, 1, 26, 4, 3, 131060, 5, 0, 131061, 5, 0, 131062, 536870917, 2, 131066, 536870916, 3, 131067, 536870916, 0, 131068, 4, 3, 65537, 6, 0, 65539, 6, 0, 65541, 6, 0, 65544, 6, 0, 65545, -536870907, 2, 65547, 1610612742, 0, 65550, 6, 0, 65557, 536870917, 2, 65560, 4, 2, 65561, 536870916, 0, 65562, 536870916, 2, 196597, 1073741829, 2, 196598, -1610612731, 0, 196602, 536870916, 3, 196603, 4, 1, 196604, 536870916, 2, 131073, 6, 0, 131074, -1610612730, 0, 131075, -1610612730, 0, 131076, -1610612730, 0, 131077, 6, 0, 131080, 6, 0, 131083, 1610612742, 0, 131084, -1610612730, 0, 131085, -1610612730, 0, 131086, -1610612730, 0, 131088, 5, 2, 131089, 5, 0, 131090, 536870917, 2, 131093, 6, 0, 262134, -1610612731, 0, 262138, 536870916, 3, 262139, 4, 1, 262140, 4, 0, 262141, 4, 3, 196611, 6, 0, 196616, 6, 0, 196621, 1610612742, 0, 196624, -1610612731, 0, 196625, -1610612731, 0, 196626, 5, 0, 196629, 6, 0 ) -brick_color = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +brick_color = Color( 0.12549, 0.188235, 0.129412, 1 ) grass_color = Color( 0.0392157, 0.411765, 0.941176, 1 ) wood_color = Color( 0.658824, 0.176471, 0.176471, 1 ) @@ -176,9 +176,10 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -917515, 0, 0, -917514, 0, 0, -917513, 0, 0, -917512, 0, 0, -917511, 0, 0, -917510, 0, 0, -917509, 0, 0, -917508, 0, 0, -917507, 0, 0, -917506, 0, 0, -917505, 0, 0, -983040, 0, 0, -983039, 0, 0, -983038, 0, 0, -983037, 0, 0, -983036, 0, 0, -983035, 0, 0, -983034, 0, 0, -983033, 0, 0, -983032, 0, 0, -983031, 0, 0, -983030, 0, 0, -983029, 0, 0, -983028, 0, 0, -983027, 0, 0, -983026, 0, 0, -983025, 0, 0, -983024, 0, 0, -983023, 0, 0, -983022, 0, 0, -983021, 0, 0, -983020, 0, 0, -983019, 0, 0, -983018, 0, 0, -983017, 0, 0, -983016, 0, 0, -983015, 536870912, 0, -851979, 0, 0, -851978, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -917491, 0, 0, -917490, 0, 0, -917489, 0, 0, -917488, 0, 0, -917487, 0, 0, -917486, 0, 0, -917485, 0, 0, -917484, 0, 0, -917483, 0, 0, -917482, 0, 0, -917481, 0, 0, -917480, 0, 0, -917479, 536870912, 0, -786443, 0, 0, -786442, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -786433, 0, 0, -851968, 0, 0, -851967, 0, 0, -851966, 0, 0, -851965, 0, 0, -851964, 0, 0, -851963, 0, 0, -851962, 0, 0, -851961, 0, 0, -851960, 0, 0, -851959, 0, 0, -851958, 0, 0, -851957, 0, 0, -851956, 0, 0, -851955, 0, 0, -851954, 0, 0, -851953, 0, 0, -851952, 0, 0, -851951, 0, 0, -851950, 0, 0, -851949, 0, 0, -851948, 0, 0, -851947, 0, 0, -851946, 0, 0, -851945, 0, 0, -851944, 0, 0, -851943, 536870912, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -720898, 0, 0, -720897, 0, 0, -786432, 0, 0, -786431, 0, 0, -786430, 0, 0, -786429, 0, 0, -786428, 0, 0, -786427, 0, 0, -786426, 0, 0, -786425, 0, 0, -786424, 0, 0, -786423, 0, 0, -786422, 0, 0, -786421, 0, 0, -786420, 0, 0, -786419, 0, 0, -786418, 0, 0, -786417, 0, 0, -786416, 0, 0, -786415, 0, 0, -786414, 0, 0, -786413, 0, 0, -786412, 0, 0, -786411, 0, 0, -786410, 0, 0, -786409, 0, 0, -786408, 0, 0, -786407, 536870912, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720878, 0, 0, -720877, 0, 0, -720876, 0, 0, -720875, 0, 0, -720874, 0, 0, -720873, 0, 0, -720872, 0, 0, -720871, 536870912, 0, -589835, 0, 0, -589834, 0, 0, -655342, 0, 0, -655341, 0, 0, -655340, 0, 0, -655339, 0, 0, -655338, 0, 0, -655337, 0, 0, -655336, 0, 0, -655335, 536870912, 0, -524299, 0, 0, -524298, 0, 0, -589800, 0, 0, -589799, 0, 0, -458763, 0, 0, -458762, 0, 0, -458761, 536870914, 3, -524264, 0, 0, -524263, 0, 0, -393227, 0, 0, -393226, 0, 0, -393225, 2, 2, -458728, 0, 0, -458727, 0, 0, -393192, 0, 0, -393191, 0, 0 ) tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 8 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 34, -40 ) -bounds = Rect2( 8, 0, 60, 0 ) +script = ExtResource( 8 ) +bounds = Rect2( 0, 0, 60, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -196,5 +197,3 @@ position = Vector2( -50, -16 ) [node name="Note" parent="Actors" instance=ExtResource( 9 )] position = Vector2( 195, -53 ) - -[editable path="GameCamera"] diff --git a/src/map/5-2.tscn b/src/map/5-2.tscn index 02958f8..d387e6f 100644 --- a/src/map/5-2.tscn +++ b/src/map/5-2.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=6] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=7] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=9] @@ -56,7 +56,7 @@ 4/name = "bricks.png 4" 4/texture = ExtResource( 14 ) 4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +4/modulate = Color( 0.12549, 0.188235, 0.129412, 1 ) 4/region = Rect2( 0, 0, 40, 8 ) 4/tile_mode = 2 4/autotile/icon_coordinate = Vector2( 0, 0 ) @@ -151,7 +151,7 @@ script = ExtResource( 10 ) palette = 4 color_solid = Color( 0.4, 0.741176, 0.415686, 1 ) -color_back = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +color_back = Color( 0.12549, 0.188235, 0.129412, 1 ) color_grass = Color( 0.0392157, 0.411765, 0.941176, 1 ) color_wood = Color( 0.658824, 0.176471, 0.176471, 1 ) @@ -167,7 +167,7 @@ tile_data = PoolIntArray( -131075, 0, 0, -131074, 0, 0, -131073, 0, 0, -196608, z_index = -11 tile_set = SubResource( 2 ) tile_data = PoolIntArray( -786438, 536870916, 3, -786437, 4, 0, -786436, 4, 1, -786435, 4, 1, -786434, 4, 1, -786433, 536870916, 0, -851968, 4, 1, -851967, 4, 3, -851965, 536870918, 0, -851959, 536870916, 3, -851958, 4, 1, -851957, 4, 0, -851956, 4, 1, -851955, 4, 0, -851954, 4, 3, -851950, 4, 1, -851949, 4, 1, -851948, 536870916, 0, -851947, 4, 1, -720902, 4, 2, -720901, 4, 1, -720900, 4, 1, -720899, 536870916, 0, -720898, 4, 1, -720897, 4, 1, -786432, 4, 0, -786431, 536870916, 2, -786429, 536870918, 0, -786425, 536870916, 3, -786424, 536870916, 0, -786423, 536870916, 1, -786422, 536870916, 0, -786421, 4, 1, -786420, 536870916, 0, -786419, 4, 1, -786418, 4, 0, -786417, 4, 3, -786414, 4, 2, -786413, 536870916, 0, -786412, 4, 1, -786411, 4, 0, -655365, 4, 2, -655364, 4, 0, -655363, 4, 1, -655362, 536870916, 0, -655361, 4, 1, -720896, 536870916, 2, -720893, 536870918, 0, -720887, 4, 2, -720886, 4, 1, -720885, 536870916, 2, -720884, 536870916, 3, -720883, 536870916, 0, -720882, 536870916, 2, -720877, 4, 2, -720876, 4, 0, -720875, 4, 1, -655353, 536870917, 2, -655351, 536870916, 3, -655350, 536870916, 0, -655349, 536870916, 2, -655343, 536870917, 2, -655340, 4, 2, -655339, 4, 1, -524292, 4, 2, -524291, 4, 1, -524290, 536870916, 0, -524289, 536870916, 2, -589817, 1610612742, 0, -458755, 4, 2, -458754, 536870916, 2, -458753, 5, 2, -524288, -1073741819, 0, -524287, -1073741819, 0, -524286, -1610612731, 2, -524274, 6, 0, -524271, 1073741829, 2, -524270, 5, 0, -393217, 1610612741, 0, -458752, 5, 0, -458751, 5, 0, -458750, 5, 0, -458742, 1610612742, 0, -458738, 6, 0, -458734, -1073741819, 2, -458732, -1610612731, 2, -327683, -1610612730, 0, -327682, -1610612730, 0, -327681, 1610612741, 0, -393216, -1610612731, 2, -393215, 5, 0, -393214, 5, 0, -393211, 536870916, 3, -393210, 4, 0, -393209, 4, 3, -393206, 1610612741, 0, -393204, 5, 2, -393203, 5, 0, -393202, 5, 0, -393201, 5, 0, -393200, -1610612731, 2, -393196, -1610612731, 0, -262145, -1073741819, 2, -327680, -1610612731, 0, -327679, -1610612731, 0, -327678, 1610612741, 2, -327676, 536870916, 3, -327675, 4, 1, -327674, 4, 3, -327668, -1073741819, 2, -327667, 5, 0, -327666, 5, 0, -327665, 5, 0, -327664, 1610612741, 2, -327660, -2147483643, 0, -196614, -1073741819, 2, -196613, -1610612730, 0, -262143, 6, 0, -262140, 536870916, 3, -262139, 536870916, 0, -262138, 4, 3, -262137, 5, 0, -262136, -1610612731, 0, -262135, -1610612731, 0, -262131, -1073741819, 2, -262130, 5, 0, -262129, 1610612741, 2, -262124, -1610612731, 0, -196607, 6, 0, -196605, 4, 2, -196604, 4, 1, -196603, 536870916, 2, -196601, 5, 0, -196600, -1073741819, 2, -196599, 1610612741, 0, -196591, 5, 2, -196590, 5, 0, -196588, 1610612741, 2, -65545, 536870916, 0, -65544, 4, 3, -131068, 4, 0, -131067, 4, 3, -131065, -1073741819, 0, -131064, -1073741819, 0, -131063, 1610612741, 0, -131055, -1073741819, 2, -131054, 5, 2, -9, 4, 1, -8, 536870916, 0, -7, 4, 3, -2, 6, 0, -65535, 536870916, 3, -65534, 4, 1, -65532, 4, 1, -65531, 536870916, 2, -65528, 6, 0, 65527, 536870916, 0, 65528, 4, 1, 65529, 4, 0, 65530, 4, 3, 65534, 6, 0, 1, 536870916, 3, 2, 4, 0, 4, 536870916, 0, 5, 536870916, 2, 8, 6, 0, 131063, 4, 1, 131064, 536870916, 0, 131065, 4, 1, 131066, 4, 3, 131069, 5, 2, 131070, 1073741829, 0, 131071, -1610612731, 2, 65537, 4, 2, 65538, 4, 1, 65553, 536870916, 3, 65554, 4, 1, 65555, 4, 0, 65556, 4, 1, 65557, 4, 1, 196599, 4, 0, 196600, 4, 1, 196601, 536870916, 2, 196604, 5, 2, 196605, 1073741829, 0, 196606, 1610612741, 0, 196607, 1073741829, 0, 131072, -1610612731, 2, 131073, 4, 2, 131074, 536870916, 0, 131075, 4, 1, 131076, 536870916, 0, 131077, 4, 3, 131083, 1610612742, 0, 131089, 4, 2, 131090, 536870916, 2, 131091, 536870916, 3, 131092, 536870916, 0, 131093, 4, 1, 262135, 4, 1, 262136, 536870916, 2, 262139, 5, 2, 262140, 1073741829, 0, 262141, 1610612741, 0, 262142, 1073741829, 0, 262143, 1610612741, 0, 196608, 1073741829, 0, 196609, -1610612731, 2, 196610, 4, 2, 196611, 4, 0, 196612, 4, 1, 196613, 536870916, 0, 196614, 536870916, 2, 196619, 1073741829, 2, 196625, 4, 2, 196626, 4, 0, 196627, 4, 0, 196628, 4, 1, 196629, 4, 1, 327675, 5, 0, 327676, 1610612741, 0, 327677, 1073741829, 0, 327678, 1610612741, 0, 327679, 1073741829, 0, 262144, 1610612741, 0, 262145, 5, 0, 262147, 4, 2, 262148, 4, 1, 262149, 4, 1, 262150, 4, 1, 262151, 536870916, 2, 262162, 4, 1, 262163, 4, 1, 262164, 4, 1, 262165, 4, 1 ) -brick_color = Color( 0.0431373, 0.129412, 0.0470588, 1 ) +brick_color = Color( 0.12549, 0.188235, 0.129412, 1 ) grass_color = Color( 0.0392157, 0.411765, 0.941176, 1 ) wood_color = Color( 0.658824, 0.176471, 0.176471, 1 ) @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -327688, 1610612736, 0, -327687, 1610612736, 0, -327686, 1610612736, 0, -327685, 1610612736, 0, -262152, 1610612736, 0, -262151, 1610612736, 0, -262150, 1610612736, 0, -262149, 1610612736, 0, -196616, 1610612736, 0, -196615, 1610612736, 0, -196614, 1610612736, 0, -196613, 1610612736, 0, -131080, 1610612736, 0, -131079, 1610612736, 0, -131078, 1610612736, 0, -131077, 1610612736, 0, -196588, 1610612736, 0, -65544, 1610612736, 0, -65543, 1610612736, 0, -65542, 1610612736, 0, -65541, 1610612736, 0, -131052, 1610612736, 0, -8, 1610612736, 0, -7, 1610612736, 0, -6, 1610612736, 0, -5, 1610612736, 0, -4, 1610612736, 0, -3, 1610612736, 0, -2, 1610612736, 0, -1, 1610612736, 0, -65536, 1610612736, 0, -65535, 1610612736, 0, -65534, 1610612736, 0, -65533, 2, 2, -65516, 1610612736, 0, 65528, 1610612736, 0, 65529, 1610612736, 0, 65530, 1610612736, 0, 65531, 1610612736, 0, 65532, 1610612736, 0, 65533, 1610612736, 0, 65534, 1610612736, 0, 65535, 1610612736, 0, 0, 1610612736, 0, 1, 1610612736, 0, 2, 1610612736, 0, 15, 1610612736, 0, 16, 1610612736, 0, 17, 1610612736, 0, 18, 1610612736, 0, 19, 1610612736, 0, 20, 1610612736, 0, 131064, 1610612736, 0, 131065, 1610612736, 0, 131066, 1610612736, 0, 131067, 1610612736, 0, 131068, 1610612736, 0, 131069, 1610612736, 0, 131070, 1610612736, 0, 131071, 1610612736, 0, 65536, 1610612736, 0, 65537, 1610612736, 0, 65538, 1610612736, 0, 65551, 1610612736, 0, 65552, 1610612736, 0, 65553, 1610612736, 0, 65554, 1610612736, 0, 65555, 1610612736, 0, 65556, 1610612736, 0, 196600, 1610612736, 0, 196601, 1610612736, 0, 196602, 1610612736, 0, 196603, 1610612736, 0, 196604, 1610612736, 0, 196605, 1610612736, 0, 196606, 1610612736, 0, 196607, 1610612736, 0, 131072, 1610612736, 0, 131073, 1610612736, 0, 131074, 1610612736, 0, 131075, 1610612736, 0, 131076, 1610612736, 0, 131077, 1610612736, 0, 131078, 1610612736, 0, 131079, 1610612736, 0, 131080, 1610612736, 0, 131081, 1610612736, 0, 131082, 1610612736, 0, 131083, 1610612736, 0, 131084, 1610612736, 0, 131085, 1610612736, 0, 131086, 1610612736, 0, 131087, 1610612736, 0, 131088, 1610612736, 0, 131089, 1610612736, 0, 131090, 1610612736, 0, 131091, 1610612736, 0, 131092, 1610612736, 0, 262136, 1610612736, 0, 262137, 1610612736, 0, 262138, 1610612736, 0, 262139, 1610612736, 0, 262140, 1610612736, 0, 262141, 1610612736, 0, 262142, 1610612736, 0, 262143, 1610612736, 0, 196608, 1610612736, 0, 196609, 1610612736, 0, 196610, 1610612736, 0, 196611, 1610612736, 0, 196612, 1610612736, 0, 196613, 1610612736, 0, 196614, 1610612736, 0, 196615, 1610612736, 0, 196616, 1610612736, 0, 196617, 1610612736, 0, 196618, 1610612736, 0, 196619, 1610612736, 0, 196620, 1610612736, 0, 196621, 1610612736, 0, 196622, 1610612736, 0, 196623, 1610612736, 0, 196624, 1610612736, 0, 196625, 1610612736, 0, 196626, 1610612736, 0, 196627, 1610612736, 0, 196628, 1610612736, 0 ) tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 6 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 52, -32 ) +script = ExtResource( 6 ) [node name="Actors" type="Node2D" parent="."] @@ -195,5 +196,3 @@ position = Vector2( 143, -24 ) [node name="Note" parent="Actors" instance=ExtResource( 1 )] position = Vector2( -61, -29 ) - -[editable path="GameCamera"] diff --git a/src/map/5-3.tscn b/src/map/5-3.tscn index 5813c64..5af176f 100644 --- a/src/map/5-3.tscn +++ b/src/map/5-3.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=4] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=6] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=7] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=9] @@ -179,8 +179,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -1114121, 0, 0, -1114120, 0, 0, -1114119, 0, 0, -1114118, 0, 0, -1114117, 0, 0, -1114116, 0, 0, -1114115, 0, 0, -1114114, 0, 0, -1114113, 0, 0, -1179648, 0, 0, -1179647, 0, 0, -1179646, 0, 0, -1179645, 0, 0, -1179644, 0, 0, -1179643, 0, 0, -1179642, 0, 0, -1179641, 0, 0, -1179640, 0, 0, -1179639, 0, 0, -1179638, 0, 0, -1179637, 0, 0, -1179636, 0, 0, -1179635, 0, 0, -1179634, 0, 0, -1179633, 0, 0, -1179632, 0, 0, -1179631, 0, 0, -1179630, 0, 0, -1179629, 0, 0, -1179628, 0, 0, -1048585, 0, 0, -1048584, 0, 0, -1048583, 0, 0, -1048582, 0, 0, -1048581, 0, 0, -1048580, 0, 0, -1048579, 0, 0, -1048578, 0, 0, -1048577, 0, 0, -1114112, 0, 0, -1114111, 0, 0, -1114110, 0, 0, -1114109, 0, 0, -1114108, 0, 0, -1114107, 0, 0, -1114106, 0, 0, -1114105, 0, 0, -1114104, 0, 0, -1114103, 0, 0, -1114102, 0, 0, -1114101, 0, 0, -1114100, 0, 0, -1114099, 0, 0, -1114098, 0, 0, -1114097, 0, 0, -1114096, 0, 0, -1114095, 0, 0, -1114094, 0, 0, -1114093, 0, 0, -1114092, 0, 0, -983049, 0, 0, -983048, 0, 0, -983047, 0, 0, -983046, 0, 0, -983045, 0, 0, -983044, 0, 0, -983043, 0, 0, -983042, 0, 0, -983041, 0, 0, -1048576, 0, 0, -1048575, 0, 0, -1048574, 0, 0, -1048573, 0, 0, -1048572, 0, 0, -1048571, 0, 0, -1048570, 0, 0, -1048569, 0, 0, -1048568, 0, 0, -1048567, 0, 0, -1048566, 0, 0, -1048565, 0, 0, -1048564, 0, 0, -1048563, 0, 0, -1048562, 0, 0, -1048561, 0, 0, -1048560, 0, 0, -1048559, 0, 0, -1048558, 0, 0, -1048557, 0, 0, -1048556, 0, 0, -917513, 0, 0, -917512, 0, 0, -917511, 0, 0, -917510, 0, 0, -917509, 0, 0, -917508, 0, 0, -917507, 0, 0, -917506, 0, 0, -917505, 0, 0, -983040, 0, 0, -983039, 0, 0, -983038, 0, 0, -983037, 0, 0, -983036, 0, 0, -983035, 0, 0, -983034, 0, 0, -983033, 0, 0, -983032, 0, 0, -983031, 0, 0, -983030, 0, 0, -983029, 0, 0, -983028, 0, 0, -983027, 0, 0, -983026, 0, 0, -983025, 0, 0, -983024, 0, 0, -983023, 0, 0, -983022, 0, 0, -983021, 0, 0, -983020, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -917491, 0, 0, -917490, 0, 0, -917489, 0, 0, -917488, 0, 0, -917487, 0, 0, -917486, 0, 0, -917485, 0, 0, -917484, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -524297, 0, 0, -524296, 0, 0, -524295, 0, 0, -524294, 0, 0, -524293, 0, 0, -524292, 0, 0, -458761, 0, 0, -458760, 0, 0, -458757, 536870914, 3, -458756, 2, 2 ) tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 6 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 48, -48 ) +script = ExtResource( 6 ) [node name="Actors" type="Node2D" parent="."] @@ -198,5 +199,3 @@ position = Vector2( 4, -56 ) [node name="Note" parent="Actors" instance=ExtResource( 1 )] position = Vector2( -53, -101 ) - -[editable path="GameCamera"] diff --git a/src/map/5-4.tscn b/src/map/5-4.tscn index 708a536..37f43b9 100644 --- a/src/map/5-4.tscn +++ b/src/map/5-4.tscn @@ -7,7 +7,7 @@ [ext_resource path="res://media/image/bricks.png" type="Texture" id=5] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=6] [ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=7] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=8] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=9] [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=10] [ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=11] @@ -176,8 +176,9 @@ tile_set = SubResource( 3 ) tile_data = PoolIntArray( -589818, 536870914, 2, -589817, 0, 0, -589816, 0, 0, -589815, 0, 0, -589814, 0, 0, -524282, 2, 3, -524281, 0, 0, -524280, 0, 0, -524279, 0, 0, -524278, 0, 0 ) tile_color = Color( 0.4, 0.741176, 0.415686, 1 ) -[node name="GameCamera" parent="." instance=ExtResource( 8 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 34, -56 ) +script = ExtResource( 8 ) bounds = Rect2( 0, 0, 140, 0 ) [node name="Actors" type="Node2D" parent="."] @@ -196,5 +197,3 @@ position = Vector2( -59, -48 ) [node name="Note" parent="Actors" instance=ExtResource( 12 )] position = Vector2( 75, -69 ) - -[editable path="GameCamera"] diff --git a/src/map/win.tscn b/src/map/win.tscn index 760fe4e..d60b1d6 100644 --- a/src/map/win.tscn +++ b/src/map/win.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=2] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=5] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=6] [ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=7] [ext_resource path="res://media/image/crate_tiles.png" type="Texture" id=8] @@ -195,8 +195,9 @@ tile_data = PoolIntArray( -720911, 5, 0, -720910, 5, 0, -720909, -1610612731, 0, tile_set = SubResource( 13 ) tile_data = PoolIntArray( -851982, 0, 0, -851981, 0, 0, -851980, 0, 0, -851979, 0, 0, -851978, 0, 0, -851977, 0, 0, -851976, 0, 0, -851975, 0, 0, -851974, 0, 0, -851973, 0, 0, -851972, 0, 0, -851971, 0, 0, -851970, 0, 0, -851969, 0, 0, -917504, 0, 0, -917503, 0, 0, -917502, 0, 0, -917501, 0, 0, -917500, 0, 0, -917499, 0, 0, -917498, 0, 0, -917497, 0, 0, -917496, 0, 0, -917495, 0, 0, -917494, 0, 0, -917493, 0, 0, -917492, 0, 0, -917491, 0, 0, -786446, 0, 0, -786445, 0, 0, -786444, 0, 0, -786443, 0, 0, -786442, 0, 0, -786441, 0, 0, -786440, 0, 0, -786439, 0, 0, -786438, 0, 0, -786437, 0, 0, -786436, 0, 0, -786435, 0, 0, -786434, 0, 0, -786433, 0, 0, -851968, 0, 0, -851967, 0, 0, -851966, 0, 0, -851965, 0, 0, -851964, 0, 0, -851963, 0, 0, -851962, 0, 0, -851961, 0, 0, -851960, 0, 0, -851959, 0, 0, -851958, 0, 0, -851957, 0, 0, -851956, 0, 0, -851955, 0, 0, -720910, 0, 0, -720909, 0, 0, -720908, 0, 0, -720907, 0, 0, -720906, 0, 0, -720905, 0, 0, -720904, 0, 0, -720903, 0, 0, -720902, 0, 0, -720901, 0, 0, -720900, 0, 0, -720899, 0, 0, -720898, 0, 0, -720897, 0, 0, -786432, 0, 0, -786431, 0, 0, -786430, 0, 0, -786429, 0, 0, -786428, 0, 0, -786427, 0, 0, -786426, 0, 0, -786425, 0, 0, -786424, 0, 0, -786423, 0, 0, -786422, 0, 0, -786421, 0, 0, -786420, 0, 0, -786419, 0, 0, -655374, 0, 0, -655373, 0, 0, -655372, 0, 0, -655371, 0, 0, -655370, 0, 0, -655369, 0, 0, -655368, 0, 0, -655367, 0, 0, -655366, 0, 0, -655365, 0, 0, -655364, 0, 0, -655363, 0, 0, -655362, 0, 0, -655361, 0, 0, -720896, 0, 0, -720895, 0, 0, -720894, 0, 0, -720893, 0, 0, -720892, 0, 0, -720891, 0, 0, -720890, 0, 0, -720889, 0, 0, -720888, 0, 0, -720887, 0, 0, -720886, 0, 0, -720885, 0, 0, -720884, 0, 0, -720883, 0, 0, -589838, 0, 0, -589837, 0, 0, -589836, 0, 0, -589835, 0, 0, -589834, 0, 0, -589833, 0, 0, -589832, 0, 0, -589831, 0, 0, -589830, 0, 0, -589829, 0, 0, -589828, 0, 0, -589827, 0, 0, -589826, 0, 0, -589825, 0, 0, -655360, 0, 0, -655359, 0, 0, -655358, 0, 0, -655357, 0, 0, -655356, 0, 0, -655355, 0, 0, -655354, 0, 0, -655353, 0, 0, -655352, 0, 0, -655351, 0, 0, -655350, 0, 0, -655349, 0, 0, -655348, 0, 0, -655347, 0, 0, -524302, 0, 0, -524301, 0, 0, -524300, 0, 0, -524299, 0, 0, -524298, 0, 0, -589815, 0, 0, -589814, 0, 0, -589813, 0, 0, -589812, 0, 0, -589811, 0, 0, -458766, 0, 0, -458765, 0, 0, -458764, 0, 0, -458763, 0, 0, -458762, 0, 0, -524280, 2, 2, -524279, 0, 0, -524278, 0, 0, -524277, 0, 0, -524276, 0, 0, -524275, 0, 0, -393230, 0, 0, -393229, 0, 0, -393228, 0, 0, -393227, 0, 0, -393226, 0, 0, -458743, 0, 0, -458742, 0, 0, -458741, 0, 0, -458740, 0, 0, -458739, 0, 0, -327694, 0, 0, -327693, 0, 0, -327692, 0, 0, -327691, 0, 0, -327690, 0, 0, -393207, 0, 0, -393206, 0, 0, -393205, 0, 0, -393204, 0, 0, -393203, 0, 0, -262158, 0, 0, -262157, 0, 0, -262156, 0, 0, -262155, 0, 0, -262154, 0, 0, -327671, 0, 0, -327670, 0, 0, -327669, 0, 0, -327668, 0, 0, -327667, 0, 0, -262135, 0, 0, -262134, 0, 0, -262133, 0, 0, -262132, 0, 0, -262131, 0, 0, -196599, 0, 0, -196598, 0, 0, -196597, 0, 0, -196596, 0, 0, -196595, 0, 0, -131063, 0, 0, -131062, 0, 0, -131061, 0, 0, -131060, 0, 0, -131059, 0, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 5 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( 0, -24 ) +script = ExtResource( 5 ) [node name="Actors" type="Node2D" parent="."] @@ -437,5 +438,3 @@ margin_right = 24.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 11 ) text = "13" - -[editable path="GameCamera"] diff --git a/src/menu/select.gd b/src/menu/select.gd index bd5e9f2..9c5b5e6 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -69,6 +69,7 @@ var lockdict= {0:["1-1", "1-2", "1-3", "1-4", "1-5", "1-6", "1-7", "1-8"], 24: ['5-1', '5-2', '5-3', '5-4'], 30: ['win']} +var stage_size := Vector2(136, 96) func _ready(): #Leaderboard.connect("new_score", self, "new_score") @@ -191,7 +192,13 @@ func _physics_process(delta): if load_list.size() > 0: var pop = load_list.pop_front() if Shared.scene_dict.has(pop[1]): - pop[2].add_child(Shared.scene_dict[pop[1]].instance()) + var inst = Shared.scene_dict[pop[1]].instance() + var cam = inst.get_node("CamBounds") + + pop[2].add_child(inst) + if is_instance_valid(cam): + inst.position += stage_size / 2 + screen_static[pop[0]].visible = false else: is_load = false @@ -240,7 +247,7 @@ func make_screen(i := 0): screens_node.add_child(new) overlays[i] = new.get_node("Overlay") screen_static.append(new.get_node("Vis/Static")) - view_scene(new.get_node("Vis/ViewportContainer/Viewport"), Shared.map_dir + map_list[i] + ".tscn", i) + view_scene(new.get_node("Vis/Node2D"), Shared.map_dir + map_list[i] + ".tscn", i) # view a scene inside the viewport by path func view_scene(port, path, arg): diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 34cfb5d..6abe422 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=32 format=2] +[gd_scene load_steps=21 format=2] [ext_resource path="res://media/image/corner.png" type="Texture" id=1] [ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=2] [ext_resource path="res://media/image/note.png" type="Texture" id=3] +[ext_resource path="res://src/menu/Vis.gd" type="Script" id=4] [ext_resource path="res://src/shader/tv_static.gdshader" type="Shader" id=5] [ext_resource path="res://src/shader/outline2D_outer.shader" type="Shader" id=6] [ext_resource path="res://src/menu/select.gd" type="Script" id=7] @@ -10,148 +11,7 @@ [ext_resource path="res://media/image/diamond12.png" type="Texture" id=9] [ext_resource path="res://media/image/menu.png" type="Texture" id=10] [ext_resource path="res://media/image/skull.png" type="Texture" id=11] -[ext_resource path="res://src/stage/Stage.gd" type="Script" id=12] [ext_resource path="res://src/menu/cursor_anim.gd" type="Script" id=13] -[ext_resource path="res://media/image/solid_bricks.png" type="Texture" id=14] -[ext_resource path="res://media/image/bricks.png" type="Texture" id=15] -[ext_resource path="res://media/image/8pixel.png" type="Texture" id=16] -[ext_resource path="res://media/image/crate_tiles.png" type="Texture" id=17] -[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=18] -[ext_resource path="res://src/stage/ObscureMap.tscn" type="PackedScene" id=19] -[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=20] -[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=21] - -[sub_resource type="TileSet" id=1] -0/name = "solid_bricks.png 0" -0/texture = ExtResource( 14 ) -0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0.768627, 0.407843, 0.454902, 1 ) -0/region = Rect2( 0, 0, 16, 8 ) -0/tile_mode = 2 -0/autotile/icon_coordinate = Vector2( 0, 0 ) -0/autotile/tile_size = Vector2( 8, 8 ) -0/autotile/spacing = 0 -0/autotile/occluder_map = [ ] -0/autotile/navpoly_map = [ ] -0/autotile/priority_map = [ ] -0/autotile/z_index_map = [ ] -0/occluder_offset = Vector2( 0, 0 ) -0/navigation_offset = Vector2( 0, 0 ) -0/shape_offset = Vector2( 0, 0 ) -0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -0/shape_one_way = false -0/shape_one_way_margin = 0.0 -0/shapes = [ ] -0/z_index = 0 -1/name = "8pixel.png 1" -1/texture = ExtResource( 16 ) -1/tex_offset = Vector2( 0, 0 ) -1/modulate = Color( 1, 0, 1, 0.33 ) -1/region = Rect2( 0, 0, 8, 8 ) -1/tile_mode = 0 -1/occluder_offset = Vector2( 0, 0 ) -1/navigation_offset = Vector2( 0, 0 ) -1/shape_offset = Vector2( 0, 0 ) -1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -1/shape_one_way = false -1/shape_one_way_margin = 0.0 -1/shapes = [ ] -1/z_index = 0 - -[sub_resource type="TileSet" id=12] -4/name = "bricks.png 4" -4/texture = ExtResource( 15 ) -4/tex_offset = Vector2( 0, 0 ) -4/modulate = Color( 0.239216, 0.109804, 0.184314, 1 ) -4/region = Rect2( 0, 0, 40, 8 ) -4/tile_mode = 2 -4/autotile/icon_coordinate = Vector2( 0, 0 ) -4/autotile/tile_size = Vector2( 8, 8 ) -4/autotile/spacing = 0 -4/autotile/occluder_map = [ ] -4/autotile/navpoly_map = [ ] -4/autotile/priority_map = [ ] -4/autotile/z_index_map = [ ] -4/occluder_offset = Vector2( 0, 0 ) -4/navigation_offset = Vector2( 0, 0 ) -4/shape_offset = Vector2( 0, 0 ) -4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -4/shape_one_way = false -4/shape_one_way_margin = 0.0 -4/shapes = [ ] -4/z_index = 0 -5/name = "crate_tiles.png 5" -5/texture = ExtResource( 17 ) -5/tex_offset = Vector2( 0, 0 ) -5/modulate = Color( 0.741176, 0.580392, 0, 1 ) -5/region = Rect2( 0, 16, 24, 8 ) -5/tile_mode = 2 -5/autotile/icon_coordinate = Vector2( 0, 0 ) -5/autotile/tile_size = Vector2( 8, 8 ) -5/autotile/spacing = 0 -5/autotile/occluder_map = [ ] -5/autotile/navpoly_map = [ ] -5/autotile/priority_map = [ ] -5/autotile/z_index_map = [ ] -5/occluder_offset = Vector2( 0, 0 ) -5/navigation_offset = Vector2( 0, 0 ) -5/shape_offset = Vector2( 0, 0 ) -5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -5/shape_one_way = false -5/shape_one_way_margin = 0.0 -5/shapes = [ ] -5/z_index = 0 -6/name = "crate_tiles.png 6" -6/texture = ExtResource( 17 ) -6/tex_offset = Vector2( 0, 0 ) -6/modulate = Color( 0.678431, 0, 0.156863, 1 ) -6/region = Rect2( 0, 24, 8, 8 ) -6/tile_mode = 0 -6/occluder_offset = Vector2( 0, 0 ) -6/navigation_offset = Vector2( 0, 0 ) -6/shape_offset = Vector2( 0, 0 ) -6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -6/shape_one_way = false -6/shape_one_way_margin = 0.0 -6/shapes = [ ] -6/z_index = 0 - -[sub_resource type="TileSet" id=13] -0/name = "8pixel.png 0" -0/texture = ExtResource( 16 ) -0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0, 1, 0, 0.14902 ) -0/region = Rect2( 0, 0, 8, 8 ) -0/tile_mode = 0 -0/occluder_offset = Vector2( 0, 0 ) -0/navigation_offset = Vector2( 0, 0 ) -0/shape_offset = Vector2( 0, 0 ) -0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -0/shape_one_way = false -0/shape_one_way_margin = 0.0 -0/shapes = [ ] -0/z_index = 0 -2/name = "solid_bricks.png 2" -2/texture = ExtResource( 14 ) -2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 0.768627, 0.407843, 0.454902, 1 ) -2/region = Rect2( 0, 0, 32, 8 ) -2/tile_mode = 2 -2/autotile/icon_coordinate = Vector2( 0, 0 ) -2/autotile/tile_size = Vector2( 8, 8 ) -2/autotile/spacing = 0 -2/autotile/occluder_map = [ ] -2/autotile/navpoly_map = [ ] -2/autotile/priority_map = [ ] -2/autotile/z_index_map = [ ] -2/occluder_offset = Vector2( 0, 0 ) -2/navigation_offset = Vector2( 0, 0 ) -2/shape_offset = Vector2( 0, 0 ) -2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -2/shape_one_way = false -2/shape_one_way_margin = 0.0 -2/shapes = [ ] -2/z_index = 0 [sub_resource type="ShaderMaterial" id=8] shader = ExtResource( 5 ) @@ -239,49 +99,11 @@ margin_bottom = 96.0 rect_min_size = Vector2( 136, 96 ) color = Color( 0, 0, 0, 1 ) -[node name="Stage" type="Node2D" parent="Control/Screen"] -position = Vector2( 128, 64 ) -script = ExtResource( 12 ) -__meta__ = { -"_editor_description_": "" -} -palette = 1 -color_solid = Color( 0.768627, 0.407843, 0.454902, 1 ) -color_back = Color( 0.239216, 0.109804, 0.184314, 1 ) -color_grass = Color( 0.741176, 0.580392, 0, 1 ) - -[node name="SolidTileMap" parent="Control/Screen/Stage" instance=ExtResource( 20 )] -tile_set = SubResource( 1 ) -tile_data = PoolIntArray( -851985, 1, 0, -851984, 1, 0, -851983, 1, 0, -851982, 1, 0, -851981, 1, 0, -851980, 1, 0, -851979, 1, 0, -851978, 1, 0, -851977, 1, 0, -851976, 1, 0, -851975, 1, 0, -851974, 1, 0, -851973, 1, 0, -851972, 1, 0, -851971, 1, 0, -851970, 1, 0, -851969, 1, 0, -917504, 1, 0, -917503, 1, 0, -917502, 1, 0, -917501, 1, 0, -917500, 1, 0, -917499, 1, 0, -917498, 1, 0, -917497, 1, 0, -917496, 1, 0, -917495, 1, 0, -917494, 1, 0, -917493, 1, 0, -917492, 1, 0, -917491, 1, 0, -917490, 1, 0, -917489, 1, 0, -917488, 1, 0, -917487, 1, 0, -917486, 1, 0, -917485, 1, 0, -917484, 1, 0, -917483, 1, 0, -917482, 1, 0, -786449, 1, 0, -851946, 1, 0, -720913, 1, 0, -786410, 1, 0, -655377, 1, 0, -720874, 1, 0, -589841, 1, 0, -655338, 1, 0, -524305, 1, 0, -589802, 1, 0, -458769, 1, 0, -524274, 0, 1, -524273, 0, 0, -524272, 0, 1, -524271, 536870912, 0, -524270, 0, 1, -524269, 536870912, 0, -524268, 536870912, 1, -524266, 1, 0, -393233, 1, 0, -393229, 0, 1, -393228, 0, 0, -393227, 0, 1, -393226, 0, 1, -393225, 536870912, 0, -393224, 0, 1, -393223, 0, 1, -393222, 0, 0, -393221, 0, 1, -393220, 0, 1, -393219, 536870912, 0, -393218, 536870912, 1, -458751, 536870912, 1, -458750, 0, 0, -458749, 536870912, 1, -458748, 536870912, 0, -458747, 0, 1, -458746, 0, 0, -458745, 0, 1, -458744, 536870912, 0, -458743, 0, 1, -458742, 0, 1, -458741, 0, 0, -458740, 0, 1, -458739, 536870912, 1, -458738, 536870912, 0, -458730, 1, 0, -327697, 1, 0, -327693, 0, 0, -327682, 0, 0, -327681, 0, 1, -393216, 0, 1, -393215, 536870912, 0, -393202, 536870912, 1, -393196, 536870912, 1, -393195, 1, 0, -393194, 1, 0, -262161, 1, 0, -262160, 1, 0, -262159, 536870912, 1, -262158, 536870912, 0, -262157, 0, 1, -327666, 0, 0, -327665, 0, 1, -327664, 536870912, 0, -327660, 536870912, 0, -196623, 0, 0, -262124, 536870912, 1, -131087, 536870912, 1, -196588, 0, 0, -65551, 0, 0, -131054, 0, 1, -131053, 536870912, 0, -131052, 536870912, 1, -15, 536870912, 1, -65518, 0, 0, 65521, 0, 0, 65522, 0, 1, 65523, 536870912, 0, 65524, 0, 1, 65525, 0, 0, 65526, 0, 1, 65527, 536870912, 0, 65534, 0, 1, 65535, 0, 0, 0, 0, 1, 1, 536870912, 0, 14, 0, 1, 15, 0, 0, 16, 0, 1, 17, 536870912, 0, 18, 0, 1, 131063, 536870912, 1, 131070, 0, 0, 65537, 0, 1, 65550, 0, 0, 196599, 0, 0, 196600, 0, 1, 196601, 536870912, 0, 196602, 0, 1, 196603, 0, 0, 196604, 0, 1, 196605, 536870912, 0, 196606, 0, 1, 131073, 0, 0, 131074, 0, 1, 131075, 536870912, 0, 131076, 0, 1, 131077, 0, 0, 131078, 0, 1, 131079, 536870912, 0, 131080, 0, 1, 131081, 0, 1, 131082, 0, 0, 131083, 0, 1, 131084, 0, 1, 131085, 536870912, 0, 131086, 0, 1 ) -tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) - -[node name="SpikeTileMap" parent="Control/Screen/Stage" instance=ExtResource( 18 )] -tile_data = PoolIntArray( 131064, 0, 0, 131065, 0, 0, 131066, 0, 0, 131067, 0, 0, 131068, 0, 0, 131069, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 0, 0, 65541, 0, 0, 65542, 0, 0, 65543, 0, 0, 65544, 0, 0, 65545, 0, 0, 65546, 0, 0, 65547, 0, 0, 65548, 0, 0, 65549, 0, 0 ) - -[node name="DetailTileMap" parent="Control/Screen/Stage" instance=ExtResource( 21 )] -z_index = -11 -tile_set = SubResource( 12 ) -tile_data = PoolIntArray( -458766, 536870916, 3, -458765, 536870916, 0, -458764, 4, 1, -458763, 4, 3, -458758, 5, 2, -458757, 5, 0, -458756, 536870917, 2, -524282, 5, 2, -524281, 5, 0, -524280, 5, 0, -524279, 5, 0, -524278, 5, 0, -524277, 536870917, 2, -393230, 4, 0, -393217, 5, 2, -458752, 536870917, 2, -458737, 536870916, 1, -458736, 536870916, 0, -458735, 4, 3, -327694, 4, 2, -327692, 4, 1, -327691, 4, 3, -327688, 6, 0, -327685, 1073741829, 2, -327684, 5, 0, -327683, 1610612741, 2, -393211, 1073741829, 2, -393210, 5, 0, -393209, 1610612741, 2, -393206, 1073741829, 2, -393205, 6, 0, -393204, 5, 0, -393203, 1610612741, 2, -393201, 4, 0, -393200, 536870916, 1, -393199, 536870916, 2, -393197, -2147483643, 2, -262156, 4, 0, -262155, 536870916, 2, -262153, 5, 2, -262152, 5, 0, -262151, -1610612731, 2, -262145, 4, 2, -327680, 536870916, 0, -327679, 4, 3, -327669, 6, 0, -327661, -1073741819, 0, -196617, -1073741819, 0, -196616, -1073741819, 0, -196615, -1073741819, 0, -196613, 4, 2, -196612, 4, 3, -196610, 536870916, 3, -196609, 4, 0, -262144, 536870916, 1, -262143, 4, 3, -262141, 5, 2, -262140, 5, 0, -262139, -1610612731, 2, -262134, 5, 2, -262133, 5, 0, -262132, -1610612731, 2, -262130, 536870916, 3, -262129, 4, 0, -262128, 4, 0, -262127, 4, 3, -262125, -1073741819, 2, -131081, -1073741819, 2, -131080, -1073741819, 0, -131079, 1610612741, 2, -131077, 4, 2, -131076, 4, 3, -131074, 4, 2, -131073, 536870916, 2, -196608, 536870916, 3, -196607, 4, 3, -196605, 5, 0, -196604, 5, 0, -196603, 5, 0, -196601, 536870916, 3, -196600, 536870916, 2, -196598, -1073741819, 2, -196597, 5, 0, -196596, 1610612741, 2, -196594, 4, 2, -196593, 536870916, 2, -196592, 4, 2, -196591, 4, 3, -65550, 536870916, 3, -65549, 536870916, 1, -65548, 4, 0, -65547, 4, 3, -65538, 4, 2, -65537, 536870916, 0, -131072, 536870916, 1, -131071, 4, 3, -131069, -1073741819, 2, -131068, 5, 0, -131067, 1610612741, 2, -131065, 536870916, 3, -131064, 536870916, 2, -131058, 4, 2, -131057, 4, 3, -131056, 536870916, 3, -131055, 536870916, 2, -14, 536870916, 1, -13, 4, 0, -12, 536870916, 1, -11, 4, 0, -10, 4, 3, -5, 5, 0, -2, 4, 2, -1, 536870916, 1, -65536, 4, 0, -65535, 4, 3, -65532, 6, 0, -65522, 536870916, 3, -65521, 4, 0, -65520, 4, 0, -65519, 4, 3, 65531, 6, 0, 4, 6, 0, 5, -1610612731, 2, 9, 5, 2, 131058, 4, 2, 131059, 536870916, 1, 131060, 4, 0, 131061, 536870916, 1, 131062, 536870916, 2, 131067, 6, 0, 131071, 1073741829, 2, 65536, 1610612741, 2, 65540, 6, 0, 65545, 6, 0, 196594, 4, 2, 196595, 4, 0, 196596, 4, 1, 196597, 536870916, 2, 262136, 1073741829, 2, 262137, 5, 0, 262138, 5, 0, 262139, 5, 0, 262140, 1610612741, 2, 196612, 1073741829, 2, 196613, 5, 0, 196614, 5, 0, 196615, 5, 0, 196616, 5, 0, 196617, 1610612741, 2 ) -brick_color = Color( 0.239216, 0.109804, 0.184314, 1 ) -grass_color = Color( 0.741176, 0.580392, 0, 1 ) - -[node name="ObscureMap" parent="Control/Screen/Stage" instance=ExtResource( 19 )] -tile_set = SubResource( 13 ) -tile_data = PoolIntArray( -786448, 536870912, 0, -786447, 536870912, 0, -786446, 536870912, 0, -786445, 536870912, 0, -786444, 536870912, 0, -786443, 536870912, 0, -786442, 536870912, 0, -786441, 536870912, 0, -786440, 536870912, 0, -786439, 536870912, 0, -786438, 536870912, 0, -786437, 536870912, 0, -786436, 536870912, 0, -786435, 536870912, 0, -786434, 536870912, 0, -786433, 536870912, 0, -851968, 536870912, 0, -851967, 536870912, 0, -851966, 536870912, 0, -851965, 536870912, 0, -851964, 536870912, 0, -851963, 536870912, 0, -851962, 536870912, 0, -851961, 536870912, 0, -851960, 536870912, 0, -851959, 536870912, 0, -851958, 536870912, 0, -851957, 536870912, 0, -851956, 536870912, 0, -851955, 536870912, 0, -851954, 536870912, 0, -851953, 536870912, 0, -851952, 536870912, 0, -851951, 536870912, 0, -851950, 536870912, 0, -851949, 536870912, 0, -851948, 536870912, 0, -851947, 536870912, 0, -720912, 536870912, 0, -720911, 536870912, 0, -720910, 536870912, 0, -720909, 536870912, 0, -720908, 536870912, 0, -720907, 536870912, 0, -720906, 536870912, 0, -720905, 536870912, 0, -720904, 536870912, 0, -720903, 536870912, 0, -720902, 536870912, 0, -720901, 536870912, 0, -720900, 536870912, 0, -720899, 536870912, 0, -720898, 536870912, 0, -720897, 536870912, 0, -786432, 536870912, 0, -786431, 536870912, 0, -786430, 536870912, 0, -786429, 536870912, 0, -786428, 536870912, 0, -786427, 536870912, 0, -786426, 536870912, 0, -786425, 536870912, 0, -786424, 536870912, 0, -786423, 536870912, 0, -786422, 536870912, 0, -786421, 536870912, 0, -786420, 536870912, 0, -786419, 536870912, 0, -786418, 536870912, 0, -786417, 536870912, 0, -786416, 536870912, 0, -786415, 536870912, 0, -786414, 536870912, 0, -786413, 536870912, 0, -786412, 536870912, 0, -786411, 536870912, 0, -655376, 536870912, 0, -655375, 536870912, 0, -655374, 536870912, 0, -655373, 536870912, 0, -655372, 536870912, 0, -655371, 536870912, 0, -655370, 536870912, 0, -655369, 536870912, 0, -655368, 536870912, 0, -655367, 536870912, 0, -655366, 536870912, 0, -655365, 536870912, 0, -655364, 536870912, 0, -655363, 536870912, 0, -655362, 536870912, 0, -655361, 536870912, 0, -720896, 536870912, 0, -720895, 536870912, 0, -720894, 536870912, 0, -720893, 536870912, 0, -720892, 536870912, 0, -720891, 536870912, 0, -720890, 536870912, 0, -720889, 536870912, 0, -720888, 536870912, 0, -720887, 536870912, 0, -720886, 536870912, 0, -720885, 536870912, 0, -720884, 536870912, 0, -720883, 536870912, 0, -720882, 536870912, 0, -720881, 536870912, 0, -720880, 536870912, 0, -720879, 536870912, 0, -720878, 536870912, 0, -720877, 536870912, 0, -720876, 536870912, 0, -720875, 536870912, 0, -589840, 536870912, 0, -589839, 536870912, 0, -589838, 536870912, 0, -589837, 536870912, 0, -589836, 536870912, 0, -589835, 536870912, 0, -589834, 536870912, 0, -589833, 536870912, 0, -589832, 536870912, 0, -589831, 536870912, 0, -589830, 536870912, 0, -589829, 536870912, 0, -589828, 536870912, 0, -589827, 536870912, 0, -589826, 536870912, 0, -589825, 536870912, 0, -655360, 536870912, 0, -655359, 536870912, 0, -655358, 536870912, 0, -655357, 536870912, 0, -655356, 536870912, 0, -655355, 536870912, 0, -655354, 536870912, 0, -655353, 536870912, 0, -655352, 536870912, 0, -655351, 536870912, 0, -655350, 536870912, 0, -655349, 536870912, 0, -655348, 536870912, 0, -655347, 536870912, 0, -655346, 536870912, 0, -655345, 536870912, 0, -655344, 536870912, 0, -655343, 536870912, 0, -655342, 536870912, 0, -655341, 536870912, 0, -655340, 536870912, 0, -655339, 536870912, 0, -524304, 536870912, 0, -524303, 536870912, 0, -524302, 536870912, 0, -524301, 536870912, 0, -524300, 536870912, 0, -524299, 536870912, 0, -524298, 536870912, 0, -524297, 536870912, 0, -524296, 536870912, 0, -524295, 536870912, 0, -524294, 536870912, 0, -524293, 536870912, 0, -524292, 536870912, 0, -524291, 536870912, 0, -524290, 536870912, 0, -524289, 536870912, 0, -589824, 536870912, 0, -589823, 536870912, 0, -589822, 536870912, 0, -589821, 536870912, 0, -589820, 536870912, 0, -589819, 536870912, 0, -589818, 536870912, 0, -589817, 536870912, 0, -589816, 536870912, 0, -589815, 536870912, 0, -589814, 536870912, 0, -589813, 536870912, 0, -589812, 536870912, 0, -589811, 536870912, 0, -589810, 536870912, 0, -589809, 536870912, 0, -589808, 536870912, 0, -589807, 536870912, 0, -589806, 536870912, 0, -589805, 536870912, 0, -589804, 536870912, 0, -589803, 536870912, 0, -458768, 536870912, 0, -458767, 536870912, 0, -458766, 536870912, 0, -458765, 536870912, 0, -458764, 536870912, 0, -458763, 536870912, 0, -458762, 536870912, 0, -458761, 536870912, 0, -458760, 536870912, 0, -458759, 536870912, 0, -458758, 536870912, 0, -458757, 536870912, 0, -458756, 536870912, 0, -458755, 536870912, 0, -458754, 536870912, 0, -458753, 536870912, 0, -524288, 536870912, 0, -524287, 536870912, 0, -524286, 536870912, 0, -524285, 536870912, 0, -524284, 536870912, 0, -524283, 536870912, 0, -524282, 536870912, 0, -524281, 536870912, 0, -524280, 536870912, 0, -524279, 536870912, 0, -524278, 536870912, 0, -524277, 536870912, 0, -524276, 536870912, 0, -524275, 536870912, 0, -524267, 536870912, 0, -393232, 536870912, 0, -393231, 536870912, 0, -393230, 536870912, 0, -393217, 536870912, 0, -458752, 536870912, 0, -458732, 2, 2, -458731, 536870912, 0, -327696, 536870912, 0, -327695, 536870912, 0, -327694, 536870912, 0 ) -tile_color = Color( 0.768627, 0.407843, 0.454902, 1 ) - [node name="Vis" type="VisibilityNotifier2D" parent="Control/Screen"] -visible = false rect = Rect2( 0, 0, 136, 96 ) +script = ExtResource( 4 ) -[node name="ViewportContainer" type="ViewportContainer" parent="Control/Screen/Vis"] -margin_right = 136.0 -margin_bottom = 96.0 - -[node name="Viewport" type="Viewport" parent="Control/Screen/Vis/ViewportContainer"] -size = Vector2( 136, 96 ) -handle_input_locally = false -render_target_update_mode = 0 +[node name="Node2D" type="Node2D" parent="Control/Screen/Vis"] [node name="Static" type="ColorRect" parent="Control/Screen/Vis"] modulate = Color( 0.14, 0.14, 0.14, 1 ) @@ -465,6 +287,7 @@ text = "12:67 long_name1234567 [node name="Camera2D" type="Camera2D" parent="."] position = Vector2( 160, 90 ) +current = true smoothing_enabled = true editor_draw_screen = false diff --git a/src/stage/CamBounds.gd b/src/stage/CamBounds.gd new file mode 100644 index 0000000..335e3aa --- /dev/null +++ b/src/stage/CamBounds.gd @@ -0,0 +1,31 @@ +tool +extends Node2D + +export var bounds := Rect2(0, 0, 0, 0) setget _set_bounds + +var bounds_upper := Vector2.ZERO +var bounds_lower := Vector2.ZERO + +var rect : Rect2 +var screen = Vector2(228, 128) + +func _ready(): + rect = Rect2(-screen/2, screen) + # set limits + bounds_upper.x = -bounds.position.x + position.x + bounds_upper.y = -bounds.position.y + position.y + bounds_lower.x = bounds.size.x + position.x + bounds_lower.y = bounds.size.y + position.y + print("CamBounds upper: ", bounds_upper, " lower: ", bounds_lower) + +func _set_bounds(arg): + bounds.position.x = abs(arg.position.x) + bounds.position.y = abs(arg.position.y) + bounds.size.x = abs(arg.size.x) + bounds.size.y = abs(arg.size.y) + update() + +func _draw(): + if Engine.editor_hint: + draw_rect(Rect2(-bounds.position.x - (screen.x/2), -bounds.position.y - (screen.y/2), screen.x + bounds.size.x + bounds.position.x, screen.y + bounds.size.y + bounds.position.y), Color.red, false) + draw_rect(rect, Color.yellow, false) diff --git a/src/stage/GameCamera.tscn b/src/stage/GameCamera.tscn index 6c486dd..b0ce3bb 100644 --- a/src/stage/GameCamera.tscn +++ b/src/stage/GameCamera.tscn @@ -2,8 +2,6 @@ [ext_resource path="res://src/stage/GameCamera.gd" type="Script" id=1] -[node name="GameCamera" type="Camera2D" groups=[ -"game_camera", -]] +[node name="GameCamera" type="Camera2D" groups=["game_camera"]] current = true script = ExtResource( 1 ) From 54ea3cff32b16d76b6991ff2ff417667af2eb3b3 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Mon, 24 Feb 2025 20:27:20 -0500 Subject: [PATCH 02/19] stage display lined up ! can remove excess tiles --- src/menu/select.gd | 4 ++-- src/menu/select.tscn | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/menu/select.gd b/src/menu/select.gd index 9c5b5e6..7adb5bd 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -9,7 +9,7 @@ var current_map := "1-1" onready var screens_node : Control = $Control/Screens onready var screen : Control = $Control/Screen export var screen_dist = Vector2(5, 5) -export var screen_size = Vector2(136, 104) +export var screen_size = Vector2(136, 96) export var columns = 8 var screen_pos := [] var screen_static := [] @@ -197,7 +197,7 @@ func _physics_process(delta): pop[2].add_child(inst) if is_instance_valid(cam): - inst.position += stage_size / 2 + inst.position -= cam.position screen_static[pop[0]].visible = false else: diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 6abe422..b7dbe7b 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -69,7 +69,6 @@ script = ExtResource( 7 ) __meta__ = { "_edit_lock_": true } -screen_size = Vector2( 136, 96 ) [node name="Control" type="Control" parent="."] margin_right = 320.0 @@ -104,6 +103,8 @@ rect = Rect2( 0, 0, 136, 96 ) script = ExtResource( 4 ) [node name="Node2D" type="Node2D" parent="Control/Screen/Vis"] +position = Vector2( 68, 48 ) +z_index = -400 [node name="Static" type="ColorRect" parent="Control/Screen/Vis"] modulate = Color( 0.14, 0.14, 0.14, 1 ) From f22ee3b33a69ef7457a855f2a6c167cdec111503 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Tue, 25 Feb 2025 01:01:01 -0500 Subject: [PATCH 03/19] Cam & CamBounds working (-= level select working too --- project.godot | 6 ---- src/actor/Player.gd | 2 +- src/autoload/Shared.gd | 62 ++--------------------------------- src/autoload/Shared.tscn | 7 +++- src/menu/Creator.tscn | 9 +++--- src/menu/StartMenu.gd | 7 ++-- src/menu/StartMenu.tscn | 7 ++-- src/menu/select.gd | 28 ++++++++-------- src/menu/select.tscn | 54 +++++++++++++++---------------- src/menu/splash.tscn | 7 ++-- src/stage/Cam.gd | 41 +++++++++++++++++++++++ src/stage/CamBounds.gd | 20 ++++++------ src/stage/GameCamera.gd | 68 --------------------------------------- src/stage/GameCamera.tscn | 7 ---- src/stage/preview.gd | 19 ----------- 15 files changed, 118 insertions(+), 226 deletions(-) create mode 100644 src/stage/Cam.gd delete mode 100644 src/stage/GameCamera.gd delete mode 100644 src/stage/GameCamera.tscn delete mode 100644 src/stage/preview.gd diff --git a/project.godot b/project.godot index fab076c..8d36831 100644 --- a/project.godot +++ b/project.godot @@ -54,11 +54,6 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://src/class/savedict.gd" }, { -"base": "Resource", -"class": "StagePreview", -"language": "GDScript", -"path": "res://src/stage/preview.gd" -}, { "base": "Actor", "class": "Switch", "language": "GDScript", @@ -79,7 +74,6 @@ _global_script_class_icons={ "Passthrough": "", "Player": "", "SaveDict": "", -"StagePreview": "", "Switch": "", "SwitchBlock": "" } diff --git a/src/actor/Player.gd b/src/actor/Player.gd index 6ce41ea..cbffde8 100644 --- a/src/actor/Player.gd +++ b/src/actor/Player.gd @@ -71,7 +71,7 @@ func _ready(): btnx_array.append(0) # assign camera target - if !is_attract_mode and Shared.cam: + if !is_attract_mode: Shared.cam.node_target = self Shared.cam.pos_target_offset = Vector2(4, 4) diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index 84df606..793d928 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -2,10 +2,11 @@ extends Node onready var node_ghost := $Ghost onready var node_ghosts := $Ghosts +onready var cam := $Cam + var ghosts := [] var ghost_count := 10 -var cam : Camera2D var map_solid : TileMap var map_obscure : TileMap @@ -102,7 +103,7 @@ func _ready(): var dir = Directory.new() if !dir.open(save_path) == OK: dir.make_dir(save_path) - for i in range(save_limit) + ["map"]: + for i in save_limit: var s = save_path + str(i) if !dir.open(s) == OK: dir.make_dir(s) @@ -112,10 +113,6 @@ func _ready(): for i in dir_list(map_dir): scene_dict[map_dir + i] = load(map_dir + i) maps.append(i.split(".")[0]) - - #print("maps: ", maps, " ", maps.size(), " ", scene_dict) - - load_options() @@ -125,59 +122,6 @@ func _ready(): Wipe.connect("finish", self, "wipe_finish") -func make_preview(inst : Node, map_short): - # make preview - var sp = StagePreview.new() - sp.palette = inst.palette - - for c in inst.get_children(): - var cname = c.name.to_lower() - - var cells = [] - if "map" in cname: - cells = c.get_used_cells() - - if "spike" in cname: - for p in cells: - sp.spike += vec_string(p) + " " - - elif "solid" in cname: - for p in cells: - make_key(p, c, sp.solid, 1) - - elif "detail" in cname: - for p in cells: - make_key(p, c, sp.detail) - - elif "obscure" in cname: - for p in cells: - make_key(p, c, sp.obscure, 0) - - elif "camera" in cname: - var p = c.position - sp.camera = vec_string(p) - - elif "actors" in cname: - for a in c.get_children(): - var aname = a.name.to_lower() - - var p = Vector2.ZERO - if a is Node2D: - p = a.position - - if "player" in aname: - sp.player = vec_string(p) - - elif "exit" in aname: - sp.exit = vec_string(p) - - elif "box" in aname: - sp.box += vec_string(p) + " " - - - - ResourceSaver.save(save_path + "map/" + map_short + ".tres", sp) - func vec_string(p : Vector2): return str(int(p.x)) + "," + str(int(p.y)) diff --git a/src/autoload/Shared.tscn b/src/autoload/Shared.tscn index e059746..34e0d0f 100644 --- a/src/autoload/Shared.tscn +++ b/src/autoload/Shared.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://src/autoload/Shared.gd" type="Script" id=1] [ext_resource path="res://media/image/player_swap.png" type="Texture" id=2] [ext_resource path="res://src/shader/player_palette_swap.gdshader" type="Shader" id=3] +[ext_resource path="res://src/stage/Cam.gd" type="Script" id=4] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 3 ) @@ -32,3 +33,7 @@ vframes = 2 region_rect = Rect2( 0, 0, 8, 24 ) [node name="Ghosts" type="Node2D" parent="."] + +[node name="Cam" type="Camera2D" parent="." groups=["game_camera"]] +current = true +script = ExtResource( 4 ) diff --git a/src/menu/Creator.tscn b/src/menu/Creator.tscn index 2841b3f..40398e6 100644 --- a/src/menu/Creator.tscn +++ b/src/menu/Creator.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=1] [ext_resource path="res://media/image/player_swap.png" type="Texture" id=2] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=3] [ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] [ext_resource path="res://media/image/tinyArrow.png" type="Texture" id=5] [ext_resource path="res://media/image/creator.png" type="Texture" id=6] @@ -252,9 +252,10 @@ z_index = -11 tile_set = SubResource( 22 ) tile_data = PoolIntArray( 65516, 5, 0, 65517, 5, 0, 65518, 5, 0, 65519, 5, 0, 65520, 5, 0, 131052, 5, 0, 131053, 5, 0, 131054, 5, 0, 131055, 5, 0, 131056, 5, 0, 196588, 1073741829, 2, 196589, 5, 0, 196590, 5, 0, 196591, 5, 0, 196592, 1610612741, 2, 262125, 1073741829, 2, 262126, 5, 0, 262127, 1610612741, 2, 327662, 6, 0, 393198, 6, 0, 524273, 1073741829, 2, 524275, -1610612731, 2, 589811, -1610612731, 0, 655347, -1610612731, 0 ) -[node name="GameCamera" parent="." instance=ExtResource( 3 )] +[node name="CamBounds" type="Node2D" parent="."] position = Vector2( -92, 48 ) -zoom = Vector2( 0.5, 0.5 ) +scale = Vector2( 0.5, 0.5 ) +script = ExtResource( 3 ) [node name="Player" type="Node2D" parent="."] position = Vector2( -120, 40 ) @@ -1353,5 +1354,3 @@ margin_bottom = 7.0 custom_fonts/font = SubResource( 14 ) text = "random" align = 1 - -[editable path="GameCamera"] diff --git a/src/menu/StartMenu.gd b/src/menu/StartMenu.gd index c9f2035..17a1c0d 100644 --- a/src/menu/StartMenu.gd +++ b/src/menu/StartMenu.gd @@ -9,6 +9,7 @@ onready var user_label := $Username/Label onready var menu_stuff := main_menu.get_children() onready var credits_node := $Credits onready var stage := $Stage +onready var cam := Shared.cam export var open_player_path : NodePath = "" onready var open_player_mat : ShaderMaterial = get_node(open_player_path).material @@ -125,13 +126,13 @@ func menu_select(tag : String = menu_items[clamp(cursor, 0, menu_items.size() - "options": open_sub(OptionsMenu) Audio.play("menu_options", 0.9, 1.1) - Shared.cam.pos_target += Vector2(24, -4) + cam.pos_target += Vector2(24, -4) "credits": is_credits = true credits_node.visible = true if parent_node: parent_node.visible = false - Shared.cam.pos_target += Vector2(104, 0) + cam.pos_target += Vector2(104, 0) Audio.play("menu_options", 0.9, 1.1) UI.keys(false, false, false, false) TouchScreen.show_keys() @@ -167,7 +168,7 @@ func menu_select(tag : String = menu_items[clamp(cursor, 0, menu_items.size() - func on_close_sub(): - Shared.cam.pos_target = Vector2(90, 76) + cam.pos_target = Vector2(90, 76) UI.keys(false) func switch_menu(arg, silent := false, _cursor := 0): diff --git a/src/menu/StartMenu.tscn b/src/menu/StartMenu.tscn index 0fdc56c..e074215 100644 --- a/src/menu/StartMenu.tscn +++ b/src/menu/StartMenu.tscn @@ -3,6 +3,7 @@ [ext_resource path="res://media/image/creator.png" type="Texture" id=1] [ext_resource path="res://media/image/crate_tiles.png" type="Texture" id=2] [ext_resource path="res://src/menu/StartMenu.gd" type="Script" id=3] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=4] [ext_resource path="res://media/font/ThaleahFat.ttf" type="DynamicFontData" id=5] [ext_resource path="res://media/font/ExpressionPro.ttf" type="DynamicFontData" id=6] [ext_resource path="res://media/image/8pixel.png" type="Texture" id=7] @@ -11,7 +12,6 @@ [ext_resource path="res://src/menu/AttractMode.gd" type="Script" id=10] [ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=11] [ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=12] -[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=13] [ext_resource path="res://src/actor/SwitchBlockBlue.tscn" type="PackedScene" id=14] [ext_resource path="res://src/actor/SwitchBlue.tscn" type="PackedScene" id=15] [ext_resource path="res://media/image/menu.png" type="Texture" id=16] @@ -1084,8 +1084,9 @@ z_index = -11 tile_set = SubResource( 29 ) tile_data = PoolIntArray( 131093, 536870916, 3, 131094, 4, 1, 131095, 4, 0, 131096, 4, 3, 196624, 5, 2, 196625, 5, 0, 196626, -1610612731, 2, 196630, 536870916, 0, 196631, 4, 1, 196632, 4, 0, 262154, 536870916, 3, 262155, 536870916, 0, 262156, 4, 3, 262159, 5, 2, 262160, 5, 0, 262161, 5, 0, 262162, 5, 0, 262163, -1610612731, 2, 262166, 4, 1, 262167, 4, 0, 262168, 4, 1, 327685, 5, 2, 327686, 5, 0, 327687, 5, 0, 327688, 5, 0, 327689, 536870917, 2, 327690, 536870916, 0, 327691, 4, 1, 327692, 4, 0, 327695, -1610612731, 0, 327696, 5, 0, 327697, 5, 0, 327698, 5, 0, 327699, -1073741819, 0, 327701, 536870916, 3, 327702, 4, 0, 327703, 4, 1, 327704, 536870916, 2, 393221, -1073741819, 0, 393227, 4, 1, 393228, 4, 0, 393229, 4, 3, 393231, -1073741819, 2, 393232, 5, 0, 393233, 5, 0, 393234, 5, 0, 393235, -536870907, 2, 393237, 536870916, 0, 393238, 4, 1, 393239, 536870916, 0, 458757, -1073741819, 2, 458759, -1610612731, 2, 458762, 4, 1, 458763, 536870916, 0, 458764, 4, 1, 458765, 4, 0, 458768, -1073741819, 2, 458769, 5, 0, 458770, 1610612741, 2, 458773, 4, 2, 458774, 4, 0, 458775, 4, 1, 458776, 4, 3, 524295, -1610612731, 0, 524298, 4, 2, 524299, 4, 1, 524300, 536870916, 0, 524301, 4, 1, 524302, 4, 3, 524305, 6, 0, 524310, 4, 2, 524311, 536870916, 0, 524312, 536870916, 2, 589831, -1610612730, 0, 589832, -1610612731, 0, 589836, 4, 2, 589837, 4, 1, 589838, 4, 0, 589839, 4, 3, 589841, 6, 0, 589842, -536870907, 2, 655367, -1610612731, 0, 655373, 536870916, 3, 655374, 4, 1, 655375, 536870916, 0, 655377, 6, 0, 720901, -2147483643, 2, 720903, -536870907, 2, 720905, 5, 2, 720906, 5, 0, 720907, 5, 0, 720908, 536870917, 2, 720909, 536870916, 3, 720910, 536870916, 0, 720911, 536870916, 2, 720912, 5, 2, 720913, 6, 0, 720914, 5, 0, 720915, 536870917, 2, 720917, 5, 2, 720918, 5, 0, 720919, 536870917, 2, 786437, -2147483643, 0, 786441, -1073741819, 0, 786455, -1610612731, 0, 851973, -1073741819, 2, 851974, 1610612741, 2, 851977, 1073741829, 2, 851978, 5, 0, 851979, 1610612741, 2, 851982, 4, 1, 851983, 4, 0, 851987, 1073741829, 2, 851988, 5, 0, 851989, 6, 0, 851990, 5, 0, 851991, -536870907, 2, 917517, 536870916, 0, 917518, 4, 1, 917519, 536870916, 2, 917525, 1610612741, 2, 983053, 4, 2, 983054, 4, 0, 983055, 536870916, 2 ) -[node name="GameCamera" parent="Stage" instance=ExtResource( 13 )] +[node name="CamBounds" type="Node2D" parent="Stage"] position = Vector2( 90, 76 ) +script = ExtResource( 4 ) bounds = Rect2( 300, 200, 300, 200 ) [node name="Actors" type="Node2D" parent="Stage"] @@ -1181,5 +1182,3 @@ margin_right = 126.0 margin_bottom = 54.0 custom_fonts/font = SubResource( 28 ) text = "long_name1234567" - -[editable path="Stage/GameCamera"] diff --git a/src/menu/select.gd b/src/menu/select.gd index 7adb5bd..4bd4f3b 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -1,6 +1,6 @@ extends Node2D -onready var cam : Camera2D = $Camera2D +onready var cam : Camera2D = Shared.cam onready var cursor_node := $Cursor var cursor = 0 @@ -110,7 +110,7 @@ func _ready(): overlays.resize(screen_pos.size()) scroll(Shared.map_select) - cam.reset_smoothing() + cam.set_pos(cam.pos_target) screen_list.sort_custom(self, "sort_list") is_screening = true @@ -193,11 +193,11 @@ func _physics_process(delta): var pop = load_list.pop_front() if Shared.scene_dict.has(pop[1]): var inst = Shared.scene_dict[pop[1]].instance() - var cam = inst.get_node("CamBounds") + var cb = inst.get_node("CamBounds") pop[2].add_child(inst) - if is_instance_valid(cam): - inst.position -= cam.position + if is_instance_valid(cb): + inst.position -= cb.position screen_static[pop[0]].visible = false else: @@ -211,20 +211,20 @@ func make_screen(i := 0): var is_locked = Shared.count_gems < map_lock[map_name] new.rect_position = screen_pos[i] - new.get_node("Overlay/HBox/Label").text = (str(map_lock[map_name]) + " to unlock") if is_locked else map_name - new.get_node("Overlay/HBox/Gem").visible = is_locked + new.get_node("Vis/Overlay/HBox/Label").text = (str(map_lock[map_name]) + " to unlock") if is_locked else map_name + new.get_node("Vis/Overlay/HBox/Gem").visible = is_locked var s = {} if Shared.save_maps.has(map_name): s = Shared.save_maps[map_name] var has_note = s.has("note") - new.get_node("Overlay/Notes").visible = has_note - var note_label = new.get_node("Overlay/Notes/Label") + new.get_node("Vis/Overlay/Notes").visible = has_note + var note_label = new.get_node("Vis/Overlay/Notes/Label") if has_note: note_label.text = Shared.time_to_string(s["note"]) - var gem = new.get_node("Overlay/Gem") + var gem = new.get_node("Vis/Overlay/Gem") gem.visible = !is_locked var has_time = s.has("time") @@ -235,9 +235,9 @@ func make_screen(i := 0): gem_label.text = Shared.time_to_string(s["time"]) var has_die = s.has("die") - new.get_node("Overlay/Death").visible = has_die + new.get_node("Vis/Overlay/Death").visible = has_die if has_die: - new.get_node("Overlay/Death/Label").text = str(s["die"]) + new.get_node("Vis/Overlay/Death/Label").text = str(s["die"]) if is_faster and i == Shared.map_select: blink_label = note_label if is_faster_note else gem_label @@ -245,7 +245,7 @@ func make_screen(i := 0): Audio.play("menu_bell", 0.5, 1.0) screens_node.add_child(new) - overlays[i] = new.get_node("Overlay") + overlays[i] = new.get_node("Vis/Overlay") screen_static.append(new.get_node("Vis/Static")) view_scene(new.get_node("Vis/Node2D"), Shared.map_dir + map_list[i] + ".tscn", i) @@ -268,7 +268,7 @@ func scroll(arg := cursor): var sp = screen_pos[cursor] cursor_node.rect_position = sp score_node.rect_position = sp + Vector2(1, 1) - cam.position = sp + (screen_size * 0.5) + cam.pos_target = sp + (screen_size * 0.5) refresh_score() func show_scoreboard(arg := show_score): diff --git a/src/menu/select.tscn b/src/menu/select.tscn index b7dbe7b..4ef7c3e 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://media/image/corner.png" type="Texture" id=1] [ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=2] @@ -11,6 +11,7 @@ [ext_resource path="res://media/image/diamond12.png" type="Texture" id=9] [ext_resource path="res://media/image/menu.png" type="Texture" id=10] [ext_resource path="res://media/image/skull.png" type="Texture" id=11] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=12] [ext_resource path="res://src/menu/cursor_anim.gd" type="Script" id=13] [sub_resource type="ShaderMaterial" id=8] @@ -70,6 +71,11 @@ __meta__ = { "_edit_lock_": true } +[node name="CamBounds" type="Node2D" parent="."] +position = Vector2( 178, 88 ) +script = ExtResource( 12 ) +bounds = Rect2( 9000, 9000, 9000, 9000 ) + [node name="Control" type="Control" parent="."] margin_right = 320.0 margin_bottom = 180.0 @@ -89,19 +95,19 @@ margin_bottom = 136.0 rect_min_size = Vector2( 136, 96 ) rect_clip_content = true -[node name="BG" type="Node2D" parent="Control/Screen"] +[node name="Vis" type="VisibilityNotifier2D" parent="Control/Screen"] +rect = Rect2( 0, 0, 136, 96 ) +script = ExtResource( 4 ) + +[node name="BG" type="Node2D" parent="Control/Screen/Vis"] z_index = -500 -[node name="ColorRect" type="ColorRect" parent="Control/Screen/BG"] +[node name="ColorRect" type="ColorRect" parent="Control/Screen/Vis/BG"] margin_right = 136.0 margin_bottom = 96.0 rect_min_size = Vector2( 136, 96 ) color = Color( 0, 0, 0, 1 ) -[node name="Vis" type="VisibilityNotifier2D" parent="Control/Screen"] -rect = Rect2( 0, 0, 136, 96 ) -script = ExtResource( 4 ) - [node name="Node2D" type="Node2D" parent="Control/Screen/Vis"] position = Vector2( 68, 48 ) z_index = -400 @@ -112,16 +118,16 @@ material = SubResource( 8 ) margin_right = 136.0 margin_bottom = 96.0 -[node name="Overlay" type="Control" parent="Control/Screen"] +[node name="Overlay" type="Control" parent="Control/Screen/Vis"] margin_right = 136.0 margin_bottom = 104.0 -[node name="HBox" type="HBoxContainer" parent="Control/Screen/Overlay"] +[node name="HBox" type="HBoxContainer" parent="Control/Screen/Vis/Overlay"] anchor_right = 1.0 anchor_bottom = 1.0 alignment = 1 -[node name="Gem" type="Control" parent="Control/Screen/Overlay/HBox"] +[node name="Gem" type="Control" parent="Control/Screen/Vis/Overlay/HBox"] margin_left = 48.0 margin_top = 44.0 margin_right = 64.0 @@ -129,13 +135,13 @@ margin_bottom = 60.0 rect_min_size = Vector2( 16, 16 ) size_flags_vertical = 4 -[node name="Sprite" type="Sprite" parent="Control/Screen/Overlay/HBox/Gem"] +[node name="Sprite" type="Sprite" parent="Control/Screen/Vis/Overlay/HBox/Gem"] modulate = Color( 1, 0.92549, 0.152941, 1 ) material = SubResource( 10 ) position = Vector2( 8, 8 ) texture = ExtResource( 9 ) -[node name="Label" type="Label" parent="Control/Screen/Overlay/HBox"] +[node name="Label" type="Label" parent="Control/Screen/Vis/Overlay/HBox"] margin_left = 68.0 margin_top = 49.0 margin_right = 88.0 @@ -146,17 +152,17 @@ text = "1-1" align = 1 valign = 1 -[node name="Death" type="Control" parent="Control/Screen/Overlay"] +[node name="Death" type="Control" parent="Control/Screen/Vis/Overlay"] margin_top = 96.0 margin_bottom = 96.0 -[node name="Clock" type="Sprite" parent="Control/Screen/Overlay/Death"] +[node name="Clock" type="Sprite" parent="Control/Screen/Vis/Overlay/Death"] material = SubResource( 3 ) position = Vector2( 8, -7 ) texture = ExtResource( 11 ) region_rect = Rect2( 15, 7, 10, 10 ) -[node name="Label" type="Label" parent="Control/Screen/Overlay/Death"] +[node name="Label" type="Label" parent="Control/Screen/Vis/Overlay/Death"] margin_left = 15.0 margin_top = -9.0 margin_right = 83.0 @@ -165,14 +171,14 @@ grow_horizontal = 2 custom_fonts/font = SubResource( 4 ) text = "79" -[node name="Notes" type="Control" parent="Control/Screen/Overlay"] +[node name="Notes" type="Control" parent="Control/Screen/Vis/Overlay"] -[node name="Sprite" type="Sprite" parent="Control/Screen/Overlay/Notes"] +[node name="Sprite" type="Sprite" parent="Control/Screen/Vis/Overlay/Notes"] material = SubResource( 3 ) position = Vector2( 10, 10 ) texture = ExtResource( 3 ) -[node name="Label" type="Label" parent="Control/Screen/Overlay/Notes"] +[node name="Label" type="Label" parent="Control/Screen/Vis/Overlay/Notes"] margin_left = 19.0 margin_top = 4.0 margin_right = 101.0 @@ -181,19 +187,19 @@ grow_horizontal = 2 custom_fonts/font = SubResource( 4 ) text = "12:34" -[node name="Gem" type="Control" parent="Control/Screen/Overlay"] +[node name="Gem" type="Control" parent="Control/Screen/Vis/Overlay"] margin_left = 136.0 margin_top = 96.0 margin_right = 136.0 margin_bottom = 96.0 -[node name="Sprite" type="Sprite" parent="Control/Screen/Overlay/Gem"] +[node name="Sprite" type="Sprite" parent="Control/Screen/Vis/Overlay/Gem"] modulate = Color( 0.513726, 0.462745, 0.611765, 1 ) material = SubResource( 9 ) position = Vector2( -12, -12 ) texture = ExtResource( 8 ) -[node name="Label" type="Label" parent="Control/Screen/Overlay/Gem"] +[node name="Label" type="Label" parent="Control/Screen/Vis/Overlay/Gem"] margin_left = -103.0 margin_top = -9.0 margin_right = -21.0 @@ -286,12 +292,6 @@ text = "12:67 long_name1234567 9. waahuu 10. thats it" -[node name="Camera2D" type="Camera2D" parent="."] -position = Vector2( 160, 90 ) -current = true -smoothing_enabled = true -editor_draw_screen = false - [node name="Cursor" type="Control" parent="."] modulate = Color( 1, 0.92549, 0.152941, 1 ) margin_left = 110.0 diff --git a/src/menu/splash.tscn b/src/menu/splash.tscn index 5075f02..21da7a9 100644 --- a/src/menu/splash.tscn +++ b/src/menu/splash.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://media/image/title_splash-pixel.png" type="Texture" id=1] +[ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=2] [ext_resource path="res://src/menu/splash.gd" type="Script" id=3] [node name="Splash" type="Node2D"] @@ -27,6 +28,6 @@ modulate = Color( 0, 0, 0, 1 ) position = Vector2( 114, 64 ) texture = ExtResource( 1 ) -[node name="Camera2D" type="Camera2D" parent="CanvasLayer/Center/Control"] +[node name="CamBounds" type="Node2D" parent="CanvasLayer/Center/Control"] position = Vector2( 114, 64 ) -current = true +script = ExtResource( 2 ) diff --git a/src/stage/Cam.gd b/src/stage/Cam.gd new file mode 100644 index 0000000..8bc26dd --- /dev/null +++ b/src/stage/Cam.gd @@ -0,0 +1,41 @@ +extends Camera2D + +var node_target : Node2D +var pos_target := Vector2.ZERO +var pos_target_offset := Vector2.ZERO +export var lerp_step := 0.1 +var lerp_pos := Vector2.ZERO + +var bounds_upper := Vector2.ZERO +var bounds_lower := Vector2.ZERO + + +func set_pos(arg : Vector2 = position): + position = arg + lerp_pos = position + pos_target = position + +func _ready(): + set_pos() + + Wipe.connect("finish", self, "wipe_finish") + +func wipe_finish(): + node_target = null + pos_target_offset = Vector2.ZERO + +func _physics_process(delta): + if is_instance_valid(node_target): + pos_target = node_target.position + pos_target_offset + pos_target.x = clamp(pos_target.x, bounds_upper.x, bounds_lower.x) + pos_target.y = clamp(pos_target.y, bounds_upper.y, bounds_lower.y) + + # smoothing + lerp_pos = lerp_pos.linear_interpolate(pos_target, clamp(lerp_step, 0, 1)) + position = lerp_pos.round() + +# super simple screen shake +func shake(dist : int): + position.x += dist if randf() < 0.5 else -dist + position.y += dist if randf() < 0.5 else -dist + lerp_pos = position diff --git a/src/stage/CamBounds.gd b/src/stage/CamBounds.gd index 335e3aa..c4b0ba5 100644 --- a/src/stage/CamBounds.gd +++ b/src/stage/CamBounds.gd @@ -3,20 +3,22 @@ extends Node2D export var bounds := Rect2(0, 0, 0, 0) setget _set_bounds -var bounds_upper := Vector2.ZERO -var bounds_lower := Vector2.ZERO - +var cam var rect : Rect2 var screen = Vector2(228, 128) func _ready(): rect = Rect2(-screen/2, screen) - # set limits - bounds_upper.x = -bounds.position.x + position.x - bounds_upper.y = -bounds.position.y + position.y - bounds_lower.x = bounds.size.x + position.x - bounds_lower.y = bounds.size.y + position.y - print("CamBounds upper: ", bounds_upper, " lower: ", bounds_lower) + + if (!Shared.is_level_select or get_parent().name == "Select") and is_instance_valid(Shared.cam): + cam = Shared.cam + cam.bounds_upper = position - bounds.position + cam.bounds_lower = bounds.size + position + + cam.set_pos(global_position) + cam.zoom = scale + + print("CamBounds upper: ", cam.bounds_upper, " lower: ", cam.bounds_lower) func _set_bounds(arg): bounds.position.x = abs(arg.position.x) diff --git a/src/stage/GameCamera.gd b/src/stage/GameCamera.gd deleted file mode 100644 index 5911347..0000000 --- a/src/stage/GameCamera.gd +++ /dev/null @@ -1,68 +0,0 @@ -tool -extends Camera2D - -export var is_moving := true - -var node_target : Node2D -var pos_target := Vector2.ZERO -var pos_target_offset := Vector2.ZERO -export var lerp_step := 0.1 -var lerp_pos := Vector2.ZERO - -export var is_focal_point := false -# between 0.0 and 1.0, distance of lerp between focal point and target -export var target_influence := 0.5 - -var node_bounds : ColorRect -var bounds_upper := Vector2.ZERO -var bounds_lower := Vector2.ZERO - -export var bounds := Rect2(0, 0, 0, 0) setget _set_bounds - -func _ready(): - if Engine.editor_hint or Shared.is_level_select: - set_physics_process(false) - return - - Shared.cam = self - - # set limits - bounds_upper.x = -bounds.position.x + position.x - bounds_upper.y = -bounds.position.y + position.y - bounds_lower.x = bounds.size.x + position.x - bounds_lower.y = bounds.size.y + position.y - print("GameCamera - bounds upper: ", bounds_upper, " lower: ", bounds_lower) - - # set vars - lerp_pos = position - pos_target = position - -func _physics_process(delta): - if !is_moving or Engine.editor_hint: - return - - if is_instance_valid(node_target): - pos_target = node_target.position + pos_target_offset - pos_target.x = clamp(pos_target.x, bounds_upper.x, bounds_lower.x) - pos_target.y = clamp(pos_target.y, bounds_upper.y, bounds_lower.y) - - # smoothing - lerp_pos = lerp_pos.linear_interpolate(pos_target, lerp_step) - position = lerp_pos.round() - -func _set_bounds(arg): - bounds.position.x = abs(arg.position.x) - bounds.position.y = abs(arg.position.y) - bounds.size.x = abs(arg.size.x) - bounds.size.y = abs(arg.size.y) - update() - -func _draw(): - if Engine.editor_hint: - draw_rect(Rect2(-bounds.position.x - 228/2, -bounds.position.y - 128/2, 228 + bounds.size.x + bounds.position.x, 128 + bounds.size.y + bounds.position.y), Color.red, false) - -# super simple screen shake -func shake(dist : int): - position.x += dist if randf() < 0.5 else -dist - position.y += dist if randf() < 0.5 else -dist - lerp_pos = position diff --git a/src/stage/GameCamera.tscn b/src/stage/GameCamera.tscn deleted file mode 100644 index b0ce3bb..0000000 --- a/src/stage/GameCamera.tscn +++ /dev/null @@ -1,7 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://src/stage/GameCamera.gd" type="Script" id=1] - -[node name="GameCamera" type="Camera2D" groups=["game_camera"]] -current = true -script = ExtResource( 1 ) diff --git a/src/stage/preview.gd b/src/stage/preview.gd deleted file mode 100644 index 634ce54..0000000 --- a/src/stage/preview.gd +++ /dev/null @@ -1,19 +0,0 @@ -extends Resource -class_name StagePreview - -export var file_md5 := "" - -export var palette := 0 - -export var camera := "" -export var player := "" -export var exit := "" -export var box := "" - -export var spike := "" - -export var solid := {} -export var detail := {} -export var obscure := {} - -# ID CO-ORDS.x is_transpose + is_x + is_y From 56ec7561e1580fc5bb1330223a4d378bfc2e5abb Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Tue, 25 Feb 2025 02:06:04 -0500 Subject: [PATCH 04/19] take screenshots of every level --- src/actor/BoxSpawner.gd | 2 ++ src/actor/ExitStar.gd | 3 +++ src/actor/Switch.gd | 4 ++-- src/autoload/Shared.gd | 22 ++-------------------- src/menu/splash.gd | 30 ++++++++++++++++++++++++++++++ src/menu/splash.tscn | 14 ++++++++++++++ 6 files changed, 53 insertions(+), 22 deletions(-) diff --git a/src/actor/BoxSpawner.gd b/src/actor/BoxSpawner.gd index 8d5297f..17536ca 100644 --- a/src/actor/BoxSpawner.gd +++ b/src/actor/BoxSpawner.gd @@ -13,6 +13,8 @@ export var color := "red" var box = preload("res://src/actor/Box.tscn") func _ready(): + if Shared.is_level_select: return + for i in get_tree().get_nodes_in_group("switch_" + color): i.connect("press", self, "release") diff --git a/src/actor/ExitStar.gd b/src/actor/ExitStar.gd index e3fcc96..9cde57e 100644 --- a/src/actor/ExitStar.gd +++ b/src/actor/ExitStar.gd @@ -26,6 +26,9 @@ func _ready(): rot_speed += rand_range(-rot_speed_diff, rot_speed_diff) if randf() > 0.5: rot_speed = -rot_speed + + for i in 5: + _physics_process(1.0/60.0) func _physics_process(delta): counter += delta diff --git a/src/actor/Switch.gd b/src/actor/Switch.gd index 9bc9757..d2e3e04 100644 --- a/src/actor/Switch.gd +++ b/src/actor/Switch.gd @@ -14,11 +14,11 @@ signal press signal release func _enter_tree(): - if Engine.editor_hint: return + if Engine.editor_hint or Shared.is_level_select: return add_to_group("switch_" + color) func _physics_process(delta): - if Engine.editor_hint: return + if Engine.editor_hint or Shared.is_level_select: return is_last = is_on is_on = is_area_solid_actor(position.x, position.y) diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index 793d928..b36997e 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -103,7 +103,8 @@ func _ready(): var dir = Directory.new() if !dir.open(save_path) == OK: dir.make_dir(save_path) - for i in save_limit: + + for i in range(save_limit) + ["map"]: var s = save_path + str(i) if !dir.open(s) == OK: dir.make_dir(s) @@ -122,25 +123,6 @@ func _ready(): Wipe.connect("finish", self, "wipe_finish") -func vec_string(p : Vector2): - return str(int(p.x)) + "," + str(int(p.y)) - -func make_key(p : Vector2, c : TileMap, dict : Dictionary, skip_id := -1): - var id = c.get_cellv(p) - if id == skip_id: - return - var coord = c.get_cell_autotile_coord(p.x, p.y) - - var t = c.is_cell_transposed(p.x, p.y) - var x = c.is_cell_x_flipped(p.x, p.y) - var y = c.is_cell_y_flipped(p.x, p.y) - var key = str(id) + " " + str(int(coord.x)) + " " + str(int(t)) + str(int(x)) + str(int(y)) - - if !dict.has(key): - dict[key] = "" - - dict[key] += vec_string(p) + " " - func _input(event): var joy = event is InputEventJoypadButton or event is InputEventJoypadMotion if is_gamepad != joy: diff --git a/src/menu/splash.gd b/src/menu/splash.gd index 886459a..de4e097 100644 --- a/src/menu/splash.gd +++ b/src/menu/splash.gd @@ -1,8 +1,38 @@ extends Node2D +onready var viewport := $ViewportContainer/Viewport +onready var view_node := $ViewportContainer/Viewport/Node2D + func _ready(): + + Shared.is_level_select = true + for i in Shared.scene_dict.keys(): + var inst = Shared.scene_dict[i].instance() + + for c in view_node.get_children(): + c.queue_free() + + view_node.add_child(inst) + + var cb = inst.get_node("CamBounds") + if is_instance_valid(cb): + inst.position -= cb.position + var ps = inst.get_node("Actors/Player/Sprite") + if is_instance_valid(ps): + ps.material = null + + for f in 2: + yield(get_tree(), "idle_frame") + + var image = viewport.get_texture().get_data() + image.flip_y() + + image.save_png("user://save/map/" + str(i).split("/")[-1].trim_suffix(".tscn") + ".png") + + yield(get_tree(), "idle_frame") Music.play() Audio.play("menu_bell") yield(get_tree().create_timer(1.5), "timeout") Shared.wipe_scene(Shared.main_menu_path) + diff --git a/src/menu/splash.tscn b/src/menu/splash.tscn index 21da7a9..d00fa0a 100644 --- a/src/menu/splash.tscn +++ b/src/menu/splash.tscn @@ -31,3 +31,17 @@ texture = ExtResource( 1 ) [node name="CamBounds" type="Node2D" parent="CanvasLayer/Center/Control"] position = Vector2( 114, 64 ) script = ExtResource( 2 ) + +[node name="ViewportContainer" type="ViewportContainer" parent="."] +margin_left = -163.0 +margin_top = -120.0 +margin_right = -27.0 +margin_bottom = -24.0 + +[node name="Viewport" type="Viewport" parent="ViewportContainer"] +size = Vector2( 136, 96 ) +handle_input_locally = false +render_target_update_mode = 3 + +[node name="Node2D" type="Node2D" parent="ViewportContainer/Viewport"] +position = Vector2( 68, 48 ) From ee2dfaa0b80649f08b23cdd9161df6e0445e8ee9 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Tue, 25 Feb 2025 02:15:47 -0500 Subject: [PATCH 05/19] color invert after screenshots --- src/menu/splash.gd | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/menu/splash.gd b/src/menu/splash.gd index de4e097..5d76233 100644 --- a/src/menu/splash.gd +++ b/src/menu/splash.gd @@ -1,10 +1,16 @@ extends Node2D +onready var color_rect := $CanvasLayer/ColorRect +onready var logo := $CanvasLayer/Center/Control/Logo + onready var viewport := $ViewportContainer/Viewport onready var view_node := $ViewportContainer/Viewport/Node2D func _ready(): + color_rect.modulate = Color.black + logo.modulate = Color.white + Shared.is_level_select = true for i in Shared.scene_dict.keys(): var inst = Shared.scene_dict[i].instance() @@ -31,6 +37,10 @@ func _ready(): yield(get_tree(), "idle_frame") + + color_rect.modulate = Color.white + logo.modulate = Color.black + Music.play() Audio.play("menu_bell") yield(get_tree().create_timer(1.5), "timeout") From f75b735580816d23ce4e70423b1755df71edbb6c Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Tue, 25 Feb 2025 03:58:21 -0500 Subject: [PATCH 06/19] sheet.png & sheet.tres, showing map images on select (-= --- src/actor/BoxSpawner.gd | 4 +- src/actor/BoxSpawner.tscn | 1 + src/actor/ExitStar.gd | 3 -- src/autoload/Shared.gd | 4 +- src/menu/select.gd | 6 ++- src/menu/select.tscn | 10 ++++- src/menu/splash.gd | 83 +++++++++++++++++++++++++++----------- src/menu/splash.tscn | 1 + src/stage/sheet.png | Bin 0 -> 48459 bytes src/stage/sheet.tres | 45 +++++++++++++++++++++ 10 files changed, 125 insertions(+), 32 deletions(-) create mode 100644 src/stage/sheet.png create mode 100644 src/stage/sheet.tres diff --git a/src/actor/BoxSpawner.gd b/src/actor/BoxSpawner.gd index 17536ca..e9650fe 100644 --- a/src/actor/BoxSpawner.gd +++ b/src/actor/BoxSpawner.gd @@ -13,7 +13,9 @@ export var color := "red" var box = preload("res://src/actor/Box.tscn") func _ready(): - if Shared.is_level_select: return + if Shared.is_level_select: + node_anim.advance(0.5) + return for i in get_tree().get_nodes_in_group("switch_" + color): i.connect("press", self, "release") diff --git a/src/actor/BoxSpawner.tscn b/src/actor/BoxSpawner.tscn index d6c2c8e..a2a4720 100644 --- a/src/actor/BoxSpawner.tscn +++ b/src/actor/BoxSpawner.tscn @@ -96,6 +96,7 @@ vframes = 8 frame = 15 [node name="Sprite2" type="Sprite" parent="."] +visible = false position = Vector2( 4, 4 ) z_index = 50 z_as_relative = false diff --git a/src/actor/ExitStar.gd b/src/actor/ExitStar.gd index 9cde57e..e3fcc96 100644 --- a/src/actor/ExitStar.gd +++ b/src/actor/ExitStar.gd @@ -26,9 +26,6 @@ func _ready(): rot_speed += rand_range(-rot_speed_diff, rot_speed_diff) if randf() > 0.5: rot_speed = -rot_speed - - for i in 5: - _physics_process(1.0/60.0) func _physics_process(delta): counter += delta diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index b36997e..16b358c 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -48,6 +48,8 @@ var bus_volume = [10, 10, 10] var actors := [] var player +var map_dict : Dictionary = load("res://src/stage/sheet.tres").dict + var map_select := 0 var maps := [] var map_name := "" @@ -104,7 +106,7 @@ func _ready(): if !dir.open(save_path) == OK: dir.make_dir(save_path) - for i in range(save_limit) + ["map"]: + for i in save_limit: var s = save_path + str(i) if !dir.open(s) == OK: dir.make_dir(s) diff --git a/src/menu/select.gd b/src/menu/select.gd index 4bd4f3b..dc20e88 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -244,10 +244,14 @@ func make_screen(i := 0): print("faster ", i, ", blink_label ", blink_label) Audio.play("menu_bell", 0.5, 1.0) + var sprite = new.get_node("Vis/Sprite") + var dict = Shared.map_dict[map_name] + sprite.region_rect = Rect2(screen_size * Vector2(dict[0], dict[1]), screen_size) + screens_node.add_child(new) overlays[i] = new.get_node("Vis/Overlay") screen_static.append(new.get_node("Vis/Static")) - view_scene(new.get_node("Vis/Node2D"), Shared.map_dir + map_list[i] + ".tscn", i) + #view_scene(new.get_node("Vis/Node2D"), Shared.map_dir + map_list[i] + ".tscn", i) # view a scene inside the viewport by path func view_scene(port, path, arg): diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 4ef7c3e..33e7ec6 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=22 format=2] +[gd_scene load_steps=23 format=2] [ext_resource path="res://media/image/corner.png" type="Texture" id=1] [ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=2] @@ -13,6 +13,7 @@ [ext_resource path="res://media/image/skull.png" type="Texture" id=11] [ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=12] [ext_resource path="res://src/menu/cursor_anim.gd" type="Script" id=13] +[ext_resource path="res://src/stage/sheet.png" type="Texture" id=14] [sub_resource type="ShaderMaterial" id=8] shader = ExtResource( 5 ) @@ -93,7 +94,6 @@ margin_top = 40.0 margin_right = 246.0 margin_bottom = 136.0 rect_min_size = Vector2( 136, 96 ) -rect_clip_content = true [node name="Vis" type="VisibilityNotifier2D" parent="Control/Screen"] rect = Rect2( 0, 0, 136, 96 ) @@ -118,6 +118,12 @@ material = SubResource( 8 ) margin_right = 136.0 margin_bottom = 96.0 +[node name="Sprite" type="Sprite" parent="Control/Screen/Vis"] +texture = ExtResource( 14 ) +centered = false +region_enabled = true +region_rect = Rect2( 0, 0, 136, 96 ) + [node name="Overlay" type="Control" parent="Control/Screen/Vis"] margin_right = 136.0 margin_bottom = 104.0 diff --git a/src/menu/splash.gd b/src/menu/splash.gd index 5d76233..a3e0159 100644 --- a/src/menu/splash.gd +++ b/src/menu/splash.gd @@ -1,5 +1,7 @@ extends Node2D +export var is_build_sheet := false + onready var color_rect := $CanvasLayer/ColorRect onready var logo := $CanvasLayer/Center/Control/Logo @@ -7,42 +9,75 @@ onready var viewport := $ViewportContainer/Viewport onready var view_node := $ViewportContainer/Viewport/Node2D func _ready(): + if is_build_sheet: + color_rect.modulate = Color.black + logo.modulate = Color.white - color_rect.modulate = Color.black - logo.modulate = Color.white - - Shared.is_level_select = true - for i in Shared.scene_dict.keys(): - var inst = Shared.scene_dict[i].instance() + yield(get_tree(), "idle_frame") - for c in view_node.get_children(): - c.queue_free() + Shared.is_level_select = true + Shared.map_dict = {} + var ix = 136 + var iy = 96 + var vx = 5 + var vy = 8 - view_node.add_child(inst) + var image_sheet = viewport.get_texture().get_data() + image_sheet.resize(ix * vx, iy * vy) - var cb = inst.get_node("CamBounds") - if is_instance_valid(cb): - inst.position -= cb.position - var ps = inst.get_node("Actors/Player/Sprite") - if is_instance_valid(ps): - ps.material = null - - for f in 2: + for i in Shared.maps.size(): + var dx = int(i % vx) + var dy = int(floor(i / vx)) + var s = str(Shared.maps[i]) + Shared.map_dict[s] = [dx,dy,0,0,0,0,0,0] + var dict = Shared.map_dict[s] + + var inst = load(Shared.map_dir + s + ".tscn").instance() + + for c in view_node.get_children(): + c.queue_free() + + view_node.add_child(inst) + + var cb = inst.get_node("CamBounds") + if is_instance_valid(cb): + inst.position -= cb.position + dict[2] = int(cb.position.x) + dict[3] = int(cb.position.y) + + var p = inst.get_node("Actors/Player") + if is_instance_valid(p): + p.visible = false + dict[4] = int(p.position.x) + dict[5] = int(p.position.y) + + var e = inst.get_node("Actors/Exit") + if is_instance_valid(e): + e.visible = false + dict[6] = int(e.position.x) + dict[7] = int(e.position.y) + yield(get_tree(), "idle_frame") + + var image = viewport.get_texture().get_data() + image.flip_y() + + image_sheet.blit_rect(image, Rect2(0, 0, ix, iy), Vector2(dx * ix, dy * iy)) + image_sheet.save_png("res://src/stage/sheet.png") - var image = viewport.get_texture().get_data() - image.flip_y() + var sd := SaveDict.new() + sd.dict = Shared.map_dict - image.save_png("user://save/map/" + str(i).split("/")[-1].trim_suffix(".tscn") + ".png") - - - yield(get_tree(), "idle_frame") + ResourceSaver.save("res://src/stage/sheet.tres", sd) + + yield(get_tree(), "idle_frame") color_rect.modulate = Color.white logo.modulate = Color.black - Music.play() Audio.play("menu_bell") + yield(get_tree().create_timer(1.5), "timeout") + Shared.wipe_scene(Shared.main_menu_path) diff --git a/src/menu/splash.tscn b/src/menu/splash.tscn index d00fa0a..8bfdfb0 100644 --- a/src/menu/splash.tscn +++ b/src/menu/splash.tscn @@ -6,6 +6,7 @@ [node name="Splash" type="Node2D"] script = ExtResource( 3 ) +is_build_sheet = true [node name="CanvasLayer" type="CanvasLayer" parent="."] layer = 9 diff --git a/src/stage/sheet.png b/src/stage/sheet.png new file mode 100644 index 0000000000000000000000000000000000000000..9c0258351f4e8c56e3dea2b760ad14299e9dc8e6 GIT binary patch literal 48459 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 literal 0 HcmV?d00001 diff --git a/src/stage/sheet.tres b/src/stage/sheet.tres new file mode 100644 index 0000000..b57099c --- /dev/null +++ b/src/stage/sheet.tres @@ -0,0 +1,45 @@ +[gd_resource type="Resource" load_steps=2 format=2] + +[ext_resource path="res://src/class/savedict.gd" type="Script" id=1] + +[resource] +script = ExtResource( 1 ) +dict = { +"1-1": [ 0, 0, 0, 0, -40, 8, 45, 5 ], +"1-2": [ 1, 0, 0, 0, -48, 24, 45, -19 ], +"1-3": [ 2, 0, -24, -16, -92, 24, -67, -51 ], +"1-4": [ 3, 0, 16, 0, 40, 32, -51, -27 ], +"1-5": [ 4, 0, 32, -24, 34, 16, 53, -67 ], +"1-6": [ 0, 1, 8, -24, -12, -8, -3, -67 ], +"1-7": [ 1, 1, 16, -40, -4, -8, 77, -75 ], +"1-8": [ 2, 1, 0, -48, -4, -8, -3, -83 ], +"2-1": [ 3, 1, 40, -16, -53, -8, 125, -11 ], +"2-2": [ 4, 1, 40, -20, 36, -24, 125, -27 ], +"2-3": [ 0, 2, -14, -24, -84, -8, 125, -51 ], +"2-4": [ 1, 2, 20, -24, 52, 16, 29, -123 ], +"2-5": [ 2, 2, 52, -20, -11, -8, 133, -35 ], +"2-6": [ 3, 2, 8, 8, -27, -24, 57, 49 ], +"2-7": [ 4, 2, 0, -24, -68, -8, -3, -55 ], +"2-8": [ 0, 3, -16, -32, -40, 8, -91, -67 ], +"3-1": [ 1, 3, 8, -8, -28, -8, 61, -35 ], +"3-2": [ 2, 3, -4, -16, -40, -8, 5, -59 ], +"3-3": [ 3, 3, -8, -24, -56, -16, -35, -67 ], +"3-4": [ 4, 3, 16, -8, -64, 16, 149, -35 ], +"3-5": [ 0, 4, -16, -24, -68, -8, 29, -43 ], +"3-6": [ 1, 4, -16, -36, -63, -32, 53, -59 ], +"3-7": [ 2, 4, 16, -44, -52, -32, 95, -67 ], +"3-8": [ 3, 4, 4, -33, -60, -16, 77, -75 ], +"4-1": [ 4, 4, 0, -4, -44, 8, 41, -15 ], +"4-2": [ 0, 5, 0, -52, -9, -8, -3, -99 ], +"4-3": [ 1, 5, 16, -4, 60, 24, -59, -51 ], +"4-4": [ 2, 5, 28, -40, -4, -24, 25, -55 ], +"4-5": [ 3, 5, -8, -28, 5, -24, 49, -63 ], +"4-6": [ 4, 5, 48, -44, 87, -16, -35, -51 ], +"4-7": [ 0, 6, 40, -36, 86, -16, -119, -55 ], +"4-8": [ 1, 6, 40, -44, -8, -16, -47, -79 ], +"5-1": [ 2, 6, 34, -40, -12, -16, 174, -59 ], +"5-2": [ 3, 6, 52, -32, 121, -16, -43, -67 ], +"5-3": [ 4, 6, 48, -48, 33, -64, -39, -47 ], +"5-4": [ 0, 7, 34, -56, 69, -16, -51, -91 ], +"win": [ 1, 7, 0, -24, -13, 8, 89, -39 ] +} From 364f8a40620a6f362249d622157038e1bb602171 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Tue, 25 Feb 2025 04:15:29 -0500 Subject: [PATCH 07/19] clean up scene_dict and select --- src/autoload/Shared.gd | 6 +----- src/menu/select.gd | 44 ------------------------------------------ src/menu/select.tscn | 27 +------------------------- src/menu/splash.tscn | 1 - 4 files changed, 2 insertions(+), 76 deletions(-) diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index 16b358c..877e353 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -35,7 +35,6 @@ var save_path := "user://save/" var save_filename := "box.save" var keys_path := "keys.tres" var options_path := "options.tres" -var scene_dict := {} var replays := [{}, {}, {}, {}, {}, {}, {}] var is_save := false var last_menu := "main" @@ -114,7 +113,6 @@ func _ready(): # get all maps for i in dir_list(map_dir): - scene_dict[map_dir + i] = load(map_dir + i) maps.append(i.split(".")[0]) @@ -197,9 +195,7 @@ func change_map(): if is_win: save_replays() - if !scene_dict.has(scene_path): - scene_dict[scene_path] = load(scene_path) - get_tree().change_scene_to(scene_dict[scene_path]) + get_tree().change_scene_to(load(scene_path)) is_win = false is_save = false diff --git a/src/menu/select.gd b/src/menu/select.gd index dc20e88..9fad5b8 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -10,9 +10,7 @@ onready var screens_node : Control = $Control/Screens onready var screen : Control = $Control/Screen export var screen_dist = Vector2(5, 5) export var screen_size = Vector2(136, 96) -export var columns = 8 var screen_pos := [] -var screen_static := [] var screen_max := 1 var overlays := [] @@ -32,17 +30,10 @@ onready var score_clock := $Control/Scores/HBoxContainer/Clock onready var score_map := $Control/Scores/HBoxContainer/Map onready var score_row := $Control/Scores/Row -var load_list := [] -var loader : ResourceInteractiveLoader -var port_count = 0 -var is_load := false var is_screening := false -var map_limit := 0 var screen_list := [] export var timeout_mod := 1.0 - var screen_time := 0.0 -var loading_time := 0.0 export var color_gem := Color("ffec27") export var color_new := Color("83769c") @@ -69,8 +60,6 @@ var lockdict= {0:["1-1", "1-2", "1-3", "1-4", "1-5", "1-6", "1-7", "1-8"], 24: ['5-1', '5-2', '5-3', '5-4'], 30: ['win']} -var stage_size := Vector2(136, 96) - func _ready(): #Leaderboard.connect("new_score", self, "new_score") #SilentWolf.Scores.connect("sw_scores_received", self, "new_score") @@ -135,7 +124,6 @@ func _input(event): if open_map(): Audio.play("menu_pick", 0.9, 1.1) is_input = false - is_load = false else: Audio.play("menu_random", 0.8, 1.2) elif event.is_action_pressed("ui_pause"): @@ -180,30 +168,8 @@ func _physics_process(delta): make_screen(screen_list.pop_front()) else: is_screening = false - is_load = true print(screen_time, " screeening time") break - - # load stages - elif is_load: - loading_time += delta - - while OS.get_ticks_msec() < ticks + (delta * timeout_mod): - if load_list.size() > 0: - var pop = load_list.pop_front() - if Shared.scene_dict.has(pop[1]): - var inst = Shared.scene_dict[pop[1]].instance() - var cb = inst.get_node("CamBounds") - - pop[2].add_child(inst) - if is_instance_valid(cb): - inst.position -= cb.position - - screen_static[pop[0]].visible = false - else: - is_load = false - print(loading_time, " loading time") - break func make_screen(i := 0): var new = screen.duplicate() @@ -250,16 +216,6 @@ func make_screen(i := 0): screens_node.add_child(new) overlays[i] = new.get_node("Vis/Overlay") - screen_static.append(new.get_node("Vis/Static")) - #view_scene(new.get_node("Vis/Node2D"), Shared.map_dir + map_list[i] + ".tscn", i) - -# view a scene inside the viewport by path -func view_scene(port, path, arg): - for i in port.get_children(): - i.queue_free() - - load_list.append([port_count, path, port]) - port_count += 1 func scroll(arg := cursor): if overlays[cursor]: overlays[cursor].visible = true diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 33e7ec6..86fbf70 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=23 format=2] +[gd_scene load_steps=21 format=2] [ext_resource path="res://media/image/corner.png" type="Texture" id=1] [ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=2] [ext_resource path="res://media/image/note.png" type="Texture" id=3] [ext_resource path="res://src/menu/Vis.gd" type="Script" id=4] -[ext_resource path="res://src/shader/tv_static.gdshader" type="Shader" id=5] [ext_resource path="res://src/shader/outline2D_outer.shader" type="Shader" id=6] [ext_resource path="res://src/menu/select.gd" type="Script" id=7] [ext_resource path="res://media/image/diamond16.png" type="Texture" id=8] @@ -15,11 +14,6 @@ [ext_resource path="res://src/menu/cursor_anim.gd" type="Script" id=13] [ext_resource path="res://src/stage/sheet.png" type="Texture" id=14] -[sub_resource type="ShaderMaterial" id=8] -shader = ExtResource( 5 ) -shader_param/mouse_pos = Vector2( 0.01, 0.005 ) -shader_param/vsync_issues = 0.7 - [sub_resource type="ShaderMaterial" id=10] shader = ExtResource( 6 ) shader_param/line_color = Color( 0, 0, 0, 1 ) @@ -99,25 +93,6 @@ rect_min_size = Vector2( 136, 96 ) rect = Rect2( 0, 0, 136, 96 ) script = ExtResource( 4 ) -[node name="BG" type="Node2D" parent="Control/Screen/Vis"] -z_index = -500 - -[node name="ColorRect" type="ColorRect" parent="Control/Screen/Vis/BG"] -margin_right = 136.0 -margin_bottom = 96.0 -rect_min_size = Vector2( 136, 96 ) -color = Color( 0, 0, 0, 1 ) - -[node name="Node2D" type="Node2D" parent="Control/Screen/Vis"] -position = Vector2( 68, 48 ) -z_index = -400 - -[node name="Static" type="ColorRect" parent="Control/Screen/Vis"] -modulate = Color( 0.14, 0.14, 0.14, 1 ) -material = SubResource( 8 ) -margin_right = 136.0 -margin_bottom = 96.0 - [node name="Sprite" type="Sprite" parent="Control/Screen/Vis"] texture = ExtResource( 14 ) centered = false diff --git a/src/menu/splash.tscn b/src/menu/splash.tscn index 8bfdfb0..d00fa0a 100644 --- a/src/menu/splash.tscn +++ b/src/menu/splash.tscn @@ -6,7 +6,6 @@ [node name="Splash" type="Node2D"] script = ExtResource( 3 ) -is_build_sheet = true [node name="CanvasLayer" type="CanvasLayer" parent="."] layer = 9 From 4425e61508c9ffa2b1fa661a70317023647c1101 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Tue, 25 Feb 2025 04:54:10 -0500 Subject: [PATCH 08/19] player and exit showing on select ! --- src/menu/select.gd | 12 ++++++- src/menu/select.tscn | 40 +++++++++++++++++++----- src/menu/splash.gd | 28 ++++++++--------- src/stage/sheet.tres | 74 ++++++++++++++++++++++---------------------- 4 files changed, 94 insertions(+), 60 deletions(-) diff --git a/src/menu/select.gd b/src/menu/select.gd index 9fad5b8..ef329e3 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -2,6 +2,8 @@ extends Node2D onready var cam : Camera2D = Shared.cam onready var cursor_node := $Cursor +onready var player := $"%Player" +onready var exit := $"%Exit" var cursor = 0 var current_map := "1-1" @@ -228,8 +230,16 @@ func scroll(arg := cursor): var sp = screen_pos[cursor] cursor_node.rect_position = sp score_node.rect_position = sp + Vector2(1, 1) - cam.pos_target = sp + (screen_size * 0.5) + var half = sp + (screen_size * 0.5) + cam.pos_target = half refresh_score() + + var dict = Shared.map_dict[str(map_list[cursor])] + + player.position = Vector2(dict[2], dict[3]) + player.node_sprite.flip_h = randf() > 0.5 + exit.position = Vector2(dict[4], dict[5]) + func show_scoreboard(arg := show_score): var n = arg == 2 diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 86fbf70..c6c1c95 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=23 format=2] [ext_resource path="res://media/image/corner.png" type="Texture" id=1] [ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=2] [ext_resource path="res://media/image/note.png" type="Texture" id=3] [ext_resource path="res://src/menu/Vis.gd" type="Script" id=4] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=5] [ext_resource path="res://src/shader/outline2D_outer.shader" type="Shader" id=6] [ext_resource path="res://src/menu/select.gd" type="Script" id=7] [ext_resource path="res://media/image/diamond16.png" type="Texture" id=8] @@ -13,6 +14,7 @@ [ext_resource path="res://src/stage/CamBounds.gd" type="Script" id=12] [ext_resource path="res://src/menu/cursor_anim.gd" type="Script" id=13] [ext_resource path="res://src/stage/sheet.png" type="Texture" id=14] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=15] [sub_resource type="ShaderMaterial" id=10] shader = ExtResource( 6 ) @@ -274,39 +276,63 @@ text = "12:67 long_name1234567 10. thats it" [node name="Cursor" type="Control" parent="."] -modulate = Color( 1, 0.92549, 0.152941, 1 ) margin_left = 110.0 margin_top = 40.0 margin_right = 246.0 -margin_bottom = 144.0 +margin_bottom = 136.0 + +[node name="Arrows" type="Control" parent="Cursor"] +modulate = Color( 1, 0.92549, 0.152941, 1 ) +margin_right = 136.0 +margin_bottom = 96.0 script = ExtResource( 13 ) +__meta__ = { +"_editor_description_": "" +} time = 0.5 distance = 12.0 offset = -6.0 size = Vector2( 136, 96 ) -[node name="c1" type="Sprite" parent="Cursor"] +[node name="c1" type="Sprite" parent="Cursor/Arrows"] material = SubResource( 11 ) texture = ExtResource( 1 ) -[node name="c2" type="Sprite" parent="Cursor"] +[node name="c2" type="Sprite" parent="Cursor/Arrows"] material = SubResource( 11 ) position = Vector2( 136, 0 ) rotation = 1.5708 texture = ExtResource( 1 ) -[node name="c3" type="Sprite" parent="Cursor"] +[node name="c3" type="Sprite" parent="Cursor/Arrows"] material = SubResource( 11 ) position = Vector2( 0, 103 ) rotation = -1.5708 texture = ExtResource( 1 ) -[node name="c4" type="Sprite" parent="Cursor"] +[node name="c4" type="Sprite" parent="Cursor/Arrows"] material = SubResource( 11 ) position = Vector2( 136, 103 ) rotation = 3.14159 texture = ExtResource( 1 ) +[node name="Control" type="Control" parent="Cursor"] +margin_right = 40.0 +margin_bottom = 40.0 +rect_min_size = Vector2( 136, 96 ) +rect_clip_content = true + +[node name="Actors" type="Node2D" parent="Cursor/Control"] +position = Vector2( 68, 48 ) + +[node name="Player" parent="Cursor/Control/Actors" instance=ExtResource( 5 )] +unique_name_in_owner = true +position = Vector2( -21, 10 ) + +[node name="Exit" parent="Cursor/Control/Actors" instance=ExtResource( 15 )] +unique_name_in_owner = true +position = Vector2( 19, 17 ) + [node name="BG" type="CanvasLayer" parent="."] layer = -1 diff --git a/src/menu/splash.gd b/src/menu/splash.gd index a3e0159..29c51fd 100644 --- a/src/menu/splash.gd +++ b/src/menu/splash.gd @@ -42,21 +42,19 @@ func _ready(): var cb = inst.get_node("CamBounds") if is_instance_valid(cb): inst.position -= cb.position - dict[2] = int(cb.position.x) - dict[3] = int(cb.position.y) - - var p = inst.get_node("Actors/Player") - if is_instance_valid(p): - p.visible = false - dict[4] = int(p.position.x) - dict[5] = int(p.position.y) - - var e = inst.get_node("Actors/Exit") - if is_instance_valid(e): - e.visible = false - dict[6] = int(e.position.x) - dict[7] = int(e.position.y) - + + var p = inst.get_node("Actors/Player") + if is_instance_valid(p): + p.visible = false + dict[2] = int(p.position.x - cb.position.x) + dict[3] = int(p.position.y - cb.position.y) + + var e = inst.get_node("Actors/Exit") + if is_instance_valid(e): + e.visible = false + dict[4] = int(e.position.x - cb.position.x) + dict[5] = int(e.position.y - cb.position.y) + yield(get_tree(), "idle_frame") var image = viewport.get_texture().get_data() diff --git a/src/stage/sheet.tres b/src/stage/sheet.tres index b57099c..df9db77 100644 --- a/src/stage/sheet.tres +++ b/src/stage/sheet.tres @@ -5,41 +5,41 @@ [resource] script = ExtResource( 1 ) dict = { -"1-1": [ 0, 0, 0, 0, -40, 8, 45, 5 ], -"1-2": [ 1, 0, 0, 0, -48, 24, 45, -19 ], -"1-3": [ 2, 0, -24, -16, -92, 24, -67, -51 ], -"1-4": [ 3, 0, 16, 0, 40, 32, -51, -27 ], -"1-5": [ 4, 0, 32, -24, 34, 16, 53, -67 ], -"1-6": [ 0, 1, 8, -24, -12, -8, -3, -67 ], -"1-7": [ 1, 1, 16, -40, -4, -8, 77, -75 ], -"1-8": [ 2, 1, 0, -48, -4, -8, -3, -83 ], -"2-1": [ 3, 1, 40, -16, -53, -8, 125, -11 ], -"2-2": [ 4, 1, 40, -20, 36, -24, 125, -27 ], -"2-3": [ 0, 2, -14, -24, -84, -8, 125, -51 ], -"2-4": [ 1, 2, 20, -24, 52, 16, 29, -123 ], -"2-5": [ 2, 2, 52, -20, -11, -8, 133, -35 ], -"2-6": [ 3, 2, 8, 8, -27, -24, 57, 49 ], -"2-7": [ 4, 2, 0, -24, -68, -8, -3, -55 ], -"2-8": [ 0, 3, -16, -32, -40, 8, -91, -67 ], -"3-1": [ 1, 3, 8, -8, -28, -8, 61, -35 ], -"3-2": [ 2, 3, -4, -16, -40, -8, 5, -59 ], -"3-3": [ 3, 3, -8, -24, -56, -16, -35, -67 ], -"3-4": [ 4, 3, 16, -8, -64, 16, 149, -35 ], -"3-5": [ 0, 4, -16, -24, -68, -8, 29, -43 ], -"3-6": [ 1, 4, -16, -36, -63, -32, 53, -59 ], -"3-7": [ 2, 4, 16, -44, -52, -32, 95, -67 ], -"3-8": [ 3, 4, 4, -33, -60, -16, 77, -75 ], -"4-1": [ 4, 4, 0, -4, -44, 8, 41, -15 ], -"4-2": [ 0, 5, 0, -52, -9, -8, -3, -99 ], -"4-3": [ 1, 5, 16, -4, 60, 24, -59, -51 ], -"4-4": [ 2, 5, 28, -40, -4, -24, 25, -55 ], -"4-5": [ 3, 5, -8, -28, 5, -24, 49, -63 ], -"4-6": [ 4, 5, 48, -44, 87, -16, -35, -51 ], -"4-7": [ 0, 6, 40, -36, 86, -16, -119, -55 ], -"4-8": [ 1, 6, 40, -44, -8, -16, -47, -79 ], -"5-1": [ 2, 6, 34, -40, -12, -16, 174, -59 ], -"5-2": [ 3, 6, 52, -32, 121, -16, -43, -67 ], -"5-3": [ 4, 6, 48, -48, 33, -64, -39, -47 ], -"5-4": [ 0, 7, 34, -56, 69, -16, -51, -91 ], -"win": [ 1, 7, 0, -24, -13, 8, 89, -39 ] +"1-1": [ 0, 0, -40, 8, 45, 5, 0, 0 ], +"1-2": [ 1, 0, -48, 24, 45, -19, 0, 0 ], +"1-3": [ 2, 0, -68, 40, -43, -35, 0, 0 ], +"1-4": [ 3, 0, 24, 32, -67, -27, 0, 0 ], +"1-5": [ 4, 0, 2, 40, 21, -43, 0, 0 ], +"1-6": [ 0, 1, -20, 16, -11, -43, 0, 0 ], +"1-7": [ 1, 1, -20, 32, 61, -35, 0, 0 ], +"1-8": [ 2, 1, -4, 40, -3, -35, 0, 0 ], +"2-1": [ 3, 1, -93, 8, 85, 5, 0, 0 ], +"2-2": [ 4, 1, -4, -4, 85, -7, 0, 0 ], +"2-3": [ 0, 2, -70, 16, 139, -27, 0, 0 ], +"2-4": [ 1, 2, 32, 40, 9, -99, 0, 0 ], +"2-5": [ 2, 2, -63, 12, 81, -15, 0, 0 ], +"2-6": [ 3, 2, -35, -32, 49, 41, 0, 0 ], +"2-7": [ 4, 2, -68, 16, -3, -31, 0, 0 ], +"2-8": [ 0, 3, -24, 40, -75, -35, 0, 0 ], +"3-1": [ 1, 3, -36, 0, 53, -27, 0, 0 ], +"3-2": [ 2, 3, -36, 8, 9, -43, 0, 0 ], +"3-3": [ 3, 3, -48, 8, -27, -43, 0, 0 ], +"3-4": [ 4, 3, -80, 24, 133, -27, 0, 0 ], +"3-5": [ 0, 4, -52, 16, 45, -19, 0, 0 ], +"3-6": [ 1, 4, -47, 4, 69, -23, 0, 0 ], +"3-7": [ 2, 4, -68, 12, 79, -23, 0, 0 ], +"3-8": [ 3, 4, -64, 17, 73, -42, 0, 0 ], +"4-1": [ 4, 4, -44, 12, 41, -11, 0, 0 ], +"4-2": [ 0, 5, -9, 44, -3, -47, 0, 0 ], +"4-3": [ 1, 5, 44, 28, -75, -47, 0, 0 ], +"4-4": [ 2, 5, -32, 16, -3, -15, 0, 0 ], +"4-5": [ 3, 5, 13, 4, 57, -35, 0, 0 ], +"4-6": [ 4, 5, 39, 28, -83, -7, 0, 0 ], +"4-7": [ 0, 6, 46, 20, -159, -19, 0, 0 ], +"4-8": [ 1, 6, -48, 28, -87, -35, 0, 0 ], +"5-1": [ 2, 6, -46, 24, 140, -19, 0, 0 ], +"5-2": [ 3, 6, 69, 16, -95, -35, 0, 0 ], +"5-3": [ 4, 6, -15, -16, -87, 1, 0, 0 ], +"5-4": [ 0, 7, 35, 40, -85, -35, 0, 0 ], +"win": [ 1, 7, -13, 32, 89, -15, 0, 0 ] } From 2ca6baa859b0e73d5e8712621b658058c44ec2dd Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Tue, 25 Feb 2025 12:17:15 -0500 Subject: [PATCH 09/19] draw Overlay over player & exit --- src/menu/select.tscn | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/menu/select.tscn b/src/menu/select.tscn index c6c1c95..9d7ebd1 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -68,6 +68,17 @@ __meta__ = { "_edit_lock_": true } +[node name="BG" type="CanvasLayer" parent="."] +layer = -1 + +[node name="ColorRect" type="ColorRect" parent="BG"] +anchor_right = 1.0 +anchor_bottom = 1.0 +color = Color( 0.160784, 0.678431, 1, 1 ) +__meta__ = { +"_edit_lock_": true +} + [node name="CamBounds" type="Node2D" parent="."] position = Vector2( 178, 88 ) script = ExtResource( 12 ) @@ -92,10 +103,12 @@ margin_bottom = 136.0 rect_min_size = Vector2( 136, 96 ) [node name="Vis" type="VisibilityNotifier2D" parent="Control/Screen"] +z_index = 1000 rect = Rect2( 0, 0, 136, 96 ) script = ExtResource( 4 ) [node name="Sprite" type="Sprite" parent="Control/Screen/Vis"] +z_index = -1000 texture = ExtResource( 14 ) centered = false region_enabled = true @@ -332,14 +345,3 @@ position = Vector2( -21, 10 ) [node name="Exit" parent="Cursor/Control/Actors" instance=ExtResource( 15 )] unique_name_in_owner = true position = Vector2( 19, 17 ) - -[node name="BG" type="CanvasLayer" parent="."] -layer = -1 - -[node name="ColorRect" type="ColorRect" parent="BG"] -anchor_right = 1.0 -anchor_bottom = 1.0 -color = Color( 0.160784, 0.678431, 1, 1 ) -__meta__ = { -"_edit_lock_": true -} From ea2f02966ffd2b5ec3d433e8618c12a2d880a681 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Tue, 25 Feb 2025 15:37:17 -0500 Subject: [PATCH 10/19] CanvasLayers on level select and... reorder all CanvasLayers in project --- src/autoload/Pause.tscn | 1 + src/autoload/UI.tscn | 2 +- src/autoload/Wipe.tscn | 2 +- src/autoload/touch_screen.tscn | 2 +- src/menu/Vis.gd | 6 +- src/menu/options/KeyMenu.tscn | 1 + src/menu/options/OptionsMenu.tscn | 1 + src/menu/select.gd | 59 +++++++----- src/menu/select.tscn | 148 ++++++++++++++++-------------- src/stage/Cam.gd | 3 + 10 files changed, 128 insertions(+), 97 deletions(-) diff --git a/src/autoload/Pause.tscn b/src/autoload/Pause.tscn index 9768c6f..ff545a2 100644 --- a/src/autoload/Pause.tscn +++ b/src/autoload/Pause.tscn @@ -20,6 +20,7 @@ font_data = ExtResource( 6 ) [node name="Pause" type="CanvasLayer"] pause_mode = 2 +layer = 20 script = ExtResource( 3 ) __meta__ = { "_edit_horizontal_guides_": [ -19.0 ] diff --git a/src/autoload/UI.tscn b/src/autoload/UI.tscn index 4b0b3eb..47a1358 100644 --- a/src/autoload/UI.tscn +++ b/src/autoload/UI.tscn @@ -69,7 +69,7 @@ font_data = ExtResource( 1 ) [node name="UI" type="CanvasLayer"] pause_mode = 2 -layer = 5 +layer = 50 script = ExtResource( 3 ) pos_left = 60 pos_right = 184 diff --git a/src/autoload/Wipe.tscn b/src/autoload/Wipe.tscn index e5924b5..79bdd2a 100644 --- a/src/autoload/Wipe.tscn +++ b/src/autoload/Wipe.tscn @@ -15,7 +15,7 @@ shader_param/tex = ExtResource( 2 ) [node name="Wipe" type="CanvasLayer"] pause_mode = 2 -layer = 10 +layer = 100 script = ExtResource( 1 ) duration = 0.35 diff --git a/src/autoload/touch_screen.tscn b/src/autoload/touch_screen.tscn index 13c7d94..f7a2363 100644 --- a/src/autoload/touch_screen.tscn +++ b/src/autoload/touch_screen.tscn @@ -35,7 +35,7 @@ points = PoolVector2Array( 2.12132, -2.12132, 3.57746e-08, -3, -2.12132, -2.1213 [node name="TouchScreen" type="CanvasLayer"] pause_mode = 2 -layer = 6 +layer = 60 script = ExtResource( 1 ) [node name="Control" type="Control" parent="."] diff --git a/src/menu/Vis.gd b/src/menu/Vis.gd index 0313598..4f4f1a9 100644 --- a/src/menu/Vis.gd +++ b/src/menu/Vis.gd @@ -1,9 +1,11 @@ extends VisibilityNotifier2D +var node_list = [self] + func _ready(): connect("screen_entered", self, "enter") connect("screen_exited", self, "enter") - pass # Replace with function body. func enter(): - visible = is_on_screen() + for i in node_list: + i.visible = is_on_screen() diff --git a/src/menu/options/KeyMenu.tscn b/src/menu/options/KeyMenu.tscn index 38d066b..58b7fc9 100644 --- a/src/menu/options/KeyMenu.tscn +++ b/src/menu/options/KeyMenu.tscn @@ -26,6 +26,7 @@ font_data = ExtResource( 5 ) [node name="KeyMenu" type="CanvasLayer"] pause_mode = 2 +layer = 40 script = ExtResource( 3 ) parent_path = NodePath(".") list_path = NodePath("Center/Control/VBox") diff --git a/src/menu/options/OptionsMenu.tscn b/src/menu/options/OptionsMenu.tscn index d1bac34..ca30a87 100644 --- a/src/menu/options/OptionsMenu.tscn +++ b/src/menu/options/OptionsMenu.tscn @@ -27,6 +27,7 @@ font_data = ExtResource( 6 ) [node name="OptionsMenu" type="CanvasLayer"] pause_mode = 2 +layer = 30 script = ExtResource( 1 ) parent_path = NodePath(".") list_path = NodePath("Center/Control/MenuItems") diff --git a/src/menu/select.gd b/src/menu/select.gd index ef329e3..a8f76e6 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -1,15 +1,18 @@ extends Node2D onready var cam : Camera2D = Shared.cam -onready var cursor_node := $Cursor +onready var cursor_node := $"%Cursor" onready var player := $"%Player" onready var exit := $"%Exit" var cursor = 0 var current_map := "1-1" -onready var screens_node : Control = $Control/Screens -onready var screen : Control = $Control/Screen +onready var screens_node := $"%MapLayer" +onready var screen := $"%Screen" +onready var overlay_node := $"%Overlay" +onready var overlay_layer := $"%OverlayLayer" + export var screen_dist = Vector2(5, 5) export var screen_size = Vector2(136, 96) var screen_pos := [] @@ -24,13 +27,14 @@ var show_score := 0 var last_refresh := {} var refresh_wait := 5.0 -onready var score_node := $Control/Scores -onready var score_title := $Control/Scores/HBoxContainer/Title -onready var score_list := $Control/Scores/List -onready var score_note := $Control/Scores/HBoxContainer/Note -onready var score_clock := $Control/Scores/HBoxContainer/Clock -onready var score_map := $Control/Scores/HBoxContainer/Map -onready var score_row := $Control/Scores/Row +onready var score_node := $"%Scores" +onready var score_list := score_node.get_node("List") +onready var score_row := score_node.get_node("Row") +onready var score_hbox := score_node.get_node("HBoxContainer") +onready var score_title := score_hbox.get_node("Title") +onready var score_note := score_hbox.get_node("Note") +onready var score_clock := score_hbox.get_node("Clock") +onready var score_map := score_hbox.get_node("Map") var is_screening := false var screen_list := [] @@ -63,6 +67,12 @@ var lockdict= {0:["1-1", "1-2", "1-3", "1-4", "1-5", "1-6", "1-7", "1-8"], 30: ['win']} func _ready(): + screen = screen.duplicate() + $"%Screen".queue_free() + + overlay_node = overlay_node.duplicate() + $"%Overlay".queue_free() + #Leaderboard.connect("new_score", self, "new_score") #SilentWolf.Scores.connect("sw_scores_received", self, "new_score") @@ -84,8 +94,6 @@ func _ready(): print("map_lock: ", map_lock) print("map_rows: ", map_rows) - screen.rect_position -= Vector2.ONE * 500 - # make screens screen_pos = [] var sum = -1 @@ -175,24 +183,30 @@ func _physics_process(delta): func make_screen(i := 0): var new = screen.duplicate() + var new_overlay = overlay_node.duplicate() + new.node_list.append(new_overlay) + var map_name = map_list[i] var is_locked = Shared.count_gems < map_lock[map_name] - new.rect_position = screen_pos[i] - new.get_node("Vis/Overlay/HBox/Label").text = (str(map_lock[map_name]) + " to unlock") if is_locked else map_name - new.get_node("Vis/Overlay/HBox/Gem").visible = is_locked + new.position = screen_pos[i] + new_overlay.rect_position = screen_pos[i] + + new_overlay.get_node("HBox/Label") + new_overlay.get_node("HBox/Label").text = (str(map_lock[map_name]) + " to unlock") if is_locked else map_name + new_overlay.get_node("HBox/Gem").visible = is_locked var s = {} if Shared.save_maps.has(map_name): s = Shared.save_maps[map_name] var has_note = s.has("note") - new.get_node("Vis/Overlay/Notes").visible = has_note - var note_label = new.get_node("Vis/Overlay/Notes/Label") + new_overlay.get_node("Notes").visible = has_note + var note_label = new_overlay.get_node("Notes/Label") if has_note: note_label.text = Shared.time_to_string(s["note"]) - var gem = new.get_node("Vis/Overlay/Gem") + var gem = new_overlay.get_node("Gem") gem.visible = !is_locked var has_time = s.has("time") @@ -203,21 +217,22 @@ func make_screen(i := 0): gem_label.text = Shared.time_to_string(s["time"]) var has_die = s.has("die") - new.get_node("Vis/Overlay/Death").visible = has_die + new_overlay.get_node("Death").visible = has_die if has_die: - new.get_node("Vis/Overlay/Death/Label").text = str(s["die"]) + new_overlay.get_node("Death/Label").text = str(s["die"]) if is_faster and i == Shared.map_select: blink_label = note_label if is_faster_note else gem_label print("faster ", i, ", blink_label ", blink_label) Audio.play("menu_bell", 0.5, 1.0) - var sprite = new.get_node("Vis/Sprite") + var sprite = new.get_node("Sprite") var dict = Shared.map_dict[map_name] sprite.region_rect = Rect2(screen_size * Vector2(dict[0], dict[1]), screen_size) screens_node.add_child(new) - overlays[i] = new.get_node("Vis/Overlay") + overlay_layer.add_child(new_overlay) + overlays[i] = new_overlay func scroll(arg := cursor): if overlays[cursor]: overlays[cursor].visible = true diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 9d7ebd1..e0b04e6 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -84,46 +84,61 @@ position = Vector2( 178, 88 ) script = ExtResource( 12 ) bounds = Rect2( 9000, 9000, 9000, 9000 ) -[node name="Control" type="Control" parent="."] -margin_right = 320.0 -margin_bottom = 180.0 -__meta__ = { -"_edit_lock_": true -} +[node name="MapLayer" type="CanvasLayer" parent="."] +unique_name_in_owner = true +follow_viewport_enable = true -[node name="Screens" type="Control" parent="Control"] -margin_right = 40.0 -margin_bottom = 40.0 - -[node name="Screen" type="Control" parent="Control"] -margin_left = 110.0 -margin_top = 40.0 -margin_right = 246.0 -margin_bottom = 136.0 -rect_min_size = Vector2( 136, 96 ) - -[node name="Vis" type="VisibilityNotifier2D" parent="Control/Screen"] -z_index = 1000 +[node name="Screen" type="VisibilityNotifier2D" parent="MapLayer"] +unique_name_in_owner = true +position = Vector2( 110, 40 ) rect = Rect2( 0, 0, 136, 96 ) script = ExtResource( 4 ) -[node name="Sprite" type="Sprite" parent="Control/Screen/Vis"] -z_index = -1000 +[node name="Sprite" type="Sprite" parent="MapLayer/Screen"] texture = ExtResource( 14 ) centered = false region_enabled = true region_rect = Rect2( 0, 0, 136, 96 ) -[node name="Overlay" type="Control" parent="Control/Screen/Vis"] -margin_right = 136.0 -margin_bottom = 104.0 +[node name="ActorLayer" type="CanvasLayer" parent="."] +layer = 2 -[node name="HBox" type="HBoxContainer" parent="Control/Screen/Vis/Overlay"] +[node name="Control" type="Control" parent="ActorLayer"] +margin_left = 46.0 +margin_top = 16.0 +margin_right = 182.0 +margin_bottom = 112.0 +rect_clip_content = true + +[node name="Actors" type="Node2D" parent="ActorLayer/Control"] +position = Vector2( 68, 48 ) + +[node name="Player" parent="ActorLayer/Control/Actors" instance=ExtResource( 5 )] +unique_name_in_owner = true +position = Vector2( -21, 10 ) + +[node name="Exit" parent="ActorLayer/Control/Actors" instance=ExtResource( 15 )] +unique_name_in_owner = true +position = Vector2( 19, 17 ) + +[node name="OverlayLayer" type="CanvasLayer" parent="."] +unique_name_in_owner = true +layer = 3 +follow_viewport_enable = true + +[node name="Overlay" type="Control" parent="OverlayLayer"] +unique_name_in_owner = true +margin_left = 110.0 +margin_top = 40.0 +margin_right = 246.0 +margin_bottom = 144.0 + +[node name="HBox" type="HBoxContainer" parent="OverlayLayer/Overlay"] anchor_right = 1.0 anchor_bottom = 1.0 alignment = 1 -[node name="Gem" type="Control" parent="Control/Screen/Vis/Overlay/HBox"] +[node name="Gem" type="Control" parent="OverlayLayer/Overlay/HBox"] margin_left = 48.0 margin_top = 44.0 margin_right = 64.0 @@ -131,13 +146,13 @@ margin_bottom = 60.0 rect_min_size = Vector2( 16, 16 ) size_flags_vertical = 4 -[node name="Sprite" type="Sprite" parent="Control/Screen/Vis/Overlay/HBox/Gem"] +[node name="Sprite" type="Sprite" parent="OverlayLayer/Overlay/HBox/Gem"] modulate = Color( 1, 0.92549, 0.152941, 1 ) material = SubResource( 10 ) position = Vector2( 8, 8 ) texture = ExtResource( 9 ) -[node name="Label" type="Label" parent="Control/Screen/Vis/Overlay/HBox"] +[node name="Label" type="Label" parent="OverlayLayer/Overlay/HBox"] margin_left = 68.0 margin_top = 49.0 margin_right = 88.0 @@ -148,17 +163,17 @@ text = "1-1" align = 1 valign = 1 -[node name="Death" type="Control" parent="Control/Screen/Vis/Overlay"] +[node name="Death" type="Control" parent="OverlayLayer/Overlay"] margin_top = 96.0 margin_bottom = 96.0 -[node name="Clock" type="Sprite" parent="Control/Screen/Vis/Overlay/Death"] +[node name="Clock" type="Sprite" parent="OverlayLayer/Overlay/Death"] material = SubResource( 3 ) position = Vector2( 8, -7 ) texture = ExtResource( 11 ) region_rect = Rect2( 15, 7, 10, 10 ) -[node name="Label" type="Label" parent="Control/Screen/Vis/Overlay/Death"] +[node name="Label" type="Label" parent="OverlayLayer/Overlay/Death"] margin_left = 15.0 margin_top = -9.0 margin_right = 83.0 @@ -167,14 +182,14 @@ grow_horizontal = 2 custom_fonts/font = SubResource( 4 ) text = "79" -[node name="Notes" type="Control" parent="Control/Screen/Vis/Overlay"] +[node name="Notes" type="Control" parent="OverlayLayer/Overlay"] -[node name="Sprite" type="Sprite" parent="Control/Screen/Vis/Overlay/Notes"] +[node name="Sprite" type="Sprite" parent="OverlayLayer/Overlay/Notes"] material = SubResource( 3 ) position = Vector2( 10, 10 ) texture = ExtResource( 3 ) -[node name="Label" type="Label" parent="Control/Screen/Vis/Overlay/Notes"] +[node name="Label" type="Label" parent="OverlayLayer/Overlay/Notes"] margin_left = 19.0 margin_top = 4.0 margin_right = 101.0 @@ -183,19 +198,19 @@ grow_horizontal = 2 custom_fonts/font = SubResource( 4 ) text = "12:34" -[node name="Gem" type="Control" parent="Control/Screen/Vis/Overlay"] +[node name="Gem" type="Control" parent="OverlayLayer/Overlay"] margin_left = 136.0 margin_top = 96.0 margin_right = 136.0 margin_bottom = 96.0 -[node name="Sprite" type="Sprite" parent="Control/Screen/Vis/Overlay/Gem"] +[node name="Sprite" type="Sprite" parent="OverlayLayer/Overlay/Gem"] modulate = Color( 0.513726, 0.462745, 0.611765, 1 ) material = SubResource( 9 ) position = Vector2( -12, -12 ) texture = ExtResource( 8 ) -[node name="Label" type="Label" parent="Control/Screen/Vis/Overlay/Gem"] +[node name="Label" type="Label" parent="OverlayLayer/Overlay/Gem"] margin_left = -103.0 margin_top = -9.0 margin_right = -21.0 @@ -205,7 +220,12 @@ custom_fonts/font = SubResource( 4 ) text = "12:34" align = 2 -[node name="Scores" type="Control" parent="Control"] +[node name="ScoreLayer" type="CanvasLayer" parent="."] +layer = 4 +follow_viewport_enable = true + +[node name="Scores" type="Control" parent="ScoreLayer"] +unique_name_in_owner = true visible = false margin_left = 111.0 margin_top = 41.0 @@ -213,20 +233,20 @@ margin_right = 245.0 margin_bottom = 135.0 rect_min_size = Vector2( 134, 94 ) -[node name="Row" type="ColorRect" parent="Control/Scores"] +[node name="Row" type="ColorRect" parent="ScoreLayer/Scores"] margin_left = -1.0 margin_top = 14.0 margin_right = 135.0 margin_bottom = 23.0 -[node name="HBoxContainer" type="HBoxContainer" parent="Control/Scores"] +[node name="HBoxContainer" type="HBoxContainer" parent="ScoreLayer/Scores"] anchor_right = 1.0 margin_top = 1.0 margin_bottom = 11.0 custom_constants/separation = 2 alignment = 1 -[node name="Title" type="Label" parent="Control/Scores/HBoxContainer"] +[node name="Title" type="Label" parent="ScoreLayer/Scores/HBoxContainer"] margin_left = 9.0 margin_top = 2.0 margin_right = 92.0 @@ -235,34 +255,34 @@ custom_fonts/font = SubResource( 6 ) text = "FASTEST note" valign = 1 -[node name="Note" type="Control" parent="Control/Scores/HBoxContainer"] +[node name="Note" type="Control" parent="ScoreLayer/Scores/HBoxContainer"] margin_left = 94.0 margin_right = 103.0 margin_bottom = 10.0 rect_min_size = Vector2( 9, 10 ) -[node name="Sprite" type="Sprite" parent="Control/Scores/HBoxContainer/Note"] +[node name="Sprite" type="Sprite" parent="ScoreLayer/Scores/HBoxContainer/Note"] material = SubResource( 3 ) position = Vector2( 5, 4 ) texture = ExtResource( 10 ) region_enabled = true region_rect = Rect2( 7, 7, 9, 10 ) -[node name="Clock" type="Control" parent="Control/Scores/HBoxContainer"] +[node name="Clock" type="Control" parent="ScoreLayer/Scores/HBoxContainer"] visible = false margin_left = 99.0 margin_right = 109.0 margin_bottom = 10.0 rect_min_size = Vector2( 10, 10 ) -[node name="Sprite" type="Sprite" parent="Control/Scores/HBoxContainer/Clock"] +[node name="Sprite" type="Sprite" parent="ScoreLayer/Scores/HBoxContainer/Clock"] material = SubResource( 3 ) position = Vector2( 5, 4 ) texture = ExtResource( 10 ) region_enabled = true region_rect = Rect2( 15, 7, 10, 10 ) -[node name="Map" type="Label" parent="Control/Scores/HBoxContainer"] +[node name="Map" type="Label" parent="ScoreLayer/Scores/HBoxContainer"] margin_left = 105.0 margin_top = 2.0 margin_right = 125.0 @@ -271,7 +291,7 @@ custom_fonts/font = SubResource( 6 ) text = "1-3" valign = 1 -[node name="List" type="Label" parent="Control/Scores"] +[node name="List" type="Label" parent="ScoreLayer/Scores"] margin_left = 1.0 margin_top = 16.0 margin_right = 133.0 @@ -288,13 +308,18 @@ text = "12:67 long_name1234567 9. waahuu 10. thats it" -[node name="Cursor" type="Control" parent="."] +[node name="CursorLayer" type="CanvasLayer" parent="."] +layer = 5 +follow_viewport_enable = true + +[node name="Cursor" type="Control" parent="CursorLayer"] +unique_name_in_owner = true margin_left = 110.0 margin_top = 40.0 margin_right = 246.0 margin_bottom = 136.0 -[node name="Arrows" type="Control" parent="Cursor"] +[node name="Arrows" type="Control" parent="CursorLayer/Cursor"] modulate = Color( 1, 0.92549, 0.152941, 1 ) margin_right = 136.0 margin_bottom = 96.0 @@ -307,41 +332,24 @@ distance = 12.0 offset = -6.0 size = Vector2( 136, 96 ) -[node name="c1" type="Sprite" parent="Cursor/Arrows"] +[node name="c1" type="Sprite" parent="CursorLayer/Cursor/Arrows"] material = SubResource( 11 ) texture = ExtResource( 1 ) -[node name="c2" type="Sprite" parent="Cursor/Arrows"] +[node name="c2" type="Sprite" parent="CursorLayer/Cursor/Arrows"] material = SubResource( 11 ) position = Vector2( 136, 0 ) rotation = 1.5708 texture = ExtResource( 1 ) -[node name="c3" type="Sprite" parent="Cursor/Arrows"] +[node name="c3" type="Sprite" parent="CursorLayer/Cursor/Arrows"] material = SubResource( 11 ) position = Vector2( 0, 103 ) rotation = -1.5708 texture = ExtResource( 1 ) -[node name="c4" type="Sprite" parent="Cursor/Arrows"] +[node name="c4" type="Sprite" parent="CursorLayer/Cursor/Arrows"] material = SubResource( 11 ) position = Vector2( 136, 103 ) rotation = 3.14159 texture = ExtResource( 1 ) - -[node name="Control" type="Control" parent="Cursor"] -margin_right = 40.0 -margin_bottom = 40.0 -rect_min_size = Vector2( 136, 96 ) -rect_clip_content = true - -[node name="Actors" type="Node2D" parent="Cursor/Control"] -position = Vector2( 68, 48 ) - -[node name="Player" parent="Cursor/Control/Actors" instance=ExtResource( 5 )] -unique_name_in_owner = true -position = Vector2( -21, 10 ) - -[node name="Exit" parent="Cursor/Control/Actors" instance=ExtResource( 15 )] -unique_name_in_owner = true -position = Vector2( 19, 17 ) diff --git a/src/stage/Cam.gd b/src/stage/Cam.gd index 8bc26dd..a58daa5 100644 --- a/src/stage/Cam.gd +++ b/src/stage/Cam.gd @@ -4,6 +4,7 @@ var node_target : Node2D var pos_target := Vector2.ZERO var pos_target_offset := Vector2.ZERO export var lerp_step := 0.1 +export var lerp_jump := 0.5 var lerp_pos := Vector2.ZERO var bounds_upper := Vector2.ZERO @@ -32,6 +33,8 @@ func _physics_process(delta): # smoothing lerp_pos = lerp_pos.linear_interpolate(pos_target, clamp(lerp_step, 0, 1)) + if lerp_pos.distance_to(pos_target) < lerp_jump: + lerp_pos = pos_target position = lerp_pos.round() # super simple screen shake From d6d7327d3c6b8cf6f831a76ca856436b9f623e42 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Tue, 25 Feb 2025 16:46:20 -0500 Subject: [PATCH 11/19] actors lerp smoothing on select (: TODO fix scoreboard scoreboard not always showing most recent high score --- src/menu/select.gd | 30 +++++++++++++++++++----------- src/menu/select.tscn | 10 +++++----- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/menu/select.gd b/src/menu/select.gd index a8f76e6..36dfcdf 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -2,8 +2,6 @@ extends Node2D onready var cam : Camera2D = Shared.cam onready var cursor_node := $"%Cursor" -onready var player := $"%Player" -onready var exit := $"%Exit" var cursor = 0 var current_map := "1-1" @@ -66,6 +64,10 @@ var lockdict= {0:["1-1", "1-2", "1-3", "1-4", "1-5", "1-6", "1-7", "1-8"], 24: ['5-1', '5-2', '5-3', '5-4'], 30: ['win']} +onready var actors = [[Vector2.ZERO, Vector2.ZERO, $"%Player"], [Vector2.ZERO, Vector2.ZERO, $"%Exit"]] +var actor_lerp := 0.1 +var actor_jump := 0.5 + func _ready(): screen = screen.duplicate() $"%Screen".queue_free() @@ -157,10 +159,19 @@ func _input(event): Audio.play("menu_scroll3", 0.9, 1.5) func _physics_process(delta): + # move actors + for i in actors: + i[0] = i[0].linear_interpolate(i[1], clamp(actor_lerp, 0, 1)) + if i[0].distance_to(i[1]) < actor_jump: + i[0] = i[1] + i[2].position = i[0].round() + + # input count input_count = max(0, input_count - 1) for i in last_refresh.keys(): last_refresh[i] = max(0, last_refresh[i] - delta) + # blink if is_instance_valid(blink_label) and blink_count > 0: blink_clock -= delta if blink_clock < -blink_off: @@ -168,9 +179,9 @@ func _physics_process(delta): blink_count -= 1 blink_label.modulate = [Color.transparent, Color.white][int(blink_clock > 0.0)] - var ticks : float = OS.get_ticks_msec() - + # make screens if is_screening: + var ticks : float = OS.get_ticks_msec() screen_time += delta while OS.get_ticks_msec() < ticks + (delta * timeout_mod): @@ -192,7 +203,6 @@ func make_screen(i := 0): new.position = screen_pos[i] new_overlay.rect_position = screen_pos[i] - new_overlay.get_node("HBox/Label") new_overlay.get_node("HBox/Label").text = (str(map_lock[map_name]) + " to unlock") if is_locked else map_name new_overlay.get_node("HBox/Gem").visible = is_locked @@ -226,9 +236,8 @@ func make_screen(i := 0): print("faster ", i, ", blink_label ", blink_label) Audio.play("menu_bell", 0.5, 1.0) - var sprite = new.get_node("Sprite") var dict = Shared.map_dict[map_name] - sprite.region_rect = Rect2(screen_size * Vector2(dict[0], dict[1]), screen_size) + new.get_node("Sprite").region_rect = Rect2(screen_size * Vector2(dict[0], dict[1]), screen_size) screens_node.add_child(new) overlay_layer.add_child(new_overlay) @@ -251,10 +260,9 @@ func scroll(arg := cursor): var dict = Shared.map_dict[str(map_list[cursor])] - player.position = Vector2(dict[2], dict[3]) - player.node_sprite.flip_h = randf() > 0.5 - exit.position = Vector2(dict[4], dict[5]) - + actors[0][1] = Vector2(dict[2], dict[3]) + actors[0][2].node_sprite.flip_h = randf() > 0.5 + actors[1][1] = Vector2(dict[4], dict[5]) func show_scoreboard(arg := show_score): var n = arg == 2 diff --git a/src/menu/select.tscn b/src/menu/select.tscn index e0b04e6..e3fa7dc 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -68,6 +68,11 @@ __meta__ = { "_edit_lock_": true } +[node name="CamBounds" type="Node2D" parent="."] +position = Vector2( 178, 88 ) +script = ExtResource( 12 ) +bounds = Rect2( 9000, 9000, 9000, 9000 ) + [node name="BG" type="CanvasLayer" parent="."] layer = -1 @@ -79,11 +84,6 @@ __meta__ = { "_edit_lock_": true } -[node name="CamBounds" type="Node2D" parent="."] -position = Vector2( 178, 88 ) -script = ExtResource( 12 ) -bounds = Rect2( 9000, 9000, 9000, 9000 ) - [node name="MapLayer" type="CanvasLayer" parent="."] unique_name_in_owner = true follow_viewport_enable = true From ca939789e84fd591e6adcb1d7b31d29fc40a5b1f Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Wed, 26 Feb 2025 23:47:52 -0500 Subject: [PATCH 12/19] remove Delete.gd and Shared.delete_save() --- src/autoload/Shared.gd | 3 --- src/menu/options/Delete.gd | 6 ------ 2 files changed, 9 deletions(-) delete mode 100644 src/menu/options/Delete.gd diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index 877e353..d583843 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -430,9 +430,6 @@ func generate_username(): var _name = pf[0] + middle[0] + sf[0] + end[0] + str(randi() % 100) return _name -func delete_save(): - print("delete save") - func unlock(): print("unlock") diff --git a/src/menu/options/Delete.gd b/src/menu/options/Delete.gd deleted file mode 100644 index daf5dde..0000000 --- a/src/menu/options/Delete.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends Node2D - -func act(): - Audio.play("menu_delete", 0.9, 1.1) - Shared.delete_save() - Shared.cam.shake(5) From 9b6804ea20108fc8e82b26ba6e56f28bee901639 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Thu, 27 Feb 2025 00:46:17 -0500 Subject: [PATCH 13/19] use an array on scoreboard, not a dict + sort_custom() --- src/menu/select.gd | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/menu/select.gd b/src/menu/select.gd index 36dfcdf..fcdd3d3 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -284,32 +284,37 @@ func refresh_score(var map_name : String = current_map): write_score() if !last_refresh.has(map_name) or last_refresh[map_name] == 0: - #Leaderboard.refresh_score(map_name) print(" - ", map_name, " REFRESH SCORE ") last_refresh[map_name] = refresh_wait -func new_score(arg1 = null, arg2 = null, arg3 = null): - write_score() +func sort_scores(a, b): + if a[0] < b[0]: + return true + return false func write_score(): var key = "note" if show_score == 2 else "time" var dat = Shared.save_data - var dict = {} + var array = [] for i in dat.keys(): + #print("dat ", i, " ", dat[i]) if dat[i].has_all(["username", "maps"]) and dat[i]["maps"].has(current_map) and dat[i]["maps"][current_map].has(key): - dict[int(dat[i]["maps"][current_map][key])] = dat[i]["username"] + var k := int(dat[i]["maps"][current_map][key]) + var v := str(dat[i]["username"]) + #print(k, " / ", v) + array.append([k, v]) var t = "" - var keys = dict.keys() var row = 0 var my_row = -1 - keys.sort() - for i in keys: - t += Shared.time_to_string(i) + " " + dict[i] + "\n" + array.sort_custom(self, "sort_scores") + + for i in array: + t += Shared.time_to_string(i[0]) + " " + i[1] + "\n" - if dict[i] == Shared.username: + if i[1] == Shared.username: my_row = row row += 1 From 2c48fd462c32bff80de6d2415baf707964f48107 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Thu, 27 Feb 2025 01:18:07 -0500 Subject: [PATCH 14/19] Shared.load_save() on select _ready() remove is_load argument from load_save() --- src/autoload/Shared.gd | 7 +++---- src/menu/StartMenu.gd | 4 ++-- src/menu/select.gd | 2 ++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index d583843..d2ee259 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -355,13 +355,13 @@ func delete_slot(_slot := save_slot): dir.remove(fname) fname = dir.get_next() - replays[_slot] = {} + replays[_slot] = {} load_save(_slot) func save_replays(arg := replay_map, _slot := save_slot): save_file(save_path + str(_slot) + "/" + arg + ".save", JSON.print(replays[save_slot][arg], "\t")) -func load_save(_slot = save_slot, is_reload := false): +func load_save(_slot = save_slot): save_slot = clamp(_slot, 0, save_limit - 1) var save_string = save_path + str(save_slot) + "/" + save_filename @@ -374,14 +374,13 @@ func load_save(_slot = save_slot, is_reload := false): save_clock = 0.0 var dict := {} - if is_reload: dict = save_data[_slot] if dict.empty(): var l = load_file(save_string) if l: dict = JSON.parse(l).result else: print(save_string + " not found") - print(_slot, " / ", dict) + print(save_slot, " / ", dict) if !dict.empty(): if dict.has("clock"): save_clock = dict["clock"] diff --git a/src/menu/StartMenu.gd b/src/menu/StartMenu.gd index 17a1c0d..385ae7d 100644 --- a/src/menu/StartMenu.gd +++ b/src/menu/StartMenu.gd @@ -138,10 +138,10 @@ func menu_select(tag : String = menu_items[clamp(cursor, 0, menu_items.size() - TouchScreen.show_keys() "yes": Audio.play("menu_yes", 0.9, 1.1) + menu_stuff[cursor].text = "quit!!" if OS.get_name() == "HTML5": Shared.wipe_scene(Shared.splash_path) else: - menu_stuff[cursor].text = "quit!!" Shared.wipe_quit() "no": switch_menu("main") @@ -206,7 +206,7 @@ func switch_menu(arg, silent := false, _cursor := 0): Shared.map_select = 0 user_label.visible = true "open": - Shared.load_save(Shared.last_slot, true) + Shared.load_save(Shared.last_slot) Player.set_palette(open_player_mat, Shared.player_colors) Player.set_palette(demo_player_mat, Shared.player_colors) if menu_last == "erase": diff --git a/src/menu/select.gd b/src/menu/select.gd index fcdd3d3..6b23c6a 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -69,6 +69,8 @@ var actor_lerp := 0.1 var actor_jump := 0.5 func _ready(): + Shared.load_save() + screen = screen.duplicate() $"%Screen".queue_free() From 74cde82194c1f9f06be9da38807d0de54c2442b7 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Thu, 27 Feb 2025 01:55:00 -0500 Subject: [PATCH 15/19] CenterContainer Actors on select --- src/menu/select.tscn | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/menu/select.tscn b/src/menu/select.tscn index e3fa7dc..12486ef 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -103,21 +103,26 @@ region_rect = Rect2( 0, 0, 136, 96 ) [node name="ActorLayer" type="CanvasLayer" parent="."] layer = 2 -[node name="Control" type="Control" parent="ActorLayer"] +[node name="CenterContainer" type="CenterContainer" parent="ActorLayer"] +anchor_right = 1.0 +anchor_bottom = 1.0 + +[node name="Control" type="Control" parent="ActorLayer/CenterContainer"] margin_left = 46.0 margin_top = 16.0 margin_right = 182.0 margin_bottom = 112.0 +rect_min_size = Vector2( 136, 96 ) rect_clip_content = true -[node name="Actors" type="Node2D" parent="ActorLayer/Control"] +[node name="Actors" type="Node2D" parent="ActorLayer/CenterContainer/Control"] position = Vector2( 68, 48 ) -[node name="Player" parent="ActorLayer/Control/Actors" instance=ExtResource( 5 )] +[node name="Player" parent="ActorLayer/CenterContainer/Control/Actors" instance=ExtResource( 5 )] unique_name_in_owner = true position = Vector2( -21, 10 ) -[node name="Exit" parent="ActorLayer/Control/Actors" instance=ExtResource( 15 )] +[node name="Exit" parent="ActorLayer/CenterContainer/Control/Actors" instance=ExtResource( 15 )] unique_name_in_owner = true position = Vector2( 19, 17 ) From dc96e13e19586f1984ba9a99a216549271056299 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Thu, 27 Feb 2025 02:09:25 -0500 Subject: [PATCH 16/19] Adjust for odd number X resolutions (: --- src/autoload/Wipe.gd | 2 +- src/menu/select.gd | 6 ++++++ src/menu/select.tscn | 11 ++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/autoload/Wipe.gd b/src/autoload/Wipe.gd index 99ef43c..c4e6910 100644 --- a/src/autoload/Wipe.gd +++ b/src/autoload/Wipe.gd @@ -53,7 +53,7 @@ func item_rect(): mat.set_shader_param("size", (image.rect_size / Vector2(228, 128)) * Vector2(14.25, 8)) mat.set_shader_param("offset", Vector2(fposmod(image.rect_size.x / 32, 1.0), 0)) - print(mat.get_shader_param("size"), " / ", mat.get_shader_param("offset")) + #print(mat.get_shader_param("size"), " / ", mat.get_shader_param("offset")) func set_duration(arg): duration = arg diff --git a/src/menu/select.gd b/src/menu/select.gd index 6b23c6a..7507ab5 100644 --- a/src/menu/select.gd +++ b/src/menu/select.gd @@ -70,6 +70,8 @@ var actor_jump := 0.5 func _ready(): Shared.load_save() + $"%Center".connect("item_rect_changed", self, "item_rect") + item_rect() screen = screen.duplicate() $"%Screen".queue_free() @@ -194,6 +196,10 @@ func _physics_process(delta): print(screen_time, " screeening time") break +func item_rect(): + print($"%Center".rect_size) + $"%Center".rect_position.x = posmod($"%Center".rect_size.x, 2) + func make_screen(i := 0): var new = screen.duplicate() var new_overlay = overlay_node.duplicate() diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 12486ef..bd43b07 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -103,11 +103,12 @@ region_rect = Rect2( 0, 0, 136, 96 ) [node name="ActorLayer" type="CanvasLayer" parent="."] layer = 2 -[node name="CenterContainer" type="CenterContainer" parent="ActorLayer"] +[node name="Center" type="CenterContainer" parent="ActorLayer"] +unique_name_in_owner = true anchor_right = 1.0 anchor_bottom = 1.0 -[node name="Control" type="Control" parent="ActorLayer/CenterContainer"] +[node name="Control" type="Control" parent="ActorLayer/Center"] margin_left = 46.0 margin_top = 16.0 margin_right = 182.0 @@ -115,14 +116,14 @@ margin_bottom = 112.0 rect_min_size = Vector2( 136, 96 ) rect_clip_content = true -[node name="Actors" type="Node2D" parent="ActorLayer/CenterContainer/Control"] +[node name="Actors" type="Node2D" parent="ActorLayer/Center/Control"] position = Vector2( 68, 48 ) -[node name="Player" parent="ActorLayer/CenterContainer/Control/Actors" instance=ExtResource( 5 )] +[node name="Player" parent="ActorLayer/Center/Control/Actors" instance=ExtResource( 5 )] unique_name_in_owner = true position = Vector2( -21, 10 ) -[node name="Exit" parent="ActorLayer/CenterContainer/Control/Actors" instance=ExtResource( 15 )] +[node name="Exit" parent="ActorLayer/Center/Control/Actors" instance=ExtResource( 15 )] unique_name_in_owner = true position = Vector2( 19, 17 ) From d5259f7ad97b4157b9bc188ec6f746b7d9d29650 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Fri, 28 Feb 2025 03:49:47 -0500 Subject: [PATCH 17/19] working on touch_controls visible on touch, hide on key --- src/autoload/touch_screen.gd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/autoload/touch_screen.gd b/src/autoload/touch_screen.gd index 64e7aa2..7305122 100644 --- a/src/autoload/touch_screen.gd +++ b/src/autoload/touch_screen.gd @@ -16,6 +16,12 @@ func _ready(): visible = (OS.has_touchscreen_ui_hint() and OS.get_name() == "HTML5") or OS.get_name() == "Android" vis() +func _input(event): + if event is InputEventScreenTouch or event is InputEventScreenDrag: + visible = true + elif event is InputEventKey or event is InputEventJoypadButton or event is InputEventJoypadMotion: + visible = false + func vis(): if is_instance_valid(UI.keys_node): UI.keys_node.visible = !visible From bddb9123e8b91638b7d7c18e24c28a66577cc48a Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Mon, 3 Mar 2025 15:30:35 -0500 Subject: [PATCH 18/19] touch screen toggle, always options ! fullscreen & borderless option simplified splash drawn on top of touch controls save options for view and touch controls --- src/autoload/Shared.gd | 31 ++- src/autoload/touch_screen.gd | 5 +- src/menu/Menu.gd | 2 +- src/menu/options/Borderless.gd | 20 -- src/menu/options/Fullscreen.gd | 34 ++-- src/menu/options/OptionsMenu.tscn | 328 ++++++++++++++---------------- src/menu/options/Touch.gd | 14 +- src/menu/splash.tscn | 2 +- 8 files changed, 198 insertions(+), 238 deletions(-) delete mode 100644 src/menu/options/Borderless.gd diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index d2ee259..4a4b590 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -80,6 +80,7 @@ var last_palette = -1 var time_elapsed := 0 var auto_save_clock := 0 var auto_save_time := 1800 +var window_option := 0 setget set_window_option func _ready(): print("Shared._ready(): ") @@ -94,7 +95,7 @@ func _ready(): # scale window window_scale = floor(OS.get_screen_size().x / get_viewport().size.x) window_scale = max(1, floor(window_scale * 0.9)) - set_window_scale() + #set_window_scale() # lower volume for i in [1, 2]: @@ -317,11 +318,23 @@ func load_keys(path := keys_path): for e in r.dict[a]: InputMap.action_add_event(a, e) +func set_window_option(arg := window_option): + window_option = clamp(arg, 0, 4) + OS.window_borderless = window_option == 1 or window_option == 2 + OS.window_fullscreen = window_option == 3 + if window_option == 2: + OS.window_size = OS.get_screen_size() + + OS.set_window_position(Vector2.ZERO if window_option == 2 else (OS.get_screen_size() * 0.5 - OS.get_window_size() * 0.5)) + Input.mouse_mode = Input.MOUSE_MODE_VISIBLE if window_option < 3 else Input.MOUSE_MODE_HIDDEN + func save_options(path := options_path): var data = {} data["sfx"] = bus_volume[1] - data["music"] = bus_volume[2] - data["fullscreen"] = int(OS.window_fullscreen) + data["ost"] = bus_volume[2] + data["touch"] = int(TouchScreen.is_stay) + data["full"] = int(OS.window_fullscreen) + data["view"] = int(window_option) data["time"] = time_elapsed print("save_options, path: ", path, " time: ", time_elapsed) @@ -337,12 +350,16 @@ func load_options(path := options_path): var v = int(dict["sfx"]) bus_volume[1] = v set_bus_volume(1, v) - if dict.has("music"): - var v = int(dict["music"]) + if dict.has("ost"): + var v = int(dict["ost"]) bus_volume[2] = v set_bus_volume(2, v) - if dict.has("fullscreen"): - set_fullscreen(bool(dict["fullscreen"])) + if dict.has("full"): + set_fullscreen(bool(dict["full"])) + if dict.has("touch"): + TouchScreen.is_stay = bool(dict["touch"]) + if dict.has("view"): + self.window_option = int(dict["view"]) if dict.has("time"): time_elapsed = abs(int(dict["time"])) diff --git a/src/autoload/touch_screen.gd b/src/autoload/touch_screen.gd index 7305122..ff7ad4c 100644 --- a/src/autoload/touch_screen.gd +++ b/src/autoload/touch_screen.gd @@ -9,18 +9,19 @@ onready var buttons := [$Control/HBoxRight/C/Control/Button, $Control/HBoxRight/ onready var btns := $Control/DPad/Buttons.get_children() onready var actions := InputMap.get_actions() +export var is_stay := false + func _ready(): connect("visibility_changed", self, "vis") yield(get_tree(), "idle_frame") - visible = (OS.has_touchscreen_ui_hint() and OS.get_name() == "HTML5") or OS.get_name() == "Android" vis() func _input(event): if event is InputEventScreenTouch or event is InputEventScreenDrag: visible = true elif event is InputEventKey or event is InputEventJoypadButton or event is InputEventJoypadMotion: - visible = false + visible = is_stay func vis(): if is_instance_valid(UI.keys_node): diff --git a/src/menu/Menu.gd b/src/menu/Menu.gd index 6d36d73..0be52b5 100644 --- a/src/menu/Menu.gd +++ b/src/menu/Menu.gd @@ -56,7 +56,7 @@ func make_list(arg): list_node = arg list = [] for i in arg.get_children(): - if !i.is_in_group("no_item"): + if !i.is_in_group("no_item") and i.visible: list.append(i) func menu_input(event): diff --git a/src/menu/options/Borderless.gd b/src/menu/options/Borderless.gd deleted file mode 100644 index 2aef2e9..0000000 --- a/src/menu/options/Borderless.gd +++ /dev/null @@ -1,20 +0,0 @@ -extends CanvasItem - -onready var fill = $Box/Fill -var is_selected = false - -func _ready(): - fill.visible = OS.window_borderless - -func select(): - is_selected = true - -func deselect(): - is_selected = false - -func _input(event): - if is_selected and event.is_action_pressed("ui_yes"): - var is_full = OS.window_borderless - OS.window_borderless = !is_full - Audio.play("menu_delete", 0.5, 1.5) - fill.visible = !is_full diff --git a/src/menu/options/Fullscreen.gd b/src/menu/options/Fullscreen.gd index 8deeb61..d572bc8 100644 --- a/src/menu/options/Fullscreen.gd +++ b/src/menu/options/Fullscreen.gd @@ -1,27 +1,19 @@ extends CanvasItem -onready var fill = $Box/Fill -var is_selected = false +onready var label := $Label2 +var cursor = 0 +var text = ["windowed", "win no border", "full no border", "fullscreen"] func _ready(): - fill.visible = OS.window_fullscreen + yield(get_tree(), "idle_frame") + cursor = Shared.window_option + label.text = text[cursor] -func select(): - is_selected = true +func act(): + scroll() -func deselect(): - is_selected = false - -# HTML5 fullscreen fix -func _input(event): - if is_selected and event.is_action_pressed("ui_yes"): - var is_full = OS.window_fullscreen - Shared.set_fullscreen(!is_full) - #OS.window_fullscreen = !is_full - Shared.set_window_scale() - Audio.play("menu_pause", 0.7, 1.3) - fill.visible = !is_full - if !is_full: - Input.set_mouse_mode(Input.MOUSE_MODE_HIDDEN) - else: - Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) +func scroll(arg := 1): + cursor = wrapi(cursor + arg, 0, 4) + label.text = text[cursor] + Shared.window_option = cursor + Audio.play("menu_pause", 0.7, 1.3) diff --git a/src/menu/options/OptionsMenu.tscn b/src/menu/options/OptionsMenu.tscn index ca30a87..435b7c2 100644 --- a/src/menu/options/OptionsMenu.tscn +++ b/src/menu/options/OptionsMenu.tscn @@ -7,7 +7,7 @@ [ext_resource path="res://media/audio/sfx/btn0.wav" type="AudioStream" id=5] [ext_resource path="res://media/font/QuinqueFive.ttf" type="DynamicFontData" id=6] [ext_resource path="res://media/font/ThaleahFat.ttf" type="DynamicFontData" id=7] -[ext_resource path="res://src/menu/options/Borderless.gd" type="Script" id=8] +[ext_resource path="res://media/image/tinyArrow.png" type="Texture" id=9] [ext_resource path="res://src/menu/options/Fullscreen.gd" type="Script" id=20] [ext_resource path="res://src/menu/options/WindowSize.gd" type="Script" id=21] [ext_resource path="res://src/menu/options/Touch.gd" type="Script" id=22] @@ -30,7 +30,7 @@ pause_mode = 2 layer = 30 script = ExtResource( 1 ) parent_path = NodePath(".") -list_path = NodePath("Center/Control/MenuItems") +list_path = NodePath("Center/Control/CenterContainer/MenuItems") cursor_path = NodePath("Center/Control/Cursor") cursor_expand = Vector2( 4, 4 ) is_audio_scroll = true @@ -63,178 +63,190 @@ margin_bottom = 35.0 script = ExtResource( 4 ) color_blink = PoolColorArray( 0, 0, 1, 1, 0, 0.482353, 1, 1 ) -[node name="Header" type="Label" parent="Center/Control"] -margin_top = 7.0 -margin_right = 228.0 -margin_bottom = 20.0 +[node name="CenterContainer" type="CenterContainer" parent="Center/Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 + +[node name="MenuItems" type="VBoxContainer" parent="Center/Control/CenterContainer"] +margin_left = 53.0 +margin_top = 11.0 +margin_right = 175.0 +margin_bottom = 116.0 +rect_min_size = Vector2( 122, 0 ) +alignment = 1 + +[node name="Header" type="Label" parent="Center/Control/CenterContainer/MenuItems" groups=["no_item"]] +margin_right = 122.0 +margin_bottom = 12.0 +rect_min_size = Vector2( 0, 12 ) custom_colors/font_color_shadow = Color( 0, 0, 0, 1 ) custom_constants/shadow_as_outline = 1 custom_fonts/font = SubResource( 4 ) text = "OPTIONS" align = 1 -[node name="MenuItems" type="VBoxContainer" parent="Center/Control"] -margin_left = 58.0 -margin_top = 21.0 -margin_right = 174.0 -margin_bottom = 113.0 -alignment = 1 - -[node name="Keyboard" type="HBoxContainer" parent="Center/Control/MenuItems"] -margin_right = 116.0 -margin_bottom = 8.0 +[node name="Keyboard" type="HBoxContainer" parent="Center/Control/CenterContainer/MenuItems"] +margin_top = 16.0 +margin_right = 122.0 +margin_bottom = 24.0 rect_min_size = Vector2( 0, 8 ) script = ExtResource( 3 ) -[node name="Label" type="Label" parent="Center/Control/MenuItems/Keyboard"] +[node name="Label" type="Label" parent="Center/Control/CenterContainer/MenuItems/Keyboard"] margin_top = 1.0 margin_right = 84.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 2 ) text = "Keyboard Setup" -[node name="Spacer" type="Control" parent="Center/Control/MenuItems/Keyboard"] +[node name="Spacer" type="Control" parent="Center/Control/CenterContainer/MenuItems/Keyboard"] margin_left = 88.0 -margin_right = 104.0 +margin_right = 110.0 margin_bottom = 8.0 size_flags_horizontal = 3 -[node name="Spacer2" type="Control" parent="Center/Control/MenuItems/Keyboard"] -margin_left = 108.0 -margin_right = 116.0 +[node name="Spacer2" type="Control" parent="Center/Control/CenterContainer/MenuItems/Keyboard"] +margin_left = 114.0 +margin_right = 122.0 margin_bottom = 8.0 rect_min_size = Vector2( 8, 0 ) -[node name="Gamepad" type="HBoxContainer" parent="Center/Control/MenuItems"] -margin_top = 12.0 -margin_right = 116.0 -margin_bottom = 20.0 +[node name="Gamepad" type="HBoxContainer" parent="Center/Control/CenterContainer/MenuItems"] +margin_top = 28.0 +margin_right = 122.0 +margin_bottom = 36.0 rect_min_size = Vector2( 0, 8 ) script = ExtResource( 3 ) is_gamepad = true -[node name="Label" type="Label" parent="Center/Control/MenuItems/Gamepad"] +[node name="Label" type="Label" parent="Center/Control/CenterContainer/MenuItems/Gamepad"] margin_top = 1.0 margin_right = 78.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 2 ) text = "gamepad Setup" -[node name="Spacer" type="Control" parent="Center/Control/MenuItems/Gamepad"] +[node name="Spacer" type="Control" parent="Center/Control/CenterContainer/MenuItems/Gamepad"] margin_left = 82.0 -margin_right = 104.0 +margin_right = 110.0 margin_bottom = 8.0 size_flags_horizontal = 3 -[node name="Spacer2" type="Control" parent="Center/Control/MenuItems/Gamepad"] -margin_left = 108.0 -margin_right = 116.0 +[node name="Spacer2" type="Control" parent="Center/Control/CenterContainer/MenuItems/Gamepad"] +margin_left = 114.0 +margin_right = 122.0 margin_bottom = 8.0 rect_min_size = Vector2( 8, 0 ) -[node name="Sounds" parent="Center/Control/MenuItems" instance=ExtResource( 2 )] -margin_top = 24.0 -margin_right = 116.0 -margin_bottom = 32.0 +[node name="Sounds" parent="Center/Control/CenterContainer/MenuItems" instance=ExtResource( 2 )] +margin_top = 40.0 +margin_right = 122.0 +margin_bottom = 48.0 -[node name="Music" parent="Center/Control/MenuItems" instance=ExtResource( 2 )] -margin_top = 36.0 -margin_right = 116.0 -margin_bottom = 44.0 +[node name="Music" parent="Center/Control/CenterContainer/MenuItems" instance=ExtResource( 2 )] +margin_top = 52.0 +margin_right = 122.0 +margin_bottom = 60.0 bus = 2 -[node name="Label" parent="Center/Control/MenuItems/Music" index="0"] +[node name="Label" parent="Center/Control/CenterContainer/MenuItems/Music" index="0"] margin_right = 30.0 text = "Music" -[node name="Spacer" parent="Center/Control/MenuItems/Music" index="1"] +[node name="Spacer" parent="Center/Control/CenterContainer/MenuItems/Music" index="1"] margin_left = 32.0 -margin_right = 65.0 +margin_right = 71.0 -[node name="Arrow" parent="Center/Control/MenuItems/Music" index="2"] -margin_left = 67.0 -margin_right = 70.0 +[node name="Arrow" parent="Center/Control/CenterContainer/MenuItems/Music" index="2"] +margin_left = 73.0 +margin_right = 76.0 -[node name="Meter" parent="Center/Control/MenuItems/Music" index="3"] -margin_left = 72.0 -margin_right = 111.0 +[node name="Meter" parent="Center/Control/CenterContainer/MenuItems/Music" index="3"] +margin_left = 78.0 +margin_right = 117.0 -[node name="Arrow2" parent="Center/Control/MenuItems/Music" index="4"] -margin_left = 113.0 -margin_right = 116.0 +[node name="Arrow2" parent="Center/Control/CenterContainer/MenuItems/Music" index="4"] +margin_left = 119.0 +margin_right = 122.0 -[node name="AudioStreamPlayer" parent="Center/Control/MenuItems/Music" index="5"] +[node name="AudioStreamPlayer" parent="Center/Control/CenterContainer/MenuItems/Music" index="5"] stream = ExtResource( 5 ) bus = "Music" -[node name="Fullscreen" type="HBoxContainer" parent="Center/Control/MenuItems"] -margin_top = 48.0 -margin_right = 116.0 -margin_bottom = 56.0 +[node name="View" type="HBoxContainer" parent="Center/Control/CenterContainer/MenuItems"] +margin_top = 64.0 +margin_right = 122.0 +margin_bottom = 72.0 +rect_min_size = Vector2( 116, 8 ) +custom_constants/separation = 2 script = ExtResource( 20 ) -[node name="Label" type="Label" parent="Center/Control/MenuItems/Fullscreen"] +[node name="Label" type="Label" parent="Center/Control/CenterContainer/MenuItems/View"] margin_top = 1.0 -margin_right = 60.0 +margin_right = 24.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 2 ) -text = "Fullscreen" +text = "view" __meta__ = { "_edit_use_anchors_": false } -[node name="Spacer" type="Control" parent="Center/Control/MenuItems/Fullscreen"] -margin_left = 64.0 -margin_right = 92.0 +[node name="Spacer" type="Control" parent="Center/Control/CenterContainer/MenuItems/View"] +margin_left = 26.0 +margin_right = 26.0 margin_bottom = 8.0 size_flags_horizontal = 3 -[node name="Box" type="ColorRect" parent="Center/Control/MenuItems/Fullscreen"] -margin_left = 96.0 -margin_right = 104.0 +[node name="Arrow" type="Control" parent="Center/Control/CenterContainer/MenuItems/View"] +margin_left = 28.0 +margin_right = 31.0 margin_bottom = 8.0 -rect_min_size = Vector2( 8, 8 ) +rect_min_size = Vector2( 3, 0 ) -[node name="Back" type="ColorRect" parent="Center/Control/MenuItems/Fullscreen/Box"] -margin_left = 1.0 +[node name="Sprite" type="Sprite" parent="Center/Control/CenterContainer/MenuItems/View/Arrow"] +position = Vector2( 2, 4 ) +texture = ExtResource( 9 ) + +[node name="Label2" type="Label" parent="Center/Control/CenterContainer/MenuItems/View"] +margin_left = 33.0 margin_top = 1.0 -margin_right = 7.0 -margin_bottom = 7.0 -color = Color( 0, 0, 0, 1 ) - -[node name="Fill" type="ColorRect" parent="Center/Control/MenuItems/Fullscreen/Box"] -margin_left = 2.0 -margin_top = 2.0 -margin_right = 6.0 +margin_right = 117.0 margin_bottom = 6.0 +custom_fonts/font = SubResource( 2 ) +text = "full no border" __meta__ = { "_edit_use_anchors_": false } -[node name="Spacer2" type="Control" parent="Center/Control/MenuItems/Fullscreen"] -margin_left = 108.0 -margin_right = 116.0 +[node name="Arrow2" type="Control" parent="Center/Control/CenterContainer/MenuItems/View"] +margin_left = 119.0 +margin_right = 122.0 margin_bottom = 8.0 -rect_min_size = Vector2( 8, 0 ) +rect_min_size = Vector2( 3, 0 ) -[node name="WindowSize" type="HBoxContainer" parent="Center/Control/MenuItems"] -margin_top = 60.0 -margin_right = 116.0 -margin_bottom = 68.0 +[node name="Sprite" type="Sprite" parent="Center/Control/CenterContainer/MenuItems/View/Arrow2"] +position = Vector2( 1, 4 ) +texture = ExtResource( 9 ) +flip_h = true + +[node name="WindowSize" type="HBoxContainer" parent="Center/Control/CenterContainer/MenuItems"] +margin_top = 76.0 +margin_right = 122.0 +margin_bottom = 84.0 rect_min_size = Vector2( 0, 8 ) script = ExtResource( 21 ) -[node name="Label" type="Label" parent="Center/Control/MenuItems/WindowSize"] +[node name="Label" type="Label" parent="Center/Control/CenterContainer/MenuItems/WindowSize"] margin_top = 1.0 -margin_right = 36.0 +margin_right = 24.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 2 ) -text = "Window" +text = "Size" -[node name="Scale" type="Label" parent="Center/Control/MenuItems/WindowSize"] -margin_left = 40.0 +[node name="Scale" type="Label" parent="Center/Control/CenterContainer/MenuItems/WindowSize"] +margin_left = 28.0 margin_top = 1.0 -margin_right = 58.0 +margin_right = 64.0 margin_bottom = 6.0 size_flags_horizontal = 3 custom_fonts/font = SubResource( 2 ) @@ -244,121 +256,77 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Resolution" type="Label" parent="Center/Control/MenuItems/WindowSize"] -margin_left = 62.0 +[node name="Resolution" type="Label" parent="Center/Control/CenterContainer/MenuItems/WindowSize"] +margin_left = 68.0 margin_top = 1.0 -margin_right = 116.0 +margin_right = 122.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 2 ) text = "228 x 128" align = 1 -[node name="Borderless" type="HBoxContainer" parent="Center/Control/MenuItems"] -margin_top = 72.0 -margin_right = 116.0 -margin_bottom = 80.0 -script = ExtResource( 8 ) - -[node name="Label" type="Label" parent="Center/Control/MenuItems/Borderless"] -margin_top = 1.0 -margin_right = 60.0 -margin_bottom = 6.0 -custom_fonts/font = SubResource( 2 ) -text = "Borderless" - -[node name="Spacer" type="Control" parent="Center/Control/MenuItems/Borderless"] -margin_left = 64.0 -margin_right = 92.0 -margin_bottom = 8.0 -size_flags_horizontal = 3 - -[node name="Box" type="ColorRect" parent="Center/Control/MenuItems/Borderless"] -margin_left = 96.0 -margin_right = 104.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 8, 8 ) - -[node name="Back" type="ColorRect" parent="Center/Control/MenuItems/Borderless/Box"] -margin_left = 1.0 -margin_top = 1.0 -margin_right = 7.0 -margin_bottom = 7.0 -color = Color( 0, 0, 0, 1 ) - -[node name="Fill" type="ColorRect" parent="Center/Control/MenuItems/Borderless/Box"] -margin_left = 2.0 -margin_top = 2.0 -margin_right = 6.0 -margin_bottom = 6.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Spacer2" type="Control" parent="Center/Control/MenuItems/Borderless"] -margin_left = 108.0 -margin_right = 116.0 -margin_bottom = 8.0 -rect_min_size = Vector2( 8, 0 ) - -[node name="TouchControls" type="HBoxContainer" parent="Center/Control/MenuItems"] -margin_top = 84.0 -margin_right = 116.0 -margin_bottom = 92.0 +[node name="Touch" type="HBoxContainer" parent="Center/Control/CenterContainer/MenuItems"] +margin_top = 88.0 +margin_right = 122.0 +margin_bottom = 96.0 +rect_min_size = Vector2( 0, 8 ) +custom_constants/separation = 2 script = ExtResource( 22 ) -[node name="Label" type="Label" parent="Center/Control/MenuItems/TouchControls"] +[node name="Label" type="Label" parent="Center/Control/CenterContainer/MenuItems/Touch"] margin_top = 1.0 -margin_right = 84.0 +margin_right = 72.0 margin_bottom = 6.0 custom_fonts/font = SubResource( 2 ) -text = "Touch Controls" +text = "Touch screen" -[node name="Spacer" type="Control" parent="Center/Control/MenuItems/TouchControls"] -margin_left = 88.0 -margin_right = 92.0 +[node name="Spacer" type="Control" parent="Center/Control/CenterContainer/MenuItems/Touch"] +margin_left = 74.0 +margin_right = 74.0 margin_bottom = 8.0 size_flags_horizontal = 3 -[node name="Box" type="ColorRect" parent="Center/Control/MenuItems/TouchControls"] -margin_left = 96.0 -margin_right = 104.0 +[node name="Arrow" type="Control" parent="Center/Control/CenterContainer/MenuItems/Touch"] +margin_left = 76.0 +margin_right = 79.0 margin_bottom = 8.0 -rect_min_size = Vector2( 8, 8 ) +rect_min_size = Vector2( 3, 0 ) -[node name="Back" type="ColorRect" parent="Center/Control/MenuItems/TouchControls/Box"] -margin_left = 1.0 +[node name="Sprite" type="Sprite" parent="Center/Control/CenterContainer/MenuItems/Touch/Arrow"] +position = Vector2( 2, 4 ) +texture = ExtResource( 9 ) + +[node name="Label2" type="Label" parent="Center/Control/CenterContainer/MenuItems/Touch"] +margin_left = 81.0 margin_top = 1.0 -margin_right = 7.0 -margin_bottom = 7.0 -color = Color( 0, 0, 0, 1 ) - -[node name="Fill" type="ColorRect" parent="Center/Control/MenuItems/TouchControls/Box"] -margin_left = 2.0 -margin_top = 2.0 -margin_right = 6.0 +margin_right = 117.0 margin_bottom = 6.0 -__meta__ = { -"_edit_use_anchors_": false -} +custom_fonts/font = SubResource( 2 ) +text = "always" -[node name="Spacer2" type="Control" parent="Center/Control/MenuItems/TouchControls"] -margin_left = 108.0 -margin_right = 116.0 +[node name="Arrow2" type="Control" parent="Center/Control/CenterContainer/MenuItems/Touch"] +margin_left = 119.0 +margin_right = 122.0 margin_bottom = 8.0 -rect_min_size = Vector2( 8, 0 ) +rect_min_size = Vector2( 3, 0 ) -[node name="Time" type="HBoxContainer" parent="Center/Control/MenuItems" groups=["no_item"]] -margin_top = 96.0 -margin_right = 116.0 -margin_bottom = 101.0 +[node name="Sprite" type="Sprite" parent="Center/Control/CenterContainer/MenuItems/Touch/Arrow2"] +position = Vector2( 1, 4 ) +texture = ExtResource( 9 ) +flip_h = true -[node name="TimeLabel" type="Label" parent="Center/Control/MenuItems/Time"] +[node name="Time" type="HBoxContainer" parent="Center/Control/CenterContainer/MenuItems" groups=["no_item"]] +margin_top = 100.0 +margin_right = 122.0 +margin_bottom = 105.0 + +[node name="TimeLabel" type="Label" parent="Center/Control/CenterContainer/MenuItems/Time"] unique_name_in_owner = true -margin_right = 116.0 +margin_right = 122.0 margin_bottom = 5.0 size_flags_horizontal = 3 custom_fonts/font = SubResource( 2 ) -text = "Touch Controls" +text = "01:23" align = 1 -[editable path="Center/Control/MenuItems/Music"] +[editable path="Center/Control/CenterContainer/MenuItems/Music"] diff --git a/src/menu/options/Touch.gd b/src/menu/options/Touch.gd index d122fab..ca0b225 100644 --- a/src/menu/options/Touch.gd +++ b/src/menu/options/Touch.gd @@ -1,14 +1,16 @@ extends CanvasItem -onready var fill = $Box/Fill -var is_selected = false +onready var label := $Label2 +var text = ["toggle", "always"] func _ready(): yield(get_tree(), "idle_frame") - fill.visible = TouchScreen.visible + label.text = text[int(TouchScreen.is_stay)] + +func scroll(arg := 1): + act() func act(): - var is_touch = !TouchScreen.visible - TouchScreen.visible = is_touch - fill.visible = is_touch + TouchScreen.is_stay = !TouchScreen.is_stay + label.text = text[int(TouchScreen.is_stay)] Audio.play("menu_pause", 0.9, 1.1) diff --git a/src/menu/splash.tscn b/src/menu/splash.tscn index d00fa0a..4330ee2 100644 --- a/src/menu/splash.tscn +++ b/src/menu/splash.tscn @@ -8,7 +8,7 @@ script = ExtResource( 3 ) [node name="CanvasLayer" type="CanvasLayer" parent="."] -layer = 9 +layer = 90 [node name="ColorRect" type="ColorRect" parent="CanvasLayer"] anchor_right = 1.0 From 0a63473f296c8783e85fc843649d499fb6bf7447 Mon Sep 17 00:00:00 2001 From: Harmony Honey Monroe Date: Mon, 3 Mar 2025 16:22:16 -0500 Subject: [PATCH 19/19] save and load window size ! win size shown in options remove Back.gd and Unlock.gd unused option scripts remove Shared.set_window_scale() and window_scale --- project.godot | 4 ++-- src/autoload/Shared.gd | 22 +++++++--------------- src/menu/options/Back.gd | 5 ----- src/menu/options/Unlock.gd | 6 ------ src/menu/options/WindowSize.gd | 21 +++++++++++++++------ 5 files changed, 24 insertions(+), 34 deletions(-) delete mode 100644 src/menu/options/Back.gd delete mode 100644 src/menu/options/Unlock.gd diff --git a/project.godot b/project.godot index 8d36831..66a6257 100644 --- a/project.godot +++ b/project.godot @@ -109,8 +109,8 @@ KeyMenu="*res://src/menu/options/KeyMenu.tscn" window/size/width=228 window/size/height=128 -window/size/test_width=1280 -window/size/test_height=720 +window/size/test_width=1140 +window/size/test_height=640 window/dpi/allow_hidpi=true window/stretch/mode="viewport" window/stretch/aspect="keep_height" diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index 4a4b590..ad4e9aa 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -40,7 +40,6 @@ var is_save := false var last_menu := "main" var last_cursor := 0 -var window_scale := 1 var view_size := Vector2(228, 128) var bus_volume = [10, 10, 10] @@ -92,11 +91,6 @@ func _ready(): ghosts.append(g) node_ghost.visible = false - # scale window - window_scale = floor(OS.get_screen_size().x / get_viewport().size.x) - window_scale = max(1, floor(window_scale * 0.9)) - #set_window_scale() - # lower volume for i in [1, 2]: set_bus_volume(i, 7) @@ -111,7 +105,6 @@ func _ready(): if !dir.open(s) == OK: dir.make_dir(s) - # get all maps for i in dir_list(map_dir): maps.append(i.split(".")[0]) @@ -335,6 +328,8 @@ func save_options(path := options_path): data["touch"] = int(TouchScreen.is_stay) data["full"] = int(OS.window_fullscreen) data["view"] = int(window_option) + var ws = OS.window_size + data["size"] = str(ws.x) + "," + str(ws.y) data["time"] = time_elapsed print("save_options, path: ", path, " time: ", time_elapsed) @@ -360,6 +355,11 @@ func load_options(path := options_path): TouchScreen.is_stay = bool(dict["touch"]) if dict.has("view"): self.window_option = int(dict["view"]) + if dict.has("size"): + var ws = str(dict["size"]).split_floats(",", false) + if ws.size() == 2: + OS.window_size = Vector2(float(ws[0]), float(ws[1])) + set_window_option() if dict.has("time"): time_elapsed = abs(int(dict["time"])) @@ -552,14 +552,6 @@ func set_bus_volume(_bus := 1, _vol := 5): bus_volume[_bus] = clamp(_vol, 0, 10) AudioServer.set_bus_volume_db(_bus, linear2db(bus_volume[_bus] / 10.0)) -func set_window_scale(arg := window_scale): - window_scale = max(1, arg if arg else window_scale) - if OS.get_name() != "HTML5": - OS.window_size = Vector2(view_size.x * window_scale, view_size.y * window_scale) - # center window - OS.set_window_position(OS.get_screen_size() * 0.5 - OS.get_window_size() * 0.5) - return "window_scale: " + str(window_scale) + " - resolution: " + str(OS.get_window_size()) - func get_all_children(n, a := []): if is_instance_valid(n): a.append(n) diff --git a/src/menu/options/Back.gd b/src/menu/options/Back.gd deleted file mode 100644 index 3e0d89d..0000000 --- a/src/menu/options/Back.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends Node2D - -func act(): - Shared.wipe_scene(Shared.main_menu_path) - Audio.play("menu_back", 0.9, 1.1) diff --git a/src/menu/options/Unlock.gd b/src/menu/options/Unlock.gd deleted file mode 100644 index 60fb5c9..0000000 --- a/src/menu/options/Unlock.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends Node2D - -func act(): - Audio.play("menu_pick", 0.9, 1.1) - Shared.unlock() - Shared.cam.shake(10) diff --git a/src/menu/options/WindowSize.gd b/src/menu/options/WindowSize.gd index 3593b3f..bddf5c1 100644 --- a/src/menu/options/WindowSize.gd +++ b/src/menu/options/WindowSize.gd @@ -3,14 +3,23 @@ extends CanvasItem onready var label_scale := $Scale onready var label_res := $Resolution +var cursor = 0 + func _ready(): - set_text() + get_tree().connect("screen_resized", self, "size_changed") + yield(get_tree(),"idle_frame") + + size_changed() func scroll(arg = 1): - Shared.set_window_scale(clamp(Shared.window_scale + arg, 1, 12)) - set_text() + cursor = clamp(cursor + arg, 1, 32) + OS.window_size = Shared.view_size * cursor + Shared.set_window_option() Audio.play("menu_scroll2", 0.7, 1.4) -func set_text(): - label_scale.text = str(Shared.window_scale) + "x" - label_res.text = str(Shared.view_size.x * Shared.window_scale) + " x " + str(Shared.view_size.y * Shared.window_scale) +func size_changed(): + var view_size = OS.window_size + label_res.text = str(view_size.x) + " x " + str(view_size.y) + + cursor = floor(view_size.y / Shared.view_size. y) + label_scale.text = str(cursor) + "x" if OS.window_size == Shared.view_size * cursor else ""