diff --git a/assets/sprites/CP002AA.BMP b/assets/sprites/CP002AA.BMP new file mode 100644 index 0000000..8088a7e Binary files /dev/null and b/assets/sprites/CP002AA.BMP differ diff --git a/assets/sprites/CP002AA.BMP.import b/assets/sprites/CP002AA.BMP.import new file mode 100644 index 0000000..0234f43 --- /dev/null +++ b/assets/sprites/CP002AA.BMP.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dyutp4m5d53gd" +path="res://.godot/imported/CP002AA.BMP-458508fd9812b1212a2b0485c80b722b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/CP002AA.BMP" +dest_files=["res://.godot/imported/CP002AA.BMP-458508fd9812b1212a2b0485c80b722b.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/assets/sprites/MP000A.BMP b/assets/sprites/MP000A.BMP new file mode 100644 index 0000000..c0c78fe Binary files /dev/null and b/assets/sprites/MP000A.BMP differ diff --git a/assets/sprites/MP000A.BMP.import b/assets/sprites/MP000A.BMP.import new file mode 100644 index 0000000..2d0f8e2 --- /dev/null +++ b/assets/sprites/MP000A.BMP.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://65rmoynep5hy" +path="res://.godot/imported/MP000A.BMP-368d2040af5711fa204ca3af7a278f42.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/MP000A.BMP" +dest_files=["res://.godot/imported/MP000A.BMP-368d2040af5711fa204ca3af7a278f42.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/assets/sprites/combat_map_ui.BMP b/assets/sprites/combat_map_ui.BMP new file mode 100644 index 0000000..5f6297e Binary files /dev/null and b/assets/sprites/combat_map_ui.BMP differ diff --git a/assets/sprites/combat_map_ui.BMP.import b/assets/sprites/combat_map_ui.BMP.import new file mode 100644 index 0000000..c9d8937 --- /dev/null +++ b/assets/sprites/combat_map_ui.BMP.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b1ks72fiesfrm" +path="res://.godot/imported/combat_map_ui.BMP-d85bc460987d9320be9eb9133d575ddc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/combat_map_ui.BMP" +dest_files=["res://.godot/imported/combat_map_ui.BMP-d85bc460987d9320be9eb9133d575ddc.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/nodes/combat_map.gd b/nodes/combat_map.gd index 5539a8a..155bc7f 100644 --- a/nodes/combat_map.gd +++ b/nodes/combat_map.gd @@ -4,9 +4,8 @@ extends Node2D @export var tile_set: DLTileset @onready var tile_map: TileMapLayer = %TerrainLayer @onready var highlight_map: GridOverlay = %OverlayLayer -@onready var tile_highlight: ColorRect = $TileHighlight -const TILE_SIZE := 48.0 +const TILE_SIZE := 100.0 const SOURCE_ID: int = 0 var _pending_layout: String @@ -80,8 +79,3 @@ func remove_unit(unit: Unit) -> void: func target_tile(coords: Vector2i) -> void: highlight_map.target_tile(coords) - - -func set_highlight_enabled(enabled: bool) -> void: - tile_highlight.visible = enabled - tile_highlight.set_process(enabled) diff --git a/nodes/strategy_phase.gd b/nodes/strategy_phase.gd index 379324a..03fb65f 100644 --- a/nodes/strategy_phase.gd +++ b/nodes/strategy_phase.gd @@ -17,8 +17,6 @@ func _ready() -> void: func _on_mouse_grid_changed(coords: Vector2i) -> void: combat_map.target_tile(coords) - combat_map.tile_highlight.set_grid_coords(coords) - func _on_combat_requested(attacker: Unit, defender: Unit) -> void: var atk_coords := combat_map.world_to_coords(attacker.position) diff --git a/prefabs/combat_map.tscn b/prefabs/combat_map.tscn index 94d101f..0a65e11 100644 --- a/prefabs/combat_map.tscn +++ b/prefabs/combat_map.tscn @@ -2,15 +2,14 @@ [ext_resource type="Script" uid="uid://bks7uplgjjdg0" path="res://nodes/combat_map.gd" id="1_jyv1f"] [ext_resource type="Script" uid="uid://c6701vy8h5rfx" path="res://resources/resource_definitions/dl_tileset.gd" id="2_8rn0j"] -[ext_resource type="TileSet" uid="uid://dm5wl6d4xkstu" path="res://resources/combat_tileset.tres" id="3_8rn0j"] [ext_resource type="Texture2D" uid="uid://sjsl8q7tkx8" path="res://assets/sprites/grid_highlight.png" id="3_vcj5e"] [ext_resource type="Script" uid="uid://cxl38x2m6sj3w" path="res://scripts/grid_overlay.gd" id="4_jelju"] -[ext_resource type="Texture2D" uid="uid://h7nfrjxagqmc" path="res://assets/sprites/selector.png" id="5_muxvo"] -[ext_resource type="Script" uid="uid://b31eyqov8w7bm" path="res://scripts/tile_highlight.gd" id="7_tileh"] +[ext_resource type="Texture2D" uid="uid://b1ks72fiesfrm" path="res://assets/sprites/combat_map_ui.BMP" id="5_mycp7"] +[ext_resource type="Texture2D" uid="uid://65rmoynep5hy" path="res://assets/sprites/MP000A.BMP" id="6_muxvo"] [sub_resource type="Resource" id="Resource_vcj5e"] script = ExtResource("2_8rn0j") -wall_tile_coords = Vector2i(2, 15) +wall_tile_coords = Vector2i(0, 1) metadata/_custom_type_script = "uid://c6701vy8h5rfx" [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_jelju"] @@ -26,9 +25,46 @@ texture_region_size = Vector2i(48, 48) 0:0/0 = 0 [sub_resource type="TileSet" id="TileSet_muxvo"] -tile_size = Vector2i(48, 48) +tile_size = Vector2i(100, 100) sources/0 = SubResource("TileSetAtlasSource_jelju") +[sub_resource type="AtlasTexture" id="AtlasTexture_e2u25"] +atlas = ExtResource("5_mycp7") +region = Rect2(0, 428, 100, 100) + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_mycp7"] +texture = ExtResource("6_muxvo") +texture_region_size = Vector2i(100, 100) +0:0/0 = 0 +1:0/0 = 0 +2:0/0 = 0 +3:0/0 = 0 +4:0/0 = 0 +0:1/0 = 0 +1:1/0 = 0 +2:1/0 = 0 +3:1/0 = 0 +4:1/0 = 0 +0:2/0 = 0 +1:2/0 = 0 +2:2/0 = 0 +3:2/0 = 0 +4:2/0 = 0 +0:3/0 = 0 +1:3/0 = 0 +2:3/0 = 0 +3:3/0 = 0 +4:3/0 = 0 +0:4/0 = 0 +1:4/0 = 0 +2:4/0 = 0 +3:4/0 = 0 +4:4/0 = 0 + +[sub_resource type="TileSet" id="TileSet_e2u25"] +tile_size = Vector2i(100, 100) +sources/0 = SubResource("TileSetAtlasSource_mycp7") + [node name="CombatMap" type="Node2D" unique_id=546780706] script = ExtResource("1_jyv1f") tile_set = SubResource("Resource_vcj5e") @@ -41,12 +77,9 @@ script = ExtResource("4_jelju") [node name="TargetingIndicator" type="Sprite2D" parent="OverlayLayer" unique_id=1836328987] visible = false z_index = 3 -texture = ExtResource("5_muxvo") -offset = Vector2(24, 24) +texture = SubResource("AtlasTexture_e2u25") +offset = Vector2(50, 50) [node name="TerrainLayer" type="TileMapLayer" parent="." unique_id=1201875024] unique_name_in_owner = true -tile_set = ExtResource("3_8rn0j") - -[node name="TileHighlight" type="ColorRect" parent="." unique_id=211433569] -script = ExtResource("7_tileh") +tile_set = SubResource("TileSet_e2u25") diff --git a/prefabs/dialogue.tscn b/prefabs/dialogue.tscn new file mode 100644 index 0000000..e2f1bd8 --- /dev/null +++ b/prefabs/dialogue.tscn @@ -0,0 +1,9 @@ +[gd_scene format=3 uid="uid://c6fnawy2wtqii"] + +[node name="Control" type="Control" unique_id=1778107518] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 diff --git a/prefabs/unit.tscn b/prefabs/unit.tscn index 5ea8b75..47e7d7b 100644 --- a/prefabs/unit.tscn +++ b/prefabs/unit.tscn @@ -2,8 +2,8 @@ [ext_resource type="Script" uid="uid://c016mxgatcpse" path="res://nodes/unit.gd" id="1_cq4v0"] [ext_resource type="Texture2D" uid="uid://cw5su6lignryo" path="res://assets/sprites/flag.png" id="2_fhs1y"] -[ext_resource type="Texture2D" uid="uid://c2se5wyly6gr6" path="res://assets/sprites/character.bmp" id="2_on614"] [ext_resource type="Shader" uid="uid://bd8ki8xwym5nc" path="res://shaders/chroma_key.gdshader" id="3_fhs1y"] +[ext_resource type="Texture2D" uid="uid://dyutp4m5d53gd" path="res://assets/sprites/CP002AA.BMP" id="3_on614"] [sub_resource type="GDScript" id="GDScript_fhs1y"] resource_name = "AllegianceIndicatorManager" @@ -14,13 +14,46 @@ func _on_unit_unit_allegiance_changed(unit: Unit, allegiance: UnitAllegiance) -> self_modulate = allegiance.color " -[sub_resource type="ShaderMaterial" id="ShaderMaterial_4j20j"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_fhs1y"] shader = ExtResource("3_fhs1y") +shader_parameter/key_color = Color(0, 1, 0, 1) shader_parameter/threshold = 0.01 -[sub_resource type="AtlasTexture" id="AtlasTexture_on614"] -atlas = ExtResource("2_on614") -region = Rect2(144, 240, 48, 48) +[sub_resource type="AtlasTexture" id="AtlasTexture_fhs1y"] +atlas = ExtResource("3_on614") +region = Rect2(0, 0, 40, 50) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4j20j"] +atlas = ExtResource("3_on614") +region = Rect2(40, 0, 40, 50) + +[sub_resource type="AtlasTexture" id="AtlasTexture_v0xod"] +atlas = ExtResource("3_on614") +region = Rect2(0, 50, 40, 50) + +[sub_resource type="AtlasTexture" id="AtlasTexture_50p1h"] +atlas = ExtResource("3_on614") +region = Rect2(40, 50, 40, 50) + +[sub_resource type="SpriteFrames" id="SpriteFrames_7jqdg"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_fhs1y") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_4j20j") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_v0xod") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_50p1h") +}], +"loop": true, +"name": &"idle", +"speed": 5.0 +}] [sub_resource type="GDScript" id="GDScript_on614"] resource_name = "UnitSelectorHandler" @@ -40,16 +73,17 @@ texture = ExtResource("2_fhs1y") offset = Vector2(24, 24) script = SubResource("GDScript_fhs1y") -[node name="UnitSprite" type="Sprite2D" parent="." unique_id=350615297] -z_index = 1 -material = SubResource("ShaderMaterial_4j20j") -texture = SubResource("AtlasTexture_on614") -offset = Vector2(24, 24) +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=1796991032] +material = SubResource("ShaderMaterial_fhs1y") +position = Vector2(50, 50) +sprite_frames = SubResource("SpriteFrames_7jqdg") +animation = &"idle" +autoplay = "idle" [node name="ColorRect" type="ColorRect" parent="." unique_id=1313394023] visible = false -offset_right = 48.0 -offset_bottom = 48.0 +offset_right = 100.0 +offset_bottom = 100.0 color = Color(1, 1, 0.3019608, 0.36078432) script = SubResource("GDScript_on614") diff --git a/resources/combat_tileset.tres b/resources/combat_tileset.tres index ae305f1..c4477ae 100644 --- a/resources/combat_tileset.tres +++ b/resources/combat_tileset.tres @@ -1,836 +1,36 @@ [gd_resource type="TileSet" format=3 uid="uid://dm5wl6d4xkstu"] -[ext_resource type="Texture2D" uid="uid://udsusbp3o76m" path="res://assets/sprites/map1.bmp" id="1_v1d02"] +[ext_resource type="Texture2D" uid="uid://65rmoynep5hy" path="res://assets/sprites/MP000A.BMP" id="1_v1d02"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_5lppa"] texture = ExtResource("1_v1d02") -texture_region_size = Vector2i(48, 48) +texture_region_size = Vector2i(100, 100) 0:0/0 = 0 1:0/0 = 0 2:0/0 = 0 3:0/0 = 0 4:0/0 = 0 -5:0/0 = 0 -6:0/0 = 0 -7:0/0 = 0 -8:0/0 = 0 -9:0/0 = 0 -10:0/0 = 0 -11:0/0 = 0 -12:0/0 = 0 -13:0/0 = 0 -14:0/0 = 0 -15:0/0 = 0 -16:0/0 = 0 -17:0/0 = 0 -18:0/0 = 0 -19:0/0 = 0 -20:0/0 = 0 -21:0/0 = 0 -22:0/0 = 0 -23:0/0 = 0 -24:0/0 = 0 -25:0/0 = 0 -26:0/0 = 0 -27:0/0 = 0 -28:0/0 = 0 -29:0/0 = 0 -30:0/0 = 0 -31:0/0 = 0 -32:0/0 = 0 0:1/0 = 0 1:1/0 = 0 2:1/0 = 0 3:1/0 = 0 4:1/0 = 0 -5:1/0 = 0 -6:1/0 = 0 -7:1/0 = 0 -8:1/0 = 0 -9:1/0 = 0 -10:1/0 = 0 -11:1/0 = 0 -12:1/0 = 0 -13:1/0 = 0 -14:1/0 = 0 -15:1/0 = 0 -16:1/0 = 0 -17:1/0 = 0 -18:1/0 = 0 -19:1/0 = 0 -20:1/0 = 0 -21:1/0 = 0 -22:1/0 = 0 -23:1/0 = 0 -24:1/0 = 0 -25:1/0 = 0 -26:1/0 = 0 -27:1/0 = 0 -28:1/0 = 0 -29:1/0 = 0 -30:1/0 = 0 -31:1/0 = 0 -32:1/0 = 0 0:2/0 = 0 1:2/0 = 0 2:2/0 = 0 3:2/0 = 0 4:2/0 = 0 -5:2/0 = 0 -6:2/0 = 0 -7:2/0 = 0 -8:2/0 = 0 -9:2/0 = 0 -10:2/0 = 0 -11:2/0 = 0 -12:2/0 = 0 -13:2/0 = 0 -14:2/0 = 0 -15:2/0 = 0 -16:2/0 = 0 -17:2/0 = 0 -18:2/0 = 0 -19:2/0 = 0 -20:2/0 = 0 -21:2/0 = 0 -22:2/0 = 0 -23:2/0 = 0 -24:2/0 = 0 -25:2/0 = 0 -26:2/0 = 0 -27:2/0 = 0 -28:2/0 = 0 -29:2/0 = 0 -30:2/0 = 0 -31:2/0 = 0 -32:2/0 = 0 0:3/0 = 0 1:3/0 = 0 2:3/0 = 0 3:3/0 = 0 4:3/0 = 0 -5:3/0 = 0 -6:3/0 = 0 -7:3/0 = 0 -8:3/0 = 0 -9:3/0 = 0 -10:3/0 = 0 -11:3/0 = 0 -12:3/0 = 0 -13:3/0 = 0 -14:3/0 = 0 -15:3/0 = 0 -16:3/0 = 0 -17:3/0 = 0 -18:3/0 = 0 -19:3/0 = 0 -20:3/0 = 0 -21:3/0 = 0 -22:3/0 = 0 -23:3/0 = 0 -24:3/0 = 0 -25:3/0 = 0 -26:3/0 = 0 -27:3/0 = 0 -28:3/0 = 0 -29:3/0 = 0 -30:3/0 = 0 -31:3/0 = 0 -32:3/0 = 0 0:4/0 = 0 1:4/0 = 0 2:4/0 = 0 3:4/0 = 0 4:4/0 = 0 -5:4/0 = 0 -6:4/0 = 0 -7:4/0 = 0 -8:4/0 = 0 -9:4/0 = 0 -10:4/0 = 0 -11:4/0 = 0 -12:4/0 = 0 -13:4/0 = 0 -14:4/0 = 0 -15:4/0 = 0 -16:4/0 = 0 -17:4/0 = 0 -18:4/0 = 0 -19:4/0 = 0 -20:4/0 = 0 -21:4/0 = 0 -22:4/0 = 0 -23:4/0 = 0 -24:4/0 = 0 -25:4/0 = 0 -26:4/0 = 0 -27:4/0 = 0 -28:4/0 = 0 -29:4/0 = 0 -30:4/0 = 0 -31:4/0 = 0 -32:4/0 = 0 -0:5/0 = 0 -1:5/0 = 0 -2:5/0 = 0 -3:5/0 = 0 -4:5/0 = 0 -5:5/0 = 0 -6:5/0 = 0 -7:5/0 = 0 -8:5/0 = 0 -9:5/0 = 0 -10:5/0 = 0 -11:5/0 = 0 -12:5/0 = 0 -13:5/0 = 0 -14:5/0 = 0 -15:5/0 = 0 -16:5/0 = 0 -17:5/0 = 0 -18:5/0 = 0 -19:5/0 = 0 -20:5/0 = 0 -21:5/0 = 0 -22:5/0 = 0 -23:5/0 = 0 -24:5/0 = 0 -25:5/0 = 0 -26:5/0 = 0 -27:5/0 = 0 -28:5/0 = 0 -29:5/0 = 0 -30:5/0 = 0 -31:5/0 = 0 -32:5/0 = 0 -0:6/0 = 0 -1:6/0 = 0 -2:6/0 = 0 -3:6/0 = 0 -4:6/0 = 0 -5:6/0 = 0 -6:6/0 = 0 -7:6/0 = 0 -8:6/0 = 0 -9:6/0 = 0 -10:6/0 = 0 -11:6/0 = 0 -12:6/0 = 0 -13:6/0 = 0 -14:6/0 = 0 -15:6/0 = 0 -16:6/0 = 0 -17:6/0 = 0 -18:6/0 = 0 -19:6/0 = 0 -20:6/0 = 0 -21:6/0 = 0 -22:6/0 = 0 -23:6/0 = 0 -24:6/0 = 0 -25:6/0 = 0 -26:6/0 = 0 -27:6/0 = 0 -28:6/0 = 0 -29:6/0 = 0 -30:6/0 = 0 -31:6/0 = 0 -32:6/0 = 0 -0:7/0 = 0 -1:7/0 = 0 -2:7/0 = 0 -3:7/0 = 0 -4:7/0 = 0 -5:7/0 = 0 -6:7/0 = 0 -7:7/0 = 0 -8:7/0 = 0 -9:7/0 = 0 -10:7/0 = 0 -11:7/0 = 0 -12:7/0 = 0 -13:7/0 = 0 -14:7/0 = 0 -15:7/0 = 0 -16:7/0 = 0 -17:7/0 = 0 -18:7/0 = 0 -19:7/0 = 0 -20:7/0 = 0 -21:7/0 = 0 -22:7/0 = 0 -23:7/0 = 0 -24:7/0 = 0 -25:7/0 = 0 -26:7/0 = 0 -27:7/0 = 0 -28:7/0 = 0 -29:7/0 = 0 -30:7/0 = 0 -31:7/0 = 0 -32:7/0 = 0 -0:8/0 = 0 -1:8/0 = 0 -2:8/0 = 0 -3:8/0 = 0 -4:8/0 = 0 -5:8/0 = 0 -6:8/0 = 0 -7:8/0 = 0 -8:8/0 = 0 -9:8/0 = 0 -10:8/0 = 0 -11:8/0 = 0 -12:8/0 = 0 -13:8/0 = 0 -14:8/0 = 0 -15:8/0 = 0 -16:8/0 = 0 -17:8/0 = 0 -18:8/0 = 0 -19:8/0 = 0 -20:8/0 = 0 -21:8/0 = 0 -22:8/0 = 0 -23:8/0 = 0 -24:8/0 = 0 -25:8/0 = 0 -26:8/0 = 0 -27:8/0 = 0 -28:8/0 = 0 -29:8/0 = 0 -30:8/0 = 0 -31:8/0 = 0 -32:8/0 = 0 -0:9/0 = 0 -1:9/0 = 0 -2:9/0 = 0 -3:9/0 = 0 -4:9/0 = 0 -5:9/0 = 0 -6:9/0 = 0 -7:9/0 = 0 -8:9/0 = 0 -9:9/0 = 0 -10:9/0 = 0 -11:9/0 = 0 -12:9/0 = 0 -13:9/0 = 0 -14:9/0 = 0 -15:9/0 = 0 -16:9/0 = 0 -17:9/0 = 0 -18:9/0 = 0 -19:9/0 = 0 -20:9/0 = 0 -21:9/0 = 0 -22:9/0 = 0 -23:9/0 = 0 -24:9/0 = 0 -25:9/0 = 0 -26:9/0 = 0 -27:9/0 = 0 -28:9/0 = 0 -29:9/0 = 0 -30:9/0 = 0 -31:9/0 = 0 -32:9/0 = 0 -0:10/0 = 0 -1:10/0 = 0 -2:10/0 = 0 -3:10/0 = 0 -4:10/0 = 0 -5:10/0 = 0 -6:10/0 = 0 -7:10/0 = 0 -8:10/0 = 0 -9:10/0 = 0 -10:10/0 = 0 -11:10/0 = 0 -12:10/0 = 0 -13:10/0 = 0 -14:10/0 = 0 -15:10/0 = 0 -16:10/0 = 0 -17:10/0 = 0 -18:10/0 = 0 -19:10/0 = 0 -20:10/0 = 0 -21:10/0 = 0 -22:10/0 = 0 -23:10/0 = 0 -24:10/0 = 0 -25:10/0 = 0 -26:10/0 = 0 -27:10/0 = 0 -28:10/0 = 0 -29:10/0 = 0 -30:10/0 = 0 -31:10/0 = 0 -32:10/0 = 0 -0:11/0 = 0 -1:11/0 = 0 -2:11/0 = 0 -3:11/0 = 0 -4:11/0 = 0 -5:11/0 = 0 -6:11/0 = 0 -7:11/0 = 0 -8:11/0 = 0 -9:11/0 = 0 -10:11/0 = 0 -11:11/0 = 0 -12:11/0 = 0 -13:11/0 = 0 -14:11/0 = 0 -15:11/0 = 0 -16:11/0 = 0 -17:11/0 = 0 -18:11/0 = 0 -19:11/0 = 0 -20:11/0 = 0 -21:11/0 = 0 -22:11/0 = 0 -23:11/0 = 0 -24:11/0 = 0 -25:11/0 = 0 -26:11/0 = 0 -27:11/0 = 0 -28:11/0 = 0 -29:11/0 = 0 -30:11/0 = 0 -31:11/0 = 0 -32:11/0 = 0 -0:12/0 = 0 -1:12/0 = 0 -2:12/0 = 0 -3:12/0 = 0 -4:12/0 = 0 -5:12/0 = 0 -6:12/0 = 0 -7:12/0 = 0 -8:12/0 = 0 -9:12/0 = 0 -10:12/0 = 0 -11:12/0 = 0 -12:12/0 = 0 -13:12/0 = 0 -14:12/0 = 0 -15:12/0 = 0 -16:12/0 = 0 -17:12/0 = 0 -18:12/0 = 0 -19:12/0 = 0 -20:12/0 = 0 -21:12/0 = 0 -22:12/0 = 0 -23:12/0 = 0 -24:12/0 = 0 -25:12/0 = 0 -26:12/0 = 0 -27:12/0 = 0 -28:12/0 = 0 -29:12/0 = 0 -30:12/0 = 0 -31:12/0 = 0 -32:12/0 = 0 -0:13/0 = 0 -1:13/0 = 0 -2:13/0 = 0 -3:13/0 = 0 -4:13/0 = 0 -5:13/0 = 0 -6:13/0 = 0 -7:13/0 = 0 -8:13/0 = 0 -9:13/0 = 0 -10:13/0 = 0 -11:13/0 = 0 -12:13/0 = 0 -13:13/0 = 0 -14:13/0 = 0 -15:13/0 = 0 -16:13/0 = 0 -17:13/0 = 0 -18:13/0 = 0 -19:13/0 = 0 -20:13/0 = 0 -21:13/0 = 0 -22:13/0 = 0 -23:13/0 = 0 -24:13/0 = 0 -25:13/0 = 0 -26:13/0 = 0 -27:13/0 = 0 -28:13/0 = 0 -29:13/0 = 0 -30:13/0 = 0 -31:13/0 = 0 -32:13/0 = 0 -0:14/0 = 0 -1:14/0 = 0 -2:14/0 = 0 -3:14/0 = 0 -4:14/0 = 0 -5:14/0 = 0 -6:14/0 = 0 -7:14/0 = 0 -8:14/0 = 0 -9:14/0 = 0 -10:14/0 = 0 -11:14/0 = 0 -12:14/0 = 0 -13:14/0 = 0 -14:14/0 = 0 -15:14/0 = 0 -16:14/0 = 0 -17:14/0 = 0 -18:14/0 = 0 -19:14/0 = 0 -20:14/0 = 0 -21:14/0 = 0 -22:14/0 = 0 -23:14/0 = 0 -24:14/0 = 0 -25:14/0 = 0 -26:14/0 = 0 -27:14/0 = 0 -28:14/0 = 0 -29:14/0 = 0 -30:14/0 = 0 -31:14/0 = 0 -32:14/0 = 0 -0:15/0 = 0 -1:15/0 = 0 -2:15/0 = 0 -3:15/0 = 0 -4:15/0 = 0 -5:15/0 = 0 -6:15/0 = 0 -7:15/0 = 0 -8:15/0 = 0 -9:15/0 = 0 -10:15/0 = 0 -11:15/0 = 0 -12:15/0 = 0 -13:15/0 = 0 -14:15/0 = 0 -15:15/0 = 0 -16:15/0 = 0 -17:15/0 = 0 -18:15/0 = 0 -19:15/0 = 0 -20:15/0 = 0 -21:15/0 = 0 -22:15/0 = 0 -23:15/0 = 0 -24:15/0 = 0 -25:15/0 = 0 -26:15/0 = 0 -27:15/0 = 0 -28:15/0 = 0 -29:15/0 = 0 -30:15/0 = 0 -31:15/0 = 0 -32:15/0 = 0 -0:16/0 = 0 -1:16/0 = 0 -2:16/0 = 0 -3:16/0 = 0 -4:16/0 = 0 -5:16/0 = 0 -6:16/0 = 0 -7:16/0 = 0 -8:16/0 = 0 -9:16/0 = 0 -10:16/0 = 0 -11:16/0 = 0 -12:16/0 = 0 -13:16/0 = 0 -14:16/0 = 0 -15:16/0 = 0 -16:16/0 = 0 -17:16/0 = 0 -18:16/0 = 0 -19:16/0 = 0 -20:16/0 = 0 -21:16/0 = 0 -22:16/0 = 0 -23:16/0 = 0 -24:16/0 = 0 -25:16/0 = 0 -26:16/0 = 0 -27:16/0 = 0 -28:16/0 = 0 -29:16/0 = 0 -30:16/0 = 0 -31:16/0 = 0 -32:16/0 = 0 -0:17/0 = 0 -1:17/0 = 0 -2:17/0 = 0 -3:17/0 = 0 -4:17/0 = 0 -5:17/0 = 0 -6:17/0 = 0 -7:17/0 = 0 -8:17/0 = 0 -9:17/0 = 0 -10:17/0 = 0 -11:17/0 = 0 -12:17/0 = 0 -13:17/0 = 0 -14:17/0 = 0 -15:17/0 = 0 -16:17/0 = 0 -17:17/0 = 0 -18:17/0 = 0 -19:17/0 = 0 -20:17/0 = 0 -21:17/0 = 0 -22:17/0 = 0 -23:17/0 = 0 -24:17/0 = 0 -25:17/0 = 0 -26:17/0 = 0 -27:17/0 = 0 -28:17/0 = 0 -29:17/0 = 0 -30:17/0 = 0 -31:17/0 = 0 -32:17/0 = 0 -0:18/0 = 0 -1:18/0 = 0 -2:18/0 = 0 -3:18/0 = 0 -4:18/0 = 0 -5:18/0 = 0 -6:18/0 = 0 -7:18/0 = 0 -8:18/0 = 0 -9:18/0 = 0 -10:18/0 = 0 -11:18/0 = 0 -12:18/0 = 0 -13:18/0 = 0 -14:18/0 = 0 -15:18/0 = 0 -16:18/0 = 0 -17:18/0 = 0 -18:18/0 = 0 -19:18/0 = 0 -20:18/0 = 0 -21:18/0 = 0 -22:18/0 = 0 -23:18/0 = 0 -24:18/0 = 0 -25:18/0 = 0 -26:18/0 = 0 -27:18/0 = 0 -28:18/0 = 0 -29:18/0 = 0 -30:18/0 = 0 -31:18/0 = 0 -32:18/0 = 0 -0:19/0 = 0 -1:19/0 = 0 -2:19/0 = 0 -3:19/0 = 0 -4:19/0 = 0 -5:19/0 = 0 -6:19/0 = 0 -7:19/0 = 0 -8:19/0 = 0 -9:19/0 = 0 -10:19/0 = 0 -11:19/0 = 0 -12:19/0 = 0 -13:19/0 = 0 -14:19/0 = 0 -15:19/0 = 0 -16:19/0 = 0 -17:19/0 = 0 -18:19/0 = 0 -19:19/0 = 0 -20:19/0 = 0 -21:19/0 = 0 -22:19/0 = 0 -23:19/0 = 0 -24:19/0 = 0 -25:19/0 = 0 -26:19/0 = 0 -27:19/0 = 0 -28:19/0 = 0 -29:19/0 = 0 -30:19/0 = 0 -31:19/0 = 0 -32:19/0 = 0 -0:20/0 = 0 -1:20/0 = 0 -2:20/0 = 0 -3:20/0 = 0 -4:20/0 = 0 -5:20/0 = 0 -6:20/0 = 0 -7:20/0 = 0 -8:20/0 = 0 -9:20/0 = 0 -10:20/0 = 0 -11:20/0 = 0 -12:20/0 = 0 -13:20/0 = 0 -14:20/0 = 0 -15:20/0 = 0 -16:20/0 = 0 -17:20/0 = 0 -18:20/0 = 0 -19:20/0 = 0 -20:20/0 = 0 -21:20/0 = 0 -22:20/0 = 0 -23:20/0 = 0 -24:20/0 = 0 -25:20/0 = 0 -26:20/0 = 0 -27:20/0 = 0 -28:20/0 = 0 -29:20/0 = 0 -30:20/0 = 0 -31:20/0 = 0 -32:20/0 = 0 -0:21/0 = 0 -1:21/0 = 0 -2:21/0 = 0 -3:21/0 = 0 -4:21/0 = 0 -5:21/0 = 0 -6:21/0 = 0 -7:21/0 = 0 -8:21/0 = 0 -9:21/0 = 0 -10:21/0 = 0 -11:21/0 = 0 -12:21/0 = 0 -13:21/0 = 0 -14:21/0 = 0 -15:21/0 = 0 -16:21/0 = 0 -17:21/0 = 0 -18:21/0 = 0 -19:21/0 = 0 -20:21/0 = 0 -21:21/0 = 0 -22:21/0 = 0 -23:21/0 = 0 -24:21/0 = 0 -25:21/0 = 0 -26:21/0 = 0 -27:21/0 = 0 -28:21/0 = 0 -29:21/0 = 0 -30:21/0 = 0 -31:21/0 = 0 -32:21/0 = 0 -0:22/0 = 0 -1:22/0 = 0 -2:22/0 = 0 -3:22/0 = 0 -4:22/0 = 0 -5:22/0 = 0 -6:22/0 = 0 -7:22/0 = 0 -8:22/0 = 0 -9:22/0 = 0 -10:22/0 = 0 -11:22/0 = 0 -12:22/0 = 0 -13:22/0 = 0 -14:22/0 = 0 -15:22/0 = 0 -16:22/0 = 0 -17:22/0 = 0 -18:22/0 = 0 -19:22/0 = 0 -20:22/0 = 0 -21:22/0 = 0 -22:22/0 = 0 -23:22/0 = 0 -24:22/0 = 0 -25:22/0 = 0 -26:22/0 = 0 -27:22/0 = 0 -28:22/0 = 0 -29:22/0 = 0 -30:22/0 = 0 -31:22/0 = 0 -32:22/0 = 0 -0:23/0 = 0 -1:23/0 = 0 -2:23/0 = 0 -3:23/0 = 0 -4:23/0 = 0 -5:23/0 = 0 -6:23/0 = 0 -7:23/0 = 0 -8:23/0 = 0 -9:23/0 = 0 -10:23/0 = 0 -11:23/0 = 0 -12:23/0 = 0 -13:23/0 = 0 -14:23/0 = 0 -15:23/0 = 0 -16:23/0 = 0 -17:23/0 = 0 -18:23/0 = 0 -19:23/0 = 0 -20:23/0 = 0 -21:23/0 = 0 -22:23/0 = 0 -23:23/0 = 0 -24:23/0 = 0 -25:23/0 = 0 -26:23/0 = 0 -27:23/0 = 0 -28:23/0 = 0 -29:23/0 = 0 -30:23/0 = 0 -31:23/0 = 0 -32:23/0 = 0 -0:24/0 = 0 -1:24/0 = 0 -2:24/0 = 0 -3:24/0 = 0 -4:24/0 = 0 -5:24/0 = 0 -6:24/0 = 0 -7:24/0 = 0 -8:24/0 = 0 -9:24/0 = 0 -10:24/0 = 0 -11:24/0 = 0 -12:24/0 = 0 -13:24/0 = 0 -14:24/0 = 0 -15:24/0 = 0 -16:24/0 = 0 -17:24/0 = 0 -18:24/0 = 0 -19:24/0 = 0 -20:24/0 = 0 -21:24/0 = 0 -22:24/0 = 0 -23:24/0 = 0 -24:24/0 = 0 -25:24/0 = 0 -26:24/0 = 0 -27:24/0 = 0 -28:24/0 = 0 -29:24/0 = 0 -30:24/0 = 0 -31:24/0 = 0 -32:24/0 = 0 [resource] -tile_size = Vector2i(48, 48) -sources/0 = SubResource("TileSetAtlasSource_5lppa") +tile_size = Vector2i(100, 100) +sources/1 = SubResource("TileSetAtlasSource_5lppa") diff --git a/scenes/strategy_phase.tscn b/scenes/strategy_phase.tscn index 3e67b3e..0bfbfff 100644 --- a/scenes/strategy_phase.tscn +++ b/scenes/strategy_phase.tscn @@ -24,7 +24,6 @@ script = ExtResource("6_combat") [node name="Camera2D" type="Camera2D" parent="." unique_id=1739569732] position = Vector2(384, 216) -zoom = Vector2(1.5, 1.5) script = ExtResource("4_ww3c6") [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." unique_id=1057500234] diff --git a/scenes/test_scene.tscn b/scenes/test_scene.tscn index 7c0a603..8b71cb2 100644 --- a/scenes/test_scene.tscn +++ b/scenes/test_scene.tscn @@ -1,9 +1,43 @@ -[gd_scene format=3 uid="uid://b7hhdysqqmx4y"] +[gd_scene format=4 uid="uid://b7hhdysqqmx4y"] +[ext_resource type="Texture2D" uid="uid://65rmoynep5hy" path="res://assets/sprites/MP000A.BMP" id="1_7ddre"] [ext_resource type="Texture2D" uid="uid://c7e4jw4xcti0q" path="res://assets/sprites/castle_spritesheet.png" id="1_g7g4h"] [ext_resource type="Shader" uid="uid://dakre5usldk6r" path="res://shaders/masked_palette_swap.gdshader" id="1_nd71p"] [ext_resource type="Texture2D" uid="uid://b8td6sv5re6r8" path="res://assets/sprites/grey_castle_spritesheet_mask.bmp" id="2_7ddre"] +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_qjeyg"] +texture = ExtResource("1_7ddre") +texture_region_size = Vector2i(100, 100) +0:0/0 = 0 +1:0/0 = 0 +2:0/0 = 0 +3:0/0 = 0 +4:0/0 = 0 +0:1/0 = 0 +1:1/0 = 0 +2:1/0 = 0 +3:1/0 = 0 +4:1/0 = 0 +0:2/0 = 0 +1:2/0 = 0 +2:2/0 = 0 +3:2/0 = 0 +4:2/0 = 0 +0:3/0 = 0 +1:3/0 = 0 +2:3/0 = 0 +3:3/0 = 0 +4:3/0 = 0 +0:4/0 = 0 +1:4/0 = 0 +2:4/0 = 0 +3:4/0 = 0 +4:4/0 = 0 + +[sub_resource type="TileSet" id="TileSet_3qnke"] +tile_size = Vector2i(100, 100) +sources/0 = SubResource("TileSetAtlasSource_qjeyg") + [sub_resource type="ShaderMaterial" id="ShaderMaterial_qjeyg"] shader = ExtResource("1_nd71p") shader_parameter/flag_mask = ExtResource("2_7ddre") @@ -16,6 +50,11 @@ region = Rect2(0, 100, 100, 100) [node name="TestScene" type="Node2D" unique_id=1687841395] +[node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=265586128] +tile_map_data = PackedByteArray("AAD+//7/AAAAAAAAAAD+////AAAAAAEAAAD+/wAAAAAAAAIAAAD+/wEAAAAAAAMAAAD+/wIAAAAAAAQAAAD///7/AAABAAAAAAD/////AAABAAEAAAD//wAAAAABAAIAAAD//wEAAAABAAMAAAD//wIAAAABAAQAAAAAAP7/AAACAAAAAAAAAP//AAACAAEAAAAAAAAAAAACAAIAAAAAAAEAAAACAAMAAAAAAAIAAAACAAQAAAABAP7/AAADAAAAAAABAP//AAADAAEAAAABAAAAAAADAAIAAAABAAEAAAADAAMAAAABAAIAAAADAAQAAAACAP7/AAAEAAAAAAACAP//AAAEAAEAAAACAAAAAAAEAAIAAAACAAEAAAAEAAMAAAACAAIAAAAEAAQAAAADAP7/AAAAAAAAAAADAP//AAAAAAEAAAADAAAAAAAAAAIAAAADAAEAAAAAAAMAAAADAAIAAAAAAAQAAAAEAP7/AAABAAAAAAAEAP//AAABAAEAAAAEAAAAAAABAAIAAAAEAAEAAAABAAMAAAAEAAIAAAABAAQAAAAFAP7/AAACAAAAAAAFAP//AAACAAEAAAAFAAAAAAACAAIAAAAFAAEAAAACAAMAAAAFAAIAAAACAAQAAAAGAP7/AAADAAAAAAAGAP//AAADAAEAAAAGAAAAAAADAAIAAAAGAAEAAAADAAMAAAAGAAIAAAADAAQAAAAHAP7/AAAEAAAAAAAHAP//AAAEAAEAAAAHAAAAAAAEAAIAAAAHAAEAAAAEAAMAAAAHAAIAAAAEAAQAAAA=") +tile_set = SubResource("TileSet_3qnke") + [node name="Sprite2D" type="Sprite2D" parent="." unique_id=1997336331] material = SubResource("ShaderMaterial_qjeyg") +position = Vector2(-150, -148) texture = SubResource("AtlasTexture_j8ivh") diff --git a/scenes/vn_scene.tscn b/scenes/vn_scene.tscn new file mode 100644 index 0000000..aff97b3 --- /dev/null +++ b/scenes/vn_scene.tscn @@ -0,0 +1,9 @@ +[gd_scene format=3 uid="uid://dsg3pxopc0fab"] + +[node name="VnScene" type="Control" unique_id=74039790] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 diff --git a/shaders/chroma_key.gdshader b/shaders/chroma_key.gdshader index ba41358..307b192 100644 --- a/shaders/chroma_key.gdshader +++ b/shaders/chroma_key.gdshader @@ -1,11 +1,12 @@ shader_type canvas_item; +uniform vec4 key_color : source_color = vec4(0.0, 0.0, 0.0, 1.0); uniform float threshold : hint_range(0.0, 1.0) = 0.01; void fragment() { vec4 tex_color = texture(TEXTURE, UV); - float brightness = max(tex_color.r, max(tex_color.g, tex_color.b)); - if (brightness < threshold) { + float dist = distance(tex_color.rgb, key_color.rgb); + if (dist < threshold) { discard; } COLOR = tex_color * COLOR;