mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
Load SummonProperties.dbc, data not used yet
This commit is contained in:
parent
871f2e181c
commit
96f2b1d314
6 changed files with 33 additions and 3 deletions
|
|
@ -298,7 +298,7 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
|
||||||
Player *target = GetPlayer();
|
Player *target = GetPlayer();
|
||||||
|
|
||||||
//Players with Feather Fall or low fall time, or physical immunity (charges used) are ignored
|
//Players with Feather Fall or low fall time, or physical immunity (charges used) are ignored
|
||||||
if (movementInfo.fallTime > 1100 && !target->isDead() && !target->isGameMaster() &&
|
if (movementInfo.fallTime > 1500 && !target->isDead() && !target->isGameMaster() &&
|
||||||
!target->HasAuraType(SPELL_AURA_HOVER) && !target->HasAuraType(SPELL_AURA_FEATHER_FALL) &&
|
!target->HasAuraType(SPELL_AURA_HOVER) && !target->HasAuraType(SPELL_AURA_FEATHER_FALL) &&
|
||||||
!target->HasAuraType(SPELL_AURA_FLY) && !target->IsImmunedToDamage(SPELL_SCHOOL_MASK_NORMAL,true) )
|
!target->HasAuraType(SPELL_AURA_FLY) && !target->IsImmunedToDamage(SPELL_SCHOOL_MASK_NORMAL,true) )
|
||||||
{
|
{
|
||||||
|
|
@ -306,10 +306,10 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
|
||||||
int32 safe_fall = target->GetTotalAuraModifier(SPELL_AURA_SAFE_FALL);
|
int32 safe_fall = target->GetTotalAuraModifier(SPELL_AURA_SAFE_FALL);
|
||||||
uint32 fall_time = (movementInfo.fallTime > (safe_fall*10)) ? movementInfo.fallTime - (safe_fall*10) : 0;
|
uint32 fall_time = (movementInfo.fallTime > (safe_fall*10)) ? movementInfo.fallTime - (safe_fall*10) : 0;
|
||||||
|
|
||||||
if(fall_time > 1100) //Prevent damage if fall time < 1100
|
if(fall_time > 1500) //Prevent damage if fall time < 1500
|
||||||
{
|
{
|
||||||
//Fall Damage calculation
|
//Fall Damage calculation
|
||||||
float fallperc = float(fall_time)/1100;
|
float fallperc = float(fall_time)/1500;
|
||||||
uint32 damage = (uint32)(((fallperc*fallperc -1) / 9 * target->GetMaxHealth())*sWorld.getRate(RATE_DAMAGE_FALL));
|
uint32 damage = (uint32)(((fallperc*fallperc -1) / 9 * target->GetMaxHealth())*sWorld.getRate(RATE_DAMAGE_FALL));
|
||||||
|
|
||||||
float height = movementInfo.z;
|
float height = movementInfo.z;
|
||||||
|
|
|
||||||
|
|
@ -2061,6 +2061,22 @@ enum SummonType
|
||||||
SUMMON_TYPE_POSESSED2 = 428
|
SUMMON_TYPE_POSESSED2 = 428
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum SummonType2
|
||||||
|
{
|
||||||
|
SUMMON_TYPE2_UNKNOWN = 0,
|
||||||
|
SUMMON_TYPE2_SUMMON = 1,
|
||||||
|
SUMMON_TYPE2_GUARDIAN = 2,
|
||||||
|
SUMMON_TYPE2_DEMON = 3,
|
||||||
|
SUMMON_TYPE2_TOTEM = 4,
|
||||||
|
SUMMON_TYPE2_CRITTER = 5,
|
||||||
|
SUMMON_TYPE2_GHOUL = 6,
|
||||||
|
SUMMON_TYPE2_BOMB = 7,
|
||||||
|
SUMMON_TYPE2_PHASING = 8,
|
||||||
|
SUMMON_TYPE2_SIEGE_VEH = 9,
|
||||||
|
SUMMON_TYPE2_DRAKE_VEH = 10,
|
||||||
|
SUMMON_TYPE2_LIGHTWELL = 11
|
||||||
|
};
|
||||||
|
|
||||||
enum ResponseCodes
|
enum ResponseCodes
|
||||||
{
|
{
|
||||||
RESPONSE_SUCCESS = 0x00,
|
RESPONSE_SUCCESS = 0x00,
|
||||||
|
|
|
||||||
|
|
@ -109,6 +109,7 @@ DBCStorage <SpellRangeEntry> sSpellRangeStore(SpellRangefmt);
|
||||||
DBCStorage <SpellRuneCostEntry> sSpellRuneCostStore(SpellRuneCostfmt);
|
DBCStorage <SpellRuneCostEntry> sSpellRuneCostStore(SpellRuneCostfmt);
|
||||||
DBCStorage <SpellShapeshiftEntry> sSpellShapeshiftStore(SpellShapeshiftfmt);
|
DBCStorage <SpellShapeshiftEntry> sSpellShapeshiftStore(SpellShapeshiftfmt);
|
||||||
DBCStorage <StableSlotPricesEntry> sStableSlotPricesStore(StableSlotPricesfmt);
|
DBCStorage <StableSlotPricesEntry> sStableSlotPricesStore(StableSlotPricesfmt);
|
||||||
|
DBCStorage <SummonPropertiesEntry> sSummonPropertiesStore(SummonPropertiesfmt);
|
||||||
DBCStorage <TalentEntry> sTalentStore(TalentEntryfmt);
|
DBCStorage <TalentEntry> sTalentStore(TalentEntryfmt);
|
||||||
TalentSpellPosMap sTalentSpellPosMap;
|
TalentSpellPosMap sTalentSpellPosMap;
|
||||||
DBCStorage <TalentTabEntry> sTalentTabStore(TalentTabEntryfmt);
|
DBCStorage <TalentTabEntry> sTalentTabStore(TalentTabEntryfmt);
|
||||||
|
|
@ -318,6 +319,7 @@ void LoadDBCStores(std::string dataPath)
|
||||||
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellRuneCostStore, dbcPath,"SpellRuneCost.dbc");
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellRuneCostStore, dbcPath,"SpellRuneCost.dbc");
|
||||||
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellShapeshiftStore, dbcPath,"SpellShapeshiftForm.dbc");
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellShapeshiftStore, dbcPath,"SpellShapeshiftForm.dbc");
|
||||||
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sStableSlotPricesStore, dbcPath,"StableSlotPrices.dbc");
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sStableSlotPricesStore, dbcPath,"StableSlotPrices.dbc");
|
||||||
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSummonPropertiesStore, dbcPath,"SummonProperties.dbc");
|
||||||
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTalentStore, dbcPath,"Talent.dbc");
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTalentStore, dbcPath,"Talent.dbc");
|
||||||
|
|
||||||
// create talent spells set
|
// create talent spells set
|
||||||
|
|
|
||||||
|
|
@ -191,6 +191,7 @@ extern DBCStorage <SpellRuneCostEntry> sSpellRuneCostStore;
|
||||||
extern DBCStorage <SpellShapeshiftEntry> sSpellShapeshiftStore;
|
extern DBCStorage <SpellShapeshiftEntry> sSpellShapeshiftStore;
|
||||||
extern DBCStorage <SpellEntry> sSpellStore;
|
extern DBCStorage <SpellEntry> sSpellStore;
|
||||||
extern DBCStorage <StableSlotPricesEntry> sStableSlotPricesStore;
|
extern DBCStorage <StableSlotPricesEntry> sStableSlotPricesStore;
|
||||||
|
extern DBCStorage <SummonPropertiesEntry> sSummonPropertiesStore;
|
||||||
extern DBCStorage <TalentEntry> sTalentStore;
|
extern DBCStorage <TalentEntry> sTalentStore;
|
||||||
extern DBCStorage <TalentTabEntry> sTalentTabStore;
|
extern DBCStorage <TalentTabEntry> sTalentTabStore;
|
||||||
extern DBCStorage <TaxiNodesEntry> sTaxiNodesStore;
|
extern DBCStorage <TaxiNodesEntry> sTaxiNodesStore;
|
||||||
|
|
|
||||||
|
|
@ -1234,6 +1234,16 @@ struct StableSlotPricesEntry
|
||||||
uint32 Price;
|
uint32 Price;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct SummonPropertiesEntry
|
||||||
|
{
|
||||||
|
uint32 Id;
|
||||||
|
uint32 Unk1;
|
||||||
|
uint32 Unk2;
|
||||||
|
uint32 Type;
|
||||||
|
uint32 Slot;
|
||||||
|
uint32 Flags;
|
||||||
|
};
|
||||||
|
|
||||||
struct TalentEntry
|
struct TalentEntry
|
||||||
{
|
{
|
||||||
uint32 TalentID; // 0
|
uint32 TalentID; // 0
|
||||||
|
|
|
||||||
|
|
@ -77,6 +77,7 @@ const char SpellRangefmt[]="nfxfxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
|
||||||
const char SpellRuneCostfmt[]="niiii";
|
const char SpellRuneCostfmt[]="niiii";
|
||||||
const char SpellShapeshiftfmt[]="nxxxxxxxxxxxxxxxxxxiixixxxxxxxxxxxx";
|
const char SpellShapeshiftfmt[]="nxxxxxxxxxxxxxxxxxxiixixxxxxxxxxxxx";
|
||||||
const char StableSlotPricesfmt[] = "ni";
|
const char StableSlotPricesfmt[] = "ni";
|
||||||
|
const char SummonPropertiesfmt[] = "niiiii";
|
||||||
const char TalentEntryfmt[]="niiiiiiiixxxxixxixxxxxx";
|
const char TalentEntryfmt[]="niiiiiiiixxxxixxixxxxxx";
|
||||||
const char TalentTabEntryfmt[]="nxxxxxxxxxxxxxxxxxxxiiix";
|
const char TalentTabEntryfmt[]="nxxxxxxxxxxxxxxxxxxxiiix";
|
||||||
const char TaxiNodesEntryfmt[]="nifffxxxxxxxxxxxxxxxxxii";
|
const char TaxiNodesEntryfmt[]="nifffxxxxxxxxxxxxxxxxxii";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue