Skip to content

Commit

Permalink
lógica y early stage de los items
Browse files Browse the repository at this point in the history
  • Loading branch information
Patataman committed Jul 12, 2021
1 parent 742f6d4 commit ec1563e
Show file tree
Hide file tree
Showing 36 changed files with 464 additions and 854 deletions.
Binary file modified assets/prototipos/enemigos/enemy_slime_normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 7 additions & 4 deletions real_deal/scenes/duel/DuelEnemy.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 108.893, 93.6324 )

[node name="Battle_Enemy_Swampy" type="Area2D"]
[node name="Battle_Enemy" type="Area2D"]
scale = Vector2( 2, 2 )
script = ExtResource( 1 )

Expand All @@ -19,6 +19,9 @@ flip_h = true

[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )
__meta__ = {
"_edit_lock_": true
}

[node name="HealthBar" type="TextureProgress" parent="."]
margin_left = -108.505
Expand All @@ -30,7 +33,7 @@ texture_progress = ExtResource( 4 )
__meta__ = {
"_edit_use_anchors_": false
}
[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="card_target" from="." to="." method="_on_Battle_Enemy_card_target"]
[connection signal="not_card_target" from="." to="." method="_on_Battle_Enemy_not_card_target"]
[connection signal="playCard" from="." to="." method="_on_Battle_Enemy_playCard"]
[connection signal="animation_finished" from="Character" to="." method="_on_Character_animation_finished"]
14 changes: 10 additions & 4 deletions real_deal/scenes/duel/DuelManager.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,18 @@ anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 3 )
__meta__ = {
"_edit_lock_": true
"_edit_lock_": true,
"_edit_vertical_guides_": [ 539.699 ]
}

[node name="MouseCollision" parent="." instance=ExtResource( 1 )]
position = Vector2( 1380.94, 168.19 )

[node name="Fondo" type="Node2D" parent="."]
position = Vector2( 27.7183, 0 )
__meta__ = {
"_edit_group_": true
}

[node name="Base" type="TileMap" parent="Fondo"]
scale = Vector2( 0.5, 0.5 )
Expand Down Expand Up @@ -79,13 +85,13 @@ position = Vector2( 1380.94, 299.762 )
[node name="Enemigos" type="Node" parent="."]

[node name="Enemy_0" type="Position2D" parent="Enemigos"]
position = Vector2( 516.433, 241.43 )
position = Vector2( 539.699, 234.756 )

[node name="Enemy_1" type="Position2D" parent="Enemigos"]
position = Vector2( 192.042, 265.002 )
position = Vector2( 184.033, 267.247 )

[node name="Enemy_2" type="Position2D" parent="Enemigos"]
position = Vector2( 819.498, 267.247 )
position = Vector2( 836.851, 267.247 )
[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"]
Expand Down
78 changes: 0 additions & 78 deletions real_deal/scenes/exploration/actors/Chest.tscn

This file was deleted.

45 changes: 0 additions & 45 deletions real_deal/scenes/exploration/actors/Enemy.tscn

This file was deleted.

72 changes: 0 additions & 72 deletions real_deal/scenes/exploration/actors/Player.tscn

This file was deleted.

Loading

0 comments on commit ec1563e

Please sign in to comment.