From 12c6585a23ebc39ef0fd0454991f6509798bd518 Mon Sep 17 00:00:00 2001 From: Woahsea <103764495+Woahsea@users.noreply.github.com> Date: Wed, 27 Jul 2022 18:36:20 +0100 Subject: [PATCH] Little Mario's Notes (#569) * change pause modes to fix UI inputs --- project.godot | 6 + scenes/Main.tscn | 15 +- scenes/enemies/Bub.tscn | 36 ++- scenes/friends/Blug.tscn | 8 +- scenes/levels/Hub.tscn | 8 +- scenes/levels/LuigiMansion/Mansion0.tscn | 17 +- scenes/levels/tutorial/tutorial0.tscn | 25 +- scenes/objects/NotesNewTrigger.tscn | 19 ++ scenes/powerups/Bus.tscn | 32 ++- scenes/powerups/FireFlower.tscn | 9 +- scenes/powerups/Magpie.tscn | 10 +- scenes/ui/Notes.tscn | 344 +++++++++++++++++++++++ scenes/ui/NotesButton.tscn | 29 ++ scenes/ui/Themes/NoteBox.tres | 13 + scenes/ui/Themes/NoteBoxFocus.tres | 11 + scenes/ui/Themes/NoteBoxPress.tres | 11 + scripts/autoload/EventBus.gd | 3 + scripts/objects/NotesNewTrigger.gd | 19 ++ scripts/ui/Notes.gd | 73 +++++ scripts/ui/NotesButton.gd | 13 + sprites/ui/note.png.import | 35 +++ sprites/ui/note1.png | Bin 0 -> 144 bytes sprites/ui/note1.png.import | 35 +++ sprites/ui/note2.png | Bin 0 -> 143 bytes sprites/ui/note2.png.import | 35 +++ sprites/ui/note3.png | Bin 0 -> 144 bytes sprites/ui/note3.png.import | 35 +++ sprites/ui/notes/bubpic.png | Bin 0 -> 1167 bytes sprites/ui/notes/bubpic.png.import | 35 +++ sprites/ui/notes/tutorial_pic.png | Bin 0 -> 1402 bytes sprites/ui/notes/tutorial_pic.png.import | 35 +++ 31 files changed, 876 insertions(+), 35 deletions(-) create mode 100644 scenes/objects/NotesNewTrigger.tscn create mode 100644 scenes/ui/Notes.tscn create mode 100644 scenes/ui/NotesButton.tscn create mode 100644 scenes/ui/Themes/NoteBox.tres create mode 100644 scenes/ui/Themes/NoteBoxFocus.tres create mode 100644 scenes/ui/Themes/NoteBoxPress.tres create mode 100644 scripts/objects/NotesNewTrigger.gd create mode 100644 scripts/ui/Notes.gd create mode 100644 scripts/ui/NotesButton.gd create mode 100644 sprites/ui/note.png.import create mode 100644 sprites/ui/note1.png create mode 100644 sprites/ui/note1.png.import create mode 100644 sprites/ui/note2.png create mode 100644 sprites/ui/note2.png.import create mode 100644 sprites/ui/note3.png create mode 100644 sprites/ui/note3.png.import create mode 100644 sprites/ui/notes/bubpic.png create mode 100644 sprites/ui/notes/bubpic.png.import create mode 100644 sprites/ui/notes/tutorial_pic.png create mode 100644 sprites/ui/notes/tutorial_pic.png.import diff --git a/project.godot b/project.godot index 99988c7f4..ee62a79a6 100644 --- a/project.godot +++ b/project.godot @@ -600,6 +600,12 @@ interact={ , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null) ] } +show_notes={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":78,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":10,"pressure":0.0,"pressed":false,"script":null) + ] +} [layer_names] diff --git a/scenes/Main.tscn b/scenes/Main.tscn index ed51828d5..84e3536c2 100644 --- a/scenes/Main.tscn +++ b/scenes/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=15 format=2] [ext_resource path="res://scripts/Audio.gd" type="Script" id=1] [ext_resource path="res://scripts/Main.gd" type="Script" id=2] @@ -12,6 +12,7 @@ [ext_resource path="res://shaders/CRT.gdshader" type="Shader" id=10] [ext_resource path="res://scenes/ui/TouchInputs.tscn" type="PackedScene" id=11] [ext_resource path="res://scripts/CRT.gd" type="Script" id=12] +[ext_resource path="res://scenes/ui/Notes.tscn" type="PackedScene" id=13] [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 10 ) @@ -28,6 +29,7 @@ shader_param/maskDark = 0.5 shader_param/maskLight = 1.5 [node name="Root" type="Node"] +pause_mode = 2 [node name="ViewportContainer" type="ViewportContainer" parent="."] material = SubResource( 2 ) @@ -35,6 +37,7 @@ margin_right = 1024.0 margin_bottom = 600.0 [node name="Main" type="Viewport" parent="ViewportContainer"] +pause_mode = 1 size = Vector2( 1024, 600 ) handle_input_locally = false render_target_update_mode = 3 @@ -53,13 +56,12 @@ script = ExtResource( 6 ) [node name="UI" parent="ViewportContainer/Main" instance=ExtResource( 3 )] -[node name="PauseMenu" parent="ViewportContainer/Main" instance=ExtResource( 9 )] - [node name="Transition" parent="ViewportContainer/Main" instance=ExtResource( 8 )] [node name="TouchInputs" parent="ViewportContainer/Main" instance=ExtResource( 11 )] [node name="Audio" type="Node" parent="ViewportContainer/Main"] +pause_mode = 2 script = ExtResource( 1 ) [node name="BGM" type="AudioStreamPlayer" parent="ViewportContainer/Main/Audio"] @@ -71,3 +73,10 @@ bus = "music" [node name="CRT" type="Node" parent="ViewportContainer/Main"] script = ExtResource( 12 ) container_path = NodePath("../..") + +[node name="Unpausable" type="Node2D" parent="ViewportContainer/Main"] +pause_mode = 2 + +[node name="PauseMenu" parent="ViewportContainer/Main/Unpausable" instance=ExtResource( 9 )] + +[node name="Notes" parent="ViewportContainer/Main/Unpausable" instance=ExtResource( 13 )] diff --git a/scenes/enemies/Bub.tscn b/scenes/enemies/Bub.tscn index e958c9606..802caa320 100644 --- a/scenes/enemies/Bub.tscn +++ b/scenes/enemies/Bub.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=39 format=2] +[gd_scene load_steps=41 format=2] [ext_resource path="res://scenes/enemies/Enemy.tscn" type="PackedScene" id=1] [ext_resource path="res://sprites/pistol.png" type="Texture" id=2] @@ -9,6 +9,7 @@ [ext_resource path="res://audio/sfx/pop-gun.wav" type="AudioStream" id=7] [ext_resource path="res://sprites/projectiles/ombsti_bomb.png" type="Texture" id=8] [ext_resource path="res://audio/sfx/effects/explode_small.wav" type="AudioStream" id=9] +[ext_resource path="res://scenes/objects/NotesNewTrigger.tscn" type="PackedScene" id=10] [sub_resource type="RectangleShape2D" id=12] extents = Vector2( 26, 24 ) @@ -21,10 +22,6 @@ region = Rect2( 64, 0, 64, 64 ) atlas = ExtResource( 4 ) region = Rect2( 128, 0, 64, 64 ) -[sub_resource type="AtlasTexture" id=32] -atlas = ExtResource( 4 ) -region = Rect2( 0, 0, 64, 64 ) - [sub_resource type="AtlasTexture" id=24] atlas = ExtResource( 4 ) region = Rect2( 0, 64, 64, 64 ) @@ -49,6 +46,10 @@ region = Rect2( 256, 64, 64, 64 ) atlas = ExtResource( 4 ) region = Rect2( 320, 64, 64, 64 ) +[sub_resource type="AtlasTexture" id=32] +atlas = ExtResource( 4 ) +region = Rect2( 0, 0, 64, 64 ) + [sub_resource type="SpriteFrames" id=3] animations = [ { "frames": [ SubResource( 30 ), SubResource( 31 ) ], @@ -56,15 +57,15 @@ animations = [ { "name": "idle", "speed": 1.0 }, { -"frames": [ SubResource( 32 ) ], -"loop": true, -"name": "die", -"speed": 5.0 -}, { "frames": [ SubResource( 24 ), SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ) ], "loop": true, "name": "move", "speed": 10.0 +}, { +"frames": [ SubResource( 32 ) ], +"loop": true, +"name": "die", +"speed": 5.0 } ] [sub_resource type="Animation" id=34] @@ -372,6 +373,9 @@ animations = [ { "speed": 10.0 } ] +[sub_resource type="RectangleShape2D" id=50] +extents = Vector2( 192, 96 ) + [node name="Bub" instance=ExtResource( 1 )] collision_mask = 330 script = ExtResource( 3 ) @@ -397,7 +401,6 @@ position = Vector2( -12, 1.5 ) [node name="Sprite" parent="." index="2"] frames = SubResource( 3 ) animation = "idle" -frame = 1 playing = true offset = Vector2( 0, -32 ) @@ -457,3 +460,14 @@ frames = SubResource( 49 ) stream = ExtResource( 9 ) volume_db = 2.0 bus = "sfx" + +[node name="NotesNewTrigger" parent="." index="12" instance=ExtResource( 10 )] +pageName = "Bub" +pageDesc = "These little people are called Bubs. if you see a Bub with a gun, it's probably a ruthless mercenary hired by a mysterious man known as \"Bubs\". The lack of arms will heavily disadvantage a Bub in basketball." +pageSprite = "bub" +pageSpriteScale = Vector2( 3, 3 ) + +[node name="Collision" parent="NotesNewTrigger" index="0"] +shape = SubResource( 50 ) + +[editable path="NotesNewTrigger"] diff --git a/scenes/friends/Blug.tscn b/scenes/friends/Blug.tscn index ecbe58b72..1d89cf25c 100644 --- a/scenes/friends/Blug.tscn +++ b/scenes/friends/Blug.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://scenes/ui/TextTrigger.tscn" type="PackedScene" id=1] [ext_resource path="res://sprites/NPCs/blug.png" type="Texture" id=2] [ext_resource path="res://scripts/friends/Blug.gd" type="Script" id=3] +[ext_resource path="res://scenes/objects/NotesNewTrigger.tscn" type="PackedScene" id=4] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 512, 512 ) @@ -22,3 +23,8 @@ texture = ExtResource( 2 ) [node name="Collision" type="CollisionShape2D" parent="."] visible = false shape = SubResource( 1 ) + +[node name="NotesNewTrigger" parent="." instance=ExtResource( 4 )] +pageName = "blug" +pageDesc = "blug" +pageSprite = "blug" diff --git a/scenes/levels/Hub.tscn b/scenes/levels/Hub.tscn index f745bb03c..b2331ed41 100644 --- a/scenes/levels/Hub.tscn +++ b/scenes/levels/Hub.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 format=2] [ext_resource path="res://scenes/levels/TileSet.tres" type="TileSet" id=1] [ext_resource path="res://scenes/SpawnPoint.tscn" type="PackedScene" id=2] @@ -9,6 +9,7 @@ [ext_resource path="res://sprites/Coin_Gems/star.png" type="Texture" id=7] [ext_resource path="res://scenes/ui/Themes/Default/DefaultFont.tres" type="DynamicFont" id=8] [ext_resource path="res://scenes/friends/Blug.tscn" type="PackedScene" id=9] +[ext_resource path="res://scenes/objects/NotesNewTrigger.tscn" type="PackedScene" id=10] [node name="Hub" type="TileMap"] tile_set = ExtResource( 1 ) @@ -111,5 +112,10 @@ position = Vector2( 96, 160 ) [node name="Blug" parent="." instance=ExtResource( 9 )] position = Vector2( -128, 192 ) +[node name="NotesNewTrigger" parent="." instance=ExtResource( 10 )] +position = Vector2( 96, -128 ) +pageName = "Little Mario" +pageDesc = "Hey, that's me, Little Mario! This is where I make notes about my adventures! As I meet new people and make new discoveries, I'm going to make sure to write all about them here!" + [editable path="Instructions"] [editable path="PictureFrameStar"] diff --git a/scenes/levels/LuigiMansion/Mansion0.tscn b/scenes/levels/LuigiMansion/Mansion0.tscn index 5a4bd24a6..2367525f4 100644 --- a/scenes/levels/LuigiMansion/Mansion0.tscn +++ b/scenes/levels/LuigiMansion/Mansion0.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://scenes/levels/TileSet.tres" type="TileSet" id=1] [ext_resource path="res://scripts/SpawnPoint.gd" type="Script" id=2] @@ -9,7 +9,7 @@ [ext_resource path="res://scripts/BasicDialogue.gd" type="Script" id=7] [ext_resource path="res://scenes/EndPortal.tscn" type="PackedScene" id=8] [ext_resource path="res://scripts/DialogueTrigger.gd" type="Script" id=9] - +[ext_resource path="res://scenes/objects/NotesNewTrigger.tscn" type="PackedScene" id=10] [sub_resource type="GDScript" id=17] script/source = "extends Node2D @@ -118,6 +118,9 @@ tracks/2/keys = { "values": [ 0.0 ] } +[sub_resource type="RectangleShape2D" id=20] +extents = Vector2( 256, 64 ) + [sub_resource type="CircleShape2D" id=6] radius = 40.0 @@ -176,6 +179,14 @@ autoplay = "bounce" anims/RESET = SubResource( 18 ) anims/bounce = SubResource( 19 ) +[node name="NotesNewTrigger" parent="BallMario" instance=ExtResource( 10 )] +pageName = "Ball Mario" +pageDesc = "A mischievous basketball-shaped person. Despite his coin allergy, he always seems to be seeking ways to get more money. Something about his appearance seems kind of... familiar?" +pageSprite = "ball_mario" + +[node name="Collision" parent="BallMario/NotesNewTrigger" index="0"] +shape = SubResource( 20 ) + [node name="DialogueTrigger" type="Area2D" parent="."] position = Vector2( 448, 472 ) collision_layer = 0 @@ -210,3 +221,5 @@ margin_bottom = 392.0 custom_fonts/font = ExtResource( 3 ) text = "NAH" align = 1 + +[editable path="BallMario/NotesNewTrigger"] diff --git a/scenes/levels/tutorial/tutorial0.tscn b/scenes/levels/tutorial/tutorial0.tscn index b42b9f46d..a8e0a2df2 100644 --- a/scenes/levels/tutorial/tutorial0.tscn +++ b/scenes/levels/tutorial/tutorial0.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://scenes/levels/TileSet.tres" type="TileSet" id=1] [ext_resource path="res://scenes/SpawnPoint.tscn" type="PackedScene" id=2] @@ -15,6 +15,7 @@ [ext_resource path="res://scenes/boxes/GreedyCoinBox.tscn" type="PackedScene" id=13] [ext_resource path="res://scenes/objects/CameraLimits.tscn" type="PackedScene" id=14] [ext_resource path="res://scenes/objects/LimitSetArea.tscn" type="PackedScene" id=15] +[ext_resource path="res://scenes/objects/NotesNewTrigger.tscn" type="PackedScene" id=16] [sub_resource type="RectangleShape2D" id=4] extents = Vector2( 549, 152 ) @@ -98,6 +99,17 @@ position = Vector2( 3232, -96 ) position = Vector2( 2720, -160 ) bounce_count = 5 +[node name="NotesNewTrigger" parent="Objects" instance=ExtResource( 16 )] +position = Vector2( 3232, -96 ) +pageName = "Tutorial" +pageDesc = "This is the tutorial level! Not sure what that exactly means but, hey, it sounds important!" +pageSprite = "tutorial" + +[node name="NotesNewTrigger2" parent="Objects" instance=ExtResource( 16 )] +position = Vector2( 155, 448 ) +pageName = "Little Mario" +pageDesc = "Hey, that's me, Little Mario! This is where I make notes about my adventures! As I meet new people and make new discoveries, I'm going to make sure to write all about them here!" + [node name="Enemies" type="Node2D" parent="."] [node name="Bub" parent="Enemies" instance=ExtResource( 5 )] @@ -238,6 +250,16 @@ margin_bottom = -80.0 bbcode_text = "PRESS [rainbow freq=0.5 sat=1 val=1]{CTRL}[/rainbow], [rainbow freq=0.5 sat=1 val=1]{Z}[/rainbow] OR [rainbow freq=0.5 sat=1 val=1]{O}[/rainbow] TO SHOOT COLLECTED COINS!" text = "PRESS {CTRL}, {Z} OR {O} TO SHOOT COLLECTED COINS!" +[node name="Notes" parent="Decorations" instance=ExtResource( 8 )] +margin_left = 3112.0 +margin_top = -288.0 +margin_right = 3352.0 +margin_bottom = -192.0 + +[node name="RichTextLabel" parent="Decorations/Notes" index="0"] +bbcode_text = "PRESS [rainbow freq=0.5 sat=1 val=1]{N}[/rainbow] TO OPEN LITTLE MARIO'S NOTES!" +text = "PRESS {N} TO OPEN LITTLE MARIO'S NOTES!" + [node name="HoldJump" parent="Decorations" instance=ExtResource( 8 )] margin_left = 592.0 margin_top = 176.0 @@ -257,4 +279,5 @@ text = "HOLD {SPACE} TO JUMP HIGHER!" [editable path="Decorations/DoubleJump"] [editable path="Decorations/SprintJump"] [editable path="Decorations/Shoot"] +[editable path="Decorations/Notes"] [editable path="Decorations/HoldJump"] diff --git a/scenes/objects/NotesNewTrigger.tscn b/scenes/objects/NotesNewTrigger.tscn new file mode 100644 index 000000000..ba927fbd8 --- /dev/null +++ b/scenes/objects/NotesNewTrigger.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://scripts/objects/NotesNewTrigger.gd" type="Script" id=1] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 64, 64 ) + +[node name="NotesNewTrigger" type="Area2D"] +collision_layer = 0 +collision_mask = 64 +script = ExtResource( 1 ) +__meta__ = { +"_editor_description_": "Go to res://scenes/ui/Notes.tscn to add new animations." +} + +[node name="Collision" type="CollisionShape2D" parent="."] +shape = SubResource( 1 ) + +[connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/scenes/powerups/Bus.tscn b/scenes/powerups/Bus.tscn index b09d8015e..9ec740327 100644 --- a/scenes/powerups/Bus.tscn +++ b/scenes/powerups/Bus.tscn @@ -1,13 +1,22 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://sprites/powerups/just Bus-export.png" type="Texture" id=1] [ext_resource path="res://scripts/powerups/Bus.gd" type="Script" id=2] [ext_resource path="res://sprites/powerups/Mario Bus driving-Sheet-export.png" type="Texture" id=3] [ext_resource path="res://sprites/powerups/Mario Bus stationary-Sheet-export-export.png" type="Texture" id=4] +[ext_resource path="res://scenes/objects/NotesNewTrigger.tscn" type="PackedScene" id=5] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 24.5, 11.25 ) +[sub_resource type="AtlasTexture" id=6] +atlas = ExtResource( 4 ) +region = Rect2( 0, 0, 175, 82 ) + +[sub_resource type="AtlasTexture" id=7] +atlas = ExtResource( 4 ) +region = Rect2( 175, 0, 175, 82 ) + [sub_resource type="AtlasTexture" id=2] atlas = ExtResource( 3 ) region = Rect2( 0, 0, 190, 80 ) @@ -24,24 +33,16 @@ region = Rect2( 380, 0, 190, 80 ) atlas = ExtResource( 3 ) region = Rect2( 570, 0, 190, 80 ) -[sub_resource type="AtlasTexture" id=6] -atlas = ExtResource( 4 ) -region = Rect2( 0, 0, 175, 82 ) - -[sub_resource type="AtlasTexture" id=7] -atlas = ExtResource( 4 ) -region = Rect2( 175, 0, 175, 82 ) - [sub_resource type="SpriteFrames" id=8] animations = [ { -"frames": [ SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ], +"frames": [ SubResource( 6 ), SubResource( 7 ) ], "loop": true, -"name": "driving", +"name": "standing", "speed": 5.0 }, { -"frames": [ SubResource( 6 ), SubResource( 7 ) ], +"frames": [ SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ], "loop": true, -"name": "standing", +"name": "driving", "speed": 5.0 } ] @@ -65,3 +66,8 @@ position = Vector2( 13, -3 ) scale = Vector2( 0.860526, 0.875 ) frames = SubResource( 8 ) animation = "driving" + +[node name="NotesNewTrigger" parent="." instance=ExtResource( 5 )] +pageName = "Bus" +pageDesc = "I can't play basketball in this." +pageSprite = "bus" diff --git a/scenes/powerups/FireFlower.tscn b/scenes/powerups/FireFlower.tscn index 7eb7803d3..2e5b43d10 100644 --- a/scenes/powerups/FireFlower.tscn +++ b/scenes/powerups/FireFlower.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://scripts/powerups/FireFlower.gd" type="Script" id=1] [ext_resource path="res://sprites/jacob_face.jpg" type="Texture" id=2] [ext_resource path="res://scenes/ui/Themes/Default/DefaultFont.tres" type="DynamicFont" id=3] +[ext_resource path="res://scenes/objects/NotesNewTrigger.tscn" type="PackedScene" id=4] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 31.5, 43 ) @@ -38,3 +39,9 @@ B TO SHOOT FIREBALL " text = " B TO SHOOT FIREBALL " fit_content_height = true + +[node name="NotesNewTrigger" parent="." instance=ExtResource( 4 )] +pageName = "Fire Flower" +pageDesc = "Ah yes, the Inflamus imitatus, such a wonderful yet rare plant. Consumption lets lizards like me shoot magical fireballs. To avoid being eaten, the plant uses complex light manipulation to take the appearnce of a human head." +pageSprite = "fire_flower" +pageSpriteScale = Vector2( 0.8, 0.8 ) diff --git a/scenes/powerups/Magpie.tscn b/scenes/powerups/Magpie.tscn index 0589189c4..ab6b96d07 100644 --- a/scenes/powerups/Magpie.tscn +++ b/scenes/powerups/Magpie.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=76 format=2] +[gd_scene load_steps=77 format=2] [ext_resource path="res://sprites/Grapeburst Pie-Sheet.png" type="Texture" id=1] [ext_resource path="res://sprites/Boom pie-Sheet.png" type="Texture" id=2] [ext_resource path="res://scripts/powerups/Magpie.gd" type="Script" id=3] +[ext_resource path="res://scenes/objects/NotesNewTrigger.tscn" type="PackedScene" id=4] [sub_resource type="AtlasTexture" id=2] atlas = ExtResource( 1 ) @@ -318,7 +319,7 @@ script = ExtResource( 3 ) position = Vector2( 1.66893e-06, -8 ) scale = Vector2( 2, 2 ) frames = SubResource( 65 ) -frame = 3 +frame = 2 playing = true [node name="ExplosionSprite" type="AnimatedSprite" parent="."] @@ -331,3 +332,8 @@ animation = "expansion" [node name="CollisionShape" type="CollisionShape2D" parent="."] position = Vector2( 0, 4 ) shape = SubResource( 67 ) + +[node name="NotesNewTrigger" parent="." instance=ExtResource( 4 )] +pageName = "Grapeburst Pie" +pageDesc = "A hyper-reactive pie. My power level is not yet over 9000 and thus I cannot eat it; contact results in a lethal explosion. I've heard that, if one can overcome this power level threshold, it is possible to eat this pie, revealing it is tastier than anything else in this world." +pageSprite = "grapeburst_pie" diff --git a/scenes/ui/Notes.tscn b/scenes/ui/Notes.tscn new file mode 100644 index 000000000..b10744edb --- /dev/null +++ b/scenes/ui/Notes.tscn @@ -0,0 +1,344 @@ +[gd_scene load_steps=46 format=2] + +[ext_resource path="res://fonts/ALittleNameCalle.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://sprites/mario.png" type="Texture" id=2] +[ext_resource path="res://scripts/ui/Notes.gd" type="Script" id=3] +[ext_resource path="res://scenes/ui/NotesButton.tscn" type="PackedScene" id=4] +[ext_resource path="res://sprites/NPCs/blug.png" type="Texture" id=5] +[ext_resource path="res://scenes/ui/Themes/NoteBox.tres" type="StyleBox" id=6] +[ext_resource path="res://sprites/ui/notes/tutorial_pic.png" type="Texture" id=7] +[ext_resource path="res://sprites/ui/notes/bubpic.png" type="Texture" id=8] +[ext_resource path="res://sprites/Grapeburst Pie-Sheet.png" type="Texture" id=9] +[ext_resource path="res://sprites/ballmario.png" type="Texture" id=10] +[ext_resource path="res://sprites/powerups/Mario Bus driving-Sheet-export.png" type="Texture" id=11] +[ext_resource path="res://sprites/jacob_face.jpg" type="Texture" id=12] +[ext_resource path="res://scenes/ui/Themes/NoteBoxPress.tres" type="StyleBox" id=14] +[ext_resource path="res://scenes/ui/Themes/NoteBoxFocus.tres" type="StyleBox" id=15] + +[sub_resource type="DynamicFont" id=5] +font_data = ExtResource( 1 ) + +[sub_resource type="AtlasTexture" id=29] +atlas = ExtResource( 11 ) +region = Rect2( 0, 0, 190, 80 ) + +[sub_resource type="AtlasTexture" id=30] +atlas = ExtResource( 11 ) +region = Rect2( 190, 0, 190, 80 ) + +[sub_resource type="AtlasTexture" id=31] +atlas = ExtResource( 11 ) +region = Rect2( 380, 0, 190, 80 ) + +[sub_resource type="AtlasTexture" id=32] +atlas = ExtResource( 11 ) +region = Rect2( 570, 0, 190, 80 ) + +[sub_resource type="AtlasTexture" id=6] +atlas = ExtResource( 2 ) +region = Rect2( 0, 32, 32, 32 ) + +[sub_resource type="AtlasTexture" id=7] +atlas = ExtResource( 2 ) +region = Rect2( 32, 32, 32, 32 ) + +[sub_resource type="AtlasTexture" id=8] +atlas = ExtResource( 2 ) +region = Rect2( 64, 32, 32, 32 ) + +[sub_resource type="AtlasTexture" id=9] +atlas = ExtResource( 2 ) +region = Rect2( 96, 32, 32, 32 ) + +[sub_resource type="AtlasTexture" id=10] +atlas = ExtResource( 2 ) +region = Rect2( 128, 32, 32, 32 ) + +[sub_resource type="AtlasTexture" id=11] +atlas = ExtResource( 2 ) +region = Rect2( 160, 32, 32, 32 ) + +[sub_resource type="AtlasTexture" id=13] +atlas = ExtResource( 8 ) +region = Rect2( 0, 16, 16, 16 ) + +[sub_resource type="AtlasTexture" id=14] +atlas = ExtResource( 8 ) +region = Rect2( 16, 16, 16, 16 ) + +[sub_resource type="AtlasTexture" id=15] +atlas = ExtResource( 8 ) +region = Rect2( 32, 16, 16, 16 ) + +[sub_resource type="AtlasTexture" id=16] +atlas = ExtResource( 8 ) +region = Rect2( 48, 16, 16, 16 ) + +[sub_resource type="AtlasTexture" id=17] +atlas = ExtResource( 8 ) +region = Rect2( 64, 16, 16, 16 ) + +[sub_resource type="AtlasTexture" id=18] +atlas = ExtResource( 8 ) +region = Rect2( 80, 16, 16, 16 ) + +[sub_resource type="AtlasTexture" id=19] +atlas = ExtResource( 9 ) +region = Rect2( 0, 0, 40, 40 ) + +[sub_resource type="AtlasTexture" id=20] +atlas = ExtResource( 9 ) +region = Rect2( 40, 0, 40, 40 ) + +[sub_resource type="AtlasTexture" id=21] +atlas = ExtResource( 9 ) +region = Rect2( 80, 0, 40, 40 ) + +[sub_resource type="AtlasTexture" id=22] +atlas = ExtResource( 9 ) +region = Rect2( 120, 0, 40, 40 ) + +[sub_resource type="AtlasTexture" id=23] +atlas = ExtResource( 9 ) +region = Rect2( 0, 40, 40, 40 ) + +[sub_resource type="AtlasTexture" id=24] +atlas = ExtResource( 9 ) +region = Rect2( 40, 40, 40, 40 ) + +[sub_resource type="AtlasTexture" id=25] +atlas = ExtResource( 9 ) +region = Rect2( 80, 40, 40, 40 ) + +[sub_resource type="AtlasTexture" id=26] +atlas = ExtResource( 9 ) +region = Rect2( 120, 40, 40, 40 ) + +[sub_resource type="AtlasTexture" id=27] +atlas = ExtResource( 9 ) +region = Rect2( 0, 80, 40, 40 ) + +[sub_resource type="AtlasTexture" id=28] +atlas = ExtResource( 9 ) +region = Rect2( 40, 80, 40, 40 ) + +[sub_resource type="SpriteFrames" id=2] +animations = [ { +"frames": [ SubResource( 29 ), SubResource( 30 ), SubResource( 31 ), SubResource( 32 ) ], +"loop": true, +"name": "bus", +"speed": 15.0 +}, { +"frames": [ SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ), SubResource( 11 ) ], +"loop": true, +"name": "little_mario", +"speed": 10.0 +}, { +"frames": [ ExtResource( 12 ) ], +"loop": true, +"name": "fire_flower", +"speed": 5.0 +}, { +"frames": [ ExtResource( 5 ) ], +"loop": true, +"name": "blug", +"speed": 5.0 +}, { +"frames": [ ExtResource( 10 ) ], +"loop": true, +"name": "ball_mario", +"speed": 5.0 +}, { +"frames": [ ExtResource( 7 ) ], +"loop": true, +"name": "tutorial", +"speed": 5.0 +}, { +"frames": [ SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 17 ), SubResource( 18 ) ], +"loop": true, +"name": "bub", +"speed": 10.0 +}, { +"frames": [ SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ) ], +"loop": true, +"name": "grapeburst_pie", +"speed": 10.0 +} ] + +[sub_resource type="DynamicFont" id=3] +size = 32 +outline_size = 2 +outline_color = Color( 0.133333, 0.137255, 0.223529, 1 ) +extra_spacing_top = 4 +font_data = ExtResource( 1 ) + +[sub_resource type="DynamicFont" id=12] +font_data = ExtResource( 1 ) + +[sub_resource type="DynamicFont" id=33] +size = 32 +outline_color = Color( 0, 0, 0, 1 ) +extra_spacing_top = 1 +extra_spacing_bottom = 1 +font_data = ExtResource( 1 ) + +[node name="Notes" type="CanvasLayer"] +pause_mode = 2 +layer = 2 +script = ExtResource( 3 ) +noteButton = ExtResource( 4 ) + +[node name="Hbox" type="HBoxContainer" parent="."] +pause_mode = 2 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -414.0 +margin_top = -210.0 +margin_right = 414.0 +margin_bottom = 210.0 +alignment = 1 + +[node name="Scroll" type="ScrollContainer" parent="Hbox"] +pause_mode = 2 +margin_left = 28.0 +margin_right = 284.0 +margin_bottom = 492.0 +follow_focus = true +scroll_horizontal_enabled = false + +[node name="VBox" type="VBoxContainer" parent="Hbox/Scroll"] +pause_mode = 2 +margin_right = 256.0 +margin_bottom = 119.0 +rect_min_size = Vector2( 256, 0 ) + +[node name="Button" parent="Hbox/Scroll/VBox" instance=ExtResource( 4 )] +margin_right = 256.0 +margin_bottom = 23.0 +custom_colors/font_color_focus = Color( 0.133333, 0.137255, 0.223529, 1 ) +custom_colors/font_color_hover = Color( 0.235294, 0.419608, 0.588235, 1 ) + +[node name="Button2" type="Button" parent="Hbox/Scroll/VBox"] +margin_top = 27.0 +margin_right = 256.0 +margin_bottom = 47.0 +custom_fonts/font = SubResource( 5 ) +text = "Mega Lawrence" + +[node name="Button3" type="Button" parent="Hbox/Scroll/VBox"] +margin_top = 51.0 +margin_right = 256.0 +margin_bottom = 71.0 +custom_fonts/font = SubResource( 5 ) +text = "Mega Lawrence 2" + +[node name="Button4" type="Button" parent="Hbox/Scroll/VBox"] +margin_top = 75.0 +margin_right = 256.0 +margin_bottom = 95.0 +custom_fonts/font = SubResource( 5 ) +text = "Gassy Randall" + +[node name="Button5" type="Button" parent="Hbox/Scroll/VBox"] +margin_top = 99.0 +margin_right = 256.0 +margin_bottom = 119.0 +custom_fonts/font = SubResource( 5 ) +text = "Greasy Steve" + +[node name="VBox" type="VBoxContainer" parent="Hbox"] +pause_mode = 2 +margin_left = 288.0 +margin_right = 800.0 +margin_bottom = 492.0 +rect_min_size = Vector2( 512, 0 ) + +[node name="Panel" type="Panel" parent="Hbox/VBox"] +pause_mode = 2 +margin_right = 512.0 +margin_bottom = 256.0 +rect_min_size = Vector2( 512, 256 ) +custom_styles/panel = ExtResource( 6 ) + +[node name="Sprite" type="AnimatedSprite" parent="Hbox/VBox/Panel"] +pause_mode = 2 +position = Vector2( 256, 128 ) +scale = Vector2( 2, 2 ) +frames = SubResource( 2 ) +animation = "bus" +frame = 1 +playing = true +__meta__ = { +"_editor_description_": "The animation played by this node is the \"Page Sprite\" set using a NotesNewTrigger." +} + +[node name="Center" type="CenterContainer" parent="Hbox/VBox"] +pause_mode = 2 +margin_top = 260.0 +margin_right = 512.0 +margin_bottom = 296.0 +rect_min_size = Vector2( 256, 16 ) + +[node name="Panel" type="Panel" parent="Hbox/VBox/Center"] +margin_right = 512.0 +margin_bottom = 36.0 +rect_min_size = Vector2( 512, 36 ) +size_flags_horizontal = 3 +custom_styles/panel = ExtResource( 6 ) + +[node name="Name" type="Label" parent="Hbox/VBox/Center"] +pause_mode = 2 +margin_left = 112.0 +margin_top = 2.0 +margin_right = 400.0 +margin_bottom = 34.0 +rect_min_size = Vector2( 0, 28 ) +custom_fonts/font = SubResource( 3 ) +text = "Little Mario" + +[node name="Center2" type="CenterContainer" parent="Hbox/VBox"] +pause_mode = 2 +margin_top = 300.0 +margin_right = 512.0 +margin_bottom = 492.0 + +[node name="Panel" type="Panel" parent="Hbox/VBox/Center2"] +margin_right = 512.0 +margin_bottom = 192.0 +rect_min_size = Vector2( 512, 192 ) +custom_styles/panel = ExtResource( 6 ) + +[node name="Description" type="Label" parent="Hbox/VBox/Center2"] +pause_mode = 2 +margin_left = 4.0 +margin_top = 4.0 +margin_right = 508.0 +margin_bottom = 188.0 +rect_min_size = Vector2( 504, 184 ) +rect_clip_content = true +size_flags_horizontal = 5 +custom_colors/font_color = Color( 0.133333, 0.137255, 0.223529, 1 ) +custom_fonts/font = SubResource( 12 ) +text = "Hey, that's me, Little Mario! This is where I make notes about my adventures! As I meet new people and make new discoveries, I'm going to make sure to write all about them here!" +align = 1 +autowrap = true + +[node name="Exit" type="Button" parent="."] +margin_left = 904.0 +margin_top = 72.0 +margin_right = 936.0 +margin_bottom = 110.0 +custom_colors/font_color_focus = Color( 0.133333, 0.137255, 0.223529, 1 ) +custom_colors/font_color = Color( 0.133333, 0.137255, 0.223529, 1 ) +custom_colors/font_color_hover = Color( 0.133333, 0.137255, 0.223529, 1 ) +custom_colors/font_color_pressed = Color( 0.235294, 0.419608, 0.588235, 1 ) +custom_fonts/font = SubResource( 33 ) +custom_styles/hover = ExtResource( 15 ) +custom_styles/pressed = ExtResource( 14 ) +custom_styles/focus = ExtResource( 15 ) +custom_styles/normal = ExtResource( 6 ) +text = "X" + +[connection signal="pressed" from="Exit" to="." method="_on_Exit_pressed"] diff --git a/scenes/ui/NotesButton.tscn b/scenes/ui/NotesButton.tscn new file mode 100644 index 000000000..21d213eb1 --- /dev/null +++ b/scenes/ui/NotesButton.tscn @@ -0,0 +1,29 @@ +[gd_scene load_steps=7 format=2] + +[ext_resource path="res://fonts/ALittleNameCalle.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://scripts/ui/NotesButton.gd" type="Script" id=2] +[ext_resource path="res://scenes/ui/Themes/NoteBox.tres" type="StyleBox" id=3] +[ext_resource path="res://scenes/ui/Themes/NoteBoxFocus.tres" type="StyleBox" id=4] +[ext_resource path="res://scenes/ui/Themes/NoteBoxPress.tres" type="StyleBox" id=5] + +[sub_resource type="DynamicFont" id=1] +extra_spacing_top = 1 +font_data = ExtResource( 1 ) + +[node name="NotesButton" type="Button"] +pause_mode = 2 +margin_right = 192.0 +margin_bottom = 20.0 +custom_colors/font_color_focus = Color( 0.133333, 0.137255, 0.223529, 1 ) +custom_colors/font_color = Color( 0.133333, 0.137255, 0.223529, 1 ) +custom_colors/font_color_hover = Color( 0.235294, 0.419608, 0.588235, 1 ) +custom_colors/font_color_pressed = Color( 0.235294, 0.419608, 0.588235, 1 ) +custom_fonts/font = SubResource( 1 ) +custom_styles/hover = ExtResource( 5 ) +custom_styles/pressed = ExtResource( 5 ) +custom_styles/focus = ExtResource( 4 ) +custom_styles/normal = ExtResource( 3 ) +text = "Little Mario" +script = ExtResource( 2 ) + +[connection signal="focus_entered" from="." to="." method="_on_focus_entered"] diff --git a/scenes/ui/Themes/NoteBox.tres b/scenes/ui/Themes/NoteBox.tres new file mode 100644 index 000000000..6b2160cc3 --- /dev/null +++ b/scenes/ui/Themes/NoteBox.tres @@ -0,0 +1,13 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=2] + +[ext_resource path="res://sprites/ui/note1.png" type="Texture" id=1] + +[resource] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 10, 10 ) +margin_left = 4.0 +margin_right = 4.0 +margin_top = 4.0 +margin_bottom = 4.0 +axis_stretch_horizontal = 1 +axis_stretch_vertical = 1 diff --git a/scenes/ui/Themes/NoteBoxFocus.tres b/scenes/ui/Themes/NoteBoxFocus.tres new file mode 100644 index 000000000..70ae97bf2 --- /dev/null +++ b/scenes/ui/Themes/NoteBoxFocus.tres @@ -0,0 +1,11 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=2] + +[ext_resource path="res://sprites/ui/note2.png" type="Texture" id=1] + +[resource] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 10, 10 ) +margin_left = 4.0 +margin_right = 4.0 +margin_top = 4.0 +margin_bottom = 4.0 diff --git a/scenes/ui/Themes/NoteBoxPress.tres b/scenes/ui/Themes/NoteBoxPress.tres new file mode 100644 index 000000000..9327d2701 --- /dev/null +++ b/scenes/ui/Themes/NoteBoxPress.tres @@ -0,0 +1,11 @@ +[gd_resource type="StyleBoxTexture" load_steps=2 format=2] + +[ext_resource path="res://sprites/ui/note3.png" type="Texture" id=1] + +[resource] +texture = ExtResource( 1 ) +region_rect = Rect2( 0, 0, 10, 10 ) +margin_left = 4.0 +margin_right = 4.0 +margin_top = 4.0 +margin_bottom = 4.0 diff --git a/scripts/autoload/EventBus.gd b/scripts/autoload/EventBus.gd index dc893510c..25beef940 100644 --- a/scripts/autoload/EventBus.gd +++ b/scripts/autoload/EventBus.gd @@ -66,3 +66,6 @@ signal volume_changed(data) # Environmental signal big_button_pressed(button_id) signal show_all_portals() + +# Notes +signal note_added(name, desc, sprite, spriteScale) diff --git a/scripts/objects/NotesNewTrigger.gd b/scripts/objects/NotesNewTrigger.gd new file mode 100644 index 000000000..7f1fb9f00 --- /dev/null +++ b/scripts/objects/NotesNewTrigger.gd @@ -0,0 +1,19 @@ +extends Area2D + + +export (String) var pageName = "blank" +export (String, MULTILINE) var pageDesc = "blank blank more blank blank blank change this etc" + +# This the name of the animation to be displayed by the AnimatedSprite. +# Set this to one currently available there, or add a new one. +# You can check what's already there or add a new animation by going to +# res://scenes/ui/Notes.tscn and going to the node called "Sprite". +export (String) var pageSprite = "little_mario" +export (Vector2) var pageSpriteScale = Vector2(2, 2) + + +func _on_body_entered(body): + if body is Player: + EventBus.emit_signal("note_added", pageName, pageDesc, pageSprite, pageSpriteScale) + set_deferred("monitoring", false) + diff --git a/scripts/ui/Notes.gd b/scripts/ui/Notes.gd new file mode 100644 index 000000000..df290b3c9 --- /dev/null +++ b/scripts/ui/Notes.gd @@ -0,0 +1,73 @@ +extends CanvasLayer + + +var pages = {} + +export (PackedScene) var noteButton + +onready var _list := $Hbox/Scroll/VBox +onready var _sprite := $Hbox/VBox/Panel/Sprite +onready var _name := $Hbox/VBox/Center/Name +onready var _desc := $Hbox/VBox/Center2/Description +onready var _hbox := $Hbox +onready var _exit := $Exit + + +func _ready(): + $Hbox.visible = false + $Exit.visible = false + EventBus.connect("note_added", self, "_on_note_added") + remove_pages() + + +func _process(delta): + if Input.is_action_just_pressed("show_notes") or (Input.is_action_just_pressed("pause") and _hbox.visible): + toggle_visible() + + +func toggle_visible(): + if _hbox.visible: + _hbox.visible = false + _exit.visible = false + get_tree().paused = false + elif get_tree().paused == false: + _hbox.visible = true + _exit.visible = true + if _list.get_child_count() > 0: + _list.get_child(0).grab_focus() + get_tree().paused = true + + +func remove_pages(): + for node in _list.get_children(): + node.queue_free() + + +func add_page(name, desc, sprite, spriteScale): + pages[name] = {"desc": desc, "sprite" : sprite, "scale" : spriteScale} + + +func add_button(name): + var button = noteButton.instance() + button.text = name + button.connect("page_changed", self, "_on_page_changed") + _list.add_child(button) + + +func _on_note_added(name, desc, sprite, spriteScale): + if not pages.has(name): + add_button(name) + add_page(name, desc, sprite, spriteScale) + + +func _on_page_changed(pageName): + var pageInfo = pages.get(pageName) + _name.text = pageName + _desc.text = pageInfo.desc + _sprite.animation = pageInfo.sprite + _sprite.scale = pageInfo.scale + + +func _on_Exit_pressed(): + toggle_visible() + diff --git a/scripts/ui/NotesButton.gd b/scripts/ui/NotesButton.gd new file mode 100644 index 000000000..8c5dc07c6 --- /dev/null +++ b/scripts/ui/NotesButton.gd @@ -0,0 +1,13 @@ +extends Button + + +signal page_changed(pageName) + + +func _on_focus_entered(): + emit_current_focus() + + +func emit_current_focus(): + emit_signal("page_changed", text) + diff --git a/sprites/ui/note.png.import b/sprites/ui/note.png.import new file mode 100644 index 000000000..a4b0c8707 --- /dev/null +++ b/sprites/ui/note.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/note.png-d5ff0d1e2a2c8db2f420e7bbd10d4040.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/ui/note.png" +dest_files=[ "res://.import/note.png-d5ff0d1e2a2c8db2f420e7bbd10d4040.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/ui/note1.png b/sprites/ui/note1.png new file mode 100644 index 0000000000000000000000000000000000000000..c28cb49b9f71a5874d1a06231cd7022358319b12 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2VGmzZ%#=aj&F%}28J29*~C-V}>;R)~waRt&M z;wo?7-raigtn|dzi$Fe0NswPK!~g&PH|sid0QpLuE{-7_Gm{e%5?Gko1R9JbC1)OF lIN_LVWSE$owCZS<9)qG7!%U4P)^4C`22WQ%mvv4FO#m-qC!qiU literal 0 HcmV?d00001 diff --git a/sprites/ui/note1.png.import b/sprites/ui/note1.png.import new file mode 100644 index 000000000..1bcbfefd5 --- /dev/null +++ b/sprites/ui/note1.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/note1.png-b0870bad473ba93637dcbf6b8588cd6a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/ui/note1.png" +dest_files=[ "res://.import/note1.png-b0870bad473ba93637dcbf6b8588cd6a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/ui/note2.png b/sprites/ui/note2.png new file mode 100644 index 0000000000000000000000000000000000000000..f5bd68ba437008e6133fa2dd79f4d43723262708 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2VGmzZ%#=aj&F%}28J29*~C-V}>;R)~waRt&M z;wo?7-raigtn|dzi$Fe0NswPK!~g&PH|sid0QriZE{-7_Gm{e%5}26T1R9KI&X{qK k;e=zdlYy0Rux?l}qjnm@$-*l_d_ctvp00i_>zopr02y&7$^ZZW literal 0 HcmV?d00001 diff --git a/sprites/ui/note2.png.import b/sprites/ui/note2.png.import new file mode 100644 index 000000000..daf2725ee --- /dev/null +++ b/sprites/ui/note2.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/note2.png-702ee4c62ecd33012bfd8b683d973a8e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/ui/note2.png" +dest_files=[ "res://.import/note2.png-702ee4c62ecd33012bfd8b683d973a8e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/ui/note3.png b/sprites/ui/note3.png new file mode 100644 index 0000000000000000000000000000000000000000..70ed818c348323dc13fc7f88e627e17045c7cf8c GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2VGmzZ%#=aj&F%}28J29*~C-V}>;R)~waRt&M z;wo?7-raigtn|dzi$Fe0NswPK!~g&PH|sid0QpLuE{-7_Gm{e%5}26T1R9KI&X{qK m;e=zdkx^1|(yF6bdJI}!3`Z4XxLARz89ZJ6T-G@yGywotgeaN- literal 0 HcmV?d00001 diff --git a/sprites/ui/note3.png.import b/sprites/ui/note3.png.import new file mode 100644 index 000000000..b8cf1db2a --- /dev/null +++ b/sprites/ui/note3.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/note3.png-1cb2caca82d545f83c7ecc255795d887.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/ui/note3.png" +dest_files=[ "res://.import/note3.png-1cb2caca82d545f83c7ecc255795d887.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/ui/notes/bubpic.png b/sprites/ui/notes/bubpic.png new file mode 100644 index 0000000000000000000000000000000000000000..b2279b01048827563fee31f0e51d10f12a20f805 GIT binary patch literal 1167 zcmV;A1aSL_P)Px(Nl8RORA_ENUpT%=MG=psmIpj)9rT52E$`bePab12xQfyN=;EIxF`W$_!Hm$`!8@dbKTYV z@@^TYxipP&NoT@tN4o@sbLl!uqNzW@+01pUkDqY1SJ!SLzg2G9$FJZ)u6e&F8bIJA zFL}4|Iloor$K)V|sXqYRoS6myL`M>^jta4)yONzg6bQ)5ZGu z3D(C?@ags>7QgRNTWxtxSm92@{t#{*73ejwTSo;vJQ(E0_tXm4SfJcKd`Fhp10$tGnQbga%2EH!D z=?mwc~01c1P3F5(_Ffa9MFINg>;_NT$+$4G|<%F-hK}N2mvUj zfE%wLDC=#E9hL{`1WfkPtbb)QiSvmy06=j6sX)Tc=sZGq9w9QD_sl;WiehZ2hQn`t z_0LPk06@pEAol=Z>iIAL1gf^xT@9#gCSh;C$E`2#q~ml5WI;$^iw7D6c%`<%|)K6b~>2c;U~~z~-lQuPfdGe{kW&&?qP>#BjHJ z=dZHq-1FhXhmQ`zvzM?JKcqT|PUSCb#V(S7=|0|cepCNW=FjeeJki5h=*qd>r04(b z{5d&VmHk>OBOfUjnHl)$>jBrwuUC!>hK1aMNA~fMO~O z>}RP?4p3=V5VB0?XZZ^|N0Tq6vVs)t^#8ncEXdi#RF;dWlCx#9Gl8TY%7gBCf-Haf1XOK{lTFE2 z2SADECY6Ca35obXATpb;GpnSnUykhDJEQaT+TI47E04w4P%SX^e7Fvz`5UPu7t`IB zLjV90@c}sNQSsp9jcuwde?g9Jk|!pjBdf|JTwOUn002ovPDHLkV1h{iG%NrB literal 0 HcmV?d00001 diff --git a/sprites/ui/notes/bubpic.png.import b/sprites/ui/notes/bubpic.png.import new file mode 100644 index 000000000..c8e41ff26 --- /dev/null +++ b/sprites/ui/notes/bubpic.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bubpic.png-fad40afa210ad25ca686132593bea9d8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/ui/notes/bubpic.png" +dest_files=[ "res://.import/bubpic.png-fad40afa210ad25ca686132593bea9d8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/ui/notes/tutorial_pic.png b/sprites/ui/notes/tutorial_pic.png new file mode 100644 index 0000000000000000000000000000000000000000..6a56e219495e2e176bed10054346138d75119d66 GIT binary patch literal 1402 zcmV-=1%>*FP)Px)G)Y83RCt{2oxhIUHV}tLE9n3MzH3sXGZ3T*;O+`Hc@#H6{044NND8|+1oi<7+)82!?P!M-Nl81}%dYtQfWt`?#no~@4TseI$-e*QD?@_c z?i&IiM3a}+{^ozW4zLm+5KsYufQrJ+dA@!6g|+{1_wQp~4>&XKu5YaUKR(`D`-nh5 z1q1>rAP`VdxCL&`^UI%qJ=(>9^W)vC=hprYzaj?$3j%?F3J3&LKp>z30s$2e2&jNS zK*eAk=ospzC1VVgMNYfAp)AX&$U8T8b@!}|%Vgb9J4EC??t|Nx=Y*~&)V^$k$+E1k zD+yhfY};4g?T59X7HC&DeaBsuMZdk-Y^ZHptL|pAA!CeH-`5UN*U@7V?dpc!(&3yJ zbw)%)hJNnar4*|=F9!Hd~Ev<(!3wGo!uJxap(iRDTif5WW6s*s2|oM(W397 zZVnyg>rA&JV;Ezs_FSYqFQ^ko%H&=TQ75H)eX>q=d-z%kZ9kkl>Ifu16ko^iabHKq z+6&#$R=xe_6=wVmW!>$gV8*7(n7=5M=4Lp?j;Gt6vp;Ly`SpBgZ;!;_32$Of6 zdk6aPb?DrVc84wNdg!}h*@tjjvEgg(haZYWYvW{@T#;`ELizUH@=$%3vdH`Ba|}L_ z$|9dU`-R#+x$tPV+;^zOY_nMbbzX5s1hh|3llcvRL`l*PU`bQ}(sjHRnBFI*TnN z${851bI9aahHlOej4@WS>8>d;TrSs^}-~W2X0fK0s;XQ5D2JPEC;%DK7F?TXu!?&lR=q020D@#h$X42$|~P( zw}Ucy3=(xDEzqaW_q`k`pG+)`?^ziVX$UkxN;G9wmO9B! z3j_ixAka*BxRZ;BDK97{ zp978I`;k|7_Lg#D4S~r2GeWL7?!HXCrBJC!l(azdH!@s#c%OyviG+kZVSz%wkr9d{ zF_BUxNrA?Otk^IV6DhUfizrcnTzo^;7_LYu%0mQ!ERK;NRdJXk1#%x>q&oa8L6QOy z*^e(E&+#NH5D~;#0zAq9Dj*P00fB%D2n19NlIXkZ8*BgFtLKk)G2r|tfB(lRxw7^U zfq)7K1XMsEpdx$r^lSV_5-^#+@9ckfjR*u(Kp>z30s$5O0Y%!P`&In15&!@I07*qo IM6N<$f&{LIn*aa+ literal 0 HcmV?d00001 diff --git a/sprites/ui/notes/tutorial_pic.png.import b/sprites/ui/notes/tutorial_pic.png.import new file mode 100644 index 000000000..9a97d7658 --- /dev/null +++ b/sprites/ui/notes/tutorial_pic.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/tutorial_pic.png-c35886d21586a6ce2fcba23582bf1eb9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/ui/notes/tutorial_pic.png" +dest_files=[ "res://.import/tutorial_pic.png-c35886d21586a6ce2fcba23582bf1eb9.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0