From 369841217e3fb76c1b710effb2ced0c05b839aac Mon Sep 17 00:00:00 2001 From: Marco Date: Sat, 15 Feb 2025 13:42:43 +0100 Subject: [PATCH] Added marisa --- Scenes/Activable/BulletEmitter.tscn | 2 +- Scenes/Actors/Marisa.tscn | 88 +++++++++++++++++++++++++++ Scenes/test.tscn | 26 +++++++- Sprites/Actors/Marisa_boss.png | 3 + Sprites/Actors/Marisa_boss.png.import | 34 +++++++++++ 5 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 Scenes/Actors/Marisa.tscn create mode 100644 Sprites/Actors/Marisa_boss.png create mode 100644 Sprites/Actors/Marisa_boss.png.import diff --git a/Scenes/Activable/BulletEmitter.tscn b/Scenes/Activable/BulletEmitter.tscn index 4e14a2fb..67f9f8f1 100644 --- a/Scenes/Activable/BulletEmitter.tscn +++ b/Scenes/Activable/BulletEmitter.tscn @@ -9,7 +9,7 @@ script = ExtResource("3_njoox") BulletScene = ExtResource("2_tvufl") BulletSpeed = 20.0 -BulletDamage = 4.0 +BulletDamage = 8.0 LifeTime = 4.0 Owner = 0 DamageType = 2 diff --git a/Scenes/Actors/Marisa.tscn b/Scenes/Actors/Marisa.tscn new file mode 100644 index 00000000..be76b2cc --- /dev/null +++ b/Scenes/Actors/Marisa.tscn @@ -0,0 +1,88 @@ +[gd_scene load_steps=13 format=3 uid="uid://c5fiv1nioghfb"] + +[ext_resource type="Script" path="res://Scripts/Actors/Boss.cs" id="1_4dxms"] +[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"] +[ext_resource type="Script" path="res://Scripts/Components/ProximityPlayerDetection.cs" id="9_mgpqv"] +[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="10_abc1f"] +[ext_resource type="PackedScene" uid="uid://cuixq5ex0j40h" path="res://Scenes/enemyBullet.tscn" id="11_xgdm8"] +[ext_resource type="Script" path="res://Scripts/Components/BulletSpawner.cs" id="12_4et3d"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_8gtts"] +radius = 7.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_cacb5"] +radius = 4.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_v711r"] +radius = 85.0529 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_m1rsg"] +size = Vector2(8, 12) + +[node name="Marisa" type="CharacterBody2D" groups=["Destroyable"]] +collision_layer = 16 +collision_mask = 9 +script = ExtResource("1_4dxms") +BossName = "Marisa" +Phases = Array[Resource]([]) +BossHudPrefab = ExtResource("6_r0018") +_bossPortraitTexture = ExtResource("7_h84or") +Health = 200.0 +metadata/_edit_group_ = true + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("4_jniuv") + +[node name="Damage_HitBox" type="CollisionShape2D" parent="."] +visible = false +shape = SubResource("CircleShape2D_8gtts") + +[node name="RigidBody2D" type="RigidBody2D" parent="."] +collision_layer = 16 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"] +visible = false +position = Vector2(0, 5) +shape = SubResource("CircleShape2D_cacb5") + +[node name="PlayerDetection" type="Area2D" parent="."] +visible = false +collision_layer = 16 +collision_mask = 2 +script = ExtResource("9_mgpqv") + +[node name="PlayerDetectionArea" type="CollisionShape2D" parent="PlayerDetection"] +shape = SubResource("CircleShape2D_v711r") + +[node name="ShootTimer" type="Timer" parent="."] +wait_time = 0.4 +one_shot = true + +[node name="Weapon" parent="." instance=ExtResource("10_abc1f")] +BulletScene = ExtResource("11_xgdm8") + +[node name="NavigationAgent2D" type="NavigationAgent2D" parent="."] +target_desired_distance = 64.0 +path_max_distance = 800.0 +path_postprocessing = 1 +avoidance_enabled = true +debug_enabled = true +debug_path_custom_color = Color(1, 0, 0, 1) + +[node name="DamageHitbox" type="Area2D" parent="."] +collision_layer = 16 +collision_mask = 9 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="DamageHitbox"] +shape = SubResource("RectangleShape2D_m1rsg") + +[node name="BulletSpawner" type="Node2D" parent="."] +script = ExtResource("12_4et3d") +BulletScene = ExtResource("11_xgdm8") + +[connection signal="area_entered" from="PlayerDetection" to="PlayerDetection" method="_on_area_entered"] +[connection signal="area_exited" from="PlayerDetection" to="." method="_on_area_exited"] +[connection signal="velocity_computed" from="NavigationAgent2D" to="." method="_on_navigation_agent_2d_velocity_computed"] +[connection signal="area_entered" from="DamageHitbox" to="." method="_on_damage_hitbox_area_entered"] diff --git a/Scenes/test.tscn b/Scenes/test.tscn index fde001a1..440eec75 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=57 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=58 format=4 uid="uid://bv451a8wgty4u"] [ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_8tmoj"] [ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_8mh54"] @@ -49,6 +49,7 @@ [ext_resource type="PackedScene" uid="uid://cdti0hnbs3e63" path="res://Scenes/Actors/RoamingSusan.tscn" id="47_u1ve6"] [ext_resource type="PackedScene" uid="uid://b0pb078xylxy" path="res://Scenes/Interactable/Valve.tscn" id="48_8usll"] [ext_resource type="PackedScene" uid="uid://cd36ch65jijg0" path="res://Scenes/Activable/BulletEmitter.tscn" id="49_64oga"] +[ext_resource type="PackedScene" uid="uid://c5fiv1nioghfb" path="res://Scenes/Actors/Marisa.tscn" id="50_mp5ma"] [sub_resource type="CircleShape2D" id="CircleShape2D_8wuck"] @@ -152,6 +153,27 @@ text = "Welcome to Debug Room" label_settings = ExtResource("14_c4c20") +[node name="Valve2" parent="Factory Tilemaps/Debug Room" node_paths=PackedStringArray("Target") instance=ExtResource("48_8usll")] +position = Vector2(-597, -398) +Target = NodePath("../BulletEmitter2") + +[node name="BulletEmitter2" parent="Factory Tilemaps/Debug Room" instance=ExtResource("49_64oga")] +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")] +position = Vector2(-666, -491) + +[node name="Label2" type="Label" parent="Factory Tilemaps/Debug Room"] +offset_left = -687.0 +offset_top = -485.0 +offset_right = -635.0 +offset_bottom = -462.0 +text = "Start Marisa" +label_settings = ExtResource("14_c4c20") + [node name="LargeTank" parent="Factory Tilemaps" instance=ExtResource("6_nkauc")] position = Vector2(-640, 54) @@ -320,7 +342,7 @@ position = Vector2(-1432, 12) position = Vector2(-1506, -167) [node name="Elevator" parent="." instance=ExtResource("16_n40rt")] -position = Vector2(-581, -485) +position = Vector2(-914, -611) [node name="InventoryManager" type="Node2D" parent="."] script = ExtResource("18_dvo37") diff --git a/Sprites/Actors/Marisa_boss.png b/Sprites/Actors/Marisa_boss.png new file mode 100644 index 00000000..efb67d3d --- /dev/null +++ b/Sprites/Actors/Marisa_boss.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0dd12c3d37977c8286df48e4d1930dc3a922c09a00f7037cdaee15f890e2c0ad +size 469 diff --git a/Sprites/Actors/Marisa_boss.png.import b/Sprites/Actors/Marisa_boss.png.import new file mode 100644 index 00000000..e264b014 --- /dev/null +++ b/Sprites/Actors/Marisa_boss.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ch72faq5f0xqr" +path="res://.godot/imported/Marisa_boss.png-76bb7e3de49ee8bf1c20c6df7e6b785a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Actors/Marisa_boss.png" +dest_files=["res://.godot/imported/Marisa_boss.png-76bb7e3de49ee8bf1c20c6df7e6b785a.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