Redesign Arena tilemap (#41)

* Add new tileset

* Change tilemap

Assets/Sprites/Props/tree-leaves-dark-0.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dlxiybkk75imp"
+path="res://.godot/imported/tree-leaves-dark-0.png-c0a1d8978753948673d83a622b613796.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Props/tree-leaves-dark-0.png"
+dest_files=["res://.godot/imported/tree-leaves-dark-0.png-c0a1d8978753948673d83a622b613796.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+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/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

Assets/Sprites/Props/tree-leaves-dark-1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://022r5gtr5ut5"
+path="res://.godot/imported/tree-leaves-dark-1.png-e500a7048d53ad3769f9fb33e7139e3a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Props/tree-leaves-dark-1.png"
+dest_files=["res://.godot/imported/tree-leaves-dark-1.png-e500a7048d53ad3769f9fb33e7139e3a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+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/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

Assets/Sprites/Props/tree-leaves-dark-2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://fb2cpwplhe7o"
+path="res://.godot/imported/tree-leaves-dark-2.png-e3e4a859dde5c7535113533f8a9eb51d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/Props/tree-leaves-dark-2.png"
+dest_files=["res://.godot/imported/tree-leaves-dark-2.png-e3e4a859dde5c7535113533f8a9eb51d.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+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/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

Assets/Sprites/arena-tileset-new.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bth1v3dyuqwg6"
+path="res://.godot/imported/arena-tileset-new.png-be9f2f14aeaee34d9c3f67ae1188e672.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Sprites/arena-tileset-new.png"
+dest_files=["res://.godot/imported/arena-tileset-new.png-be9f2f14aeaee34d9c3f67ae1188e672.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+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/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

Characters/DocLegionary.tscn

@@ -268,8 +268,8 @@ scale_curve = SubResource("CurveTexture_5uulw")
 color = Color(1, 0, 0, 1)
 color_ramp = SubResource("GradientTexture1D_iyaih")
 
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_bfqew"]
-size = Vector2(8, 8)
+[sub_resource type="CircleShape2D" id="CircleShape2D_umi1b"]
+radius = 4.0
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_1gjgc"]
 size = Vector2(12, 16)
@@ -430,7 +430,7 @@ offset = Vector2(0, -12)
 hframes = 7
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-shape = SubResource("RectangleShape2D_bfqew")
+shape = SubResource("CircleShape2D_umi1b")
 
 [node name="Inventory" type="Node2D" parent="." node_paths=PackedStringArray("Hotbar")]
 script = ExtResource("17_5rur0")

Characters/NPC.cs

@@ -145,7 +145,7 @@ public partial class NPC : Character
                 }
 
                 float score = 0;
-                score -= Position.DistanceSquaredTo(character.Position);
+                score -= Position.DistanceTo(character.Position);
 
                 if (score < bestScore)
                 {

Characters/Weeb.tscn

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

Entities/UnwantedFrequency.cs

@@ -59,7 +59,7 @@ public partial class UnwantedFrequency : Projectile, Utils.ITarget
         TrailPosition.Position = new Vector2(0, 4 * Mathf.Sin(radians));
         TrailPosition2.Position = -TrailPosition.Position;
 
-        if (CharacterTarget is not null)
+        if (CharacterTarget is not null && IsInstanceValid(CharacterTarget))
         {
             var pos = CharacterTarget.GlobalPosition;
             var desired = GlobalPosition.DirectionTo(pos);

Props/Bookshelf.tscn

@@ -26,18 +26,17 @@ vframes = 2
 frame = 9
 
 [node name="TopLeft" type="Sprite2D" parent="."]
-position = Vector2(-16, -16)
+position = Vector2(-16, 0)
 texture = ExtResource("1_cnrpk")
 centered = false
-offset = Vector2(0, -16)
+offset = Vector2(0, -32)
 hframes = 8
 vframes = 2
 
 [node name="TopRight" type="Sprite2D" parent="."]
-position = Vector2(0, -16)
 texture = ExtResource("1_cnrpk")
 centered = false
-offset = Vector2(0, -16)
+offset = Vector2(0, -32)
 hframes = 8
 vframes = 2
 frame = 1

Scenes/Maps/ArenaTileset.tres

@@ -1,8 +1,9 @@
-[gd_resource type="TileSet" load_steps=12 format=3 uid="uid://l61kbx31ug4p"]
+[gd_resource type="TileSet" load_steps=14 format=3 uid="uid://l61kbx31ug4p"]
 
 [ext_resource type="Texture2D" uid="uid://b0yiy7w8nxmas" path="res://Assets/Sprites/arena-tileset.png" id="1_kud44"]
 [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"]
+[ext_resource type="Texture2D" uid="uid://bth1v3dyuqwg6" path="res://Assets/Sprites/arena-tileset-new.png" id="4_n70qi"]
 
 [sub_resource type="NavigationPolygon" id="NavigationPolygon_7s0wj"]
 source_geometry_group_name = &"navigation_polygon_source_group"
@@ -456,6 +457,149 @@ texture = ExtResource("3_hbylw")
 1:1/0 = 0
 2:1/0 = 0
 
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_45tin"]
+texture = ExtResource("4_n70qi")
+0:0/0 = 0
+1:0/0 = 0
+4:0/0 = 0
+4:0/0/y_sort_origin = 8
+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/y_sort_origin = 8
+5:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+6:0/0 = 0
+6:0/0/y_sort_origin = 8
+6:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+8:0/0 = 0
+9:0/0 = 0
+10:0/0 = 0
+11:0/0 = 0
+12:0/0 = 0
+13:0/0 = 0
+0:1/0 = 0
+1:1/0 = 0
+4:1/0 = 0
+4:1/0/y_sort_origin = 8
+4:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+5:1/0 = 0
+5:1/0/y_sort_origin = 8
+5:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+6:1/0 = 0
+6:1/0/y_sort_origin = 8
+6:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+7:1/0 = 0
+7:1/0/y_sort_origin = 8
+7:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+8:1/0 = 0
+8:1/0/y_sort_origin = 8
+8:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+9:1/0 = 0
+9:1/0/y_sort_origin = 8
+9:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+10:1/0 = 0
+11:1/0 = 0
+2:2/0 = 0
+2:2/0/y_sort_origin = 8
+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/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+4:2/0 = 0
+4:2/0/y_sort_origin = 8
+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/y_sort_origin = 8
+5:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+6:2/0 = 0
+6:2/0/y_sort_origin = 8
+6:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+7:2/0 = 0
+7:2/0/y_sort_origin = 8
+7:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+8:2/0 = 0
+8:2/0/y_sort_origin = 8
+8:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+9:2/0 = 0
+9:2/0/y_sort_origin = 8
+9:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+10:2/0 = 0
+11:2/0 = 0
+0:3/0 = 0
+0:3/0/y_sort_origin = 8
+1:3/0 = 0
+1:3/0/y_sort_origin = 8
+2:3/0 = 0
+2:3/0/y_sort_origin = 8
+3:3/0 = 0
+3:3/0/y_sort_origin = 8
+3:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+4:3/0 = 0
+4:3/0/y_sort_origin = 8
+4:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+8:3/0 = 0
+0:4/0 = 0
+0:4/0/y_sort_origin = 8
+0: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/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+3:4/0 = 0
+3:4/0/y_sort_origin = 8
+3:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+4:4/0 = 0
+4:4/0/y_sort_origin = 8
+4:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+5:4/0 = 0
+5:4/0/y_sort_origin = 8
+5:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+6:4/0 = 0
+6:4/0/y_sort_origin = 8
+6:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+9:4/0 = 0
+0:5/0 = 0
+0:5/0/y_sort_origin = 8
+0:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+1:5/0 = 0
+1:5/0/y_sort_origin = 8
+1:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+2:5/0 = 0
+2:5/0/y_sort_origin = 8
+2:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+3:5/0 = 0
+4:5/0 = 0
+5:3/0 = 0
+5:3/0/y_sort_origin = 8
+6:3/0 = 0
+6:3/0/y_sort_origin = 8
+0:6/0 = 0
+0:7/0 = 0
+1:7/0 = 0
+2:7/0 = 0
+1:6/0 = 0
+2:6/0 = 0
+2:1/0 = 0
+2:0/0 = 0
+3:0/0 = 0
+3:1/0 = 0
+13:5/size_in_atlas = Vector2i(1, 2)
+13:5/0 = 0
+13:5/0/texture_origin = Vector2i(0, 8)
+13:5/0/y_sort_origin = 8
+13:5/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
+12:4/size_in_atlas = Vector2i(1, 3)
+12:4/0 = 0
+12:4/0/texture_origin = Vector2i(0, 16)
+12:4/0/y_sort_origin = -2
+10:3/0 = 0
+11:3/0 = 0
+12:2/0 = 0
+12:3/0 = 0
+13:3/0 = 0
+13:2/0 = 0
+12:1/0 = 0
+13:1/0 = 0
+14:2/0 = 0
+
 [resource]
 occlusion_layer_0/light_mask = 1
 physics_layer_0/collision_layer = 1
@@ -473,3 +617,4 @@ navigation_layer_0/layers = 1
 sources/0 = SubResource("TileSetAtlasSource_fcd6d")
 sources/1 = SubResource("TileSetAtlasSource_mdfpe")
 sources/2 = SubResource("TileSetAtlasSource_u4tjf")
+sources/3 = SubResource("TileSetAtlasSource_45tin")

Utils/IFaction.cs

@@ -7,6 +7,7 @@ public enum FactionName
 {
     Player = 1,
     Doc = 2,
+    Forest = 4,
 }
 
 public interface IFaction

project.godot

@@ -226,7 +226,5 @@ locale/translations_pot_files=PackedStringArray("res://Assets/Dialogue/doc.dialo
 [rendering]
 
 textures/canvas_textures/default_texture_filter=0
-renderer/rendering_method="gl_compatibility"
-renderer/rendering_method.mobile="gl_compatibility"
 environment/defaults/default_clear_color=Color(0.301961, 0.301961, 0.301961, 1)
 viewport/hdr_2d=true