Merge pull request #1772 from endlessm/wjt/ink-combat-2-switch-to-single-tile-foam

Ink combat 2: Switch to single-tile foam

Author: manuq

scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_2.tscn

@@ -5,8 +5,8 @@
 [ext_resource type="Script" uid="uid://cp54mgi54nywo" path="res://scenes/game_logic/fill_game_logic.gd" id="3_wqron"]
 [ext_resource type="TileSet" uid="uid://oynx002hv8tl" path="res://tiles/water.tres" id="4_4q3i8"]
 [ext_resource type="PackedScene" uid="uid://crqjcicx0vdu" path="res://scenes/game_elements/props/decoration/bush/bush.tscn" id="4_4r6cg"]
+[ext_resource type="TileSet" uid="uid://bjx3gvah0ycl1" path="res://tiles/foam_2.tres" id="5_4q3i8"]
 [ext_resource type="PackedScene" uid="uid://iu2q66clupc6" path="res://scenes/game_elements/characters/player/player.tscn" id="5_bk6nl"]
-[ext_resource type="TileSet" uid="uid://yducoif83sia" path="res://tiles/foam.tres" id="5_oigmj"]
 [ext_resource type="PackedScene" uid="uid://b82nsrh332syj" path="res://scenes/game_elements/characters/enemies/throwing_enemy/throwing_enemy.tscn" id="6_e81yh"]
 [ext_resource type="TileSet" uid="uid://b8qnr0owsbhhn" path="res://tiles/exterior_floors.tres" id="6_gx7k2"]
 [ext_resource type="PackedScene" uid="uid://y8ha8abfyap2" path="res://scenes/game_elements/props/filling_barrel/filling_barrel.tscn" id="7_btlpg"]
@@ -73,12 +73,8 @@ tile_map_data = PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAIAAAAAAAA
 tile_set = ExtResource("4_4q3i8")
 
 [node name="Foam" type="TileMapLayer" parent="TileMapLayers"]
-tile_map_data = PackedByteArray("AAAJAAIAAgACAAEAAAAJAAMAAgACAAEAAAAJAAQAAgACAAEAAAAJAAUAAgACAAEAAAAJAAYAAgACAAEAAAAJAAcAAgACAAEAAAALAAIAAgAAAAEAAAALAAMAAgAAAAEAAAALAAQAAgAAAAEAAAALAAUAAgAAAAEAAAALAAYAAgAAAAEAAAALAAcAAgAAAAEAAAAIAAIAAgABAAEAAAAIAAMAAgABAAEAAAAIAAQAAgABAAEAAAAIAAUAAgABAAEAAAAIAAYAAgABAAEAAAAIAAcAAgABAAEAAAAMAAIAAgABAAEAAAAMAAMAAgABAAEAAAAMAAQAAgABAAEAAAAMAAUAAgABAAEAAAAMAAcAAgABAAEAAAAMAAYAAgABAAEAAAAMAAEAAgABAAEAAAAIAAEAAgABAAEAAAACAAIAAgABAAEAAAACAAMAAgABAAEAAAACAAQAAgABAAEAAAACAAUAAgABAAEAAAACAAYAAgABAAEAAAACAAcAAgABAAEAAAABAAIAAgAAAAEAAAABAAMAAgAAAAEAAAABAAQAAgAAAAEAAAABAAUAAgAAAAEAAAABAAYAAgAAAAEAAAABAAcAAgAAAAEAAAAAAAAAAgABAAEAAAACAP//AgABAAEAAAADAP//AgABAAEAAAACAAAAAgABAAIAAAACAP7/AgABAAAAAAAEAP//AgABAAEAAAADAAAAAgABAAIAAAADAP7/AgABAAAAAAAFAP//AgABAAEAAAAEAAAAAgABAAIAAAAEAP7/AgABAAAAAAAGAP//AgABAAEAAAAFAAAAAgABAAIAAAAFAP7/AgABAAAAAAAHAP//AgABAAEAAAAGAAAAAgABAAIAAAAGAP7/AgABAAAAAAAIAP//AgABAAEAAAAHAAAAAgABAAIAAAAHAP7/AgABAAAAAAAJAP//AgACAAEAAAAIAAAAAgABAAIAAAAIAP7/AgABAAAAAAAOAAAAAgABAAEAAAANAAEAAgACAAEAAAAPAAAAAgACAAEAAAAOAAEAAgABAAEAAAAOAP//AgABAAAAAAAPAAEAAgACAAEAAAAOAAIAAgABAAEAAAAPAAIAAgACAAEAAAAOAAMAAgABAAEAAAANAAIAAgAAAAEAAAAPAAMAAgACAAEAAAAOAAQAAgABAAEAAAANAAMAAgAAAAEAAAAPAAQAAgACAAEAAAAOAAUAAgABAAEAAAANAAQAAgAAAAEAAAAPAAUAAgACAAEAAAAOAAYAAgABAAEAAAANAAUAAgAAAAEAAAABAAAAAgACAAEAAAAAAAEAAgABAAEAAAD//wAAAgAAAAEAAAABAAEAAgABAAEAAAAAAAIAAgABAAIAAAD//wEAAgAAAAEAAAACAAEAAgACAAEAAAAPAAYAAgACAAEAAAAOAAcAAgABAAEAAAAPAAcAAgACAAEAAAAOAAgAAgABAAEAAAAPAAgAAgACAAEAAAAOAAkAAgABAAEAAAANAAgAAgABAAAAAAAPAAkAAgACAAEAAAAOAAoAAgABAAIAAAANAAkAAgABAAEAAAANAAoAAgABAAIAAAAMAAkAAgABAAEAAAAMAAoAAgABAAIAAAALAAkAAgABAAEAAAAMAAgAAgABAAAAAAALAAoAAgABAAIAAAAKAAkAAgABAAEAAAAKAAoAAgABAAIAAAAJAAkAAgABAAEAAAAJAAoAAgABAAIAAAAIAAkAAgABAAEAAAAIAAoAAgABAAIAAAAHAAkAAgABAAEAAAAIAAgAAgABAAAAAAAHAAoAAgABAAIAAAAGAAkAAgABAAEAAAAHAAgAAgABAAAAAAAGAAoAAgABAAIAAAAFAAkAAgABAAEAAAAGAAgAAgABAAAAAAAFAAoAAgABAAIAAAAEAAkAAgABAAEAAAAFAAgAAgABAAAAAAAEAAoAAgABAAIAAAADAAkAAgABAAEAAAAEAAgAAgABAAAAAAADAAoAAgABAAIAAAACAAkAAgABAAEAAAADAAgAAgABAAAAAAACAAoAAgABAAIAAAABAAkAAgABAAEAAAACAAgAAgABAAAAAAABAAoAAgABAAIAAAAAAAkAAgABAAEAAAAAAAoAAgABAAIAAAD//wkAAgAAAAEAAAA=")
-tile_set = ExtResource("5_oigmj")
-
-[node name="Foam Level 2" type="TileMapLayer" parent="TileMapLayers"]
-tile_map_data = PackedByteArray("AAAJAAIAAgABAAIAAAAKAAIAAgABAAIAAAALAAIAAgABAAIAAAAAAAEAAgABAAEAAAAAAAIAAgABAAIAAAABAAEAAgABAAEAAAABAAIAAgABAAIAAAAJAAEAAgABAAEAAAAKAAEAAgABAAEAAAALAAEAAgABAAEAAAA=")
-tile_set = ExtResource("5_oigmj")
+tile_map_data = PackedByteArray("AAAAAAAAAgAAAAAAAAAAAAEAAgAAAAAAAAABAAEAAgAAAAAAAAACAP//AgAAAAAAAAACAAAAAgAAAAAAAAACAAEAAgAAAAAAAAACAAIAAgAAAAAAAAACAAMAAgAAAAAAAAACAAQAAgAAAAAAAAACAAUAAgAAAAAAAAACAAYAAgAAAAAAAAACAAcAAgAAAAAAAAADAP//AgAAAAAAAAAEAP//AgAAAAAAAAAFAP//AgAAAAAAAAAGAP//AgAAAAAAAAAHAP//AgAAAAAAAAAIAP//AgAAAAAAAAAIAAAAAgAAAAAAAAAIAAEAAgAAAAAAAAAJAAEAAgAAAAAAAAAKAAEAAgAAAAAAAAALAAEAAgAAAAAAAAAMAAEAAgAAAAAAAAAMAAIAAgAAAAAAAAAMAAMAAgAAAAAAAAAMAAQAAgAAAAAAAAAMAAUAAgAAAAAAAAAMAAYAAgAAAAAAAAAMAAcAAgAAAAAAAAAMAAgAAgAAAAAAAAAIAAIAAgAAAAAAAAAIAAMAAgAAAAAAAAAIAAQAAgAAAAAAAAAIAAUAAgAAAAAAAAAIAAYAAgAAAAAAAAAIAAcAAgAAAAAAAAAIAAgAAgAAAAAAAAANAAEAAgAAAAAAAAAOAAEAAgAAAAAAAAAOAAAAAgAAAAAAAAAOAAIAAgAAAAAAAAAOAAMAAgAAAAAAAAAOAAQAAgAAAAAAAAAOAAUAAgAAAAAAAAAOAAYAAgAAAAAAAAAOAAcAAgAAAAAAAAAOAAgAAgAAAAAAAAAOAAkAAgAAAAAAAAANAAkAAgAAAAAAAAAMAAkAAgAAAAAAAAALAAkAAgAAAAAAAAAKAAkAAgAAAAAAAAAJAAkAAgAAAAAAAAAIAAkAAgAAAAAAAAAHAAkAAgAAAAAAAAAGAAkAAgAAAAAAAAAFAAkAAgAAAAAAAAAEAAkAAgAAAAAAAAADAAkAAgAAAAAAAAACAAkAAgAAAAAAAAABAAkAAgAAAAAAAAAAAAkAAgAAAAAAAAACAAgAAgAAAAAAAAA=")
+tile_set = ExtResource("5_4q3i8")
 
 [node name="Grass" type="TileMapLayer" parent="TileMapLayers"]
 tile_map_data = PackedByteArray("AAAGAAEAAQABAAEAAAAGAAAAAQABAAEAAAAGAAgAAQABAAEAAAAGAAcAAQABAAEAAAAGAAUAAQABAAEAAAAGAAQAAQABAAEAAAAGAAMAAQABAAEAAAAGAAIAAQABAAEAAAAMAAcAAQAAAAEAAAANAAcAAQABAAEAAAANAAYAAQABAAEAAAAMAAYAAQAAAAEAAAAMAAUAAQAAAAEAAAANAAUAAQABAAEAAAAMAAQAAQAAAAEAAAANAAQAAQABAAEAAAANAAMAAQABAAEAAAAMAAMAAQAAAAEAAAAMAAIAAQAAAAEAAAANAAIAAQABAAEAAAACAAIAAQAAAAEAAAADAAIAAQABAAEAAAAEAAIAAQABAAEAAAAFAAIAAQABAAEAAAAHAAIAAQABAAEAAAAIAAIAAQACAAEAAAAIAAMAAQACAAEAAAAHAAMAAQABAAEAAAAFAAMAAQABAAEAAAAEAAMAAQABAAEAAAADAAMAAQABAAEAAAACAAMAAQAAAAEAAAACAAQAAQAAAAEAAAADAAQAAQABAAEAAAAEAAQAAQABAAEAAAAFAAQAAQABAAEAAAAHAAQAAQABAAEAAAAIAAQAAQACAAEAAAAIAAUAAQACAAEAAAAHAAUAAQABAAEAAAAFAAUAAQABAAEAAAAEAAUAAQABAAEAAAADAAUAAQABAAEAAAACAAUAAQAAAAEAAAACAAYAAQAAAAEAAAADAAYAAQABAAEAAAAEAAYAAQABAAEAAAAFAAYAAQABAAEAAAAGAAYAAQABAAEAAAAHAAYAAQABAAEAAAAIAAYAAQACAAEAAAAIAAcAAQACAAEAAAAHAAcAAQABAAEAAAAFAAcAAQABAAEAAAAEAAcAAQABAAEAAAADAAcAAQABAAEAAAACAAcAAQAAAAEAAAACAAEAAQAAAAEAAAADAAEAAQABAAEAAAAEAAEAAQABAAEAAAAFAAEAAQABAAEAAAAHAAEAAQABAAEAAAAIAAEAAQACAAEAAAAIAAAAAQACAAEAAAAHAAAAAQABAAEAAAAFAAAAAQABAAEAAAAEAAAAAQABAAEAAAADAAAAAQABAAEAAAACAAAAAQAAAAEAAAACAP//AQAAAAAAAAADAP//AQABAAAAAAAEAP//AQABAAAAAAAFAP//AQABAAAAAAAGAP//AQABAAAAAAAHAP//AQABAAAAAAAIAP//AQACAAAAAAACAAgAAQAAAAEAAAADAAgAAQABAAEAAAAEAAgAAQABAAEAAAAFAAgAAQABAAEAAAAHAAgAAQABAAEAAAAIAAgAAQACAAEAAAAIAAkAAQACAAIAAAAHAAkAAQABAAIAAAAGAAkAAQABAAIAAAAFAAkAAQABAAIAAAAEAAkAAQABAAIAAAADAAkAAQABAAIAAAACAAkAAQAAAAIAAAAMAAEAAQAAAAAAAAANAAEAAQABAAAAAAAOAAEAAQACAAAAAAAOAAIAAQACAAEAAAAOAAMAAQACAAEAAAAOAAQAAQACAAEAAAAOAAUAAQACAAEAAAAOAAYAAQACAAEAAAAOAAcAAQACAAEAAAAOAAgAAQACAAIAAAANAAgAAQABAAIAAAAMAAgAAQAAAAIAAAA=")