Skip to content
This repository was archived by the owner on Apr 29, 2020. It is now read-only.

Tortoise Song now only dispels songs and rolls, food no longer removed when entering battlefield or level sync #12

Merged
teschnei merged 1 commit into from
Jan 30, 2014
Merged

Tortoise Song now only dispels songs and rolls, food no longer removed when entering battlefield or level sync #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/globals/mobskills/Tortoise_Song.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ end;

function OnMobWeaponSkill(target, mob, skill)

local count = target:dispelAllStatusEffect();
local count = target:dispelAllStatusEffect(bit.bor(EFFECTFLAG_SONG, EFFECTFLAG_ROLL));

if(count == 0) then
skill:setMsg(MSG_NO_EFFECT);
Expand Down
2 changes: 2 additions & 0 deletions scripts/globals/status.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,8 @@ EFFECTFLAG_NO_REST = 0x1000
EFFECTFLAG_PREVENT_ACTION = 0x2000
EFFECTFLAG_WALTZABLE = 0x4000
EFFECTFLAG_FOOD = 0x8000
EFFECTFLAG_SONG = 0x10000
EFFECTFLAG_ROLL = 0x20000

function removeSleepEffects(target)
target:delStatusEffect(EFFECT_SLEEP_I);
Expand Down
2 changes: 1 addition & 1 deletion sql/status_effects.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ INSERT INTO `status_effects` VALUES (247,'(imagery)',32,244,0,0,0,0,0);
INSERT INTO `status_effects` VALUES (248,'(imagery)',32,244,0,0,0,0,0);
INSERT INTO `status_effects` VALUES (249,'dedication',0,0,0,0,0,0,0);
INSERT INTO `status_effects` VALUES (250,'ef_badge',32,0,0,0,0,0,0);
INSERT INTO `status_effects` VALUES (251,'food',32800,0,0,2,0,0,0);
INSERT INTO `status_effects` VALUES (251,'food',32768,0,0,2,0,0,0);
INSERT INTO `status_effects` VALUES (252,'chocobo',164,0,0,0,0,0,0);
INSERT INTO `status_effects` VALUES (253,'signet',0,0,0,0,0,0,0);
INSERT INTO `status_effects` VALUES (254,'battlefield',0,0,0,0,0,0,0);
Expand Down
2 changes: 1 addition & 1 deletion src/map/ai/ai_char_normal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ void CAICharNormal::ActionDeath()
// без задержки удаление эффектов не всегда правильно обрабатывается клиентом
if (m_Tick >= m_LastActionTime + 1000)
{
m_PChar->StatusEffectContainer->DelStatusEffectsByFlag(EFFECTFLAG_DEATH, true);
m_PChar->StatusEffectContainer->DelStatusEffectsByFlag(EFFECTFLAG_DEATH | EFFECTFLAG_FOOD, true);

if(m_PChar->m_PVPFlag)
{
Expand Down
4 changes: 3 additions & 1 deletion src/map/status_effect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ enum EFFECTFLAG
EFFECTFLAG_NO_REST = 0x1000, // prevents resting, curse II, plague, disease
EFFECTFLAG_PREVENT_ACTION = 0x2000, // sleep, lullaby, stun, petro. Not implemented
EFFECTFLAG_WALTZABLE = 0x4000, //for healing waltzable spells
EFFECTFLAG_FOOD = 0x8000
EFFECTFLAG_FOOD = 0x8000,
EFFECTFLAG_SONG = 0x10000, //bard songs
EFFECTFLAG_ROLL = 0x20000 //corsair rolls
};

enum EFFECT
Expand Down