mirror of
https://gitlab.com/MaddoScientisto/cirnogodot.git
synced 2026-06-22 01:13:46 +00:00
Generic marker pickups
This commit is contained in:
parent
6cbf2014b4
commit
692c33c939
15 changed files with 176 additions and 36 deletions
|
|
@ -1,7 +1,8 @@
|
|||
[gd_scene load_steps=5 format=3 uid="uid://cmr6fclttrpkb"]
|
||||
[gd_scene load_steps=6 format=3 uid="uid://cmr6fclttrpkb"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://b3h7b30kerf60" path="res://Scripts/Interactables/ItemPickup.cs" id="1_it180"]
|
||||
[ext_resource type="Resource" uid="uid://ct1fa2huvy34n" path="res://Resources/Items/Ammo1.tres" id="2_j10i4"]
|
||||
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="2_k1yis"]
|
||||
[ext_resource type="SpriteFrames" uid="uid://pmwatoyt2ase" path="res://Resources/Sprites/Ammo_Inventory_Sprite.tres" id="3_6n103"]
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_6vv2s"]
|
||||
|
|
@ -10,7 +11,7 @@
|
|||
collision_layer = 4
|
||||
collision_mask = 2
|
||||
script = ExtResource("1_it180")
|
||||
LootTable = [ExtResource("2_j10i4")]
|
||||
LootTable = Array[ExtResource("2_k1yis")]([ExtResource("2_j10i4")])
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
shape = SubResource("CircleShape2D_6vv2s")
|
||||
|
|
|
|||
21
Scenes/Items/GenericItem.tscn
Normal file
21
Scenes/Items/GenericItem.tscn
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
[gd_scene load_steps=4 format=3 uid="uid://yj383ec5xnx"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://b3h7b30kerf60" path="res://Scripts/Interactables/ItemPickup.cs" id="1_rj4fe"]
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_6vv2s"]
|
||||
|
||||
[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_e0m7j"]
|
||||
size = Vector2(8, 8)
|
||||
|
||||
[node name="Item" type="Area2D" groups=["Interactable"]]
|
||||
collision_layer = 4
|
||||
collision_mask = 2
|
||||
script = ExtResource("1_rj4fe")
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
|
||||
shape = SubResource("CircleShape2D_6vv2s")
|
||||
|
||||
[node name="Sprite2D" type="Sprite2D" parent="."]
|
||||
texture = SubResource("PlaceholderTexture2D_e0m7j")
|
||||
|
||||
[connection signal="area_entered" from="." to="." method="_on_area_entered"]
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
[gd_scene load_steps=7 format=3 uid="uid://mtn26qwp4yqy"]
|
||||
[gd_scene load_steps=8 format=3 uid="uid://mtn26qwp4yqy"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://dxs3ks2ucaxl4" path="res://Scenes/Items/Red_Keycard.tscn" id="1_0bwjc"]
|
||||
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="2_0bwjc"]
|
||||
[ext_resource type="Resource" uid="uid://oa8s6xydriib" path="res://Resources/Items/Generic_Keycard.tres" id="3_0bwjc"]
|
||||
[ext_resource type="Texture2D" uid="uid://bvybqletsvqgk" path="res://Sprites/Items/BlueKeycard_Small.png" id="4_7ohj7"]
|
||||
|
||||
|
|
@ -27,7 +28,7 @@ animations = [{
|
|||
}]
|
||||
|
||||
[node name="GrayKeycard" instance=ExtResource("1_0bwjc")]
|
||||
LootTable = [ExtResource("3_0bwjc")]
|
||||
LootTable = Array[ExtResource("2_0bwjc")]([ExtResource("3_0bwjc")])
|
||||
|
||||
[node name="AnimatedSprite2D" parent="." index="1"]
|
||||
sprite_frames = SubResource("SpriteFrames_gbw5v")
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=158 format=4 uid="uid://bv451a8wgty4u"]
|
||||
[gd_scene load_steps=159 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"]
|
||||
|
|
@ -92,6 +92,7 @@
|
|||
[ext_resource type="AudioStream" uid="uid://blohh20jktoyo" path="res://SFX/270641__phantastonia__alarm2.wav" id="79_jn1m0"]
|
||||
[ext_resource type="PackedScene" uid="uid://dky13otbks8cm" path="res://Scenes/Actors/Thermatron_FSM.tscn" id="80_f37sa"]
|
||||
[ext_resource type="PackedScene" uid="uid://ihy1ew7bo6no" path="res://Scenes/Items/Yin_Yang_Orb.tscn" id="81_ati1v"]
|
||||
[ext_resource type="Script" uid="uid://cqoqovfvk83wn" path="res://Scripts/Actors/ItemMarker.cs" id="82_fuaed"]
|
||||
[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="PackedScene" uid="uid://e80xujqyjoh" path="res://Scenes/Props/Box_Vertical.tscn" id="84_bwt6v"]
|
||||
|
|
@ -692,6 +693,30 @@ position = Vector2(-736, -438)
|
|||
[node name="VendingMachine" parent="Parallax2D/Factory Tilemaps/Debug Room" instance=ExtResource("87_gqbl6")]
|
||||
position = Vector2(-840, -423)
|
||||
|
||||
[node name="AmmoMarker" type="Marker2D" parent="Parallax2D/Factory Tilemaps/Debug Room"]
|
||||
position = Vector2(-808, -410)
|
||||
script = ExtResource("82_fuaed")
|
||||
Item = ExtResource("4_swym2")
|
||||
AutoSpawn = true
|
||||
|
||||
[node name="AmmoMarker2" type="Marker2D" parent="Parallax2D/Factory Tilemaps/Debug Room"]
|
||||
position = Vector2(-808, -397)
|
||||
script = ExtResource("82_fuaed")
|
||||
Item = ExtResource("4_swym2")
|
||||
AutoSpawn = true
|
||||
|
||||
[node name="AmmoMarker3" type="Marker2D" parent="Parallax2D/Factory Tilemaps/Debug Room"]
|
||||
position = Vector2(-792, -410)
|
||||
script = ExtResource("82_fuaed")
|
||||
Item = ExtResource("4_swym2")
|
||||
AutoSpawn = true
|
||||
|
||||
[node name="AmmoMarker4" type="Marker2D" parent="Parallax2D/Factory Tilemaps/Debug Room"]
|
||||
position = Vector2(-792, -397)
|
||||
script = ExtResource("82_fuaed")
|
||||
Item = ExtResource("4_swym2")
|
||||
AutoSpawn = true
|
||||
|
||||
[node name="Part2" type="Node2D" parent="Parallax2D/Factory Tilemaps"]
|
||||
y_sort_enabled = true
|
||||
|
||||
|
|
@ -1103,18 +1128,6 @@ label_settings = ExtResource("14_c4c20")
|
|||
position = Vector2(290, 79)
|
||||
EnemyData = ExtResource("71_xhinl")
|
||||
|
||||
[node name="Ammo1" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")]
|
||||
position = Vector2(-792, -396)
|
||||
|
||||
[node name="Ammo2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")]
|
||||
position = Vector2(-808, -396)
|
||||
|
||||
[node name="Ammo3" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")]
|
||||
position = Vector2(-808, -408)
|
||||
|
||||
[node name="Ammo4" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")]
|
||||
position = Vector2(-792, -407)
|
||||
|
||||
[node name="BossBattleEndScript" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps"]
|
||||
position = Vector2(-1628.53, -477.628)
|
||||
script = ExtResource("42_wigyb")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue