From d3b731f24a6cbe7f82d57bfdf8303d527ec54563 Mon Sep 17 00:00:00 2001 From: lyeeedar Date: Tue, 7 May 2019 07:36:47 +0100 Subject: [PATCH] Some fixes to druid heroes. --- android/assetsraw/Factions/Druid/Flix.xml | 27 +++++++++++++------ android/assetsraw/Particles/QuillSpray.xml | 6 ++--- .../Components/StatisticsComponent.kt | 7 ++++- .../Game/ActionSequence/RenderableActions.kt | 2 ++ core/src/com/lyeeedar/Game/Equipment.kt | 7 ++++- core/src/com/lyeeedar/UI/EntityWidget.kt | 7 +++-- 6 files changed, 41 insertions(+), 15 deletions(-) diff --git a/android/assetsraw/Factions/Druid/Flix.xml b/android/assetsraw/Factions/Druid/Flix.xml index f33b13f..ae05186 100644 --- a/android/assetsraw/Factions/Druid/Flix.xml +++ b/android/assetsraw/Factions/Druid/Flix.xml @@ -154,27 +154,39 @@ Terrorize - Summon a dark whisp to terrorize an enemy, giving them a [GOLD]50%[] fumble and [GOLD]50%[] root chance. The whisp moves to a new enemy every turn. + Summon a dark whisp to terrorize an enemy, giving them a [GOLD]30%[] fumble and [GOLD]30%[] root chance. The whisp moves to a new enemy every turn. Oryx/uf_split/uf_heroes/moth_red_1 + + + 99 + + + - + Origin + + + false + 0.15 - + FlightParticle + 255,255,255,139 + 0.6 @@ -185,22 +197,21 @@ - true Origin - + 0.0194403082 - + true - 0.5 - 0.5 + 0.3 + 0.3 1 diff --git a/android/assetsraw/Particles/QuillSpray.xml b/android/assetsraw/Particles/QuillSpray.xml index 2ee0fa6..22d85f6 100644 --- a/android/assetsraw/Particles/QuillSpray.xml +++ b/android/assetsraw/Particles/QuillSpray.xml @@ -10,7 +10,7 @@ 0|1 Border - 1,1 + 1.4,1.8 0,360 0|20 @@ -18,11 +18,11 @@ true - 0.4,0.5 + 0.25,0.35 true - 0|0.2|0.4 + 0|0.1|0.2 Multiplicative diff --git a/core/src/com/lyeeedar/Components/StatisticsComponent.kt b/core/src/com/lyeeedar/Components/StatisticsComponent.kt index 8625bbb..0336f4a 100644 --- a/core/src/com/lyeeedar/Components/StatisticsComponent.kt +++ b/core/src/com/lyeeedar/Components/StatisticsComponent.kt @@ -313,11 +313,14 @@ class StatisticsComponent: AbstractComponent() hp *= 1f + getStat(Statistic.AEGIS) hp *= 1f + getStat(Statistic.DR) hp *= 1f + getStat(Statistic.REGENERATION) * 2f + hp *= (1f - getStat(Statistic.ROOT)) + hp *= 1f + getStat(Statistic.FLEETFOOT) var power = getStat(Statistic.POWER) * 10f power += (power * (1f + getStat(Statistic.CRITDAMAGE))) * getStat(Statistic.CRITCHANCE) - power *= 1f + getStat(Statistic.HASTE) + power *= 1f + (getStat(Statistic.HASTE) + getStat(Statistic.DERVISH)) power *= 1f + getStat(Statistic.LIFESTEAL) + power *= (1f - getStat(Statistic.FUMBLE)) var rating = hp + power val ability = entity.ability() @@ -345,6 +348,8 @@ class StatisticsComponent: AbstractComponent() abilityModifier += getStat(Statistic.ABILITYCOOLDOWN) } + abilityModifier *= (1f - getStat(Statistic.DISTRACTION)) + rating *= 1f + abilityModifier * 0.5f } diff --git a/core/src/com/lyeeedar/Game/ActionSequence/RenderableActions.kt b/core/src/com/lyeeedar/Game/ActionSequence/RenderableActions.kt index 4c2f625..92fcf70 100644 --- a/core/src/com/lyeeedar/Game/ActionSequence/RenderableActions.kt +++ b/core/src/com/lyeeedar/Game/ActionSequence/RenderableActions.kt @@ -75,6 +75,8 @@ class ReplaceSourceRenderableAction() : AbstractActionSequenceAction() { if (Global.resolveInstant) return + if (!restoreOriginal) return + val source = sequence.source if (originalRenderable != null) diff --git a/core/src/com/lyeeedar/Game/Equipment.kt b/core/src/com/lyeeedar/Game/Equipment.kt index efb6a7d..9584887 100644 --- a/core/src/com/lyeeedar/Game/Equipment.kt +++ b/core/src/com/lyeeedar/Game/Equipment.kt @@ -129,6 +129,8 @@ class Equipment(override var loadPath: String) : IEquipmentStatsProvider hp *= 1f + getStat(Statistic.AEGIS, stats.level) hp *= 1f + getStat(Statistic.DR, stats.level) hp *= 1f + getStat(Statistic.REGENERATION, stats.level) * 2f + hp *= (1f - getStat(Statistic.ROOT, stats.level)) + hp *= 1f + getStat(Statistic.FLEETFOOT, stats.level) var power = stats.baseStats[Statistic.POWER].applyAscensionAndLevel(stats.level, stats.ascension) * 10f + getStat(Statistic.POWER, stats.level) * 10f power = max(power, 1f) @@ -136,8 +138,9 @@ class Equipment(override var loadPath: String) : IEquipmentStatsProvider val critDam = 1f + getStat(Statistic.CRITDAMAGE, stats.level) + stats.baseStats[Statistic.CRITDAMAGE] val critChance = getStat(Statistic.CRITCHANCE, stats.level) + stats.baseStats[Statistic.CRITCHANCE] power += (power * critDam) * critChance - power *= 1f + getStat(Statistic.HASTE, stats.level) + power *= 1f + getStat(Statistic.HASTE, stats.level) + getStat(Statistic.DERVISH, stats.level) power *= 1f + getStat(Statistic.LIFESTEAL, stats.level) + power *= (1f - getStat(Statistic.FUMBLE, stats.level)) var rating = hp + power @@ -174,6 +177,8 @@ class Equipment(override var loadPath: String) : IEquipmentStatsProvider abilityModifier += getStat(Statistic.ABILITYCOOLDOWN, stats.level) } + abilityModifier *= (1f - getStat(Statistic.DISTRACTION, stats.level)) + rating *= 1f + abilityModifier * 0.5f } diff --git a/core/src/com/lyeeedar/UI/EntityWidget.kt b/core/src/com/lyeeedar/UI/EntityWidget.kt index d38d150..6db4650 100644 --- a/core/src/com/lyeeedar/UI/EntityWidget.kt +++ b/core/src/com/lyeeedar/UI/EntityWidget.kt @@ -112,7 +112,7 @@ class EntityWidget(var entity: Entity?) : Widget() var i = 0 for (buffCounter in buffCounterMap.values()) { - batch.setColor(buffCounter.buff.icon!!.colour.color().toFloatBits()) + batch.setColor(buffCounter.buff.icon!!.colour) batch.draw(buffCounter.buff.icon!!.currentTexture, x + 5f + i * solid * 3, y + 10f, solid * 3, solid * 3) batch.setColor(Colour.WHITE) font.draw(batch, buffCounter.count.toString(), x + 5f + i * solid * 3 + solid * 2, y + 20f) @@ -126,11 +126,14 @@ class EntityWidget(var entity: Entity?) : Widget() val abx = x+width-17f val aby = y+height-17f - batch.setColor(whiteColour) for (i in 0 until ability.abilities.size) { val ab = ability.abilities[i] + + batch.setColor(whiteColour) batch.draw(background, abx, aby-i*12f, 10f, 10f) + + batch.setColor(ab.icon.colour) batch.draw(ab.icon.currentTexture, abx, aby-i*12f, 10f, 10f) if (ab.remainingCooldown > 0)