Merge pull request 'Added grassy tiles' (#3) from feat-procedural-gen into main

Reviewed-on: #3

objects/scenes/asset/light.tscn

@@ -0,0 +1,42 @@
+[gd_scene format=3 uid="uid://xanv3qbl1n2u"]
+
+[sub_resource type="Gradient" id="Gradient_nxkc6"]
+colors = PackedColorArray(1, 1, 1, 1, 0, 0, 0, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_kfvst"]
+gradient = SubResource("Gradient_nxkc6")
+fill = 1
+fill_from = Vector2(0.5, 0.5)
+fill_to = Vector2(0.725, 0)
+
+[node name="Light" type="Node2D" unique_id=658403720]
+scale = Vector2(3.105, 3.105)
+
+[node name="BackgroundLight" type="PointLight2D" parent="." unique_id=1870867099]
+scale = Vector2(3, 3)
+color = Color(1, 0.73333335, 0, 1)
+energy = 1.5
+shadow_enabled = true
+shadow_filter = 1
+texture = SubResource("GradientTexture2D_kfvst")
+height = 15.0
+
+[node name="ForegroundLight" type="PointLight2D" parent="." unique_id=574997062]
+scale = Vector2(5, 5)
+color = Color(0.93, 0.837, 0, 0.8)
+energy = 0.7
+shadow_enabled = true
+shadow_filter = 1
+shadow_item_cull_mask = 2
+texture = SubResource("GradientTexture2D_kfvst")
+height = 15.0
+
+[node name="ForegroundNOCLight" type="PointLight2D" parent="." unique_id=2045804818]
+scale = Vector2(5, 5)
+color = Color(0.93, 0.837, 0, 0.8)
+energy = 0.7
+range_item_cull_mask = 4
+shadow_filter = 1
+shadow_item_cull_mask = 4
+texture = SubResource("GradientTexture2D_kfvst")
+height = 15.0

project.godot

@@ -108,6 +108,7 @@ turn_back={
 
 2d_render/layer_1="Backgrounds"
 2d_render/layer_2="Foregrounds"
+2d_render/layer_3="Foregrounds NOC"
 
 [physics]
 

sprites/tilesets/pool_dyn.tres

@@ -84,13 +84,13 @@ polygon = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
 [sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_yfu7p"]
 polygon = PackedVector2Array(-16, -16, 16, -16, 16, 16, -16, 16)
 
-[sub_resource type="CanvasTexture" id="CanvasTexture_x4gly"]
+[sub_resource type="CanvasTexture" id="CanvasTexture_by4n8"]
 diffuse_texture = ExtResource("1_by4n8")
 normal_texture = ExtResource("2_1bmlt")
 specular_shininess = 0.35
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_blkrv"]
-texture = SubResource("CanvasTexture_x4gly")
+texture = SubResource("CanvasTexture_by4n8")
 texture_region_size = Vector2i(32, 32)
 0:0/0 = 0
 0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, 16, 16, 16, 16, -16, -16, -16)
@@ -197,7 +197,19 @@ texture_region_size = Vector2i(32, 32)
 8:2/0/occlusion_layer_1/polygon_0/polygon = SubResource("OccluderPolygon2D_xwwfl")
 9:2/0 = 0
 10:2/0 = 0
+10:2/0/terrain_set = 0
+10:2/0/terrain = 1
+10:2/0/terrains_peering_bit/right_side = 1
+10:2/0/terrains_peering_bit/bottom_right_corner = 1
+10:2/0/terrains_peering_bit/bottom_side = 1
 11:2/0 = 0
+11:2/0/terrain_set = 0
+11:2/0/terrain = 1
+11:2/0/terrains_peering_bit/right_side = 1
+11:2/0/terrains_peering_bit/bottom_right_corner = 1
+11:2/0/terrains_peering_bit/bottom_side = 1
+11:2/0/terrains_peering_bit/bottom_left_corner = 1
+11:2/0/terrains_peering_bit/left_side = 1
 0:3/0 = 0
 1:3/next_alternative_id = 2
 1:3/0 = 0
@@ -360,7 +372,24 @@ texture_region_size = Vector2i(32, 32)
 8:3/0 = 0
 9:3/0 = 0
 10:3/0 = 0
+10:3/0/terrain_set = 0
+10:3/0/terrain = 1
+10:3/0/terrains_peering_bit/right_side = 1
+10:3/0/terrains_peering_bit/bottom_right_corner = 1
+10:3/0/terrains_peering_bit/bottom_side = 1
+10:3/0/terrains_peering_bit/top_side = 1
+10:3/0/terrains_peering_bit/top_right_corner = 1
 11:3/0 = 0
+11:3/0/terrain_set = 0
+11:3/0/terrain = 1
+11:3/0/terrains_peering_bit/right_side = 1
+11:3/0/terrains_peering_bit/bottom_right_corner = 1
+11:3/0/terrains_peering_bit/bottom_side = 1
+11:3/0/terrains_peering_bit/bottom_left_corner = 1
+11:3/0/terrains_peering_bit/left_side = 1
+11:3/0/terrains_peering_bit/top_left_corner = 1
+11:3/0/terrains_peering_bit/top_side = 1
+11:3/0/terrains_peering_bit/top_right_corner = 1
 0:4/0 = 0
 1:4/0 = 0
 1:4/0/terrain_set = 0
@@ -440,6 +469,51 @@ texture_region_size = Vector2i(32, 32)
 5:4/0/occlusion_layer_0/polygon_0/polygon = SubResource("OccluderPolygon2D_njrqr")
 5:4/0/occlusion_layer_1/polygon_0/polygon = SubResource("OccluderPolygon2D_o2foe")
 5:4/0/physics_layer_0/polygon_0/points = PackedVector2Array(-16, -16, -16, 16, 16, 16, 16, -16)
+8:4/0 = 0
+9:4/0 = 0
+10:4/0 = 0
+10:4/0/terrain_set = 0
+10:4/0/terrain = 1
+10:4/0/terrains_peering_bit/right_side = 1
+10:4/0/terrains_peering_bit/top_side = 1
+10:4/0/terrains_peering_bit/top_right_corner = 1
+12:1/0 = 0
+13:1/0 = 0
+12:2/0 = 0
+12:2/0/terrain_set = 0
+12:2/0/terrain = 1
+12:2/0/terrains_peering_bit/bottom_side = 1
+12:2/0/terrains_peering_bit/bottom_left_corner = 1
+12:2/0/terrains_peering_bit/left_side = 1
+13:2/0 = 0
+12:3/0 = 0
+12:3/0/terrain_set = 0
+12:3/0/terrain = 1
+12:3/0/terrains_peering_bit/bottom_side = 1
+12:3/0/terrains_peering_bit/bottom_left_corner = 1
+12:3/0/terrains_peering_bit/left_side = 1
+12:3/0/terrains_peering_bit/top_left_corner = 1
+12:3/0/terrains_peering_bit/top_side = 1
+13:3/0 = 0
+11:4/0 = 0
+11:4/0/terrain_set = 0
+11:4/0/terrain = 1
+11:4/0/terrains_peering_bit/right_side = 1
+11:4/0/terrains_peering_bit/left_side = 1
+11:4/0/terrains_peering_bit/top_left_corner = 1
+11:4/0/terrains_peering_bit/top_side = 1
+11:4/0/terrains_peering_bit/top_right_corner = 1
+12:4/0 = 0
+12:4/0/terrain_set = 0
+12:4/0/terrain = 1
+12:4/0/terrains_peering_bit/left_side = 1
+12:4/0/terrains_peering_bit/top_left_corner = 1
+12:4/0/terrains_peering_bit/top_side = 1
+13:4/0 = 0
+10:5/0 = 0
+11:5/0 = 0
+12:5/0 = 0
+13:5/0 = 0
 
 [resource]
 tile_size = Vector2i(32, 32)
@@ -449,4 +523,6 @@ physics_layer_0/collision_layer = 1
 terrain_set_0/mode = 0
 terrain_set_0/terrain_0/name = "Brick"
 terrain_set_0/terrain_0/color = Color(0.5, 0.34375, 0.25, 1)
+terrain_set_0/terrain_1/name = "Forested"
+terrain_set_0/terrain_1/color = Color(0.39864206, 0.682954, 0.06894464, 1)
 sources/0 = SubResource("TileSetAtlasSource_blkrv")

src/components/PlayerPhysicsController.cs

@@ -151,7 +151,7 @@ public partial class PlayerPhysicsController : CharacterBody2D {
                 vely *= 1/4f;
             }
 
-            if (Input.IsActionJustPressed("turn_back") && vely > 0) {
+            if (Input.IsActionJustPressed("turn_back") && vely > 0 && velx != 0) {
                 var side = velx > 0 ? PredictiveCollisions.Location.BottomRight : PredictiveCollisions.Location.BottomLeft;
                 if (Predictor.AnyHit(side) && !this.IsOnWall()) {
                     EmitSignal(SignalName.OnTurnbackJump, true, this.IsOnWall());