diff --git a/src/dev-util/hardcoded_cards.gd b/src/dev-util/hardcoded_cards.gd index c8248af..ee73ddb 100644 --- a/src/dev-util/hardcoded_cards.gd +++ b/src/dev-util/hardcoded_cards.gd @@ -1,4 +1,4 @@ -class_name HardCards extends Node2D +class_name HardCards extends Control static var source_dicts: Array[Dictionary] = [ { @@ -14,13 +14,53 @@ static var source_dicts: Array[Dictionary] = [ { "c_comic_heroes": ["p_effort", "p_agent_q", []], "c_boy_stuff": ["p_pretending", "p_girls", []], - "c_teasing": ["p_stubborn", "p_good_intended", ["p_thomas_gifted"]] + "c_teasing": ["p_my_own_good", "p_good_intended", ["p_thomas_gifted"]] }, { "c_jui_jutsu": ["p_body", "p_girly", []], "c_void": ["p_wet", "p_stop", []], "c_hit": ["p_confidence", "p_vent", ["p_becoming_teacher"]] }, + { + "c_seen": ["p_understanding_self", "p_starting_change", []], + "c_autistic": ["p_always_afraid", "p_in_hindsight", []], + "c_support": ["p_pride", "p_not_mutual", []] + }, + { + "c_being_girl": ["p_other_way", "p_always_known", []], + "c_not_girl": ["p_xavier", "p_fuck_that", []], + "c_find_out": ["p_rad", "p_consequences", []] + }, + { + "c_lukas_fault": ["p_aaa", "p_bbb", []], + "c_ran_away": ["p_lovable", "p_my_trauma", []], + "c_difficult_teachers": ["p_nightmare_children", "p_failing_forward", []] + }, + { + "c_mom": ["p_good_intensions", "p_helplessness", []], + "c_no_eating": ["p_coping", "p_too_everythig", []], + "c_adoption": ["p_flawed_help", "p_bodily_needs", []] + }, + { + "c_mental_health": ["p_early_recognition", "p_unhelpful_lectures", []], + "c_adhd_life": ["p_upset_thoughts", "p_me_weird", []], + "c_auti_brother": ["p_cruel_kindness", "p_time_and_faith", []] + }, + { + "c_doing_right": ["p_getting_right", "p_self_lying", []], + "c_work_piling": ["p_push_myself", "p_improve_myself", []], + "c_best_version": ["p_kids_deserve", "p_whoami", []] + }, + { + "c_right_choice": ["p_not_belonging", "p_stubborn", []], + "c_creating_support": ["p_self_taught", "p_peer_review", []], + "c_peer_therapy": ["p_real_help", "p_great_therapy", []] + }, + { + "c_trauma_regrets": ["p_toxic_thoughts", "p_diganose_benefits", []], + "c_cravings": ["p_therapy_talk", "p_procastinate", []], + "c_ex_hurt": ["p_lessons_learned", "p_thought_spiral", []] + }, ] static var id_reference: Dictionary[StringName, StringName] = generate_id_reference(true, true) @@ -175,11 +215,17 @@ static func create_from_id(id:StringName) -> Area2D: push_error("Attempted to create Card or Sticky from non-existent ID!") return null -static func create_dev_board(parent: Node2D, rect: Rect2) -> void: +static func create_dev_board(parent: Control, rect: Rect2) -> void: + var scroll_container = ScrollContainer.new() + var panel = Panel.new() + + parent.add_child(scroll_container) + scroll_container.add_child(panel) + for x in range(source_dicts.size()): - var sub_parent = Node2D.new() - sub_parent.position = Vector2( rect.size.x/(source_dicts.size()+1) * (x+1) , 0) - parent.add_child(sub_parent, false, Node.INTERNAL_MODE_BACK) + var sub_parent = Panel.new() + sub_parent.position = Vector2( 128 + 256*x , 0) + panel.add_child(sub_parent, false, Node.INTERNAL_MODE_BACK) var y = 1 for card_name in source_dicts[x].keys(): var card:Card = create_from_id(card_id_reference[card_name]) @@ -194,7 +240,10 @@ static func create_dev_board(parent: Node2D, rect: Rect2) -> void: z += 1 y += 1 + + panel.custom_minimum_size.x = source_dicts.size() * 256 func _ready() -> void: create_dev_board(self, get_viewport().get_visible_rect()) + TranslationServer.set_locale("en") diff --git a/src/dev-util/hardcoded_cards.tscn b/src/dev-util/hardcoded_cards.tscn index a37b54e..3d53fb6 100644 --- a/src/dev-util/hardcoded_cards.tscn +++ b/src/dev-util/hardcoded_cards.tscn @@ -2,5 +2,10 @@ [ext_resource type="Script" uid="uid://dysgoaaesqjbg" path="res://dev-util/hardcoded_cards.gd" id="1_5kg6w"] -[node name="Node2D" type="Node2D"] +[node name="Node2D" type="PanelContainer"] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 script = ExtResource("1_5kg6w") diff --git a/src/internationalisation.csv b/src/internationalisation.csv index 90a558a..e251d7e 100644 --- a/src/internationalisation.csv +++ b/src/internationalisation.csv @@ -178,7 +178,7 @@ c_boy_stuff,"I like boy stuff, ","Ich mag Jungs Kram,",,, p_pretending,yet they think I'm just pretending.,aber die denken ich tu einfach nur so.,,, p_girls,and girls don't get that.,und Mädchen verstehen das einfach nicht!,,, c_teasing,"When my friend got teased, I lashed out to defend them","Ich verteidige mit vollem Elan Freund*innen, die geärgert werden",,, -p_stubborn,"I wouldn't have it any other way, even if it was for my own good.","das würde ich nicht aufgeben, selbst wenn es mir helfen würde.",,, +p_my_own_good,"I wouldn't have it any other way, even if it was for my own good.","das würde ich nicht aufgeben, selbst wenn es mir helfen würde.",,, p_good_intended,I will always stand up for the good intended!,"ich werde immer für Menschen einstehen, die das Richtige wollen!",,, c_jui_jutsu,"I stopped doing jiu-jitsu, ","Ich habe mit Jiu Jitsu aufgehört,",,, p_body,my body just didn't feel right.,mein Körper hat sich falsch anfefühlt.,,, @@ -367,3 +367,72 @@ Combine cards to order your thoughts.,Combine cards to order your thoughts.,"Kle There are three Mementos left to find.,Find all three Momentos to collect all thoughts.,"Finde all drei Erinnerungen, um alle Gedanken zu sammeln. ",,, You have collected half of the mementos.,Find two more Momentos to collect all cards.,"Finde zwei weitere Erinnerungen, um alle Karten zu sammeln.",,, Find the last Memento to complete the Board.,Find the last remaining Momento.,Finde die letzte Erinnerung. ,,, +c_seen,"I never felt seen, let alone understood",Ich habe mich nie gesehen gefühlt und erst recht nicht verstanden,,, +p_understanding_self,no wonder I had also trouble understanding myself.,"kein wunder, dass ich mich selbst nie gut verstanden habe.",,, +p_starting_change,and I am glad this is starting to change.,"und ich bin froh, dass sich das langsam bessert.",,, +c_autistic,Many traits my autistic brother has I also see in me,Ich sehe viele Eigenarten meines autistischen Bruders auch bei mir,,, +p_always_afraid,and I always was afraid of that.,ich habe mich deswegen immer komisch gefühlt.,,, +p_in_hindsight,in hindsight this should have been a sign.,retrospektiv gesehen war das ein Zeichen.,,, +c_support,My instinct is to try and support others,Ich rutsche immer in den Helfer-Modus,,, +p_pride,I take pride in that even though it is exhausting.,"ich bin stolz darauf, auch wenn es erschöpfend ist.",,, +p_not_mutual,and far too often that is not mutual.,das beruht viel zu oft nicht auf Gegenseitigkeit.,,, +c_being_girl,I never liked being a girl,Ich wollte nie ein Mädchen sein,,, +p_other_way,and I guess I just didn't see another way.,ich habe nur irgendwie keine Alternative gesehen.,,, +p_always_known,"I've always known that, but I never really thought about it.","ich habe das immer schon gewusst, ich hab nur nie darüber nachgedacht.",,, +c_not_girl,I don't have to be a girl,Ich muss kein Mädchen sein,,, +p_xavier,that is why my name now is Xavier.,deswegen ist mein Name “Xavier”.,,, +p_fuck_that,and fuck it! I can change that!,"scheiß drauf, ich kann das ändern!",,, +c_find_out,I sometimes like to fuck around and find out,Manchmal muss ich Grenzen austesten,,, +p_rad,this is so rad.,das ist einfach based.,,, +p_consequences,but I also have to accept the consequences then.,ich muss dann halt auch die Konsequenzen aushalten.,,, +c_ran_away,I lashed out and then ran away when my Deanah tried to help me,"Ich wurde richtig aggro und bin dann weg gerannt, als Diana mir helfen wollte.",,, +p_lovable,yet I am still lovable to them.,ich bin trotzdem liebenswürdig für sie.,,, +p_my_trauma,"that isn't me, but it is my trauma.","das war nicht ich, das war mein Trauma.",,, +c_difficult_teachers,School is difficult for teachers too,Schule ist auch für Lehrkräfte fies,,, +p_failing_forward,and there's value in failing forward.,"es ist viel Wert, in der richtigen Richtung zu Scheitern.",,, +p_nightmare_children,children can be nightmares at times.,Kinder können richtig grausam sein.,,, +c_mom,Mom always took care of everything at home,Mom hat sich früher einfach um alles gekümmert,,, +p_good_intensions,"that was well intended, but has now become a burden.","ds war damals gut gemeint, ist aber heute richtig belastend.",,, +p_helplessness,that was the perfect recipe for helplessness.,das ist das perfekte Rezept für erlernte Hilflosigkeit.,,, +c_no_eating,I couldn't bring myself to eat,Ich konnte mich nicht zum Essen bringen,,, +p_coping,and I don't know how people cope with that.,"und ich weiß nicht, wie Leute damit klar kommen.",,, +p_too_everythig,"it's just too loud, too peoply, too ... everything.","… es ist zu laut, zu leutig, zu … alles!",,, +c_adoption,"When Jules saw my struggle, she kind of adopted me",Julses konnte irgendwann nicht mehr zusehen und hat mich mehr oder wneiger adoptiert,,, +p_flawed_help,"it was along the wrong lines, but helpful nontheless.","das ging etwas in die falsche Richtung, war aber trotzdem hilfreich.",,, +p_bodily_needs,my body really needed that.,mein Körper hat das echt gebraucht!,,, +c_mental_health,I wish teachers knew more about mental health,"Es hätte so geholfen, wenn meine Lehrkräfte mehr von mentaler Gesundheit verstanden hätten",,, +p_early_recognition,recognising such things early makes a huge difference.,so Sachen früh erkennen macht einen riesen Unterschied.,,, +p_unhelpful_lectures,unfortunately the lectures I had really did not help me.,leider haben die Vorlesungen dazu mir gar nicht geholfen.,,, +c_adhd_life,I couldn't tell apart my life experience and ADHD,Ich kann mein Leben und ADHS nicht ganz auseinander halten.,,, +p_upset_thoughts,thinking of that makes me so upset.,Ich werde wütend wenn ich nur darüber nachdenke.,,, +p_me_weird,do others think I'm weird because of that?,halten mich andere deswegen für komisch?,,, +c_auti_brother,My autistic brother is one of the most kind and caring people that I know,"Mein autistischer Bruder ist einer der liebsten und fürsorglichsten Menschen, die ich kenne",,, +p_cruel_kindness,it's cruel that the kindest people often hurt the most.,Warum erleben die liebsten Menschen immer auch den größten Scheiß?,,, +p_time_and_faith,you just have to put in time and good faith to see it.,es braucht halt Zeit und Willen das zu sehen.,,, +c_doing_right,I think I am doing the right thing,Ich glaube ich tue das Richtige,,, +p_getting_right,so why can't I get it right like everybody else?,warum also krieg’ ich es nicht wie alle anderen auch gebacken?,,, +p_self_lying,but I could be lying to myself with that.,vielleicht lüge ich mich damit auch selbst an.,,, +c_work_piling,My work just keeps piling up,Meine Arbeit wird immer mehr und mehr,,, +p_push_myself,I must push myself trough that and then it will be better.,"ich muss mich einfach durchbeißen, dann wird das schon.",,, +p_improve_myself,"I can't change that, but I can improve myself.","daran kann ich ncihts ändern, aber ich kann besser werden.",,, +c_best_version,I must become the best version of myself,Ich muss die beste Version von mir selbst werden,,, +p_kids_deserve,the kids deserve seeing me be okay.,"die Kids verdienen, dass es mir gut geht.",,, +p_whoami,so why can't I be myself?,"Warum ist es so unmöglich, einfach nur ich selbst zu sein?",,, +c_right_choice,I don't know if uni was the right choice,"Ich weiß nicht, ob studieren das Richtige für mich war",,, +p_not_belonging,I don't think someone thought that I belonged there.,"ich glaube viele haben gedacht, dass ich da nicht hin gehörte.",,, +p_stubborn,I could not bring myself to do things that made no sense to me.,"Ich kann keine Dinge tun, die ich unsinnig finde.",,, +c_creating_support,I create the support for others that I would have needed myself,"Ich habe für andere die Unterstützung organisiert, die ich selbst gebraucht hätte.",,, +p_self_taught,this has thought me more than anything else had.,noch nie habe ich bei etwas so viel gelernt.,,, +p_peer_review,that is what got me diagnosed by peer review.,das hat mir eine Diagnose per “Peer Review” eingebracht.,,, +c_peer_therapy,My peers helped me more in understanding myself than my therapist,"Ich habe in meiner Studi-Gruppe mehr verstanden über mich, als in meiner Therapie.",,, +p_real_help,that still shouldn't be a substitute for professional help.,trotzdem ist das kein Ersatz für professionelle Hilfe.,,, +p_great_therapy,and that helped me get the most out of my therapy.,dadurch habe ich mehr aus meiner Therapie raus holen können.,,, +c_trauma_regrets,Sometimes I wish my trauma didn't happen to me,"Manchmal will ich, dass mein Trauma nie passiert wäre",,, +p_toxic_thoughts,and I now recognise that is a toxic thought.,Ich glaube das ist ein toxischer Gedanke.,,, +p_diganose_benefits,at least I now have an ADHD Diagnosis.,zumindest habe ich inzwischen eine ADHS Diagnose.,,, +c_cravings,I don't know what to do about my intimate cravings,"Ich weiß nicht, was ich mit meinen intimen Bedürfnissen anfangen soll.",,, +p_therapy_talk,If only I could talk to my therapist about that.,Wenn ich nur mit meinem Therapeuten darüber reden könne.,,, +p_procastinate,but I can accept its there and figure it out later.,ich kann das jetzt akzeptieren und später klären.,,, +c_ex_hurt,I sometimes want to make my Ex feel how much they hurt me,"Manchmal will ich meinen Ex spüren lassen, wie sehr er mir weh getan hat.",,, +p_lessons_learned,on a calm mind I just hope they learned their lesson.,"eigentlich hoffe ich, dass der gleiche Fehler nicht nochmal passiert.",,, +p_thought_spiral,"whenever I focus on that, my thoughts spiral down.",darüber nachdenken bringt mich in ein schwarzes Loch.,,, diff --git a/src/internationalisation.de.translation b/src/internationalisation.de.translation index 8dd5e9d..58a4b60 100644 Binary files a/src/internationalisation.de.translation and b/src/internationalisation.de.translation differ diff --git a/src/internationalisation.en.translation b/src/internationalisation.en.translation index f3bf43a..3208a60 100644 Binary files a/src/internationalisation.en.translation and b/src/internationalisation.en.translation differ diff --git a/src/internationalisation.es.translation b/src/internationalisation.es.translation index 33edda9..1ae34c5 100644 Binary files a/src/internationalisation.es.translation and b/src/internationalisation.es.translation differ diff --git a/src/internationalisation.ja.translation b/src/internationalisation.ja.translation index da5c275..9862bcc 100644 Binary files a/src/internationalisation.ja.translation and b/src/internationalisation.ja.translation differ diff --git a/src/internationalisation.notes.translation b/src/internationalisation.notes.translation index 8c0446e..51f7692 100644 Binary files a/src/internationalisation.notes.translation and b/src/internationalisation.notes.translation differ diff --git a/src/logic-scenes/collectable/new_collectable_ui.gd b/src/logic-scenes/collectable/new_collectable_ui.gd index b4eab66..ff3bd1e 100644 --- a/src/logic-scenes/collectable/new_collectable_ui.gd +++ b/src/logic-scenes/collectable/new_collectable_ui.gd @@ -50,17 +50,30 @@ class_name CollectableUi extends CenterContainer if title_override == "": title_label.text = TranslationServer.translate("Sports Clothes") if subtitle_override == "": cn_label.text = TranslationServer.translate("[b]CN:[/b] Body Issues (Gender-Dysphoria), non-consensual Sex, Dissociation, Self-sabotaging Thoughts, Swearing") Scenes.id.TRANSITION: - if title_override == "": title_label.text = "Starlight" + if title_override == "": title_label.text = TranslationServer.translate("Move on") if subtitle_override == "": cn_label.text = "" - Scenes.id.YOUTH_DRAEVEN: - if title_override == "": title_label.text = "Starlight" + Scenes.id.ADULT_DND: + if title_override == "": title_label.text = TranslationServer.translate("colorful Dice") if subtitle_override == "": cn_label.text = "" - Scenes.id.YOUTH_DRAEVEN: - if title_override == "": title_label.text = "Starlight" + Scenes.id.ADULD_VOLUNTARY: + if title_override == "": title_label.text = TranslationServer.translate("Paintings") if subtitle_override == "": cn_label.text = "" - Scenes.id.YOUTH_DRAEVEN: - if title_override == "": title_label.text = "Starlight" + Scenes.id.ADULD_CHRISTMAS: + if title_override == "": title_label.text = TranslationServer.translate("Chat Messages") if subtitle_override == "": cn_label.text = "" + Scenes.id.ADULT_EATING: + if title_override == "": title_label.text = TranslationServer.translate("Dishes") + if subtitle_override == "": cn_label.text = "" + Scenes.id.ADULT_UNI: + if title_override == "": title_label.text = TranslationServer.translate("Science Poster") + if subtitle_override == "": cn_label.text = "" + Scenes.id.ADULT_THERAOY: + if title_override == "": title_label.text = TranslationServer.translate("Doctors Note") + if subtitle_override == "": cn_label.text = "" + Scenes.id.ADULT_BURNOUT: + if title_override == "": title_label.text = TranslationServer.translate("Paperwork") + if subtitle_override == "": cn_label.text = "" + if not Engine.is_editor_hint(): is_collected = Scenes.is_sequence_repeating(scene) @export var is_collected: bool = false: diff --git a/src/singletons/scene_reference.gd b/src/singletons/scene_reference.gd index 9bd8ae7..018234f 100644 --- a/src/singletons/scene_reference.gd +++ b/src/singletons/scene_reference.gd @@ -14,7 +14,11 @@ enum id { TRANSITION, ADULT_DND, ADULD_VOLUNTARY, - ADULD_CHRISTMAS + ADULD_CHRISTMAS, + ADULT_EATING, + ADULT_UNI, + ADULT_THERAOY, + ADULT_BURNOUT } signal scene_starting(scene_id: id, is_repeating: bool)