diff --git a/Main.tscn b/Main.tscn index d4badb8..3408eb6 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=23 format=2] [ext_resource path="res://assets/Backgrounds/bgmuck.png" type="Texture" id=1] [ext_resource path="res://src/playerC/Player.tscn" type="PackedScene" id=2] @@ -7,6 +7,8 @@ [ext_resource path="res://src/CameraControl-Position2D.gd" type="Script" id=5] [ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=6] [ext_resource path="res://src/enemyC/EnemyC.tscn" type="PackedScene" id=7] +[ext_resource path="res://assets/Fonts/QuinqueFive.tres" type="DynamicFont" id=8] +[ext_resource path="res://src/UI_Dialog.tscn" type="PackedScene" id=9] [sub_resource type="ConvexPolygonShape2D" id=2] points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 ) @@ -216,3 +218,15 @@ position = Vector2( 492, 27 ) [node name="ActorTemplate" parent="." instance=ExtResource( 6 )] position = Vector2( 262, 44 ) actor_type = "NPC" + +[node name="UI_Dialog" parent="." instance=ExtResource( 9 )] + +[node name="Label" type="Label" parent="."] +visible = false +margin_left = 75.0 +margin_top = 14.0 +margin_right = 301.0 +margin_bottom = 53.0 +custom_fonts/font = ExtResource( 8 ) +text = "In a world where danger lurks in your plumbing. One thing decides to do another thing and we all determine it wasn't worth it. Hello World" +autowrap = true diff --git a/assets/Fonts/PublicPixel.tres b/assets/Fonts/PublicPixel.tres new file mode 100644 index 0000000..16e4790 --- /dev/null +++ b/assets/Fonts/PublicPixel.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[sub_resource type="DynamicFontData" id=1] +antialiased = false +font_path = "res://assets/Fonts/PublicPixel.ttf" + +[resource] +size = 8 +font_data = SubResource( 1 ) diff --git a/assets/Fonts/PublicPixel.ttf b/assets/Fonts/PublicPixel.ttf new file mode 100644 index 0000000..2edc14c Binary files /dev/null and b/assets/Fonts/PublicPixel.ttf differ diff --git a/assets/Fonts/QuinqueFive.tres b/assets/Fonts/QuinqueFive.tres new file mode 100644 index 0000000..958242b --- /dev/null +++ b/assets/Fonts/QuinqueFive.tres @@ -0,0 +1,8 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[sub_resource type="DynamicFontData" id=1] +font_path = "res://assets/Fonts/QuinqueFive.ttf" + +[resource] +size = 5 +font_data = SubResource( 1 ) diff --git a/assets/Fonts/QuinqueFive.ttf b/assets/Fonts/QuinqueFive.ttf new file mode 100644 index 0000000..a89a6e9 Binary files /dev/null and b/assets/Fonts/QuinqueFive.ttf differ diff --git a/assets/Fonts/SMB.tres b/assets/Fonts/SMB.tres new file mode 100644 index 0000000..4d80bc0 --- /dev/null +++ b/assets/Fonts/SMB.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[sub_resource type="DynamicFontData" id=1] +antialiased = false +font_path = "res://assets/Fonts/Super Mario Bros. NES.ttf" + +[resource] +size = 4 +font_data = SubResource( 1 ) diff --git a/assets/Fonts/Super Mario Bros. NES.ttf b/assets/Fonts/Super Mario Bros. NES.ttf new file mode 100644 index 0000000..b6cd7d9 Binary files /dev/null and b/assets/Fonts/Super Mario Bros. NES.ttf differ diff --git a/assets/Fonts/m5x7.tres b/assets/Fonts/m5x7.tres new file mode 100644 index 0000000..637d034 --- /dev/null +++ b/assets/Fonts/m5x7.tres @@ -0,0 +1,8 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[sub_resource type="DynamicFontData" id=1] +antialiased = false +font_path = "res://assets/Fonts/m5x7.ttf" + +[resource] +font_data = SubResource( 1 ) diff --git a/assets/Fonts/m5x7.ttf b/assets/Fonts/m5x7.ttf new file mode 100644 index 0000000..2ed774d Binary files /dev/null and b/assets/Fonts/m5x7.ttf differ diff --git a/src/UI_Dialog.tscn b/src/UI_Dialog.tscn new file mode 100644 index 0000000..9c73b74 --- /dev/null +++ b/src/UI_Dialog.tscn @@ -0,0 +1,39 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://assets/Fonts/QuinqueFive.tres" type="DynamicFont" id=1] +[ext_resource path="res://icon.png" type="Texture" id=2] + +[node name="UI_Dialog" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 + +[node name="PanelContainer" type="PanelContainer" parent="."] +margin_left = 2.0 +margin_top = 2.0 +margin_right = 318.0 +margin_bottom = 80.0 + +[node name="HSplitContainer" type="HSplitContainer" parent="PanelContainer"] +margin_left = 7.0 +margin_top = 7.0 +margin_right = 309.0 +margin_bottom = 71.0 +size_flags_vertical = 0 +split_offset = 1 + +[node name="TextureRect" type="TextureRect" parent="PanelContainer/HSplitContainer"] +margin_right = 64.0 +margin_bottom = 64.0 +grow_vertical = 2 +size_flags_vertical = 5 +texture = ExtResource( 2 ) + +[node name="Label" type="Label" parent="PanelContainer/HSplitContainer"] +margin_left = 77.0 +margin_right = 302.0 +margin_bottom = 64.0 +size_flags_vertical = 1 +size_flags_stretch_ratio = 5.0 +custom_fonts/font = ExtResource( 1 ) +text = "In a world where danger lurks in your plumbing. One thing decides to do another thing and we all determine it wasn't worth it. Hello World" +autowrap = true diff --git a/src/enemyC/EnemyC.tscn b/src/enemyC/EnemyC.tscn index f6ab261..f847d4e 100644 --- a/src/enemyC/EnemyC.tscn +++ b/src/enemyC/EnemyC.tscn @@ -127,7 +127,7 @@ actor_type = "Enemy" position = Vector2( 11, -7 ) frames = SubResource( 20 ) animation = "idle" -frame = 0 +frame = 2 __meta__ = { "_aseprite_wizard_config_": { "layer": "",