sandvich
/
SupaLidlGame
mirror of https://github.com/humanoidsandvichdispenser/SupaLidlgame
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: sandvich:b8a5e641b65f775c1a2f0e00f8d3bf166ab81ad2
Branches Tags
sandvich:master
sandvich:fix-worldenv
sandvich:impl-save-inventory
sandvich:wip
sandvich:origin/master
sandvich:phantom-camera
sandvich:refactor
sandvich:issue-templates
sandvich:godot-4.3
sandvich:wip-inventory
sandvich:godot-4.2
sandvich:controller-support
sandvich:godot-4.1.1
sandvich:item-info
sandvich:2023-09-09
...
compare: sandvich:8764d12859e9afde75069edc14a5b9e008af0fdc
Branches Tags
sandvich:master
sandvich:fix-worldenv
sandvich:impl-save-inventory
sandvich:wip
sandvich:origin/master
sandvich:phantom-camera
sandvich:refactor
sandvich:issue-templates
sandvich:godot-4.3
sandvich:wip-inventory
sandvich:godot-4.2
sandvich:controller-support
sandvich:godot-4.1.1
sandvich:item-info
sandvich:2023-09-09

12 Commits
b8a5e641b6 ... 8764d12859

Author SHA1 Message Date
John Montagu, the 4th Earl of Sandvich 8764d12859
Remove resource UIDs 2024-06-06 09:40:11 -07:00
John Montagu, the 4th Earl of Sandvich 94d66ec8da
Use Forest tileset as external resource 2024-06-06 09:38:25 -07:00
John Montagu, the 4th Earl of Sandvich b7547f3b38
Remove print statement 2024-06-06 09:37:56 -07:00
John Montagu, the 4th Earl of Sandvich 2cffab617c
Fix DocLegionary NPC off-center sprite 2024-06-06 09:31:13 -07:00
John Montagu, the 4th Earl of Sandvich 590f440b92
Add correct faction to Doc NPCs 2024-06-06 09:30:21 -07:00
John Montagu, the 4th Earl of Sandvich 0f73567aa7
Fix navigation issues 2024-06-06 09:27:59 -07:00
John Montagu, the 4th Earl of Sandvich 057aedca30
Add check to not rebake while navmesh is baking 2024-06-06 09:23:33 -07:00
John Montagu, the 4th Earl of Sandvich c3ead0cdaa
Add Get and Set methods for MapState 2024-06-06 09:22:26 -07:00
John Montagu, the 4th Earl of Sandvich 4f3d5dd316
Use World singleton 2024-06-06 09:21:39 -07:00
John Montagu, the 4th Earl of Sandvich a67dedf3f9
Add `Map.GetCharacters()` 2024-06-06 07:59:29 -07:00
John Montagu, the 4th Earl of Sandvich 4c780da552
Fix alt fire on joystick right 2024-06-05 12:20:30 -07:00
John Montagu, the 4th Earl of Sandvich 54ddc63fbe
Remove parentheses check in parser 2024-06-05 12:13:36 -07:00
19 changed files with 524 additions and 499 deletions
Show Stats Expand all files Collapse all files

1
Characters/DocCenturion.tscn
View File

@ -152,6 +152,7 @@ Sprite = NodePath("Sprites/Node2D/Character")
Inventory = NodePath("Inventory")
StateMachine = NodePath("StateMachine")
Hurtbox = NodePath("Hurtbox")
Faction = 2
[node name="Stats" type="Node" parent="."]
script = ExtResource("9_bxrs2")

1
Characters/DocCultist.tscn
View File

@ -405,6 +405,7 @@ Sprite = NodePath("Sprites/Node2D/Character")
Inventory = NodePath("Inventory")
StateMachine = NodePath("StateMachine")
Hurtbox = NodePath("Hurtbox")
Faction = 2
[node name="StateMachine" type="Node" parent="." node_paths=PackedStringArray("InitialState", "Character")]
script = ExtResource("3_lj2a2")

3
Characters/DocLegionary.tscn
View File

@ -290,6 +290,7 @@ Sprite = NodePath("Sprites/Node2D/Character")
Inventory = NodePath("Inventory")
StateMachine = NodePath("StateMachine")
Hurtbox = NodePath("Hurtbox")
Faction = 2
metadata/_edit_vertical_guides_ = []
[node name="Stats" type="Node" parent="."]
@ -416,7 +417,7 @@ stream = ExtResource("15_w7mkq")
unique_name_in_owner = true
y_sort_enabled = true
use_parent_material = true
position = Vector2(-0.5, 4)
position = Vector2(0, 4)
rotation = 6.28319
[node name="Node2D" type="Node2D" parent="Sprites"]

30
Characters/NPC.cs
View File

@ -104,27 +104,25 @@ public partial class NPC : Character
{
float bestScore = float.MaxValue;
Character bestChar = null;
// NOTE: this relies on all Characters being under the Entities node
foreach (Node node in GetParent().GetChildren())
foreach (var character in World.Instance.CurrentMap.GetCharacters())
{
if (node is Character character)
bool isFriendly = ((IFaction)character).AlignsWith(this);
if (isFriendly || !character.IsAlive)
{
bool isFriendly = character.Faction == Faction;
if (isFriendly || character.Health <= 0)
{
continue;
}
continue;
}
float score = 0;
score -= Position.DistanceTo(character.Position);
float score = 0;
score += GlobalPosition.DistanceSquaredTo(character.GlobalPosition);
if (score < bestScore)
{
bestScore = score;
bestChar = character;
}
if (score < bestScore)
{
bestScore = score;
bestChar = character;
}
}
return bestChar;
}
@ -147,7 +145,7 @@ public partial class NPC : Character
}
float score = 0;
score -= Position.DistanceTo(character.Position);
score -= Position.DistanceSquaredTo(character.Position);
if (score < bestScore)
{

1
Characters/Player.cs
View File

@ -238,7 +238,6 @@ public sealed partial class Player : Character
switch (inputMethod)
{
case State.Global.InputMethod.Joystick:
GD.Print(joystick);
if (joystick.IsZeroApprox())
{
return Direction;

5
Debug/Transpiler/Parser.cs
View File

@ -91,11 +91,6 @@ public class Parser
}
else if (token.Type == TokenType.Grouping)
{
if (token.Value == ")")
{
throw new InterpreterException("Unexpected )",
token.Line, token.Column);
}
if (prev is LiteralExpression l)
{
// this is a function call

5
Entities/DynamicDoor.cs
View File

@ -59,7 +59,10 @@ public partial class DynamicDoor : StaticBody2D
{
// rebake navmesh so NPCs can correctly travel conditionally
GD.Print("Dynamic door updated; rebaking navmeshes...");
navmesh.BakeNavigationPolygon();
if (!navmesh.IsBaking())
{
navmesh.BakeNavigationPolygon();
}
}
}
}

2
Items/Inventory.cs
View File

@ -111,8 +111,6 @@ public partial class Inventory : Node2D, IItemCollection<ItemMetadata>
EmitSignal(SignalName.EquippedItem, prevItem, _selectedItem);
GD.Print($"Inventory: {index} is new selected index.");
return true;
}

8
Props/Bookshelf.tscn
View File

@ -1,13 +1,10 @@
[gd_scene load_steps=4 format=3 uid="uid://hm3ek8vqt1d4"]
[gd_scene load_steps=3 format=3 uid="uid://hm3ek8vqt1d4"]
[ext_resource type="Texture2D" uid="uid://dwbrymm3ud5xu" path="res://Assets/Sprites/Props/bookshelf.png" id="1_cnrpk"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_wc4oe"]
size = Vector2(28, 8)
[sub_resource type="NavigationPolygon" id="NavigationPolygon_tsfmt"]
source_geometry_group_name = &"navigation_polygon_source_group"
[node name="Bookshelf" type="StaticBody2D"]
y_sort_enabled = true
@ -48,6 +45,3 @@ frame = 1
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(0, -4)
shape = SubResource("RectangleShape2D_wc4oe")
[node name="NavigationRegion2D" type="NavigationRegion2D" parent="."]
navigation_polygon = SubResource("NavigationPolygon_tsfmt")

12
Scenes/Map.cs
View File

@ -1,5 +1,6 @@
using Godot;
using SupaLidlGame.Extensions;
using System.Collections.Generic;
namespace SupaLidlGame.Scenes;
@ -71,6 +72,17 @@ public partial class Map : TileMap
GetNode<Audio.AudioManager>("/root/AudioManager").PlayBackground(Music);
}
public IEnumerable<Characters.Character> GetCharacters()
{
foreach (var child in Entities.GetChildren())
{
if (child is Characters.Character c)
{
yield return c;
}
}
}
public Node SpawnEntity(PackedScene scene)
{
var instance = scene.Instantiate();

20
Scenes/Maps/ArenaExterior.tscn
View File

@ -309,6 +309,7 @@ polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Arr
outlines = Array[PackedVector2Array]([PackedVector2Array(-16, 176, 16, 176, 16, 336, 144, 336, 144, 368, 112, 368, 112, 400, 48, 400, 48, 368, 16, 368, 16, 464, -16, 464)])
source_geometry_mode = 1
source_geometry_group_name = &"navigation"
cell_size = 16.0
agent_radius = 8.0
[sub_resource type="NavigationPolygon" id="NavigationPolygon_0dq8c"]
@ -317,6 +318,7 @@ polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Arr
outlines = Array[PackedVector2Array]([PackedVector2Array(-112, -16, -112, 16, -208, 16, -208, 96, -240, 96, -240, -16), PackedVector2Array(-240, 112, -208, 112, -208, 208, -240, 208)])
source_geometry_mode = 1
source_geometry_group_name = &"navigation"
cell_size = 16.0
agent_radius = 8.0
[sub_resource type="NavigationPolygon" id="NavigationPolygon_ag23k"]
@ -325,14 +327,16 @@ polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Arr
outlines = Array[PackedVector2Array]([PackedVector2Array(-192, 80, -192, 128, -400, 128, -400, 80, -560, 80, -560, 0, -336, 0, -336, 80), PackedVector2Array(-240, 192, -192, 192, -192, 256, -224, 256, -224, 464, -288, 464, -288, 528, -528, 528, -528, 464, -608, 464, -608, 384, -512, 384, -512, 320, -528, 320, -528, 192), PackedVector2Array(-256, 368, -256, 256, -368, 256, -368, 320, -480, 320, -480, 384, -464, 384, -464, 464, -352, 464, -352, 368)])
source_geometry_mode = 1
source_geometry_group_name = &"navigation"
cell_size = 16.0
agent_radius = 8.0
[sub_resource type="NavigationPolygon" id="NavigationPolygon_lh32d"]
vertices = PackedVector2Array(296, 680, 552, 680, 552, 696, 392, 696, 392, 712, 328, 712, 328, 696, 296, 696, 168, 680, 168, 660, 296, 456, 184, 680, 168, 648, 168, 628, 168, 616, 168, 596, 159, 625, 136, 628, 145, 625, 159, 657, 136, 660, 145, 657, -56, 660, -56, 584, -47, 593, 136, 824, 136, 680, 145, 689, 136, 616, -33, 593, 136, 648, 118, 521, 118, 497, 168, 564, -56, 456, 42, 497, 136, 596, -15, 593, 159, 689, 184, 840, 40, 840, 40, 872, -120, 872, -120, 840, -344, 840, -344, 520, -296, 520, -312, 628, -296, 628, -312, 648, -303, 657, -296, 657, -296, 660, -312, 660, -312, 680, -303, 689, -296, 689, -296, 692, -312, 692, -312, 712, -303, 721, -296, 721, -296, 724, -312, 724, -312, 744, -303, 753, -296, 753, -296, 756, -312, 756, -312, 776, -303, 785, -296, 824, -296, 785, -200, 824, -200, 728, -232, 728, -232, 520, -152, 568, 42, 521, 38, 521, 38, 497, -38, 497, -56, 520, -38, 521, -24, 584, -1, 593, 8, 584, 17, 593, 31, 593, 40, 584, 49, 593, 63, 593, 72, 584, 81, 593, 95, 593, 104, 584, 113, 593, 127, 593, 136, 584, 145, 593, 159, 593, 168, 584, -88, 564, -88, 568, -152, 728, -184, 728, -184, 824, -120, 824, -120, 792, 40, 792, 40, 824)
polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Array(3, 4, 5, 6), PackedInt32Array(0, 3, 6), PackedInt32Array(0, 6, 7), PackedInt32Array(8, 9, 10, 11), PackedInt32Array(12, 10, 9), PackedInt32Array(10, 12, 13), PackedInt32Array(14, 10, 13), PackedInt32Array(10, 14, 15), PackedInt32Array(16, 14, 13), PackedInt32Array(16, 13, 17, 18), PackedInt32Array(19, 12, 9), PackedInt32Array(19, 9, 20, 21), PackedInt32Array(22, 23, 24), PackedInt32Array(25, 26, 27), PackedInt32Array(28, 18, 17, 29), PackedInt32Array(24, 29, 30, 21, 20, 22), PackedInt32Array(31, 32, 10, 33), PackedInt32Array(34, 10, 32, 35), PackedInt32Array(17, 30, 29), PackedInt32Array(36, 28, 29, 37), PackedInt32Array(10, 0, 11), PackedInt32Array(38, 8, 11, 39, 25), PackedInt32Array(40, 41, 42, 43), PackedInt32Array(44, 45, 46, 47), PackedInt32Array(46, 48, 47), PackedInt32Array(44, 47, 49), PackedInt32Array(50, 51, 52, 53), PackedInt32Array(49, 50, 53), PackedInt32Array(44, 49, 53), PackedInt32Array(44, 53, 54), PackedInt32Array(55, 56, 57, 58), PackedInt32Array(54, 55, 58), PackedInt32Array(44, 54, 58), PackedInt32Array(44, 58, 59), PackedInt32Array(60, 61, 62, 63), PackedInt32Array(59, 60, 63), PackedInt32Array(44, 59, 63), PackedInt32Array(44, 63, 64), PackedInt32Array(65, 66, 67, 68), PackedInt32Array(64, 65, 68), PackedInt32Array(44, 64, 68), PackedInt32Array(44, 68, 69), PackedInt32Array(44, 69, 70, 71), PackedInt32Array(70, 72, 71), PackedInt32Array(43, 44, 71, 73), PackedInt32Array(74, 75, 76, 77), PackedInt32Array(35, 78, 79, 80), PackedInt32Array(34, 35, 80), PackedInt32Array(34, 80, 81), PackedInt32Array(82, 34, 81, 83), PackedInt32Array(29, 84, 37), PackedInt32Array(36, 37, 85), PackedInt32Array(85, 86, 87), PackedInt32Array(36, 85, 87), PackedInt32Array(36, 87, 88), PackedInt32Array(88, 89, 90), PackedInt32Array(36, 88, 90), PackedInt32Array(36, 90, 91), PackedInt32Array(91, 92, 93), PackedInt32Array(36, 91, 93), PackedInt32Array(36, 93, 94), PackedInt32Array(94, 95, 96), PackedInt32Array(36, 94, 96), PackedInt32Array(36, 96, 97), PackedInt32Array(36, 97, 98, 99), PackedInt32Array(15, 36, 99, 100), PackedInt32Array(15, 100, 101), PackedInt32Array(10, 15, 101), PackedInt32Array(10, 101, 33), PackedInt32Array(31, 33, 102, 78), PackedInt32Array(79, 78, 102), PackedInt32Array(83, 79, 102), PackedInt32Array(76, 82, 83, 102, 77), PackedInt32Array(102, 103, 77), PackedInt32Array(77, 104, 105), PackedInt32Array(74, 77, 105), PackedInt32Array(73, 74, 105, 106), PackedInt32Array(43, 73, 106), PackedInt32Array(43, 106, 107, 40), PackedInt32Array(107, 108, 109, 110), PackedInt32Array(40, 107, 110, 39), PackedInt32Array(39, 110, 25), PackedInt32Array(38, 25, 27)])
vertices = PackedVector2Array(-152, 728, -161, 728, -152, 719, -223, 728, -232, 728, -232, 719, 296, 680, 552, 680, 552, 696, 392, 696, 392, 712, 328, 712, 328, 696, 296, 696, 136, 824, 184, 840, 40, 840, 40, 824, 248, 559, 248, 539, 296, 456, 248, 527, 248, 507, 239, 536, 216, 539, 225, 536, -161, 600, -152, 591, -152, 603, -184, 603, -175, 600, -161, 632, -152, 623, -152, 635, -184, 635, -175, 632, -161, 664, -152, 655, -152, 667, -184, 667, -175, 664, -161, 696, -152, 687, -152, 699, -184, 699, -175, 696, -184, 719, -175, 728, -184, 728, -200, 719, -200, 728, -209, 728, -232, 699, -232, 687, -223, 696, -200, 699, -209, 696, -232, 667, -232, 655, -223, 664, -200, 667, -209, 664, -232, 635, -232, 623, -223, 632, -200, 635, -209, 632, -232, 603, -232, 591, -223, 600, -200, 603, -209, 600, 198, 456, 198, 464, -8, 507, 122, 464, 216, 527, 207, 536, -200, 591, -184, 591, -200, 623, -184, 623, -200, 655, -184, 655, -200, 687, -184, 687, 175, 632, 184, 680, 136, 680, 161, 632, 239, 632, 248, 623, 225, 632, 118, 464, 118, 456, 122, 456, 42, 464, -56, 520, 15, 536, 24, 527, 33, 536, 47, 536, 56, 527, 65, 536, 79, 536, 88, 527, 97, 536, 111, 536, 120, 527, 129, 536, 143, 536, 152, 527, 161, 536, 175, 536, 184, 527, 193, 536, 15, 632, 24, 623, 33, 632, 47, 632, 56, 623, 65, 632, 79, 632, 88, 623, 97, 632, 111, 632, 120, 623, 129, 632, 143, 632, 152, 623, 184, 623, 193, 632, 207, 632, 216, 623, -56, 680, 1, 632, -8, 623, -56, 568, -8, 603, -152, 568, -152, 571, -184, 571, -120, 824, -120, 792, 40, 792, -120, 840, 40, 872, -120, 872, -184, 824, -344, 840, -344, 520, -296, 520, -296, 824, -200, 571, -232, 571, -232, 520, -8, 527, 1, 536, -56, 456, 42, 456, 216, 559, 248, 603, 248, 591, 239, 600, 225, 600, 216, 591, 216, 571, 225, 568, 248, 571, 239, 568, -200, 824)
polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2), PackedInt32Array(3, 4, 5), PackedInt32Array(6, 7, 8, 9), PackedInt32Array(9, 10, 11, 12), PackedInt32Array(6, 9, 12), PackedInt32Array(6, 12, 13), PackedInt32Array(14, 15, 16, 17), PackedInt32Array(18, 19, 20, 6), PackedInt32Array(21, 20, 19), PackedInt32Array(20, 21, 22), PackedInt32Array(23, 21, 19), PackedInt32Array(23, 19, 24, 25), PackedInt32Array(26, 27, 28), PackedInt32Array(26, 28, 29, 30), PackedInt32Array(31, 32, 33), PackedInt32Array(31, 33, 34, 35), PackedInt32Array(36, 37, 38), PackedInt32Array(36, 38, 39, 40), PackedInt32Array(41, 42, 43), PackedInt32Array(41, 43, 44, 45), PackedInt32Array(46, 47, 48, 49), PackedInt32Array(50, 51, 49), PackedInt32Array(52, 53, 54), PackedInt32Array(55, 52, 54, 56), PackedInt32Array(57, 58, 59), PackedInt32Array(60, 57, 59, 61), PackedInt32Array(62, 63, 64), PackedInt32Array(65, 62, 64, 66), PackedInt32Array(67, 68, 69), PackedInt32Array(70, 67, 69, 71), PackedInt32Array(72, 20, 22, 73), PackedInt32Array(73, 22, 74, 75), PackedInt32Array(76, 25, 24, 77), PackedInt32Array(78, 79, 30, 29, 70, 71), PackedInt32Array(80, 81, 35, 34, 65, 66), PackedInt32Array(82, 83, 40, 39, 60, 61), PackedInt32Array(84, 85, 45, 44, 55, 56), PackedInt32Array(86, 87, 15, 14, 88, 89), PackedInt32Array(90, 91, 6), PackedInt32Array(90, 6, 87, 92), PackedInt32Array(93, 94, 95, 75), PackedInt32Array(93, 75, 74), PackedInt32Array(96, 93, 74, 97), PackedInt32Array(98, 99, 100), PackedInt32Array(101, 102, 103), PackedInt32Array(104, 105, 106), PackedInt32Array(107, 108, 109), PackedInt32Array(110, 111, 112), PackedInt32Array(113, 114, 115), PackedInt32Array(116, 117, 118), PackedInt32Array(119, 120, 121), PackedInt32Array(122, 123, 124), PackedInt32Array(125, 126, 127), PackedInt32Array(128, 129, 89, 88), PackedInt32Array(86, 130, 131, 87), PackedInt32Array(132, 133, 92, 87), PackedInt32Array(131, 132, 87), PackedInt32Array(127, 128, 88, 134), PackedInt32Array(125, 127, 134), PackedInt32Array(124, 125, 134), PackedInt32Array(122, 124, 134), PackedInt32Array(121, 122, 134), PackedInt32Array(119, 121, 134), PackedInt32Array(118, 119, 134), PackedInt32Array(116, 118, 134), PackedInt32Array(135, 116, 134), PackedInt32Array(136, 135, 134), PackedInt32Array(136, 134, 137, 138), PackedInt32Array(139, 140, 141), PackedInt32Array(142, 143, 144, 17), PackedInt32Array(142, 17, 16, 145), PackedInt32Array(16, 146, 147, 145), PackedInt32Array(148, 142, 145, 149), PackedInt32Array(149, 150, 151, 152), PackedInt32Array(153, 154, 155, 97, 156, 157, 139), PackedInt32Array(97, 158, 159, 96), PackedInt32Array(97, 74, 156), PackedInt32Array(77, 24, 160, 115), PackedInt32Array(113, 115, 160), PackedInt32Array(6, 91, 161), PackedInt32Array(162, 6, 161), PackedInt32Array(163, 162, 161), PackedInt32Array(163, 161, 138, 164), PackedInt32Array(165, 164, 138), PackedInt32Array(166, 165, 138, 137), PackedInt32Array(166, 137, 112, 113, 160, 167), PackedInt32Array(6, 162, 168), PackedInt32Array(18, 6, 168), PackedInt32Array(169, 18, 168), PackedInt32Array(169, 168, 166, 167), PackedInt32Array(110, 112, 137), PackedInt32Array(109, 110, 137), PackedInt32Array(107, 109, 137), PackedInt32Array(106, 107, 137), PackedInt32Array(104, 106, 137), PackedInt32Array(103, 104, 137), PackedInt32Array(101, 103, 137), PackedInt32Array(100, 101, 137), PackedInt32Array(98, 100, 137), PackedInt32Array(157, 98, 137, 139), PackedInt32Array(153, 139, 141), PackedInt32Array(153, 141, 79, 78), PackedInt32Array(70, 29, 81, 80), PackedInt32Array(65, 34, 83, 82), PackedInt32Array(60, 39, 85, 84), PackedInt32Array(55, 44, 46, 49), PackedInt32Array(50, 49, 48, 148), PackedInt32Array(170, 50, 148), PackedInt32Array(170, 148, 149), PackedInt32Array(170, 149, 152)])
outlines = Array[PackedVector2Array]([PackedVector2Array(-352, 512, -288, 512, -288, 816, -208, 816, -208, 736, -240, 736, -240, 512, -64, 512, -64, 448, 304, 448, 304, 672, 560, 672, 560, 704, 400, 704, 400, 720, 320, 720, 320, 704, 288, 704, 288, 688, 192, 688, 192, 848, 48, 848, 48, 880, -128, 880, -128, 848, -352, 848), PackedVector2Array(48, 816, 128, 816, 128, 688, -64, 688, -64, 576, -144, 576, -144, 736, -176, 736, -176, 816, -128, 816, -128, 784, 48, 784)])
source_geometry_mode = 1
source_geometry_group_name = &"navigation"
cell_size = 16.0
agent_radius = 8.0
[sub_resource type="NavigationPolygon" id="NavigationPolygon_qjknj"]
@ -341,6 +345,7 @@ polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3), PackedInt32Arr
outlines = Array[PackedVector2Array]([PackedVector2Array(16, -112, 16, -256, 64, -256, 64, -384, -208, -384, -208, -416, -432, -416, -432, -400, -464, -400, -464, -160, -528, -160, -528, -128, -464, -128, -464, 16, -432, 16, -432, -128, -368, -128, -368, -160, -432, -160, -432, -368, -336, -368, -336, -304, -208, -304, -208, -336, -64, -336, -64, -256, -16, -256, -16, -112)])
source_geometry_mode = 1
source_geometry_group_name = &"navigation"
cell_size = 16.0
agent_radius = 8.0
[node name="ArenaExterior" node_paths=PackedStringArray("Entities", "Areas", "Spawners", "Markers") groups=["navigation"] instance=ExtResource("1_ci4ij")]
@ -538,14 +543,13 @@ texture = ExtResource("6_lctxm")
texture = ExtResource("3_lgup0")
texture_scale = 0.15
[node name="StaticBookshelf" parent="Props" index="13" node_paths=PackedStringArray("InteractionTrigger") instance=ExtResource("9_qsthf")]
[node name="StaticBookshelf" parent="Props" index="13" instance=ExtResource("9_qsthf")]
position = Vector2(64, 456)
script = ExtResource("10_apvp5")
InteractionTrigger = NodePath("InteractionTrigger")
DialogueResource = ExtResource("11_fpxpb")
DialogueTitle = "unwanted_frequencies"
[node name="InteractionTrigger" parent="Props/StaticBookshelf" index="6" instance=ExtResource("10_scl41")]
[node name="InteractionTrigger" parent="Props/StaticBookshelf" index="5" instance=ExtResource("10_scl41")]
[node name="Popup" parent="Props/StaticBookshelf/InteractionTrigger" index="1"]
offset_top = -57.0
@ -803,15 +807,17 @@ bus = &"Ambient"
z_index = -1
position = Vector2(576, 416)
[node name="LeftDoor" parent="Entities" index="1" instance=ExtResource("21_nvrif")]
[node name="LeftDoor" parent="Entities" index="1" node_paths=PackedStringArray("Rebake") instance=ExtResource("21_nvrif")]
y_sort_enabled = true
position = Vector2(-224, 41)
MapStateKey = "b_arena_depths_1"
Rebake = [NodePath("../../Areas/LeftDoorNav")]
[node name="LeftDoor2" parent="Entities" index="2" instance=ExtResource("21_nvrif")]
[node name="LeftDoor2" parent="Entities" index="2" node_paths=PackedStringArray("Rebake") instance=ExtResource("21_nvrif")]
y_sort_enabled = true
position = Vector2(-224, 161)
MapStateKey = "b_arena_depths_1"
Rebake = [NodePath("../../Areas/LeftDoorNav")]
[node name="LeftDoorSwitch" parent="Entities" index="3" node_paths=PackedStringArray("InteractionTrigger") instance=ExtResource("22_ay852")]
position = Vector2(-257, 76)

48
Scenes/Maps/ArenaTileset.tres
View File

@ -4,22 +4,13 @@
[ext_resource type="Texture2D" uid="uid://j1ekk1ppenm4" path="res://Assets/Sprites/grass-tileset.png" id="2_lihbs"]
[ext_resource type="Texture2D" uid="uid://udgjrcaexuaq" path="res://Assets/Sprites/Props/arena-arches.png" id="3_hbylw"]
[sub_resource type="NavigationPolygon" id="NavigationPolygon_7lhug"]
vertices = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)])
outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)])
[sub_resource type="NavigationPolygon" id="NavigationPolygon_7s0wj"]
source_geometry_group_name = &"navigation_polygon_source_group"
[sub_resource type="NavigationPolygon" id="NavigationPolygon_d0snv"]
vertices = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)])
outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)])
[sub_resource type="NavigationPolygon" id="NavigationPolygon_7vkqx"]
source_geometry_group_name = &"navigation_polygon_source_group"
[sub_resource type="NavigationPolygon" id="NavigationPolygon_m43r7"]
vertices = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)])
outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)])
[sub_resource type="NavigationPolygon" id="NavigationPolygon_pxj45"]
source_geometry_group_name = &"navigation_polygon_source_group"
[sub_resource type="CanvasTexture" id="CanvasTexture_3n6aa"]
@ -40,7 +31,7 @@ texture = SubResource("CanvasTexture_3n6aa")
0:0/0/terrains_peering_bit/top_left_corner = 0
0:0/0/terrains_peering_bit/top_side = 0
0:0/0/terrains_peering_bit/top_right_corner = 0
0:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7lhug")
0:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
1:1/0 = 0
1:1/0/terrain_set = 0
1:1/0/terrain = 0
@ -54,7 +45,7 @@ texture = SubResource("CanvasTexture_3n6aa")
1:1/0/terrains_peering_bit/top_left_corner = 0
1:1/0/terrains_peering_bit/top_side = 0
1:1/0/terrains_peering_bit/top_right_corner = 0
1:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7lhug")
1:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
2:1/0 = 0
2:1/0/terrain_set = 0
2:1/0/terrain = 1
@ -77,6 +68,7 @@ texture = SubResource("CanvasTexture_3n6aa")
2:2/0/terrains_peering_bit/bottom_right_corner = 1
2:2/0/terrains_peering_bit/bottom_side = 1
2:2/0/terrains_peering_bit/bottom_left_corner = 1
2:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
1:0/0 = 0
1:0/0/terrain_set = 0
1:0/0/terrain = 0
@ -90,7 +82,7 @@ texture = SubResource("CanvasTexture_3n6aa")
1:0/0/terrains_peering_bit/top_left_corner = 0
1:0/0/terrains_peering_bit/top_side = 0
1:0/0/terrains_peering_bit/top_right_corner = 0
1:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7lhug")
1:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
0:1/0 = 0
0:1/0/terrain_set = 0
0:1/0/terrain = 0
@ -104,7 +96,7 @@ texture = SubResource("CanvasTexture_3n6aa")
0:1/0/terrains_peering_bit/top_left_corner = 0
0:1/0/terrains_peering_bit/top_side = 0
0:1/0/terrains_peering_bit/top_right_corner = 0
0:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7lhug")
0:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
0:2/0 = 0
0:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:2/0/physics_layer_0/angular_velocity = 0.0
@ -117,21 +109,23 @@ texture = SubResource("CanvasTexture_3n6aa")
1:2/0 = 0
1:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:2/0/physics_layer_0/angular_velocity = 0.0
1:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
2:0/0 = 0
2:0/0/terrain_set = 0
2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:0/0/physics_layer_0/angular_velocity = 0.0
2:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_m43r7")
2:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
3:0/0 = 0
3:0/0/terrain_set = 0
3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:0/0/physics_layer_0/angular_velocity = 0.0
3:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_m43r7")
3:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
4:0/0 = 0
4:0/0/terrain_set = 0
4:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:0/0/physics_layer_0/angular_velocity = 0.0
4:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
5:0/0 = 0
5:0/0/terrain_set = 0
5:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
@ -174,6 +168,7 @@ texture = SubResource("CanvasTexture_3n6aa")
3:2/0/terrains_peering_bit/top_left_corner = 0
3:2/0/terrains_peering_bit/top_side = 0
3:2/0/terrains_peering_bit/top_right_corner = 0
3:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
3:3/0 = 0
3:3/0/terrain_set = 0
3:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
@ -202,12 +197,14 @@ texture = SubResource("CanvasTexture_3n6aa")
4:2/0/physics_layer_0/angular_velocity = 0.0
4:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(0, 0, 8, 0, 8, 8, 0, 8)
4:2/0/terrains_peering_bit/bottom_right_corner = 1
4:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
5:2/0 = 0
5:2/0/terrain_set = 0
5:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:2/0/physics_layer_0/angular_velocity = 0.0
5:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, 0, 0, 0, 0, 8, -8, 8)
5:2/0/terrains_peering_bit/bottom_left_corner = 1
5:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
5:3/0 = 0
5:3/0/terrain_set = 0
5:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
@ -220,9 +217,11 @@ texture = SubResource("CanvasTexture_3n6aa")
6:2/0 = 0
6:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
6:2/0/physics_layer_0/angular_velocity = 0.0
6:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
7:2/0 = 0
7:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
7:2/0/physics_layer_0/angular_velocity = 0.0
7:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
7:3/0 = 0
7:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
7:3/0/physics_layer_0/angular_velocity = 0.0
@ -312,34 +311,37 @@ texture = SubResource("CanvasTexture_3n6aa")
10:1/0/terrain_set = 1
10:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
10:1/0/physics_layer_0/angular_velocity = 0.0
10:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_d0snv")
10:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
11:1/0 = 0
11:1/0/terrain_set = 1
11:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
11:1/0/physics_layer_0/angular_velocity = 0.0
11:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_d0snv")
11:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
11:2/0 = 0
11:2/0/terrain_set = 1
11:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
11:2/0/physics_layer_0/angular_velocity = 0.0
11:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_d0snv")
11:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
10:2/0 = 0
10:2/0/terrain_set = 1
10:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
10:2/0/physics_layer_0/angular_velocity = 0.0
10:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_d0snv")
10:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
8:1/0 = 0
8:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
8:1/0/physics_layer_0/angular_velocity = 0.0
8:2/0 = 0
8:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
8:2/0/physics_layer_0/angular_velocity = 0.0
8:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
9:1/0 = 0
9:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
9:1/0/physics_layer_0/angular_velocity = 0.0
9:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
9:2/0 = 0
9:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
9:2/0/physics_layer_0/angular_velocity = 0.0
9:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7s0wj")
9:5/0 = 0
9:5/0/terrain_set = 1
9:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
@ -384,6 +386,7 @@ texture = SubResource("CanvasTexture_3n6aa")
9:6/0/terrains_peering_bit/right_side = 0
9:6/0/terrains_peering_bit/bottom_right_corner = 0
9:6/0/terrains_peering_bit/top_right_corner = 0
9:6/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_pxj45")
9:7/0 = 0
9:7/0/terrain_set = 1
9:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
@ -482,6 +485,7 @@ texture = SubResource("CanvasTexture_3n6aa")
7:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
7:7/0/physics_layer_0/angular_velocity = 0.0
7:7/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
7:7/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_7vkqx")
8:7/0 = 0
8:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
8:7/0/physics_layer_0/angular_velocity = 0.0

434
Scenes/Maps/ForestNew.tscn
View File

File diff suppressed because one or more lines are too long

429
Scenes/Maps/ForestTileset.tres 100644
View File

@ -0,0 +1,429 @@
[gd_resource type="TileSet" load_steps=7 format=3 uid="uid://dkis3rb4n62cu"]
[ext_resource type="Texture2D" uid="uid://c70cn53osy56w" path="res://Assets/Sprites/dev-tileset.png" id="1_nk7yv"]
[ext_resource type="Texture2D" uid="uid://lnyd6osxcu0g" path="res://Assets/Sprites/Props/tree-autumn-cluster-tiles.png" id="2_j2hod"]
[ext_resource type="Texture2D" uid="uid://ccqfwgjkerta5" path="res://Assets/Sprites/grass-tileset-dark.png" id="3_dmva5"]
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_s1h2f"]
texture = ExtResource("1_nk7yv")
0:0/0 = 0
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:0/0/physics_layer_0/angular_velocity = 0.0
1:0/0 = 0
1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:0/0/physics_layer_0/angular_velocity = 0.0
2:0/0 = 0
2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:0/0/physics_layer_0/angular_velocity = 0.0
3:0/0 = 0
3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:0/0/physics_layer_0/angular_velocity = 0.0
0:1/0 = 0
0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:1/0/physics_layer_0/angular_velocity = 0.0
1:1/0 = 0
1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:1/0/physics_layer_0/angular_velocity = 0.0
2:1/0 = 0
2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:1/0/physics_layer_0/angular_velocity = 0.0
3:1/0 = 0
3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:1/0/physics_layer_0/angular_velocity = 0.0
0:2/0 = 0
0:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:2/0/physics_layer_0/angular_velocity = 0.0
1:2/0 = 0
1:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:2/0/physics_layer_0/angular_velocity = 0.0
2:2/0 = 0
2:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:2/0/physics_layer_0/angular_velocity = 0.0
3:2/0 = 0
3:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:2/0/physics_layer_0/angular_velocity = 0.0
0:3/0 = 0
0:3/0/y_sort_origin = 8
0:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:3/0/physics_layer_0/angular_velocity = 0.0
1:3/0 = 0
1:3/0/y_sort_origin = 8
1:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:3/0/physics_layer_0/angular_velocity = 0.0
2:3/0 = 0
2:3/0/y_sort_origin = 8
2:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:3/0/physics_layer_0/angular_velocity = 0.0
0:4/0 = 0
0:4/0/y_sort_origin = 8
0:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:4/0/physics_layer_0/angular_velocity = 0.0
0:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(4, -8, 8, -8, 8, 8, 4, 8)
1:4/0 = 0
1:4/0/y_sort_origin = 8
1:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:4/0/physics_layer_0/angular_velocity = 0.0
1:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:4/0 = 0
2:4/0/y_sort_origin = 8
2:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:4/0/physics_layer_0/angular_velocity = 0.0
2:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -4, -8, -4, 8, -8, 8)
0:5/0 = 0
0:5/0/y_sort_origin = 8
0:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:5/0/physics_layer_0/angular_velocity = 0.0
0:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(3.5, -8, 8, -8, 8, -4, 4, -4)
1:5/0 = 0
1:5/0/y_sort_origin = 8
1:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:5/0/physics_layer_0/angular_velocity = 0.0
1:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, -4, -8, -4)
2:5/0 = 0
2:5/0/y_sort_origin = 8
2:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:5/0/physics_layer_0/angular_velocity = 0.0
2:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -4, -8, -4, -4, -8, -4)
3:5/0 = 0
3:5/0/y_sort_origin = 8
3:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:5/0/physics_layer_0/angular_velocity = 0.0
4:5/0 = 0
4:5/0/y_sort_origin = 8
4:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:5/0/physics_layer_0/angular_velocity = 0.0
5:5/0 = 0
5:5/0/y_sort_origin = 8
5:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:5/0/physics_layer_0/angular_velocity = 0.0
4:4/0 = 0
4:4/0/y_sort_origin = 8
4:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:4/0/physics_layer_0/angular_velocity = 0.0
4:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(4, -8, 4, 8, 8, 8, 8, -8)
3:4/0 = 0
3:4/0/y_sort_origin = 8
3:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:4/0/physics_layer_0/angular_velocity = 0.0
3:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -4, -8, -4, 8, -8, 8)
4:3/0 = 0
4:3/0/y_sort_origin = 8
4:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:3/0/physics_layer_0/angular_velocity = 0.0
3:3/0 = 0
3:3/0/y_sort_origin = 8
3:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:3/0/physics_layer_0/angular_velocity = 0.0
5:2/0 = 0
5:2/0/y_sort_origin = 8
5:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:2/0/physics_layer_0/angular_velocity = 0.0
4:1/0 = 0
4:1/0/y_sort_origin = 8
4:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:1/0/physics_layer_0/angular_velocity = 0.0
4:0/0 = 0
4:0/0/y_sort_origin = 8
4:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:0/0/physics_layer_0/angular_velocity = 0.0
5:0/0 = 0
5:0/0/y_sort_origin = 8
5:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:0/0/physics_layer_0/angular_velocity = 0.0
5:1/0 = 0
5:1/0/y_sort_origin = 8
5:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:1/0/physics_layer_0/angular_velocity = 0.0
4:2/0 = 0
4:2/0/y_sort_origin = 8
4:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:2/0/physics_layer_0/angular_velocity = 0.0
5:4/0 = 0
5:4/0/y_sort_origin = 8
5:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:4/0/physics_layer_0/angular_velocity = 0.0
5:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(4, -8, 8, -8, 8, 8, 4, 8)
5:3/0 = 0
5:3/0/y_sort_origin = 8
5:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:3/0/physics_layer_0/angular_velocity = 0.0
5:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, -4, -8, -4, 8, -8, 8)
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_tw0o1"]
texture = ExtResource("2_j2hod")
0:0/0 = 0
0:0/0/y_sort_origin = 8
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:0/0/physics_layer_0/angular_velocity = 0.0
0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:0/0 = 0
1:0/0/y_sort_origin = 8
1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:0/0/physics_layer_0/angular_velocity = 0.0
1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:0/0 = 0
2:0/0/y_sort_origin = 8
2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:0/0/physics_layer_0/angular_velocity = 0.0
2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:0/0 = 0
3:0/0/y_sort_origin = 8
3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:0/0/physics_layer_0/angular_velocity = 0.0
3:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:1/0 = 0
0:1/0/y_sort_origin = 8
0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:1/0/physics_layer_0/angular_velocity = 0.0
0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:1/0 = 0
1:1/0/y_sort_origin = 8
1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:1/0/physics_layer_0/angular_velocity = 0.0
1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:1/0 = 0
2:1/0/y_sort_origin = 8
2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:1/0/physics_layer_0/angular_velocity = 0.0
2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:1/0 = 0
3:1/0/y_sort_origin = 8
3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:1/0/physics_layer_0/angular_velocity = 0.0
3:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:2/0 = 0
0:2/0/y_sort_origin = 8
0:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:2/0/physics_layer_0/angular_velocity = 0.0
0:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:2/0 = 0
1:2/0/y_sort_origin = 8
1:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:2/0/physics_layer_0/angular_velocity = 0.0
1:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:2/0 = 0
2:2/0/y_sort_origin = 8
2:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:2/0/physics_layer_0/angular_velocity = 0.0
2:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:2/0 = 0
3:2/0/y_sort_origin = 8
3:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:2/0/physics_layer_0/angular_velocity = 0.0
3:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:3/size_in_atlas = Vector2i(1, 2)
0:3/0 = 0
0:3/0/texture_origin = Vector2i(0, 8)
0:3/0/y_sort_origin = 8
0:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:3/0/physics_layer_0/angular_velocity = 0.0
0:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -24, 8, -24, 8, 8, -8, 8)
1:3/size_in_atlas = Vector2i(1, 2)
1:3/0 = 0
1:3/0/texture_origin = Vector2i(0, 8)
1:3/0/y_sort_origin = 8
1:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:3/0/physics_layer_0/angular_velocity = 0.0
1:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -24, 8, -24, 8, 8, -8, 8)
2:3/size_in_atlas = Vector2i(1, 2)
2:3/0 = 0
2:3/0/texture_origin = Vector2i(0, 8)
2:3/0/y_sort_origin = 8
2:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:3/0/physics_layer_0/angular_velocity = 0.0
2:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -24, 8, -24, 8, 8, -8, 8)
3:3/size_in_atlas = Vector2i(1, 2)
3:3/0 = 0
3:3/0/texture_origin = Vector2i(0, 8)
3:3/0/y_sort_origin = 8
3:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:3/0/physics_layer_0/angular_velocity = 0.0
3:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -24, 8, -24, 8, 8, -8, 8)
4:0/0 = 0
4:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:0/0/physics_layer_0/angular_velocity = 0.0
4:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
5:0/0 = 0
5:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:0/0/physics_layer_0/angular_velocity = 0.0
5:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
5:1/0 = 0
5:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:1/0/physics_layer_0/angular_velocity = 0.0
5:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:1/0 = 0
4:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:1/0/physics_layer_0/angular_velocity = 0.0
4:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:2/0 = 0
4:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:2/0/physics_layer_0/angular_velocity = 0.0
4:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
5:2/0 = 0
5:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:2/0/physics_layer_0/angular_velocity = 0.0
5:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
5:3/0 = 0
5:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:3/0/physics_layer_0/angular_velocity = 0.0
5:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:3/0 = 0
4:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:3/0/physics_layer_0/angular_velocity = 0.0
4:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_w8vpx"]
texture = ExtResource("3_dmva5")
0:0/0 = 0
0:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:0/0/physics_layer_0/angular_velocity = 0.0
1:0/0 = 0
1:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:0/0/physics_layer_0/angular_velocity = 0.0
1:1/0 = 0
1:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:1/0/physics_layer_0/angular_velocity = 0.0
2:1/0 = 0
2:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:1/0/physics_layer_0/angular_velocity = 0.0
3:2/0 = 0
3:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:2/0/physics_layer_0/angular_velocity = 0.0
4:2/0 = 0
4:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:2/0/physics_layer_0/angular_velocity = 0.0
4:3/0 = 0
4:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:3/0/physics_layer_0/angular_velocity = 0.0
5:3/0 = 0
5:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:3/0/physics_layer_0/angular_velocity = 0.0
0:1/0 = 0
0:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:1/0/physics_layer_0/angular_velocity = 0.0
0:2/0 = 0
0:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:2/0/physics_layer_0/angular_velocity = 0.0
0:3/0 = 0
0:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:3/0/physics_layer_0/angular_velocity = 0.0
0:4/0 = 0
0:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:4/0/physics_layer_0/angular_velocity = 0.0
0:5/0 = 0
0:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:5/0/physics_layer_0/angular_velocity = 0.0
1:5/0 = 0
1:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:5/0/physics_layer_0/angular_velocity = 0.0
1:6/0 = 0
1:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:6/0/physics_layer_0/angular_velocity = 0.0
2:6/0 = 0
2:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:6/0/physics_layer_0/angular_velocity = 0.0
0:6/0 = 0
0:6/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:6/0/physics_layer_0/angular_velocity = 0.0
0:7/0 = 0
0:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:7/0/physics_layer_0/angular_velocity = 0.0
1:7/0 = 0
1:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:7/0/physics_layer_0/angular_velocity = 0.0
2:7/0 = 0
2:7/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:7/0/physics_layer_0/angular_velocity = 0.0
2:5/0 = 0
2:5/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:5/0/physics_layer_0/angular_velocity = 0.0
1:2/0 = 0
1:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:2/0/physics_layer_0/angular_velocity = 0.0
1:3/0 = 0
1:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:3/0/physics_layer_0/angular_velocity = 0.0
2:3/0 = 0
2:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:3/0/physics_layer_0/angular_velocity = 0.0
3:3/0 = 0
3:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:3/0/physics_layer_0/angular_velocity = 0.0
1:4/0 = 0
1:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:4/0/physics_layer_0/angular_velocity = 0.0
6:3/0 = 0
6:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
6:3/0/physics_layer_0/angular_velocity = 0.0
2:4/0 = 0
2:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:4/0/physics_layer_0/angular_velocity = 0.0
3:4/0 = 0
3:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:4/0/physics_layer_0/angular_velocity = 0.0
4:4/0 = 0
4:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:4/0/physics_layer_0/angular_velocity = 0.0
2:2/0 = 0
2:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:2/0/physics_layer_0/angular_velocity = 0.0
5:4/0 = 0
5:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:4/0/physics_layer_0/angular_velocity = 0.0
6:4/0 = 0
6:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
6:4/0/physics_layer_0/angular_velocity = 0.0
7:4/0 = 0
7:4/0/physics_layer_0/linear_velocity = Vector2(0, 0)
7:4/0/physics_layer_0/angular_velocity = 0.0
7:3/0 = 0
7:3/0/physics_layer_0/linear_velocity = Vector2(0, 0)
7:3/0/physics_layer_0/angular_velocity = 0.0
2:0/0 = 0
2:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:0/0/physics_layer_0/angular_velocity = 0.0
3:0/0 = 0
3:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:0/0/physics_layer_0/angular_velocity = 0.0
4:0/0 = 0
4:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:0/0/physics_layer_0/angular_velocity = 0.0
5:0/0 = 0
5:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:0/0/physics_layer_0/angular_velocity = 0.0
6:0/0 = 0
6:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
6:0/0/physics_layer_0/angular_velocity = 0.0
7:0/0 = 0
7:0/0/physics_layer_0/linear_velocity = Vector2(0, 0)
7:0/0/physics_layer_0/angular_velocity = 0.0
7:1/0 = 0
7:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
7:1/0/physics_layer_0/angular_velocity = 0.0
6:2/0 = 0
6:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
6:2/0/physics_layer_0/angular_velocity = 0.0
5:2/0 = 0
5:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:2/0/physics_layer_0/angular_velocity = 0.0
4:1/0 = 0
4:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:1/0/physics_layer_0/angular_velocity = 0.0
3:1/0 = 0
3:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:1/0/physics_layer_0/angular_velocity = 0.0
6:1/0 = 0
6:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
6:1/0/physics_layer_0/angular_velocity = 0.0
7:2/0 = 0
7:2/0/physics_layer_0/linear_velocity = Vector2(0, 0)
7:2/0/physics_layer_0/angular_velocity = 0.0
5:1/0 = 0
5:1/0/physics_layer_0/linear_velocity = Vector2(0, 0)
5:1/0/physics_layer_0/angular_velocity = 0.0
[resource]
physics_layer_0/collision_layer = 1
sources/0 = SubResource("TileSetAtlasSource_s1h2f")
sources/3 = SubResource("TileSetAtlasSource_w8vpx")
sources/1 = SubResource("TileSetAtlasSource_tw0o1")

10
State/Global/MapState.cs
View File

@ -54,4 +54,14 @@ public partial class MapState : Resource
}
return null;
}
public Variant Get(string key)
{
return this[key];
}
public void Set(string key, Variant value)
{
this[key] = value;
}
}

2
UI/Inventory/ShopMenu.tscn
View File

@ -1,6 +1,6 @@
[gd_scene load_steps=15 format=3 uid="uid://cyggkyqosjk36"]
[ext_resource type="StyleBox" uid="uid://bqhotx2ogucye" path="res://UI/Themes/Panel.tres" id="1_2ffty"]
[ext_resource type="StyleBox" path="res://UI/Themes/Panel.tres" id="1_2ffty"]
[ext_resource type="Script" path="res://UI/Inventory/ShopMenu.cs" id="1_8c1y7"]
[ext_resource type="Shader" path="res://Shaders/WipeXY.gdshader" id="2_jqery"]
[ext_resource type="FontFile" uid="uid://cgwa8bjiyv534" path="res://Assets/Fonts/alagard.ttf" id="3_aj4jx"]

8
UI/Themes/supalidl.tres
View File

@ -1,11 +1,11 @@
[gd_resource type="Theme" load_steps=11 format=3 uid="uid://cksjbu3vrup5"]
[ext_resource type="FontFile" uid="uid://6bvgjbmqovau" path="res://Assets/Fonts/calamity/calamity.ttf" id="1_334fe"]
[ext_resource type="StyleBox" uid="uid://nvb4etac7ee2" path="res://UI/Themes/InventorySlotButtonFocus.tres" id="2_3w5h1"]
[ext_resource type="StyleBox" path="res://UI/Themes/InventorySlotButtonFocus.tres" id="2_3w5h1"]
[ext_resource type="Texture2D" uid="uid://b16461tjso0j7" path="res://Assets/Sprites/UI/hotbar-inactive.png" id="2_6sv27"]
[ext_resource type="StyleBox" uid="uid://bqhotx2ogucye" path="res://UI/Themes/Panel.tres" id="2_jlgx8"]
[ext_resource type="StyleBox" uid="uid://cfqp0ycwvwx7c" path="res://UI/Themes/InventorySlotButtonNormal.tres" id="3_nuiio"]
[ext_resource type="StyleBox" uid="uid://pqtn0115bqtp" path="res://UI/Themes/InventorySlotButtonPressed.tres" id="4_mllnb"]
[ext_resource type="StyleBox" path="res://UI/Themes/Panel.tres" id="2_jlgx8"]
[ext_resource type="StyleBox" path="res://UI/Themes/InventorySlotButtonNormal.tres" id="3_nuiio"]
[ext_resource type="StyleBox" path="res://UI/Themes/InventorySlotButtonPressed.tres" id="4_mllnb"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_wk5ww"]
content_margin_left = 4.0

2
Utils/Spawner.cs
View File

@ -53,7 +53,7 @@ public partial class Spawner : Node2D
var chr = Character.Instantiate<Characters.Character>();
chr.GlobalPosition = randPos;
this.GetAncestor<Scenes.Map>().Entities.AddChild(chr);
World.Instance.CurrentMap.Entities.AddChild(chr);
}
}
}

2
project.godot
View File

@ -100,7 +100,7 @@ attack1={
attack2={
"deadzone": 0.5,
"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":2,"axis_value":1.0,"script":null)
, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":4,"axis_value":1.0,"script":null)
]
}
equip={