From b25e1f040c8eecc6a3df763affaf669145eaf6b7 Mon Sep 17 00:00:00 2001 From: Martin Araneda Date: Fri, 15 Jul 2022 23:04:06 -0400 Subject: [PATCH] minor changes --- godot/levels/Prototype.tscn | 2 +- src/coin/CoinCollected.cpp | 6 +++++- src/coin/CoinCounter.cpp | 5 ++++- src/coin/CoinNotCollected.cpp | 2 ++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/godot/levels/Prototype.tscn b/godot/levels/Prototype.tscn index b6f8afb..b1f265c 100644 --- a/godot/levels/Prototype.tscn +++ b/godot/levels/Prototype.tscn @@ -82,4 +82,4 @@ margin_right = 256.0 margin_bottom = 32.0 text = "##" -[connection signal="ready" from="CoinHUD/Coins" to="Player" method="_on_CoinHUD_ready"] +[connection signal="ready" from="CoinHUD" to="Player" method="_on_CoinHUD_ready"] diff --git a/src/coin/CoinCollected.cpp b/src/coin/CoinCollected.cpp index 65c4a51..7f1f2f2 100644 --- a/src/coin/CoinCollected.cpp +++ b/src/coin/CoinCollected.cpp @@ -2,6 +2,7 @@ #include using namespace godot; +int coin = 0; void CoinCollected::_register_methods() { @@ -25,7 +26,7 @@ void CoinCollected::_init() void CoinCollected::_state_enter() { - + coin = coin + 1; auto node = get_parent()->find_node("AnimationPlayer"); if (node != nullptr) @@ -33,6 +34,7 @@ void CoinCollected::_state_enter() auto animation_player = Object::cast_to(node); animation_player->play("jump"); } + } void CoinCollected::_state_exit() @@ -44,6 +46,8 @@ void CoinCollected::_on_animation_finished(String anim_name) { this->get_parent()->queue_free(); + // get_state_machine()->change("CoinCounter"); + } diff --git a/src/coin/CoinCounter.cpp b/src/coin/CoinCounter.cpp index e50810f..365453b 100644 --- a/src/coin/CoinCounter.cpp +++ b/src/coin/CoinCounter.cpp @@ -3,6 +3,7 @@ using namespace godot; + void CoinCounter::_register_methods() { register_method("_state_enter", &CoinCounter::_state_enter); @@ -35,6 +36,8 @@ void CoinCounter::_state_exit() void CoinCounter::_on_CoinHUD_ready() { - + get_node("Coins").text() = "hola"; } + + diff --git a/src/coin/CoinNotCollected.cpp b/src/coin/CoinNotCollected.cpp index beb34e2..cb7487b 100644 --- a/src/coin/CoinNotCollected.cpp +++ b/src/coin/CoinNotCollected.cpp @@ -3,6 +3,7 @@ using namespace godot; + void CoinNotCollected::_register_methods() { register_method("_state_enter", &CoinNotCollected::_state_enter); @@ -45,6 +46,7 @@ void CoinNotCollected::_on_body_entered(Node *node) auto coin = Object::cast_to(parent_node); coin->set_collision_mask_bit(0, false); } + get_state_machine()->change("CoinCollected");