From 3de41e6fc8d5ad62ea8a72a2dc9de307df3da3a1 Mon Sep 17 00:00:00 2001 From: betalars Date: Mon, 28 Apr 2025 15:46:50 +0200 Subject: [PATCH] celanup --- .../youth_room/scnees/jui_jutsu.tscn | 6 ++++-- src/dev-util/hardcoded_cards.gd | 2 +- src/internationalisation.csv | 6 +++--- src/internationalisation.de.translation | Bin 17641 -> 17649 bytes src/internationalisation.en.translation | Bin 15946 -> 15954 bytes src/internationalisation.es.translation | Bin 7493 -> 7501 bytes src/internationalisation.ja.translation | Bin 7493 -> 7501 bytes src/internationalisation.notes.translation | Bin 8024 -> 8032 bytes src/logic-scenes/board/card-board.gd | 3 +++ src/logic-scenes/board/card.gd | 7 +++---- src/logic-scenes/card_picker/card_picker.gd | 2 +- src/main.gd | 2 +- src/main.tscn | 2 +- 13 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/base-environments/youth_room/scnees/jui_jutsu.tscn b/src/base-environments/youth_room/scnees/jui_jutsu.tscn index 319d509..e13ba5e 100644 --- a/src/base-environments/youth_room/scnees/jui_jutsu.tscn +++ b/src/base-environments/youth_room/scnees/jui_jutsu.tscn @@ -712,7 +712,7 @@ offset_right = -424.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_aby4n") -story_array = Array[String](["Why do i still have this junk lying around? it's not like I want to do ju jutsu ever again. I just fucked it.", "I mean I did enjoy it while it lasted. Being able to properly hit people was great. ", "It gave me the confidence to intimidate students, that were begging to get folded and - as I only once actually got to do that - it also was a great vent for anger. ", "I mean my tits just about killed me during warmup and the changing room really didn't need mirrors - thank you I know my hips are fat and disgusting - but at least there was Lukas.", "He was such a huge nerd. He studied math in his third semester and could talk for hours about his passion.", "He was such a huge nerd. He studied math in his third semester and could talk for hours about his passion.", "She was always so worried.", "Also: my math grades pretty much leaped for my final year in high shool thanks to him.", "He also helped me so much with jui jitsu, as he properly floored me when I slipped up. ", "Also - unlike everyone else - he understood that I didn't want people to mind my chest. ", "So Fighting for wins with him was actually rewarding even tho more often than not I ended up having to tap out.", "We also had my first proper kiss. I thought I loved him. But now?", "He was weird that evening. Even more huggy and hyperactive than usual. ", "We were under my bed, reading my secret comic stash when I got tired of the floor and told him we should go upstairs.", "We had a play fight on my mattress. I’ve never seen him fight like this. ", "His fingers Curled across my Skin without grabbing me, like he would normally do. And he let me win", "… with this smirk on his face.", "I rolled over exhausted when suddently he sat on top of me, a pearl of sweat dropped from his nose on my throat.", "He started undoing his shirt.", "Do you have condoms?", "Yes, of course everybody has Why did he ask that?", "I saw my body lying on the bed, getting undressed. I was drifting away, towards the stars.", "My body didn't move. It didn't say a word when the butterflies tried to escape from it's stomach as he kissed it.", "I … observed him from afar. He … didn't seem to notice, that I had left.", "That I didn't return to kiss him good bye. That I didn't hug him when he went home.", "My hands knocked on my brother’s door. He let me lie on his carpet.", "I slowly returned.", "\"How did it go?, Fabian asked.", "\"It was moist”, I said.", "“That usually helps.”", "He laughed awkwardly. I just wanted to also laugh, but curled into a ball and cried.", "It took him a while to say something. “I … you … it's fine Lisa. I know it hurts the first time.” ", "He gently stroked the back I was curling towards him.", "That was good. He was a sweet angel. Why must he be so bad at comforting?"]) +story_array = Array[String](["Why do i still have this junk lying around? It’s not like I want to do ju jutsu ever again. I just fucked it.", "I mean I did enjoy it while it lasted. Being able to properly hit people was great. ", "It gave me the confidence to intimidate students, that were begging to get folded and - as I only once actually got to do that - it also was a great vent for anger. ", "I mean my tits just about killed me during warmup and the changing room really didn't need mirrors - thank you I know my hips are fat and disgusting - but at least there was Lukas.", "He was such a huge nerd. He studied math in his third semester and could talk for hours about his passion.", "He was such a huge nerd. He studied math in his third semester and could talk for hours about his passion.", "She was always so worried.", "Also: my math grades pretty much leaped for my final year in high shool thanks to him.", "He also helped me so much with jui jitsu, as he properly floored me when I slipped up. ", "Also - unlike everyone else - he understood that I didn't want people to mind my chest. ", "So Fighting for wins with him was actually rewarding even tho more often than not I ended up having to tap out.", "We also had my first proper kiss. I thought I loved him. But now?", "He was weird that evening. Even more huggy and hyperactive than usual. ", "We were under my bed, reading my secret comic stash when I got tired of the floor and told him we should go upstairs.", "We had a play fight on my mattress. I’ve never seen him fight like this. ", "His fingers Curled across my Skin without grabbing me, like he would normally do. And he let me win", "… with this smirk on his face.", "I rolled over exhausted when suddently he sat on top of me, a pearl of sweat dropped from his nose on my throat.", "He started undoing his shirt.", "Do you have condoms?", "Yes, of course everybody has Why did he ask that?", "I saw my body lying on the bed, getting undressed. I was drifting away, towards the stars.", "My body didn't move. It didn't say a word when the butterflies tried to escape from it's stomach as he kissed it.", "I … observed him from afar. He … didn't seem to notice, that I had left.", "That I didn't return to kiss him good bye. That I didn't hug him when he went home.", "My hands knocked on my brother’s door. He let me lie on his carpet.", "I slowly returned.", "\"How did it go?, Fabian asked.", "\"It was moist”, I said.", "“That usually helps.”", "He laughed awkwardly. I just wanted to also laugh, but curled into a ball and cried.", "It took him a while to say something. “I … you … it's fine Lisa. I know it hurts the first time.” ", "He gently stroked the back I was curling towards him.", "That was good. He was a sweet angel. Why must he be so bad at comforting?"]) progress = 17.0 [node name="PanelContainer" type="PanelContainer" parent="."] @@ -769,10 +769,12 @@ custom_minimum_size = Vector2(800, 10) layout_mode = 2 size_flags_horizontal = 3 bbcode_enabled = true -text = "Why do i still have this junk lying around? it's not like I want to do ju jutsu ever again. I just fucked it.I mean I did enjoy it while it lasted. Being able to properly hit people was great. It gave me the confidence to intimidate students, that were begging to get folded and - as I only once actually got to do that - it also was a great vent for anger. I mean my tits just about killed me during warmup and the changing room really didn't need mirrors - thank you I know my hips are fat and disgusting - but at least there was Lukas.He was such a huge nerd. He studied math in his third semester and could talk for hours about his passion.He was such a huge nerd. He studied math in his third semester and could talk for hours about his passion.She was always so worried.Also: my math grades pretty much leaped for my final year in high shool thanks to him.He also helped me so much with jui jitsu, as he properly floored me when I slipped up. Also - unlike everyone else - he understood that I didn't want people to mind my chest. So Fighting for wins with him was actually rewarding even tho more often than not I ended up having to tap out.We also had my first proper kiss. I thought I loved him. But now?He was weird that evening. Even more huggy and hyperactive than usual. We were under my bed, reading my secret comic stash when I got tired of the floor and told him we should go upstairs.We had a play fight on my mattress. I’ve never seen him fight like this. His fingers Curled across my Skin without grabbing me, like he would normally do. And he let me win… with this smirk on his face.I rolled over exhausted when suddently he sat on top of me, a pearl of sweat dropped from his nose on my throat.He started undoing his shirt.Do you have condoms?Yes, of course everybody has Why did he ask that?I saw my body lying on the bed, getting undressed. I was drifting away, towards the stars.My body didn't move. It didn't say a word when the butterflies tried to escape from it's stomach as he kissed it.I … observed him from afar. He … didn't seem to notice, that I had left.That I didn't return to kiss him good bye. That I didn't hug him when he went home.My hands knocked on my brother’s door. He let me lie on his carpet.I slowly returned.\"How did it go?, Fabian asked.\"It was moist”, I said.“That usually helps.”He laughed awkwardly. I just wanted to also laugh, but curled into a ball and cried.It took him a while to say something. “I … you … it's fine Lisa. I know it hurts the first time.” He gently stroked the back I was curling towards him.That was good. He was a sweet angel. Why must he be so bad at comforting?" +text = "Why do i still have this junk lying around? It’s not like I want to do ju jutsu ever again. I just fucked it.I mean I did enjoy it while it lasted. Being able to properly hit people was great. It gave me the confidence to intimidate students, that were begging to get folded and - as I only once actually got to do that - it also was a great vent for anger. I mean my tits just about killed me during warmup and the changing room really didn't need mirrors - thank you I know my hips are fat and disgusting - but at least there was Lukas.He was such a huge nerd. He studied math in his third semester and could talk for hours about his passion.He was such a huge nerd. He studied math in his third semester and could talk for hours about his passion.She was always so worried.Also: my math grades pretty much leaped for my final year in high shool thanks to him.He also helped me so much with jui jitsu, as he properly floored me when I slipped up. Also - unlike everyone else - he understood that I didn't want people to mind my chest. So Fighting for wins with him was actually rewarding even tho more often than not I ended up having to tap out.We also had my first proper kiss. I thought I loved him. But now?He was weird that evening. Even more huggy and hyperactive than usual. We were under my bed, reading my secret comic stash when I got tired of the floor and told him we should go upstairs.We had a play fight on my mattress. I’ve never seen him fight like this. His fingers Curled across my Skin without grabbing me, like he would normally do. And he let me win… with this smirk on his face.I rolled over exhausted when suddently he sat on top of me, a pearl of sweat dropped from his nose on my throat.He started undoing his shirt.Do you have condoms?Yes, of course everybody has Why did he ask that?I saw my body lying on the bed, getting undressed. I was drifting away, towards the stars.My body didn't move. It didn't say a word when the butterflies tried to escape from it's stomach as he kissed it.I … observed him from afar. He … didn't seem to notice, that I had left.That I didn't return to kiss him good bye. That I didn't hug him when he went home.My hands knocked on my brother’s door. He let me lie on his carpet.I slowly returned.\"How did it go?, Fabian asked.\"It was moist”, I said.“That usually helps.”He laughed awkwardly. I just wanted to also laugh, but curled into a ball and cried.It took him a while to say something. “I … you … it's fine Lisa. I know it hurts the first time.” He gently stroked the back I was curling towards him.That was good. He was a sweet angel. Why must he be so bad at comforting?" fit_content = true scroll_active = false +visible_characters = 1603 visible_characters_behavior = 1 +visible_ratio = 0.607657 [node name="StartBottom" type="TextureRect" parent="PanelContainer/VBoxContainer"] custom_minimum_size = Vector2(0, 64) diff --git a/src/dev-util/hardcoded_cards.gd b/src/dev-util/hardcoded_cards.gd index bd2a0d4..dce69bd 100644 --- a/src/dev-util/hardcoded_cards.gd +++ b/src/dev-util/hardcoded_cards.gd @@ -2,7 +2,7 @@ class_name HardCards extends Node2D static var source_dicts: Array[Dictionary] = [ { - "out-of-world": ["unique", "few_friends", []], + "out_of_world": ["unique", "few_friends", []], "rejection": ["finding_friends", "laughed_at", []], "confusion": ["inner_conflict", "outer_conflict", []] }, diff --git a/src/internationalisation.csv b/src/internationalisation.csv index 96c5cc6..613adb8 100644 --- a/src/internationalisation.csv +++ b/src/internationalisation.csv @@ -179,7 +179,7 @@ vent,and that’s a great vent.,ich kann da gut Frust ablassen.,,, wet,"I was wet, so I must have been into it","Ich war feucht, also hab ichs 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,,, +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",,, @@ -242,9 +242,9 @@ We had a play fight on my mattress. I’ve never seen him fight like this. ,We h He started undoing his shirt.,He started undoing his shirt.[/p],Er hat sein Hemd auf gemacht.,,, Do you have condoms?,[p]”Do you have condoms?”[/p],Hast du Kondome?,,, "Yes, of course everybody has Why did he ask that?","[p]”Yes, of course everybody has Why did he ask that?”.[/p]","Natürlich, jeder hat Kondome, warum hat er das gefragt?",,, -"I saw my body lying on the bed, getting undressed. I was drifting away, towards the stars.","[p]I saw my body lying on the bed, getting undressed. I was drifting away, towards the stars.","Ich habe gesehen, wie mein Körper entkleidet wurde. Ich war schwerelos zwischen den Sternen.",,, +"I saw my body lying on the bed, getting undressed. I was drifting away, towards the stars.","[p]I saw my body lying on the bed, getting undressed. I was drifting away, towards the stars. ","Ich habe gesehen, wie mein Körper entkleidet wurde. Ich war schwerelos zwischen den Sternen.",,, My body didn’t move. It didn’t say a word when the butterflies tried to escape from it’s stomach as he kissed it.,My body didn’t move. It didn’t say a word when the butterflies tried to escape from it’s stomach as he kissed it.,"Mein Körper hat sich nicht bewegt. Mein Mund hat nichts gesagt, als die Schmetterlinge aus meinem Bauch ausbrechen wollten, weil der geküsst wurde.",,, -"I … observed him from afar. He … didn’t seem to notice, that I had left.","I … observed him from afar. He … didn’t seem to notice, that I had left. ","Ich habe Lukas von Weitem beobachtet. Ihm ist nicht aufgefallen, dass ich nicht mehr da war.",,, +"I … observed him from afar. He … didn't seem to notice, that I had left.","I … observed him from afar. He … didn’t seem to notice, that I had left. ","Ich habe Lukas von Weitem beobachtet. Ihm ist nicht aufgefallen, dass ich nicht mehr da war.",,, That I didn’t return to kiss him good bye. That I didn’t hug him when he went home.,That I didn’t return to kiss him good bye. That I didn’t hug him when he went home.[/p],Dass ich ihm keinen Abschiedskuss gegeben habe. Dass ich ihn an der Tür nicht umarmt habe.,,, My hands knocked on my brother’s door. He let me lie on his carpet.,[p]My hands knocked on my brother’s door. He let me lie on his carpet.[/p],Meine Hände Klopften an Fabis tür. Ich durfte auf seinem Teppich liegen.,,, I slowly returned.,[p]I slowly returned.[/p],Langsam bin ich zurück gekehrt.,,, diff --git a/src/internationalisation.de.translation b/src/internationalisation.de.translation index 3441f3191be5184981198350c71b1fdd939418f1..ad63c0172eea3760a4d3664a453ac2dd318361b3 100644 GIT binary patch delta 1214 zcmZXUK}b_^9LIm}?M)?@#$$$rtPqhH5i%l2#FCD+L+rGIq9lT(!@BGwJuwgkk#Zd* zM5H`PMD%u$pq)m<4&q@a53-Y3NK}M`NcR2heINUyfB5e6{eJ(yKkx0aw{J7nuNmvZ zXZzxwh#X=akhUe#0d+yz_mT;4z$#s{`%BA~<0V<^$R+qI%p>Ft@D{z!+=0IjjX?$W zMREe1f@Ya@Ue~;l7vbMP?}F~Z;YV(+krgsH8hn05x6Zx}Zqe_MI`xD854aDBEz$;+ zURrT42BSkR*hfD|4uO~HuaeivEU9O8<&2!Czh`t0>BqoAtM{6R^`qD-o81KR6uVh+ zo?IYxaLMqRSCChsHTD&YIh3$40N7d z3QR*8C=2BvoikS+-6-_r$X*e7oZTci9g&`6hv%??JL`=taB?Xq;@%32RkBQ0$SPQa z>d+?Cfb_Pu$?z6;jl4&HV01dy=Cr<64BmCblRl#ygulR?0@F|i%CZYDmP5|78wCr- zei440c@mtapCey^uj!W^PvkvAnfwG+p&C?Y7hZS^d6(U9@Gt#8(23%Y0g6N6e8|L+ zZU8w6MLY0Por8w_XYFqzR;1M5IqW~~Y}h9k%TJ^0-69F>CjCs;bE^lxD$%zv{b=L+ Y&RLNW_`Cj>?wd9ay6&)l+kKJx5Bu|Ed;kCd delta 1192 zcmZXUKWGzC9LL{XE?W90Eul(~q9v%5AR#!U4nZBnp^8+I(8W-pQ-|V^K{A*OQmAxL z4@w6q)rvSclm?1JTmni4>CmY|$zl*KA}S)KsP*%jZ^#iJeDCx9e&6qLmxJ8*Ip_17 zv--wO?ipkDS;lGd5bQ-!8*z zLA(zipohwK-mZl}UdF#@=iB?M3hQE}z1cj?^&Q=N^_y^8{-bCIzsUc9yXY_STx0x4 z&S0?{V}}OdQTbsp0aNm6F(Y0U?OD672J#L0i9nZ=pMulv{#5fc*E{Xinl( zY{IsS9Yagx=V)DhMXZW7(VpGFZ=pJBsQ(HNUc;^mJLra*ucS+~T?8LPr`4rk8fDNJ z8b@|6xUzJUXu4xBPcEn{!P$^G^55ZkHh8jF?}8?uG>gIFGZinzHL)UAVGV7fEmTML zu^M9Q5qARlr~F=^vvZ!;{#o7l0nZf8u|RnepHNQ0G|Hecb*-C?le6k3;Y?sZk1r^f z;H><-_!utAFL^~{UMZ}JuVEF{(5AZ9jkn1=>b}8W^1q=Q=0kv@s5Rf>P)8RhkDzcD zUz1^!EZ;l45^_90-ZR=)d)ugN^c!=WjYK)y^T91&kKA>_{L_q6uJ>PY8B9b+`_BAX RiF`U?%tbbCm2*-5>_0J~TbKX< diff --git a/src/internationalisation.en.translation b/src/internationalisation.en.translation index 178d83adc38a33f40928a4f7f648910375afd28c..2a99b5c0c027f5ff6a35c00a76389bb8ae7f8c22 100644 GIT binary patch delta 1218 zcmZXUPe_w-9LB%zpQ-4wm?pJEB8G@W4GA3~5*=*^*=cylFzFyc>oN!iuNjC3k#HR( zM4~)NNc0Yp4m<4-JA}j_@F1Q>ghWJ0h_s%s@AI-B_QJEz^E|)rkN3~^u3Gp~c(-L= zI~0)yj$_icMB1QENc#(9ADFO;N&8Cix#fC;taaoD{7vRt0L*T6mcZ=_EBp#KdXL1K%v*tpLg zFAA$8F|e1upG<6hMvO-o#o!zm!MRrl_Lv=3v3?9spG3PqLLuw~=?>YE5G{9~MOhIE% z8p=RAXC7H})6m0HYkA}XyLoWYk*@zXFFW|c;_a)PTi4j*Z7^<;~L;7Q*)43M6c}r3Fm@A(28f8EHRpucu1&u*zcHzk~$XRyNV9r?2!xxz6 z!A1II@&)*k{*~*AY%!F`k6;C=LN#{biT98X*!=?k(EkP92>uYDZYZ1&*>|c-AP+*3 zHoQ!ip``z)^^IdW#jcJKf3l-sSyTSk=zZ(VTIq455f!`?EVLkC@hU=~W0J$Y)+W-In delta 1216 zcmZXUF-RLx9LC?fTvTF=5+z8?AVEry5;DaOp@T>ZwzQ!X>68jONr?^_N)RrBWGETL zfH)M9T1p2g;(>I?6wroJTFB%ePQgKnh?FAI8o$^3j(gaHFTd~m-v4oz7jn(TuZugM zjO3LNqK!*PhaF%L3Ny#ZIGB*tlo7A4NYhHPR$K4E-)Ej6pMcNl)l3e47Ro~f_C<0T zd;_g8t9f;;X?YX=gO^{ncNq4_nz!ie#^(XLZ|s}k5&a3N27l6DfS1rUWE%LM5i4Lg zN74sI=!eNsFh!pxGvou(eU8Uken$U7>vHt7;GEZ6?*8_ISN`jY$R&1VvO=zsYH(fi zDsLdahxXXl$U4~|)$Dg;K!`&W$54w4XU@S~YIBCqIixO9?G3>XLU-7uz%-PBCZQ~( z=Jaa{-83|JYpsA>WLE;qKGFZ*=86wLSTwN4xwk4ttapqb$z8HW*1-nUgbtx&NIg=E zbRX|j%fINav`)>LruUTs@O`GRL{uwB;76HLU>eFmlkD7^Ws#@YO@n!Dy#QZiE`eqG z3b_id({GrT5Zes99L2x8T&!rc<%mU!ND&c{A|gdYC|Vp#h7y<5K~$umbcjnP@x(!-6``hs zh=^Dxky3gYq|i(eN{Zr;$w4xSNDwI^B2s<-+&l7NKY01Q_rCwfU5;G#qWjVBzs$}n zrPLkPEomA`RYUcV^o?XQ*lMKv&6f0rVL2VFW#lD%l=(IJ27F5|Gehtr&?J;(pCV_$ zd1#SY=4CBwc@2IO+VQ&4yC2-#C9|Y=)cgF6?tpy(Jf=S-W$K*%61;(wsZ7DXn`AAjDayN@S&u)=iCRa!q zT-UthE#z%zmwlGZk$F;P56!1a9ib>fC)~II%a7)Ug-luj?=jVo(mjEH2DP*61|v`( z6ocZB%;_tEZVdYHU@wI{&2A1{2&jht4liK?ch(qM;pDnkgqt93G0WmUdb2;R1oqnfm`4gLjlHyDBXpcp&1S?Wf?U zndiU-`X%xUxJtiaIZAzF$dEt59F&I&?EDKKBbV6y1+VG%Ox~HTTQyVnhG{ delta 1168 zcmZXUKWI}?9EI^9!E8^f#8Ym8N2~-0988THUoq|IZ5fLp#t>5iC;XUGo^S*P={axOl;k_T<9^ZKF zW)6)pM=ay`JOKw#LU~wB!BMAn#ZA@L9Iuj5ZI52UUsk>DeObH@ z7tsS{J8#!=D6iq42l@8VhQgNE2sZuGT;I^WQ{RTW@}ERI_(lFZJV1Yu=NeOc=nPe2 z7&|lw&&ZF6X_%GIiFxswXwTYpJ(O?CPldW^`B^v@^ymH4T<-+saaSf+)zzMO$tl~e z^bD<%pP?=F4Y4VHpt+vC61l9d3Kt^g^nZt!*x<>M1IwCx>=#3orz&2En_@$3!WL?y9khq+V|B#t zBkqUt5BbATXXiXGc&!+I&@&ZtHdLO&rqONCAG6>OpwYOCwsc$d7d?i>6m{~Nkdegr6iy7OHQ_jD=pD2n#+HyJ^h x`n{9u5yz{g`p2TJ?M`E{KH2}-t>1{>b?P5a6>s%WSy=!8 diff --git a/src/internationalisation.ja.translation b/src/internationalisation.ja.translation index 55a63e0dd5e162f61cb9384a344437730c0dc8c9..7ba0dd7bf02d7454ba2406d2659151d40d908375 100644 GIT binary patch delta 1196 zcmZXUF-RL>9L2x8T&!rc<%mU!ND&c{A|gdYC|Vp#h7y<5K~$umbcjnP@x(!-6``hs zh=^Dxky3gYq|i(eN{Zr;$w4xSNDwI^B2s<-+&l7NKY01Q_rCwfU5;G#qWjVBzs$}n zrPLkPEomA`RYUcV^o?XQ*lMKv&6f0rVL2VFW#lD%l=(IJ27F5|Gehtr&?J;(pCV_$ zd1#SY=4CBwc@2IO+VQ&4yC2-#C9|Y=)cgF6?tpy(Jf=S-W$K*%61;(wsZ7DXn`AAjDayN@S&u)=iCRa!q zT-UthE#z%zmwlGZk$F;P56!1a9ib>fC)~II%a7)Ug-luj?=jVo(mjEH2DP*61|v`( z6ocZB%;_tEZVdYHU@wI{&2A1{2&jht4liK?ch(qM;pDnkgqt93G0WmUdb2;R1oqnfm`4gLjlHyDBXpcp&1S?Wf?U zndiU-`X%xUxJtiaIZAzF$dEt59F&I&?EDKKBbV6y1+VG%Ox~HTTQyVnhG{ delta 1168 zcmZXUKWI}?9EI^9!E8^f#8Ym8N2~-0988THUoq|IZ5fLp#t>5iC;XUGo^S*P={axOl;k_T<9^ZKF zW)6)pM=ay`JOKw#LU~wB!BMAn#ZA@L9Iuj5ZI52UUsk>DeObH@ z7tsS{J8#!=D6iq42l@8VhQgNE2sZuGT;I^WQ{RTW@}ERI_(lFZJV1Yu=NeOc=nPe2 z7&|lw&&ZF6X_%GIiFxswXwTYpJ(O?CPldW^`B^v@^ymH4T<-+saaSf+)zzMO$tl~e z^bD<%pP?=F4Y4VHpt+vC61l9d3Kt^g^nZt!*x<>M1IwCx>=#3orz&2En_@$3!WL?y9khq+V|B#t zBkqUt5BbATXXiXGc&!+I&@&ZtHdLO&rqONCAG6>OpwYOCwsc$d7d?i>6m{~Nkdegr6iy7OHQ_jD=pD2n#+HyJ^h x`n{9u5yz{g`p2TJ?M`E{KH2}-t>1{>b?P5a6>s%WSy=!8 diff --git a/src/internationalisation.notes.translation b/src/internationalisation.notes.translation index 13aa7631926ac028dd1403af7015ec0780074039..d3b2809d2de16b27db0f4c57350d6859b38242fa 100644 GIT binary patch delta 1136 zcmZ9LPe_wt9LJx%f97iri)m;jQY4b%VMx>n8P+j&h@D3C4~Y)aVL}WK!fPJFLwM-v zATlJ<~MIhaJQ~c9IB*jF7O=`u^7UWe+{@-RJxLKELOEw!yoTs--sH zS&1X1R0FF{S`no@s1uUDm+S`zAbn_E^c%x$W#TgYHRf^hCU}cpW^ThjfF_|F`#d=d zK7*b!%e<@?MlQg=hSrBAejKK(2tQf$TTTuWo3+t7ti>%k3-n)y& z#V=Vdywpx?Xa+85a`BlY;JOlxG3ERkif0#%`1s0PU` z`($|Ifsv2s>qaMYQK$7SWAJfD`Kr$-2jNGUN5LeNg3|25%QDDWb`xOE*w4eyFwcSW z^b6!maEbnv<14knP$b`iWvBvG*@YMHAs?{&0sf-@13E6=YN#6u=R@}Y*9{;KL#~Hc z;yjcHp0=&nx_-vfBOM7{X!C+69Xpm=C{DRc`hwRLq&uf0dMxHelaIE)ezt-SCo@*W N)~DlFgFEqh>@TwLH(CGy delta 1153 zcmZ9MF-Tic7=>?M-m5W6DiLZ?2WwlgqLL{(gn%F-A|fKv$!5qDO0bZjWO)%JgJcjN zh!hd2r8qc<0ddHn0VRVtWC~QoAvj18Eun~QjpruknM*I6eCM3|-`vN8!8L znb(oOL3`{oWR}d4a`qIy0G(^XEsET@mak;!P8rjj)z{-9^{$JOL+zlBn{AF}N z{ptC-O{YV*-Zl&vxuas{i}lLYoDMe>wDh#+v%^}ebES*VM>UM}c?XQ%f192km64C$ GQsW~_Z$)?j diff --git a/src/logic-scenes/board/card-board.gd b/src/logic-scenes/board/card-board.gd index 02e4400..2497b36 100644 --- a/src/logic-scenes/board/card-board.gd +++ b/src/logic-scenes/board/card-board.gd @@ -124,6 +124,8 @@ func _ready(): 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"]) mementos_collected = 2 has_stage = has_stage @@ -455,6 +457,7 @@ func rebuild_from_savedict(board_state:Dictionary): sticky.transform.origin = stickies[sticky.name] func validate_board(): + return if current_context == NAVIGATE: var needs_rebuild = false diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index d687d7e..f58934f 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -88,11 +88,9 @@ func _ready(): background_sprite = AnimatedSprite2D.new() background_sprite.sprite_frames = preload("res://logic-scenes/board/card-textures/card-sprites.tres") - add_child(background_sprite, false, Node.INTERNAL_MODE_BACK) label = Label.new() label.theme_type_variation = "card_text" - add_child(label, false, Node.INTERNAL_MODE_BACK) label.size = Vector2(273.0, 131.0) label.position = Vector2(-135.0, -82.0) label.autowrap_mode = TextServer.AUTOWRAP_WORD @@ -103,7 +101,9 @@ func _ready(): collider.radius = 110 collision_shape.shape = collider - add_child(collision_shape, false, Node.INTERNAL_MODE_BACK) + add_child(collision_shape, false, Node.INTERNAL_MODE_FRONT) + add_child(background_sprite, false, Node.INTERNAL_MODE_FRONT) + add_child(label, false, Node.INTERNAL_MODE_FRONT) collision_shape.rotation = PI/2 @@ -215,7 +215,6 @@ func attach_sticky_note(sticky_note: StickyNote) -> bool: if has_sticky_note_attached(): return false sticky_note.reparent(self) - sticky_note.z_index = 1 sticky_note.position = sticky_note_position sticky_note.on_board = false current_sticky_note = sticky_note diff --git a/src/logic-scenes/card_picker/card_picker.gd b/src/logic-scenes/card_picker/card_picker.gd index a46bfc9..865e1cd 100644 --- a/src/logic-scenes/card_picker/card_picker.gd +++ b/src/logic-scenes/card_picker/card_picker.gd @@ -198,7 +198,7 @@ func transition(): elif selection_state == POSTS_SELECTED: var out_str:Array[StringName] = [] for card in output: - out_str.append(card.text) + out_str.append(card.text if card.text != "" else "void") cards_picked.emit(out_str) get_parent().get_parent().get_parent().dnd = false selection_state = DONE diff --git a/src/main.gd b/src/main.gd index b49568f..7113334 100644 --- a/src/main.gd +++ b/src/main.gd @@ -69,7 +69,7 @@ func toggle_pause_menu(): get_tree().paused = false var state_machine = menu_animation["parameters/playback"] state_machine.travel("start_game") - #FIXME: this may need a more generic implementation + if State.stage_list[0] is Player: Input.mouse_mode = Input.MOUSE_MODE_CAPTURED diff --git a/src/main.tscn b/src/main.tscn index 8709041..ecae4f4 100644 --- a/src/main.tscn +++ b/src/main.tscn @@ -977,7 +977,7 @@ states/reveal_pause_menu/position = Vector2(783.91, -112.734) states/start_game/node = SubResource("AnimationNodeAnimation_5umfs") states/start_game/position = Vector2(698, 32) transitions = ["Start", "init", SubResource("AnimationNodeStateMachineTransition_dxdg4"), "init", "loading", SubResource("AnimationNodeStateMachineTransition_0hpxy"), "loading", "loading_done", SubResource("AnimationNodeStateMachineTransition_ipapo"), "loading_done", "start_game", SubResource("AnimationNodeStateMachineTransition_0t1lp"), "start_game", "init", SubResource("AnimationNodeStateMachineTransition_66nmg"), "loading_done", "load_savegame", SubResource("AnimationNodeStateMachineTransition_6b86u"), "load_savegame", "loading_game", SubResource("AnimationNodeStateMachineTransition_y626i"), "loading_game", "start_game", SubResource("AnimationNodeStateMachineTransition_52bss"), "start_game", "credits_roll", SubResource("AnimationNodeStateMachineTransition_x8oth"), "credits_roll", "loading_done", SubResource("AnimationNodeStateMachineTransition_5ge3a"), "loading_done", "credits_roll", SubResource("AnimationNodeStateMachineTransition_44pd3"), "start_game", "reveal_pause_menu", SubResource("AnimationNodeStateMachineTransition_pc6pe"), "reveal_pause_menu", "hide_pause_menu", SubResource("AnimationNodeStateMachineTransition_dx61n"), "hide_pause_menu", "start_game", SubResource("AnimationNodeStateMachineTransition_lp1dx"), "hide_pause_menu", "init", SubResource("AnimationNodeStateMachineTransition_mqlnh")] -graph_offset = Vector2(-187.25, -157.734) +graph_offset = Vector2(51.75, 2.26601) [sub_resource type="Resource" id="Resource_qi5jr"] resource_local_to_scene = true