From 37b06927ddef597f572cca04961c792f6ac4373a Mon Sep 17 00:00:00 2001 From: betalars Date: Fri, 16 May 2025 23:50:19 +0200 Subject: [PATCH] fix Board initialization errors that caused crashes and not displaying cards when loading a save due to StringName and naming errors --- src/dev-util/hardcoded_cards.gd | 24 +++---- src/dev-util/savegame.gd | 13 ++++ src/internationalisation.csv | 70 ++++++++++----------- src/internationalisation.de.translation | Bin 17821 -> 18829 bytes src/internationalisation.en.translation | Bin 16030 -> 16930 bytes src/internationalisation.es.translation | Bin 7509 -> 7965 bytes src/internationalisation.ja.translation | Bin 7509 -> 7965 bytes src/internationalisation.notes.translation | Bin 8040 -> 8492 bytes src/logic-scenes/board/card-board.gd | 63 ++++++++++--------- src/logic-scenes/board/card.gd | 4 +- src/logic-scenes/board/sticky-note.gd | 5 +- 11 files changed, 98 insertions(+), 81 deletions(-) diff --git a/src/dev-util/hardcoded_cards.gd b/src/dev-util/hardcoded_cards.gd index dce69bd..6bd19b1 100644 --- a/src/dev-util/hardcoded_cards.gd +++ b/src/dev-util/hardcoded_cards.gd @@ -2,24 +2,24 @@ class_name HardCards extends Node2D static var source_dicts: Array[Dictionary] = [ { - "out_of_world": ["unique", "few_friends", []], - "rejection": ["finding_friends", "laughed_at", []], - "confusion": ["inner_conflict", "outer_conflict", []] + "c_out_of_world": ["p_unique", "p_few_friends", []], + "c_rejection": ["p_finding_friends", "p_laughed_at", []], + "c_confusion": ["p_inner_conflict", "p_outer_conflict", []] }, { - "homework": ["good_grades", "upset_peers", []], - "teachers": ["volunteering", "becoming_teacher", []], - "joy": ["worried_mother", "thomas_gifted", []] + "c_homework": ["p_good_grades", "p_upset_peers", []], + "c_teachers": ["p_volunteering", "p_becoming_teacher", []], + "c_joy": ["p_worried_mother", "p_thomas_gifted", []] }, { - "comic_heroes": ["effort", "agent_q", []], - "boy_stuff": ["pretending", "girls", []], - "teasing": ["stubborn", "good_intended", ["thomas_gifted"]] + "c_comic_heroes": ["p_effort", "p_agent_q", []], + "c_boy_stuff": ["p_pretending", "girls", []], + "c_teasing": ["p_stubborn", "p_good_intended", ["p_thomas_gifted"]] }, { - "jui_jutsu": ["body", "girly", []], - "void": ["wet", "stop", []], - "hit": ["confidence", "vent", ["becoming_teacher"]] + "c_jui_jutsu": ["p_body", "p_girly", []], + "c_void": ["p_wet", "p_stop", []], + "c_hit": ["p_confidence", "p_vent", ["p_becoming_teacher"]] }, ] diff --git a/src/dev-util/savegame.gd b/src/dev-util/savegame.gd index 9ce2ea5..19ac7f1 100644 --- a/src/dev-util/savegame.gd +++ b/src/dev-util/savegame.gd @@ -93,6 +93,19 @@ func read_save_file(): if dict[key].begins_with("("): dict[key] = parse_vec_from_string(dict[key]) + var cards: Dictionary[StringName, Variant] + var stickies: Dictionary[StringName, Variant] + + for cardname:String in board_state["cards"]: + cards[StringName(cardname)] = board_state["cards"][cardname] + for sticky_name:String in board_state["stickies"]: + stickies[StringName(sticky_name)] = board_state["stickies"][sticky_name] + + board_state = { + "cards": cards, + "stickies": stickies + } + is_valid = are_types_valid \ and current_room >= 0 \ and current_room < State.rooms.keys().size() \ diff --git a/src/internationalisation.csv b/src/internationalisation.csv index e5d0713..cd6f505 100644 --- a/src/internationalisation.csv +++ b/src/internationalisation.csv @@ -162,43 +162,43 @@ Exploring social service year.,Exploring social service year.,Während des FSJ., Transitioning to university.,Transitioning to university.,Übergang zur Universität.,,, Exploring dorm room.,Exploring dorm room.,Während des Studiums.,,, Ending,Ending,Ende,,, -homework,"I never put in much effort for homework, ","Ich habe mir nie Mühe bei Hausaufgaben gegeben, ",,, -good_grades,but at least I get good grades.,aber zumindest waren meine Noten gut.,,, -upset_peers,my peers were upset about that.,meine Klasse war deswegen sauer.,,, -teachers,"I like my teachers more than my classmates, ","Ich komm mit meinen Lehrern besser klar, als mit meiner Klasse, ",,, -volunteering,doing voluntary social service at my school would be great.,vielleicht sollte ich ein FSJ vor dem Studium machen.,,, -becoming_teacher,Maybe I want to become a teacher.,vielleicht sollte ich Lehrerin werden.,,, -joy,"I can put ages into things I enjoy, ","Ich versinke in Dingen, die mir Freude machen,",,, -worried_mother,my mother would be worried about that.,meiner Mutter macht das Sorgen.,,, -thomas_gifted,Mr. Thomas thinks that makes me gifted.,Herr Thomas denkt das macht mich begabt.,,, -comic_heroes,"Comic heroes are my role models, ","Comic Helden sind meine Vorbilder,",,, -effort,"when I put in the effort, I can make the world a better place!","wenn ich mich nur anstrenge, kann ich die Welt verbessern!",,, -agent_q,and I want to be like Agent Q!,"Ich will so sein, wie Agent Q!",,, -boy_stuff,"I like boy stuff, ","Ich mag Jungs Kram,",,, -pretending,yet they think I'm just pretending.,aber die denken ich tu einfach nur so.,,, -girls,and girls don't get that.,und Mädchen verstehen das einfach nicht!,,, -teasing,"When Jojo got bullied for trying, I pretty much exploded","Ich bin ausgerastet, weil Jojo für ihre Mühe gemobbt wurde,",,, -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.",,, -good_intended,I will always stand up for the good intended!,"ich werde immer für Menschen einstehen, die das Richtige wollen!",,, -jui_jutsu,"I stopped doing jiu-jitsu, ","Ich habe mit Jiu Jitsu aufgehört,",,, -body,my body just didn't feel right.,mein Körper hat sich falsch anfefühlt.,,, -girly,I just hate being treated like a girl.,ich hasse es wie ein Mädchen behandelt zu werden.,,, -hit,"I know how to properly hit people, ","Ich weiß, wie man ordentlich zuschlägt, ",,, -confidence,that gives me a lot of confidence.,das gibt mir viel Selbstvertrauen.,,, -vent,and that's a great vent.,ich kann da gut Frust ablassen.,,, +c_homework,"I never put in much effort for homework, ","Ich habe mir nie Mühe bei Hausaufgaben gegeben, ",,, +p_good_grades,but at least I get good grades.,aber zumindest waren meine Noten gut.,,, +p_upset_peers,my peers were upset about that.,meine Klasse war deswegen sauer.,,, +c_teachers,"I like my teachers more than my classmates, ","Ich komm mit meinen Lehrern besser klar, als mit meiner Klasse, ",,, +p_volunteering,doing voluntary social service at my school would be great.,vielleicht sollte ich ein FSJ vor dem Studium machen.,,, +p_becoming_teacher,Maybe I want to become a teacher.,vielleicht sollte ich Lehrerin werden.,,, +c_joy,"I can put ages into things I enjoy, ","Ich versinke in Dingen, die mir Freude machen,",,, +p_worried_mother,my mother would be worried about that.,meiner Mutter macht das Sorgen.,,, +p_thomas_gifted,Mr. Thomas thinks that makes me gifted.,Herr Thomas denkt das macht mich begabt.,,, +c_comic_heroes,"Comic heroes are my role models, ","Comic Helden sind meine Vorbilder,",,, +p_effort,"when I put in the effort, I can make the world a better place!","wenn ich mich nur anstrenge, kann ich die Welt verbessern!",,, +p_agent_q,and I want to be like Agent Q!,"Ich will so sein, wie Agent Q!",,, +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 Jojo got bullied for trying, I pretty much exploded","Ich bin ausgerastet, weil Jojo für ihre Mühe gemobbt wurde,",,, +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_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.,,, +p_girly,I just hate being treated like a girl.,ich hasse es wie ein Mädchen behandelt zu werden.,,, +c_hit,"I know how to properly hit people, ","Ich weiß, wie man ordentlich zuschlägt, ",,, +p_confidence,that gives me a lot of confidence.,das gibt mir viel Selbstvertrauen.,,, +p_vent,and that's a great vent.,ich kann da gut Frust ablassen.,,, "Lukas did not ask for consent, he didn't explain a thing, I didn’t even move! Yet he dared to assume, that ","Lukas did not ask for consent, he didn't explain a thing, I didn’t even move! Yet he dared to assume, that ","Lukas hat mich nicht gefragt, er hat nichts erklärt und trotzdem wagte er es zu glauben:",,,It is very crucial that this sentence and the next line form a complete sentence -wet,"I was wet, so I must have been into it?","Ich war feucht, also hab ich es wohl gewollt?",,,This line on itself should seem like a intrusive thought on it’s own without the contect above. +p_wet,"I was wet, so I must have been into it?","Ich war feucht, also hab ich es wohl gewollt?",,,This line on itself should seem like a intrusive thought on it’s own without the contect above. "Lukas jumped me, he didn't even explain a thing or ask consent. I was confused and paralised, so ","Lukas jumped me, he didn't even explain a thing or ask consent. I was confused and paralised, so ","Lukas hat mich überrumpelt, er hat nichts erklärt oder überhaupt gefragt, was ich wollte. Ich war im Moment nicht mehr ich selbst und",,,It is very crucial that this sentence and the next line form a complete sentence -stop,I didn’t say stop.,Ich habe nicht Stopp gesagt.,,,This line on itself should seem like a intrusive thought on it’s own without the contect above. -out_of_world,I feel like I am not from of this world,Ich fühl mich wie von einer anderen Welt,,, -unique,I like being unique like that,ich mag es so besonders zu sein.,,, -few_friends,I am thankful for the few friends that get me,"gut, dass ich ein paar Freunde habe, die das verstehen.",,, -rejection,I fear being rejected,"Ich habe Angst, ausgeschlossen zu werden",,, -finding_friends,that makes it hard to find friends,darum fällt mir Freunde finden schwer.,,, -laughed_at,I'm afraid I will just get laughed at,"was, wenn ich deswegen ausgelacht werde?",,, -confusion,I am just too many things at once,Ich bin zu viel gleichzeitig.,,, -inner_conflict,it is just so overwhealming for me,das ist einfach überfordernd für mich.,,, -outer_conflict,this is just too much for others,das ist einfach überfordernd für andere.,,, +p_stop,I didn’t say stop.,Ich habe nicht Stopp gesagt.,,,This line on itself should seem like a intrusive thought on it’s own without the contect above. +c_out_of_world,I feel like I am not from of this world,Ich fühl mich wie von einer anderen Welt,,, +p_unique,I like being unique like that,ich mag es so besonders zu sein.,,, +p_few_friends,I am thankful for the few friends that get me,"gut, dass ich ein paar Freunde habe, die das verstehen.",,, +c_rejection,I fear being rejected,"Ich habe Angst, ausgeschlossen zu werden",,, +p_finding_friends,that makes it hard to find friends,darum fällt mir Freunde finden schwer.,,, +p_laughed_at,I'm afraid I will just get laughed at,"was, wenn ich deswegen ausgelacht werde?",,, +c_confusion,I am just too many things at once,Ich bin zu viel gleichzeitig.,,, +p_inner_conflict,it is just so overwhealming for me,das ist einfach überfordernd für mich.,,, +p_outer_conflict,this is just too much for others,das ist einfach überfordernd für andere.,,, "[p]Oh, my old mask. I have so many good memories about theatre club. ","[p]Oh, my old mask. I have so many good memories about theatre club.","[p]Nahw, meine gute alte Maske. Ich habe so schöne Erinnerungen an die Theater-AG. ",,, "I would stand on my bed for entire afternoons, weeks on end, practicing my lines. Pretending to be on the big stage ... ","I would stand on my bed for entire afternoons, weeks on end, practicing my lines. Pretending to be on the big stage ... ","Ich hab den ganzen Nachmittag geübt, wochenlang. Mein Bett eine große Bühne. ",,, "my mom would get mad at me, when she had to call me three or four times for dinner. ","my mom would get mad at me, when she had to call me three or four times for dinner. [/p]","Es gab so oft Zoff, weil mich meine Mutter immer wieder zum Essen rufen musste.[/p]",,, diff --git a/src/internationalisation.de.translation b/src/internationalisation.de.translation index 2de3407733e952af60f4c6e04bddcc66eca01ab8..0a21d23c02eaf420781f1dd80c7769e0791bcf14 100644 GIT binary patch delta 7583 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 biPVs&5{4d)gn6whmL8z4?_6e9=7|3SXn{#G delta 6681 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 Vv%gka+_gZM_~Q>*dPe&2{|8l(ft3IN diff --git a/src/internationalisation.en.translation b/src/internationalisation.en.translation index 4212744311365c227a1712c0f1e32f10fb1d1391..ba1c044393c8e867c9aedb0f7b5b6c184307994f 100644 GIT binary patch delta 7744 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 literal 7509 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 literal 7509 zcmd^^d05Wd7RO&{(C|`dR8bNVG9?u#YF&p5<$q?qr(6Gz0WB%d?pZb1#rw@N(u02rpv!JX-UTc!@6PAnJZ3zusL|Bbe_d3503 z%uARCfrdlGFdq+^2(cStKVun8PlIMdTwos8kP}}3c@ac8V^vI_Gp%Kcb5R=^{{$*h z`0L|FnK2De9SB1RQ^v3dswLyYK^<5=jp;1Vc`RSZ)Sqb(Q|z;x_!yGocsyf?oH3zh zE8!`SrxA}m4l{O=jGcx267fRqHSk4@-D6t8^eI!Jt{U8j1hHa^VFK#|2d*z9-}c5N3o8fqW$MwxA9W(;z$< z!(I!(FJdeNG^WFNJoAa5J6WE>G!67H%QHbQuw2fx0JH?+DMT$}xNalyt&l6iYkm8D zfoekNKo~NHb4)vUfm<>LBI*M%91`K_E5!bupG2!!j!e+>>`{Y-cR|?ha!mUii4;~PY^_Pv`I!x#AgQ-7;3GcsH2T!5)+_>(+ z(EWs8PthvOC4RNGnNKb8IKOL9SluAPai39VHTPB#zISm%)(hgX?qiOQY69UGa|?Iw zA|BUKRx5ouhQoVaZOJ;v;U!y^w(a3?X>M}FQVw@hDoju1@E+G&5C6#FgI}E4Abg&{ z{h@k~DnE0L!<{{ylVybC{a*^}9Su**fAx`<>wEPf9{ZY)Zk*kZ!!IW!M_Y0D1(!ef z&fxIainTM}akxov`HWD)@o~`-)j3Ot@ZZnaxQ-&;T)$?Z@OcmSiE94XO?b)t3xAcE zC=TcF=ATs!e&F!5kDHse5{~EQY^7fyd^pGTVh&9?xRQ9}{RhnTjpA@c$0H55Ib84c z2a{~AB3+O?c4AR@i<>a5|#3t!)n~6nx4f9M`ime`aP*c%!QSgD~Q8y>#!g$03B{d`r8`z#fFBj#y`0N<7YAw5N8Y zKZiSXDGjYB9Q&5|^-D@7yvj|n@Bs1HH!*sTk{5^X$XuFlLOAx7E8KVN5b)OT41il-1dri#I|Q>t`>p z{yXuwkGY0rDl0hL#MWtu0f*1Evx~$vu!o>_pI3OCC-qpfu)6=BiwSpF6LIw{@z`VN z`p0PWM?BU!zED^)iEzWM1C4(p9_wCO zI{Y@0@Q7+d=kJNfefG9+%>9nT>-yE^_z;eL-DTl*PJ|c#(8b~<@mM#-Pri0G;Zyy- zJ0K?>>mFZGNE<+SqD_yd9>n85>nEkfWpnsyyPqnb5st4j7h04!@%}A>W8_TxX+_+WFrQOxNciT`r0Gq>W8L+r$bJ@t--=pw_&D)+9_Cg_ z8xC{0?fk%962h@>7q7F1W`wI2C8}2tkA1c79`$hHaHRxS_bD8HBz(Z5Lc(#q=~)hs zdJ(QRxS*ztcwFzD_PCtugya0+eckK42{&5lIAJaEShxMMvZFTPiYM-V&LSSy(X~x* z^CcYTtCVzd=}maJ^X;Zf#ADs)V>*qIgx^rGA}9{YZ24$>IH;Tm$I3(GiMc~|o%O~P@#gAL1dEeYS~v`)T{ zc&rm2m1qqmT;)}hM>_GiFS8qY%^Dm&PcMFKBH`HgiS@Cm+X){OYFK@Xcs&0RQI=D$ z5WXqtgnK3No?>s;_rzoWY;pEAUCMjb`p%=C<>v#{=7(^b diff --git a/src/internationalisation.notes.translation b/src/internationalisation.notes.translation index 851046231bee80b7db129ce57fca25b598968a84..6e199fc5d73d7a477ee71ef23b15f71a58e88046 100644 GIT binary patch literal 8492 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 L`;#8<|0Mnih7T{k literal 8040 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 Qb64bVbi%zbcleF{U#n9)8vp dropzone.get_child_count() - 1: current_dropzone_id = 0 - elif new_id < 0: current_dropzone_id = dropzone.get_child_count() - 1 - else: current_dropzone_id = new_id - if current_context == ASSIGN and not focus_stickies: - while not dropzone.get_child(current_dropzone_id) is Card: current_dropzone_id = (current_dropzone_id + 1) % dropzone.get_child_count() - dropzone.get_child(current_dropzone_id).preview_sticky_note(currently_active_node) + if is_node_ready(): + if new_id > dropzone.get_child_count() - 1: current_dropzone_id = 0 + elif new_id < 0: current_dropzone_id = dropzone.get_child_count() - 1 + else: current_dropzone_id = new_id + if current_context == ASSIGN and not focus_stickies: + while not dropzone.get_child(current_dropzone_id) is Card: current_dropzone_id = (current_dropzone_id + 1) % dropzone.get_child_count() + dropzone.get_child(current_dropzone_id).preview_sticky_note(currently_active_node) - elif not focus_stickies: - currently_active_node = dropzone.get_child(current_dropzone_id) + elif not focus_stickies: + currently_active_node = dropzone.get_child(current_dropzone_id) @onready var current_sticky_note_id: int = 0: set(new_id): - if sticky_note_container.get_child_count() <= 1: return - elif new_id > sticky_note_container.get_child_count() - 1: current_sticky_note_id = 0 - elif new_id < 0: current_sticky_note_id = sticky_note_container.get_child_count() - 1 - else: current_sticky_note_id = new_id - if current_context == ASSIGN: - _return_sticky_notes_to_panels() - currently_active_node.preview_sticky_note(sticky_note_container.get_child(current_sticky_note_id).attached_sticky_note) - else: - if sticky_note_container.get_child(current_sticky_note_id).get_child_count() == 1: - currently_active_node = sticky_note_container.get_child(current_sticky_note_id).get_child(0) + if is_node_ready(): + if sticky_note_container.get_child_count() <= 1: return + elif new_id > sticky_note_container.get_child_count() - 1: current_sticky_note_id = 0 + elif new_id < 0: current_sticky_note_id = sticky_note_container.get_child_count() - 1 + else: current_sticky_note_id = new_id + if current_context == ASSIGN: + _return_sticky_notes_to_panels() + currently_active_node.preview_sticky_note(sticky_note_container.get_child(current_sticky_note_id).attached_sticky_note) else: - for i in range(sticky_note_container.get_child_count() - 1): - if sticky_note_container.get_child(i).get_child_count() == 1: - currently_active_node = sticky_note_container.get_child(i).get_child(0) + if sticky_note_container.get_child(current_sticky_note_id).get_child_count() == 1: + currently_active_node = sticky_note_container.get_child(current_sticky_note_id).get_child(0) + else: + for i in range(sticky_note_container.get_child_count() - 1): + if sticky_note_container.get_child(i).get_child_count() == 1: + currently_active_node = sticky_note_container.get_child(i).get_child(0) var last_save_dict: Dictionary var text_recovery: Dictionary @@ -125,10 +128,10 @@ func _ready(): dropzone_size = get_viewport_rect().size - Vector2(dropzone_padding + size_reference.minimum_size.x, dropzone_padding) if get_parent() == get_tree().root: - populate_board(["void", 'joy', "wet", "effort"]) - populate_board(["jui_jutsu", 'hit', "girly", "vent"]) - populate_board(["comic_heroes", 'teasing', "agent_q", "good_intended"]) - populate_board(["out_of_world", 'confusion', "outer_conflict", "unique"]) + populate_board(["c_void", 'c_joy', "p_wet", "p_effort"]) + populate_board(["c_jui_jutsu", 'c_hit', "p_girly", "p_vent"]) + populate_board(["c_comic_heroes", 'c_teasing', "p_agent_q", "p_good_intended"]) + populate_board(["c_out_of_world", 'c_confusion', "p_outer_conflict", "p_unique"]) mementos_collected = 2 has_stage = has_stage @@ -466,20 +469,20 @@ func initialise_from_save(savegame: SaveGame): rebuild_from_savedict(savegame.board_state) func rebuild_from_savedict(board_state:Dictionary): - var cards: Dictionary = board_state["cards"] - var stickies: Dictionary = board_state["stickies"] + var cards: Dictionary[StringName, Variant] = board_state["cards"] + var stickies: Dictionary[StringName, Variant] = board_state["stickies"] var card_pile = HardCards.get_cards_by_name_array(cards.keys() + (stickies.keys())) for card:Card in card_pile["cards"]: - add_card(card) - card.transform.origin = cards[card.name] # Replacing position reference with card reference! Needed in next loop. + add_card(card, false) + card.transform.origin = cards[card.name]# Replacing position reference with card reference! Needed in next loop. cards[card.name] = card text_recovery[card.name] = card.text for sticky:StickyNote in card_pile["sticky_notes"]: text_recovery[sticky.name] = sticky.text if stickies[sticky.name] == -1: - add_sticky_note(sticky) + add_sticky_note(sticky, false) elif stickies[sticky.name] is String: cards[stickies[sticky.name]].attach_sticky_note(sticky) else: diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index 85e4389..d573458 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -75,10 +75,10 @@ var is_mouse_entered: bool = false var mouse_offset: Vector2 func _init(card_name: String = "card", own_id:StringName = "-1") -> void: - if card_name != "void": + if card_name != "c_void": text = card_name card_id = own_id - name = "c_%s" % card_name + name = card_name func _ready(): diff --git a/src/logic-scenes/board/sticky-note.gd b/src/logic-scenes/board/sticky-note.gd index 0f12fc2..b39c6e4 100644 --- a/src/logic-scenes/board/sticky-note.gd +++ b/src/logic-scenes/board/sticky-note.gd @@ -74,10 +74,11 @@ var mouse_diff: Vector2 @export_range(1.0, 10.0) var bounce_speed: float = 8 var on_board: bool = false -func _init(sticky_name: String = "card", card_id: StringName = "-1", own_id:StringName = "-1") -> void: +func _init(sticky_name: String = "sticky_note", card_id: StringName = "-1") -> void: + name = sticky_name text = sticky_name parent_id = card_id - sticky_id = own_id + sticky_id = StringName( "%s.%s" % [parent_id, sticky_name] ) func _ready() -> void: if get_child_count() == 0: