Skip to content

Commit

Permalink
Added entity_resource_base_world_speed property to the ESS singleton.
Browse files Browse the repository at this point in the history
  • Loading branch information
Relintai committed Apr 15, 2024
1 parent b5ce7b8 commit e39251c
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 6 deletions.
15 changes: 15 additions & 0 deletions modules/entity_spell_system/singletons/ess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,14 @@ void ESS::stat_set_main_stat_count(const int index) {
_stat_main_stat_count = index;
}

// Entity Resources
real_t ESS::entity_resource_get_base_world_speed() const {
return _entity_resource_base_world_speed;
}
void ESS::entity_resource_set_base_world_speed(const real_t value) {
_entity_resource_base_world_speed = value;
}

//Equipslots
void ESS::equip_slot_set_string(const String &equip_slot_enum_string) {
_equip_slot_id_to_name.clear();
Expand Down Expand Up @@ -755,6 +763,11 @@ void ESS::_bind_methods() {
ClassDB::bind_method(D_METHOD("stat_get_main_stat_count"), &ESS::stat_get_main_stat_count);
ClassDB::bind_method(D_METHOD("stat_set_main_stat_count", "index"), &ESS::stat_set_main_stat_count);
ADD_PROPERTY(PropertyInfo(Variant::INT, "main_stat_count"), "stat_set_main_stat_count", "stat_get_main_stat_count");

// Entity Resources
ClassDB::bind_method(D_METHOD("entity_resource_get_base_world_speed"), &ESS::entity_resource_get_base_world_speed);
ClassDB::bind_method(D_METHOD("entity_resource_set_base_world_speed", "index"), &ESS::entity_resource_set_base_world_speed);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "entity_resource_base_world_speed"), "entity_resource_set_base_world_speed", "entity_resource_get_base_world_speed");

//Equipslots
ClassDB::bind_method(D_METHOD("equip_slot_get_string"), &ESS::equip_slot_get_string);
Expand Down Expand Up @@ -892,6 +905,8 @@ ESS::ESS() {

stat_set_string(GLOBAL_DEF("ess/enums/stats", "Agility,Strength,Stamina,Intellect,Spirit,Health,Speed,Global Cooldown,Haste"));
_stat_main_stat_count = GLOBAL_DEF("ess/enums/main_stat_count", 5);

_entity_resource_base_world_speed = GLOBAL_DEF("ess/entity_resources/base_world_speed", 100);

equip_slot_set_string(GLOBAL_DEF("ess/enums/equip_slots", "Head,Neck,Shoulder,Chest,Gloves,Belt,Legs,Feet,Ring_1,Ring_2,Trinket_1,Trinket_2,Main_Hand,Off_Hand"));

Expand Down
19 changes: 13 additions & 6 deletions modules/entity_spell_system/singletons/ess.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class ESS : public Object {

void load_all();

//Stats
// Stats
String stat_get_string() const;
void stat_set_string(const String &stat_enum_string);

Expand All @@ -114,8 +114,12 @@ class ESS : public Object {

int stat_get_main_stat_count() const;
void stat_set_main_stat_count(const int index);

// Entity Resources
real_t entity_resource_get_base_world_speed() const;
void entity_resource_set_base_world_speed(const real_t value);

//Equipslots
// Equipslots
String equip_slot_get_string() const;
void equip_slot_set_string(const String &equip_slot_enum_string);

Expand All @@ -131,7 +135,7 @@ class ESS : public Object {
PoolStringArray equip_slots_get() const;
void equip_slots_set(const PoolStringArray &array);

//Skeletons
// Skeletons
String entity_types_get() const;
void entity_types_set(const String &value);

Expand All @@ -147,14 +151,14 @@ class ESS : public Object {
PoolStringArray skeletons_bone_attachment_points_get() const;
void skeletons_bone_attachment_points_set(const PoolStringArray &value);

//Other
// Other
String model_visual_groups_get() const;
void model_visual_groups_set(const String &value);

String texture_layers_get() const;
void texture_layers_set(const String &value);

//Diminishing Returns
// Diminishing Returns
String dminishing_return_categories_get() const;
void dminishing_return_categories_set(const String &value);

Expand All @@ -164,7 +168,7 @@ class ESS : public Object {
int dminishing_return_steps_get() const;
void dminishing_return_steps_set(const int value);

//Levels/XP
// Levels/XP
int get_max_character_level() const;
int get_max_class_level() const;

Expand Down Expand Up @@ -254,6 +258,9 @@ class ESS : public Object {

String _stat_enum_string;
int _stat_main_stat_count;

// Entity Resources
real_t _entity_resource_base_world_speed;

//Equipslots
Vector<StringName> _equip_slot_id_to_name;
Expand Down

0 comments on commit e39251c

Please sign in to comment.