Mitochondria properly as a node as it should be

MylesScholz · Jan 30, 2024 · 6ad46c0 · 6ad46c0
1 parent b9dfc93
commit 6ad46c0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/src/cell.cpp b/src/cell.cpp
@@ -46,29 +46,13 @@ Size2 Cell::getSpriteSize() const { return _spriteSize; }
 void Cell::_ready() {
 	_cellState = this->get_node<CellState>("CellState");
 	_mitochondria = this->get_node<Mitochondria>("Mitochondria");
-	if (!_mitochondria) {
-		ERR_PRINT("Mitochondria node not found or not of type Mitochondria!");
-	} else {
-		if (!_mitochondria->is_class("Mitochondria")) {
-			ERR_PRINT("Node named 'Mitochondria' is not of type Mitochondria!");
-		} else {
-			ERR_PRINT("Node named 'Mitochondria' is of type Mitochondria");
-		}
-	}
 }
 
 void Cell::_process(double delta) {
 	// Don't run if in editor
 	if (Engine::get_singleton()->is_editor_hint())
 		return;
 
-	if (!_mitochondria) {
-		_cellState->setAlive(false); // kill cell
-		this->set_linear_damp(10.0);
-		ERR_PRINT("Mitochondria node is not initialized!");
-		return;
-	}
-
 	if (_cellState->getAlive()) {
 		// Living Cell behavior
 

diff --git a/src/mitochondria.cpp b/src/mitochondria.cpp
@@ -6,7 +6,7 @@ void Mitochondria::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("add_nutrients", "amount"), &Mitochondria::addNutrients);
 	ClassDB::bind_method(D_METHOD("decrement_nutrients", "amount"), &Mitochondria::decrementNutrients);
 	ClassDB::bind_method(D_METHOD("get_nutrients"), &Mitochondria::getNutrients);
-	ClassDB::bind_method(D_METHOD("set_nutrients", "level"), &Mitochondria::getNutrients);
+	ClassDB::bind_method(D_METHOD("set_nutrients", "level"), &Mitochondria::setNutrients);
 	ClassDB::add_property("Mitochondria", PropertyInfo(Variant::FLOAT, "nutrients"),
 			"set_nutrients", "get_nutrients");
 }

diff --git a/src/register_types.cpp b/src/register_types.cpp
@@ -4,6 +4,7 @@
 #include "cell_spawner.hpp"
 #include "cell_state.hpp"
 #include "fps_counter.hpp"
+#include "mitochondria.hpp"
 #include "start_button.hpp"
 #include "stats_counter.hpp"
 
@@ -22,6 +23,7 @@ void initialize_gdextension_module(ModuleInitializationLevel p_level) {
 	ClassDB::register_class<FpsCounter>();
 	ClassDB::register_class<Cell>();
 	ClassDB::register_class<CellState>();
+	ClassDB::register_class<Mitochondria>();
 	ClassDB::register_class<CellSpawner>();
 	ClassDB::register_class<StartButton>();
 }