From d12474ae7ba8c9f8c5c2f5fa535529cddabe9e3e Mon Sep 17 00:00:00 2001 From: elliottHong Date: Sun, 6 Aug 2023 11:33:53 -0700 Subject: [PATCH] Working on basic UI for genre substitution --- .../.import/.gdignore | 1 + ...e.csv-f593f5b4d0df687ec2043eb45dbff294.md5 | 1 + .../testingCSVCharFile.csv.import | 13 ++++++ .../userInterface/But_History_Page.gd | 2 - .../Godot_Toolset/Main/genre_substitution.gd | 16 ++++++++ .../Main/genre_substitution.tscn | 40 +++++++++++++++++++ 6 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/.import/.gdignore create mode 100644 Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/.import/testingCSVCharFile.csv-f593f5b4d0df687ec2043eb45dbff294.md5 create mode 100644 Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv.import create mode 100644 Phase2/Godot_Toolset/Main/genre_substitution.gd create mode 100644 Phase2/Godot_Toolset/Main/genre_substitution.tscn diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/.import/.gdignore b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/.import/.gdignore new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/.import/.gdignore @@ -0,0 +1 @@ + diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/.import/testingCSVCharFile.csv-f593f5b4d0df687ec2043eb45dbff294.md5 b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/.import/testingCSVCharFile.csv-f593f5b4d0df687ec2043eb45dbff294.md5 new file mode 100644 index 0000000..a569579 --- /dev/null +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/.import/testingCSVCharFile.csv-f593f5b4d0df687ec2043eb45dbff294.md5 @@ -0,0 +1 @@ +source_md5="fe8dea03f3f241ec8c3f199dcd974cbe" diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv.import b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv.import new file mode 100644 index 0000000..18b90ee --- /dev/null +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/TestingFiles/UserData/characterFiles/testingCSVCharFile.csv.import @@ -0,0 +1,13 @@ +[remap] + +importer="csv_translation" +type="Translation" +valid=false + +[deps] + +source_file="res://TestingFiles/UserData/characterFiles/testingCSVCharFile.csv" +[params] + +compress=true +delimiter=0 diff --git a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/userInterface/But_History_Page.gd b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/userInterface/But_History_Page.gd index f63f1e3..66cafed 100644 --- a/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/userInterface/But_History_Page.gd +++ b/Phase2/Godot_GameCode/MergedDemo/Doug/bcirpg_mergedDemo_20220814A/userInterface/But_History_Page.gd @@ -17,5 +17,3 @@ func _on_But_History_Page_button_up(): current_page = 0 history_rows_node.remove_child(history_rows_node.get_child(0)) history_rows_node.add_child(game_history_array[current_page]) - - diff --git a/Phase2/Godot_Toolset/Main/genre_substitution.gd b/Phase2/Godot_Toolset/Main/genre_substitution.gd new file mode 100644 index 0000000..8513abe --- /dev/null +++ b/Phase2/Godot_Toolset/Main/genre_substitution.gd @@ -0,0 +1,16 @@ +extends PanelContainer + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass diff --git a/Phase2/Godot_Toolset/Main/genre_substitution.tscn b/Phase2/Godot_Toolset/Main/genre_substitution.tscn new file mode 100644 index 0000000..bb166cc --- /dev/null +++ b/Phase2/Godot_Toolset/Main/genre_substitution.tscn @@ -0,0 +1,40 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://genre_substitution.gd" type="Script" id=1] + +[sub_resource type="DynamicFont" id=1] + +[node name="PanelContainer" type="PanelContainer"] +margin_right = 1024.0 +margin_bottom = 600.0 +script = ExtResource( 1 ) + +[node name="VLayout" type="VBoxContainer" parent="."] +margin_left = 7.0 +margin_top = 7.0 +margin_right = 1017.0 +margin_bottom = 593.0 + +[node name="DescriptionHeader" type="VBoxContainer" parent="VLayout"] +margin_right = 1010.0 +margin_bottom = 50.0 +rect_min_size = Vector2( 0, 50 ) + +[node name="MH1" type="Panel" parent="VLayout/DescriptionHeader"] +margin_right = 1010.0 +margin_bottom = 50.0 +rect_min_size = Vector2( 250, 50 ) +rect_pivot_offset = Vector2( 250, -32 ) + +[node name="Label" type="Label" parent="VLayout/DescriptionHeader/MH1"] +anchor_left = 0.098 +anchor_top = 0.44 +anchor_right = 0.098 +anchor_bottom = 0.44 +margin_left = -14.98 +margin_top = -5.0 +margin_right = 12.02 +margin_bottom = 9.0 +rect_scale = Vector2( 4.85677, 1.04501 ) +custom_fonts/font = SubResource( 1 ) +text = "Default:"