diff --git a/Godot/MainMenu/GodotUserInterface_Luke/Die.gd b/Godot/MainMenu/GodotUserInterface_Luke/Die.gd
index ba8acc3..a2e047a 100644
--- a/Godot/MainMenu/GodotUserInterface_Luke/Die.gd
+++ b/Godot/MainMenu/GodotUserInterface_Luke/Die.gd
@@ -6,42 +6,76 @@ class_name Die
# var b = "text"
enum DieCategory{
- D4,
- D6,
- D8,
- D10,
- D12,
- D00,
- D20
+ D4 = 4,
+ D6 = 6,
+ D8 = 8,
+ D10 = 10,
+ D12 = 12,
+ D00 = 00,
+ D20 = 20
}
-var dieType = DieCategory
-var numberOfFaces = 0
+var DieType = DieCategory
+var NumberOfFaces = 0
+
+
+func RollDie(InputDie):
+ #InputDie is supposed to be DieType for example.
+ var DieFaceResult = 0;
+ var LowestPossibleNumberOnDie = 0
+ var rng = RandomNumberGenerator.new()
+
+ var NoOfSides = NumberOfFaces
+
+ match NoOfSides:
+ 100:
+ LowestPossibleNumberOnDie = 0
+ #Will need to come up with a solution just for 00 Dice.
+
+ _:
+ LowestPossibleNumberOnDie = 1
+ DieFaceResult = rng.randi_range(LowestPossibleNumberOnDie, NumberOfFaces)
+
+ var DieSuccessPercentage = DieFaceResult/NumberOfFaces
+
+ print("DieFace:")
+ print(DieFaceResult)
+
func SetNumberOfSides():
- var DSides = dieType
-
+ var DSides = DieType
+# For 7 Die Set, testing purposes
+
+
+########################################
+# Need to Seed Random Number Generator #
+########################################
match DSides:
- D4:
- numberOfFaces = 4
- D6:
- numberOfFaces = 6
- D8:
- numberOfFaces = 8
- D10:
- numberOfFaces = 10
- D12:
- numberOfFaces = 12
- D00:
- numberOfFaces = 100
- D20:
- numberOfFaces = 20
+ 4:
+ NumberOfFaces = 4
+ 6:
+ NumberOfFaces = 6
+ 8:
+ NumberOfFaces = 8
+ 10:
+ NumberOfFaces = 10
+ 12:
+ NumberOfFaces = 12
+ 00:
+ NumberOfFaces = 100
+ 20:
+ NumberOfFaces = 20
+
+ print(NumberOfFaces)
# Called when the node enters the scene tree for the first time.
func _ready():
- pass # Replace with function body.
+ DieType = DieCategory.D20
+ SetNumberOfSides()
+ RollDie(NumberOfFaces)
+ # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
diff --git a/Godot/MainMenu/GodotUserInterface_Luke/GUI.tscn b/Godot/MainMenu/GodotUserInterface_Luke/GUI.tscn
index 6ff3a4c..f9a929f 100644
--- a/Godot/MainMenu/GodotUserInterface_Luke/GUI.tscn
+++ b/Godot/MainMenu/GodotUserInterface_Luke/GUI.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
[ext_resource path="res://Player_Settings_Button.gd" type="Script" id=1]
[ext_resource path="res://HostAndJoinGame.gd" type="Script" id=2]
[ext_resource path="res://Start Game.gd" type="Script" id=3]
[ext_resource path="res://GUI.gd" type="Script" id=4]
+[ext_resource path="res://Die.gd" type="Script" id=5]
[node name="GUI" type="MarginContainer"]
anchor_right = 1.0
@@ -37,33 +38,41 @@ custom_constants/separation = 30
alignment = 1
[node name="Start Game" type="Label" parent="HBoxContainer/VBoxContainer/MenuOptions"]
-margin_top = 147.0
+margin_top = 125.0
margin_right = 112.0
-margin_bottom = 161.0
+margin_bottom = 139.0
mouse_filter = 1
text = "Start Game"
script = ExtResource( 3 )
-[node name="Load Game" type="Label" parent="HBoxContainer/VBoxContainer/MenuOptions"]
-margin_top = 191.0
+[node name="DieTest" type="Label" parent="HBoxContainer/VBoxContainer/MenuOptions"]
+margin_top = 169.0
margin_right = 112.0
-margin_bottom = 205.0
+margin_bottom = 183.0
+mouse_filter = 1
+text = "Die Test"
+script = ExtResource( 5 )
+
+[node name="Load Game" type="Label" parent="HBoxContainer/VBoxContainer/MenuOptions"]
+margin_top = 213.0
+margin_right = 112.0
+margin_bottom = 227.0
mouse_filter = 1
text = "Load Game"
script = ExtResource( 3 )
[node name="HostAndJoinGame" type="Label" parent="HBoxContainer/VBoxContainer/MenuOptions"]
-margin_top = 235.0
+margin_top = 257.0
margin_right = 112.0
-margin_bottom = 249.0
+margin_bottom = 271.0
mouse_filter = 1
text = "Host / Join Game"
script = ExtResource( 2 )
[node name="Player Settings" type="Label" parent="HBoxContainer/VBoxContainer/MenuOptions"]
-margin_top = 279.0
+margin_top = 301.0
margin_right = 112.0
-margin_bottom = 293.0
+margin_bottom = 315.0
mouse_filter = 1
text = "Player Settings"
script = ExtResource( 1 )
@@ -83,6 +92,7 @@ margin_bottom = 227.0
text = "Test Menu"
[connection signal="gui_input" from="HBoxContainer/VBoxContainer/MenuOptions/Start Game" to="HBoxContainer/VBoxContainer/MenuOptions/Start Game" method="_on_Start_Game_gui_input"]
+[connection signal="gui_input" from="HBoxContainer/VBoxContainer/MenuOptions/DieTest" to="HBoxContainer/VBoxContainer/MenuOptions/DieTest" method="_on_Start_Game_gui_input"]
[connection signal="gui_input" from="HBoxContainer/VBoxContainer/MenuOptions/Load Game" to="HBoxContainer/VBoxContainer/MenuOptions/Load Game" method="_on_Start_Game_gui_input"]
[connection signal="gui_input" from="HBoxContainer/VBoxContainer/MenuOptions/HostAndJoinGame" to="HBoxContainer/VBoxContainer/MenuOptions/HostAndJoinGame" method="_on_HostAndJoinGame_gui_input"]
[connection signal="gui_input" from="HBoxContainer/VBoxContainer/MenuOptions/Player Settings" to="HBoxContainer/VBoxContainer/MenuOptions/Player Settings" method="_on_Player_Settings_gui_input"]
diff --git a/UML Diagrams/LoadAndSaveGame/ProjectIlmatar_SaveAndLoadGame_UML_2021.9.19.drawio b/UML Diagrams/LoadAndSaveGame/ProjectIlmatar_SaveAndLoadGame_UML_2021.9.19.drawio
index ba44dd4..2934fa3 100644
--- a/UML Diagrams/LoadAndSaveGame/ProjectIlmatar_SaveAndLoadGame_UML_2021.9.19.drawio
+++ b/UML Diagrams/LoadAndSaveGame/ProjectIlmatar_SaveAndLoadGame_UML_2021.9.19.drawio
@@ -1 +1 @@
-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
\ No newline at end of file
+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
\ No newline at end of file