Merge remote-tracking branch 'origin/master' into dev_adri

# Conflicts: # real_deal/scenes/duel/DuelEnemy.tscn # real_deal/scenes/duel/DuelManager.tscn
guluc3m · Jul 26, 2021 · 413488f · 413488f
2 parents d675fd2 + 52b3fea
commit 413488f
Show file tree

Hide file tree

Showing 61 changed files with 1,173 additions and 920 deletions.
diff --git a/assets/prototipos/elementos/items/berry.png b/assets/prototipos/elementos/items/berry.png
diff --git a/assets/prototipos/enemigos/enemy_slime_normal.png b/assets/prototipos/enemigos/enemy_slime_normal.png
diff --git a/assets/prototipos/escena/Batalla/battle_background.png b/assets/prototipos/escena/Batalla/battle_background.png
diff --git a/assets/prototipos/escena/Batalla/battle_example.png b/assets/prototipos/escena/Batalla/battle_example.png
diff --git a/assets/prototipos/escena/Batalla/battle_template.png b/assets/prototipos/escena/Batalla/battle_template.png
diff --git a/assets/prototipos/escena/Batalla/boss_battle_background.png b/assets/prototipos/escena/Batalla/boss_battle_background.png
diff --git a/assets/prototipos/escena/Batalla/deck_pile.png b/assets/prototipos/escena/Batalla/deck_pile.png
diff --git a/assets/prototipos/escena/Batalla/deck_pile_1.png b/assets/prototipos/escena/Batalla/deck_pile_1.png
diff --git a/assets/prototipos/escena/Batalla/deck_pile_2.png b/assets/prototipos/escena/Batalla/deck_pile_2.png
diff --git a/assets/prototipos/escena/Batalla/discard_icon.png b/assets/prototipos/escena/Batalla/discard_icon.png
diff --git a/assets/prototipos/escena/Batalla/hud.png b/assets/prototipos/escena/Batalla/hud.png
diff --git a/assets/prototipos/escena/Batalla/status_icon.png b/assets/prototipos/escena/Batalla/status_icon.png
diff --git a/assets/prototipos/personaje/Prototipo Final/lateral_izq.png b/assets/prototipos/personaje/Prototipo Final/lateral_izq.png
diff --git a/dani_sandbox/scenes/menu/Personalizar.tscn b/dani_sandbox/scenes/menu/Personalizar.tscn
@@ -4,7 +4,7 @@
 [ext_resource path="res://dani_sandbox/scripts/menu/CharactertMenu_a.gd" type="Script" id=2]
 [ext_resource path="res://assets/sprites/cards_ilustrations/ilustration_placeholder.png" type="Texture" id=3]
 
-[node name="HUD" type="CanvasLayer"]
+[node name="Inventary" type="CanvasLayer"]
 script = ExtResource( 2 )
 
 [node name="Container" type="MarginContainer" parent="."]

diff --git a/dani_sandbox/scripts/menu/CartaColeccion_a.gd b/dani_sandbox/scripts/menu/CartaColeccion_a.gd
@@ -1,12 +1,17 @@
 extends Control
 
-signal a_mazo;
+signal a_mazo
+
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	pass # Replace with function body.
 
 
+func init_image(card_tpye: String):
+	pass
+
+
 func _on_CartaColeccion_gui_input(event):
 	""" Evento para saber cuándo el usuario hace click o hace click derecho en la carta
 	"""

diff --git a/dani_sandbox/scripts/menu/CartaMazo_a.gd b/dani_sandbox/scripts/menu/CartaMazo_a.gd
@@ -7,6 +7,10 @@ func _ready():
 	pass # Replace with function body.
 
 
+func init_image(card_tpye: String):
+	pass
+
+
 func _on_CartaMazo_gui_input(event):
 	""" Evento para saber cuándo el usuario hace click y así eliminarla (visualmente)
 		del mazo.

diff --git a/real_deal/scenes/exploration/actors/Chest.tscn b/real_deal/scenes/exploration/actors/Chest.tscn
diff --git a/real_deal/scenes/exploration/actors/Enemy.tscn b/real_deal/scenes/exploration/actors/Enemy.tscn
diff --git a/real_deal/scenes/exploration/actors/Player.tscn b/real_deal/scenes/exploration/actors/Player.tscn