Merge pull request #10045 from Frankie-hz/familyrename

[cpp, lua, sql] Renames family to species

Author: Xaver-DaRed

scripts/actions/mobskills/abrasive_tantara.lua

@@ -11,7 +11,7 @@
 local mobskillObject = {}
 
 mobskillObject.onMobSkillCheck = function(target, mob, skill)
-    if mob:getAnimationSub() == 5 and mob:getFamily() == xi.mobSpecies.IMP then -- Imps without horn
+    if mob:getAnimationSub() == 5 and mob:getSpecies() == xi.mobSpecies.IMP then -- Imps without horn
         return 1
     else
         return 0

scripts/actions/mobskills/astral_flow_pet.lua

@@ -57,7 +57,7 @@ mobskillObject.onMobWeaponSkill = function(mob, target, skill, action)
     end
 
     -- Find proper pet skill
-    local petFamily = pet:getFamily()
+    local petFamily = pet:getSpecies()
     local skillId   = xi.mobSkill.SEARING_LIGHT_1 -- Default to Searing Light if not found below
 
     for mobSkillId, petFamilyList in pairs(petAstralFlowAbility) do

scripts/actions/mobskills/crosswind.lua

@@ -8,7 +8,7 @@ local mobskillObject = {}
 
 mobskillObject.onMobSkillCheck = function(target, mob, skill)
     if
-        mob:getFamily() == xi.mobSpecies.WARDEN and -- Pandemonium Warden TODO: Set skill lists
+        mob:getSpecies() == xi.mobSpecies.WARDEN and -- Pandemonium Warden TODO: Set skill lists
         mob:getModelId() ~= 1746
     then
         return 1

scripts/actions/mobskills/deafening_tantara.lua

@@ -11,7 +11,7 @@
 local mobskillObject = {}
 
 mobskillObject.onMobSkillCheck = function(target, mob, skill)
-    if mob:getAnimationSub() == 5 and mob:getFamily() == xi.mobSpecies.IMP then -- Imps without horn
+    if mob:getAnimationSub() == 5 and mob:getSpecies() == xi.mobSpecies.IMP then -- Imps without horn
         return 1
     else
         return 0

scripts/actions/mobskills/digest.lua

@@ -10,10 +10,10 @@ local mobskillObject = {}
 mobskillObject.onMobSkillCheck = function(target, mob, skill)
     -- TODO: Move to mobskill script?
     if
-        mob:getFamily() == xi.mobSpecies.BOIL or -- Boil
-        mob:getFamily() == xi.mobSpecies.CLOT or -- Clot
-        mob:getFamily() == xi.mobSpecies.SCUM or -- Scum
-        mob:getFamily() == xi.mobSpecies.SLIME   -- Slime
+        mob:getSpecies() == xi.mobSpecies.BOIL or -- Boil
+        mob:getSpecies() == xi.mobSpecies.CLOT or -- Clot
+        mob:getSpecies() == xi.mobSpecies.SCUM or -- Scum
+        mob:getSpecies() == xi.mobSpecies.SLIME   -- Slime
     then -- Slime family
         if mob:checkDistance(target) < 3 then -- Don't use it if he is on his target.
             return 1

scripts/actions/mobskills/frenetic_rip.lua

@@ -9,7 +9,7 @@ local mobskillObject = {}
 mobskillObject.onMobSkillCheck = function(target, mob, skill)
     if
         mob:getAnimationSub() == 4 and
-        mob:getFamily() == xi.mobSpecies.HORNED_IMP
+        mob:getSpecies() == xi.mobSpecies.HORNED_IMP
     then
         return 1
     else

scripts/actions/mobskills/stifling_tantara.lua

@@ -8,7 +8,7 @@
 local mobskillObject = {}
 
 mobskillObject.onMobSkillCheck = function(target, mob, skill)
-    if mob:getAnimationSub() == 5 and mob:getFamily() == xi.mobSpecies.IMP then -- Imps without horn
+    if mob:getAnimationSub() == 5 and mob:getSpecies() == xi.mobSpecies.IMP then -- Imps without horn
         return 1
     else
         return 0

scripts/actions/spells/black/meteor.lua

@@ -32,7 +32,7 @@ spellObject.onSpellCast = function(caster, target, spell)
         -- TODO: Account for all mitigation sources.
         -- TODO: Account for rage.
         damage = caster:getMainLvl() * 15.5
-    elseif caster:getFamily() == xi.mobSpecies.PROMATHIA then -- Promathia family
+    elseif caster:getSpecies() == xi.mobSpecies.PROMATHIA then -- Promathia family
         damage = caster:getMainLvl() * 7
     else
         damage = ((100 + caster:getMod(xi.mod.MATT)) / (100 + target:getMod(xi.mod.MDEF))) * (caster:getStat(xi.mod.INT) + (caster:getMaxSkillLevel(caster:getMainLvl(), xi.job.BLM, xi.skill.ELEMENTAL_MAGIC)) / 6) * 9.4

scripts/commands/getmobspecies.lua scripts/commands/getspecies.luascripts/commands/getmobspecies.lua renamed to scripts/commands/getspecies.lua

@@ -1,5 +1,5 @@
 -----------------------------------
--- func: getmobspecies <optional MobID>
+-- func: getspecies <optional MobID>
 -- desc: Prints the mob's species ID.
 -----------------------------------
 ---@type TCommand
@@ -13,7 +13,7 @@ commandObj.cmdprops =
 
 local function error(player, msg)
     player:printToPlayer(msg)
-    player:printToPlayer('!getmobspecies (mob ID)')
+    player:printToPlayer('!getspecies (mob ID)')
 end
 
 local function getSpeciesName(id)
@@ -42,7 +42,7 @@ commandObj.onTrigger = function(player, mobId)
         end
     end
 
-    local speciesId = targ:getFamily()
+    local speciesId = targ:getSpecies()
     player:printToPlayer(string.format('%s %i mob species is %i (%s).', targ:getName(), targ:getID(), speciesId, getSpeciesName(speciesId)))
 end
 

scripts/effects/counterstance.lua

@@ -6,7 +6,7 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    if target:isMob() and target:getFamily() == xi.mobSpecies.BUGBEAR then -- Bugbear Family
+    if target:isMob() and target:getSpecies() == xi.mobSpecies.BUGBEAR then -- Bugbear Family
         effect:addMod(xi.mod.ATTP, 15)
     end