Merge branch 'main' of gitlab.com:betalars/frame-of-mind
This commit is contained in:
commit
b91153d759
|
|
@ -27,7 +27,7 @@ text = "but at least I get good grades."
|
|||
|
||||
[node name="p_upset_peers" parent="childhood/c_homework" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_teachers"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 140)
|
||||
text = "and my peers were upset about that."
|
||||
text = "my peers were upset about that."
|
||||
|
||||
[node name="c_teachers" parent="childhood" instance=ExtResource("1_xrckx")]
|
||||
position = Vector2(0, 300)
|
||||
|
|
@ -67,7 +67,7 @@ text = "Comic heroes are my role models "
|
|||
position = Vector2(-32, 50)
|
||||
text = "when I put in the effort, I can make the world a better place"
|
||||
|
||||
[node name="p_upset_peers" parent="voice_training/c_comic_heroes" groups=["c_Joy", "c_body", "c_boy_stuff", "c_hit"] instance=ExtResource("2_ucudl")]
|
||||
[node name="p_agent_q" parent="voice_training/c_comic_heroes" groups=["c_Joy", "c_body", "c_boy_stuff", "c_hit"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 140)
|
||||
text = "and I want to be like agent q!"
|
||||
|
||||
|
|
@ -75,9 +75,9 @@ text = "and I want to be like agent q!"
|
|||
position = Vector2(0, 300)
|
||||
text = "I like boy stuff "
|
||||
|
||||
[node name="p_slut" parent="voice_training/c_boy_stuff" groups=["c_Joy", "c_body", "c_hit", "c_homework", "c_teachers"] instance=ExtResource("2_ucudl")]
|
||||
[node name="p_pretending" parent="voice_training/c_boy_stuff" groups=["c_Joy", "c_body", "c_hit", "c_teachers"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 50)
|
||||
text = "others think I only pretend to."
|
||||
text = "yet they think I'm just pretending"
|
||||
|
||||
[node name="p_girls" parent="voice_training/c_boy_stuff" groups=["c_Joy", "c_body", "c_comic_heroes", "c_hit", "c_homework", "c_teachers"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 140)
|
||||
|
|
@ -85,11 +85,11 @@ text = "and girls don't get that."
|
|||
|
||||
[node name="c_backlash" parent="voice_training" instance=ExtResource("1_xrckx")]
|
||||
position = Vector2(0, 600)
|
||||
text = "Despite the backlash, I protected Joyo in front of class "
|
||||
text = "Despite the backlash, I protected my friend"
|
||||
|
||||
[node name="p_cross_friend" parent="voice_training/c_backlash" groups=["c_Joy", "c_boy_stuff", "c_comic_heroes", "c_hit"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 50)
|
||||
text = "I would never cross a friend, even if it was for my own good."
|
||||
text = "I wouldn't never not do that, even if it was for my own good"
|
||||
|
||||
[node name="p_reward" parent="voice_training/c_backlash" groups=["c_Joy"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 140)
|
||||
|
|
@ -136,41 +136,83 @@ text = "… I was wet, so I must have been into it."
|
|||
position = Vector2(-32, 140)
|
||||
text = "… I didn’t say stop."
|
||||
|
||||
[node name="test" type="Control" parent="."]
|
||||
[node name="draeven" type="Control" parent="."]
|
||||
anchors_preset = 0
|
||||
offset_left = 1234.0
|
||||
offset_top = 141.0
|
||||
offset_right = 1274.0
|
||||
offset_bottom = 181.0
|
||||
|
||||
[node name="c_random1" parent="test" instance=ExtResource("1_xrckx")]
|
||||
[node name="c_out-of-world" parent="draeven" instance=ExtResource("1_xrckx")]
|
||||
text = "I feel like I am not from of this world"
|
||||
|
||||
[node name="p_random11" parent="test/c_random1" groups=["c_boy_stuff"] instance=ExtResource("2_ucudl")]
|
||||
[node name="p_random11" parent="draeven/c_out-of-world" groups=["c_boy_stuff"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 50)
|
||||
text = "I like being unique like that"
|
||||
|
||||
[node name="p_random12" parent="draeven/c_out-of-world" instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 140)
|
||||
text = "I am thankful for the few friends that get me"
|
||||
|
||||
[node name="c_rejection" parent="draeven" instance=ExtResource("1_xrckx")]
|
||||
position = Vector2(0, 300)
|
||||
text = "I fear being rejected"
|
||||
|
||||
[node name="p_friends" parent="draeven/c_rejection" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_homework"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 50)
|
||||
text = "that makes it hard to find friends"
|
||||
|
||||
[node name="p_laughed" parent="draeven/c_rejection" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_homework", "c_teachers"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 140)
|
||||
text = "I'm afraid I will just get laughed at"
|
||||
|
||||
[node name="c_confusion" parent="draeven" instance=ExtResource("1_xrckx")]
|
||||
position = Vector2(0, 600)
|
||||
text = "I am just too many things at once"
|
||||
|
||||
[node name="p_random21" parent="draeven/c_confusion" groups=["c_void"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 50)
|
||||
text = "it is just so overwhealming for me"
|
||||
|
||||
[node name="p_random22" parent="draeven/c_confusion" groups=["c_void"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 140)
|
||||
text = "this is just too much for others"
|
||||
|
||||
[node name="test2" type="Control" parent="."]
|
||||
anchors_preset = 0
|
||||
offset_left = 1610.0
|
||||
offset_top = 141.0
|
||||
offset_right = 1650.0
|
||||
offset_bottom = 181.0
|
||||
|
||||
[node name="c_random1" parent="test2" instance=ExtResource("1_xrckx")]
|
||||
|
||||
[node name="p_random11" parent="test2/c_random1" groups=["c_boy_stuff"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 50)
|
||||
text = "random 1"
|
||||
|
||||
[node name="p_random12" parent="test/c_random1" instance=ExtResource("2_ucudl")]
|
||||
[node name="p_random12" parent="test2/c_random1" instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 140)
|
||||
text = "random 1"
|
||||
|
||||
[node name="c_pick" parent="test" instance=ExtResource("1_xrckx")]
|
||||
[node name="c_pick" parent="test2" instance=ExtResource("1_xrckx")]
|
||||
position = Vector2(0, 300)
|
||||
|
||||
[node name="p_pick" parent="test/c_pick" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_homework"] instance=ExtResource("2_ucudl")]
|
||||
[node name="p_pick" parent="test2/c_pick" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_homework"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 50)
|
||||
text = "pick me 2"
|
||||
|
||||
[node name="p_goof" parent="test/c_pick" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_homework", "c_teachers"] instance=ExtResource("2_ucudl")]
|
||||
[node name="p_goof" parent="test2/c_pick" groups=["c_Joy", "c_backlash", "c_boy_stuff", "c_comic_heroes", "c_homework", "c_teachers"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 140)
|
||||
text = "you done goofed"
|
||||
|
||||
[node name="c_random2" parent="test" instance=ExtResource("1_xrckx")]
|
||||
[node name="c_random2" parent="test2" instance=ExtResource("1_xrckx")]
|
||||
position = Vector2(0, 600)
|
||||
|
||||
[node name="p_random21" parent="test/c_random2" groups=["c_void"] instance=ExtResource("2_ucudl")]
|
||||
[node name="p_random21" parent="test2/c_random2" groups=["c_void"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 50)
|
||||
text = "random 2"
|
||||
|
||||
[node name="p_random22" parent="test/c_random2" groups=["c_void"] instance=ExtResource("2_ucudl")]
|
||||
[node name="p_random22" parent="test2/c_random2" groups=["c_void"] instance=ExtResource("2_ucudl")]
|
||||
position = Vector2(-32, 140)
|
||||
text = "random 2"
|
||||
|
|
|
|||
|
|
@ -27,8 +27,21 @@ var has_stage = false:
|
|||
@onready var postit_container = $HBoxContainer/ScrollContainer/VBoxContainer
|
||||
@onready var board_of_devs = $"board of devs"
|
||||
@onready var base_postit_panel = $HBoxContainer/ScrollContainer/VBoxContainer/Panel
|
||||
@onready var empty_text = $emptyText
|
||||
@onready var active_context = ui_context.DROPZONE # 0 = dropzone, 1 = post it list
|
||||
@onready var instructions = $instructions_panel/HBoxContainer/cards_remaining
|
||||
|
||||
var mementos_collected: int = 0:
|
||||
set(mementos):
|
||||
mementos_collected = mementos
|
||||
match mementos:
|
||||
1:
|
||||
instructions.text = "There are three Mementos left to find."
|
||||
2:
|
||||
instructions.text = "You have collected half of the mementos."
|
||||
3:
|
||||
instructions.text = "Find the last Memento to complete the Board."
|
||||
4:
|
||||
instructions.text = "Combine cards to order your thoughts."
|
||||
|
||||
var currently_selected_node: Area2D = null
|
||||
var currently_selected_card_for_assigning: Area2D = null
|
||||
|
|
@ -62,12 +75,13 @@ func _process(delta):
|
|||
|
||||
# we should maybe consider moving this to _input() for consistency
|
||||
if Input.is_action_just_pressed("ui_cancel"):
|
||||
populate_board(["c_Joy","p_effort","c_backlash","c_body","c_hit","p_slut","p_worried_mother","p_cross_friend"])
|
||||
populate_board(["c_Joy","p_effort","c_backlash","c_body","c_hit","p_reward","p_worried_mother","p_cross_friend"])
|
||||
|
||||
|
||||
# Will be used later to spawn Cards and Post-Its and remember them in the dictionary
|
||||
func populate_board(card_names: Array):
|
||||
empty_text.visible = false
|
||||
|
||||
mementos_collected += 1
|
||||
|
||||
var all_cards = Array()
|
||||
var all_postits = Array()
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@ shader = ExtResource("1_ggnth")
|
|||
shader_parameter/magic_scale_factor = 1500.0
|
||||
shader_parameter/tex = ExtResource("1_8brxc")
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ivo5o"]
|
||||
size = Vector2(4249, 766.5)
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_5ri3m"]
|
||||
size = Vector2(4262, 766.5)
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ivo5o"]
|
||||
size = Vector2(4249, 766.5)
|
||||
|
||||
[node name="board" type="PanelContainer"]
|
||||
material = SubResource("ShaderMaterial_ttqei")
|
||||
clip_contents = true
|
||||
|
|
@ -75,15 +75,6 @@ process_mode = 4
|
|||
visible = false
|
||||
layout_mode = 2
|
||||
|
||||
[node name="border_right" type="Area2D" parent="."]
|
||||
position = Vector2(1872, 461)
|
||||
script = ExtResource("6_wpxls")
|
||||
direction = Vector2(-100, 0)
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="border_right"]
|
||||
rotation = 1.5708
|
||||
shape = SubResource("RectangleShape2D_ivo5o")
|
||||
|
||||
[node name="up" type="Control" parent="."]
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 4
|
||||
|
|
@ -94,7 +85,7 @@ script = ExtResource("6_wpxls")
|
|||
direction = Vector2(0, 100)
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="up/border_up"]
|
||||
position = Vector2(-58, -423)
|
||||
position = Vector2(-58, -369)
|
||||
shape = SubResource("RectangleShape2D_5ri3m")
|
||||
|
||||
[node name="left" type="Control" parent="."]
|
||||
|
|
@ -107,7 +98,7 @@ script = ExtResource("6_wpxls")
|
|||
direction = Vector2(100, 0)
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="left/border_left"]
|
||||
position = Vector2(-476, -22.5)
|
||||
position = Vector2(-371, -21.5)
|
||||
rotation = 1.5708
|
||||
shape = SubResource("RectangleShape2D_ivo5o")
|
||||
|
||||
|
|
@ -121,7 +112,7 @@ script = ExtResource("6_wpxls")
|
|||
direction = Vector2(0, -100)
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="down/border_down"]
|
||||
position = Vector2(2, 416)
|
||||
position = Vector2(2, 377)
|
||||
shape = SubResource("RectangleShape2D_5ri3m")
|
||||
|
||||
[node name="right" type="Control" parent="."]
|
||||
|
|
@ -134,23 +125,29 @@ script = ExtResource("6_wpxls")
|
|||
direction = Vector2(-100, 0)
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="right/border_left"]
|
||||
position = Vector2(12, 13)
|
||||
position = Vector2(20, 13)
|
||||
rotation = 1.5708
|
||||
shape = SubResource("RectangleShape2D_ivo5o")
|
||||
|
||||
[node name="emptyText" type="Label" parent="."]
|
||||
modulate = Color(0, 0, 0, 1)
|
||||
[node name="instructions_panel" type="PanelContainer" parent="."]
|
||||
layout_mode = 2
|
||||
theme_override_font_sizes/font_size = 50
|
||||
text = "Collect mementos to fill board with cards."
|
||||
size_flags_horizontal = 4
|
||||
size_flags_vertical = 0
|
||||
|
||||
[node name="HBoxContainer" type="HBoxContainer" parent="instructions_panel"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="VSeparator2" type="VSeparator" parent="instructions_panel/HBoxContainer"]
|
||||
custom_minimum_size = Vector2(15, 0)
|
||||
layout_mode = 2
|
||||
|
||||
[node name="cards_remaining" type="Label" parent="instructions_panel/HBoxContainer"]
|
||||
layout_mode = 2
|
||||
size_flags_vertical = 0
|
||||
text = "Collect Mementos to fill the mind-board."
|
||||
horizontal_alignment = 1
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="disclaimer" type="Label" parent="."]
|
||||
modulate = Color(0, 0, 0, 1)
|
||||
[node name="VSeparator" type="VSeparator" parent="instructions_panel/HBoxContainer"]
|
||||
custom_minimum_size = Vector2(15, 0)
|
||||
layout_mode = 2
|
||||
size_flags_vertical = 0
|
||||
theme_override_font_sizes/font_size = 40
|
||||
text = "alpha: Gamepad compatibility is limited. Using a mouse to move cards is advised."
|
||||
horizontal_alignment = 1
|
||||
vertical_alignment = 1
|
||||
|
|
|
|||
|
|
@ -63,6 +63,11 @@ func replace_with(postit: PostIt):
|
|||
self.text = postit.text
|
||||
self.voice_line = postit.voice_line
|
||||
self.sibling = postit.sibling
|
||||
self.name = postit.name
|
||||
for group in self.get_groups():
|
||||
self.remove_from_group(group)
|
||||
for group in postit.get_groups():
|
||||
self.add_to_group(group)
|
||||
|
||||
func _process(_delta: float) -> void:
|
||||
_move_post_it()
|
||||
|
|
|
|||
Loading…
Reference in New Issue