From e1024bf7bc384e14bd912fff430db7d9324e3375 Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Sun, 9 Jun 2024 20:37:12 +0200 Subject: [PATCH 1/2] update to godot 4 --- src/NPCs/goblin.gd | 2 +- src/NPCs/goblin.png.import | 32 +++--- src/NPCs/goblin.tscn | 6 +- src/NPCs/moss.png.import | 32 +++--- src/NPCs/moss.tscn | 4 +- src/NPCs/ooze.gd | 2 +- src/NPCs/ooze.png.import | 32 +++--- src/NPCs/ooze.tscn | 6 +- src/Tilesets/dirt.png.import | 32 +++--- src/Tilesets/stone.png.import | 32 +++--- src/Tilesets/water.png.import | 32 +++--- src/World.tscn | 183 +++++++--------------------------- src/default_env.tres | 6 +- src/icon.png.import | 32 +++--- src/project.godot | 21 ++-- 15 files changed, 167 insertions(+), 287 deletions(-) diff --git a/src/NPCs/goblin.gd b/src/NPCs/goblin.gd index 9b25dac..1695934 100644 --- a/src/NPCs/goblin.gd +++ b/src/NPCs/goblin.gd @@ -1,4 +1,4 @@ -extends KinematicBody2D +extends CharacterBody2D # Declare member variables here. Examples: diff --git a/src/NPCs/goblin.png.import b/src/NPCs/goblin.png.import index c8e875e..3ab0eb6 100644 --- a/src/NPCs/goblin.png.import +++ b/src/NPCs/goblin.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/goblin.png-555c4de3e7de7d249da453933b804842.stex" +type="CompressedTexture2D" +uid="uid://dt16fxo5qxqqh" +path="res://.godot/imported/goblin.png-555c4de3e7de7d249da453933b804842.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,24 @@ metadata={ [deps] source_file="res://NPCs/goblin.png" -dest_files=[ "res://.import/goblin.png-555c4de3e7de7d249da453933b804842.stex" ] +dest_files=["res://.godot/imported/goblin.png-555c4de3e7de7d249da453933b804842.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/NPCs/goblin.tscn b/src/NPCs/goblin.tscn index 758eb98..687327c 100644 --- a/src/NPCs/goblin.tscn +++ b/src/NPCs/goblin.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://NPCs/goblin.png" type="Texture" id=1] +[ext_resource path="res://NPCs/goblin.png" type="Texture2D" id=1] [ext_resource path="res://NPCs/goblin.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=2] @@ -12,10 +12,10 @@ extents = Vector2( 4.13172, 3.98318 ) [sub_resource type="RectangleShape2D" id=3] extents = Vector2( 4.0574, 3.7602 ) -[node name="goblin" type="KinematicBody2D"] +[node name="goblin" type="CharacterBody2D"] script = ExtResource( 2 ) -[node name="goblin" type="Sprite" parent="."] +[node name="goblin" type="Sprite2D" parent="."] position = Vector2( 0.380203, -0.127379 ) texture = ExtResource( 1 ) diff --git a/src/NPCs/moss.png.import b/src/NPCs/moss.png.import index 6ceb097..7f28b18 100644 --- a/src/NPCs/moss.png.import +++ b/src/NPCs/moss.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/moss.png-61d539c9df559a4b157329d26994cee7.stex" +type="CompressedTexture2D" +uid="uid://cutet8b2m1af" +path="res://.godot/imported/moss.png-61d539c9df559a4b157329d26994cee7.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,24 @@ metadata={ [deps] source_file="res://NPCs/moss.png" -dest_files=[ "res://.import/moss.png-61d539c9df559a4b157329d26994cee7.stex" ] +dest_files=["res://.godot/imported/moss.png-61d539c9df559a4b157329d26994cee7.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/NPCs/moss.tscn b/src/NPCs/moss.tscn index b13c569..9ca062d 100644 --- a/src/NPCs/moss.tscn +++ b/src/NPCs/moss.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://NPCs/moss.png" type="Texture" id=1] +[ext_resource path="res://NPCs/moss.png" type="Texture2D" id=1] [ext_resource path="res://NPCs/moss.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=2] @@ -15,7 +15,7 @@ extents = Vector2( 3.96625, 3.96779 ) [node name="moss" type="Area2D"] script = ExtResource( 2 ) -[node name="moss" type="Sprite" parent="."] +[node name="moss" type="Sprite2D" parent="."] position = Vector2( 0.118118, -0.0393729 ) scale = Vector2( 1.02953, 0.990157 ) texture = ExtResource( 1 ) diff --git a/src/NPCs/ooze.gd b/src/NPCs/ooze.gd index a52b762..e72aa39 100644 --- a/src/NPCs/ooze.gd +++ b/src/NPCs/ooze.gd @@ -1,4 +1,4 @@ -extends KinematicBody2D +extends CharacterBody2D # Declare member variables here. Examples: diff --git a/src/NPCs/ooze.png.import b/src/NPCs/ooze.png.import index 601b92b..a60f696 100644 --- a/src/NPCs/ooze.png.import +++ b/src/NPCs/ooze.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/ooze.png-0a3aed31cac3950abca695916d8e15ef.stex" +type="CompressedTexture2D" +uid="uid://b31k3mt2ovlm5" +path="res://.godot/imported/ooze.png-0a3aed31cac3950abca695916d8e15ef.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,24 @@ metadata={ [deps] source_file="res://NPCs/ooze.png" -dest_files=[ "res://.import/ooze.png-0a3aed31cac3950abca695916d8e15ef.stex" ] +dest_files=["res://.godot/imported/ooze.png-0a3aed31cac3950abca695916d8e15ef.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/NPCs/ooze.tscn b/src/NPCs/ooze.tscn index 24209ea..8d5ee11 100644 --- a/src/NPCs/ooze.tscn +++ b/src/NPCs/ooze.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://NPCs/ooze.png" type="Texture" id=1] +[ext_resource path="res://NPCs/ooze.png" type="Texture2D" id=1] [ext_resource path="res://NPCs/ooze.gd" type="Script" id=2] [sub_resource type="RectangleShape2D" id=1] @@ -12,10 +12,10 @@ extents = Vector2( 4.69029, 4.54633 ) [sub_resource type="RectangleShape2D" id=3] extents = Vector2( 4.69029, 4.43497 ) -[node name="ooze" type="KinematicBody2D"] +[node name="ooze" type="CharacterBody2D"] script = ExtResource( 2 ) -[node name="ooze" type="Sprite" parent="."] +[node name="ooze" type="Sprite2D" parent="."] position = Vector2( -0.061738, 0.18198 ) texture = ExtResource( 1 ) diff --git a/src/Tilesets/dirt.png.import b/src/Tilesets/dirt.png.import index 0b48bbd..1c19cd7 100644 --- a/src/Tilesets/dirt.png.import +++ b/src/Tilesets/dirt.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/dirt.png-ff175a3e6b1e0d87d0f80d5ca7a3d29e.stex" +type="CompressedTexture2D" +uid="uid://5wx0qwvlk57q" +path="res://.godot/imported/dirt.png-ff175a3e6b1e0d87d0f80d5ca7a3d29e.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,24 @@ metadata={ [deps] source_file="res://Tilesets/dirt.png" -dest_files=[ "res://.import/dirt.png-ff175a3e6b1e0d87d0f80d5ca7a3d29e.stex" ] +dest_files=["res://.godot/imported/dirt.png-ff175a3e6b1e0d87d0f80d5ca7a3d29e.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/Tilesets/stone.png.import b/src/Tilesets/stone.png.import index 6e9ec08..5120aa9 100644 --- a/src/Tilesets/stone.png.import +++ b/src/Tilesets/stone.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/stone.png-4f7def60038ccb460a48436a729efec6.stex" +type="CompressedTexture2D" +uid="uid://bofaisgk5bgob" +path="res://.godot/imported/stone.png-4f7def60038ccb460a48436a729efec6.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,24 @@ metadata={ [deps] source_file="res://Tilesets/stone.png" -dest_files=[ "res://.import/stone.png-4f7def60038ccb460a48436a729efec6.stex" ] +dest_files=["res://.godot/imported/stone.png-4f7def60038ccb460a48436a729efec6.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/Tilesets/water.png.import b/src/Tilesets/water.png.import index c622cfd..4bdd049 100644 --- a/src/Tilesets/water.png.import +++ b/src/Tilesets/water.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/water.png-154297d676290e71bc3fa3868b532a65.stex" +type="CompressedTexture2D" +uid="uid://bdvuklx08b5rs" +path="res://.godot/imported/water.png-154297d676290e71bc3fa3868b532a65.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,24 @@ metadata={ [deps] source_file="res://Tilesets/water.png" -dest_files=[ "res://.import/water.png-154297d676290e71bc3fa3868b532a65.stex" ] +dest_files=["res://.godot/imported/water.png-154297d676290e71bc3fa3868b532a65.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/World.tscn b/src/World.tscn index 831bb00..7508669 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,165 +1,50 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=11 format=3 uid="uid://bvco1ugq6whqw"] -[ext_resource path="res://Tilesets/stone.png" type="Texture" id=1] -[ext_resource path="res://Tilesets/dirt.png" type="Texture" id=2] -[ext_resource path="res://Tilesets/water.png" type="Texture" id=3] -[ext_resource path="res://NPCs/goblin.tscn" type="PackedScene" id=4] -[ext_resource path="res://NPCs/ooze.tscn" type="PackedScene" id=5] -[ext_resource path="res://NPCs/moss.tscn" type="PackedScene" id=6] +[ext_resource type="Texture2D" uid="uid://bofaisgk5bgob" path="res://Tilesets/stone.png" id="1"] +[ext_resource type="Texture2D" uid="uid://5wx0qwvlk57q" path="res://Tilesets/dirt.png" id="2"] +[ext_resource type="Texture2D" uid="uid://bdvuklx08b5rs" path="res://Tilesets/water.png" id="3"] +[ext_resource type="PackedScene" path="res://NPCs/goblin.tscn" id="4"] +[ext_resource type="PackedScene" path="res://NPCs/ooze.tscn" id="5"] +[ext_resource type="PackedScene" path="res://NPCs/moss.tscn" id="6"] -[sub_resource type="ConvexPolygonShape2D" id=1] -points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 ) +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_mqn1b"] +texture = ExtResource("2") -[sub_resource type="ConvexPolygonShape2D" id=2] -points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 ) +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_qofsj"] +texture = ExtResource("1") -[sub_resource type="ConvexPolygonShape2D" id=3] -points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 ) +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_5ky2b"] +texture = ExtResource("3") -[sub_resource type="ConvexPolygonShape2D" id=4] -points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 ) - -[sub_resource type="ConvexPolygonShape2D" id=5] -points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 ) - -[sub_resource type="ConvexPolygonShape2D" id=6] -points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 ) - -[sub_resource type="TileSet" id=7] -0/name = "dirt.png 0" -0/texture = ExtResource( 2 ) -0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 1, 1, 1, 1 ) -0/region = Rect2( 0, 0, 24, 8 ) -0/tile_mode = 1 -0/autotile/bitmask_mode = 2 -0/autotile/bitmask_flags = [ Vector2( 0, 0 ), 511, Vector2( 1, 0 ), 511, Vector2( 2, 0 ), 511 ] -0/autotile/icon_coordinate = Vector2( 0, 0 ) -0/autotile/tile_size = Vector2( 8, 8 ) -0/autotile/spacing = 0 -0/autotile/occluder_map = [ ] -0/autotile/navpoly_map = [ ] -0/autotile/priority_map = [ ] -0/autotile/z_index_map = [ ] -0/occluder_offset = Vector2( 0, 0 ) -0/navigation_offset = Vector2( 0, 0 ) -0/shape_offset = Vector2( 0, 0 ) -0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -0/shape_one_way = false -0/shape_one_way_margin = 0.0 -0/shapes = [ ] -0/z_index = 0 -1/name = "stone.png 1" -1/texture = ExtResource( 1 ) -1/tex_offset = Vector2( 0, 0 ) -1/modulate = Color( 1, 1, 1, 1 ) -1/region = Rect2( 0, 0, 24, 16 ) -1/tile_mode = 1 -1/autotile/bitmask_mode = 2 -1/autotile/bitmask_flags = [ Vector2( 0, 0 ), 511, Vector2( 0, 1 ), 511, Vector2( 1, 0 ), 511, Vector2( 1, 1 ), 511, Vector2( 2, 0 ), 511, Vector2( 2, 1 ), 511 ] -1/autotile/icon_coordinate = Vector2( 0, 0 ) -1/autotile/tile_size = Vector2( 8, 8 ) -1/autotile/spacing = 0 -1/autotile/occluder_map = [ ] -1/autotile/navpoly_map = [ ] -1/autotile/priority_map = [ ] -1/autotile/z_index_map = [ ] -1/occluder_offset = Vector2( 0, 0 ) -1/navigation_offset = Vector2( 0, 0 ) -1/shape_offset = Vector2( 0, 0 ) -1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -1/shape = SubResource( 1 ) -1/shape_one_way = false -1/shape_one_way_margin = 1.0 -1/shapes = [ { -"autotile_coord": Vector2( 0, 0 ), -"one_way": false, -"one_way_margin": 1.0, -"shape": SubResource( 1 ), -"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) -}, { -"autotile_coord": Vector2( 1, 0 ), -"one_way": false, -"one_way_margin": 1.0, -"shape": SubResource( 2 ), -"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) -}, { -"autotile_coord": Vector2( 2, 0 ), -"one_way": false, -"one_way_margin": 1.0, -"shape": SubResource( 3 ), -"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) -}, { -"autotile_coord": Vector2( 0, 1 ), -"one_way": false, -"one_way_margin": 1.0, -"shape": SubResource( 4 ), -"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) -}, { -"autotile_coord": Vector2( 1, 1 ), -"one_way": false, -"one_way_margin": 1.0, -"shape": SubResource( 5 ), -"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) -}, { -"autotile_coord": Vector2( 2, 1 ), -"one_way": false, -"one_way_margin": 1.0, -"shape": SubResource( 6 ), -"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) -} ] -1/z_index = 0 -2/name = "water.png 2" -2/texture = ExtResource( 3 ) -2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 1, 1, 1, 1 ) -2/region = Rect2( 0, 0, 24, 24 ) -2/tile_mode = 1 -2/autotile/bitmask_mode = 2 -2/autotile/bitmask_flags = [ Vector2( 0, 0 ), 432, Vector2( 0, 1 ), 438, Vector2( 0, 2 ), 54, Vector2( 1, 0 ), 504, Vector2( 1, 1 ), 511, Vector2( 1, 2 ), 63, Vector2( 2, 0 ), 216, Vector2( 2, 1 ), 219, Vector2( 2, 2 ), 27 ] -2/autotile/icon_coordinate = Vector2( 1, 1 ) -2/autotile/tile_size = Vector2( 8, 8 ) -2/autotile/spacing = 0 -2/autotile/occluder_map = [ ] -2/autotile/navpoly_map = [ ] -2/autotile/priority_map = [ ] -2/autotile/z_index_map = [ ] -2/occluder_offset = Vector2( 0, 0 ) -2/navigation_offset = Vector2( 0, 0 ) -2/shape_offset = Vector2( 0, 0 ) -2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -2/shape_one_way = false -2/shape_one_way_margin = 0.0 -2/shapes = [ ] -2/z_index = 0 +[sub_resource type="TileSet" id="7"] +sources/0 = SubResource("TileSetAtlasSource_mqn1b") +sources/1 = SubResource("TileSetAtlasSource_qofsj") +sources/2 = SubResource("TileSetAtlasSource_5ky2b") [node name="World" type="Node2D"] [node name="TileMap" type="TileMap" parent="."] -tile_set = SubResource( 7 ) -cell_size = Vector2( 8, 8 ) -cell_quadrant_size = 8 -cell_custom_transform = Transform2D( 8, 0, 0, 8, 0, 0 ) -format = 1 -tile_data = PoolIntArray( 0, 1, 0, 1, 1, 0, 2, 1, 0, 3, 1, 0, 4, 1, 0, 5, 1, 0, 6, 1, 0, 7, 1, 0, 8, 1, 0, 9, 1, 0, 65536, 1, 0, 65537, 0, 0, 65538, 0, 0, 65539, 0, 0, 65540, 2, 65537, 65541, 2, 65537, 65542, 2, 65537, 65543, 1, 0, 65544, 1, 0, 65545, 1, 0, 131072, 1, 0, 131073, 0, 0, 131074, 1, 0, 131075, 0, 0, 131076, 0, 0, 131077, 1, 0, 131078, 2, 65537, 131079, 1, 0, 131080, 1, 0, 131081, 1, 0, 196608, 1, 0, 196609, 0, 0, 196610, 1, 0, 196611, 0, 0, 196612, 0, 0, 196613, 0, 0, 196614, 2, 65537, 196615, 2, 65537, 196616, 2, 2, 196617, 1, 0, 262144, 1, 0, 262145, 0, 0, 262146, 1, 0, 262147, 0, 0, 262148, 0, 0, 262149, 1, 0, 262150, 2, 65536, 262151, 2, 65537, 262152, 2, 65538, 262153, 1, 0, 327680, 1, 0, 327681, 0, 0, 327682, 1, 0, 327683, 0, 0, 327684, 0, 0, 327685, 0, 0, 327686, 2, 65536, 327687, 2, 65537, 327688, 2, 65538, 327689, 1, 0, 393216, 1, 0, 393217, 0, 0, 393218, 0, 0, 393219, 0, 0, 393220, 0, 0, 393221, 0, 0, 393222, 2, 131072, 393223, 2, 131073, 393224, 2, 131074, 393225, 1, 0, 458752, 1, 0, 458753, 1, 0, 458754, 1, 0, 458755, 1, 0, 458756, 1, 0, 458757, 1, 0, 458758, 1, 0, 458759, 1, 0, 458760, 1, 0, 458761, 1, 0 ) +tile_set = SubResource("7") +rendering_quadrant_size = 8 +format = 2 -[node name="moss" parent="." instance=ExtResource( 6 )] -position = Vector2( 36, 36 ) +[node name="moss" parent="." instance=ExtResource("6")] +position = Vector2(36, 36) -[node name="Moss2" parent="." instance=ExtResource( 6 )] -position = Vector2( 44, 44 ) +[node name="Moss2" parent="." instance=ExtResource("6")] +position = Vector2(44, 44) -[node name="Moss" parent="." instance=ExtResource( 6 )] -position = Vector2( 36, 20 ) +[node name="Moss" parent="." instance=ExtResource("6")] +position = Vector2(36, 20) -[node name="Moss3" parent="." instance=ExtResource( 6 )] -position = Vector2( 44, 52 ) +[node name="Moss3" parent="." instance=ExtResource("6")] +position = Vector2(44, 52) -[node name="Goblin" parent="." instance=ExtResource( 4 )] -position = Vector2( 12, 20 ) +[node name="Goblin" parent="." instance=ExtResource("4")] +position = Vector2(12, 20) -[node name="Goblin2" parent="." instance=ExtResource( 4 )] -position = Vector2( 28, 28 ) +[node name="Goblin2" parent="." instance=ExtResource("4")] +position = Vector2(28, 28) -[node name="Ooze2" parent="." instance=ExtResource( 5 )] -position = Vector2( 36, 52 ) +[node name="Ooze2" parent="." instance=ExtResource("5")] +position = Vector2(36, 52) diff --git a/src/default_env.tres b/src/default_env.tres index 20207a4..67c2ac7 100644 --- a/src/default_env.tres +++ b/src/default_env.tres @@ -1,7 +1,7 @@ -[gd_resource type="Environment" load_steps=2 format=2] +[gd_resource type="Environment" load_steps=2 format=3 uid="uid://dt58ittqtiyqc"] -[sub_resource type="ProceduralSky" id=1] +[sub_resource type="Sky" id="1"] [resource] background_mode = 2 -background_sky = SubResource( 1 ) +sky = SubResource("1") diff --git a/src/icon.png.import b/src/icon.png.import index 96cbf46..4d12e5c 100644 --- a/src/icon.png.import +++ b/src/icon.png.import @@ -1,8 +1,9 @@ [remap] importer="texture" -type="StreamTexture" -path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" +type="CompressedTexture2D" +uid="uid://c003apmumsqnn" +path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex" metadata={ "vram_texture": false } @@ -10,25 +11,24 @@ metadata={ [deps] source_file="res://icon.png" -dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] +dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"] [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 +compress/hdr_compression=1 compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" process/fix_alpha_border=true process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/src/project.godot b/src/project.godot index eb96b34..486cd94 100644 --- a/src/project.godot +++ b/src/project.godot @@ -6,17 +6,13 @@ ; [section] ; section goes between [] ; param=value ; assign values to parameters -config_version=4 - -_global_script_classes=[ ] -_global_script_class_icons={ - -} +config_version=5 [application] config/name="Fishtank" run/main_scene="res://World.tscn" +config/features=PackedStringArray("4.2") config/icon="res://icon.png" [autoload] @@ -25,13 +21,13 @@ Global="*res://global.gd" [display] -window/size/width=80 -window/size/height=64 +window/size/viewport_width=80 +window/size/viewport_height=64 window/size/resizable=false -window/size/fullscreen=true -window/size/test_width=1280 -window/size/test_height=720 +window/size/window_width_override=1280 +window/size/window_height_override=720 window/stretch/mode="2d" +window/size/fullscreen=true [physics] @@ -39,7 +35,6 @@ common/physics_fps=5 [rendering] +environment/defaults/default_environment="res://default_env.tres" quality/driver/driver_name="GLES2" vram_compression/import_etc=true -vram_compression/import_etc2=false -environment/default_environment="res://default_env.tres" From efc7adcade7c493d92f5f8cc90b95336dc72e806 Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Sun, 9 Jun 2024 20:55:48 +0200 Subject: [PATCH 2/2] make check --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 93d029f..5dc63a7 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,21 @@ help: @echo "\tmake pdf" @echo "\tmake creature" @echo "\tmake show" + @echo "\tmake check (to check your dependencies)" @echo "\tmake install-godot" @echo "\tmake uninstall-godot" .PHONY: pdf pdf: overview.pdf +.PHONY: check +check: + @which lowdown >/dev/null || echo 'install lowdown (optional)' + @which git-lfs >/dev/null || echo 'install git-lfs' + @which pdflatex >/dev/null || echo 'install pdflatex (optional)' + @which less >/dev/null || echo 'install less (you absolute cave-man)' + @godot --version | grep -q '4.2' || echo 'install godot version 4.2' + rubbish/: mkdir rubbish