Merge commit '3de41e6fc8d5ad62ea8a72a2dc9de307df3da3a1' into development

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)

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", []]
 	},
@@ -12,7 +12,7 @@ static var source_dicts: Array[Dictionary] = [
 		"joy": ["worried_mother", "thomas_gifted", []]
 	},
 	{
-		"comic_heroes": ["effort", "agend_t", []],
+		"comic_heroes": ["effort", "agent_q", []],
 		"boy_stuff": ["pretending", "girls", []],
 		"teasing": ["stubborn", "good_intended", ["thomas_gifted"]]
 	},

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",,,
@@ -247,6 +247,11 @@ My body didn't move. It didn't say a word when the butterflies tried to escape f
 "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 goodbye. That I didn't hug him when he went home.,That I didn't return to kiss him goodbye. 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 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.",,,
+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.,,,
 """How did it go?, Fabian asked.","[p]""How did it go?, Fabian asked.[/p]","“Wie wars?”, fragte mein Bruder.",,,
 """It was moist”, I said.","[p]""It was moist”, I said.[/p]","“Feucht?”, fragte ich.",,,

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
@@ -462,6 +464,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

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
 	

src/logic-scenes/board/sticky-note.gd

@@ -204,7 +204,7 @@ func _move_sticky_note():
 				if (closest.position - position).length() > (closest.position - position).length():
 					card = closest
 			closest.highlighted = true
-			content.position = (closest.sticky_note_anchor.global_position - global_position) * hover_pos_shift
+			content.position = (closest.to_global(closest.sticky_note_position) - global_position) * hover_pos_shift
 
 func is_sticky_note_attached() -> bool:
 	return attached_to is Card

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

src/logic-scenes/player_controller/player_controller.gd

@@ -1,4 +1,4 @@
-extends RigidBody3D
+class_name Player extends RigidBody3D
 
 var has_stage: bool = false:
 	set(on_stage):

src/main.gd

@@ -65,6 +65,8 @@ func toggle_pause_menu():
 		get_tree().paused = false
 		var state_machine = menu_animation["parameters/playback"]
 		state_machine.travel("start_game")
+
+		if State.stage_list[0] is Player:
 			Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
 
 func debug_youth():