mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-02 04:16:46 +00:00
Renamed and moved SkillUseTypes enumeration to EQEmu::skills::SkillType; eq_dictionary work
This commit is contained in:
Uleat
+164
-14
@@ -1,5 +1,6 @@
|
||||
/* EQEMu: Everquest Server Emulator
|
||||
Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
|
||||
|
||||
Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -9,17 +10,20 @@
|
||||
but WITHOUT ANY WARRANTY except by those people which sell it, which
|
||||
are required to give you total support for your newly bought product;
|
||||
without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
||||
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "types.h"
|
||||
#include "skills.h"
|
||||
|
||||
bool EQEmu::IsTradeskill(SkillUseTypes skill)
|
||||
#include <string.h>
|
||||
|
||||
|
||||
bool EQEmu::skills::IsTradeskill(SkillType skill)
|
||||
{
|
||||
switch (skill) {
|
||||
case SkillFishing:
|
||||
@@ -40,7 +44,7 @@ bool EQEmu::IsTradeskill(SkillUseTypes skill)
|
||||
}
|
||||
}
|
||||
|
||||
bool EQEmu::IsSpecializedSkill(SkillUseTypes skill)
|
||||
bool EQEmu::skills::IsSpecializedSkill(SkillType skill)
|
||||
{
|
||||
// this could be a simple if, but if this is more portable if any IDs change (probably won't)
|
||||
// or any other specialized are added (also unlikely)
|
||||
@@ -56,7 +60,7 @@ bool EQEmu::IsSpecializedSkill(SkillUseTypes skill)
|
||||
}
|
||||
}
|
||||
|
||||
float EQEmu::GetSkillMeleePushForce(SkillUseTypes skill)
|
||||
float EQEmu::skills::GetSkillMeleePushForce(SkillType skill)
|
||||
{
|
||||
// This is the force/magnitude of the push from an attack of this skill type
|
||||
// You can find these numbers in the clients skill struct
|
||||
@@ -93,7 +97,7 @@ float EQEmu::GetSkillMeleePushForce(SkillUseTypes skill)
|
||||
}
|
||||
}
|
||||
|
||||
bool EQEmu::IsBardInstrumentSkill(SkillUseTypes skill)
|
||||
bool EQEmu::skills::IsBardInstrumentSkill(SkillType skill)
|
||||
{
|
||||
switch (skill) {
|
||||
case SkillBrassInstruments:
|
||||
@@ -107,7 +111,7 @@ bool EQEmu::IsBardInstrumentSkill(SkillUseTypes skill)
|
||||
}
|
||||
}
|
||||
|
||||
const std::map<SkillUseTypes, std::string>& EQEmu::GetSkillUseTypesMap()
|
||||
const std::map<EQEmu::skills::SkillType, std::string>& EQEmu::skills::GetSkillTypeMap()
|
||||
{
|
||||
/* VS2013 code
|
||||
static const std::map<SkillUseTypes, std::string> skill_use_types_map = {
|
||||
@@ -194,7 +198,7 @@ const std::map<SkillUseTypes, std::string>& EQEmu::GetSkillUseTypesMap()
|
||||
|
||||
/* VS2012 code - begin */
|
||||
|
||||
static const char* skill_use_names[_EmuSkillCount] = {
|
||||
static const char* skill_use_names[SkillCount] = {
|
||||
"1H Blunt",
|
||||
"1H Slashing",
|
||||
"2H Blunt",
|
||||
@@ -275,14 +279,160 @@ const std::map<SkillUseTypes, std::string>& EQEmu::GetSkillUseTypesMap()
|
||||
"2H Piercing"
|
||||
};
|
||||
|
||||
static std::map<SkillUseTypes, std::string> skill_use_types_map;
|
||||
static std::map<SkillType, std::string> skill_type_map;
|
||||
|
||||
skill_use_types_map.clear();
|
||||
skill_type_map.clear();
|
||||
|
||||
for (int i = Skill1HBlunt; i < _EmuSkillCount; ++i)
|
||||
skill_use_types_map[(SkillUseTypes)i] = skill_use_names[i];
|
||||
for (int i = Skill1HBlunt; i < SkillCount; ++i)
|
||||
skill_type_map[(SkillType)i] = skill_use_names[i];
|
||||
|
||||
/* VS2012 code - end */
|
||||
|
||||
return skill_use_types_map;
|
||||
return skill_type_map;
|
||||
}
|
||||
|
||||
struct EQEmu::SkillProfile // prototype - not implemented
|
||||
{
|
||||
union {
|
||||
struct {
|
||||
uint32 _1HBlunt;
|
||||
uint32 _1HSlashing;
|
||||
uint32 _2HBlunt;
|
||||
uint32 _2HSlashing;
|
||||
uint32 Abjuration;
|
||||
uint32 Alteration;
|
||||
uint32 ApplyPoison;
|
||||
uint32 Archery;
|
||||
uint32 Backstab;
|
||||
uint32 BindWound;
|
||||
uint32 Bash;
|
||||
uint32 Block;
|
||||
uint32 BrassInstruments;
|
||||
uint32 Channeling;
|
||||
uint32 Conjuration;
|
||||
uint32 Defense;
|
||||
uint32 Disarm;
|
||||
uint32 DisarmTraps;
|
||||
uint32 Divination;
|
||||
uint32 Dodge;
|
||||
uint32 DoubleAttack;
|
||||
union {
|
||||
uint32 DragonPunch;
|
||||
uint32 TailRake;
|
||||
};
|
||||
uint32 DualWield;
|
||||
uint32 EagleStrike;
|
||||
uint32 Evocation;
|
||||
uint32 FeignDeath;
|
||||
uint32 FlyingKick;
|
||||
uint32 Forage;
|
||||
uint32 HandtoHand;
|
||||
uint32 Hide;
|
||||
uint32 Kick;
|
||||
uint32 Meditate;
|
||||
uint32 Mend;
|
||||
uint32 Offense;
|
||||
uint32 Parry;
|
||||
uint32 PickLock;
|
||||
uint32 _1HPiercing;
|
||||
uint32 Riposte;
|
||||
uint32 RoundKick;
|
||||
uint32 SafeFall;
|
||||
uint32 SenseHeading;
|
||||
uint32 Singing;
|
||||
uint32 Sneak;
|
||||
uint32 SpecializeAbjure;
|
||||
uint32 SpecializeAlteration;
|
||||
uint32 SpecializeConjuration;
|
||||
uint32 SpecializeDivination;
|
||||
uint32 SpecializeEvocation;
|
||||
uint32 PickPockets;
|
||||
uint32 StringedInstruments;
|
||||
uint32 Swimming;
|
||||
uint32 Throwing;
|
||||
uint32 TigerClaw;
|
||||
uint32 Tracking;
|
||||
uint32 WindInstruments;
|
||||
uint32 Fishing;
|
||||
uint32 MakePoison;
|
||||
uint32 Tinkering;
|
||||
uint32 Research;
|
||||
uint32 Alchemy;
|
||||
uint32 Baking;
|
||||
uint32 Tailoring;
|
||||
uint32 SenseTraps;
|
||||
uint32 Blacksmithing;
|
||||
uint32 Fletching;
|
||||
uint32 Brewing;
|
||||
uint32 AlcoholTolerance;
|
||||
uint32 Begging;
|
||||
uint32 JewelryMaking;
|
||||
uint32 Pottery;
|
||||
uint32 PercussionInstruments;
|
||||
uint32 Intimidation;
|
||||
uint32 Berserking;
|
||||
uint32 Taunt;
|
||||
uint32 Frenzy;
|
||||
uint32 RemoveTraps;
|
||||
uint32 TripleAttack;
|
||||
uint32 _2HPiercing;
|
||||
uint32 unused1;
|
||||
uint32 unused2;
|
||||
uint32 unused3;
|
||||
uint32 unused4;
|
||||
uint32 unused5;
|
||||
uint32 unused6;
|
||||
uint32 unused7;
|
||||
uint32 unused8;
|
||||
uint32 unused9;
|
||||
uint32 unused10;
|
||||
uint32 unused11;
|
||||
uint32 unused12;
|
||||
uint32 unused13;
|
||||
uint32 unused14;
|
||||
uint32 unused15;
|
||||
uint32 unused16;
|
||||
uint32 unused17;
|
||||
uint32 unused18;
|
||||
uint32 unused19;
|
||||
uint32 unused20;
|
||||
uint32 unused21;
|
||||
uint32 unused22;
|
||||
};
|
||||
uint32 skill[PACKET_SKILL_ARRAY_SIZE];
|
||||
};
|
||||
|
||||
SkillProfile();
|
||||
|
||||
uint32* GetSkills() { return reinterpret_cast<uint32*>(&skill); }
|
||||
|
||||
skills::SkillType GetLastUseableSkill() { return EQEmu::skills::Skill2HPiercing; }
|
||||
|
||||
size_t GetSkillsArraySize() { return PACKET_SKILL_ARRAY_SIZE; }
|
||||
uint32 GetSkill(int skill_id);
|
||||
|
||||
uint32 operator[](int skill_id) { return GetSkill(skill_id); }
|
||||
|
||||
// const
|
||||
uint32* GetSkills() const { return const_cast<SkillProfile*>(this)->GetSkills(); }
|
||||
|
||||
skills::SkillType GetLastUseableSkill() const { return const_cast<SkillProfile*>(this)->GetLastUseableSkill(); }
|
||||
|
||||
size_t GetSkillsArraySize() const { return const_cast<SkillProfile*>(this)->GetSkillsArraySize(); }
|
||||
uint32 GetSkill(int skill_id) const { return const_cast<SkillProfile*>(this)->GetSkill(skill_id); }
|
||||
|
||||
uint32 operator[](int skill_id) const { return const_cast<SkillProfile*>(this)->GetSkill(skill_id); }
|
||||
};
|
||||
|
||||
EQEmu::SkillProfile::SkillProfile()
|
||||
{
|
||||
memset(&skill, 0, (sizeof(uint32) * PACKET_SKILL_ARRAY_SIZE));
|
||||
}
|
||||
|
||||
uint32 EQEmu::SkillProfile::GetSkill(int skill_id)
|
||||
{
|
||||
if (skill_id < 0 || skill_id >= PACKET_SKILL_ARRAY_SIZE)
|
||||
return 0;
|
||||
|
||||
return skill[skill_id];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user