maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-01 08:45:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Title screen new art

Browse source
This commit is contained in:
Marco 2025-03-10 14:23:28 +01:00
commit e41fd125de
7 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Scenes/Cutscenes/Intro.tscn
View file

@ -1145,13 +1145,15 @@ stretch_mode = 5
[node name="l1_forest" type="TextureRect" parent="MarginContainer/ImagesContainer/Intro1"]
layout_mode = 0
offset_right = 256.0
offset_left = -6.23507
offset_right = 249.765
offset_bottom = 100.0
texture = ExtResource("20_jmnog")
[node name="l2_forest" type="TextureRect" parent="MarginContainer/ImagesContainer/Intro1"]
layout_mode = 0
offset_right = 256.0
offset_left = -16.1923
offset_right = 239.808
offset_bottom = 100.0
texture = ExtResource("21_kvayf")

31
Scenes/MainMenu.tscn
View file

@ -3,7 +3,6 @@
[ext_resource type="Script" uid="uid://dql102fvubniv" path="res://Scripts/MainMenu.cs" id="1_702nk"]
[ext_resource type="PackedScene" uid="uid://c84shrj84g4t2" path="res://Scenes/HUD/MusicRoom.tscn" id="2_if7li"]
[ext_resource type="Texture2D" uid="uid://xvadkvwajs0t" path="res://Sprites/UI/Crystal.png" id="2_j4e6a"]
[ext_resource type="Texture2D" uid="uid://dicat7qqa0a7o" path="res://Sprites/Portraits/CirnoTitle.png" id="2_mpelb"]
[ext_resource type="Texture2D" uid="uid://by38ufb51f6rx" path="res://Sprites/UI/TitleBackground.png" id="2_qdx0s"]
[ext_resource type="FontFile" uid="uid://ccm3u37q1hvux" path="res://fonts/Xolonium-Regular.ttf" id="3_bl0se"]
[ext_resource type="PackedScene" uid="uid://cmdf7cbqbxedj" path="res://Scenes/HUD/CreditsMenu.tscn" id="4_8e205"]
@ -14,6 +13,7 @@
[ext_resource type="StyleBox" uid="uid://ctw2hju32l3rg" path="res://Resources/Styles/PixelStyleBoxRed.tres" id="7_rrcx7"]
[ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="8_koqhg"]
[ext_resource type="PackedScene" uid="uid://bemu3l6b1e84y" path="res://Scenes/HUD/debug_menu.tscn" id="9_nwlsr"]
[ext_resource type="Texture2D" uid="uid://cv1fmski5dvhk" path="res://Sprites/Briefing/Intro/robot pov/l1_robot pov1.png" id="12_7467j"]
[ext_resource type="Resource" uid="uid://byo74ews118nl" path="res://Resources/Music/No_Reason.tres" id="13_fh7cp"]
[sub_resource type="Theme" id="Theme_c7h4d"]
@ -25,15 +25,7 @@ font_size = 12
outline_size = 4
outline_color = Color(0, 0, 0, 1)
[node name="MainMenu" type="Control" node_paths=PackedStringArray("SubMenuHolder", "MusicPlayer")]
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
[node name="MainMenu" type="CanvasLayer" node_paths=PackedStringArray("SubMenuHolder", "MusicPlayer")]
script = ExtResource("1_702nk")
GameScene = "res://Scenes/Maps/Tutorial.tscn"
MainMenuScene = "res://Scenes/MainMenu.tscn"
@ -45,21 +37,21 @@ CreditsMenuTemplate = ExtResource("4_8e205")
OptionsMenuTemplate = ExtResource("5_7467j")
[node name="TextureRect2" type="TextureRect" parent="."]
layout_mode = 0
offset_right = 320.0
offset_bottom = 160.0
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("2_qdx0s")
[node name="TextureRect" type="TextureRect" parent="."]
layout_mode = 0
offset_left = 122.315
offset_top = 16.0
offset_top = 21.375
offset_right = 170.315
offset_bottom = 56.0
offset_bottom = 61.375
texture = ExtResource("2_j4e6a")
[node name="MarginContainer" type="MarginContainer" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
@ -106,7 +98,6 @@ size_flags_horizontal = 3
[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/GridContainer/Title"]
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 0
theme_override_constants/separation = -9
[node name="Label" type="Label" parent="MarginContainer/GridContainer/Title/VBoxContainer"]
@ -129,7 +120,8 @@ horizontal_alignment = 1
[node name="TextureRect" type="TextureRect" parent="MarginContainer/GridContainer/Title/VBoxContainer"]
layout_mode = 2
size_flags_horizontal = 4
texture = ExtResource("2_mpelb")
size_flags_vertical = 10
texture = ExtResource("12_7467j")
stretch_mode = 2
[node name="Options" type="VBoxContainer" parent="MarginContainer/GridContainer"]
@ -159,7 +151,6 @@ MusicData = ExtResource("13_fh7cp")
[node name="SubMenuContainer" type="PanelContainer" parent="."]
visible = false
layout_mode = 0
offset_left = 13.0
offset_top = 23.0
offset_right = 312.0

5
Scripts/Activables/DialogueStarter.cs
View file

@ -37,6 +37,11 @@ public partial class DialogueStarter : ChainActivable
public override bool Activate(ActivationType activationType = ActivationType.Toggle)
{
if (GlobalState.Instance.SessionSettings.SkipDialogues)
{
DialogueEndAction();
return true;
}
_dialogic.Connect("timeline_ended", Callable.From(OnTimelineEnded));
var dialogicNode = _dialogic.Call("start", _trackName);

2
Scripts/Components/Actors/PlayerDamageReceiver.cs
View file

@ -45,6 +45,8 @@ public partial class PlayerDamageReceiver : Area2D
public void Init()
{
Invulnerable = GlobalState.Instance.SessionSettings.GodMode;
_healthProvider.ResourceChanged += ((value, maxValue) =>
{
//if (!Enabled) return;

2
Scripts/GlobalState.cs
View file

@ -13,7 +13,7 @@ public partial class GlobalState : Node
private ColorRect _fader { get; set; }
public SessionSettings SessionSettings { get; set; }
public SessionSettings SessionSettings { get; set; } = new();
private PackedScene _plaqueTemplate;

2
Scripts/MainMenu.cs
View file

@ -2,7 +2,7 @@ using Godot;
using System;
using Cirno.Scripts.UI;
public partial class MainMenu : Control
public partial class MainMenu : CanvasLayer
{
[Export]

6
Scripts/Resources/Events/DialogueStartEvent.cs
View file

@ -19,6 +19,12 @@ public partial class DialogueStartEvent : EventResource
public override void Start(Node2D parent)
{
if (GlobalState.Instance.SessionSettings.SkipDialogues)
{
DialogueEndAction();
return;
}
_dialogic.Connect("timeline_ended", Callable.From(OnTimelineEnded));
var dialogicNode =_dialogic.Call("start", TimelineName);