diff --git a/src/Data/Minions.lua b/src/Data/Minions.lua index 221a1612..fddf07fb 100644 --- a/src/Data/Minions.lua +++ b/src/Data/Minions.lua @@ -1724,7 +1724,6 @@ minions["LivingLightningMinion"] = { minions["PenanceMarkPhantasm"] = { name = "Shackled Phantasm", - hostile = true, monsterTags = { "caster", "fire_affinity", "ghost", "ghost_armour", "ghost_blood", "is_unarmed", "medium_movement", "slashing_weapon", "undead", }, life = 1.3, fireResist = 40, @@ -1736,7 +1735,7 @@ minions["PenanceMarkPhantasm"] = { attackTime = 1.755, attackRange = 6, accuracy = 1, - limit = "ActiveVoidSpawnLimit", + hostile = true, skillList = { "MPSPhantasmBasicBlood", }, diff --git a/src/Export/Minions/Minions.txt b/src/Export/Minions/Minions.txt index 9bd731a3..8e8dc525 100644 --- a/src/Export/Minions/Minions.txt +++ b/src/Export/Minions/Minions.txt @@ -242,5 +242,5 @@ minions["GuardianRelicAll"] = { #emit #monster Metadata/Monsters/SummonedPhantasm/SummonedPhantasmPenanceMark PenanceMarkPhantasm -#limit ActiveVoidSpawnLimit +#hostile true #emit \ No newline at end of file diff --git a/src/Export/Scripts/minions.lua b/src/Export/Scripts/minions.lua index e8f984dd..f0bf39f2 100644 --- a/src/Export/Scripts/minions.lua +++ b/src/Export/Scripts/minions.lua @@ -99,6 +99,7 @@ directiveTable.monster = function(state, args, out) state.varietyId = nil state.name = nil state.limit = nil + state.hostile = nil state.extraModList = { } state.extraSkillList = { } for arg in args:gmatch("%S+") do @@ -123,6 +124,11 @@ directiveTable.limit = function(state, args, out) state.limit = args end +-- #hostile [true|false] +directiveTable.hostile = function(state, args, out) + state.hostile = args +end + -- #mod directiveTable.mod = function(state, args, out) table.insert(state.extraModList, args) @@ -194,6 +200,9 @@ directiveTable.emit = function(state, args, out) if state.limit then out:write('\tlimit = "', state.limit, '",\n') end + if state.hostile then + out:write('\thostile = ', state.hostile, ',\n') + end out:write('\tskillList = {\n') for _, grantedEffect in ipairs(monsterVariety.GrantedEffects) do out:write('\t\t"', grantedEffect.Id, '",\n') diff --git a/src/Export/Skills/other.txt b/src/Export/Skills/other.txt index 92f39cf5..9b228acb 100644 --- a/src/Export/Skills/other.txt +++ b/src/Export/Skills/other.txt @@ -659,6 +659,7 @@ local skills, mod, flag, skill = ... }, }, #baseMod skill("debuff", true) +#baseMod skill("minionLevelIsEnemyLevel", true) #mods #skill PhysicalAegis