Little Mario's Notes (#569)

* change pause modes to fix UI inputs

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]
 

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,13 +29,15 @@ 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 )
 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 )]

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,22 +46,26 @@ 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 ) ],
 "loop": true,
 "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"]

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"

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"]

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"]

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"]

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"]

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"