mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 14:37:44 +00:00
Code Activity

Adjusted structs for 3.3, might still be more to fix.

Browse source
This commit is contained in:
Mordred 2023-01-20 21:50:08 +01:00
parent db94a098a2
commit 2f39f3d4a2
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
deps/datReader/Exd/Structs.h vendored
View file

@ -84,6 +84,7 @@ namespace Excel
int32_t RepairItem; int32_t RepairItem;
int32_t MirageItem; int32_t MirageItem;
uint16_t Icon; uint16_t Icon;
uint16_t Level;
uint16_t Trait; uint16_t Trait;
uint16_t Damage; uint16_t Damage;
uint16_t MagicDamage; uint16_t MagicDamage;
@ -96,7 +97,6 @@ namespace Excel
uint16_t Action; uint16_t Action;
uint16_t Salvage; uint16_t Salvage;
int16_t BonusValue[7]; int16_t BonusValue[7];
uint8_t Level;
uint8_t EquipLevel; uint8_t EquipLevel;
uint8_t EquipPvPRank; uint8_t EquipPvPRank;
uint8_t Category; uint8_t Category;
@ -134,7 +134,6 @@ namespace Excel
uint8_t ConditionFemale : 1; uint8_t ConditionFemale : 1;
uint8_t ConditionMale : 1; uint8_t ConditionMale : 1;
uint8_t DisableSameAccount : 1; uint8_t DisableSameAccount : 1;
int8_t padding2[4];
}; };
/* 35156 */ /* 35156 */
@ -229,12 +228,11 @@ namespace Excel
struct ClassJob struct ClassJob
{ {
ClassJobTextStruct Text; ClassJobTextStruct Text;
int8_t padding0[4];
uint64_t ModelJobStone;
Excel::StringOffset EnText; Excel::StringOffset EnText;
uint32_t JobCrystalItemId; uint32_t JobCrystalItemId;
uint32_t ARRRelicQuestId; uint32_t ARRRelicQuestId;
uint32_t ARRFinalJobQuest; uint32_t ARRFinalJobQuest;
uint32_t HWFinalJobQuest;
int32_t InitWeapon[2]; int32_t InitWeapon[2];
uint16_t Hp; uint16_t Hp;
uint16_t Mp; uint16_t Mp;
@ -253,12 +251,13 @@ namespace Excel
uint8_t MainClass; uint8_t MainClass;
uint8_t Role; uint8_t Role;
uint8_t Town; uint8_t Town;
uint8_t PartyBuff;
int8_t MonsterNote; int8_t MonsterNote;
int8_t StartingLevel; int8_t StartingLevel;
uint8_t PartyBuff;
int8_t WorkIndex; int8_t WorkIndex;
int8_t BattleClassIndex; int8_t BattleClassIndex;
int8_t CraftingClassIndex; int8_t CraftingClassIndex;
int8_t Unknown7;
}; };
/* 63507 */ /* 63507 */
@ -698,6 +697,7 @@ namespace Excel
uint16_t SubRegion; uint16_t SubRegion;
uint16_t Area; uint16_t Area;
uint16_t Map; uint16_t Map;
uint16_t Unknown4;
uint16_t BGM; uint16_t BGM;
uint16_t QuestBattle; uint16_t QuestBattle;
uint8_t BattalionMode; uint8_t BattalionMode;
@ -1845,6 +1845,7 @@ namespace Excel
uint8_t GeneralAction[2]; uint8_t GeneralAction[2];
uint8_t AllaganTomestoneType; uint8_t AllaganTomestoneType;
uint8_t AllaganTomestoneNum; uint8_t AllaganTomestoneNum;
uint8_t Unknown95E;
uint8_t BeastReputationValueNum; uint8_t BeastReputationValueNum;
uint8_t unknown1[4]; uint8_t unknown1[4];
}; };
@ -1867,6 +1868,7 @@ namespace Excel
uint32_t Inlay; uint32_t Inlay;
int32_t Mount; int32_t Mount;
uint16_t ClassLevel; uint16_t ClassLevel;
uint16_t Unknown9A2;
uint16_t ClassLevel2; uint16_t ClassLevel2;
uint16_t AcquiredReward; uint16_t AcquiredReward;
uint16_t TimeBegin; uint16_t TimeBegin;
@ -1897,6 +1899,7 @@ namespace Excel
uint8_t Genre; uint8_t Genre;
uint8_t IconType; uint8_t IconType;
uint8_t Quality; uint8_t Quality;
uint8_t Unknown9C9;
uint8_t padding2 : 3; uint8_t padding2 : 3;
uint8_t HideOfferIcon : 1; uint8_t HideOfferIcon : 1;
uint8_t Cancellable : 1; uint8_t Cancellable : 1;

6
src/world/Actor/Player.cpp
View file

@ -1429,12 +1429,6 @@ void Player::autoAttack( CharaPtr pTarget )
effectPacket->setRotation( Util::floatToUInt16Rot( getRot() ) ); effectPacket->setRotation( Util::floatToUInt16Rot( getRot() ) );
effectPacket->addTargetEffect( entry ); effectPacket->addTargetEffect( entry );
Logger::debug(
"Dump:\n{0}",
Util::binaryToHexDump( const_cast< uint8_t* >( &effectPacket->getData()[0] ),
static_cast< uint16_t >( effectPacket->getContentSize() ) )
);
sendToInRangeSet( effectPacket, true ); sendToInRangeSet( effectPacket, true );
pTarget->takeDamage( static_cast< uint32_t >( damage.first ) ); pTarget->takeDamage( static_cast< uint32_t >( damage.first ) );