refactor credits menu yet again

2 files changed, 47 insertions, 60 deletions

diff --git a/client/menu/credits.gd b/client/menu/credits.gd
index bcb6d394..188cd415 100644
--- a/client/menu/credits.gd
+++ b/client/menu/credits.gd
@@ -17,69 +17,56 @@
 #
 extends Menu
 
-const SPACER: String = "\n\n\n"
-
 var contributors := ["sofviic", "metamuffin", "nokoe", "tpart", "BigBrotherNii"]
-var cc_by_3 := {
-	"Game_over.wav": "deleted_user_877451"
-}
-var cc_by_4 := {
-	"Footstep sounds": "Dryoma",
-	"Page_Turn_24.wav": "Koops",
-	"Pencil, Writing, Close, A.wav": "InspectorJ",
-	"Super Dialogue Audio Pack": "Dillon Becker",
-	"Universal UI/Menu Soundpack": "Ellr",
-	"Woosh Fleuret Escrime B.wav": "toyoto",
-}
-var cc_by_0 := ["kenney.nl","Kay Lousberg","Quaternius"]
-var links := {
-	"Creative Commons: By Attribution\n3.0 License":"https://creativecommons.org/licenses/by/3.0",
-	"Creative Commons: By Attribution\n4.0 License":"https://creativecommons.org/licenses/by/4.0",
-	"Weblate":"https://translate.codeberg.org/projects/hurrycurry/",
-}
-var thx: String = "[b]"+tr("Thank You For Playing")+"[/b]"
+const cc_by_4 := "CC-BY 4.0"
+const cc_by_3 := "CC-BY 3.0"
+const cc0 := "CC0"
+var credits := [
+	[tr("Models"), [
+		["kenney.nl", "Various Models", cc0],
+		["Kay Lousberg", "Kitchen tiles", cc0],
+	]],
+	[tr("Sounds"), [
+		["Dryoma", "Footstep sounds", cc_by_4],
+		["Koops", "Page_Turn_24.wav", cc_by_4],
+		["InspectorJ", "Pencil, Writing, Close, A.wav", cc_by_4],
+		["Dillon Becker", "Super Dialogue Audio Pack", cc_by_4],
+		["Ellr", "Universal UI/Menu Soundpack", cc_by_4],
+		["toyoto", "Woosh Fleuret Escrime B.wav", cc_by_4],
+		["deleted_user_877451", "Game_over.wav", cc_by_3],
+		["Quaternius", "Someting, dont remember...", cc0],
+	]],
+]
 
-@onready var label = $MarginContainer/Panel/MarginContainer/VBoxContainer/RichTextLabel
+@onready var label = $OuterMargin/Panel/InnerMargin/Vert/CreditsText
 
 func _ready():
 	super()
 	contributors.shuffle()
-	var cont: String
-	cont += "\n".join(contributors)
-	var title_and_contribors: String = "[center][b]%s[/b]\n\n%s\n\n[b]%s[/b]\n" % [
+	
+	var text = "[center]"
+
+	text += "\n\n\n[b]%s[/b]\n\n%s\n\n[b]%s[/b]\n\n\n" % [
 		tr("Hurry Curry! - a game about cooking"),
 		tr("developed by"),
-		cont
+		"\n".join(contributors)
 	]
-	label.text += title_and_contribors + SPACER
-	
-	var cc_3 : String = "[b]"+tr("Licensed under Creative Commons: By Attribution 3.0 License")+"[/b]\n\n[table=3]"
-	for i in cc_by_3.keys():
-		cc_3 += "[cell]"+i+"[/cell][cell]"+tr("by")+"[/cell][cell]"+cc_by_3[i]+"[/cell]"
-	cc_3 += "[/table]"
-	label.text += cc_3 + SPACER
-	
-	var cc_4 : String = "[b]"+tr("Licensed under Creative Commons: By Attribution 4.0 License")+"[/b]\n\n[table=3]"
-	for i in cc_by_4.keys():
-		cc_4 += "[cell]"+i+"[/cell][cell]"+tr("by")+"[/cell][cell]"+cc_by_4[i]+"[/cell]"
-	cc_4 += "[/table]"
-	label.text += cc_4 + SPACER
-	
-	var cc_0: String = "[b]"+tr("Additional CC0 assets by")+"[/b]\n\n"
-	cc_0 += "\n".join(cc_by_0)
-	label.text += cc_0 + SPACER
-	
-	var special: String = "[b]"+tr("Support for Translations by")+"[/b]\n\nOur supporters on Weblate"
-	label.text += special + SPACER
-	
-	var info: String = "[b]"+tr("For further information on")+"[/b]\n\n[table=3]"
-	for i in links.keys():
-		info += "[cell]"+i+"[/cell][cell]"+tr("visit")+"[/cell][cell]"+links[i]+"[/cell]"
-	info += "[/table]"
-	label.text += info + SPACER
-	
+
+	for section in credits:
+		text += "[b]%s[/b]\n\n" % section[0]
+		text += "[table=3]"
+		for entry in section[1]:
+			print(entry)
+			text += "[cell][right]%s[/right][/cell]" % entry[0]
+			text += "[cell][left]%s[/left][/cell]" % entry[1]
+			text += "[cell][left]%s[/left][/cell]" % entry[2]
+		text += "[/table]\n\n\n"
+
+	text += "\n[b]%s[/b]\n\n\n" % tr("Thank You For Playing")
 	
-	label.text += SPACER + thx + SPACER + SPACER + SPACER
+	text += "[/center]"
+
+	label.text = text
 
 func _on_back_pressed():
 	exit()
diff --git a/client/menu/credits.tscn b/client/menu/credits.tscn
index 7b7b7ff0..9d7c4d28 100644
--- a/client/menu/credits.tscn
+++ b/client/menu/credits.tscn
@@ -15,7 +15,7 @@ theme = ExtResource("1_16kk6")
 script = ExtResource("2_alvab")
 support_anim = false
 
-[node name="MarginContainer" type="MarginContainer" parent="."]
+[node name="OuterMargin" type="MarginContainer" parent="."]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -23,11 +23,11 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="Panel" type="Panel" parent="MarginContainer"]
+[node name="Panel" type="Panel" parent="OuterMargin"]
 material = ExtResource("3_nwoiv")
 layout_mode = 2
 
-[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/Panel"]
+[node name="InnerMargin" type="MarginContainer" parent="OuterMargin/Panel"]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -39,10 +39,10 @@ theme_override_constants/margin_top = 50
 theme_override_constants/margin_right = 50
 theme_override_constants/margin_bottom = 50
 
-[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/Panel/MarginContainer"]
+[node name="Vert" type="VBoxContainer" parent="OuterMargin/Panel/InnerMargin"]
 layout_mode = 2
 
-[node name="RichTextLabel" type="RichTextLabel" parent="MarginContainer/Panel/MarginContainer/VBoxContainer"]
+[node name="CreditsText" type="RichTextLabel" parent="OuterMargin/Panel/InnerMargin/Vert"]
 layout_mode = 2
 size_flags_vertical = 3
 auto_translate = false
@@ -54,8 +54,8 @@ theme_override_font_sizes/bold_italics_font_size = 22
 theme_override_font_sizes/mono_font_size = 22
 bbcode_enabled = true
 
-[node name="back" type="Button" parent="MarginContainer/Panel/MarginContainer/VBoxContainer"]
+[node name="back" type="Button" parent="OuterMargin/Panel/InnerMargin/Vert"]
 layout_mode = 2
 text = "Back"
 
-[connection signal="pressed" from="MarginContainer/Panel/MarginContainer/VBoxContainer/back" to="." method="_on_back_pressed"]
+[connection signal="pressed" from="OuterMargin/Panel/InnerMargin/Vert/back" to="." method="_on_back_pressed"]