Combat fixes and additions

Add default status gain and loss ids for status effects so buffs and
debuffs can have different ids.
Add sleep, slow, and slowcast

Fix sacred prism not slowing casts
Fix some incorrect text ids in battle commands

FFXIVClassic Map Server/Database.cs

@@ -2303,7 +2303,7 @@ namespace FFXIVClassic_Map_Server
                 {
                     conn.Open();
 
-                    var query = @"SELECT id, name, flags, overwrite, tickMs, hidden, silentOnGain, silentOnLoss FROM server_statuseffects;";
+                    var query = @"SELECT id, name, flags, overwrite, tickMs, hidden, silentOnGain, silentOnLoss, statusGainTextId, statusLossTextId FROM server_statuseffects;";
 
                     MySqlCommand cmd = new MySqlCommand(query, conn);
 
@@ -2319,8 +2319,10 @@ namespace FFXIVClassic_Map_Server
                             var hidden = reader.GetBoolean("hidden");
                             var silentOnGain = reader.GetBoolean("silentOnGain");
                             var silentOnLoss = reader.GetBoolean("silentOnLoss");
+                            var statusGainTextId = reader.GetUInt16("statusGainTextId");
+                            var statusLossTextId = reader.GetUInt16("statusLossTextId");
 
-                            var effect = new StatusEffect(id, name, flags, overwrite, tickMs, hidden, silentOnGain, silentOnLoss);
+                            var effect = new StatusEffect(id, name, flags, overwrite, tickMs, hidden, silentOnGain, silentOnLoss, statusGainTextId, statusLossTextId);
 
                             lua.LuaEngine.LoadStatusEffectScript(effect);
                             effects.Add(id, effect);

FFXIVClassic Map Server/actors/chara/ai/StatusEffect.cs

@@ -404,8 +404,8 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
         private bool silentOnGain = false;          //Whether a message is sent when the status is gained
         private bool silentOnLoss = false;          //Whether a message is sent when the status is lost
         private bool hidden = false;                //Whether this status is shown. Used for things that aren't really status effects like exp chains and procs
-        private ushort statusGainTextId;            //The text id used when the status is gained
+        private ushort statusGainTextId = 30328;    //The text id used when the status is gained. 30328: [Command] grants you the effect of [status] (Used for buffs)
-        private ushort statusLossTextId;            //The text id used when the status effect falls off when its time runs out
+        private ushort statusLossTextId = 30331;    //The text id used when the status effect falls off when its time runs out. 30331: You are no longer under the effect of [status] (Used for buffs)
         public LuaScript script;
 
         HitEffect animationEffect;
@@ -448,7 +448,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
             this.hidden = effect.hidden;
         }
 
-        public StatusEffect(uint id, string name, uint flags, uint overwrite, uint tickMs, bool hidden, bool silentOnGain, bool silentOnLoss)
+        public StatusEffect(uint id, string name, uint flags, uint overwrite, uint tickMs, bool hidden, bool silentOnGain, bool silentOnLoss, ushort statusGainTextId, ushort statusLossTextId)
         {
             this.id = (StatusEffectId)id;
             this.name = name;
@@ -458,6 +458,8 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
             this.hidden = hidden;
             this.silentOnGain = silentOnGain;
             this.silentOnLoss = silentOnLoss;
+            this.statusGainTextId = statusGainTextId;
+            this.statusLossTextId = statusLossTextId;
         }
 
         // return true when duration has elapsed
@@ -579,7 +581,6 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
 
         public ushort GetStatusGainTextId()
         {
-            return 30328;
             return statusGainTextId;
         }
 

FFXIVClassic Map Server/actors/chara/ai/StatusEffectContainer.cs

@@ -57,7 +57,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
             // remove effects from this list
             foreach (var effect in removeEffects)
             {
-                RemoveStatusEffect(effect, resultContainer);
+                RemoveStatusEffect(effect, resultContainer, effect.GetStatusLossTextId());
             }
 
             resultContainer.CombineLists();
@@ -113,6 +113,11 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
         {
             var se = Server.GetWorldManager().GetStatusEffect(id);
 
+            if (se != null)
+            {
+                worldmasterTextId = se.GetStatusGainTextId();
+            }
+
             return AddStatusEffect(se, owner, actionContainer, worldmasterTextId);
         }
 
@@ -120,7 +125,11 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
         {
             var se = Server.GetWorldManager().GetStatusEffect(id);
 
+            if (se != null)
+            {
                 se.SetTier(tier);
+                worldmasterTextId = se.GetStatusGainTextId();
+            }
 
             return AddStatusEffect(se, owner, actionContainer, worldmasterTextId);
         }
@@ -129,8 +138,12 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
         {
             var se = Server.GetWorldManager().GetStatusEffect(id);
 
+            if (se != null)
+            {
                 se.SetMagnitude(magnitude);
                 se.SetTier(tier);
+                worldmasterTextId = se.GetStatusGainTextId();
+            }
 
             return AddStatusEffect(se, owner, actionContainer, worldmasterTextId);
         }
@@ -138,10 +151,12 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
         public bool AddStatusEffect(uint id, byte tier, double magnitude, uint duration, int tickMs, CommandResultContainer actionContainer = null, ushort worldmasterTextId = 30328)
         {
             var se = Server.GetWorldManager().GetStatusEffect(id);
+
             if (se != null)
             {
                 se.SetDuration(duration);
                 se.SetOwner(owner);
+                worldmasterTextId = se.GetStatusGainTextId();
             }
             return AddStatusEffect(se ?? new StatusEffect(this.owner, id, magnitude, 3000, duration, tier), owner, actionContainer, worldmasterTextId);
         }

FFXIVClassic Map Server/actors/chara/ai/utils/BattleUtils.cs

@@ -701,7 +701,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.utils
                     {
                         //If we need an extra action to show the status text
                         if (isAdditional)
-                            results.AddAction(target.actorId, 30328, skill.statusId | (uint) HitEffect.StatusEffectType);
+                            results.AddAction(target.actorId, effect.GetStatusGainTextId(), skill.statusId | (uint) HitEffect.StatusEffectType);
                     }
                     else
                         action.worldMasterTextId = 32002;//Is this right?

data/scripts/effects/dark_seal2.lua

@@ -5,7 +5,6 @@ require("battleutils")
 --There isn't really any information on this, but due to the fact it falls off BEFORE the target is hit, 
 --I'm assuming it increases a spell's accuracy modifier instead of giving actual magic accuracy
 function onCommandStart(effect, owner, skill, actionContainer)
-    print('dark seal')
     if skill.GetActionType() == ActionType.Magic then
         --50 is random guess.
         skill.accuracyModifier = skill.accuracyModifier + 50;

data/scripts/effects/haste.lua

@@ -2,9 +2,9 @@ require("modifiers")
 
 --Set magnitude to milliseconds that HF will reduce delay by
 function onGain(owner, effect, actionContainer)
-    owner.SubtractMod(modifiersGlobal.AttackDelay, effect.GetMagnitude());
+    owner.MultiplyMod(modifiersGlobal.AttackDelay, effect.GetMagnitude());
 end;
 
 function onLose(owner, effect, actionContainer)
-    owner.AddMod(modifiersGlobal.AttackDelay, effect.GetMagnitude());
+    owner.DivideMod(modifiersGlobal.AttackDelay, effect.GetMagnitude());
 end;

data/scripts/effects/sacred_prism.lua

@@ -6,6 +6,7 @@ supportedSpells = [27346, 27347, 27358, 27357, 27350, 27307]
 
 function onMagicCast(effect, caster, skill)
     if supportedSpells[skill.id] then
+        skill.castTimeMs = skill.castTimeMs * 1.5;
         skill.aoeType = TargetFindAOEType.Circle;
         skill.aoeRange = 15;
     end

data/scripts/effects/sleep.lua

@@ -0,0 +1,12 @@
+require("modifiers")
+
+--Set magnitude to milliseconds that HF will reduce delay by
+function onGain(owner, effect, actionContainer)
+end;
+
+function onLose(owner, effect, actionContainer)
+end;
+
+function onDamageTaken(effect, attacker, defender, skill, action, actionContainer)
+    defender.statusEffects.RemoveStatusEffect(effect, actionContainer)
+end;

data/scripts/effects/slow.lua

@@ -0,0 +1,10 @@
+require("modifiers")
+
+--Set magnitude to milliseconds that HF will reduce delay by
+function onGain(owner, effect, actionContainer)
+    owner.MultiplyMod(modifiersGlobal.AttackDelay, effect.GetMagnitude());
+end;
+
+function onLose(owner, effect, actionContainer)
+    owner.DivideMod(modifiersGlobal.AttackDelay, effect.GetMagnitude());
+end;

data/scripts/effects/slowcast.lua

@@ -0,0 +1,9 @@
+require("modifiers")
+require("battleutils")
+
+--Increases range of a single spell, no clue by how much, 25% is a random guess
+--It isn't clear if it has an effect on the aoe portion of skills or just the normal range, i've seen people on the OF say both.
+--It also increased height of skills
+function onMagicCast(effect, caster, skill)
+    skill.castTimeMs = skill.castTimeMs * 1.5;
+end;

sql/server_battle_commands.sql

@@ -90,7 +90,7 @@ INSERT INTO `server_battle_commands` VALUES (23463,'chaotic_chorus',0,1,0,31,171
 INSERT INTO `server_battle_commands` VALUES (23464,'the_scorpions_sting',0,1,0,31,17152,2,12,0,0.5,1,1,100,1,0,0,0,0,0,10,2,0,0,0,11,3500,10,0,0,19,0,9,3,318803968,0,0,0,3,0,30301,2,2,9,1);
 INSERT INTO `server_battle_commands` VALUES (27100,'second_wind',2,6,3,31,16415,0,0,0,0,0,1,100,1,0,0,0,0,0,10,2,0,0,0,0,0,45,0,0,14,519,2,3,234889735,0,0,0,0,0,30320,3,3,13,0);
 INSERT INTO `server_battle_commands` VALUES (27101,'blindside',2,14,3,31,16415,0,0,0,0,0,1,100,1,0,0,0,0,0,10,2,223237,60,1,0,0,60,0,0,14,635,2,3,234889851,0,0,0,0,0,30328,3,4,0,0);
-INSERT INTO `server_battle_commands` VALUES (27102,'taunt',2,42,4,768,17152,0,0,0,0,0,0,100,1,0,0,15,0,0,10,2,223073,5,1,0,0,60,0,0,14,517,2,3,234889733,0,0,0,0,0,30328,3,4,0,0);
+INSERT INTO `server_battle_commands` VALUES (27102,'taunt',2,42,4,768,17152,0,0,0,0,0,0,100,1,0,0,15,0,0,10,2,223073,5,1,0,0,60,0,0,14,517,2,3,234889733,0,0,0,0,0,30335,3,4,0,0);
 INSERT INTO `server_battle_commands` VALUES (27103,'featherfoot',2,2,3,31,16415,0,0,0,0,0,1,100,1,0,0,0,0,0,10,2,223075,30,1,0,0,60,0,0,14,535,2,3,234889751,0,0,0,0,0,30328,3,4,0,0);
 INSERT INTO `server_battle_commands` VALUES (27104,'fists_of_fire',2,34,4,31,16415,0,0,0,0,0,1,100,1,0,0,0,0,0,10,2,223209,4294967295,1,0,0,10,0,0,14,684,2,3,234889900,0,0,0,0,0,30328,3,4,0,0);
 INSERT INTO `server_battle_commands` VALUES (27105,'fists_of_earth',2,22,4,31,16415,0,0,0,0,0,1,100,1,0,0,0,0,0,10,2,223210,4294967295,1,0,0,10,0,0,14,685,2,3,234889901,0,0,0,0,0,30328,3,4,0,0);
@@ -196,7 +196,7 @@ INSERT INTO `server_battle_commands` VALUES (27302,'excruciate',22,38,256,31,164
 INSERT INTO `server_battle_commands` VALUES (27303,'necrogenesis',22,6,3,31,16415,0,0,0,0,0,0,100,1,0,0,0,0,0,10,2,223232,30,1,0,0,90,0,0,14,695,2,3,234889911,0,0,0,0,0,30328,3,4,0,0);
 INSERT INTO `server_battle_commands` VALUES (27304,'parsimony',22,2,256,31,16415,0,0,0,0,0,0,100,1,0,0,0,0,0,10,2,223233,30,1,0,0,90,0,0,14,568,2,3,234889784,0,0,0,0,0,30328,3,4,0,0);
 INSERT INTO `server_battle_commands` VALUES (27305,'convert',26,30,0,31,16415,0,0,0,0,0,0,100,1,0,0,0,0,0,10,2,0,0,0,0,0,450,0,0,14,724,2,3,234889940,0,0,0,0,0,30101,3,0,0,0);
-INSERT INTO `server_battle_commands` VALUES (27306,'sleep',22,42,256,768,17152,0,0,0,0,0,0,100,1,0,0,20,0,0,10,2,228001,60,0.9,2,3000,0,75,0,1,651,1,3,16781963,0,0,0,0,0,30328,4,4,12,0);
+INSERT INTO `server_battle_commands` VALUES (27306,'sleep',22,42,256,768,17152,0,0,0,0,0,0,100,1,0,0,20,0,0,10,2,228001,60,0.9,2,3000,0,75,0,1,651,1,3,16781963,0,0,0,0,0,30335,4,4,12,0);
 INSERT INTO `server_battle_commands` VALUES (27307,'sanguine_rite',22,30,3,31,16415,0,0,0,0,0,0,100,1,0,0,0,0,0,10,2,223234,20,1,0,0,60,120,0,1,152,1,3,16781464,0,0,0,0,0,30328,4,4,0,0);
 INSERT INTO `server_battle_commands` VALUES (27308,'blizzard',22,4,256,768,17152,0,0,0,0,0,0,100,1,0,0,20,0,0,10,2,228021,30,0.75,2,3000,10,90,0,1,502,1,3,16781814,0,0,0,0,0,30301,4,2,6,0);
 INSERT INTO `server_battle_commands` VALUES (27309,'blizzara',22,26,256,768,17152,1,8,0,0,0,0,100,1,0,0,20,0,0,10,2,228011,30,0.75,0,0,40,150,0,1,506,1,3,16781818,0,0,0,0,0,30301,4,2,6,0);
@@ -207,7 +207,7 @@ INSERT INTO `server_battle_commands` VALUES (27313,'thunder',22,1,3,768,17152,0,
 INSERT INTO `server_battle_commands` VALUES (27314,'thundara',22,18,256,768,17152,0,0,0,0,0,0,100,1,0,0,20,0,0,10,2,223015,4,0.75,0,0,30,135,0,1,508,1,3,16781820,0,27315,27316,2,0,30301,4,2,9,0);
 INSERT INTO `server_battle_commands` VALUES (27315,'thundaga',22,46,256,768,17152,0,0,0,0,0,0,100,1,0,0,20,0,0,10,2,0,0,0,2,5000,45,195,0,1,509,1,3,16781821,0,0,0,3,0,30301,4,2,9,0);
 INSERT INTO `server_battle_commands` VALUES (27316,'burst',26,50,0,768,17152,0,0,0,0,0,0,100,1,0,0,20,0,0,10,2,0,0,0,2,4000,900,90,0,1,705,1,3,16782017,0,0,0,3,0,30301,4,2,9,0);
-INSERT INTO `server_battle_commands` VALUES (27317,'sleepga',26,45,0,768,17152,1,8,0,0,0,0,100,1,0,0,20,0,0,10,2,228001,60,0.9,2,4000,0,100,0,1,704,1,3,16782016,0,0,0,0,0,30328,4,4,12,0);
+INSERT INTO `server_battle_commands` VALUES (27317,'sleepga',26,45,0,768,17152,1,8,0,0,0,0,100,1,0,0,20,0,0,10,2,228001,60,0.9,2,4000,0,100,0,1,704,1,3,16782016,0,0,0,0,0,30335,4,4,12,0);
 INSERT INTO `server_battle_commands` VALUES (27318,'flare',26,40,0,31,17152,1,8,0,0,0,1,100,1,0,0,20,0,0,10,2,223262,30,0.75,2,8000,120,200,0,1,706,1,3,16782018,0,0,0,0,0,30301,4,2,5,0);
 INSERT INTO `server_battle_commands` VALUES (27319,'freeze',26,35,0,768,17152,0,0,0,0,0,0,100,1,0,0,20,0,0,10,2,0,0,0,2,5000,120,120,0,1,707,1,3,16782019,0,0,0,0,0,30301,4,2,6,0);
 INSERT INTO `server_battle_commands` VALUES (27340,'sacred_prism',23,34,3,31,16415,0,0,0,0,0,0,100,1,0,0,0,0,0,10,2,223225,60,1,0,0,90,0,0,14,690,2,3,234889906,0,0,0,0,0,30328,3,4,0,0);
@@ -243,4 +243,4 @@ commit;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2019-06-01 21:15:51
+-- Dump completed on 2019-06-05 18:56:04

sql/server_statuseffects.sql

@@ -31,6 +31,8 @@ CREATE TABLE `server_statuseffects` (
   `hidden` tinyint(4) NOT NULL DEFAULT '0',
   `silentOnGain` tinyint(4) NOT NULL DEFAULT '0',
   `silentOnLoss` tinyint(4) NOT NULL DEFAULT '0',
+  `statusGainTextId` smallint(6) NOT NULL DEFAULT '30328',
+  `statusLossTextId` int(11) NOT NULL DEFAULT '30331',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -42,99 +44,102 @@ CREATE TABLE `server_statuseffects` (
 LOCK TABLES `server_statuseffects` WRITE;
 /*!40000 ALTER TABLE `server_statuseffects` DISABLE KEYS */;
 set autocommit=0;
-INSERT INTO `server_statuseffects` VALUES (223001,'quick',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223001,'quick',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223002,'haste',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223002,'haste',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223004,'petrification',264241173,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223003,'slow',21,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223005,'paralysis',21,2,3000,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223004,'petrification',264241173,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223006,'silence',4194325,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223005,'paralysis',21,2,3000,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223007,'blind',21,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223006,'silence',4194325,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223008,'mute',4194325,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223007,'blind',21,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223010,'glare',21,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223008,'mute',4194325,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223011,'poison',21,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223009,'slowcast',517,1,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223012,'transfixion',268435477,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223010,'glare',21,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223013,'pacification',8388629,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223011,'poison',21,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223014,'amnesia',16777237,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223012,'transfixion',268435477,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223015,'stun',264241173,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223013,'pacification',8388629,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223016,'daze',264241173,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223014,'amnesia',16777237,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223029,'hp_boost',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223015,'stun',264241173,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223030,'hp_penalty',21,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223016,'daze',264241173,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223038,'defense_down',21,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223029,'hp_boost',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223058,'aegis_boon',528409,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223030,'hp_penalty',21,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223062,'sentinel',1048601,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223038,'defense_down',21,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223063,'cover',16409,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223058,'aegis_boon',528409,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223064,'rampart',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223062,'sentinel',1048601,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223068,'tempered_will',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223063,'cover',16409,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223075,'featherfoot',131097,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223064,'rampart',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223078,'enduring_march',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223068,'tempered_will',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223081,'bloodbath',1048601,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223075,'featherfoot',131097,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223083,'foresight',262169,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223078,'enduring_march',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223091,'keen_flurry',1033,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223081,'bloodbath',1048601,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223094,'invigorate',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223083,'foresight',262169,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223097,'collusion',1048601,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223091,'keen_flurry',1033,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223104,'quelling_strike',1041,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223094,'invigorate',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223106,'hawks_eye',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223097,'collusion',1048601,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223108,'decoy',4113,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223104,'quelling_strike',1041,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223127,'bloodletter',21,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223106,'hawks_eye',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223129,'protect',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223108,'decoy',4113,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223133,'stoneskin',16393,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223127,'bloodletter',21,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223173,'covered',4105,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223129,'protect',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223180,'regen',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223133,'stoneskin',16393,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223181,'refresh',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223173,'covered',4105,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223182,'regain',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223180,'regen',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223183,'tp_bleed',21,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223181,'refresh',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223205,'combo',21,2,0,0,1,0);
+INSERT INTO `server_statuseffects` VALUES (223182,'regain',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223206,'goring_blade',21,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223183,'tp_bleed',21,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223207,'berserk2',537936145,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223205,'combo',21,2,0,0,1,0,0,30331);
-INSERT INTO `server_statuseffects` VALUES (223208,'rampage2',538984721,1,5000,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223206,'goring_blade',21,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223209,'fists_of_fire',536872209,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223207,'berserk2',537936145,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223210,'fists_of_earth',536872209,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223208,'rampage2',538984721,1,5000,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223211,'fists_of_wind',536872209,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223209,'fists_of_fire',536872209,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223212,'power_surge_I',1297,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223210,'fists_of_earth',536872209,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223213,'power_surge_II',1297,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223211,'fists_of_wind',536872209,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223214,'power_surge_III',1297,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223212,'power_surge_I',1297,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223215,'life_surge_I',1048857,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223213,'power_surge_II',1297,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223216,'life_surge_II',1048857,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223214,'power_surge_III',1297,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223217,'life_surge_III',1048857,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223215,'life_surge_I',1048857,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223218,'dread_spike',16649,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223216,'life_surge_II',1048857,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223219,'blood_for_blood',8209,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223217,'life_surge_III',1048857,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223220,'barrage',3081,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223218,'dread_spike',16649,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223221,'raging_strike2',537985297,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223219,'blood_for_blood',8209,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223224,'swiftsong',137,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223220,'barrage',3081,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223227,'cleric_stance',8209,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223221,'raging_strike2',537985297,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223228,'blissful_mind',536871185,1,1000,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223224,'swiftsong',137,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223229,'dark_seal2',1033,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223227,'cleric_stance',8209,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223230,'resonance2',2569,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223228,'blissful_mind',536871185,1,1000,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223231,'excruciate',2098185,2,3000,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223229,'dark_seal2',1033,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223232,'necrogenesis',1048585,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223230,'resonance2',2569,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223233,'parsimony',1049097,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223231,'excruciate',2098185,2,3000,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223234,'sanguine_rite2',16393,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223232,'necrogenesis',1048585,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223235,'aero',21,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223233,'parsimony',1049097,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223236,'outmaneuver2',524313,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223234,'sanguine_rite2',16393,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223237,'blindside2',8209,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223235,'aero',21,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223238,'decoy2',4113,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223236,'outmaneuver2',524313,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223239,'protect2',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223237,'blindside2',8209,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223240,'sanguine_rite3',16393,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223238,'decoy2',4113,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223241,'bloodletter2',21,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223239,'protect2',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223242,'fully_blissful_mind',536871185,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223240,'sanguine_rite3',16393,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223243,'magic_evasion_down',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223241,'bloodletter2',21,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223244,'hundred_fists',257,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223242,'fully_blissful_mind',536871185,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223245,'spinning_heel',9,1,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223243,'magic_evasion_down',9,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (223248,'divine_veil',36889,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223244,'hundred_fists',257,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223250,'vengeance',16401,1,5000,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223245,'spinning_heel',9,1,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223251,'antagonize',1048601,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223248,'divine_veil',36889,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223252,'mighty_strikes',8209,1,3000,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223250,'vengeance',16401,1,5000,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223253,'battle_voice',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223251,'antagonize',1048601,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223254,'ballad_of_magi',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223252,'mighty_strikes',8209,1,3000,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223255,'paeon_of_war',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223253,'battle_voice',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223256,'minuet_of_rigor',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223254,'ballad_of_magi',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (223264,'divine_regen',9,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223255,'paeon_of_war',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (228011,'bind',67108885,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223256,'minuet_of_rigor',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (228021,'heavy',21,2,0,0,0,0);
+INSERT INTO `server_statuseffects` VALUES (223264,'divine_regen',9,2,0,0,0,0,30328,30331);
-INSERT INTO `server_statuseffects` VALUES (253003,'evade_proc',273,1,0,1,1,1);
+INSERT INTO `server_statuseffects` VALUES (228001,'sleep',264273941,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (253004,'block_proc',273,1,0,1,1,1);
+INSERT INTO `server_statuseffects` VALUES (228011,'bind',67108885,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (253005,'parry_proc',273,1,0,1,1,1);
+INSERT INTO `server_statuseffects` VALUES (228021,'heavy',21,2,0,0,0,0,30335,30338);
-INSERT INTO `server_statuseffects` VALUES (253006,'miss_proc',273,1,0,1,1,1);
+INSERT INTO `server_statuseffects` VALUES (300000,'evade_proc',273,1,0,1,1,1,0,30331);
-INSERT INTO `server_statuseffects` VALUES (253007,'expchain',273,1,0,1,1,1);
+INSERT INTO `server_statuseffects` VALUES (300001,'block_proc',273,1,0,1,1,1,0,30331);
+INSERT INTO `server_statuseffects` VALUES (300002,'parry_proc',273,1,0,1,1,1,0,30331);
+INSERT INTO `server_statuseffects` VALUES (300003,'miss_proc',273,1,0,1,1,1,0,30331);
+INSERT INTO `server_statuseffects` VALUES (300004,'expchain',273,1,0,1,1,1,0,30331);
 /*!40000 ALTER TABLE `server_statuseffects` ENABLE KEYS */;
 UNLOCK TABLES;
 commit;
@@ -148,4 +153,4 @@ commit;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2019-06-01 21:15:54
+-- Dump completed on 2019-06-05 18:56:07