mirror of
https://github.com/JHDev2006/Super-Mario-Bros.-Remastered-Public.git
synced 2025-10-22 07:28:14 +00:00
made it so coins actually coin
This commit is contained in:
@@ -368,11 +368,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 = 232
|
scroll_horizontal = 200
|
||||||
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 = 29
|
scroll_horizontal = 8
|
||||||
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"]
|
||||||
@@ -383,7 +383,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 = 14
|
scroll_vertical = 54
|
||||||
horizontal_scroll_mode = 3
|
horizontal_scroll_mode = 3
|
||||||
vertical_scroll_mode = 3
|
vertical_scroll_mode = 3
|
||||||
script = ExtResource("24_wf6nb")
|
script = ExtResource("24_wf6nb")
|
||||||
@@ -569,12 +569,12 @@ 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 = 27
|
scroll_horizontal = 30
|
||||||
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 = 29
|
scroll_horizontal = 8
|
||||||
is_active = true
|
is_active = true
|
||||||
auto_connect_focus = false
|
auto_connect_focus = false
|
||||||
|
|
||||||
@@ -587,7 +587,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 = 14
|
scroll_vertical = 54
|
||||||
horizontal_scroll_mode = 3
|
horizontal_scroll_mode = 3
|
||||||
script = ExtResource("24_wf6nb")
|
script = ExtResource("24_wf6nb")
|
||||||
direction = 1
|
direction = 1
|
||||||
|
@@ -671,7 +671,6 @@ collision_mask = 0
|
|||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="CameraCenterJoint/LeftWall"]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="CameraCenterJoint/LeftWall"]
|
||||||
rotation = 1.5707964
|
rotation = 1.5707964
|
||||||
shape = SubResource("RectangleShape2D_t1xso")
|
shape = SubResource("RectangleShape2D_t1xso")
|
||||||
disabled = true
|
|
||||||
one_way_collision = true
|
one_way_collision = true
|
||||||
|
|
||||||
[node name="RightWall" type="StaticBody2D" parent="CameraCenterJoint"]
|
[node name="RightWall" type="StaticBody2D" parent="CameraCenterJoint"]
|
||||||
@@ -682,7 +681,6 @@ collision_mask = 0
|
|||||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="CameraCenterJoint/RightWall"]
|
[node name="CollisionShape2D" type="CollisionShape2D" parent="CameraCenterJoint/RightWall"]
|
||||||
rotation = -1.5707964
|
rotation = -1.5707964
|
||||||
shape = SubResource("RectangleShape2D_jl70t")
|
shape = SubResource("RectangleShape2D_jl70t")
|
||||||
disabled = true
|
|
||||||
one_way_collision = true
|
one_way_collision = true
|
||||||
|
|
||||||
[node name="Sprite2D" type="Sprite2D" parent="CameraCenterJoint"]
|
[node name="Sprite2D" type="Sprite2D" parent="CameraCenterJoint"]
|
||||||
|
@@ -171,9 +171,6 @@ func _ready() -> void:
|
|||||||
set_power_state_frame()
|
set_power_state_frame()
|
||||||
if Global.level_editor == null:
|
if Global.level_editor == null:
|
||||||
recenter_camera()
|
recenter_camera()
|
||||||
await get_tree().create_timer(0.1, false).timeout
|
|
||||||
for i in [$CameraCenterJoint/LeftWall/CollisionShape2D, $CameraCenterJoint/RightWall/CollisionShape2D]:
|
|
||||||
i.set_deferred("disabled", false)
|
|
||||||
|
|
||||||
func apply_character_physics() -> void:
|
func apply_character_physics() -> void:
|
||||||
var path = "res://Assets/Sprites/Players/" + character + "/CharacterInfo.json"
|
var path = "res://Assets/Sprites/Players/" + character + "/CharacterInfo.json"
|
||||||
|
@@ -74,10 +74,10 @@ var coins := 0:
|
|||||||
set(value):
|
set(value):
|
||||||
coins = value
|
coins = value
|
||||||
if coins >= 100:#
|
if coins >= 100:#
|
||||||
coins = coins % 100
|
|
||||||
if Settings.file.difficulty.inf_lives == 0 and (Global.current_game_mode != Global.GameMode.CHALLENGE and Global.current_campaign != "SMBANN"):
|
if Settings.file.difficulty.inf_lives == 0 and (Global.current_game_mode != Global.GameMode.CHALLENGE and Global.current_campaign != "SMBANN"):
|
||||||
lives += 1
|
lives += floor(coins / 100.0)
|
||||||
AudioManager.play_sfx("1_up", get_viewport().get_camera_2d().get_screen_center_position())
|
AudioManager.play_sfx("1_up", get_viewport().get_camera_2d().get_screen_center_position())
|
||||||
|
coins = coins % 100
|
||||||
var time := 300
|
var time := 300
|
||||||
var lives := 3
|
var lives := 3
|
||||||
var world_num := 1
|
var world_num := 1
|
||||||
|
@@ -25,10 +25,10 @@ var current_device_brand := 0
|
|||||||
var input_event: InputEvent = null
|
var input_event: InputEvent = null
|
||||||
|
|
||||||
const button_id_translation := [
|
const button_id_translation := [
|
||||||
["A", "B", "~"],
|
["A", "B", "✕"],
|
||||||
["B", "A", "&"],
|
["B", "A", "○"],
|
||||||
["X", "Y", "%"],
|
["X", "Y", "□"],
|
||||||
["Y", "X", "{"],
|
["Y", "X", "△"],
|
||||||
["Select", "-", "Share"],
|
["Select", "-", "Share"],
|
||||||
"Home",
|
"Home",
|
||||||
["Start", "+", "Options"],
|
["Start", "+", "Options"],
|
||||||
|
Reference in New Issue
Block a user