From ef3c27b371eaf11e68d9ec8a01c3d828052a0c03 Mon Sep 17 00:00:00 2001 From: PersonGuyGit Date: Sun, 6 Aug 2023 11:37:50 -0600 Subject: [PATCH] Created an empty project, for the team to work from; in regards to making the new toolset --- .../Screens/MenuScreen.tscn | 6 +-- .../project.godot | 2 +- Phase2/Godot_Toolset/Main/.import/.gdignore | 1 + ...n.png-487276ed1e3a0c39cad0279d744ee560.md5 | 3 ++ ....png-487276ed1e3a0c39cad0279d744ee560.stex | Bin 0 -> 1496 bytes Phase2/Godot_Toolset/Main/default_env.tres | 7 ++++ Phase2/Godot_Toolset/Main/icon.png | Bin 0 -> 3305 bytes Phase2/Godot_Toolset/Main/icon.png.import | 35 ++++++++++++++++++ Phase2/Godot_Toolset/Main/project.godot | 29 +++++++++++++++ Phase2/Networking/Client/Lobby/Lobby.gd | 1 + Phase2/Networking/Client/Lobby/Lobby.tscn | 1 - .../Networking/Client/Lobby/WatingRoom.tscn | 5 +-- Phase2/Networking/Client/Save/Save.gd | 15 ++++---- 13 files changed, 89 insertions(+), 16 deletions(-) create mode 100644 Phase2/Godot_Toolset/Main/.import/.gdignore create mode 100644 Phase2/Godot_Toolset/Main/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 create mode 100644 Phase2/Godot_Toolset/Main/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex create mode 100644 Phase2/Godot_Toolset/Main/default_env.tres create mode 100644 Phase2/Godot_Toolset/Main/icon.png create mode 100644 Phase2/Godot_Toolset/Main/icon.png.import create mode 100644 Phase2/Godot_Toolset/Main/project.godot 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 0000000000000000000000000000000000000000..71f69131f1bad5ac84f9f5fb77b8014d6f855868 GIT binary patch literal 1496 zcmV;}1t8#jQIRc$f~c)tQiw!~w%QUQ6exqX5cknk z0+d35DiDbTDuoE4>Lo>6B7>ey@m$S@5kjOuv{fWhh-@ho&(;2WkwS$K6`&Ldl|Us> zi4+J0k-+z7D#fx5bCy(4v8-W?7^7rF3d=UlIm}g3kr8v2*TVsYG0L(HsaUol6{$#J zzu%jyB(dI3x&O7SY0hEJfqi2jQf;@JF@lOwkr88**UM&PLd-R!kcy0;loU$Knm#_B zpssT<`uctM`T6EPm%A7K9*tSP|39fzMMT%Jh>GrWxv%zI|5WGxr!+(rs;IWI7+u$| ztA8kAM1hddg9IT6zY$?4T#831gq|cT869IJntT)|=01mwu*fe$Smy`ebi^HL+s-xg7chk284pq%~oy)o1W?`nc*zBC=zRt+_#M70<6PFG z6}tee5v>KVd&MI&-P+`h3e5&K^|-6M0EkEyjlf*9+`s@4^=sduefxeS9)KHW zxry#hT9*zlA+*bJIQpy4c0ZhsA-z^ z>#WBV&J`yU4D>m2?bqM)mFeH8@`b;@t{w3iXa*Wm8VHI_5p)5%2vTB$fYL+A6hukG z$!S`fHfaJP8lFT>jWhoL$`1ibnR*S{w;v;KO#Alr>y=RgAjwy$tV9ApAt(LXJMHJB z5CB9fl}q_biX|eNFsP!BlcI21)QL~UK@*6GVkMnytRt$6Bte>2l|jNPUTK0P)Fok~ z<8pRY5;Z~3$-3c)Ct*B>>n8U^6H%qzayG_@T0>t#DTYp>PAI07fWEaTdcB-^=q5<& z*tTB18j2DbF@k^@@+ev1QMg zL5#haz6F3%uU@HhjobH`e9qrvh%#pS={PAR-X0k%SWDWbr)+o y|M)fYRW9dto5g$WGgZ~$_?(~f&V283@;^HqstN$fY}?!b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c98fbb601c83c81ec8c22b1dba7d1d57c62b323c GIT binary patch literal 3305 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 literal 0 HcmV?d00001 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)) +