Improvements

This commit is contained in:
MaddoScientisto 2025-03-22 15:37:37 +01:00
commit 39183aa83f
14 changed files with 311 additions and 15 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 KiB

Binary file not shown.

BIN
ExternalMaterial/NuclearBullets/Nuclear_Bullet_2.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cismmvrtnn2kf"
path="res://.godot/imported/Nuclear_Bullet_2.png-62fda909cefb7bf641e7d1799d72f246.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://ExternalMaterial/NuclearBullets/Nuclear_Bullet_2.png"
dest_files=["res://.godot/imported/Nuclear_Bullet_2.png-62fda909cefb7bf641e7d1799d72f246.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

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

BIN
ExternalMaterial/NuclearBullets/aap-64-1x.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://71u11bxxvpvr"
path="res://.godot/imported/aap-64-1x.png-ffe82d903f443fba11210e7e7a7d83eb.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://ExternalMaterial/NuclearBullets/aap-64-1x.png"
dest_files=["res://.godot/imported/aap-64-1x.png-ffe82d903f443fba11210e7e7a7d83eb.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

View file

@ -2,15 +2,13 @@
[ext_resource type="Script" uid="uid://cfcx0of1aekhk" path="res://addons/dialogic/Modules/Character/node_portrait_container.gd" id="1_4jxq7"]
[ext_resource type="Script" uid="uid://dmxeo7lm8ftsi" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_SpeakerPortraitTextbox/speaker_portrait_textbox_layer.gd" id="1_7jt4d"]
[ext_resource type="StyleBox" uid="uid://ctw2hju32l3rg" path="res://Resources/Styles/PixelStyleBoxRed.tres" id="2_3tg5g"]
[ext_resource type="Script" uid="uid://be3h8wr0w68dx" path="res://addons/dialogic/Modules/Text/node_name_label.gd" id="2_y0h34"]
[ext_resource type="Script" uid="uid://ddkvkdb6nxtyi" path="res://addons/dialogic/Modules/Text/node_dialog_text.gd" id="3_11puy"]
[ext_resource type="Resource" uid="uid://cgqw8303lbuwo" path="res://Dialogue/Characters/Cirno.dch" id="3_u8cb2"]
[ext_resource type="FontFile" uid="uid://cc3bdt3rt8a1o" path="res://fonts/Silver.ttf" id="4_5grjp"]
[ext_resource type="Script" uid="uid://bkfrnlul8c6cv" path="res://addons/dialogic/Modules/Text/node_type_sound.gd" id="5_sr2qw"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_5grjp"]
bg_color = Color(1, 1, 1, 1)
[node name="TextboxWithSpeakerPortrait" type="Control"]
layout_mode = 3
anchors_preset = 15
@ -63,7 +61,7 @@ layout_mode = 2
size_flags_horizontal = 3
size_flags_stretch_ratio = 0.3
mouse_filter = 2
theme_override_styles/panel = SubResource("StyleBoxFlat_5grjp")
theme_override_styles/panel = ExtResource("2_3tg5g")
[node name="PortraitBackgroundColor" type="ColorRect" parent="Anchor/Panel/HBox/PortraitPanel"]
unique_name_in_owner = true

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=106 format=4 uid="uid://dqyfnby0t7gu1"]
[gd_scene load_steps=105 format=4 uid="uid://dqyfnby0t7gu1"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_c3v4x"]
[ext_resource type="Resource" uid="uid://cs3ihltcn2166" path="res://Resources/Items/IcicleGun.tres" id="3_6314l"]
@ -64,7 +64,6 @@
[ext_resource type="Script" uid="uid://d0a0o50j82eo6" path="res://Scripts/Activables/ScriptableBase.cs" id="50_cr4hs"]
[ext_resource type="PackedScene" uid="uid://dky13otbks8cm" path="res://Scenes/Actors/Thermatron_FSM.tscn" id="50_w8nwr"]
[ext_resource type="PackedScene" uid="uid://bb32f4p5e671j" path="res://Scenes/Actors/Fairy_Guard_FSM.tscn" id="51_awjkl"]
[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="52_5glx6"]
[ext_resource type="PackedScene" uid="uid://d1h48wgasakk4" path="res://Scenes/Interactable/alarm_box.tscn" id="52_5nxem"]
[ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="52_q2wmj"]
[ext_resource type="Texture2D" uid="uid://cnayqn8jgb8jj" path="res://Models/carr/carr_rotating.png" id="56_5glx6"]
@ -161,7 +160,7 @@ TimeModifiers = Array[ExtResource("43_8n581")]([])
WaitForCompletion = true
metadata/_custom_type_script = "uid://c0ndqalsc4jve"
[sub_resource type="Resource" id="Resource_8qe0x"]
[sub_resource type="Resource" id="Resource_bjd5y"]
resource_local_to_scene = true
script = ExtResource("39_83jc5")
Patterns = Array[Object]([SubResource("Resource_kuo18")])
@ -383,7 +382,7 @@ scale = Vector2(0.66, 2.04)
[node name="FairyFsm" parent="Tilemaps/AcidHitboxes" node_paths=PackedStringArray("DefeatScript") instance=ExtResource("12_64bae")]
position = Vector2(776, -56)
ExtraLoot = Array[ExtResource("13_b3y78")]([SubResource("Resource_w8nwr"), SubResource("Resource_awjkl")])
ExtraLoot = [SubResource("Resource_w8nwr"), SubResource("Resource_awjkl")]
DefeatScript = NodePath("../../Actors/HorizontalForceField2")
ActivationType = 2
@ -554,7 +553,7 @@ InvertSignal = true
[node name="FloorEmitter2" parent="Tilemaps/Actors" instance=ExtResource("44_b8ffn")]
position = Vector2(601, 147)
Script = SubResource("Resource_8qe0x")
Script = SubResource("Resource_bjd5y")
InvertSignal = true
[node name="Camera" parent="Tilemaps/Actors" instance=ExtResource("48_r562v")]
@ -566,7 +565,7 @@ Targets = [NodePath("Script")]
[node name="Script" type="Node2D" parent="Tilemaps/Actors/ControlPad4"]
script = ExtResource("50_cr4hs")
Events = Array[ExtResource("52_5glx6")]([SubResource("Resource_8n581"), SubResource("Resource_iv5wi")])
Events = [SubResource("Resource_8n581"), SubResource("Resource_iv5wi")]
[node name="FairyGuardFsm" parent="Tilemaps/Actors" instance=ExtResource("50_w8nwr")]
position = Vector2(712, -136)
@ -625,7 +624,7 @@ transform = Transform3D(0.826924, -0.385938, 0.408961, 0, 0.727282, 0.686339, -0
[node name="ScriptableAreaTrigger" parent="Tilemaps" instance=ExtResource("28_fuxq3")]
position = Vector2(230, 250)
Events = Array[ExtResource("52_5glx6")]([SubResource("Resource_pgobb")])
Events = [SubResource("Resource_pgobb")]
[node name="AlarmBox" parent="Tilemaps" instance=ExtResource("52_5nxem")]
position = Vector2(616, 88)

View file

@ -1,7 +1,8 @@
[gd_scene load_steps=20 format=3 uid="uid://b23lyiq42kvrr"]
[gd_scene load_steps=47 format=3 uid="uid://b23lyiq42kvrr"]
[ext_resource type="Script" uid="uid://dsa4b75hdig8p" path="res://Scripts/Bullet.cs" id="1_gvb0k"]
[ext_resource type="Texture2D" uid="uid://4dfuib4wce7n" path="res://Sprites/Bullets/Nuclear_Bullet.png" id="2_oarhb"]
[ext_resource type="Texture2D" uid="uid://2patpgtpyg5q" path="res://Sprites/Bullets/Nuclear_Bullet_2.png" id="3_uqai3"]
[sub_resource type="CircleShape2D" id="CircleShape2D_jxptd"]
radius = 2.23607
@ -119,6 +120,189 @@ animations = [{
"speed": 8.0
}]
[sub_resource type="AtlasTexture" id="AtlasTexture_e6wo0"]
atlas = ExtResource("3_uqai3")
region = Rect2(0, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_j7bw2"]
atlas = ExtResource("3_uqai3")
region = Rect2(16, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_axwxo"]
atlas = ExtResource("3_uqai3")
region = Rect2(32, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_5w761"]
atlas = ExtResource("3_uqai3")
region = Rect2(48, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_u3jbk"]
atlas = ExtResource("3_uqai3")
region = Rect2(64, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_1oxk1"]
atlas = ExtResource("3_uqai3")
region = Rect2(80, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_excmm"]
atlas = ExtResource("3_uqai3")
region = Rect2(96, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_k4xbf"]
atlas = ExtResource("3_uqai3")
region = Rect2(112, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_mtvly"]
atlas = ExtResource("3_uqai3")
region = Rect2(128, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_ukkr3"]
atlas = ExtResource("3_uqai3")
region = Rect2(144, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_madus"]
atlas = ExtResource("3_uqai3")
region = Rect2(160, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_loaei"]
atlas = ExtResource("3_uqai3")
region = Rect2(176, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_o5c1d"]
atlas = ExtResource("3_uqai3")
region = Rect2(192, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_qxwoj"]
atlas = ExtResource("3_uqai3")
region = Rect2(208, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_ady1y"]
atlas = ExtResource("3_uqai3")
region = Rect2(224, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_f25db"]
atlas = ExtResource("3_uqai3")
region = Rect2(240, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_ly6cl"]
atlas = ExtResource("3_uqai3")
region = Rect2(256, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_57th7"]
atlas = ExtResource("3_uqai3")
region = Rect2(272, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_t7evl"]
atlas = ExtResource("3_uqai3")
region = Rect2(288, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_see74"]
atlas = ExtResource("3_uqai3")
region = Rect2(304, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_x1rk5"]
atlas = ExtResource("3_uqai3")
region = Rect2(320, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_wfwnd"]
atlas = ExtResource("3_uqai3")
region = Rect2(336, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_h7bub"]
atlas = ExtResource("3_uqai3")
region = Rect2(352, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_2oqg6"]
atlas = ExtResource("3_uqai3")
region = Rect2(368, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_hebgw"]
atlas = ExtResource("3_uqai3")
region = Rect2(384, 0, 16, 16)
[sub_resource type="SpriteFrames" id="SpriteFrames_dpaf6"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_e6wo0")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_j7bw2")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_axwxo")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_5w761")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_u3jbk")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_1oxk1")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_excmm")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_k4xbf")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_mtvly")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ukkr3")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_madus")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_loaei")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_o5c1d")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_qxwoj")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ady1y")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_f25db")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ly6cl")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_57th7")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_t7evl")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_see74")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_x1rk5")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_wfwnd")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_h7bub")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_2oqg6")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_hebgw")
}],
"loop": false,
"name": &"default",
"speed": 5.0
}]
[node name="Bullet" type="Area2D" groups=["bullets"]]
collision_layer = 8
collision_mask = 85
@ -135,8 +319,15 @@ editor_description = "Player Bullet"
[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
visible = false
sprite_frames = SubResource("SpriteFrames_e6wo0")
[node name="AnimatedSprite2D2" type="AnimatedSprite2D" parent="."]
sprite_frames = SubResource("SpriteFrames_dpaf6")
autoplay = "default"
frame = 24
frame_progress = 1.0
[connection signal="area_entered" from="." to="." method="_on_area_entered"]
[connection signal="body_entered" from="." to="." method="_on_body_entered"]
[connection signal="screen_exited" from="VisibleOnScreenNotifier2D" to="." method="_on_visible_on_screen_notifier_2d_screen_exited"]

BIN
Sprites/Bullets/Nuclear_Bullet_2.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://2patpgtpyg5q"
path="res://.godot/imported/Nuclear_Bullet_2.png-941a0b101c41c2b6cbdc5225eb8554a9.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Bullets/Nuclear_Bullet_2.png"
dest_files=["res://.godot/imported/Nuclear_Bullet_2.png-941a0b101c41c2b6cbdc5225eb8554a9.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