diff --git a/project.godot b/project.godot index 9f103f7..c493138 100644 --- a/project.godot +++ b/project.godot @@ -13,7 +13,7 @@ config_version=5 config/name="Tiny Crate" config/description="Tiny Crate by Harmony Honey hhoney.net" -run/main_scene="res://src/menu/splash.tscn" +run/main_scene="res://src/map/1-1.tscn" config/use_custom_user_dir=true config/custom_user_dir_name="tiny_crate" config/features=PackedStringArray("4.0") diff --git a/src/actor/Actor.gd b/src/actor/Actor.gd index 9b9d3bc..fff6ca8 100644 --- a/src/actor/Actor.gd +++ b/src/actor/Actor.gd @@ -62,14 +62,14 @@ func _physics_process(delta): if not is_on_floor: time_since_floor += 1 -# #update the _draw when hitbox values are changed (in the editor) +# queue_redraw when hitbox values are changed (in the editor) func _set_hit_x(value): hitbox_x = value - #update() + queue_redraw() func _set_hit_y(value): hitbox_y = value - #update() + queue_redraw() # draw hitbox in editor func _draw(): diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index df5bbbf..81ce2d0 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -170,7 +170,7 @@ func dir_list(path : String): if dir: dir.include_hidden = false dir.include_navigational = false - dir.list_dir_begin() # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547 + dir.list_dir_begin() var file_name = dir.get_next() while file_name: array.append(file_name.split(".")[0]) diff --git a/src/autoload/Wipe.gd b/src/autoload/Wipe.gd index 22f28d2..20b6f3d 100644 --- a/src/autoload/Wipe.gd +++ b/src/autoload/Wipe.gd @@ -43,7 +43,7 @@ func stop(): image.visible = false else: for i in 2: - await get_tree().physics_frame + await get_tree().process_frame emit_signal("finish") start(true) diff --git a/src/autoload/touch_screen_button.gd b/src/autoload/touch_screen_button.gd index c50133b..2f5fd05 100644 --- a/src/autoload/touch_screen_button.gd +++ b/src/autoload/touch_screen_button.gd @@ -6,11 +6,11 @@ extends Node2D func set_is_var(arg): is_var = arg - #update() + queue_redraw() func set_circle(arg): circle_size = arg - #update() + queue_redraw() func _draw(): draw_circle(Vector2.ZERO, circle_size, Color.WHITE) diff --git a/src/map/1-1.tscn b/src/map/1-1.tscn index 0eaf304..adaf58d 100644 --- a/src/map/1-1.tscn +++ b/src/map/1-1.tscn @@ -4,31 +4,29 @@ [ext_resource type="PackedScene" path="res://src/actor/Exit.tscn" id="2"] [ext_resource type="PackedScene" path="res://src/stage/GameCamera.tscn" id="3"] [ext_resource type="PackedScene" uid="uid://c3tsbvbfy7tmu" path="res://src/stage/DetailTileMap.tscn" id="4"] -[ext_resource type="PackedScene" path="res://src/stage/SpikeTileMap.tscn" id="5"] +[ext_resource type="PackedScene" uid="uid://bvc7mxf7gpij4" path="res://src/stage/SpikeTileMap.tscn" id="5"] [ext_resource type="PackedScene" uid="uid://bleh1qiiufduy" path="res://src/actor/Player.tscn" id="6"] [ext_resource type="Script" path="res://src/stage/Stage.gd" id="7"] [ext_resource type="FontVariation" uid="uid://cntu078xgj2oj" path="res://media/font/m6x11.tres" id="8"] [ext_resource type="Texture2D" uid="uid://cmyhp4lmcy3di" path="res://media/image/btn.png" id="9"] [ext_resource type="Script" path="res://src/menu/hide_on_level_select.gd" id="10"] -[ext_resource type="PackedScene" path="res://src/stage/ObscureMap.tscn" id="11"] +[ext_resource type="PackedScene" uid="uid://bj7wygouppym4" path="res://src/stage/ObscureMap.tscn" id="11"] [ext_resource type="PackedScene" path="res://src/actor/Note.tscn" id="12"] [node name="Stage" type="Node2D"] script = ExtResource("7") [node name="SolidTileMap" parent="." instance=ExtResource("1")] -layer_0/tile_data = PackedInt32Array(-524303, 1, 0, -524302, 1, 0, -524301, 1, 0, -524300, 1, 0, -524299, 1, 0, -524298, 1, 0, -524297, 1, 0, -524296, 1, 0, -524295, 1, 0, -524294, 1, 0, -524293, 1, 0, -524292, 1, 0, -524291, 1, 0, -524290, 1, 0, -524289, 1, 0, -589824, 1, 0, -589823, 1, 0, -589822, 1, 0, -589821, 1, 0, -589820, 1, 0, -589819, 1, 0, -589818, 1, 0, -589817, 1, 0, -589816, 1, 0, -589815, 1, 0, -589814, 1, 0, -589813, 1, 0, -589812, 1, 0, -589811, 1, 0, -589810, 1, 0, -458767, 1, 0, -524274, 1, 0, -393231, 1, 0, -458738, 1, 0, -327695, 1, 0, -393202, 1, 0, -262159, 1, 0, -327666, 1, 0, -196623, 1, 0, -262130, 1, 0, -131087, 1, 0, -196594, 1, 0, -65551, 1, 0, -65542, 536870912, 0, -65541, 536870912, 1, -65540, 536870912, 1, -65539, 0, 0, -65538, 536870912, 1, -65537, 536870912, 0, -131072, 536870912, 1, -131071, 536870912, 1, -131070, 536870912, 0, -131069, 536870912, 1, -131068, 0, 0, -131067, 536870912, 1, -131066, 0, 0, -131065, 536870912, 1, -131064, 536870912, 0, -131058, 1, 0, -15, 1, 0, -14, 1, 0, -13, 1, 0, -12, 1, 0, -11, 1, 0, -10, 1, 0, -9, 1, 0, -8, 0, 1, -65528, 536870912, 0, -65522, 1, 0, 65528, 536870912, 0, 8, 536870912, 1, 14, 1, 0, 131064, 536870912, 0, 65544, 536870912, 0, 65545, 1, 0, 65546, 1, 0, 65547, 1, 0, 65548, 1, 0, 65549, 1, 0, 65550, 1, 0, 196600, 536870912, 0, 196601, 536870912, 0, 196602, 536870912, 1, 196603, 0, 0, 196604, 536870912, 1, 196605, 536870912, 0, 196606, 0, 0, 196607, 536870912, 1, 131072, 536870912, 0, 131073, 536870912, 1, 131074, 536870912, 1, 131075, 536870912, 0, 131076, 536870912, 1, 131077, 0, 0, 131078, 536870912, 1, 131079, 536870912, 0, 131080, 536870912, 0) +layer_0/tile_data = PackedInt32Array(-524303, 1, 0, -524302, 1, 0, -524301, 1, 0, -524300, 1, 0, -524299, 1, 0, -524298, 1, 0, -524297, 1, 0, -524296, 1, 0, -524295, 1, 0, -524294, 1, 0, -524293, 1, 0, -524292, 1, 0, -524291, 1, 0, -524290, 1, 0, -524289, 1, 0, -589824, 1, 0, -589823, 1, 0, -589822, 1, 0, -589821, 1, 0, -589820, 1, 0, -589819, 1, 0, -589818, 1, 0, -589817, 1, 0, -589816, 1, 0, -589815, 1, 0, -589814, 1, 0, -589813, 1, 0, -589812, 1, 0, -589811, 1, 0, -589810, 1, 0, -458767, 1, 0, -524274, 1, 0, -393231, 1, 0, -458738, 1, 0, -327695, 1, 0, -393202, 1, 0, -262159, 1, 0, -327666, 1, 0, -196623, 1, 0, -262130, 1, 0, -131087, 1, 0, -196594, 1, 0, -65551, 1, 0, -65542, 65536, 0, -65541, 65536, 0, -65540, 65536, 0, -65539, 0, 0, -65538, 65536, 0, -65537, 65536, 0, -131072, 65536, 0, -131071, 65536, 0, -131070, 65536, 0, -131069, 65536, 0, -131068, 0, 0, -131067, 65536, 0, -131066, 0, 0, -131065, 65536, 0, -131064, 65536, 0, -131058, 1, 0, -15, 1, 0, -14, 1, 0, -13, 1, 0, -12, 1, 0, -11, 1, 0, -10, 1, 0, -9, 1, 0, -8, 65536, 0, -65528, 65536, 0, -65522, 1, 0, 65528, 65536, 0, 8, 65536, 0, 14, 1, 0, 131064, 65536, 0, 65544, 65536, 0, 65545, 1, 0, 65546, 1, 0, 65547, 1, 0, 65548, 1, 0, 65549, 1, 0, 65550, 1, 0, 196600, 65536, 0, 196601, 65536, 0, 196602, 65536, 0, 196603, 0, 0, 196604, 65536, 0, 196605, 65536, 0, 196606, 0, 0, 196607, 65536, 0, 131072, 65536, 0, 131073, 65536, 0, 131074, 65536, 0, 131075, 65536, 0, 131076, 65536, 0, 131077, 0, 0, 131078, 65536, 0, 131079, 65536, 0, 131080, 65536, 0) [node name="SpikeTileMap" parent="." instance=ExtResource("5")] -format = 2 [node name="DetailTileMap" parent="." instance=ExtResource("4")] z_index = -11 layer_0/tile_data = PackedInt32Array(-393212, 5, 2, -393211, 536870917, 0, -393210, -1610612731, 2, -327676, -1073741819, 2, -327675, 536870917, 0, -327674, 1610612741, 2, -262139, 536870917, 1, -262136, 536870916, 3, -262135, 536870916, 0, -262134, 4, 3, -131080, 536870916, 3, -131079, 536870916, 0, -131078, 4, 3, -196603, 536870917, 1, -196601, 536870916, 3, -196600, 536870916, 0, -196599, 4, 1, -196598, 536870916, 2, -131063, 4, 0, -131062, 536870916, 2, -10, 536870917, 0, -9, -536870907, 1, -7, 536870916, 0, -6, 4, 1, -5, 536870916, 0, -4, 4, 3, -2, 536870916, 3, -1, 536870916, 2, -65532, 4, 2, -65531, 536870916, 1, -65530, 536870916, 0, -65529, 536870916, 1, -65527, 4, 1, -65526, 536870916, 2, 65529, 4, 1, 65530, 4, 3, 65531, 4, 2, 65532, 536870916, 2, 0, 536870917, 0, 4, 536870916, 3, 5, 536870916, 2, 6, 4, 2, 7, 536870916, 0, 9, 536870916, 2, 131063, 536870916, 3, 131065, 4, 1, 131066, 536870916, 0, 131067, 4, 1, 131068, 536870916, 0, 131069, 536870916, 2, 65536, 1073741829, 1, 65537, 4, 2, 65538, 4, 3, 65540, 4, 2, 65541, 4, 3, 65542, 536870916, 3, 65543, 536870916, 0, 65545, -2147483643, 1, 65546, 536870917, 0, 196598, 536870916, 3, 196599, 536870916, 0, 262134, 536870916, 3, 262135, 4, 1, 262136, 536870916, 0, 262137, 4, 1, 262138, 536870916, 0, 262139, 536870916, 2, 196613, 4, 2, 196614, 4, 0, 196615, 536870916, 2, 327669, 536870916, 3, 327670, 536870916, 0, 327671, 536870916, 2, 327672, 536870916, 3, 327673, 4, 0, 327674, 4, 3, 393206, 4, 2, 393207, 536870916, 0, 393208, 4, 1, 393209, 536870916, 2) [node name="ObscureMap" parent="." instance=ExtResource("11")] -format = 2 -layer_0/tile_data = PackedInt32Array(-458766, 1, 0, -458765, 1, 0, -458764, 1, 0, -458763, 1, 0, -458762, 1, 0, -458761, 1, 0, -458760, 1, 0, -458759, 1, 0, -458758, 1, 0, -458757, 1, 0, -458756, 1, 0, -458755, 1, 0, -458754, 1, 0, -458753, 1, 0, -524288, 1, 0, -524287, 1, 0, -524286, 1, 0, -524285, 1, 0, -524284, 1, 0, -524283, 1, 0, -524282, 1, 0, -524281, 1, 0, -524280, 1, 0, -524279, 1, 0, -524278, 1, 0, -524277, 1, 0, -524276, 1, 0, -524275, 1, 0, -393230, 1, 0, -393229, 1, 0, -393228, 1, 0, -393227, 1, 0, -393226, 1, 0, -393225, 1, 0, -393224, 1, 0, -393223, 1, 0, -393222, 1, 0, -393221, 1, 0, -393220, 1, 0, -393219, 1, 0, -393218, 1, 0, -393217, 1, 0, -458752, 1, 0, -458751, 1, 0, -458750, 1, 0, -458749, 1, 0, -458748, 1, 0, -458747, 1, 0, -458746, 1, 0, -458745, 1, 0, -458744, 1, 0, -458743, 1, 0, -458742, 1, 0, -458741, 1, 0, -458740, 1, 0, -458739, 1, 0, -327694, 1, 0, -327693, 1, 0, -327692, 1, 0, -327691, 1, 0, -327690, 1, 0, -327689, 1, 0, -327688, 1, 0, -327687, 1, 0, -327686, 1, 0, -327685, 1, 0, -327684, 1, 0, -327683, 1, 0, -327682, 1, 0, -327681, 1, 0, -393216, 1, 0, -393215, 1, 0, -393214, 1, 0, -393213, 1, 0, -393212, 1, 0, -393211, 1, 0, -393210, 1, 0, -393209, 1, 0, -393208, 1, 0, -393207, 1, 0, -393206, 1, 0, -393205, 1, 0, -393204, 1, 0, -393203, 1, 0, -262158, 1, 0, -262157, 1, 0, -262156, 1, 0, -262155, 1, 0, -262154, 1, 0, -262153, 1, 0, -262152, 1, 0, -262151, 1, 0, -262150, 1, 0, -262149, 1, 0, -262148, 1, 0, -262147, 1, 0, -262146, 1, 0, -262145, 0, 0, -327680, 0, 0, -327679, 1, 0, -327678, 1, 0, -327677, 1, 0, -327676, 1, 0, -327675, 1, 0, -327674, 1, 0, -327673, 1, 0, -327672, 1, 0, -327671, 1, 0, -327670, 1, 0, -327669, 1, 0, -327668, 1, 0, -327667, 1, 0, -196622, 1, 0, -196621, 1, 0, -196620, 1, 0, -196619, 1, 0, -196618, 1, 0, -196617, 1, 0, -196616, 1, 0, -196615, 1, 0, -196614, 1, 0, -196613, 1, 0, -196612, 1, 0, -196611, 1, 0, -196610, 1, 0, -196609, 0, 0, -262144, 0, 0, -262143, 1, 0, -262142, 1, 0, -262141, 1, 0, -262140, 1, 0, -262139, 1, 0, -262138, 1, 0, -262137, 1, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -262131, 1, 0, -131086, 1, 0, -131085, 1, 0, -131084, 1, 0, -131083, 1, 0, -131082, 1, 0, -131081, 1, 0, -131080, 1, 0, -131079, 1, 0, -131078, 1, 0, -131077, 1, 0, -131076, 1, 0, -131075, 1, 0, -131074, 1, 0, -131073, 1, 0, -196608, 1, 0, -196607, 1, 0, -196606, 1, 0, -196605, 1, 0, -196604, 1, 0, -196603, 1, 0, -196602, 1, 0, -196601, 1, 0, -196600, 1, 0, -196599, 1, 0, -196598, 1, 0, -196597, 1, 0, -196596, 1, 0, -196595, 1, 0, -65550, 1, 0, -65549, 1, 0, -65548, 1, 0, -65547, 1, 0, -65546, 1, 0, -65545, 1, 0, -65544, 2, 0, -65543, 2, 1, -131063, 1, 0, -131062, 1, 0, -131061, 1, 0, -131060, 1, 0, -131059, 1, 0, -65527, 1, 0, -65526, 1, 0, -65525, 1, 0, -65524, 1, 0, -65523, 1, 0, 9, 1, 0, 10, 1, 0, 11, 1, 0, 12, 1, 0, 13, 1, 0) +layer_0/tile_data = PackedInt32Array(-458766, 1, 0, -458765, 1, 0, -458764, 1, 0, -458763, 1, 0, -458762, 1, 0, -458761, 1, 0, -458760, 1, 0, -458759, 1, 0, -458758, 1, 0, -458757, 1, 0, -458756, 1, 0, -458755, 1, 0, -458754, 1, 0, -458753, 1, 0, -524288, 1, 0, -524287, 1, 0, -524286, 1, 0, -524285, 1, 0, -524284, 1, 0, -524283, 1, 0, -524282, 1, 0, -524281, 1, 0, -524280, 1, 0, -524279, 1, 0, -524278, 1, 0, -524277, 1, 0, -524276, 1, 0, -524275, 1, 0, -393230, 1, 0, -393229, 1, 0, -393228, 1, 0, -393227, 1, 0, -393226, 1, 0, -393225, 1, 0, -393224, 1, 0, -393223, 1, 0, -393222, 1, 0, -393221, 1, 0, -393220, 1, 0, -393219, 1, 0, -393218, 1, 0, -393217, 1, 0, -458752, 1, 0, -458751, 1, 0, -458750, 1, 0, -458749, 1, 0, -458748, 1, 0, -458747, 1, 0, -458746, 1, 0, -458745, 1, 0, -458744, 1, 0, -458743, 1, 0, -458742, 1, 0, -458741, 1, 0, -458740, 1, 0, -458739, 1, 0, -327694, 1, 0, -327693, 1, 0, -327692, 1, 0, -327691, 1, 0, -327690, 1, 0, -327689, 1, 0, -327688, 1, 0, -327687, 1, 0, -327686, 1, 0, -327685, 1, 0, -327684, 1, 0, -327683, 1, 0, -327682, 1, 0, -327681, 1, 0, -393216, 1, 0, -393215, 1, 0, -393214, 1, 0, -393213, 1, 0, -393212, 1, 0, -393211, 1, 0, -393210, 1, 0, -393209, 1, 0, -393208, 1, 0, -393207, 1, 0, -393206, 1, 0, -393205, 1, 0, -393204, 1, 0, -393203, 1, 0, -262158, 1, 0, -262157, 1, 0, -262156, 1, 0, -262155, 1, 0, -262154, 1, 0, -262153, 1, 0, -262152, 1, 0, -262151, 1, 0, -262150, 1, 0, -262149, 1, 0, -262148, 1, 0, -262147, 1, 0, -262146, 1, 0, -262145, 0, 0, -327680, 0, 0, -327679, 1, 0, -327678, 1, 0, -327677, 1, 0, -327676, 1, 0, -327675, 1, 0, -327674, 1, 0, -327673, 1, 0, -327672, 1, 0, -327671, 1, 0, -327670, 1, 0, -327669, 1, 0, -327668, 1, 0, -327667, 1, 0, -196622, 1, 0, -196621, 1, 0, -196620, 1, 0, -196619, 1, 0, -196618, 1, 0, -196617, 1, 0, -196616, 1, 0, -196615, 1, 0, -196614, 1, 0, -196613, 1, 0, -196612, 1, 0, -196611, 1, 0, -196610, 1, 0, -196609, 0, 0, -262144, 0, 0, -262143, 1, 0, -262142, 1, 0, -262141, 1, 0, -262140, 1, 0, -262139, 1, 0, -262138, 1, 0, -262137, 1, 0, -262136, 1, 0, -262135, 1, 0, -262134, 1, 0, -262133, 1, 0, -262132, 1, 0, -262131, 1, 0, -131086, 1, 0, -131085, 1, 0, -131084, 1, 0, -131083, 1, 0, -131082, 1, 0, -131081, 1, 0, -131080, 1, 0, -131079, 1, 0, -131078, 1, 0, -131077, 1, 0, -131076, 1, 0, -131075, 1, 0, -131074, 1, 0, -131073, 1, 0, -196608, 1, 0, -196607, 1, 0, -196606, 1, 0, -196605, 1, 0, -196604, 1, 0, -196603, 1, 0, -196602, 1, 0, -196601, 1, 0, -196600, 1, 0, -196599, 1, 0, -196598, 1, 0, -196597, 1, 0, -196596, 1, 0, -196595, 1, 0, -65550, 1, 0, -65549, 1, 0, -65548, 1, 0, -65547, 1, 0, -65546, 1, 0, -65545, 1, 0, -65544, 2, 0, -65543, 65538, 0, -131063, 1, 0, -131062, 1, 0, -131061, 1, 0, -131060, 1, 0, -131059, 1, 0, -65527, 1, 0, -65526, 1, 0, -65525, 1, 0, -65524, 1, 0, -65523, 1, 0, 9, 1, 0, 10, 1, 0, 11, 1, 0, 12, 1, 0, 13, 1, 0) [node name="GameCamera" parent="." instance=ExtResource("3")] diff --git a/src/menu/options/Unlock.gd b/src/menu/options/Unlock.gd index c2732eb..cd3ef21 100644 --- a/src/menu/options/Unlock.gd +++ b/src/menu/options/Unlock.gd @@ -4,5 +4,5 @@ extends Node2D func act(): audio.play() - false # Shared.unlock() # TODOConverter40, Image no longer requires locking, `false` helps to not break one line if/else, so it can freely be removed + Shared.unlock() Shared.node_camera_game.shake(10) diff --git a/src/menu/splash.gd b/src/menu/splash.gd index 7945b95..8fd64d3 100644 --- a/src/menu/splash.gd +++ b/src/menu/splash.gd @@ -1,7 +1,7 @@ extends Node2D func _ready(): - await get_tree().physics_frame + await get_tree().process_frame Music.play() $AudioStreamPlayer.play() await get_tree().create_timer(1.5).timeout diff --git a/src/stage/DetailTileMap.tscn b/src/stage/DetailTileMap.tscn index c174654..b4780d8 100644 --- a/src/stage/DetailTileMap.tscn +++ b/src/stage/DetailTileMap.tscn @@ -5,10 +5,19 @@ [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_u50pt"] texture = ExtResource("2") +texture_region_size = Vector2i(8, 8) +0:0/0 = 0 +1:0/0 = 0 +2:0/0 = 0 +3:0/0 = 0 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_s8eh7"] texture = ExtResource("1") -margins = Vector2i(0, 16) +texture_region_size = Vector2i(8, 8) +0:2/0 = 0 +1:2/0 = 0 +2:2/0 = 0 +3:2/0 = 0 [sub_resource type="TileSet" id="1"] tile_size = Vector2i(8, 8) diff --git a/src/stage/GameCamera.gd b/src/stage/GameCamera.gd index 8ac5a0b..3f90cf7 100644 --- a/src/stage/GameCamera.gd +++ b/src/stage/GameCamera.gd @@ -55,7 +55,7 @@ func _set_bounds(arg): bounds.position.y = abs(arg.position.y) bounds.size.x = abs(arg.size.x) bounds.size.y = abs(arg.size.y) - #update() + queue_redraw() func _draw(): if Engine.is_editor_hint(): diff --git a/src/stage/ObscureMap.gd b/src/stage/ObscureMap.gd index dfcb3d0..7ba1a34 100644 --- a/src/stage/ObscureMap.gd +++ b/src/stage/ObscureMap.gd @@ -1,9 +1,8 @@ extends TileMap func _ready(): - pass -# tile_set.tile_set_modulate(0, Color.BLACK) -# tile_set.tile_set_modulate(1, Color.TRANSPARENT) + tile_set.get_source(0).get_tile_data(Vector2i(0, 0), 0).modulate = Color.BLACK + tile_set.get_source(1).get_tile_data(Vector2i(0, 0), 0).modulate = Color.TRANSPARENT func _physics_process(delta): if is_instance_valid(Shared.player): diff --git a/src/stage/ObscureMap.tscn b/src/stage/ObscureMap.tscn index d84185e..c515f1f 100644 --- a/src/stage/ObscureMap.tscn +++ b/src/stage/ObscureMap.tscn @@ -1,66 +1,40 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=8 format=3 uid="uid://bj7wygouppym4"] -[ext_resource path="res://media/image/solid_bricks.png" type="Texture2D" id=3] -[ext_resource path="res://media/image/8pixel.png" type="Texture2D" id=4] -[ext_resource path="res://src/stage/ObscureMap.gd" type="Script" id=5] -[ext_resource path="res://media/image/wipe.png" type="Texture2D" id=6] +[ext_resource type="Texture2D" uid="uid://c2pkx12yvks5v" path="res://media/image/solid_bricks.png" id="3"] +[ext_resource type="Texture2D" uid="uid://msfqee07s5gy" path="res://media/image/8pixel.png" id="4"] +[ext_resource type="Script" path="res://src/stage/ObscureMap.gd" id="5"] -[sub_resource type="TileSet" id=1] -0/name = "8pixel.png 0" -0/texture = ExtResource( 4 ) -0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 0, 1, 0.06, 0.33 ) -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 -1/name = "wipe.png 1" -1/texture = ExtResource( 6 ) -1/tex_offset = Vector2( 0, 0 ) -1/modulate = Color( 0, 1, 0, 0.2 ) -1/region = Rect2( 32, 48, 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 -2/name = "solid_bricks.png 2" -2/texture = ExtResource( 3 ) -2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 1, 1, 1, 1 ) -2/region = Rect2( 0, 0, 16, 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="TileSetAtlasSource" id="TileSetAtlasSource_6h4hm"] +texture = ExtResource("4") +texture_region_size = Vector2i(8, 8) +0:0/next_alternative_id = 9 +0:0/0 = 0 +0:0/0/modulate = Color(0, 1, 0.06, 0.33) + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_78nr0"] +texture = ExtResource("4") +texture_region_size = Vector2i(8, 8) +0:0/next_alternative_id = 8 +0:0/0 = 0 +0:0/0/modulate = Color(0, 1, 0, 0.2) + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_o3qlt"] +texture = ExtResource("3") +texture_region_size = Vector2i(8, 8) +0:0/next_alternative_id = 5 +0:0/0 = 0 +1:0/0 = 0 + +[sub_resource type="TileSet" id="1"] +tile_size = Vector2i(8, 8) +sources/0 = SubResource("TileSetAtlasSource_6h4hm") +sources/1 = SubResource("TileSetAtlasSource_78nr0") +sources/2 = SubResource("TileSetAtlasSource_o3qlt") [node name="ObscureMap" type="TileMap"] light_mask = 4 z_index = 12 z_as_relative = false -tile_set = SubResource( 1 ) -cell_size = Vector2( 8, 8 ) -format = 1 -script = ExtResource( 5 ) +tile_set = SubResource("1") +format = 2 +script = ExtResource("5") diff --git a/src/stage/SolidTileMap.tscn b/src/stage/SolidTileMap.tscn index 362de47..66c1d19 100644 --- a/src/stage/SolidTileMap.tscn +++ b/src/stage/SolidTileMap.tscn @@ -55,32 +55,6 @@ texture_region_size = Vector2i(8, 8) 0:0/next_alternative_id = 8 0:0/0 = 0 0:0/0/modulate = Color(1, 0, 1, 0.33) -0:0/1 = 1 -0:0/1/flip_h = true -0:0/1/modulate = Color(1, 0, 1, 0.33) -0:0/2 = 2 -0:0/2/flip_v = true -0:0/2/modulate = Color(1, 0, 1, 0.33) -0:0/3 = 3 -0:0/3/flip_h = true -0:0/3/flip_v = true -0:0/3/modulate = Color(1, 0, 1, 0.33) -0:0/4 = 4 -0:0/4/transpose = true -0:0/4/modulate = Color(1, 0, 1, 0.33) -0:0/5 = 5 -0:0/5/flip_h = true -0:0/5/transpose = true -0:0/5/modulate = Color(1, 0, 1, 0.33) -0:0/6 = 6 -0:0/6/flip_v = true -0:0/6/transpose = true -0:0/6/modulate = Color(1, 0, 1, 0.33) -0:0/7 = 7 -0:0/7/flip_h = true -0:0/7/flip_v = true -0:0/7/transpose = true -0:0/7/modulate = Color(1, 0, 1, 0.33) [sub_resource type="TileSet" id="1"] tile_size = Vector2i(8, 8) @@ -92,7 +66,7 @@ script/source = "extends TileMap func _ready(): Shared.node_map_solid = self - #tile_set.tile_set_modulate(1, Color.TRANSPARENT) + tile_set.get_source(1).get_tile_data(Vector2i(0, 0), 0).modulate = Color.TRANSPARENT " [node name="SolidTileMap" type="TileMap"]