diff --git a/Scenes/Actors/Rumia.tscn b/Scenes/Actors/Rumia.tscn index 308110f2..457c2c4e 100644 --- a/Scenes/Actors/Rumia.tscn +++ b/Scenes/Actors/Rumia.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=12 format=3 uid="uid://d1rlw6ddpmrn8"] +[gd_scene load_steps=13 format=3 uid="uid://d1rlw6ddpmrn8"] [ext_resource type="Script" path="res://Scripts/Actors/Boss.cs" id="1_na4uq"] [ext_resource type="Resource" uid="uid://ks6fypeil6gk" path="res://Resources/BossPhases/TestBoss1.tres" id="2_1rhf6"] [ext_resource type="Texture2D" uid="uid://bcqgke6dthlrj" path="res://Sprites/Actors/Rumia.png" id="2_7k5gp"] [ext_resource type="Script" path="res://Scripts/Components/ProximityPlayerDetection.cs" id="3_gka5j"] +[ext_resource type="Resource" uid="uid://ccj0cqbveey8c" path="res://Resources/BossPhases/Rumia_SP1.tres" id="3_j7lbl"] [ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="4_xc6nm"] [ext_resource type="PackedScene" uid="uid://cuixq5ex0j40h" path="res://Scenes/enemyBullet.tscn" id="5_g1p0m"] [ext_resource type="Script" path="res://Scripts/Components/BulletSpawner.cs" id="7_2obh7"] @@ -24,7 +25,7 @@ size = Vector2(8, 12) collision_layer = 16 collision_mask = 9 script = ExtResource("1_na4uq") -Phases = Array[Resource]([ExtResource("2_1rhf6")]) +Phases = Array[Resource]([ExtResource("2_1rhf6"), ExtResource("3_j7lbl")]) Health = 1000.0 metadata/_edit_group_ = true diff --git a/Scenes/MainMenu.tscn b/Scenes/MainMenu.tscn index 1c1b888f..475270df 100644 --- a/Scenes/MainMenu.tscn +++ b/Scenes/MainMenu.tscn @@ -1,31 +1,36 @@ -[gd_scene load_steps=2 format=3 uid="uid://5xajclchk3my"] +[gd_scene load_steps=5 format=3 uid="uid://5xajclchk3my"] [ext_resource type="Script" path="res://Scripts/MainMenu.cs" id="1_702nk"] +[ext_resource type="Texture2D" uid="uid://dicat7qqa0a7o" path="res://Sprites/Portraits/CirnoTitle.png" id="2_mpelb"] +[ext_resource type="FontFile" uid="uid://ccm3u37q1hvux" path="res://fonts/Xolonium-Regular.ttf" id="3_bl0se"] + +[sub_resource type="Theme" id="Theme_c7h4d"] [node name="Control" type="Control"] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +offset_right = 1.0 +offset_bottom = -2.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_702nk") GameScene = "res://Scenes/game.tscn" MainMenuScene = "res://Scenes/MainMenu.tscn" +[node name="TextureRect" type="TextureRect" parent="."] +layout_mode = 0 +offset_left = 79.0 +offset_top = -14.0 +offset_right = 241.0 +offset_bottom = 148.0 +texture = ExtResource("2_mpelb") + [node name="MarginContainer" type="MarginContainer" parent="."] layout_mode = 1 -anchors_preset = 8 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -63.5 -offset_top = -64.0 -offset_right = 63.5 -offset_bottom = 64.0 -grow_horizontal = 2 -grow_vertical = 2 +offset_right = 337.0 +offset_bottom = 158.0 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] layout_mode = 2 @@ -34,8 +39,10 @@ size_flags_vertical = 4 [node name="Label" type="Label" parent="MarginContainer/VBoxContainer"] layout_mode = 2 -theme_override_font_sizes/font_size = 38 -text = "CIRNO: No Brain" +theme = SubResource("Theme_c7h4d") +theme_override_fonts/font = ExtResource("3_bl0se") +theme_override_font_sizes/font_size = 28 +text = "CIRNO: No Reason" [node name="StartButton" type="Button" parent="MarginContainer/VBoxContainer"] layout_mode = 2 diff --git a/Sprites/Portraits/CirnoTitle.png b/Sprites/Portraits/CirnoTitle.png new file mode 100644 index 00000000..f67de439 --- /dev/null +++ b/Sprites/Portraits/CirnoTitle.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bca278c695cbc808d08dbfbb2ff9202386e9e2c02355158b95aa857137ebb9be +size 4139 diff --git a/Sprites/Portraits/CirnoTitle.png.import b/Sprites/Portraits/CirnoTitle.png.import new file mode 100644 index 00000000..140b7db6 --- /dev/null +++ b/Sprites/Portraits/CirnoTitle.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dicat7qqa0a7o" +path="res://.godot/imported/CirnoTitle.png-a76d60c73265e2db89ba5fe92483b09c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Portraits/CirnoTitle.png" +dest_files=["res://.godot/imported/CirnoTitle.png-a76d60c73265e2db89ba5fe92483b09c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1