diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_2023_0716A/Screens/MenuScreen.tscn b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_2023_0716A/Screens/MenuScreen.tscn index 427e0c9..27a2b00 100644 --- a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_2023_0716A/Screens/MenuScreen.tscn +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_2023_0716A/Screens/MenuScreen.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://UserInterface/But_ChangeScene.tscn" type="PackedScene" id=1] +[ext_resource path="res://userInterface/But_ChangeScene.tscn" type="PackedScene" id=1] [ext_resource path="res://Screens/MenuScreen.gd" type="Script" id=2] [ext_resource path="res://assets/liberation_serif_40pt.tres" type="DynamicFont" id=3] -[ext_resource path="res://UserInterface/Title.tscn" type="PackedScene" id=5] +[ext_resource path="res://userInterface/Title.tscn" type="PackedScene" id=5] [ext_resource path="res://assets/ui_controlNode_dark_theme.tres" type="Theme" id=6] -[ext_resource path="res://UserInterface/But_Quit.tscn" type="PackedScene" id=10] +[ext_resource path="res://userInterface/But_Quit.tscn" type="PackedScene" id=10] [node name="MenuScreen" type="Control"] anchor_right = 1.0 diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_2023_0716A/project.godot b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_2023_0716A/project.godot index c5ead22..86a8577 100644 --- a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_2023_0716A/project.godot +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_2023_0716A/project.godot @@ -27,7 +27,7 @@ _global_script_classes=[ { "base": "PanelContainer", "class": "Locale", "language": "GDScript", -"path": "res://UserInterface/Locale.gd" +"path": "res://userInterface/Locale.gd" }, { "base": "Node", "class": "PlayerSettingsTemplate", diff --git a/Phase2/Godot_Toolset/Main/.import/.gdignore b/Phase2/Godot_Toolset/Main/.import/.gdignore new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Phase2/Godot_Toolset/Main/.import/.gdignore @@ -0,0 +1 @@ + diff --git a/Phase2/Godot_Toolset/Main/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 b/Phase2/Godot_Toolset/Main/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 new file mode 100644 index 0000000..5328bc7 --- /dev/null +++ b/Phase2/Godot_Toolset/Main/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 @@ -0,0 +1,3 @@ +source_md5="47313fa4c47a9963fddd764e1ec6e4a8" +dest_md5="26ea799ea0a3da9e753b3ebe822e0570" + diff --git a/Phase2/Godot_Toolset/Main/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex b/Phase2/Godot_Toolset/Main/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex new file mode 100644 index 0000000..71f6913 Binary files /dev/null and b/Phase2/Godot_Toolset/Main/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex differ diff --git a/Phase2/Godot_Toolset/Main/default_env.tres b/Phase2/Godot_Toolset/Main/default_env.tres new file mode 100644 index 0000000..20207a4 --- /dev/null +++ b/Phase2/Godot_Toolset/Main/default_env.tres @@ -0,0 +1,7 @@ +[gd_resource type="Environment" load_steps=2 format=2] + +[sub_resource type="ProceduralSky" id=1] + +[resource] +background_mode = 2 +background_sky = SubResource( 1 ) diff --git a/Phase2/Godot_Toolset/Main/icon.png b/Phase2/Godot_Toolset/Main/icon.png new file mode 100644 index 0000000..c98fbb6 Binary files /dev/null and b/Phase2/Godot_Toolset/Main/icon.png differ diff --git a/Phase2/Godot_Toolset/Main/icon.png.import b/Phase2/Godot_Toolset/Main/icon.png.import new file mode 100644 index 0000000..a4c02e6 --- /dev/null +++ b/Phase2/Godot_Toolset/Main/icon.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://icon.png" +dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.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=true +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/Phase2/Godot_Toolset/Main/project.godot b/Phase2/Godot_Toolset/Main/project.godot new file mode 100644 index 0000000..9118a34 --- /dev/null +++ b/Phase2/Godot_Toolset/Main/project.godot @@ -0,0 +1,29 @@ +; Engine configuration file. +; It's best edited using the editor UI and not directly, +; since the parameters that go here are not all obvious. +; +; Format: +; [section] ; section goes between [] +; param=value ; assign values to parameters + +config_version=4 + +[application] + +config/name="bcirpg_toolset" +config/icon="res://icon.png" + +[gui] + +common/drop_mouse_on_gui_input_disabled=true + +[physics] + +common/enable_pause_aware_picking=true + +[rendering] + +quality/driver/driver_name="GLES2" +vram_compression/import_etc=true +vram_compression/import_etc2=false +environment/default_environment="res://default_env.tres" diff --git a/Phase2/Networking/Client/Lobby/Lobby.gd b/Phase2/Networking/Client/Lobby/Lobby.gd index aa032a3..1d3a5ed 100644 --- a/Phase2/Networking/Client/Lobby/Lobby.gd +++ b/Phase2/Networking/Client/Lobby/Lobby.gd @@ -10,6 +10,7 @@ onready var waiting_room = $WaitingRoom onready var ready_btn = $WaitingRoom/CenterContainer/VBoxContainer/ReadyButton + func _ready(): player_name.text = Save.save_data["player_name"] selected_IP.text = Server.DEFAULT_IP diff --git a/Phase2/Networking/Client/Lobby/Lobby.tscn b/Phase2/Networking/Client/Lobby/Lobby.tscn index ab5c758..7f4e02d 100644 --- a/Phase2/Networking/Client/Lobby/Lobby.tscn +++ b/Phase2/Networking/Client/Lobby/Lobby.tscn @@ -83,7 +83,6 @@ margin_bottom = 186.0 text = "Join Session" [node name="WaitingRoom" parent="." instance=ExtResource( 2 )] -visible = false [connection signal="text_changed" from="CenterContainer/VBoxContainer/GridContainer/NameLineEdit" to="." method="_on_NameLineEdit_text_changed"] [connection signal="pressed" from="CenterContainer/VBoxContainer/JoinButton" to="." method="_on_JoinButton_pressed"] diff --git a/Phase2/Networking/Client/Lobby/WatingRoom.tscn b/Phase2/Networking/Client/Lobby/WatingRoom.tscn index cbac84f..460037e 100644 --- a/Phase2/Networking/Client/Lobby/WatingRoom.tscn +++ b/Phase2/Networking/Client/Lobby/WatingRoom.tscn @@ -1,7 +1,6 @@ [gd_scene format=2] [node name="WatingRoom" type="Popup" groups=["WaitingRoom"]] -visible = true anchor_right = 1.0 anchor_bottom = 1.0 @@ -16,9 +15,9 @@ anchor_bottom = 1.0 [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"] margin_left = 412.0 -margin_top = 194.0 +margin_top = 270.0 margin_right = 612.0 -margin_bottom = 406.0 +margin_bottom = 329.0 [node name="Label" type="Label" parent="CenterContainer/VBoxContainer"] margin_right = 200.0 diff --git a/Phase2/Networking/Client/Save/Save.gd b/Phase2/Networking/Client/Save/Save.gd index 399cb93..b7bdc50 100644 --- a/Phase2/Networking/Client/Save/Save.gd +++ b/Phase2/Networking/Client/Save/Save.gd @@ -1,22 +1,20 @@ extends Node -const save_file = "user://save_file.json" +const SAVEGAME = "user://Savegame.json" var save_data = {} - -# Called when the node enters the scene tree for the first time. func _ready(): save_data = get_data() - + func get_data(): var file = File.new() - if not file.file_exists(save_file): - save_data = {"player_name": "Unnamed"} + if not file.file_exists(SAVEGAME): + save_data = {"Player_name": "Unnamed"} save_game() - file.open(save_file, File.READ) + file.open(SAVEGAME, File.READ) var content = file.get_as_text() var data = parse_json(content) save_data = data @@ -25,5 +23,6 @@ func get_data(): func save_game(): var save_game = File.new() - save_game.open(save_file, File.WRITE) + save_game.open(SAVEGAME, File.WRITE) save_game.store_line(to_json(save_data)) +