From 5e4c82c9e7da2c7a8e8c6d7f197fe67587103bea Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Sun, 16 Feb 2025 18:21:40 +0100 Subject: [PATCH] Power Pickup --- Resources/Items/Power_Pickup.tres | 16 ++++++++++ Scenes/Items/Power_Pickup.tscn | 34 +++++++++++++++++++++ Scenes/test.tscn | 6 +++- Sprites/Items/Point_Pickup.png | 3 ++ Sprites/Items/Point_Pickup.png.import | 34 +++++++++++++++++++++ Sprites/Items/Point_Pickup_Green.png | 3 ++ Sprites/Items/Point_Pickup_Green.png.import | 34 +++++++++++++++++++++ Sprites/Items/Power_Pickup.png | 3 ++ Sprites/Items/Power_Pickup.png.import | 34 +++++++++++++++++++++ 9 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 Resources/Items/Power_Pickup.tres create mode 100644 Scenes/Items/Power_Pickup.tscn create mode 100644 Sprites/Items/Point_Pickup.png create mode 100644 Sprites/Items/Point_Pickup.png.import create mode 100644 Sprites/Items/Point_Pickup_Green.png create mode 100644 Sprites/Items/Point_Pickup_Green.png.import create mode 100644 Sprites/Items/Power_Pickup.png create mode 100644 Sprites/Items/Power_Pickup.png.import diff --git a/Resources/Items/Power_Pickup.tres b/Resources/Items/Power_Pickup.tres new file mode 100644 index 00000000..dfde506f --- /dev/null +++ b/Resources/Items/Power_Pickup.tres @@ -0,0 +1,16 @@ +[gd_resource type="Resource" script_class="LootItem" load_steps=3 format=3 uid="uid://clr1gln7nxa1o"] + +[ext_resource type="Texture2D" uid="uid://bjdsi4x8m42ky" path="res://Sprites/Items/Power_Pickup.png" id="1_cang8"] +[ext_resource type="Script" path="res://Scripts/Resources/LootItem.cs" id="1_vw5ht"] + +[resource] +script = ExtResource("1_vw5ht") +ItemName = "Power Pickup" +ItemKey = "PowerPickup" +Item = 4 +Amount = 1 +Max = 10 +PickupIfMaxed = false +ConsumeOnUse = true +UiType = 2 +InventorySprite = ExtResource("1_cang8") diff --git a/Scenes/Items/Power_Pickup.tscn b/Scenes/Items/Power_Pickup.tscn new file mode 100644 index 00000000..bd53a268 --- /dev/null +++ b/Scenes/Items/Power_Pickup.tscn @@ -0,0 +1,34 @@ +[gd_scene load_steps=7 format=3 uid="uid://dtuu2oo6qyo73"] + +[ext_resource type="Script" path="res://Scripts/Interactables/ItemPickup.cs" id="1_p3rh6"] +[ext_resource type="Resource" uid="uid://clr1gln7nxa1o" path="res://Resources/Items/Power_Pickup.tres" id="2_yhlj7"] +[ext_resource type="Texture2D" uid="uid://bjdsi4x8m42ky" path="res://Sprites/Items/Power_Pickup.png" id="3_o2lex"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_6vv2s"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_7bs76"] +atlas = ExtResource("3_o2lex") +region = Rect2(0, 0, 16, 16) + +[sub_resource type="SpriteFrames" id="SpriteFrames_y2inf"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_7bs76") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[node name="Power" type="Area2D" groups=["Interactable"]] +collision_layer = 4 +collision_mask = 2 +script = ExtResource("1_p3rh6") +LootTable = [ExtResource("2_yhlj7")] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("CircleShape2D_6vv2s") + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +sprite_frames = SubResource("SpriteFrames_y2inf") diff --git a/Scenes/test.tscn b/Scenes/test.tscn index b654668b..59f28180 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=65 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=66 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"] @@ -27,6 +27,7 @@ [ext_resource type="PackedScene" uid="uid://4q82gggqax87" path="res://Scenes/Items/Cheat_Gun_Pickup.tscn" id="18_a1e2x"] [ext_resource type="Script" path="res://Scripts/InventoryManager.cs" id="18_dvo37"] [ext_resource type="PackedScene" uid="uid://v8s3kubgb2qg" path="res://Scenes/Enemy.tscn" id="18_ixcwn"] +[ext_resource type="PackedScene" uid="uid://dtuu2oo6qyo73" path="res://Scenes/Items/Power_Pickup.tscn" id="19_2boii"] [ext_resource type="PackedScene" uid="uid://dxs3ks2ucaxl4" path="res://Scenes/Items/Red_Keycard.tscn" id="19_8fb73"] [ext_resource type="PackedScene" uid="uid://d1rlw6ddpmrn8" path="res://Scenes/Actors/Rumia.tscn" id="19_acobs"] [ext_resource type="PackedScene" uid="uid://ddwcib46ttlrp" path="res://Scenes/Items/Ice_Shotgun_Pickup.tscn" id="19_xob8g"] @@ -197,6 +198,9 @@ position = Vector2(-744, -347) [node name="IceShotgun" parent="Factory Tilemaps/Debug Room" instance=ExtResource("19_xob8g")] position = Vector2(-729, -347) +[node name="Power" parent="Factory Tilemaps/Debug Room" instance=ExtResource("19_2boii")] +position = Vector2(-767, -412) + [node name="LargeTank" parent="Factory Tilemaps" instance=ExtResource("6_nkauc")] position = Vector2(-640, 54) diff --git a/Sprites/Items/Point_Pickup.png b/Sprites/Items/Point_Pickup.png new file mode 100644 index 00000000..c07eaa35 --- /dev/null +++ b/Sprites/Items/Point_Pickup.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1065febe95e665016b1df87eaf68f930c82a09eb4163d7ff8cd194b96ae084cd +size 215 diff --git a/Sprites/Items/Point_Pickup.png.import b/Sprites/Items/Point_Pickup.png.import new file mode 100644 index 00000000..fb556fc0 --- /dev/null +++ b/Sprites/Items/Point_Pickup.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d2vmocquikjia" +path="res://.godot/imported/Point_Pickup.png-d9c59802b179b94be552554e096bb625.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Items/Point_Pickup.png" +dest_files=["res://.godot/imported/Point_Pickup.png-d9c59802b179b94be552554e096bb625.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/Items/Point_Pickup_Green.png b/Sprites/Items/Point_Pickup_Green.png new file mode 100644 index 00000000..81e45342 --- /dev/null +++ b/Sprites/Items/Point_Pickup_Green.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcdfe55120b399c979f3d9abdc00a56c5666b5b42da449a1182a422f88f81211 +size 206 diff --git a/Sprites/Items/Point_Pickup_Green.png.import b/Sprites/Items/Point_Pickup_Green.png.import new file mode 100644 index 00000000..657cd2eb --- /dev/null +++ b/Sprites/Items/Point_Pickup_Green.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cdwip2s28eleh" +path="res://.godot/imported/Point_Pickup_Green.png-4ff1fce26aa47731e728584956d4a3e2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Items/Point_Pickup_Green.png" +dest_files=["res://.godot/imported/Point_Pickup_Green.png-4ff1fce26aa47731e728584956d4a3e2.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/Items/Power_Pickup.png b/Sprites/Items/Power_Pickup.png new file mode 100644 index 00000000..6584cc87 --- /dev/null +++ b/Sprites/Items/Power_Pickup.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c16724fc429d6427b5ee783922d0a1437e8fdb37308b9d605180e7e497b8326 +size 203 diff --git a/Sprites/Items/Power_Pickup.png.import b/Sprites/Items/Power_Pickup.png.import new file mode 100644 index 00000000..ad96bfc2 --- /dev/null +++ b/Sprites/Items/Power_Pickup.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bjdsi4x8m42ky" +path="res://.godot/imported/Power_Pickup.png-8e0997413eb4330ea358e3ad4c0679f8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Items/Power_Pickup.png" +dest_files=["res://.godot/imported/Power_Pickup.png-8e0997413eb4330ea358e3ad4c0679f8.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