diff --git a/assets/sprites/CardDefaultBack.png.import b/assets/sprites/CardDefaultBack.png.import index 714bd438..d9db4ca1 100644 --- a/assets/sprites/CardDefaultBack.png.import +++ b/assets/sprites/CardDefaultBack.png.import @@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/CardDefaultBack.png-c0e9e099c0bd5c564564aefd4 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 @@ -25,6 +27,10 @@ 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 diff --git a/assets/sprites/CardDefaultFront.png.import b/assets/sprites/CardDefaultFront.png.import index 933e5b1b..fe37756f 100644 --- a/assets/sprites/CardDefaultFront.png.import +++ b/assets/sprites/CardDefaultFront.png.import @@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/CardDefaultFront.png-2f862b9f86fbb3d5c6031748 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 @@ -25,6 +27,10 @@ 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 diff --git a/assets/tile_maps/background_tile_map.tres b/assets/tile_maps/background_tile_map.tres new file mode 100644 index 00000000..1589c038 --- /dev/null +++ b/assets/tile_maps/background_tile_map.tres @@ -0,0 +1,12 @@ +[gd_resource type="TileSet" format=3 uid="uid://xv6ga63vi51o"] + +[ext_resource type="Texture2D" uid="uid://vk4fpd7xo01j" path="res://assets/sprites/Axuree/wood_medium.png" id="1_8wb7c"] + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_ycubg"] +texture = ExtResource("1_8wb7c") +texture_region_size = Vector2i(2048, 2048) +0:0/0 = 0 + +[resource] +tile_size = Vector2i(2048, 2048) +sources/0 = SubResource("TileSetAtlasSource_ycubg") diff --git a/entities/game/card_template/scenes/CardTemplate.tscn b/entities/game/card_template/scenes/CardTemplate.tscn index 18bcf557..200195f1 100644 --- a/entities/game/card_template/scenes/CardTemplate.tscn +++ b/entities/game/card_template/scenes/CardTemplate.tscn @@ -105,7 +105,6 @@ target_offset = Vector2(13, 13) animation_time = 0.1 [node name="CardBackground" type="NinePatchRect" parent="CardContentGroup" unique_id=589517874 groups=["card_content"]] -visible = false offset_right = 500.0 offset_bottom = 500.0 texture = SubResource("AtlasTexture_h72da") diff --git a/entities/game/memory_game/scenes/MemoryGame.tscn b/entities/game/memory_game/scenes/MemoryGame.tscn index 4734c8f1..eaae41cc 100644 --- a/entities/game/memory_game/scenes/MemoryGame.tscn +++ b/entities/game/memory_game/scenes/MemoryGame.tscn @@ -1,4 +1,4 @@ -[gd_scene format=3 uid="uid://bnfr8gek24m47"] +[gd_scene format=4 uid="uid://bnfr8gek24m47"] [ext_resource type="Script" uid="uid://bhgb4virmkji8" path="res://entities/game/memory_game/scripts/MemoryGame.gd" id="1_13jq5"] [ext_resource type="Resource" uid="uid://cnl5uxkf36ely" path="res://shared/resources/translations/assets/TurnEndBannerMessage.tres" id="2_fspeh"] @@ -11,7 +11,6 @@ [ext_resource type="Script" uid="uid://cetyf2kvhh70r" path="res://entities/game/memory_game/scripts/Systems.gd" id="7_8jbv8"] [ext_resource type="PackedScene" uid="uid://d0vijthhc3d38" path="res://entities/game/players_overlay/scenes/PlayersOverlay.tscn" id="7_a7rnv"] [ext_resource type="Script" uid="uid://bmwi41kseslkw" path="res://entities/game/memory_game/scripts/systems/GameStateSystem.gd" id="7_j82c0"] -[ext_resource type="Script" uid="uid://bglvkbo4aydsy" path="res://entities/game/memory_game/scripts/Background.gd" id="7_kxmqb"] [ext_resource type="Script" uid="uid://bxrsfyvew4ysu" path="res://entities/game/memory_game/scripts/systems/PlayerInputSystem.gd" id="9_86hnd"] [ext_resource type="Texture2D" uid="uid://dat3kg2y636js" path="res://assets/icons/MenuIcon.tres" id="11_da0ji"] [ext_resource type="PackedScene" uid="uid://cluwm03j8e11p" path="res://entities/game/game_pause_menu/scenes/GamePauseMenu.tscn" id="12_dfx06"] @@ -27,9 +26,9 @@ [ext_resource type="Texture2D" uid="uid://b6xl5vukmvlku" path="res://assets/icons/AddIcon.tres" id="18_pqxyo"] [ext_resource type="Script" uid="uid://xiyurpjwgjnn" path="res://entities/game/memory_game/scripts/GameCardGrid.gd" id="19_ploi3"] [ext_resource type="Texture2D" uid="uid://bjgikbiemswhu" path="res://assets/icons/MinusIcon.tres" id="20_ef4f6"] +[ext_resource type="TileSet" uid="uid://xv6ga63vi51o" path="res://assets/tile_maps/background_tile_map.tres" id="21_6nsk4"] [ext_resource type="Script" uid="uid://6fa28680utd5" path="res://shared/entities/popup_manager/scripts/PopupSystem.gd" id="21_dv4ao"] [ext_resource type="PackedScene" uid="uid://d15qeu4s4bgjk" path="res://entities/game/tutorial_window/scenes/TutorialWindow.tscn" id="22_ubsrg"] -[ext_resource type="Texture2D" uid="uid://vk4fpd7xo01j" path="res://assets/sprites/Axuree/wood_medium.png" id="23_a3528"] [ext_resource type="Script" uid="uid://cf8loyigibdp6" path="res://entities/game/memory_game/scripts/CardInteractionField.gd" id="27_7lv0s"] [ext_resource type="PackedScene" uid="uid://0m4c62oqj4ih" path="res://entities/game/card_collider/scene/CardCollider.tscn" id="28_7ou1n"] [ext_resource type="AudioStream" uid="uid://x7uoopn87syx" path="res://assets/audio/effect/card-shove-1.ogg" id="28_ycubg"] @@ -131,12 +130,14 @@ metadata/_custom_type_script = "uid://b34wu88vlg03e" [node name="World" type="Node2D" parent="." unique_id=997333008] unique_name_in_owner = true -[node name="Background" type="Node2D" parent="World" unique_id=344852813 node_paths=PackedStringArray("camera_node")] -visible = false -z_index = -20 -script = ExtResource("7_kxmqb") -background_texture = ExtResource("23_a3528") -camera_node = NodePath("../Camera2D") +[node name="TileMapLayer" type="TileMapLayer" parent="World" unique_id=974175227] +z_index = -4096 +z_as_relative = false +tile_map_data = PackedByteArray("AAD8//3/AAAAAAAAAAD9//3/AAAAAAAAAAD+//3/AAAAAAAAAAD///3/AAAAAAAAAAAAAP3/AAAAAAAAAAABAP3/AAAAAAAAAAACAP3/AAAAAAAAAAADAP3/AAAAAAAAAAAEAP3/AAAAAAAAAAAEAP7/AAAAAAAAAAAEAP//AAAAAAAAAAAEAAAAAAAAAAAAAAAEAAEAAAAAAAAAAAAEAAIAAAAAAAAAAAAEAAMAAAAAAAAAAAADAAMAAAAAAAAAAAACAAMAAAAAAAAAAAABAAMAAAAAAAAAAAAAAAMAAAAAAAAAAAD//wMAAAAAAAAAAAD+/wMAAAAAAAAAAAD9/wMAAAAAAAAAAAD8/wMAAAAAAAAAAAD7/wMAAAAAAAAAAAD7//3/AAAAAAAAAAD7//7/AAAAAAAAAAD7////AAAAAAAAAAD7/wAAAAAAAAAAAAD7/wEAAAAAAAAAAAD7/wIAAAAAAAAAAAD8/wIAAAAAAAAAAAD9/wIAAAAAAAAAAAD+/wIAAAAAAAAAAAD//wIAAAAAAAAAAAAAAAIAAAAAAAAAAAABAAIAAAAAAAAAAAACAAIAAAAAAAAAAAADAAIAAAAAAAAAAAADAAEAAAAAAAAAAAADAAAAAAAAAAAAAAADAP//AAAAAAAAAAADAP7/AAAAAAAAAAACAP7/AAAAAAAAAAABAP7/AAAAAAAAAAAAAP7/AAAAAAAAAAD///7/AAAAAAAAAAD+//7/AAAAAAAAAAD9//7/AAAAAAAAAAD8//7/AAAAAAAAAAD8////AAAAAAAAAAD8/wAAAAAAAAAAAAD8/wEAAAAAAAAAAAD9/wEAAAAAAAAAAAD+/wEAAAAAAAAAAAD//wEAAAAAAAAAAAAAAAEAAAAAAAAAAAABAAEAAAAAAAAAAAACAAAAAAAAAAAAAAACAP//AAAAAAAAAAABAP//AAAAAAAAAAD/////AAAAAAAAAAD+////AAAAAAAAAAD9////AAAAAAAAAAD9/wAAAAAAAAAAAAD+/wAAAAAAAAAAAAD//wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AAAAAAAAAAABAAAAAAAAAAAAAAACAAEAAAAAAAAAAAD7/wQAAAAAAAAAAAD7//z/AAAAAAAAAAD8//z/AAAAAAAAAAD9//z/AAAAAAAAAAD+//z/AAAAAAAAAAD///z/AAAAAAAAAAAAAPz/AAAAAAAAAAABAPz/AAAAAAAAAAACAPz/AAAAAAAAAAADAPz/AAAAAAAAAAAEAPz/AAAAAAAAAAAEAAQAAAAAAAAAAAADAAQAAAAAAAAAAAACAAQAAAAAAAAAAAABAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAD//wQAAAAAAAAAAAD+/wQAAAAAAAAAAAD9/wQAAAAAAAAAAAD8/wQAAAAAAAAAAAAGAPz/AAAAAAAAAAAGAP3/AAAAAAAAAAAGAP7/AAAAAAAAAAAGAP//AAAAAAAAAAAGAAAAAAAAAAAAAAAGAAEAAAAAAAAAAAAGAAIAAAAAAAAAAAAGAAMAAAAAAAAAAAAGAAQAAAAAAAAAAAAFAAMAAAAAAAAAAAAFAAIAAAAAAAAAAAAFAAEAAAAAAAAAAAAFAAAAAAAAAAAAAAAFAP//AAAAAAAAAAAFAP7/AAAAAAAAAAAFAP3/AAAAAAAAAAAFAPz/AAAAAAAAAAAFAAQAAAAAAAAAAAD6/wQAAAAAAAAAAAD5/wQAAAAAAAAAAAD5/wMAAAAAAAAAAAD5/wIAAAAAAAAAAAD5/wEAAAAAAAAAAAD5/wAAAAAAAAAAAAD5////AAAAAAAAAAD5//7/AAAAAAAAAAD5//3/AAAAAAAAAAD5//z/AAAAAAAAAAD6//z/AAAAAAAAAAD6//3/AAAAAAAAAAD6//7/AAAAAAAAAAD6////AAAAAAAAAAD6/wAAAAAAAAAAAAD6/wEAAAAAAAAAAAD6/wIAAAAAAAAAAAD6/wMAAAAAAAAAAAA=") +tile_set = ExtResource("21_6nsk4") +rendering_quadrant_size = 4 +physics_quadrant_size = 1 +navigation_enabled = false [node name="CardBoard" type="Node2D" parent="World" unique_id=2054375941 node_paths=PackedStringArray("state_machine", "visual_card_node")] unique_name_in_owner = true @@ -265,7 +266,6 @@ debug_functions = Array[ExtResource("34_4hsit")]([SubResource("Resource_8rpam")] [connection signal="state_changed" from="Systems/GameStateSystem" to="Systems/AiAgentSystem" method="game_state_changed"] [connection signal="state_changed" from="Systems/GameStateSystem" to="Systems/PlayerInputSystem" method="game_state_changed"] [connection signal="state_changed" from="Systems/GameStateSystem" to="Systems/NetworkHandlerSystem" method="game_state_changed"] -[connection signal="state_changed" from="Systems/GameStateSystem" to="World/Background" method="game_state_changed"] [connection signal="state_changed" from="Systems/GameStateSystem" to="World/CardBoard" method="game_state_changed"] [connection signal="state_changed" from="Systems/GameStateSystem" to="World/CardBoard/CardInteractionField" method="game_state_changed"] [connection signal="state_changed" from="Systems/GameStateSystem" to="World/Camera2D" method="game_state_changed"] diff --git a/entities/game/memory_game/scripts/Background.gd b/entities/game/memory_game/scripts/Background.gd deleted file mode 100644 index 96e949fc..00000000 --- a/entities/game/memory_game/scripts/Background.gd +++ /dev/null @@ -1,45 +0,0 @@ -extends Node2D - -@export var number_x: int = 20 -@export var number_y: int = 16 -@export var background_texture: Texture2D -@export var camera_node: Camera2D - -var background_pool_node: Node2D -var screen_width: float -var screen_height: float - -func _ready() -> void: - background_pool_node = Node2D.new() - background_pool_node.global_position = camera_node.global_position - background_pool_node.name = "background_pool" - add_child(background_pool_node) - - fill_screen() - -func fill_screen() -> void: - var x_start_pos: float = number_x / 2.0 * background_texture.get_width() - var y_start_pos: float = number_y / 2.0 * background_texture.get_width() - var start_pos: Vector2 = Vector2(-x_start_pos, -y_start_pos) - for x: int in number_x: - for y: int in number_y: - var x_pos: float = start_pos.x + background_texture.get_width() * x - var y_pos: float = start_pos.y + background_texture.get_height() * y - var new_position: Vector2 = Vector2(x_pos, y_pos) - - var node: Sprite2D = create_new_sprite() - background_pool_node.add_child(node) - node.global_position = new_position - node.name = str(x) + "/" + str(y) - node.visible = true - -func create_new_sprite() -> Sprite2D: - var sprite: Sprite2D = Sprite2D.new() - sprite.texture = background_texture - sprite.position = Vector2.ZERO - - return sprite - -func game_state_changed(new_state: GameEnum.State) -> void: - if new_state == GameEnum.State.TURN_START and not visible: - visible = true \ No newline at end of file diff --git a/entities/game/memory_game/scripts/Background.gd.uid b/entities/game/memory_game/scripts/Background.gd.uid deleted file mode 100644 index d8398a8b..00000000 --- a/entities/game/memory_game/scripts/Background.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://bglvkbo4aydsy diff --git a/entities/ui/menu_background/scenes/MenuBackground.tscn b/entities/ui/menu_background/scenes/MenuBackground.tscn index fc46aeda..ff0816c2 100644 --- a/entities/ui/menu_background/scenes/MenuBackground.tscn +++ b/entities/ui/menu_background/scenes/MenuBackground.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=2 format=3 uid="uid://cgqyilfj4ggfa"] +[gd_scene format=3 uid="uid://cgqyilfj4ggfa"] [ext_resource type="Texture2D" uid="uid://vk4fpd7xo01j" path="res://assets/sprites/Axuree/wood_medium.png" id="1_82j7h"] -[node name="MenuBackground" type="Control"] +[node name="MenuBackground" type="Control" unique_id=1942483075] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -10,7 +10,7 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -[node name="TextureRect" type="TextureRect" parent="."] +[node name="TextureRect" type="TextureRect" parent="." unique_id=1236795620] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 diff --git a/export_presets.cfg b/export_presets.cfg index 5174ae40..c9c3b0a1 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -415,8 +415,8 @@ custom_template/debug="" custom_template/release="" variant/extensions_support=false variant/thread_support=false -vram_texture_compression/for_desktop=true -vram_texture_compression/for_mobile=false +vram_texture_compression/for_desktop=false +vram_texture_compression/for_mobile=true html/export_icon=true html/custom_html_shell="" html/head_include="" diff --git a/project.godot b/project.godot index 8779b60f..bcff2b31 100644 --- a/project.godot +++ b/project.godot @@ -15,7 +15,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true [application] config/name="Samory" -config/version="0.20.5" +config/version="0.20.6" config/tags=PackedStringArray("public") run/main_scene="res://shared/global_entities/game_manager/scenes/GameManager.tscn" config/features=PackedStringArray("4.7", "GL Compatibility")