New duel scene

export_presets.cfg

@@ -0,0 +1,42 @@
+[preset.0]
+
+name="Test"
+platform="Windows Desktop"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter="**/*.json"
+exclude_filter=""
+export_path="../morgana.exe"
+patch_list=PoolStringArray(  )
+script_export_mode=1
+script_encryption_key=""
+
+[preset.0.options]
+
+texture_format/bptc=false
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+texture_format/no_bptc_fallbacks=true
+binary_format/64_bits=true
+binary_format/embed_pck=false
+custom_template/release=""
+custom_template/debug=""
+codesign/enable=false
+codesign/identity_type=0
+codesign/identity=""
+codesign/password=""
+codesign/timestamp=true
+codesign/timestamp_server_url=""
+codesign/digest_algorithm=1
+codesign/description=""
+codesign/custom_options=PoolStringArray(  )
+application/icon=""
+application/file_version=""
+application/product_version=""
+application/company_name=""
+application/product_name=""
+application/file_description=""
+application/copyright=""
+application/trademarks=""

project.godot

@@ -93,6 +93,10 @@ EnemiesDatabase="*res://real_deal/scripts/utils/enemies_database.gd"
 
 [display]
 
+window/size/width=1920
+window/size/height=1080
+window/size/test_width=1280
+window/size/test_height=720
 window/stretch/mode="2d"
 window/stretch/aspect="keep"
 

real_deal/scenes/duel/DuelEnemy.tscn

@@ -1,36 +1,98 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://real_deal/scripts/duel/DuelEnemy.gd" type="Script" id=1]
 [ext_resource path="res://assets/animations/slime_normal.tres" type="SpriteFrames" id=2]
 [ext_resource path="res://assets/gris.png" type="Texture" id=3]
 [ext_resource path="res://assets/rojo.png" type="Texture" id=4]
+[ext_resource path="res://assets/fonts/Comfortaa-Bold.ttf" type="DynamicFontData" id=5]
 
-[sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 108.893, 93.6324 )
+[sub_resource type="CircleShape2D" id=1]
+radius = 17.6002
 
-[node name="Battle_Enemy_Swampy" type="Area2D"]
-scale = Vector2( 2, 2 )
+[sub_resource type="DynamicFont" id=2]
+font_data = ExtResource( 5 )
+
+[node name="DuelEnemy" type="Area2D"]
 script = ExtResource( 1 )
 
 [node name="Character" type="AnimatedSprite" parent="."]
+position = Vector2( 213.862, 309.96 )
+scale = Vector2( 1.6473, 1.6473 )
 frames = ExtResource( 2 )
 animation = "idle"
 flip_h = true
+__meta__ = {
+"_editor_description_": ""
+}
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-shape = SubResource( 1 )
+[node name="HealthBarContainer" type="MarginContainer" parent="."]
+margin_right = 432.0
+margin_bottom = 570.0
+custom_constants/margin_top = 515
+custom_constants/margin_bottom = 40
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Container" type="CenterContainer" parent="HealthBarContainer"]
+margin_top = 515.0
+margin_right = 432.0
+margin_bottom = 530.0
 
-[node name="HealthBar" type="TextureProgress" parent="."]
-margin_left = -108.505
-margin_top = 83.9132
-margin_right = 108.495
-margin_bottom = 98.9132
+[node name="HealthBar" type="TextureProgress" parent="HealthBarContainer/Container"]
+margin_left = 107.0
+margin_right = 324.0
+margin_bottom = 15.0
+value = 20.0
 texture_under = ExtResource( 3 )
 texture_progress = ExtResource( 4 )
 __meta__ = {
+"_editor_description_": ""
+}
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2( 222, 320 )
+scale = Vector2( 10, 10 )
+shape = SubResource( 1 )
+
+[node name="NameContainer" type="MarginContainer" parent="."]
+margin_right = 432.0
+margin_bottom = 570.0
+custom_constants/margin_top = 415
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Name" type="Label" parent="NameContainer"]
+margin_top = 483.0
+margin_right = 432.0
+margin_bottom = 502.0
+mouse_default_cursor_shape = 2
+custom_fonts/font = SubResource( 2 )
+text = "DefaultName"
+align = 1
+valign = 1
+__meta__ = {
+"_edit_use_anchors_": false,
+"_editor_description_": ""
+}
+
+[node name="StatesContainer" type="MarginContainer" parent="."]
+margin_right = 432.0
+margin_bottom = 570.0
+custom_constants/margin_top = 535
+__meta__ = {
 "_edit_use_anchors_": false
 }
+
+[node name="States" type="HBoxContainer" parent="StatesContainer"]
+margin_top = 535.0
+margin_right = 432.0
+margin_bottom = 570.0
+custom_constants/separation = 2
+
+[node name="EnemyLeftPosition" type="Position2D" parent="."]
+position = Vector2( 216, 470 )
 [connection signal="card_target" from="." to="." method="_on_Battle_Enemy_Swampy_card_target"]
 [connection signal="not_card_target" from="." to="." method="_on_Battle_Enemy_Swampy_not_card_target"]
-[connection signal="playCard" from="." to="." method="_on_Battle_Enemy_Swampy_playCard"]
 [connection signal="animation_finished" from="Character" to="." method="_on_Character_animation_finished"]

real_deal/scenes/duel/DuelManager.tscn

@@ -1,10 +1,22 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=12 format=2]
 
 [ext_resource path="res://real_deal/scenes/utils/MouseCollision.tscn" type="PackedScene" id=1]
+[ext_resource path="res://assets/prototipos/escena/Duel/battle_background.png" type="Texture" id=2]
 [ext_resource path="res://real_deal/scripts/duel/DuelManager.gd" type="Script" id=3]
 [ext_resource path="res://assets/prototipos/escena_tileset.tres" type="TileSet" id=4]
-[ext_resource path="res://assets/prototipos/characters_sprites/crate.png" type="Texture" id=5]
-[ext_resource path="res://real_deal/scenes/duel/DuelLife.tscn" type="PackedScene" id=6]
+[ext_resource path="res://real_deal/scripts/duel/DuelLife.gd" type="Script" id=5]
+[ext_resource path="res://assets/prototipos/escena/Duel/deck_pile.png" type="Texture" id=6]
+[ext_resource path="res://assets/prototipos/escena/Duel/battle_template.png" type="Texture" id=7]
+[ext_resource path="res://assets/prototipos/escena/Duel/hud.png" type="Texture" id=8]
+
+[sub_resource type="RectangleShape2D" id=1]
+extents = Vector2( 265, 115 )
+
+[sub_resource type="StyleBoxFlat" id=4]
+bg_color = Color( 0.184314, 0.678431, 0.027451, 1 )
+
+[sub_resource type="StyleBoxFlat" id=3]
+bg_color = Color( 0.219608, 0, 0.356863, 1 )
 
 [node name="Main" type="Control"]
 anchor_right = 1.0
@@ -18,7 +30,17 @@ __meta__ = {
 
 [node name="Fondo" type="Node2D" parent="."]
 
+[node name="BackgroundGuide" type="Sprite" parent="Fondo"]
+visible = false
+texture = ExtResource( 7 )
+centered = false
+
+[node name="Background" type="Sprite" parent="Fondo"]
+texture = ExtResource( 2 )
+centered = false
+
 [node name="Base" type="TileMap" parent="Fondo"]
+visible = false
 scale = Vector2( 0.5, 0.5 )
 tile_set = ExtResource( 4 )
 cell_size = Vector2( 400, 400 )
@@ -27,6 +49,7 @@ format = 1
 tile_data = PoolIntArray( 0, 8, 0, 1, 8, 0, 2, 8, 0, 3, 8, 0, 4, 8, 0, 5, 8, 0, 131071, 8, 0, 65536, 8, 0, 65537, 8, 0, 65538, 8, 0, 65539, 8, 0, 65540, 8, 0, 65541, 8, 0, 196607, 8, 0, 131072, 8, 0, 131073, 8, 0, 131074, 8, 0, 131075, 8, 0, 131076, 8, 0, 131077, 8, 0, 262143, 8, 0, 196608, 8, 0, 196609, 8, 0, 196610, 8, 0, 196611, 8, 0, 196612, 8, 0, 196613, 8, 0 )
 
 [node name="Nubes" type="TileMap" parent="Fondo"]
+visible = false
 scale = Vector2( 0.5, 0.5 )
 tile_set = ExtResource( 4 )
 cell_size = Vector2( 400, 400 )
@@ -37,56 +60,84 @@ tile_data = PoolIntArray( 65535, 15, 0, 0, 15, 0, 1, 11, 0, 2, 10, 0, 3, 13, 0,
 [node name="UI_Elements_left" type="MarginContainer" parent="."]
 anchor_top = 1.0
 anchor_bottom = 1.0
-margin_left = 27.7183
-margin_top = -84.6965
-margin_right = 55.7183
-margin_bottom = -56.6965
-rect_scale = Vector2( 2, 2 )
+margin_top = -231.0
+margin_right = 531.0
+rect_min_size = Vector2( 531, 231 )
 __meta__ = {
-"_edit_group_": true,
 "_edit_use_anchors_": false
 }
 
-[node name="Button" type="Button" parent="UI_Elements_left"]
-margin_right = 28.0
-margin_bottom = 28.0
-icon = ExtResource( 5 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
+[node name="Area2D" type="Area2D" parent="UI_Elements_left"]
+script = ExtResource( 5 )
 
-[node name="Hand" type="Node" parent="."]
+[node name="Sprite" type="Sprite" parent="UI_Elements_left/Area2D"]
+texture = ExtResource( 8 )
+centered = false
 
-[node name="UI_Elements_right" type="MarginContainer" parent="."]
-anchor_left = 1.0
-anchor_top = 1.0
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_left = -50.4169
-margin_top = -109.538
-margin_right = -46.4169
-margin_bottom = -95.5383
-__meta__ = {
-"_edit_group_": true,
-"_edit_use_anchors_": false
-}
+[node name="CollisionShape2D" type="CollisionShape2D" parent="UI_Elements_left/Area2D"]
+position = Vector2( 265, 115 )
+shape = SubResource( 1 )
 
-[node name="ProgressBar" parent="UI_Elements_right" instance=ExtResource( 6 )]
+[node name="BarConatiner" type="MarginContainer" parent="UI_Elements_left"]
+margin_right = 531.0
+margin_bottom = 231.0
+custom_constants/margin_top = 188
 
-[node name="Player" type="Position2D" parent="."]
-position = Vector2( 1380.94, 299.762 )
+[node name="ProgressBar" type="ProgressBar" parent="UI_Elements_left/BarConatiner"]
+margin_top = 188.0
+margin_right = 531.0
+margin_bottom = 218.0
+rect_min_size = Vector2( 500, 30 )
+custom_styles/fg = SubResource( 4 )
+custom_styles/bg = SubResource( 3 )
 
-[node name="Enemigos" type="Node" parent="."]
+[node name="Hand" type="Node" parent="."]
 
-[node name="Enemy_0" type="Position2D" parent="Enemigos"]
-position = Vector2( 516.433, 241.43 )
+[node name="Player" type="Position2D" parent="."]
+position = Vector2( 1380.94, 299.762 )
 
-[node name="Enemy_1" type="Position2D" parent="Enemigos"]
-position = Vector2( 192.042, 265.002 )
+[node name="Enemigos" type="HBoxContainer" parent="."]
+margin_left = 310.0
+margin_top = 75.0
+margin_right = 1610.0
+margin_bottom = 645.0
+rect_min_size = Vector2( 1200, 500 )
+custom_constants/separation = 0
+alignment = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
-[node name="Enemy_2" type="Position2D" parent="Enemigos"]
-position = Vector2( 819.498, 267.247 )
+[node name="Enemy_0" type="CenterContainer" parent="Enemigos"]
+margin_left = 2.0
+margin_right = 434.0
+margin_bottom = 570.0
+rect_min_size = Vector2( 432, 0 )
+
+[node name="Enemy_1" type="CenterContainer" parent="Enemigos"]
+margin_left = 434.0
+margin_right = 866.0
+margin_bottom = 570.0
+rect_min_size = Vector2( 432, 0 )
+
+[node name="Enemy_2" type="CenterContainer" parent="Enemigos"]
+margin_left = 866.0
+margin_right = 1298.0
+margin_bottom = 570.0
+rect_min_size = Vector2( 432, 0 )
+
+[node name="Button" type="Button" parent="."]
+margin_left = 1651.29
+margin_top = 753.142
+margin_right = 1879.29
+margin_bottom = 1050.14
+icon = ExtResource( 6 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 [connection signal="addCard" from="." to="." method="_on_Main_addCard"]
 [connection signal="playCard" from="." to="." method="_on_Main_playCard"]
 [connection signal="removeCard" from="." to="." method="_on_Main_removeCard"]
-[connection signal="pressed" from="UI_Elements_left/Button" to="." method="_on_Button_pressed"]
+[connection signal="card_target" from="UI_Elements_left/Area2D" to="UI_Elements_left/Area2D" method="_on_Area2D_card_target"]
+[connection signal="not_card_target" from="UI_Elements_left/Area2D" to="UI_Elements_left/Area2D" method="_on_Area2D_not_card_target"]
+[connection signal="pressed" from="Button" to="." method="_on_Button_pressed"]

real_deal/scenes/duel/DuelManager_old.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://real_deal/scripts/duel/DuelManager.gd" type="Script" id=1]
 [ext_resource path="res://real_deal/scenes/duel/DuelLife.tscn" type="PackedScene" id=2]
-[ext_resource path="res://real_deal/scenes/duel/DuelHand.tscn" type="PackedScene" id=3]
+[ext_resource path="res://real_deal/scenes/duel/DuelPlayer.tscn" type="PackedScene" id=3]
 [ext_resource path="res://real_deal/scenes/utils/MouseCollision.tscn" type="PackedScene" id=4]
 [ext_resource path="res://assets/prototipos/albertoV_dungeon_background.png" type="Texture" id=5]
 [ext_resource path="res://assets/prototipos/characters_sprites/crate.png" type="Texture" id=6]