From 371e50829344f124311cdf014a367c1bf11933b8 Mon Sep 17 00:00:00 2001 From: Dustin Date: Sat, 10 May 2025 12:56:50 -0700 Subject: [PATCH] Level transition changes. Wish I could do better than a string but resources and packescenes just not working. --- assets_tmp/elevator.png | Bin 0 -> 1752 bytes assets_tmp/elevator.png.import | 35 +++++++++++++++++++++++++++ assets_tmp/mmz1_door.png | Bin 0 -> 9700 bytes assets_tmp/mmz1_door.png.import | 35 +++++++++++++++++++++++++++ lib/singleton_autoloads/LevelInfo.gd | 6 ++--- src/Interactables/Door.tscn | 4 +-- src/Interactables/LevelTransition.gd | 15 ++++++++++-- src/levels/CloneBox.tscn | 2 +- src/levels/TestBox.tscn | 2 +- 9 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 assets_tmp/elevator.png create mode 100644 assets_tmp/elevator.png.import create mode 100644 assets_tmp/mmz1_door.png create mode 100644 assets_tmp/mmz1_door.png.import diff --git a/assets_tmp/elevator.png b/assets_tmp/elevator.png new file mode 100644 index 0000000000000000000000000000000000000000..e175bb87e18c9bb8d0c0dbf012dc42d4ce0d0030 GIT binary patch literal 1752 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 literal 0 HcmV?d00001 diff --git a/assets_tmp/mmz1_door.png.import b/assets_tmp/mmz1_door.png.import new file mode 100644 index 0000000..cc26a4d --- /dev/null +++ b/assets_tmp/mmz1_door.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mmz1_door.png-579031ede58c9d4541d47c3e98f79062.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets_tmp/mmz1_door.png" +dest_files=[ "res://.import/mmz1_door.png-579031ede58c9d4541d47c3e98f79062.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/lib/singleton_autoloads/LevelInfo.gd b/lib/singleton_autoloads/LevelInfo.gd index ef5afe0..9a4e5fa 100644 --- a/lib/singleton_autoloads/LevelInfo.gd +++ b/lib/singleton_autoloads/LevelInfo.gd @@ -52,11 +52,11 @@ func stop_music(): if juke_box.playing: juke_box.stop() -func change_level(_level_name :String, _position_name :String): - print("res://src/levels/" + _level_name + ".tscn" ) +func change_level(_level_path :String, _position_name :String): + #print("res://src/levels/" + _level_name + ".tscn" ) var SceneTransition = get_node("/root/Main/ViewportContainer/Viewport/SceneTransition") #var simultaneous_scene = preload("res://levels/level2.tscn").instance() - var new_level = load("res://src/levels/" + _level_name + ".tscn" ).instance() + var new_level = load( _level_path ).instance() #print (get_tree().get_root().get_children()) for l in viewport.get_children(): diff --git a/src/Interactables/Door.tscn b/src/Interactables/Door.tscn index 69d8d71..1a49f2a 100644 --- a/src/Interactables/Door.tscn +++ b/src/Interactables/Door.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=15 format=2] -[ext_resource path="res://lib/templates/Interactable/Interactable_Template.tscn" type="PackedScene" id=1] +[ext_resource path="res://lib/templates/Interactable/Interactable_Component.tscn" type="PackedScene" id=1] [ext_resource path="res://src/Interactables/Door.gd" type="Script" id=2] -[ext_resource path="res://assets/mmz1_door.png" type="Texture" id=3] +[ext_resource path="res://assets_tmp/mmz1_door.png" type="Texture" id=3] [sub_resource type="AtlasTexture" id=1] atlas = ExtResource( 3 ) diff --git a/src/Interactables/LevelTransition.gd b/src/Interactables/LevelTransition.gd index 4948001..219dc8f 100644 --- a/src/Interactables/LevelTransition.gd +++ b/src/Interactables/LevelTransition.gd @@ -4,16 +4,27 @@ extends Interactable ## Things like 'door_right', 'stairs' ## helps the Player object pick an appropriate animation export var _transition_type := 'door_right' -export var _destination_level_name: String +#export var _destination_level_name: String +export(String, FILE, "*.tscn") var _destination_level +#export var _foo: FileDialog export var _destination_position_name := 'PlayerStart' # Declare member variables here. Examples: # var a = 2 # var b = "text" +##TODO: I'd really like to verify the pact scene is a level but I can't until its instanced. +#func _ready(): +# print(_destination_level.) + +# print(_destination_level.get_state(), _destination_level.get_class() , _destination_level.get_state().get_node_type(1)) +# print_debug(_destination_level._bundled) +# +# assert(_destination_level.get_state().get_node_type(0) == 'Level') func trigger_interaction(): # This is something that should maybe be extended for every differant interactible. # They could inherit from this base class and implement this function. print("Okay, I'll transition the level now!") - LevelInfo.change_level(_destination_level_name, _destination_position_name) + #LevelInfo.change_level(_destination_level_name, _destination_position_name) + LevelInfo.change_level(_destination_level, _destination_position_name) diff --git a/src/levels/CloneBox.tscn b/src/levels/CloneBox.tscn index a4135da..f4df776 100644 --- a/src/levels/CloneBox.tscn +++ b/src/levels/CloneBox.tscn @@ -51,7 +51,7 @@ position = Vector2( -13, 28 ) [node name="LevelTransition" parent="." index="6" instance=ExtResource( 4 )] position = Vector2( -12, 31 ) _transition_type = "door_left" -_destination_level_name = "TestBox" +_destination_level = "res://src/levels/TestBox.tscn" _destination_position_name = "EnterRight" [node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition" index="0"] diff --git a/src/levels/TestBox.tscn b/src/levels/TestBox.tscn index 4e4e148..a32e073 100644 --- a/src/levels/TestBox.tscn +++ b/src/levels/TestBox.tscn @@ -80,7 +80,7 @@ shape = SubResource( 1 ) [node name="LevelTransition" parent="." index="5" instance=ExtResource( 4 )] position = Vector2( 1032, 112 ) -_destination_level_name = "CloneBox" +_destination_level = "res://src/levels/CloneBox.tscn" _destination_position_name = "EnterLeft" [node name="CollisionShape2D" type="CollisionShape2D" parent="LevelTransition" index="0"]