diff --git a/Dialogue/Characters/Cirno.dch b/Dialogue/Characters/Cirno.dch index e736d225..810a293b 100644 --- a/Dialogue/Characters/Cirno.dch +++ b/Dialogue/Characters/Cirno.dch @@ -17,7 +17,7 @@ "portraits": { "Cirno": { "export_overrides": { -"image": "\"res://Sprites/Portraits/Cirno.png\"" +"image": "\"res://Sprites/Portraits/Cirno2.png\"" }, "mirror": false, "offset": Vector2(0, 0), diff --git a/Dialogue/Characters/Rumia.dch b/Dialogue/Characters/Rumia.dch index 1037231a..bfa7168b 100644 --- a/Dialogue/Characters/Rumia.dch +++ b/Dialogue/Characters/Rumia.dch @@ -17,7 +17,7 @@ "portraits": { "Default": { "export_overrides": { -"image": "\"res://Sprites/Actors/Rumia.png\"" +"image": "\"res://Sprites/Portraits/Rumia.png\"" }, "mirror": false, "offset": Vector2(0, 0), diff --git a/Scenes/Barrel.cs b/Scenes/Barrel.cs index 2f3ff425..e37016b6 100644 --- a/Scenes/Barrel.cs +++ b/Scenes/Barrel.cs @@ -52,7 +52,6 @@ public partial class Barrel : Area2D, IDestructible private void CreateParticles() { if (ExplosionParticles == null) { - GD.PushWarning("Object has no particles associated"); return; } var particle = this.CreateSibling(ExplosionParticles); diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 1afcc032..fcf818c3 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -258,7 +258,7 @@ monitoring = false monitorable = false script = ExtResource("29_pvkri") _trackName = "Rumia_Intro" -_dialogueEndActivationTargets = [] +_dialogueEndActivationTargets = [NodePath("../Rumia")] [node name="CollisionShape2D" type="CollisionShape2D" parent="RumiaDialogueStarter"] shape = SubResource("CircleShape2D_l22r0") diff --git a/Sprites/Portraits/Cirno2.png b/Sprites/Portraits/Cirno2.png new file mode 100644 index 00000000..8bab7da2 --- /dev/null +++ b/Sprites/Portraits/Cirno2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a71e947a5a30a70b40b899b1a0132657f071f062c49839a10246c65bbd901b81 +size 3944 diff --git a/Sprites/Portraits/Cirno2.png.import b/Sprites/Portraits/Cirno2.png.import new file mode 100644 index 00000000..4a3fbe18 --- /dev/null +++ b/Sprites/Portraits/Cirno2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bhhomsbvwjioa" +path="res://.godot/imported/Cirno2.png-4663de43bca10f7643106126348ec039.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Portraits/Cirno2.png" +dest_files=["res://.godot/imported/Cirno2.png-4663de43bca10f7643106126348ec039.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 diff --git a/Sprites/Portraits/Rumia.png b/Sprites/Portraits/Rumia.png new file mode 100644 index 00000000..1d230876 --- /dev/null +++ b/Sprites/Portraits/Rumia.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:836682d52719e1dd7d2d7eac4c0409b70f2cfe586e136071054adbc157fbfdb4 +size 2610 diff --git a/Sprites/Portraits/Rumia.png.import b/Sprites/Portraits/Rumia.png.import new file mode 100644 index 00000000..61c6a4e3 --- /dev/null +++ b/Sprites/Portraits/Rumia.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csuprfskdo1qp" +path="res://.godot/imported/Rumia.png-7f0b32360a04b4496ad1f5977f6db002.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Portraits/Rumia.png" +dest_files=["res://.godot/imported/Rumia.png-7f0b32360a04b4496ad1f5977f6db002.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 diff --git a/project.godot b/project.godot index f7199b33..0adee7d3 100644 --- a/project.godot +++ b/project.godot @@ -21,7 +21,7 @@ Settings/temporaryLogLifetime=5.0 [application] config/name="Cirno" -run/main_scene="res://Scenes/Maps/BossTestArena.tscn" +run/main_scene="res://Scenes/test.tscn" config/features=PackedStringArray("4.3", "C#", "GL Compatibility") config/icon="res://icon.svg"