Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
psychowolf960 committed May 4, 2024
1 parent c84c229 commit 3fced40
Show file tree
Hide file tree
Showing 12 changed files with 285 additions and 112 deletions.
4 changes: 2 additions & 2 deletions .godot/editor/editor_layout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dock_filesystem_split=0
dock_filesystem_display_mode=0
dock_filesystem_file_sort=0
dock_filesystem_file_list_display_mode=1
dock_filesystem_selected_paths=PackedStringArray("res://scripts/")
dock_filesystem_selected_paths=PackedStringArray()
dock_filesystem_uncollapsed_paths=PackedStringArray("Favorites", "res://", "res://scripts/", "res://scenes/", "res://assets/", "res://assets/sprites/", "res://assets/fonts/")
dock_3="Scene,Import"
dock_4="FileSystem"
Expand All @@ -36,7 +36,7 @@ selected_bottom_panel_item=0

[ScriptEditor]

open_scripts=["res://scripts/gamemanager.gd", "res://scripts/mainmenu.gd", "res://scenes/MarginContainer2.gd", "res://scripts/player.gd"]
open_scripts=["res://scripts/gamemanager.gd", "res://scripts/mainmenu.gd", "res://scripts/player.gd"]
selected_script="res://scripts/mainmenu.gd"
open_help=["Vector2"]
script_split_offset=70
Expand Down
11 changes: 5 additions & 6 deletions .godot/editor/filesystem_cache8
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
ea4bc82a6ad023ab7ee23ee620429895
::res://::1714724197
::res://::1714802314
default_bus_layout.tres::AudioBusLayout::6154612993266235982::1714267924::0::1::::<><>::
icon.svg::CompressedTexture2D::6469127827471254761::1714267924::1714564333::1::::<><>::
mainmenu.gd::GDScript::-1::1714682533::0::1::::<>Control<>::
::res://assets/::1714563698
::res://assets/fonts/::1714665769
PixelOperator8-Bold.ttf::FontFile::6936941770277928638::1714267924::1714564333::1::::<><>::
Expand All @@ -26,13 +25,12 @@ slime_green.png::CompressedTexture2D::3222140907498469096::1714267924::171456433
slime_purple.png::CompressedTexture2D::3959724587980025257::1714267924::1714564334::1::::<><>::
tileset_mk_16_16_nature_tileset_godot.png::CompressedTexture2D::3099737582622070004::1614636818::1714663521::1::::<><>::
world_tileset.png::CompressedTexture2D::263196027477670198::1714267924::1714564333::1::::<><>::
::res://scenes/::1714725469
::res://scenes/::1714804888
coin.tscn::PackedScene::1086827868758606395::1714649078::0::1::::<><>::uid://bped01tsjeycn::::res://assets/sprites/coin.png<>res://scripts/coin.gd<>uid://hxv3svfwkg67::::res://assets/sounds/coin.wav
game.tscn::PackedScene::6221769105244979977::1714663662::0::1::::<><>::uid://dqnaqj8yb6hwd::::res://scenes/player.tscn<>res://scripts/gamemanager.gd<>uid://c53kogtyjwsss::::res://assets/fonts/PixelOperator8-Bold.ttf<>uid://d0q2g65ahgok::::res://assets/sprites/world_tileset.png<>uid://bgv5v2fxqlswe::::res://scenes/platform.tscn<>uid://pqp5qaw561fr::::res://scenes/coin.tscn<>uid://bkfshwhwsgkwq::::res://assets/sprites/tileset_mk_16_16_nature_tileset_godot.png<>res://scenes/killzone.tscn<>uid://duj85jkd1ay6m::::res://scenes/slime.tscn<>uid://dbjl1e6kdxpl6::::res://assets/fonts/PixelOperator8.ttf
killzone.tscn::PackedScene::-1::1714267924::0::1::::<><>::
level1.tscn::PackedScene::708535710287922101::1714664557::0::1::::<><>::res://scripts/gamemanager.gd<>uid://dbjl1e6kdxpl6::::res://assets/fonts/PixelOperator8.ttf<>uid://d0q2g65ahgok::::res://assets/sprites/world_tileset.png<>uid://pqp5qaw561fr::::res://scenes/coin.tscn<>uid://bkfshwhwsgkwq::::res://assets/sprites/tileset_mk_16_16_nature_tileset_godot.png<>uid://dqnaqj8yb6hwd::::res://scenes/player.tscn<>res://scenes/killzone.tscn<>uid://bgv5v2fxqlswe::::res://scenes/platform.tscn<>uid://duj85jkd1ay6m::::res://scenes/slime.tscn
mainmenu.tscn::PackedScene::5060128894474056495::1714725502::0::1::::<><>::res://mainmenu.gd<>uid://dbjl1e6kdxpl6::::res://assets/fonts/PixelOperator8.ttf<>res://scenes/MarginContainer2.gd<>uid://cyfxuch6qa87f::::res://icon.svg
MarginContainer2.gd::GDScript::-1::1714675192::0::1::::<>MarginContainer<>::
mainmenu.tscn::PackedScene::5060128894474056495::1714804888::0::1::::<><>::res://scripts/mainmenu.gd<>uid://dbjl1e6kdxpl6::::res://assets/fonts/PixelOperator8.ttf<>uid://cyfxuch6qa87f::::res://icon.svg
music.tscn::PackedScene::789652015453189431::1714569304::0::1::::<><>::uid://m73dm4jhs3eq::::res://assets/music/time_for_adventure.mp3
optionsmenu.gd::GDScript::-1::1714577650::0::1::::<>Control<>::
optionsmenu.tscn::PackedScene::7285262778080745610::1714649078::0::1::::<><>::res://scenes/optionsmenu.gd<>uid://dbjl1e6kdxpl6::::res://assets/fonts/PixelOperator8.ttf
Expand All @@ -41,9 +39,10 @@ player.tscn::PackedScene::8309149557574787539::1714663662::0::1::::<><>::res://s
slime.tscn::PackedScene::8583676046534204298::1714649078::0::1::::<><>::uid://bl53gpvg5mh1y::::res://assets/sprites/slime_green.png<>res://scripts/slime.gd<>res://scenes/killzone.tscn
tileset_mk_16_16_nature_tileset_godot.png::CompressedTexture2D::8234780569853670918::1714663446::1714663446::1::::<><>::
tileset_mk_16_16_nature_tileset_godot.tres::TileSet::-1::1714663455::0::1::::<><>::res://scenes/tileset_mk_16_16_nature_tileset_godot.png
::res://scripts/::1714725497
::res://scripts/::1714804889
coin.gd::GDScript::-1::1714662653::0::1::::<>Area2D<>::
gamemanager.gd::GDScript::-1::1714662341::0::1::::<>Node<>::
killzone.gd::GDScript::-1::1714267924::0::1::::<>Area2D<>::
mainmenu.gd::GDScript::-1::1714804889::0::1::::<>Control<>::
player.gd::GDScript::-1::1714660830::0::1::::<>CharacterBody2D<>::
slime.gd::GDScript::-1::1714567004::0::1::::<>Node2D<>::
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,4 @@ Anim={
"zfar": 4000.01,
"znear": 0.05
}
selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17095/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@61/@VBoxContainer@62/@PanelContainer@109/MainScreen/@CanvasItemEditor@9461/@VSplitContainer@9280/@HSplitContainer@9282/@HSplitContainer@9284/@Control@9285/@SubViewportContainer@9286/@SubViewport@9287/mainmenu/MarginContainer2/HBoxContainer")])
selected_nodes=Array[NodePath]([])
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[folding]

node_unfolds=[NodePath("MarginContainer"), PackedStringArray("Layout", "Layout/Transform"), NodePath("MarginContainer/Panel"), PackedStringArray("Layout", "Layout/Container Sizing", "Layout/Transform", "Theme"), NodePath("MarginContainer/Panel/VBoxContainer"), PackedStringArray("Layout"), NodePath("MarginContainer2"), PackedStringArray("Layout", "Layout/Transform", "Localization"), NodePath("MarginContainer2/HBoxContainer"), PackedStringArray("Layout", "Localization", "Layout/Transform", "Layout/Container Sizing"), NodePath("MarginContainer2/HBoxContainer/World1"), PackedStringArray("Layout", "Layout/Transform", "Layout/Container Sizing", "Localization", "Focus"), NodePath("MarginContainer2/HBoxContainer/World1/Label2"), PackedStringArray("Layout", "Layout/Transform", "Theme Overrides", "Theme Overrides/fonts", "Theme Overrides/font_sizes", "Theme Overrides/styles", "theme_override_styles/normal"), NodePath("MarginContainer2/HBoxContainer/World1/Label1"), PackedStringArray("Theme", "Layout"), NodePath("MarginContainer2/HBoxContainer/World4"), PackedStringArray("Theme", "Visibility"), NodePath("MarginContainer2/HBoxContainer/World2"), PackedStringArray("Layout"), NodePath("MarginContainer2/Panel"), PackedStringArray("Layout", "Layout/Container Sizing", "Layout/Transform", "Theme", "Theme Overrides", "Theme Overrides/styles", "theme_override_styles/panel", "Localization")]
node_unfolds=[NodePath("MarginContainer"), PackedStringArray("Layout", "Layout/Transform"), NodePath("MarginContainer/Panel"), PackedStringArray("Layout", "Layout/Container Sizing", "Layout/Transform", "Theme"), NodePath("MarginContainer/Panel/VBoxContainer"), PackedStringArray("Layout"), NodePath("MarginContainer2"), PackedStringArray("Layout", "Layout/Transform", "Localization"), NodePath("MarginContainer2/HBoxContainer"), PackedStringArray("Layout", "Localization", "Layout/Transform", "Layout/Container Sizing"), NodePath("MarginContainer2/HBoxContainer/World1"), PackedStringArray("Layout", "Layout/Transform", "Layout/Container Sizing", "Localization", "Focus"), NodePath("MarginContainer2/HBoxContainer/World1/Label2"), PackedStringArray("Layout", "Layout/Transform", "Theme Overrides", "Theme Overrides/fonts", "Theme Overrides/font_sizes", "Theme Overrides/styles", "theme_override_styles/normal"), NodePath("MarginContainer2/HBoxContainer/World1/Label1"), PackedStringArray("Theme", "Layout"), NodePath("MarginContainer2/HBoxContainer/World2"), PackedStringArray("Layout"), NodePath("MarginContainer2/Panel"), PackedStringArray("Layout", "Layout/Container Sizing", "Layout/Transform", "Theme", "Theme Overrides", "Theme Overrides/styles", "theme_override_styles/panel", "Localization")]
resource_unfolds=["res://scenes/mainmenu.tscn::Theme_45hd1", PackedStringArray(), "res://scenes/mainmenu.tscn::StyleBoxFlat_2rwsq", PackedStringArray(), "res://scenes/mainmenu.tscn::StyleBoxFlat_8c08p", PackedStringArray("Border Width", "Expand Margins"), "res://scenes/mainmenu.tscn::StyleBoxFlat_llkcd", PackedStringArray("Border Width", "Expand Margins")]
nodes_folded=[]
2 changes: 1 addition & 1 deletion .godot/editor/project_metadata.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ run_reload_scripts=true
[recent_files]

scenes=["res://scenes/mainmenu.tscn", "res://scenes/level1.tscn", "res://scenes/player.tscn", "res://scenes/game.tscn", "res://scenes/optionsmenu.tscn", "res://scenes/slime.tscn", "res://scenes/coin.tscn", "res://mainmenu.tscn", "res://slime.tscn"]
scripts=["res://scripts/gamemanager.gd", "Vector2", "res://scenes/MarginContainer2.gd", "res://scripts/player.gd", "res://mainmenu.gd", "Node", "res://scripts/killzone.gd", "res://scenes/optionsmenu.gd", "res://slime.gd", "res://scripts/coin.gd"]
scripts=["Vector2", "res://scripts/gamemanager.gd", "res://scenes/MarginContainer2.gd", "res://scripts/player.gd", "res://mainmenu.gd", "Node", "res://scripts/killzone.gd", "res://scenes/optionsmenu.gd", "res://slime.gd", "res://scripts/coin.gd"]

[linked_properties]

Expand Down
20 changes: 3 additions & 17 deletions .godot/editor/script_editor_cache.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -90,30 +90,16 @@ state={
"syntax_highlighter": "GDScript"
}

[res://scenes/MarginContainer2.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 0,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 9,
"scroll_position": 0.0,
"selection": false,
"syntax_highlighter": "GDScript"
}

[res://scripts/mainmenu.gd]

state={
"bookmarks": PackedInt32Array(),
"breakpoints": PackedInt32Array(),
"column": 42,
"column": 14,
"folded_lines": Array[int]([]),
"h_scroll_position": 0,
"row": 66,
"scroll_position": 60.8,
"row": 27,
"scroll_position": 13.0,
"selection": false,
"syntax_highlighter": "GDScript"
}
11 changes: 0 additions & 11 deletions scenes/MarginContainer2.gd

This file was deleted.

250 changes: 250 additions & 0 deletions scenes/maiA922.tmp
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
[gd_scene load_steps=8 format=3 uid="uid://cedft3vy5hg68"]

[ext_resource type="Script" path="res://scripts/mainmenu.gd" id="1_qj2ne"]
[ext_resource type="FontFile" uid="uid://dbjl1e6kdxpl6" path="res://assets/fonts/PixelOperator8.ttf" id="2_h05dh"]
[ext_resource type="Texture2D" uid="uid://cyfxuch6qa87f" path="res://icon.svg" id="3_tlb1w"]

[sub_resource type="Theme" id="Theme_45hd1"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2rwsq"]
bg_color = Color(0.4, 0.627451, 0.796078, 1)
border_width_left = 2
border_width_top = 2
border_width_right = 2
border_width_bottom = 2
border_color = Color(0, 0, 0, 1)
border_blend = true
expand_margin_left = 10.0
expand_margin_top = 10.0
expand_margin_right = 10.0
expand_margin_bottom = 10.0
shadow_color = Color(1, 1, 1, 0.6)
shadow_size = 2
anti_aliasing = false

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8c08p"]
bg_color = Color(0.152941, 0.152941, 0.152941, 1)
expand_margin_left = 5.0
expand_margin_top = 5.0
expand_margin_right = 5.0
expand_margin_bottom = 5.0

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_llkcd"]
bg_color = Color(0.121569, 0.121569, 0.121569, 0.305882)
expand_margin_top = 10.0

[node name="mainmenu" type="Control"]
layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_qj2ne")

[node name="MarginContainer" type="MarginContainer" parent="."]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -107.0
offset_top = 76.0
offset_right = 107.0
offset_bottom = 179.0
grow_horizontal = 2
grow_vertical = 2

[node name="Panel" type="Panel" parent="MarginContainer"]
layout_mode = 2
theme = SubResource("Theme_45hd1")
theme_override_styles/panel = SubResource("StyleBoxFlat_2rwsq")

[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/Panel"]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -46.0
offset_top = -40.0
offset_right = 46.0
offset_bottom = 40.0
grow_horizontal = 2
grow_vertical = 2

[node name="Play" type="Button" parent="MarginContainer/Panel/VBoxContainer"]
layout_mode = 2
theme_override_fonts/font = ExtResource("2_h05dh")
text = "Play"

[node name="Options" type="Button" parent="MarginContainer/Panel/VBoxContainer"]
layout_mode = 2
theme_override_fonts/font = ExtResource("2_h05dh")
text = "Options"

[node name="Exit" type="Button" parent="MarginContainer/Panel/VBoxContainer"]
layout_mode = 2
theme_override_fonts/font = ExtResource("2_h05dh")
text = "Exit"

[node name="MarginContainer2" type="MarginContainer" parent="."]
layout_mode = 1
anchors_preset = 5
anchor_left = 0.5
anchor_right = 0.5
offset_left = -539.0
offset_top = 30.0
offset_right = -6.0
offset_bottom = 203.0
grow_horizontal = 2
scale = Vector2(2, 2)

[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer2"]
layout_mode = 2
size_flags_horizontal = 4

[node name="World1" type="Control" parent="MarginContainer2/HBoxContainer"]
y_sort_enabled = true
layout_mode = 2

[node name="Label2" type="Label" parent="MarginContainer2/HBoxContainer/World1"]
layout_mode = 1
anchors_preset = 5
anchor_left = 0.5
anchor_right = 0.5
offset_left = -30.0
offset_right = 30.0
offset_bottom = 23.0
grow_horizontal = 2
theme_override_fonts/font = ExtResource("2_h05dh")
theme_override_font_sizes/font_size = 24
theme_override_styles/normal = SubResource("StyleBoxFlat_8c08p")
text = "World 1"

[node name="Label1" type="TextureRect" parent="MarginContainer2/HBoxContainer/World1"]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -32.0
offset_top = -32.0
offset_right = 32.0
offset_bottom = 32.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("3_tlb1w")
expand_mode = 1
stretch_mode = 5

[node name="World4" type="Control" parent="MarginContainer2/HBoxContainer"]
layout_mode = 2

[node name="Level4" type="Label" parent="MarginContainer2/HBoxContainer/World4"]
layout_mode = 1
anchors_preset = 5
anchor_left = 0.5
anchor_right = 0.5
offset_left = -30.0
offset_right = 30.0
offset_bottom = 23.0
grow_horizontal = 2
theme_override_fonts/font = ExtResource("2_h05dh")
theme_override_font_sizes/font_size = 24
text = "World 4"

[node name="Level5" type="TextureRect" parent="MarginContainer2/HBoxContainer/World4"]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -32.0
offset_top = -32.0
offset_right = 32.0
offset_bottom = 32.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("3_tlb1w")
expand_mode = 1
stretch_mode = 5

[node name="World2" type="Control" parent="MarginContainer2/HBoxContainer"]
layout_mode = 2

[node name="Label" type="Label" parent="MarginContainer2/HBoxContainer/World2"]
layout_mode = 1
anchors_preset = 5
anchor_left = 0.5
anchor_right = 0.5
offset_left = -254.0
offset_right = -116.0
offset_bottom = 24.0
grow_horizontal = 2
theme_override_fonts/font = ExtResource("2_h05dh")
theme_override_font_sizes/font_size = 24
text = "World 2"

[node name="TextureRect" type="TextureRect" parent="MarginContainer2/HBoxContainer/World2"]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -217.0
offset_top = -32.0
offset_right = -153.0
offset_bottom = 32.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("3_tlb1w")
expand_mode = 1
stretch_mode = 5

[node name="World3" type="Control" parent="MarginContainer2/HBoxContainer"]
layout_mode = 2

[node name="Label" type="Label" parent="MarginContainer2/HBoxContainer/World3"]
layout_mode = 1
anchors_preset = 5
anchor_left = 0.5
anchor_right = 0.5
offset_left = 116.0
offset_right = 254.0
offset_bottom = 24.0
grow_horizontal = 2
theme_override_fonts/font = ExtResource("2_h05dh")
theme_override_font_sizes/font_size = 24
text = "World 3"

[node name="TextureRect" type="TextureRect" parent="MarginContainer2/HBoxContainer/World3"]
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = 153.0
offset_top = -32.0
offset_right = 217.0
offset_bottom = 32.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("3_tlb1w")
expand_mode = 1
stretch_mode = 5

[node name="Panel" type="Panel" parent="MarginContainer2"]
layout_mode = 2
size_flags_vertical = 0
theme_override_styles/panel = SubResource("StyleBoxFlat_llkcd")

[connection signal="pressed" from="MarginContainer/Panel/VBoxContainer/Play" to="." method="_on_play_pressed"]
[connection signal="pressed" from="MarginContainer/Panel/VBoxContainer/Options" to="." method="_on_options_pressed"]
[connection signal="pressed" from="MarginContainer/Panel/VBoxContainer/Exit" to="." method="_on_exit_pressed"]
Loading

0 comments on commit 3fced40

Please sign in to comment.