diff --git a/src/dev-util/board of devs.tscn b/src/dev-util/board of devs.tscn index 94b5d5e..d3218ce 100644 --- a/src/dev-util/board of devs.tscn +++ b/src/dev-util/board of devs.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://b6xp63orcmjq8" path="res://dev-util/devs_board.gd" id="1_ols6o"] [ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="1_xrckx"] [ext_resource type="PackedScene" uid="uid://vkcdj8c3ytbq" path="res://logic-scenes/board/sticky-note.tscn" id="2_ucudl"] -[ext_resource type="PackedScene" uid="uid://dp4eps03igd3w" path="res://logic-scenes/board/void_card.tscn" id="4_b7cny"] +[ext_resource type="PackedScene" uid="uid://vqwep0whfb0o" path="res://logic-scenes/board/void_card.tscn" id="4_b7cny"] [node name="board of devs" type="Control"] layout_mode = 3 @@ -22,6 +22,7 @@ offset_right = 230.0 offset_bottom = 181.0 [node name="c_out-of-world" parent="draeven" instance=ExtResource("1_xrckx")] +position = Vector2(2, -6) text = "I feel like I am not from of this world" [node name="p_unique" parent="draeven/c_out-of-world" groups=["c_comic_heroes", "c_confusion", "c_hit", "c_homework", "c_joy", "c_out-of-world", "c_teachers"] instance=ExtResource("2_ucudl")] @@ -33,7 +34,7 @@ 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) +position = Vector2(9, 294) text = "I fear being rejected" [node name="p_friends" parent="draeven/c_rejection" groups=["c_boy_stuff", "c_comic_heroes", "c_fighting", "c_homework", "c_joy", "c_out-of-world", "c_rejection", "c_teachers"] instance=ExtResource("2_ucudl")] @@ -45,7 +46,7 @@ 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) +position = Vector2(11, 593) text = "I am just too many things at once" [node name="p_inner_conflict" parent="draeven/c_confusion" groups=["c_boy_stuff", "c_confusion", "c_fighting", "c_homework", "c_rejection", "c_teasing"] instance=ExtResource("2_ucudl")] @@ -64,6 +65,7 @@ offset_right = 594.0 offset_bottom = 181.0 [node name="c_homework" parent="childhood" instance=ExtResource("1_xrckx")] +position = Vector2(4, -6) text = "I never put in much effort for homework" [node name="p_good_grades" parent="childhood/c_homework" groups=["c_body", "c_boy_stuff", "c_homework", "c_out-of-world", "c_rejection", "c_teachers"] instance=ExtResource("2_ucudl")] @@ -75,7 +77,7 @@ position = Vector2(-32, 140) text = "my peers were upset about that." [node name="c_teachers" parent="childhood" instance=ExtResource("1_xrckx")] -position = Vector2(0, 300) +position = Vector2(9, 291) text = "I like my teachers more than my classmates" [node name="p_volunteering" parent="childhood/c_teachers" groups=["c_boy_stuff", "c_comic_heroes", "c_joy", "c_teachers"] instance=ExtResource("2_ucudl")] @@ -87,7 +89,7 @@ position = Vector2(-32, 140) text = "maybe I want to become a teacher." [node name="c_joy" parent="childhood" instance=ExtResource("1_xrckx")] -position = Vector2(0, 600) +position = Vector2(11, 595) text = "I can put ages into things I enjoy" [node name="p_worried_mother" parent="childhood/c_joy" groups=["c_body", "c_boy_stuff", "c_comic_heroes", "c_fighting", "c_homework", "c_joy", "c_teachers", "c_teasing"] instance=ExtResource("2_ucudl")] @@ -106,6 +108,7 @@ offset_right = 904.0 offset_bottom = 141.0 [node name="c_comic_heroes" parent="voice_training" instance=ExtResource("1_xrckx")] +position = Vector2(9, -7) text = "Comic heroes are my role models " [node name="p_effort" parent="voice_training/c_comic_heroes" groups=["c_comic_heroes", "c_hit", "c_homework", "c_joy", "c_teachers", "c_teasing"] instance=ExtResource("2_ucudl")] @@ -117,7 +120,7 @@ position = Vector2(-32, 140) text = "and I want to be like agent q!" [node name="c_boy_stuff" parent="voice_training" instance=ExtResource("1_xrckx")] -position = Vector2(0, 300) +position = Vector2(8, 301) text = "I like boy stuff" [node name="p_pretending" parent="voice_training/c_boy_stuff" groups=["c_body", "c_boy_stuff", "c_hit", "c_homework", "c_joy", "c_teachers", "c_teasing"] instance=ExtResource("2_ucudl")] @@ -129,7 +132,7 @@ position = Vector2(-32, 140) text = "and girls don't get that." [node name="c_teasing" parent="voice_training" node_paths=PackedStringArray("evil_sticky_notes") instance=ExtResource("1_xrckx")] -position = Vector2(0, 600) +position = Vector2(6, 598) evil_sticky_notes = [NodePath("../../childhood/c_joy/p_thomas")] text = "When Jojo got teased for trying, I pretty much exploded" @@ -149,6 +152,7 @@ offset_right = 1254.0 offset_bottom = 141.0 [node name="c_fighting" parent="juijutsu" instance=ExtResource("1_xrckx")] +position = Vector2(-2, -13) text = "I stopped doing Jiu Jitsu." [node name="p_body" parent="juijutsu/c_fighting" groups=["c_boy_stuff", "c_confusion", "c_fighting", "c_out-of-world"] instance=ExtResource("2_ucudl")] @@ -160,18 +164,10 @@ position = Vector2(-32, 140) text = "I just hate being treated like a girl" [node name="c_void" parent="juijutsu" instance=ExtResource("4_b7cny")] -position = Vector2(0, 600) - -[node name="p_wet" parent="juijutsu/c_void" groups=["c_void"] instance=ExtResource("2_ucudl")] -position = Vector2(-32, 50) -text = "I was wet, so I must have been into it." - -[node name="p_stop" parent="juijutsu/c_void" groups=["c_void"] instance=ExtResource("2_ucudl")] -position = Vector2(-32, 140) -text = "I didn't say stop." +position = Vector2(16, 598) [node name="c_hit" parent="juijutsu" node_paths=PackedStringArray("evil_sticky_notes") instance=ExtResource("1_xrckx")] -position = Vector2(0, 300) +position = Vector2(15, 297) evil_sticky_notes = [NodePath("../../childhood/c_teachers/p_becoming_teacher")] text = "I know how to properly hit people" @@ -183,6 +179,14 @@ text = "that gives me a lot of confidence." position = Vector2(-32, 140) text = "and that’s a great vent." +[node name="p_wet" parent="juijutsu/c_hit" groups=["c_void"] instance=ExtResource("2_ucudl")] +position = Vector2(-31, 351) +text = "I was wet, so I must have been into it." + +[node name="p_stop" parent="juijutsu/c_hit" groups=["c_void"] instance=ExtResource("2_ucudl")] +position = Vector2(-31, 441) +text = "I didn't say stop." + [node name="test2" type="Control" parent="."] anchors_preset = 0 offset_left = 1610.0 @@ -191,6 +195,7 @@ offset_right = 1650.0 offset_bottom = 181.0 [node name="c_random1" parent="test2" instance=ExtResource("1_xrckx")] +position = Vector2(12, 1) [node name="p_random11" parent="test2/c_random1" groups=["c_boy_stuff"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) @@ -201,7 +206,7 @@ position = Vector2(-32, 140) text = "random 1" [node name="c_pick" parent="test2" instance=ExtResource("1_xrckx")] -position = Vector2(0, 300) +position = Vector2(14, 301) [node name="p_pick" parent="test2/c_pick" groups=["c_boy_stuff", "c_comic_heroes", "c_homework", "c_joy"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) @@ -212,7 +217,7 @@ position = Vector2(-32, 140) text = "you done goofed" [node name="c_random2" parent="test2" instance=ExtResource("1_xrckx")] -position = Vector2(0, 600) +position = Vector2(17, 600) [node name="p_random21" parent="test2/c_random2" groups=["c_void"] instance=ExtResource("2_ucudl")] position = Vector2(-32, 50) diff --git a/src/dev-util/steamworks.gd b/src/dev-util/steamworks.gd index 39b863e..5922ba6 100644 --- a/src/dev-util/steamworks.gd +++ b/src/dev-util/steamworks.gd @@ -1,5 +1,6 @@ extends Node func _ready() -> void: - var initialize_response: Dictionary = Steam.steamInitEx() - print("Did Steam initialize?: %s " % initialize_response) + pass + #var initialize_response: Dictionary = Steam.steamInitEx() + #print("Did Steam initialize?: %s " % initialize_response) diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index 163c908..206771f 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -1,5 +1,4 @@ @tool - extends Area2D class_name Card var compatible_sticky_notes: Array[StickyNote] = [] @@ -98,8 +97,8 @@ func _ready(): %BackgroundSprite.frame = text.hash() % %BackgroundSprite.sprite_frames.get_frame_count(%BackgroundSprite.animation) $Label.text = self.text - $Label.theme = State.current_main_theme - State.theme_changed.connect(func change_theme(new_theme): $Label.theme = new_theme) + #$Label.theme = State.current_main_theme + #State.theme_changed.connect(func change_theme(new_theme): $Label.theme = new_theme) wiggle_pos = float(text.hash() % 100) if not Engine.is_editor_hint(): @@ -200,8 +199,9 @@ func attach_sticky_note(sticky_note: StickyNote) -> bool: sticky_note.attached_to = self if name == "c_hit" and sticky_note.name == "p_effort": - Steam.setAchievement("FIGHT_FOR_GOOD") - Steam.storeStats() + #Steam.setAchievement("FIGHT_FOR_GOOD") + #Steam.storeStats() + pass return true diff --git a/src/logic-scenes/board/card.gd.uid b/src/logic-scenes/board/card.gd.uid index ab33aaa..ffd9391 100644 --- a/src/logic-scenes/board/card.gd.uid +++ b/src/logic-scenes/board/card.gd.uid @@ -1 +1 @@ -uid://wv72dum1fe72 +uid://2loic2eeec5b diff --git a/src/logic-scenes/board/card.tscn b/src/logic-scenes/board/card.tscn index 414bfa2..965f760 100644 --- a/src/logic-scenes/board/card.tscn +++ b/src/logic-scenes/board/card.tscn @@ -1,50 +1,49 @@ -[gd_scene load_steps=11 format=3 uid="uid://dy5rd437h5hsw"] +[gd_scene load_steps=10 format=3 uid="uid://dy5rd437h5hsw"] -[ext_resource type="Script" uid="uid://wv72dum1fe72" path="res://logic-scenes/board/card.gd" id="1_emip0"] +[ext_resource type="Script" uid="uid://2loic2eeec5b" path="res://logic-scenes/board/card.gd" id="1_emip0"] [ext_resource type="Texture2D" uid="uid://sv0nhkkur1tt" path="res://logic-scenes/board/card-textures/cardsheet.png" id="2_ioijn"] -[ext_resource type="Theme" uid="uid://b056fn288p8ha" path="res://logic-scenes/themes/handwriting.theme" id="3_1x4uh"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_foovg"] radius = 110.0 height = 336.0 -[sub_resource type="AtlasTexture" id="AtlasTexture_ykk13"] +[sub_resource type="AtlasTexture" id="AtlasTexture_mdi7r"] atlas = ExtResource("2_ioijn") region = Rect2(0, 0, 600, 440) -[sub_resource type="AtlasTexture" id="AtlasTexture_l43eo"] +[sub_resource type="AtlasTexture" id="AtlasTexture_e1q5p"] atlas = ExtResource("2_ioijn") region = Rect2(600, 0, 600, 440) -[sub_resource type="AtlasTexture" id="AtlasTexture_x2vcn"] +[sub_resource type="AtlasTexture" id="AtlasTexture_nu76f"] atlas = ExtResource("2_ioijn") region = Rect2(0, 440, 600, 440) -[sub_resource type="AtlasTexture" id="AtlasTexture_e7401"] +[sub_resource type="AtlasTexture" id="AtlasTexture_es87b"] atlas = ExtResource("2_ioijn") region = Rect2(600, 440, 600, 440) -[sub_resource type="AtlasTexture" id="AtlasTexture_j7wh6"] +[sub_resource type="AtlasTexture" id="AtlasTexture_7bi75"] atlas = ExtResource("2_ioijn") region = Rect2(0, 880, 600, 440) -[sub_resource type="SpriteFrames" id="SpriteFrames_ckivt"] +[sub_resource type="SpriteFrames" id="SpriteFrames_hkrkt"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_ykk13") +"texture": SubResource("AtlasTexture_mdi7r") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_l43eo") +"texture": SubResource("AtlasTexture_e1q5p") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_x2vcn") +"texture": SubResource("AtlasTexture_nu76f") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_e7401") +"texture": SubResource("AtlasTexture_es87b") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_j7wh6") +"texture": SubResource("AtlasTexture_7bi75") }], "loop": true, "name": &"default", @@ -56,7 +55,6 @@ script = ExtResource("1_emip0") metadata/type = "card" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2(-0.0713516, 0.997451) rotation = 1.5708 shape = SubResource("CapsuleShape2D_foovg") @@ -64,7 +62,7 @@ shape = SubResource("CapsuleShape2D_foovg") unique_name_in_owner = true clip_children = 2 scale = Vector2(0.6, 0.6) -sprite_frames = SubResource("SpriteFrames_ckivt") +sprite_frames = SubResource("SpriteFrames_hkrkt") frame = 1 [node name="Label" type="Label" parent="."] @@ -80,8 +78,6 @@ offset_bottom = 88.0 grow_horizontal = 2 grow_vertical = 2 rotation = 0.00872665 -theme = ExtResource("3_1x4uh") -theme_type_variation = &"card_text" autowrap_mode = 3 [node name="StickyNoteAncor" type="Node2D" parent="."] diff --git a/src/logic-scenes/board/void_card.tres b/src/logic-scenes/board/void_card.tres index adee4cf..cf7168d 100644 --- a/src/logic-scenes/board/void_card.tres +++ b/src/logic-scenes/board/void_card.tres @@ -6,6 +6,8 @@ input_name = "color" [resource] code = "shader_type canvas_item; +render_mode blend_mix; + @@ -20,7 +22,6 @@ void fragment() { } " -graph_offset = Vector2(-496.091, 53.946) mode = 1 flags/light_only = false nodes/fragment/2/node = SubResource("VisualShaderNodeInput_i5j4e") diff --git a/src/logic-scenes/board/void_card.tscn b/src/logic-scenes/board/void_card.tscn index 944d0ce..b027802 100644 --- a/src/logic-scenes/board/void_card.tscn +++ b/src/logic-scenes/board/void_card.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=21 format=3 uid="uid://dp4eps03igd3w"] +[gd_scene load_steps=20 format=3 uid="uid://vqwep0whfb0o"] -[ext_resource type="Script" uid="uid://wv72dum1fe72" path="res://logic-scenes/board/card.gd" id="1_6ceun"] +[ext_resource type="Script" uid="uid://2loic2eeec5b" path="res://logic-scenes/board/card.gd" id="1_6ceun"] [ext_resource type="Texture2D" uid="uid://sv0nhkkur1tt" path="res://logic-scenes/board/card-textures/cardsheet.png" id="2_buevv"] [ext_resource type="Texture2D" uid="uid://kpmk21d8rlso" path="res://logic-scenes/board/particle_textures/star.png" id="3_8wu8j"] -[ext_resource type="Theme" uid="uid://b056fn288p8ha" path="res://logic-scenes/themes/handwriting.theme" id="3_mi4ah"] [ext_resource type="Texture2D" uid="uid://bqilajx05t0eb" path="res://logic-scenes/board/particle_textures/void_nomotion.png" id="4_jam8u"] -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_foovg"] +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_aqrbw"] radius = 110.0 height = 336.0 @@ -37,43 +36,43 @@ func _process(delta): else: position = initial_position " -[sub_resource type="AtlasTexture" id="AtlasTexture_ykk13"] -atlas = ExtResource("2_buevv") -region = Rect2(0, 0, 600, 440) - -[sub_resource type="AtlasTexture" id="AtlasTexture_l43eo"] -atlas = ExtResource("2_buevv") -region = Rect2(600, 0, 600, 440) - -[sub_resource type="AtlasTexture" id="AtlasTexture_x2vcn"] -atlas = ExtResource("2_buevv") -region = Rect2(0, 440, 600, 440) - -[sub_resource type="AtlasTexture" id="AtlasTexture_e7401"] -atlas = ExtResource("2_buevv") -region = Rect2(600, 440, 600, 440) - -[sub_resource type="AtlasTexture" id="AtlasTexture_j7wh6"] +[sub_resource type="AtlasTexture" id="AtlasTexture_aqrbw"] atlas = ExtResource("2_buevv") region = Rect2(0, 880, 600, 440) -[sub_resource type="SpriteFrames" id="SpriteFrames_ckivt"] +[sub_resource type="AtlasTexture" id="AtlasTexture_e20ok"] +atlas = ExtResource("2_buevv") +region = Rect2(0, 440, 600, 440) + +[sub_resource type="AtlasTexture" id="AtlasTexture_onstk"] +atlas = ExtResource("2_buevv") +region = Rect2(600, 440, 600, 440) + +[sub_resource type="AtlasTexture" id="AtlasTexture_mtvrf"] +atlas = ExtResource("2_buevv") +region = Rect2(600, 0, 600, 440) + +[sub_resource type="AtlasTexture" id="AtlasTexture_inyug"] +atlas = ExtResource("2_buevv") +region = Rect2(0, 0, 600, 440) + +[sub_resource type="SpriteFrames" id="SpriteFrames_cu2at"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_ykk13") +"texture": SubResource("AtlasTexture_aqrbw") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_l43eo") +"texture": SubResource("AtlasTexture_e20ok") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_x2vcn") +"texture": SubResource("AtlasTexture_onstk") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_e7401") +"texture": SubResource("AtlasTexture_mtvrf") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_j7wh6") +"texture": SubResource("AtlasTexture_inyug") }], "loop": true, "name": &"default", @@ -134,14 +133,14 @@ func _process(_delta): self.visible = State.reduce_motion " -[node name="card" type="Area2D"] +[node name="c_void" type="Area2D"] script = ExtResource("1_6ceun") metadata/type = "card" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2(-0.0713516, 0.997451) rotation = 1.5708 -shape = SubResource("CapsuleShape2D_foovg") +shape = SubResource("CapsuleShape2D_aqrbw") [node name="Visual" type="Node2D" parent="."] scale = Vector2(0.6, 0.6) @@ -150,18 +149,17 @@ script = SubResource("GDScript_8bs16") [node name="BackgroundSprite" type="AnimatedSprite2D" parent="Visual"] unique_name_in_owner = true clip_children = 2 -sprite_frames = SubResource("SpriteFrames_ckivt") -frame = 1 +sprite_frames = SubResource("SpriteFrames_cu2at") [node name="GPUParticles2D" type="GPUParticles2D" parent="Visual/BackgroundSprite"] amount = 500 -process_material = SubResource("ParticleProcessMaterial_by44l") texture = ExtResource("3_8wu8j") lifetime = 2.5 speed_scale = 1.3 explosiveness = 0.2 randomness = 0.14 local_coords = true +process_material = SubResource("ParticleProcessMaterial_by44l") script = SubResource("GDScript_vjwk7") [node name="Sprite2D" type="Sprite2D" parent="Visual/BackgroundSprite"] @@ -187,6 +185,4 @@ offset_right = 127.0 offset_bottom = 82.5 grow_horizontal = 2 grow_vertical = 2 -theme = ExtResource("3_mi4ah") -theme_type_variation = &"card_text" autowrap_mode = 3 diff --git a/src/project.godot b/src/project.godot index e102269..20142f9 100644 --- a/src/project.godot +++ b/src/project.godot @@ -26,7 +26,7 @@ config/icon="res://icon.png" State="*res://singletons/global_state.gd" Scenes="*res://singletons/scene_reference.gd" -Steamworks="*res://dev-util/steamworks.gd" +Steamworks="res://dev-util/steamworks.gd" PromptManager="*res://addons/input_prompts/input_prompt_manager.gd" [debug]