From 48d68c0896996ad25dc00e43fca3b76486284948 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 14 Apr 2025 14:39:36 +0200 Subject: [PATCH] Renamed the level property to entity_level in ESSEntityWorldSpawner3DSingle. --- .../ess_entity_world_spawner_3d_single.cpp | 18 +++++++++--------- .../ess_entity_world_spawner_3d_single.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/entity_spell_system/world_spawners/ess_entity_world_spawner_3d_single.cpp b/modules/entity_spell_system/world_spawners/ess_entity_world_spawner_3d_single.cpp index 1e8eed479..d4144d6cc 100644 --- a/modules/entity_spell_system/world_spawners/ess_entity_world_spawner_3d_single.cpp +++ b/modules/entity_spell_system/world_spawners/ess_entity_world_spawner_3d_single.cpp @@ -57,11 +57,11 @@ void ESSEntityWorldSpawner3DSingle::set_entity_data(const Ref &p_dat _entity_data = p_data; } -int ESSEntityWorldSpawner3DSingle::get_level() const { - return _level; +int ESSEntityWorldSpawner3DSingle::get_entity_level() const { + return _entity_level; } -void ESSEntityWorldSpawner3DSingle::set_level(const int p_level) { - _level = p_level; +void ESSEntityWorldSpawner3DSingle::set_entity_level(const int p_level) { + _entity_level = p_level; } float ESSEntityWorldSpawner3DSingle::get_respawn_time_min() const { @@ -101,7 +101,7 @@ void ESSEntityWorldSpawner3DSingle::_spawn() { } info->set_entity_controller(EntityEnums::ENITIY_CONTROLLER_AI); - info->set_level(_level); + info->set_level(_entity_level); info->set_transform(get_global_transform()); info->set_entity_data(_entity_data); info->set_species_instance(_entity_data->get_species_instance()); @@ -119,7 +119,7 @@ void ESSEntityWorldSpawner3DSingle::_spawn() { } ESSEntityWorldSpawner3DSingle::ESSEntityWorldSpawner3DSingle() { - _level = 1; + _entity_level = 1; _entity = ObjectID(); _respawn_time_min = 0; _respawn_time_max = 0; @@ -181,9 +181,9 @@ void ESSEntityWorldSpawner3DSingle::_bind_methods() { ClassDB::bind_method(D_METHOD("set_entity_data", "value"), &ESSEntityWorldSpawner3DSingle::set_entity_data); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "entity_data", PROPERTY_HINT_RESOURCE_TYPE, "EntityData"), "set_entity_data", "get_entity_data"); - ClassDB::bind_method(D_METHOD("get_level"), &ESSEntityWorldSpawner3DSingle::get_level); - ClassDB::bind_method(D_METHOD("set_level", "value"), &ESSEntityWorldSpawner3DSingle::set_level); - ADD_PROPERTY(PropertyInfo(Variant::INT, "level"), "set_level", "get_level"); + ClassDB::bind_method(D_METHOD("get_entity_level"), &ESSEntityWorldSpawner3DSingle::get_entity_level); + ClassDB::bind_method(D_METHOD("set_entity_level", "value"), &ESSEntityWorldSpawner3DSingle::set_entity_level); + ADD_PROPERTY(PropertyInfo(Variant::INT, "entity_level"), "set_entity_level", "get_entity_level"); ClassDB::bind_method(D_METHOD("get_respawn_time_min"), &ESSEntityWorldSpawner3DSingle::get_respawn_time_min); ClassDB::bind_method(D_METHOD("set_respawn_time_min", "respawn_time"), &ESSEntityWorldSpawner3DSingle::set_respawn_time_min); diff --git a/modules/entity_spell_system/world_spawners/ess_entity_world_spawner_3d_single.h b/modules/entity_spell_system/world_spawners/ess_entity_world_spawner_3d_single.h index 36aa8929c..31892e637 100644 --- a/modules/entity_spell_system/world_spawners/ess_entity_world_spawner_3d_single.h +++ b/modules/entity_spell_system/world_spawners/ess_entity_world_spawner_3d_single.h @@ -46,8 +46,8 @@ public: Ref get_entity_data() const; void set_entity_data(const Ref &p_data); - int get_level() const; - void set_level(const int p_level); + int get_entity_level() const; + void set_entity_level(const int p_level); float get_respawn_time_min() const; void set_respawn_time_min(const float p_respawn_time); @@ -68,7 +68,7 @@ protected: String _entity_name; Ref _entity_data; - int _level; + int _entity_level; float _respawn_time_min; float _respawn_time_max; real_t _respawn_timer;