Skip to content

Commit 4320038

Browse files
author
LocalIdentity
committed
Fix Export
1 parent 6f954d7 commit 4320038

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

src/Data/Minions.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1724,7 +1724,6 @@ minions["LivingLightningMinion"] = {
17241724

17251725
minions["PenanceMarkPhantasm"] = {
17261726
name = "Shackled Phantasm",
1727-
hostile = true,
17281727
monsterTags = { "caster", "fire_affinity", "ghost", "ghost_armour", "ghost_blood", "is_unarmed", "medium_movement", "slashing_weapon", "undead", },
17291728
life = 1.3,
17301729
fireResist = 40,
@@ -1736,7 +1735,7 @@ minions["PenanceMarkPhantasm"] = {
17361735
attackTime = 1.755,
17371736
attackRange = 6,
17381737
accuracy = 1,
1739-
limit = "ActiveVoidSpawnLimit",
1738+
hostile = true,
17401739
skillList = {
17411740
"MPSPhantasmBasicBlood",
17421741
},

src/Export/Minions/Minions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,5 +242,5 @@ minions["GuardianRelicAll"] = {
242242
#emit
243243

244244
#monster Metadata/Monsters/SummonedPhantasm/SummonedPhantasmPenanceMark PenanceMarkPhantasm
245-
#limit ActiveVoidSpawnLimit
245+
#hostile true
246246
#emit

src/Export/Scripts/minions.lua

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ directiveTable.monster = function(state, args, out)
9999
state.varietyId = nil
100100
state.name = nil
101101
state.limit = nil
102+
state.hostile = nil
102103
state.extraModList = { }
103104
state.extraSkillList = { }
104105
for arg in args:gmatch("%S+") do
@@ -123,6 +124,11 @@ directiveTable.limit = function(state, args, out)
123124
state.limit = args
124125
end
125126

127+
-- #hostile [true|false]
128+
directiveTable.hostile = function(state, args, out)
129+
state.hostile = args
130+
end
131+
126132
-- #mod <ModDecl>
127133
directiveTable.mod = function(state, args, out)
128134
table.insert(state.extraModList, args)
@@ -194,6 +200,9 @@ directiveTable.emit = function(state, args, out)
194200
if state.limit then
195201
out:write('\tlimit = "', state.limit, '",\n')
196202
end
203+
if state.hostile then
204+
out:write('\thostile = ', state.hostile, ',\n')
205+
end
197206
out:write('\tskillList = {\n')
198207
for _, grantedEffect in ipairs(monsterVariety.GrantedEffects) do
199208
out:write('\t\t"', grantedEffect.Id, '",\n')

src/Export/Skills/other.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,7 @@ local skills, mod, flag, skill = ...
659659
},
660660
},
661661
#baseMod skill("debuff", true)
662+
#baseMod skill("minionLevelIsEnemyLevel", true)
662663
#mods
663664

664665
#skill PhysicalAegis

0 commit comments

Comments
 (0)