Marisa bullets

This commit is contained in:
Marco 2025-02-15 14:33:44 +01:00
commit f2e6025b35
17 changed files with 227 additions and 6 deletions

View file

@ -0,0 +1,29 @@
[gd_resource type="Resource" script_class="BossPhase" load_steps=5 format=3 uid="uid://da1vjfavqs7u2"]
[ext_resource type="PackedScene" uid="uid://c034favdy56p0" path="res://Scenes/Weapons/Bullets/enemyBullet_star_yellow.tscn" id="1_0bb8a"]
[ext_resource type="Script" path="res://Scripts/Resources/BossPhase.cs" id="1_7asq8"]
[ext_resource type="Script" path="res://Scripts/AttackPatterns/SpiralPattern.cs" id="1_ys2v3"]
[sub_resource type="Resource" id="Resource_q4pcc"]
script = ExtResource("1_ys2v3")
BulletScene = ExtResource("1_0bb8a")
bulletSpeed = 30.0
bulletCount = 16
rotationSpeed = 4.0
_rotationOffset = 0.0
duration = 5.0
burstInterval = 0.9
spread = 360.0
owner = 2
_damageType = 0
_bulletDamage = 1.0
_timeModifiers = null
_targetPlayer = false
WaitForCompletion = true
[resource]
script = ExtResource("1_7asq8")
PhaseName = ""
Threshold = 300
PlayAnimation = false
Patterns = Array[Object]([SubResource("Resource_q4pcc")])

View file

@ -1,6 +1,7 @@
[gd_scene load_steps=13 format=3 uid="uid://c5fiv1nioghfb"]
[gd_scene load_steps=14 format=3 uid="uid://c5fiv1nioghfb"]
[ext_resource type="Script" path="res://Scripts/Actors/Boss.cs" id="1_4dxms"]
[ext_resource type="Resource" uid="uid://da1vjfavqs7u2" path="res://Resources/BossPhases/Marisa/marisa_ns1.tres" id="2_q4m3q"]
[ext_resource type="Texture2D" uid="uid://ch72faq5f0xqr" path="res://Sprites/Actors/Marisa_boss.png" id="4_jniuv"]
[ext_resource type="PackedScene" uid="uid://bwlstkdibs7oc" path="res://Scenes/HUD/BossHud.tscn" id="6_r0018"]
[ext_resource type="Texture2D" uid="uid://csuprfskdo1qp" path="res://Sprites/Portraits/Rumia.png" id="7_h84or"]
@ -26,7 +27,7 @@ collision_layer = 16
collision_mask = 9
script = ExtResource("1_4dxms")
BossName = "Marisa"
Phases = Array[Resource]([])
Phases = Array[Resource]([ExtResource("2_q4m3q")])
BossHudPrefab = ExtResource("6_r0018")
_bossPortraitTexture = ExtResource("7_h84or")
Health = 200.0

View file

@ -0,0 +1,29 @@
[gd_scene load_steps=4 format=3 uid="uid://c034favdy56p0"]
[ext_resource type="Script" path="res://Scripts/Bullet.cs" id="1_l1hs7"]
[ext_resource type="Texture2D" uid="uid://bqunl602ko6b7" path="res://Sprites/Bullets/start_bullet_yellow_small.png" id="2_wvl35"]
[sub_resource type="CircleShape2D" id="CircleShape2D_jxptd"]
radius = 2.23607
[node name="Bullet" type="Area2D" groups=["bullets"]]
collision_layer = 128
collision_mask = 71
script = ExtResource("1_l1hs7")
Speed = 200.0
metadata/_edit_group_ = true
[node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource("2_wvl35")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_jxptd")
[node name="Node2D" type="Node2D" parent="."]
editor_description = "Player Bullet"
[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
[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"]

View file

@ -163,8 +163,9 @@ position = Vector2(-565, -399)
[node name="Marisa" parent="Factory Tilemaps/Debug Room" instance=ExtResource("50_mp5ma")]
position = Vector2(-615, -565)
[node name="ControlPad" parent="Factory Tilemaps/Debug Room" instance=ExtResource("12_hfkf1")]
[node name="ControlPad" parent="Factory Tilemaps/Debug Room" node_paths=PackedStringArray("Target") instance=ExtResource("12_hfkf1")]
position = Vector2(-666, -491)
Target = NodePath("../Marisa")
[node name="Label2" type="Label" parent="Factory Tilemaps/Debug Room"]
offset_left = -687.0

View file

@ -4,13 +4,14 @@ namespace Cirno.Scripts.Interactables;
public partial class Switch : Interactable
{
[Export] public Activable Target { get; set; }
[Export] public Node2D Target { get; set; }
[Export] public ActivationType ActivationType { get; set; } = ActivationType.Toggle;
public override bool Activate()
{
if (MeetsRequirements())
if (MeetsRequirements() && Target is IActivable activable)
{
Target?.Activate();
activable?.Activate(ActivationType);
return true;
}

BIN
Sprites/Bullets/start_bullet_blue_small.aseprite (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

View file

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

BIN
Sprites/Bullets/start_bullet_green_small.aseprite (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

View file

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

BIN
Sprites/Bullets/start_bullet_red_small.aseprite (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

View file

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

BIN
Sprites/Bullets/start_bullet_yellow_small.aseprite (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

View file

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