Index: scripts/globals/status.lua =================================================================== --- scripts/globals/status.lua (revision 3803) +++ scripts/globals/status.lua (working copy) @@ -848,9 +848,11 @@ MOD_REGEN_DOWN = 0x194 -- poison MOD_REFRESH_DOWN = 0x195 -- plague, reduce mp MOD_REGAIN_DOWN = 0x196 -- plague, reduce tp - +-- 0x197 is used above: MOD_UFASTCAST +MOD_MAG_BURST_BONUS = 0x198 MOD_EAT_RAW_FISH = 409 MOD_EAT_RAW_MEAT = 410 +MOD_AUTO_RERAISE = 0x19B ----------------------------------- -- Merit Definitions ----------------------------------- Index: src/map/ai/ai_char_normal.cpp =================================================================== --- src/map/ai/ai_char_normal.cpp (revision 3803) +++ src/map/ai/ai_char_normal.cpp (working copy) @@ -408,6 +408,11 @@ if ((m_Tick - m_LastActionTime) >= 1000) { m_PChar->StatusEffectContainer->DelStatusEffectsByFlag(EFFECTFLAG_DEATH, true); + + // Auto reraise + if( m_PChar->m_hasRaise < m_PChar->getMod(MOD_AUTO_RERAISE) ){ + m_PChar->m_hasRaise = m_PChar->getMod(MOD_AUTO_RERAISE); + } // has reraise, don't stop timer // this must be after deleting status effects Index: src/map/modifier.h =================================================================== --- src/map/modifier.h (revision 3803) +++ src/map/modifier.h (working copy) @@ -438,10 +438,11 @@ MOD_MAG_BURST_BONUS =408, MOD_EAT_RAW_FISH = 409, - MOD_EAT_RAW_MEAT = 410 + MOD_EAT_RAW_MEAT = 410, + MOD_AUTO_RERAISE =0x19B }; -#define MAX_MODIFIER 411 +#define MAX_MODIFIER 412