mirror of
https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git
synced 2025-10-27 01:40:57 +00:00
couple more improvements, im pretty happy with how this is shaping up
This commit is contained in:
@@ -67,4 +67,4 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -262,6 +262,7 @@ text = "EDITOR_MAIN_CREATE_1"
|
|||||||
uppercase = true
|
uppercase = true
|
||||||
|
|
||||||
[node name="TextureRect" type="TextureRect" parent="BG/Border/Levels/VBoxContainer/LevelList/TopBit/Button"]
|
[node name="TextureRect" type="TextureRect" parent="BG/Border/Levels/VBoxContainer/LevelList/TopBit/Button"]
|
||||||
|
visible = false
|
||||||
layout_mode = 1
|
layout_mode = 1
|
||||||
anchors_preset = -1
|
anchors_preset = -1
|
||||||
anchor_top = 0.5
|
anchor_top = 0.5
|
||||||
@@ -361,11 +362,11 @@ layout_mode = 2
|
|||||||
focus_mode = 0
|
focus_mode = 0
|
||||||
|
|
||||||
[node name="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LevelInfo/SelectedLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="0"]
|
[node name="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LevelInfo/SelectedLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="0"]
|
||||||
scroll_horizontal = 1
|
scroll_horizontal = 202
|
||||||
is_active = true
|
is_active = true
|
||||||
|
|
||||||
[node name="ScrollContainer2" parent="BG/Border/Levels/VBoxContainer/LevelInfo/SelectedLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="1"]
|
[node name="ScrollContainer2" parent="BG/Border/Levels/VBoxContainer/LevelInfo/SelectedLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="1"]
|
||||||
scroll_horizontal = 1
|
scroll_horizontal = 5
|
||||||
is_active = true
|
is_active = true
|
||||||
|
|
||||||
[node name="Panel" type="PanelContainer" parent="BG/Border/Levels/VBoxContainer/LevelInfo"]
|
[node name="Panel" type="PanelContainer" parent="BG/Border/Levels/VBoxContainer/LevelInfo"]
|
||||||
@@ -376,7 +377,7 @@ theme_override_styles/panel = ExtResource("8_psbt7")
|
|||||||
[node name="AutoScrollContainer" type="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LevelInfo/Panel"]
|
[node name="AutoScrollContainer" type="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LevelInfo/Panel"]
|
||||||
layout_mode = 2
|
layout_mode = 2
|
||||||
mouse_filter = 2
|
mouse_filter = 2
|
||||||
scroll_vertical = 1
|
scroll_vertical = 13
|
||||||
horizontal_scroll_mode = 3
|
horizontal_scroll_mode = 3
|
||||||
vertical_scroll_mode = 3
|
vertical_scroll_mode = 3
|
||||||
script = ExtResource("24_wf6nb")
|
script = ExtResource("24_wf6nb")
|
||||||
@@ -564,12 +565,11 @@ layout_mode = 2
|
|||||||
focus_mode = 0
|
focus_mode = 0
|
||||||
|
|
||||||
[node name="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LSSLevelInfo/SelectedOnlineLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="0"]
|
[node name="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LSSLevelInfo/SelectedOnlineLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="0"]
|
||||||
scroll_horizontal = 1
|
|
||||||
is_active = true
|
is_active = true
|
||||||
auto_connect_focus = false
|
auto_connect_focus = false
|
||||||
|
|
||||||
[node name="ScrollContainer2" parent="BG/Border/Levels/VBoxContainer/LSSLevelInfo/SelectedOnlineLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="1"]
|
[node name="ScrollContainer2" parent="BG/Border/Levels/VBoxContainer/LSSLevelInfo/SelectedOnlineLevel/MarginContainer/HBoxContainer/HSplitContainer/LeftHalf/LevelInfo" index="1"]
|
||||||
scroll_horizontal = 1
|
scroll_horizontal = 5
|
||||||
is_active = true
|
is_active = true
|
||||||
auto_connect_focus = false
|
auto_connect_focus = false
|
||||||
|
|
||||||
@@ -582,7 +582,7 @@ theme_override_styles/panel = ExtResource("8_psbt7")
|
|||||||
[node name="AutoScrollContainer" type="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LSSLevelInfo/Panel"]
|
[node name="AutoScrollContainer" type="ScrollContainer" parent="BG/Border/Levels/VBoxContainer/LSSLevelInfo/Panel"]
|
||||||
layout_mode = 2
|
layout_mode = 2
|
||||||
mouse_filter = 0
|
mouse_filter = 0
|
||||||
scroll_vertical = 1
|
scroll_vertical = 13
|
||||||
horizontal_scroll_mode = 3
|
horizontal_scroll_mode = 3
|
||||||
script = ExtResource("24_wf6nb")
|
script = ExtResource("24_wf6nb")
|
||||||
direction = 1
|
direction = 1
|
||||||
|
|||||||
@@ -175,12 +175,10 @@ physics_interpolation_mode = 2
|
|||||||
|
|
||||||
[node name="Flame" type="AnimatedSprite2D" parent="RotationJoint"]
|
[node name="Flame" type="AnimatedSprite2D" parent="RotationJoint"]
|
||||||
unique_name_in_owner = true
|
unique_name_in_owner = true
|
||||||
visible = false
|
|
||||||
position = Vector2(0, -32)
|
position = Vector2(0, -32)
|
||||||
sprite_frames = SubResource("SpriteFrames_8axu6")
|
sprite_frames = SubResource("SpriteFrames_8axu6")
|
||||||
animation = &"Rise"
|
animation = &"Loop"
|
||||||
frame = 5
|
frame_progress = 0.19739561
|
||||||
frame_progress = 1.0
|
|
||||||
|
|
||||||
[node name="ResourceSetterNew" type="Node" parent="RotationJoint/Flame" node_paths=PackedStringArray("node_to_affect")]
|
[node name="ResourceSetterNew" type="Node" parent="RotationJoint/Flame" node_paths=PackedStringArray("node_to_affect")]
|
||||||
script = ExtResource("3_fsldu")
|
script = ExtResource("3_fsldu")
|
||||||
@@ -244,6 +242,9 @@ offset = Vector2(0, 0)
|
|||||||
disable_physics = false
|
disable_physics = false
|
||||||
metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
|
metadata/_custom_type_script = "uid://d4a7yp6e55u8t"
|
||||||
|
|
||||||
|
[node name="OnScreen" type="VisibleOnScreenNotifier2D" parent="."]
|
||||||
|
rect = Rect2(-64, -64, 128, 128)
|
||||||
|
|
||||||
[connection signal="player_hit" from="RotationJoint/EnemyPlayerDetection" to="." method="damage_player"]
|
[connection signal="player_hit" from="RotationJoint/EnemyPlayerDetection" to="." method="damage_player"]
|
||||||
[connection signal="player_stomped_on" from="RotationJoint/EnemyPlayerDetection" to="." method="damage_player"]
|
[connection signal="player_stomped_on" from="RotationJoint/EnemyPlayerDetection" to="." method="damage_player"]
|
||||||
[connection signal="timeout" from="Timer" to="." method="do_cycle"]
|
[connection signal="timeout" from="Timer" to="." method="do_cycle"]
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ static var colour_ids := {}
|
|||||||
|
|
||||||
|
|
||||||
func _process(_delta: float) -> void:
|
func _process(_delta: float) -> void:
|
||||||
$\"../LevelEditorVisibleNode/Label\".text = str(owner.door_id)
|
$\"../LevelEditorVisibleNode/Label\".text = str(owner.door_id) +\"/\" + str(owner.sublevel_id)
|
||||||
"
|
"
|
||||||
|
|
||||||
[sub_resource type="Animation" id="Animation_hk64y"]
|
[sub_resource type="Animation" id="Animation_hk64y"]
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ property_name = "sprite_frames"
|
|||||||
resource_json = ExtResource("3_7tad6")
|
resource_json = ExtResource("3_7tad6")
|
||||||
metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
metadata/_custom_type_script = "uid://cbal8ms2oe1ik"
|
||||||
|
|
||||||
[node name="PropertyExposer" type="Node" parent="."]
|
[node name="EditorPropertyExposer" type="Node" parent="."]
|
||||||
script = ExtResource("4_hj3mh")
|
script = ExtResource("4_hj3mh")
|
||||||
properties = ["door_id", "sublevel_id"]
|
properties = ["door_id", "sublevel_id"]
|
||||||
properties_force_selector = Dictionary[String, PackedScene]({
|
properties_force_selector = Dictionary[String, PackedScene]({
|
||||||
|
|||||||
@@ -14,6 +14,9 @@ signal modifier_applied
|
|||||||
|
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
name = "EditorPropertyExposer"
|
name = "EditorPropertyExposer"
|
||||||
|
get_entity_map()
|
||||||
|
|
||||||
|
func get_entity_map() -> void:
|
||||||
if entity_map.is_empty():
|
if entity_map.is_empty():
|
||||||
entity_map = JSON.parse_string(FileAccess.open(EntityIDMapper.MAP_PATH, FileAccess.READ).get_as_text())
|
entity_map = JSON.parse_string(FileAccess.open(EntityIDMapper.MAP_PATH, FileAccess.READ).get_as_text())
|
||||||
|
|
||||||
@@ -45,6 +48,7 @@ func get_string() -> String:
|
|||||||
return string
|
return string
|
||||||
|
|
||||||
func apply_string(entity_string := "") -> void:
|
func apply_string(entity_string := "") -> void:
|
||||||
|
get_entity_map()
|
||||||
var idx := 2
|
var idx := 2
|
||||||
var slice = entity_string.split(",")
|
var slice = entity_string.split(",")
|
||||||
for i in properties:
|
for i in properties:
|
||||||
@@ -62,6 +66,10 @@ func apply_string(entity_string := "") -> void:
|
|||||||
var scene = entity_map.get(value)
|
var scene = entity_map.get(value)
|
||||||
if scene != null:
|
if scene != null:
|
||||||
owner.set(i, load(entity_map.get(value)[0]))
|
owner.set(i, load(entity_map.get(value)[0]))
|
||||||
|
elif value != "!!":
|
||||||
|
print([value, entity_map.get(value)])
|
||||||
|
print(entity_map)
|
||||||
|
Global.log_error("error getting item! : " + i + str(value))
|
||||||
elif owner.get(i) is int:
|
elif owner.get(i) is int:
|
||||||
var num = value
|
var num = value
|
||||||
if value.length() > 1:
|
if value.length() > 1:
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ func _ready() -> void:
|
|||||||
|
|
||||||
func do_cycle() -> void:
|
func do_cycle() -> void:
|
||||||
if BooRaceHandler.countdown_active == false:
|
if BooRaceHandler.countdown_active == false:
|
||||||
AudioManager.play_sfx("burner", global_position)
|
if $OnScreen.is_on_screen():
|
||||||
|
AudioManager.play_sfx("burner", global_position)
|
||||||
do_animation()
|
do_animation()
|
||||||
await get_tree().create_timer(0.25, false).timeout
|
await get_tree().create_timer(0.25, false).timeout
|
||||||
%Shape.set_deferred("disabled", false)
|
%Shape.set_deferred("disabled", false)
|
||||||
|
|||||||
@@ -112,7 +112,12 @@ func player_enter(player: Player) -> void:
|
|||||||
LevelEditor.play_door_transition = true
|
LevelEditor.play_door_transition = true
|
||||||
AudioManager.play_sfx("door_open", global_position)
|
AudioManager.play_sfx("door_open", global_position)
|
||||||
await get_tree().create_timer(0.5, false).timeout
|
await get_tree().create_timer(0.5, false).timeout
|
||||||
if Global.current_level.sublevel_id == sublevel_id:
|
var level_id = -1
|
||||||
|
if Global.current_level is CustomLevel:
|
||||||
|
level_id = Global.current_level.sublevel_id
|
||||||
|
elif Global.level_editor != null:
|
||||||
|
level_id = Global.level_editor.sub_level_id
|
||||||
|
if level_id == sublevel_id:
|
||||||
Global.do_fake_transition()
|
Global.do_fake_transition()
|
||||||
if Global.fade_transition:
|
if Global.fade_transition:
|
||||||
await get_tree().create_timer(0.25, false).timeout
|
await get_tree().create_timer(0.25, false).timeout
|
||||||
|
|||||||
@@ -334,6 +334,7 @@ func reset_values() -> void:
|
|||||||
Checkpoint.sublevel_id = 0
|
Checkpoint.sublevel_id = 0
|
||||||
Global.total_deaths = 0
|
Global.total_deaths = 0
|
||||||
Door.unlocked_doors = []
|
Door.unlocked_doors = []
|
||||||
|
Door.exiting_door_id = -1
|
||||||
Checkpoint.unlocked_doors = []
|
Checkpoint.unlocked_doors = []
|
||||||
KeyItem.total_collected = 0
|
KeyItem.total_collected = 0
|
||||||
Checkpoint.keys_collected = 0
|
Checkpoint.keys_collected = 0
|
||||||
|
|||||||
@@ -5,4 +5,4 @@ func _ready() -> void:
|
|||||||
update()
|
update()
|
||||||
|
|
||||||
func update() -> void:
|
func update() -> void:
|
||||||
visible = !LevelEditor.playing_level and Global.current_game_mode == Global.GameMode.LEVEL_EDITOR
|
visible = (!LevelEditor.playing_level and Global.current_game_mode == Global.GameMode.LEVEL_EDITOR) or Global.debug_mode
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ func _ready() -> void:
|
|||||||
Global.world_num = 1
|
Global.world_num = 1
|
||||||
Global.level_num = 1
|
Global.level_num = 1
|
||||||
Global.reset_values()
|
Global.reset_values()
|
||||||
|
Global.clear_saved_values()
|
||||||
Checkpoint.sublevel_id = 0
|
Checkpoint.sublevel_id = 0
|
||||||
Global.current_campaign = "SMB1"
|
Global.current_campaign = "SMB1"
|
||||||
AudioManager.stop_all_music()
|
AudioManager.stop_all_music()
|
||||||
|
|||||||
Reference in New Issue
Block a user