From b47c7f888b9970d31f687e30df3ccdb3b3b07cdf Mon Sep 17 00:00:00 2001 From: Marco Date: Tue, 4 Mar 2025 11:56:01 +0100 Subject: [PATCH] Yin Yang orb key item --- Resources/Items/Yin_Yang_Orb.tres | 20 ++++++++++++++++ Scenes/Items/Yin_Yang_Orb.tscn | 19 ++++++++++++++++ Scenes/test.tscn | 31 +++++++++++++++++-------- Scripts/ItemTypes.cs | 3 ++- Sprites/Items/YingYangOrb.aseprite | 3 +++ Sprites/Items/YingYangOrb.png | 3 +++ Sprites/Items/YingYangOrb.png.import | 34 ++++++++++++++++++++++++++++ 7 files changed, 103 insertions(+), 10 deletions(-) create mode 100644 Resources/Items/Yin_Yang_Orb.tres create mode 100644 Scenes/Items/Yin_Yang_Orb.tscn create mode 100644 Sprites/Items/YingYangOrb.aseprite create mode 100644 Sprites/Items/YingYangOrb.png create mode 100644 Sprites/Items/YingYangOrb.png.import diff --git a/Resources/Items/Yin_Yang_Orb.tres b/Resources/Items/Yin_Yang_Orb.tres new file mode 100644 index 00000000..22364d71 --- /dev/null +++ b/Resources/Items/Yin_Yang_Orb.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="LootItem" load_steps=3 format=3 uid="uid://b0qheywm2wej3"] + +[ext_resource type="Texture2D" uid="uid://efghydyw2q8o" path="res://Sprites/Items/YingYangOrb.png" id="1_pival"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="2_8wjtq"] + +[resource] +script = ExtResource("2_8wjtq") +ItemName = "Yin Yang Orb" +ItemDescription = "It's an orb of mystical properties" +ItemKey = "YingYangOrb" +Item = 13 +Amount = 1 +Max = 1 +PickupIfMaxed = true +ConsumeOnUse = true +UiType = 0 +Selectable = false +InventorySprite = ExtResource("1_pival") +DropScenePath = &"res://Scenes/Items/Yin_Yang_Orb.tscn" +metadata/_custom_type_script = "uid://epnwjptvks3t" diff --git a/Scenes/Items/Yin_Yang_Orb.tscn b/Scenes/Items/Yin_Yang_Orb.tscn new file mode 100644 index 00000000..845b5949 --- /dev/null +++ b/Scenes/Items/Yin_Yang_Orb.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=5 format=3 uid="uid://ihy1ew7bo6no"] + +[ext_resource type="Script" uid="uid://b3h7b30kerf60" path="res://Scripts/Interactables/ItemPickup.cs" id="1_a80ku"] +[ext_resource type="Resource" uid="uid://bgcgeg187vg1h" path="res://Resources/Items/IcicleRepeater.tres" id="2_cgnjk"] +[ext_resource type="Texture2D" uid="uid://efghydyw2q8o" path="res://Sprites/Items/YingYangOrb.png" id="3_a80ku"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_jtwy2"] + +[node name="YinYangOrb" type="Area2D" groups=["Interactable"]] +collision_layer = 4 +collision_mask = 2 +script = ExtResource("1_a80ku") +LootTable = [ExtResource("2_cgnjk")] + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("3_a80ku") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("CircleShape2D_jtwy2") diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 11a22a95..233cd65b 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=113 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=115 format=4 uid="uid://bv451a8wgty4u"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_8tmoj"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_ksslq"] @@ -86,8 +86,10 @@ [ext_resource type="PackedScene" uid="uid://drdgcu2r3yrp7" path="res://Scenes/Interactable/control_pad_green_keycard.tscn" id="76_usuub"] [ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="77_yot54"] [ext_resource type="AudioStream" uid="uid://blohh20jktoyo" path="res://SFX/270641__phantastonia__alarm2.wav" id="79_jn1m0"] +[ext_resource type="PackedScene" uid="uid://ihy1ew7bo6no" path="res://Scenes/Items/Yin_Yang_Orb.tscn" id="81_ati1v"] [ext_resource type="Resource" uid="uid://b0jpn0kkmciuq" path="res://Resources/Music/Overtime_Fairy_Dance.tres" id="82_ksslq"] [ext_resource type="PackedScene" uid="uid://cvctgw8eo2f7e" path="res://Scenes/Items/SpiderBomb_Pickup.tscn" id="83_jn1m0"] +[ext_resource type="Resource" uid="uid://b0qheywm2wej3" path="res://Resources/Items/Yin_Yang_Orb.tres" id="84_ma1ta"] [ext_resource type="PackedScene" uid="uid://bl0f0gn6b76n2" path="res://Scenes/Items/Points_Pickup.tscn" id="88_5ews6"] [ext_resource type="PackedScene" uid="uid://cdb0ix4tmypw7" path="res://Scenes/Items/Green_Points_Pickup.tscn" id="89_pqe7f"] @@ -194,7 +196,7 @@ ActivationType = 0 Targets = Array[NodePath]([NodePath("../Rumia")]) WaitForCompletion = true -[sub_resource type="Resource" id="Resource_ati1v"] +[sub_resource type="Resource" id="Resource_ma1ta"] resource_local_to_scene = true script = ExtResource("49_0si7g") Target = NodePath(".") @@ -410,6 +412,12 @@ position = Vector2(-751, -395) [node name="IcicleRepeater" parent="Factory Tilemaps/Debug Room" instance=ExtResource("32_xof4a")] position = Vector2(-729, -347) +[node name="PointsPickup" parent="Factory Tilemaps/Debug Room" instance=ExtResource("88_5ews6")] +position = Vector2(-736, -395) + +[node name="PointsPickup2" parent="Factory Tilemaps/Debug Room" instance=ExtResource("89_pqe7f")] +position = Vector2(-735, -412) + [node name="Part2" type="Node2D" parent="Factory Tilemaps"] [node name="Mainframe" parent="Factory Tilemaps/Part2" instance=ExtResource("13_acrmt")] @@ -787,7 +795,7 @@ Events = Array[Object]([SubResource("Resource_068l7"), SubResource("Resource_l3n [node name="BossBattleStartScript" parent="Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-1487, -396) -Events = Array[Object]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_ati1v")]) +Events = Array[Object]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_ma1ta")]) [node name="Enemy13" parent="Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")] position = Vector2(-1657, -788) @@ -955,6 +963,17 @@ position = Vector2(-1598, -628) position = Vector2(-1640, -619) Targets = [NodePath("../AcidBridge/LightBridge")] +[node name="YinYangOrb" parent="Factory Tilemaps/LevelProps" instance=ExtResource("81_ati1v")] +position = Vector2(-2137, -649) + +[node name="HorizontalForceField" parent="Factory Tilemaps/LevelProps" instance=ExtResource("66_nxn3h")] +position = Vector2(-2000, -736) + +[node name="ControlPad8" parent="Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")] +position = Vector2(-2027, -735) +Targets = [NodePath("../HorizontalForceField")] +Requirements = [ExtResource("84_ma1ta")] + [node name="Ammo1" parent="Factory Tilemaps" instance=ExtResource("34_17pjh")] position = Vector2(-872, -220) @@ -997,9 +1016,3 @@ AlarmSound = ExtResource("79_jn1m0") process_mode = 3 autoplay = true MusicData = ExtResource("82_ksslq") - -[node name="PointsPickup" parent="." instance=ExtResource("88_5ews6")] -position = Vector2(-736, -395) - -[node name="PointsPickup2" parent="." instance=ExtResource("89_pqe7f")] -position = Vector2(-735, -412) diff --git a/Scripts/ItemTypes.cs b/Scripts/ItemTypes.cs index 1a6ce9b4..a625178c 100644 --- a/Scripts/ItemTypes.cs +++ b/Scripts/ItemTypes.cs @@ -14,5 +14,6 @@ public enum ItemTypes Weapon, Power, Points, - Credits + Credits, + KeyItem } \ No newline at end of file diff --git a/Sprites/Items/YingYangOrb.aseprite b/Sprites/Items/YingYangOrb.aseprite new file mode 100644 index 00000000..d02d8767 --- /dev/null +++ b/Sprites/Items/YingYangOrb.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce16306042725fde1d795aa8277d6171c731227a054d58cd547e0c257d3c8ce7 +size 907 diff --git a/Sprites/Items/YingYangOrb.png b/Sprites/Items/YingYangOrb.png new file mode 100644 index 00000000..6d06d538 --- /dev/null +++ b/Sprites/Items/YingYangOrb.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13484b1752cfb889ba5ae7c1b24c42eb2f9bebf278575864711df141c52a8c82 +size 191 diff --git a/Sprites/Items/YingYangOrb.png.import b/Sprites/Items/YingYangOrb.png.import new file mode 100644 index 00000000..a03c9815 --- /dev/null +++ b/Sprites/Items/YingYangOrb.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://efghydyw2q8o" +path="res://.godot/imported/YingYangOrb.png-01d9bcdc51df8c9073515f91d9aeabfc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Items/YingYangOrb.png" +dest_files=["res://.godot/imported/YingYangOrb.png-01d9bcdc51df8c9073515f91d9aeabfc.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