maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-07-04 02:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed player template in maps

Browse source
This commit is contained in:
Marco 2025-03-03 09:44:38 +01:00
commit 1005796e13
7 changed files with 24 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Scenes/Maps/BossTestArena.tscn
View file

@ -2,14 +2,13 @@
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_paetl"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_paetl"]
[ext_resource type="PackedScene" uid="uid://d1rlw6ddpmrn8" path="res://Scenes/Actors/Rumia.tscn" id="2_47q21"] [ext_resource type="PackedScene" uid="uid://d1rlw6ddpmrn8" path="res://Scenes/Actors/Rumia.tscn" id="2_47q21"]
[ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_f17ts"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_um322"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="3_cyhmq"] [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="3_cyhmq"]
[ext_resource type="PackedScene" uid="uid://bdp710abe10s5" path="res://Scenes/Interactable/AreaTrigger.tscn" id="9_xhf0g"] [ext_resource type="PackedScene" uid="uid://bdp710abe10s5" path="res://Scenes/Interactable/AreaTrigger.tscn" id="9_xhf0g"]
[node name="GameScene" type="Node2D" node_paths=PackedStringArray("PlayerSpawnMarker")] [node name="GameScene" type="Node2D"]
script = ExtResource("1_paetl") script = ExtResource("1_paetl")
PlayerTemplate = ExtResource("2_f17ts") PlayerTemplate = ExtResource("2_um322")
PlayerSpawnMarker = NodePath("PlayerStartPosition")
[node name="Liquids" type="TileMapLayer" parent="."] [node name="Liquids" type="TileMapLayer" parent="."]
tile_map_data = PackedByteArray("AAAFAAUAAAAEAAMAAAAFAAYAAAAEAAMAAAAEAAYAAAAEAAMAAAADAAYAAAAEAAMAAAACAAYAAAAEAAMAAAACAAUAAAAEAAMAAAADAAUAAAAEAAMAAAAEAAUAAAAEAAMAAAAJAAUAAAAEAAMAAAAKAAUAAAAEAAMAAAAKAAYAAAAEAAMAAAAJAAYAAAAEAAMAAAAIAAYAAAAEAAMAAAAIAAUAAAAEAAMAAAASAAUAAAAEAAMAAAASAAYAAAAEAAMAAAARAAYAAAAEAAMAAAAQAAYAAAAEAAMAAAAQAAUAAAAEAAMAAAARAAUAAAAEAAMAAAATAAUAAAAEAAMAAAATAAYAAAAEAAMAAAA=") tile_map_data = PackedByteArray("AAAFAAUAAAAEAAMAAAAFAAYAAAAEAAMAAAAEAAYAAAAEAAMAAAADAAYAAAAEAAMAAAACAAYAAAAEAAMAAAACAAUAAAAEAAMAAAADAAUAAAAEAAMAAAAEAAUAAAAEAAMAAAAJAAUAAAAEAAMAAAAKAAUAAAAEAAMAAAAKAAYAAAAEAAMAAAAJAAYAAAAEAAMAAAAIAAYAAAAEAAMAAAAIAAUAAAAEAAMAAAASAAUAAAAEAAMAAAASAAYAAAAEAAMAAAARAAYAAAAEAAMAAAAQAAYAAAAEAAMAAAAQAAUAAAAEAAMAAAARAAUAAAAEAAMAAAATAAUAAAAEAAMAAAATAAYAAAAEAAMAAAA=")

9
Scenes/Maps/Level2.tscn
View file

@ -1,8 +1,7 @@
[gd_scene load_steps=13 format=4 uid="uid://6a6tjohypmmb"] [gd_scene load_steps=12 format=4 uid="uid://6a6tjohypmmb"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_t2k72"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_t2k72"]
[ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_v2pdx"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_2jsgm"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_e12id"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_s1vkf"] [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="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_06rc0"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_up0ka"] [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_up0ka"]
@ -15,11 +14,11 @@
[sub_resource type="Resource" id="Resource_6wo78"] [sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_s1vkf") script = ExtResource("4_s1vkf")
EggIndex = 0 EggIndex = 0
StartingEquipment = Array[ExtResource("3_e12id")]([]) StartingEquipment = []
[node name="GameScene" type="Node2D"] [node name="GameScene" type="Node2D"]
script = ExtResource("1_t2k72") script = ExtResource("1_t2k72")
PlayerTemplate = ExtResource("2_v2pdx") PlayerTemplate = ExtResource("2_2jsgm")
SpawnMarkers = Dictionary[int, NodePath]({ SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition") 0: NodePath("PlayerStartPosition")
}) })

15
Scenes/Maps/NewActorTest.tscn
View file

@ -1,10 +1,8 @@
[gd_scene load_steps=28 format=4 uid="uid://5klhna6pdpss"] [gd_scene load_steps=26 format=4 uid="uid://5klhna6pdpss"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_uhxhn"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_uhxhn"]
[ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_afebu"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_y24l4"]
[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="3_2mapn"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_7nc7l"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_7nc7l"]
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="4_bk8jb"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_bsah1"] [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_bsah1"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_f3h3l"] [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_f3h3l"]
[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="7_4a7df"] [ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="7_4a7df"]
@ -29,7 +27,7 @@
[sub_resource type="Resource" id="Resource_6wo78"] [sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_7nc7l") script = ExtResource("4_7nc7l")
EggIndex = 0 EggIndex = 0
StartingEquipment = Array[ExtResource("4_bk8jb")]([]) StartingEquipment = []
[sub_resource type="Resource" id="Resource_0a8l3"] [sub_resource type="Resource" id="Resource_0a8l3"]
script = ExtResource("18_q3u5g") script = ExtResource("18_q3u5g")
@ -38,11 +36,10 @@ WaitForCompletion = true
[node name="GameScene" type="Node2D"] [node name="GameScene" type="Node2D"]
process_mode = 3 process_mode = 3
script = ExtResource("1_uhxhn") script = ExtResource("1_uhxhn")
PlayerTemplate = ExtResource("2_afebu") PlayerTemplate = ExtResource("2_y24l4")
SpawnMarkers = { SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition") 0: NodePath("PlayerStartPosition")
} })
WeaponTemplate = ExtResource("3_2mapn")
MapStartData = SubResource("Resource_6wo78") MapStartData = SubResource("Resource_6wo78")
[node name="Tilemaps" type="Node2D" parent="."] [node name="Tilemaps" type="Node2D" parent="."]

10
Scenes/Maps/RebelBase.tscn
View file

@ -1,11 +1,10 @@
[gd_scene load_steps=23 format=4 uid="uid://bx31ou6tw3kd1"] [gd_scene load_steps=22 format=4 uid="uid://bx31ou6tw3kd1"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_jpse7"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_jpse7"]
[ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_4hnih"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_8erab"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="2_m7mag"] [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="2_m7mag"]
[ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="2_pu05b"] [ext_resource type="Script" uid="uid://cfya7sndh7vy2" path="res://Scenes/CameraController.gd" id="2_pu05b"]
[ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="3_5wmap"] [ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="3_5wmap"]
[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="3_au7nm"]
[ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="4_js5qv"] [ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="4_js5qv"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_ls56o"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_ls56o"]
[ext_resource type="PackedScene" uid="uid://byms2dhliyux0" path="res://Scenes/Actors/teleporter.tscn" id="4_tlevr"] [ext_resource type="PackedScene" uid="uid://byms2dhliyux0" path="res://Scenes/Actors/teleporter.tscn" id="4_tlevr"]
@ -34,11 +33,10 @@ WaitForCompletion = true
[node name="GameScene" type="Node2D"] [node name="GameScene" type="Node2D"]
process_mode = 3 process_mode = 3
script = ExtResource("1_jpse7") script = ExtResource("1_jpse7")
PlayerTemplate = ExtResource("2_4hnih") PlayerTemplate = ExtResource("2_8erab")
SpawnMarkers = Dictionary[int, NodePath]({ SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition") 0: NodePath("PlayerStartPosition")
}) })
WeaponTemplate = ExtResource("3_au7nm")
MapStartData = SubResource("Resource_53p3c") MapStartData = SubResource("Resource_53p3c")
[node name="Tilemaps" type="Node2D" parent="."] [node name="Tilemaps" type="Node2D" parent="."]
@ -147,5 +145,3 @@ script = ExtResource("6_m31cm")
[node name="AudioStreamPlayer2D" parent="." instance=ExtResource("19_8erab")] [node name="AudioStreamPlayer2D" parent="." instance=ExtResource("19_8erab")]
process_mode = 3 process_mode = 3
autoplay = true autoplay = true
TrackName = "Rebel Base"
AuthorName = "Nobody"

10
Scenes/Maps/SimpleScene.tscn
View file

@ -1,8 +1,7 @@
[gd_scene load_steps=17 format=4 uid="uid://prgabjxh44lf"] [gd_scene load_steps=16 format=4 uid="uid://prgabjxh44lf"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_4uv21"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_4uv21"]
[ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_j0vja"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_xfbh8"]
[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="3_a16tm"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_bc0u7"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_bc0u7"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="4_em3f4"] [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="4_em3f4"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="5_75e1c"] [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="5_75e1c"]
@ -25,11 +24,10 @@ StartingEquipment = []
[node name="GameScene" type="Node2D"] [node name="GameScene" type="Node2D"]
process_mode = 3 process_mode = 3
script = ExtResource("1_4uv21") script = ExtResource("1_4uv21")
PlayerTemplate = ExtResource("2_j0vja") PlayerTemplate = ExtResource("2_xfbh8")
SpawnMarkers = Dictionary[int, NodePath]({ SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition") 0: NodePath("PlayerStartPosition")
}) })
WeaponTemplate = ExtResource("3_a16tm")
MapStartData = SubResource("Resource_6wo78") MapStartData = SubResource("Resource_6wo78")
[node name="Tilemaps" type="Node2D" parent="."] [node name="Tilemaps" type="Node2D" parent="."]
@ -99,5 +97,3 @@ script = ExtResource("15_d7e3u")
[node name="AudioStreamPlayer2D" parent="." instance=ExtResource("12_3bxj4")] [node name="AudioStreamPlayer2D" parent="." instance=ExtResource("12_3bxj4")]
process_mode = 3 process_mode = 3
autoplay = true autoplay = true
TrackName = "Test"
AuthorName = "Nobody"

8
Scenes/Maps/Tutorial.tscn
View file

@ -1,8 +1,7 @@
[gd_scene load_steps=47 format=4 uid="uid://bpnahwxmjgb6t"] [gd_scene load_steps=46 format=4 uid="uid://bpnahwxmjgb6t"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_qxyfr"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_qxyfr"]
[ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_nth0h"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_ajkcn"]
[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="3_auj7t"]
[ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_g48r8"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_g48r8"]
[ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_2m462"] [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_2m462"]
[ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_bnfdx"] [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_bnfdx"]
@ -111,11 +110,10 @@ WaitForCompletion = true
[node name="GameScene" type="Node2D"] [node name="GameScene" type="Node2D"]
process_mode = 3 process_mode = 3
script = ExtResource("1_qxyfr") script = ExtResource("1_qxyfr")
PlayerTemplate = ExtResource("2_nth0h") PlayerTemplate = ExtResource("2_ajkcn")
SpawnMarkers = Dictionary[int, NodePath]({ SpawnMarkers = Dictionary[int, NodePath]({
0: NodePath("PlayerStartPosition") 0: NodePath("PlayerStartPosition")
}) })
WeaponTemplate = ExtResource("3_auj7t")
MapStartData = SubResource("Resource_6wo78") MapStartData = SubResource("Resource_6wo78")
[node name="Parallax2D" type="Parallax2D" parent="."] [node name="Parallax2D" type="Parallax2D" parent="."]

2
Scripts/GameManager.cs
View file

@ -167,6 +167,8 @@ public partial class GameManager : Node2D
_player.GlobalPosition = GetStartPosition(); _player.GlobalPosition = GetStartPosition();
LastCheckpointPosition = _player.GlobalPosition;
//_player.GlobalPosition = PlayerSpawnMarker.Position; //_player.GlobalPosition = PlayerSpawnMarker.Position;
CameraTargetPlayer(); CameraTargetPlayer();