Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-02-20 17:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add interaction type vendor. Also fix the EntityWindows enum, 2 of the entries had the same value.

Browse Source
This commit is contained in:
Relintai 2020-09-13 13:32:35 +02:00
parent 0a1e08f541
commit cf95db4a75
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
entity_enums.cpp
View File

@ -30,7 +30,7 @@ const String EntityEnums::BINDING_STRING_COMMON_CHARCATER_SKELETON_POINTS = "Roo
const String EntityEnums::BINDING_STRING_AI_STATES = "Off,Rest,Patrol,Follow Path,Regenerate,Attack,Pet Follow,Pet Stop,Pet Attack";
const String EntityEnums::BINDING_STRING_ENTITY_IMMUNITY_FLAGS = "Stun,Root,Freeze,Silence,Disorient,Fear,Burning,Cold,Pacify,Magic,Poison,Physical,Curse,Bleed,Melee,Holy,Shadow,Nature,Fire,Frost,Lightning,Chaos,Slow,Crit,AOE,Damage,Fall Damage,Projectile,Debuff,Attacks";
const String EntityEnums::BINDING_STRING_ENTITY_RELATION_TYPE = "Neutral,Friendly,Hostile";
const String EntityEnums::BINDING_STRING_ENTITY_INTERACTION_TYPE = "Normal,Speak,Loot,Use,Train,None";
const String EntityEnums::BINDING_STRING_ENTITY_INTERACTION_TYPE = "Normal,Speak,Loot,Use,Train,Vendor,None";
const String EntityEnums::BINDING_STRING_ENTITY_PLAYSTYLE_TYPE = "Melee,Spell,Hybrid,None";
const String EntityEnums::BINDING_STRING_ENTITY_WINDOWS = "Loot,Container,Vendor,Trainer";
const String EntityEnums::BINDING_STRING_ENTITY_ENTITY_RESOURCE_INDICES = "Health,Speed,Resources Begin";
@ -155,6 +155,7 @@ void EntityEnums::_bind_methods() {
BIND_ENUM_CONSTANT(ENITIY_INTERACTION_TYPE_SPEAK);
BIND_ENUM_CONSTANT(ENITIY_INTERACTION_TYPE_LOOT);
BIND_ENUM_CONSTANT(ENITIY_INTERACTION_TYPE_TRAIN);
BIND_ENUM_CONSTANT(ENITIY_INTERACTION_TYPE_VENDOR);
BIND_ENUM_CONSTANT(ENITIY_INTERACTION_TYPE_USE);
BIND_ENUM_CONSTANT(ENITIY_INTERACTION_TYPE_NONE);

7
entity_enums.h
View File

@ -217,6 +217,7 @@ public:
ENITIY_INTERACTION_TYPE_LOOT,
ENITIY_INTERACTION_TYPE_USE,
ENITIY_INTERACTION_TYPE_TRAIN,
ENITIY_INTERACTION_TYPE_VENDOR,
ENITIY_INTERACTION_TYPE_NONE,
};
@ -229,9 +230,9 @@ public:
enum EntityWindows {
ENTITY_WINDOW_LOOT = 0,
ENTITY_WINDOW_CONTAINER = 1,
ENTITY_WINDOW_VENDOR = 2,
ENTITY_WINDOW_TRAINER = 2,
ENTITY_WINDOW_CONTAINER,
ENTITY_WINDOW_VENDOR,
ENTITY_WINDOW_TRAINER,
};
enum EntityResourceIndices {