maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-12 05:05:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revamped equipment init

Browse source
This commit is contained in:
Marco 2025-04-07 15:58:43 +02:00
commit 2a016fd30c
16 changed files with 76 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Scenes/Maps/Level2.tscn
View file

@ -1,11 +1,8 @@
[gd_scene load_steps=93 format=4 uid="uid://6a6tjohypmmb"]
[gd_scene load_steps=89 format=4 uid="uid://6a6tjohypmmb"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_t2k72"]
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_2jsgm"]
[ext_resource type="Resource" uid="uid://mx860r8t37g1" path="res://Resources/Maps/Level2.tres" id="2_5t0ab"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_hw1so"]
[ext_resource type="Resource" uid="uid://cs3ihltcn2166" path="res://Resources/Items/IcicleGun.tres" id="3_mqt4u"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_s1vkf"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_06rc0"]
[ext_resource type="PackedScene" uid="uid://byms2dhliyux0" path="res://Scenes/Actors/teleporter.tscn" id="6_e12id"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_up0ka"]
@ -51,11 +48,6 @@
[ext_resource type="Resource" uid="uid://b0xtpdb4by8mm" path="res://Resources/Maps/Level3.tres" id="43_joghw"]
[ext_resource type="LabelSettings" uid="uid://buk3e7bbwmnv1" path="res://Resources/Styles/Hud_Text_Style.tres" id="44_q1ysg"]
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_s1vkf")
EggIndex = 0
StartingEquipment = Array[ExtResource("3_hw1so")]([ExtResource("3_mqt4u")])
[sub_resource type="LabelSettings" id="LabelSettings_5j8ks"]
font = ExtResource("9_qo7ri")
font_size = 10
@ -333,8 +325,6 @@ PlayerTemplate = ExtResource("2_2jsgm")
SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition")
})
StartingEquipment = Array[ExtResource("3_hw1so")]([ExtResource("3_mqt4u")])
MapStartData = SubResource("Resource_6wo78")
NavigationTilemap = NodePath("Tilemaps/Floor")
[node name="Tilemaps" type="Node2D" parent="."]

11
Scenes/Maps/Level3.tscn
View file

@ -1,11 +1,9 @@
[gd_scene load_steps=64 format=4 uid="uid://dnpmeebmjgv2t"]
[gd_scene load_steps=61 format=4 uid="uid://dnpmeebmjgv2t"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_0pe42"]
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_bn5f4"]
[ext_resource type="Resource" uid="uid://b0xtpdb4by8mm" path="res://Resources/Maps/Level3.tres" id="2_pjj1f"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_w0rax"]
[ext_resource type="Resource" uid="uid://cs3ihltcn2166" path="res://Resources/Items/IcicleGun.tres" id="4_7j1cb"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_w0rax"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_6nsxd"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_tvyok"]
[ext_resource type="PackedScene" uid="uid://dnbtou2fklyvp" path="res://Scenes/Actors/alarm_sign.tscn" id="7_bn5f4"]
@ -61,11 +59,6 @@
[ext_resource type="Script" uid="uid://c8tx1gh0lxt0t" path="res://Scripts/Resources/Events/AlarmEnableEvent.cs" id="52_udf20"]
[ext_resource type="PackedScene" uid="uid://dky13otbks8cm" path="res://Scenes/Actors/Thermatron_FSM.tscn" id="58_pjj1f"]
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_w0rax")
EggIndex = 0
StartingEquipment = []
[sub_resource type="RectangleShape2D" id="RectangleShape2D_tvyok"]
size = Vector2(52, 64)
@ -82,8 +75,6 @@ PlayerTemplate = ExtResource("2_bn5f4")
SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition")
})
StartingEquipment = Array[ExtResource("3_w0rax")]([ExtResource("4_7j1cb")])
MapStartData = SubResource("Resource_6wo78")
[node name="Tilemaps" type="Node2D" parent="."]
process_mode = 1

16
Scenes/Maps/RebelBase.tscn
View file

@ -1,9 +1,8 @@
[gd_scene load_steps=34 format=4 uid="uid://bx31ou6tw3kd1"]
[gd_scene load_steps=33 format=4 uid="uid://bx31ou6tw3kd1"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_6sq7s"]
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_cicvv"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_rf2ue"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_tgwif"]
[ext_resource type="Resource" uid="uid://37h0tjja4sns" path="res://Resources/Maps/RebelBase.tres" id="2_oa48u"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_vmlpc"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_sv42c"]
[ext_resource type="PackedScene" uid="uid://l84on3kv2s52" path="res://Scenes/Door_Horizontal.tscn" id="7_rs3ph"]
@ -20,6 +19,7 @@
[ext_resource type="Resource" uid="uid://mx860r8t37g1" path="res://Resources/Maps/Level2.tres" id="18_8anae"]
[ext_resource type="PackedScene" uid="uid://dx1urm7nttkqk" path="res://Scenes/Actors/level_teleporter.tscn" id="18_tbppe"]
[ext_resource type="PackedScene" uid="uid://crph24e6e0v0q" path="res://Scenes/Interactable/Control_Pad.tscn" id="19_nxss7"]
[ext_resource type="PackedScene" uid="uid://r25rq6ijgm6m" path="res://Scenes/Items/Green_Keycard.tscn" id="19_rf2ue"]
[ext_resource type="PackedScene" uid="uid://cyy5i38sf7fid" path="res://Scenes/Props/Locker.tscn" id="20_jrxvj"]
[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="21_3u61o"]
[ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="22_jn5np"]
@ -29,11 +29,6 @@
[ext_resource type="PackedScene" uid="uid://cl7s06sk106uo" path="res://Scenes/Props/VendingMachine.tscn" id="26_6sq7s"]
[ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="26_yowd0"]
[sub_resource type="Resource" id="Resource_53p3c"]
script = ExtResource("4_tgwif")
EggIndex = 0
StartingEquipment = Array[ExtResource("3_rf2ue")]([null])
[sub_resource type="Resource" id="Resource_2ugqu"]
script = ExtResource("11_esmuk")
TimelineName = &"colonel1"
@ -57,11 +52,11 @@ region = Rect2(0, 0, 8, 16)
[node name="GameScene" type="Node2D"]
process_mode = 3
script = ExtResource("1_6sq7s")
MapResource = ExtResource("2_oa48u")
PlayerTemplate = ExtResource("2_cicvv")
SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition")
})
MapStartData = SubResource("Resource_53p3c")
[node name="Tilemaps" type="Node2D" parent="."]
process_mode = 1
@ -184,6 +179,9 @@ LevelPath = "res://Scenes/Maps/Level2.tscn"
Map = ExtResource("18_8anae")
SaveInventory = true
[node name="GreenKeyCard" parent="Tilemaps/Actors" instance=ExtResource("19_rf2ue")]
position = Vector2(133, 298)
[node name="ControlPad" parent="Tilemaps" node_paths=PackedStringArray("Targets") instance=ExtResource("19_nxss7")]
position = Vector2(134, 371)
Targets = [NodePath("../Actors/HorizontalDoor")]

18
Scenes/test.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=154 format=4 uid="uid://bv451a8wgty4u"]
[gd_scene load_steps=151 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"]
@ -11,7 +11,6 @@
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="6_8tdlb"]
[ext_resource type="Resource" uid="uid://clr1gln7nxa1o" path="res://Resources/Items/Power_Pickup.tres" id="6_khabp"]
[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="6_t8ide"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="7_l32kg"]
[ext_resource type="PackedScene" uid="uid://crmwuwhltmdq7" path="res://Scenes/Props/MediumTank.tscn" id="7_lmrl1"]
[ext_resource type="PackedScene" uid="uid://7cpk3c3d8cl7" path="res://Scenes/Props/MediumLiquidTank.tscn" id="8_2wpw7"]
[ext_resource type="PackedScene" uid="uid://q7hau0tl3vsr" path="res://Scenes/Items/IcicleGun.tscn" id="10_iihys"]
@ -67,7 +66,6 @@
[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="46_0bqta"]
[ext_resource type="Script" uid="uid://ddv26x2qilprb" path="res://Scripts/Resources/Events/DialogueStartEvent.cs" id="46_i0omr"]
[ext_resource type="PackedScene" uid="uid://cqrkisw6jg24w" path="res://Scenes/Props/MainFrame1.tscn" id="46_ny2s2"]
[ext_resource type="Script" uid="uid://b5s5mjuk1rng5" path="res://Scripts/Resources/TimeModifier.cs" id="47_dferh"]
[ext_resource type="PackedScene" uid="uid://cdti0hnbs3e63" path="res://Scenes/Actors/RoamingSusan.tscn" id="47_u1ve6"]
[ext_resource type="PackedScene" uid="uid://cke02i4e3bxld" path="res://Scenes/Props/MainFrame2.tscn" id="47_y5mcc"]
[ext_resource type="PackedScene" uid="uid://b0pb078xylxy" path="res://Scenes/Interactable/Valve.tscn" id="48_8usll"]
@ -124,11 +122,6 @@
[ext_resource type="Resource" uid="uid://dqnvesdj0dk3v" path="res://Resources/Bullets/simple_enemy_bullet.tres" id="114_fuaed"]
[ext_resource type="PackedScene" uid="uid://r70dfwgv51tw" path="res://Scenes/Props/Fridge.tscn" id="115_dferh"]
[sub_resource type="Resource" id="Resource_6sau4"]
script = ExtResource("7_l32kg")
EggIndex = 0
StartingEquipment = Array[ExtResource("6_8tdlb")]([ExtResource("6_khabp")])
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ksslq"]
size = Vector2(184, 46.5)
@ -157,7 +150,7 @@ DamageType = 0
OverrideControllable = false
Controllable = false
OverrideCreationModifier = false
TimeModifiers = Array[ExtResource("47_dferh")]([])
TimeModifiers = []
WaitForCompletion = true
metadata/_custom_type_script = "uid://c0ndqalsc4jve"
@ -318,12 +311,12 @@ PlayerTemplate = ExtResource("2_ksslq")
SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("Parallax2D/Factory Tilemaps/LevelProps/StartPosition"),
2: NodePath("Parallax2D/Factory Tilemaps/LevelProps/BossDebugTeleporterDestination"),
3: NodePath("Parallax2D/Factory Tilemaps/LevelProps/AddendumStart"),
255: NodePath("Parallax2D/Factory Tilemaps/Debug Room/DebugRoomStartPosition")
})
StartingEquipment = Array[ExtResource("6_8tdlb")]([ExtResource("4_swym2"), ExtResource("5_nqier")])
MapStartData = SubResource("Resource_6sau4")
NavigationTilemap = NodePath("Parallax2D/Factory Tilemaps/Floor")
PlayerParentNode = NodePath("Parallax2D/Factory Tilemaps/PlayerParent")
EggStartIndex = 255
metadata/_edit_lock_ = true
[node name="Parallax2D" type="Parallax2D" parent="."]
@ -1504,6 +1497,9 @@ position = Vector2(-1257, 537)
ActivationType = 2
Target = NodePath("../HorizontalForceField6")
[node name="AddendumStart" type="Marker2D" parent="Parallax2D/Factory Tilemaps/LevelProps"]
position = Vector2(-1366, 358)
[node name="PlayerParent" type="Node2D" parent="Parallax2D/Factory Tilemaps"]
[node name="BeamShadows" type="TileMapLayer" parent="Parallax2D/Factory Tilemaps"]