From 7f042f0130bee96a104696ae0ed3216b3e065d9d Mon Sep 17 00:00:00 2001 From: HumanoidSandvichDispenser Date: Wed, 22 Mar 2023 21:22:51 -0700 Subject: [PATCH] upgrade to godot 4.1 --- Assets/Sprites/Characters/forsen.png.import | 2 +- .../Sprites/Particles/point-light.png.import | 2 +- Assets/Sprites/campfire.png.import | 2 +- Assets/Sprites/knife.png.import | 2 +- Assets/Sprites/sword-swing.png.import | 2 +- Assets/Sprites/tileset.png.import | 2 +- BoundingBoxes/ConnectorBox.cs | 14 ++++++ Extensions/AudioStreamPlayer2D.cs | 10 ---- Scenes/Level.tscn | 4 +- SupaLidlGame.csproj | 2 +- Utils/World.cs | 49 +++++++++++++++++++ icon.svg.import | 2 +- project.godot | 2 +- 13 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 BoundingBoxes/ConnectorBox.cs create mode 100644 Utils/World.cs diff --git a/Assets/Sprites/Characters/forsen.png.import b/Assets/Sprites/Characters/forsen.png.import index edd70e7..ec703a1 100644 --- a/Assets/Sprites/Characters/forsen.png.import +++ b/Assets/Sprites/Characters/forsen.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/forsen.png-c75844516d35dfe104cf50cd521a7820.c [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/Assets/Sprites/Particles/point-light.png.import b/Assets/Sprites/Particles/point-light.png.import index 4ea6fe5..5e8b7c3 100644 --- a/Assets/Sprites/Particles/point-light.png.import +++ b/Assets/Sprites/Particles/point-light.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/point-light.png-2a3976318d4aaede46957261acffe [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/Assets/Sprites/campfire.png.import b/Assets/Sprites/campfire.png.import index f4b10ca..7aaa457 100644 --- a/Assets/Sprites/campfire.png.import +++ b/Assets/Sprites/campfire.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/campfire.png-15ae3109f3a9a9b4ebf5bffb3876d86b [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/Assets/Sprites/knife.png.import b/Assets/Sprites/knife.png.import index f139fae..29d2ff3 100644 --- a/Assets/Sprites/knife.png.import +++ b/Assets/Sprites/knife.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/knife.png-29bc4ddc148b964cb9b086eec2187a96.ct [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/Assets/Sprites/sword-swing.png.import b/Assets/Sprites/sword-swing.png.import index 5f6a5ad..bb179b7 100644 --- a/Assets/Sprites/sword-swing.png.import +++ b/Assets/Sprites/sword-swing.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/sword-swing.png-b3fe38b6ad54820f8f9984baa9ea7 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/Assets/Sprites/tileset.png.import b/Assets/Sprites/tileset.png.import index ec98ab9..ae3cacc 100644 --- a/Assets/Sprites/tileset.png.import +++ b/Assets/Sprites/tileset.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/tileset.png-f52e8e44f74a535dd898a49592afe6d9. [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/BoundingBoxes/ConnectorBox.cs b/BoundingBoxes/ConnectorBox.cs new file mode 100644 index 0000000..ebdd868 --- /dev/null +++ b/BoundingBoxes/ConnectorBox.cs @@ -0,0 +1,14 @@ +using Godot; +using System; + +namespace SupaLidlGame.BoundingBoxes +{ + public partial class ConnectorBox : Area2D + { + [Export] + public string ToArea { get; set; } + + [Export] + public string ToConnector { get; set; } + } +} diff --git a/Extensions/AudioStreamPlayer2D.cs b/Extensions/AudioStreamPlayer2D.cs index 0daa21a..2842d93 100644 --- a/Extensions/AudioStreamPlayer2D.cs +++ b/Extensions/AudioStreamPlayer2D.cs @@ -6,16 +6,6 @@ namespace SupaLidlGame.Extensions { public static class AudioStreamPlayer2DExtensions { - public static AudioBuilder Derive(this AudioStreamPlayer2D audio) - { - var clone = audio.Duplicate() as AudioStreamPlayer2D; - clone.Finished += () => - { - clone.QueueFree(); - }; - return new AudioBuilder(clone); - } - public static AudioStreamPlayer2D Clone( this AudioStreamPlayer2D audio) { diff --git a/Scenes/Level.tscn b/Scenes/Level.tscn index b7d1ce6..5984242 100644 --- a/Scenes/Level.tscn +++ b/Scenes/Level.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=7 format=3 uid="uid://dd6xy1y0m8smm"] +[gd_scene load_steps=8 format=3 uid="uid://dd6xy1y0m8smm"] +[ext_resource type="Script" path="res://Utils/World.cs" id="1_1k6ew"] [ext_resource type="Texture2D" uid="uid://gm2pcnfg7h8j" path="res://Assets/Sprites/tileset.png" id="1_k6myx"] [ext_resource type="PackedScene" uid="uid://b2254pup8k161" path="res://Characters/Player.tscn" id="1_m35hr"] [ext_resource type="PackedScene" uid="uid://ddcf6bfv212wj" path="res://Characters/ExampleEnemy.tscn" id="2_uti3y"] @@ -1110,6 +1111,7 @@ physics_layer_0/collision_layer = 1 sources/0 = SubResource("TileSetAtlasSource_1pa1q") [node name="World" type="Node2D"] +script = ExtResource("1_1k6ew") [node name="TileMap" type="TileMap" parent="."] y_sort_enabled = true diff --git a/SupaLidlGame.csproj b/SupaLidlGame.csproj index f909828..c9adce8 100644 --- a/SupaLidlGame.csproj +++ b/SupaLidlGame.csproj @@ -1,4 +1,4 @@ - + net6.0 true diff --git a/Utils/World.cs b/Utils/World.cs new file mode 100644 index 0000000..8e370b7 --- /dev/null +++ b/Utils/World.cs @@ -0,0 +1,49 @@ +using Godot; +using SupaLidlGame.Characters; +using System.Collections.Generic; + +namespace SupaLidlGame.Utils +{ + public partial class World : Node2D + { + [Export] + public string StartingArea { get; set; } + + [Export] + public string CurrentArea { get; protected set; } + + [Export] + public Player CurrentPlayer { get; set; } + + private Dictionary maps; + + private string _currentConnector; + + public World() + { + maps = new Dictionary(); + } + + public override void _Ready() + { + base._Ready(); + } + + public override void _Process(double delta) + { + base._Process(delta); + } + + public void MoveToArea(string area, string connector) + { + if (area != CurrentArea) + { + // remove current map and load in the new map + TileMap map = GetNode(CurrentArea); + CurrentArea = area; + } + + _currentConnector = connector; + } + } +} diff --git a/icon.svg.import b/icon.svg.import index 2e1a312..232ee7e 100644 --- a/icon.svg.import +++ b/icon.svg.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.cte [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/project.godot b/project.godot index fb48c18..d44123f 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="SupaLidlGame" run/main_scene="res://Scenes/Level.tscn" -config/features=PackedStringArray("4.0", "C#", "Forward Plus") +config/features=PackedStringArray("4.1", "C#", "Forward Plus") config/icon="res://icon.svg" [dotnet]