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

Fixed teleport interruption wrongfully showing animation.\n Fixed Teleport interruption not resetting casting state. \n Changed GLOBAL keyword in chai to global

Browse source
This commit is contained in:
Mordred 2017-08-30 18:45:34 +02:00
parent 29214026ae
commit 6dd28d46a8
2 changed files with 186 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

368
scripts/chai/global.inc
View file

@ -1,233 +1,233 @@
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// Quest sequence // Quest sequence
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
GLOBAL SEQ_COMPLETE = 0xFF global SEQ_COMPLETE = 0xFF
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// SCENE_FLAGS // SCENE_FLAGS
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
GLOBAL SET_EOBJ_BASE = 0xF8400EF3 global SET_EOBJ_BASE = 0xF8400EF3
GLOBAL SET_INVIS_BASE = 0xF8400FFF global SET_INVIS_BASE = 0xF8400FFF
GLOBAL SET_BASE = 0xF8400EFB global SET_BASE = 0xF8400EFB
GLOBAL INVIS_COMPANION = 0x80000000 global INVIS_COMPANION = 0x80000000
GLOBAL INVIS_ALLIANCE_BUDDY = 0x40000000 global INVIS_ALLIANCE_BUDDY = 0x40000000
GLOBAL INVIS_ALLIANCE_PC = 0x20000000 global INVIS_ALLIANCE_PC = 0x20000000
GLOBAL INVIS_AOE = 0x08000000 global INVIS_AOE = 0x08000000
GLOBAL DISABLE_CANCEL_EMOTE = 0x04000000 global DISABLE_CANCEL_EMOTE = 0x04000000
GLOBAL LOCK_HOTBAR = 0x02000000 global LOCK_HOTBAR = 0x02000000
GLOBAL LOCK_HUD = 0x01000000 global LOCK_HUD = 0x01000000
GLOBAL ROLLBACK_HIDE_UI = 0x00800000 global ROLLBACK_HIDE_UI = 0x00800000
GLOBAL DISABLE_STEALTH = 0x00400000 global DISABLE_STEALTH = 0x00400000
GLOBAL HIDE_FESTIVAL = 0x00200000 global HIDE_FESTIVAL = 0x00200000
GLOBAL DISABLE_SKIP = 0x00080000 global DISABLE_SKIP = 0x00080000
GLOBAL SILENT_ENTER_TERRI_ALL = 0x00038000 global SILENT_ENTER_TERRI_ALL = 0x00038000
GLOBAL SILENT_ENTER_TERRI_SE = 0x00020000 global SILENT_ENTER_TERRI_SE = 0x00020000
GLOBAL SILENT_ENTER_TERRI_BGM = 0x00010000 global SILENT_ENTER_TERRI_BGM = 0x00010000
GLOBAL SILENT_ENTER_TERRI_ENV = 0x00008000 global SILENT_ENTER_TERRI_ENV = 0x00008000
GLOBAL INVINCIBLE = 0x00004000 global INVINCIBLE = 0x00004000
GLOBAL HIDE_HOTBAR = 0x00002000 global HIDE_HOTBAR = 0x00002000
GLOBAL AUTO_LOC_CAMERA = 0x00001000 global AUTO_LOC_CAMERA = 0x00001000
GLOBAL INVIS_ALL = 0xF80003FC global INVIS_ALL = 0xF80003FC
GLOBAL HIDE_UI = 0x00000800 global HIDE_UI = 0x00000800
GLOBAL CONDITION_CUTSCENE = 0x00000400 global CONDITION_CUTSCENE = 0x00000400
GLOBAL INVIS_TREASURE = 0x00000200 global INVIS_TREASURE = 0x00000200
GLOBAL INVIS_AETHERYTE = 0x00000100 global INVIS_AETHERYTE = 0x00000100
GLOBAL INVIS_GATHERING_POINT = 0x00000080 global INVIS_GATHERING_POINT = 0x00000080
GLOBAL INVIS_PARTY_BUDDY = 0x10000000 global INVIS_PARTY_BUDDY = 0x10000000
GLOBAL INVIS_PARTY_PC = 0x00000040 global INVIS_PARTY_PC = 0x00000040
GLOBAL INVIS_OTHER_PC = 0x00000020 global INVIS_OTHER_PC = 0x00000020
GLOBAL INVIS_BNPC = 0x00000010 global INVIS_BNPC = 0x00000010
GLOBAL INVIS_EOBJ = 0x00000008 global INVIS_EOBJ = 0x00000008
GLOBAL INVIS_ENPC = 0x00000004 global INVIS_ENPC = 0x00000004
GLOBAL FADE_OUT = 0x00000002 global FADE_OUT = 0x00000002
GLOBAL NO_DEFAULT_CAMERA = 0x00000001 global NO_DEFAULT_CAMERA = 0x00000001
GLOBAL NONE = 0x00000000 global NONE = 0x00000000
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// Event Types // Event Types
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
GLOBAL EVENT_TALK = 1 global EVENT_TALK = 1
GLOBAL EVENT_EMOTE = 2 global EVENT_EMOTE = 2
GLOBAL EVENT_DISTANCE_BELOW = 3 global EVENT_DISTANCE_BELOW = 3
GLOBAL EVENT_DISTANCE_OVER = 4 global EVENT_DISTANCE_OVER = 4
GLOBAL EVENT_BATTLE_REWARD = 5 global EVENT_BATTLE_REWARD = 5
GLOBAL EVENT_CRAFT = 6 global EVENT_CRAFT = 6
GLOBAL EVENT_NEST = 7 global EVENT_NEST = 7
GLOBAL EVENT_EVENT_ITEM = 8 global EVENT_EVENT_ITEM = 8
GLOBAL EVENT_DROP = 9 global EVENT_DROP = 9
GLOBAL EVENT_WITHIN_RANGE = 10 global EVENT_WITHIN_RANGE = 10
GLOBAL EVENT_OUTSIDE_RANGE = 11 global EVENT_OUTSIDE_RANGE = 11
GLOBAL EVENT_GAME_START = 12 global EVENT_GAME_START = 12
GLOBAL EVENT_GAME_PROGRESS = 13 global EVENT_GAME_PROGRESS = 13
GLOBAL EVENT_ENTER_TERRITORY = 15 global EVENT_ENTER_TERRITORY = 15
GLOBAL EVENT_GAME_COME_BACK = 17 global EVENT_GAME_COME_BACK = 17
GLOBAL EVENT_ACTION_RESULT = 18 global EVENT_ACTION_RESULT = 18
GLOBAL EVENT_MATERIA_CRAFT = 19 global EVENT_MATERIA_CRAFT = 19
GLOBAL EVENT_FISHING = 20 global EVENT_FISHING = 20
GLOBAL EVENT_UI = 21 global EVENT_UI = 21
GLOBAL EVENT_HOUSING = 22 global EVENT_HOUSING = 22
GLOBAL EVENT_SAY = 23 global EVENT_SAY = 23
GLOBAL EVENT_TABLE_GAME = 24 global EVENT_TABLE_GAME = 24
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// Event finish states // Event finish states
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
GLOBAL UNLOCK = 1 global UNLOCK = 1
GLOBAL KEEPLOCK = 0 global KEEPLOCK = 0
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// Possible Event Types // Possible Event Types
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
GLOBAL ACTOR_EVENT_ON_CREATE = 1 global ACTOR_EVENT_ON_CREATE = 1
GLOBAL ACTOR_EVENT_ON_SPAWN = 2 global ACTOR_EVENT_ON_SPAWN = 2
GLOBAL ACTOR_EVENT_ON_DESPAWN = 3 global ACTOR_EVENT_ON_DESPAWN = 3
GLOBAL ACTOR_EVENT_ON_AI_TICK = 4 global ACTOR_EVENT_ON_AI_TICK = 4
GLOBAL ACTOR_EVENT_ON_TALK_DEFAULT = 5 global ACTOR_EVENT_ON_TALK_DEFAULT = 5
GLOBAL MOB_EVENT_ON_DEATH = 1 global MOB_EVENT_ON_DEATH = 1
GLOBAL REGION_EVENT_ON_CREATE= 1 global REGION_EVENT_ON_CREATE= 1
GLOBAL REGION_EVENT_ON_ENTER = 2 global REGION_EVENT_ON_ENTER = 2
GLOBAL REGION_EVENT_ON_LEAVE = 3 global REGION_EVENT_ON_LEAVE = 3
GLOBAL PLAYER_EVENT_ON_FIRST_ENTER_WORLD = 1 global PLAYER_EVENT_ON_FIRST_ENTER_WORLD = 1
GLOBAL PLAYER_EVENT_ON_ENTER_WORLD = 2 global PLAYER_EVENT_ON_ENTER_WORLD = 2
GLOBAL PLAYER_EVENT_ON_DEATH = 3 global PLAYER_EVENT_ON_DEATH = 3
GLOBAL PLAYER_EVENT_ON_LOGIN = 4 global PLAYER_EVENT_ON_LOGIN = 4
GLOBAL PLAYER_EVENT_ON_LOGOUT = 5 global PLAYER_EVENT_ON_LOGOUT = 5
// End Event Types // End Event Types
GLOBAL SLOT_MAINH = 0 global SLOT_MAINH = 0
GLOBAL SLOT_OFFH = 1 global SLOT_OFFH = 1
GLOBAL SLOT_HEAD = 2 global SLOT_HEAD = 2
GLOBAL SLOT_BODY = 3 global SLOT_BODY = 3
GLOBAL SLOT_GLOVES = 4 global SLOT_GLOVES = 4
GLOBAL SLOT_WAIST = 5 global SLOT_WAIST = 5
GLOBAL SLOT_LEGS = 6 global SLOT_LEGS = 6
GLOBAL SLOT_FEET = 7 global SLOT_FEET = 7
GLOBAL GENDER_MALE = 0 global GENDER_MALE = 0
GLOBAL GENDER_FEMALE = 1 global GENDER_FEMALE = 1
GLOBAL ACTION_EVENT_START = 1 global ACTION_EVENT_START = 1
GLOBAL ACTION_EVENT_RETURN = 2 global ACTION_EVENT_RETURN = 2
GLOBAL ACTION_EVENT_TRADE_RETURN = 3 global ACTION_EVENT_TRADE_RETURN = 3
GLOBAL ACTION_ERANGE_EVENT_START = 4 global ACTION_ERANGE_EVENT_START = 4
GLOBAL ACTION_EVENT_EMOTE = 5 global ACTION_EVENT_EMOTE = 5
GLOBAL ACTION_RETURN = 0x26 global ACTION_RETURN = 0x26
GLOBAL ACTION_TELEPORT = 0x29 global ACTION_TELEPORT = 0x29
GLOBAL EVENTACTION_ATTUNE = 0x13 global EVENTACTION_ATTUNE = 0x13
GLOBAL CLASS_GLA = 1 global CLASS_GLA = 1
GLOBAL CLASS_PUG = 2 global CLASS_PUG = 2
GLOBAL CLASS_MRD = 3 global CLASS_MRD = 3
GLOBAL CLASS_LNC = 4 global CLASS_LNC = 4
GLOBAL CLASS_ARC = 5 global CLASS_ARC = 5
GLOBAL CLASS_CON = 6 global CLASS_CON = 6
GLOBAL CLASS_THM = 7 global CLASS_THM = 7
GLOBAL CLASS_CRP = 8 global CLASS_CRP = 8
GLOBAL CLASS_BSM = 9 global CLASS_BSM = 9
GLOBAL CLASS_ARM = 10 global CLASS_ARM = 10
GLOBAL CLASS_GLD = 11 global CLASS_GLD = 11
GLOBAL CLASS_TAN = 12 global CLASS_TAN = 12
GLOBAL CLASS_WVR = 13 global CLASS_WVR = 13
GLOBAL CLASS_ALC = 14 global CLASS_ALC = 14
GLOBAL CLASS_CUL = 15 global CLASS_CUL = 15
GLOBAL CLASS_MIN = 16 global CLASS_MIN = 16
GLOBAL CLASS_BOT = 17 global CLASS_BOT = 17
GLOBAL CLASS_FSH = 18 global CLASS_FSH = 18
GLOBAL CLASS_PLD = 19 global CLASS_PLD = 19
GLOBAL CLASS_MNK = 20 global CLASS_MNK = 20
GLOBAL CLASS_WAR = 21 global CLASS_WAR = 21
GLOBAL CLASS_DRG = 22 global CLASS_DRG = 22
GLOBAL CLASS_BRD = 23 global CLASS_BRD = 23
GLOBAL CLASS_WHM = 24 global CLASS_WHM = 24
GLOBAL CLASS_BLM = 25 global CLASS_BLM = 25
GLOBAL CLASS_ACN = 26 global CLASS_ACN = 26
GLOBAL CLASS_SMN = 27 global CLASS_SMN = 27
GLOBAL CLASS_SCH = 28 global CLASS_SCH = 28
GLOBAL CLASS_ROG = 29 global CLASS_ROG = 29
GLOBAL CLASS_NIN = 30 global CLASS_NIN = 30
GLOBAL CLASS_MCH = 31 global CLASS_MCH = 31
GLOBAL CLASS_DRK = 32 global CLASS_DRK = 32
GLOBAL CLASS_AST = 33 global CLASS_AST = 33
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
// Inventory Enums // Inventory Enums
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
GLOBAL INVENTORY_BAG0 = 0 global INVENTORY_BAG0 = 0
GLOBAL INVENTORY_BAG1 = 1 global INVENTORY_BAG1 = 1
GLOBAL INVENTORY_BAG2 = 2 global INVENTORY_BAG2 = 2
GLOBAL INVENTORY_BAG3 = 3 global INVENTORY_BAG3 = 3
GLOBAL INVENTORY_GEARSET0 = 1000 global INVENTORY_GEARSET0 = 1000
GLOBAL INVENTORY_GEARSET1 = 1001 global INVENTORY_GEARSET1 = 1001
GLOBAL INVENTORY_CURRENCY = 2000 global INVENTORY_CURRENCY = 2000
GLOBAL INVENTORY_CRYSTAL = 2001 global INVENTORY_CRYSTAL = 2001
//GLOBAL INVENTORY_UNKNOWN_0 = 2003 //global INVENTORY_UNKNOWN_0 = 2003
GLOBAL INVENTORY_KEYITEM = 2004 global INVENTORY_KEYITEM = 2004
GLOBAL INVENTORY_DAMAGEDGEAR = 2007 global INVENTORY_DAMAGEDGEAR = 2007
//GLOBAL INVENTORY_UNKNOWN_1 = 2008 //global INVENTORY_UNKNOWN_1 = 2008
GLOBAL INVENTORY_ARMORYOFF = 3200 global INVENTORY_ARMORYOFF = 3200
GLOBAL INVENTORY_ARMORYHEAD = 3201 global INVENTORY_ARMORYHEAD = 3201
GLOBAL INVENTORY_ARMORYBODY = 3202 global INVENTORY_ARMORYBODY = 3202
GLOBAL INVENTORY_ARMORYHAND = 3203 global INVENTORY_ARMORYHAND = 3203
GLOBAL INVENTORY_ARMORYWAIST = 3204 global INVENTORY_ARMORYWAIST = 3204
GLOBAL INVENTORY_ARMORYLEGS = 3205 global INVENTORY_ARMORYLEGS = 3205
GLOBAL INVENTORY_ARMORYFEET = 3206 global INVENTORY_ARMORYFEET = 3206
GLOBAL INVENTORY_ARMOTYNECK = 3207 global INVENTORY_ARMOTYNECK = 3207
GLOBAL INVENTORY_ARMORYEAR = 3208 global INVENTORY_ARMORYEAR = 3208
GLOBAL INVENTORY_ARMORYWRIST = 3209 global INVENTORY_ARMORYWRIST = 3209
GLOBAL INVENTORY_ARMORYRING = 3300 global INVENTORY_ARMORYRING = 3300
GLOBAL INVENTORY_ARMORYSOULCRYSTAL = 3400 global INVENTORY_ARMORYSOULCRYSTAL = 3400
GLOBAL INVENTORY_ARMORYMAIN = 3500 global INVENTORY_ARMORYMAIN = 3500
GLOBAL INVENTORY_RETAINERBAG0 = 10000 global INVENTORY_RETAINERBAG0 = 10000
GLOBAL INVENTORY_RETAINERBAG1 = 10001 global INVENTORY_RETAINERBAG1 = 10001
GLOBAL INVENTORY_RETAINERBAG2 = 10002 global INVENTORY_RETAINERBAG2 = 10002
GLOBAL INVENTORY_RETAINERBAG3 = 10003 global INVENTORY_RETAINERBAG3 = 10003
GLOBAL INVENTORY_RETAINERBAG4 = 10004 global INVENTORY_RETAINERBAG4 = 10004
GLOBAL INVENTORY_RETAINERBAG5 = 10005 global INVENTORY_RETAINERBAG5 = 10005
GLOBAL INVENTORY_RETAINERBAG6 = 10006 global INVENTORY_RETAINERBAG6 = 10006
GLOBAL INVENTORY_RETAINEREQUIPPEDGEAR = 11000 global INVENTORY_RETAINEREQUIPPEDGEAR = 11000
GLOBAL INVENTORY_RETAINERGIL = 12000 global INVENTORY_RETAINERGIL = 12000
GLOBAL INVENTORY_RETAINERCRYSTAL = 12001 global INVENTORY_RETAINERCRYSTAL = 12001
GLOBAL INVENTORY_RETAINERMARKET = 12002 global INVENTORY_RETAINERMARKET = 12002
GLOBAL INVENTORY_FREECOMPANYBAG0 = 20000 global INVENTORY_FREECOMPANYBAG0 = 20000
GLOBAL INVENTORY_FREECOMPANYBAG1 = 20001 global INVENTORY_FREECOMPANYBAG1 = 20001
GLOBAL INVENTORY_FREECOMPANYBAG2 = 20002 global INVENTORY_FREECOMPANYBAG2 = 20002
GLOBAL INVENTORY_FREECOMPANYGIL = 22000 global INVENTORY_FREECOMPANYGIL = 22000
GLOBAL INVENTORY_FREECOMPANYCRYSTAL = 22001 global INVENTORY_FREECOMPANYCRYSTAL = 22001
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Currency types // Currency types
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
GLOBAL CURRENCY_GIL = 0X01 global CURRENCY_GIL = 0X01
GLOBAL CURRENCY_STORMSEAL = 0X02 global CURRENCY_STORMSEAL = 0X02
GLOBAL CURRENCY_SERPENTSEAL = 0X03 global CURRENCY_SERPENTSEAL = 0X03
GLOBAL CURRENCY_FLAMESEAL = 0X04 global CURRENCY_FLAMESEAL = 0X04
GLOBAL CURRENCY_TOMESTONEPHILO = 0X05 global CURRENCY_TOMESTONEPHILO = 0X05
GLOBAL CURRENCY_TOMESTONEMYTHO = 0X06 global CURRENCY_TOMESTONEMYTHO = 0X06
GLOBAL CURRENCY_WOLFMARK = 0X07 global CURRENCY_WOLFMARK = 0X07
GLOBAL CURRENCY_TOMESTONESOLD = 0X08 global CURRENCY_TOMESTONESOLD = 0X08
GLOBAL CURRENCY_ALLIEDSEAL = 0X09 global CURRENCY_ALLIEDSEAL = 0X09
GLOBAL CURRENCY_TOMESTONEPOET = 0X0A global CURRENCY_TOMESTONEPOET = 0X0A
GLOBAL CURRENCY_MGP = 0X0B global CURRENCY_MGP = 0X0B
GLOBAL CURRENCY_TOMESTONELAW = 0X0C global CURRENCY_TOMESTONELAW = 0X0C
GLOBAL CURRENCY_TOMESTONEESO = 0X0D global CURRENCY_TOMESTONEESO = 0X0D
GLOBAL CURRENCY_TOMESTONELORE = 0X0E global CURRENCY_TOMESTONELORE = 0X0E
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Skill handle types // Skill handle types
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
GLOBAL STD_DAMAGE = 0X00 global STD_DAMAGE = 0X00
GLOBAL STD_HEAL = 0X01 global STD_HEAL = 0X01
GLOBAL STD_DOT = 0X02 global STD_DOT = 0X02

4
src/servers/Server_Zone/Action/ActionTeleport.cpp
View file

@ -104,11 +104,11 @@ void Core::Action::ActionTeleport::onInterrupt()
if( !m_pSource ) if( !m_pSource )
return; return;
m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied1 ); m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Casting );
m_pSource->getAsPlayer()->sendStateFlags(); m_pSource->getAsPlayer()->sendStateFlags();
auto control = ActorControlPacket142( m_pSource->getId(), ActorControlType::CastInterrupt, auto control = ActorControlPacket142( m_pSource->getId(), ActorControlType::CastInterrupt,
0x219, 0x04, m_id, 1 ); 0x219, 0x04, m_id, 0 );
m_pSource->sendToInRangeSet( control, true ); m_pSource->sendToInRangeSet( control, true );
} }