Some fixes to druid heroes.

Lyeeedar · May 7, 2019 · d3b731f · d3b731f
1 parent bf26771
commit d3b731f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 15 deletions.
diff --git a/android/assetsraw/Factions/Druid/Flix.xml b/android/assetsraw/Factions/Druid/Flix.xml
@@ -154,27 +154,39 @@
 				</AbilityData>
 				<AbilityData>
 					<Name>Terrorize</Name>
-					<Description>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.</Description>
+					<Description>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.</Description>
 					<Icon meta:RefKey="Sprite">
 						<Name>Oryx/uf_split/uf_heroes/moth_red_1</Name>
 					</Icon>
 					<Ability meta:RefKey="ActionSequence">
 						<Timeline>
 							<SelectSelf />
+							<UnlockEntity>
+								<Time>0.00755987177</Time>
+							</UnlockEntity>
 							<RepeatBegin>
 								<Time>0.0150237549</Time>
 								<Count>99</Count>
 							</RepeatBegin>
+							<BlockTurn>
+								<Time>0.01970524</Time>
+							</BlockTurn>
 							<StoreTargets>
-								<Time>0.032007128</Time>
+								<Time>0.0270498376</Time>
 								<Key>Origin</Key>
 							</StoreTargets>
+							<SelectEnemies>
+								<Time>0.0338335223</Time>
+								<AllowCurrent>false</AllowCurrent>
+							</SelectEnemies>
 							<MovementRenderable>
 								<Duration LockDuration="False">0.15</Duration>
-								<Time>0.0496437028</Time>
+								<Time>0.0392333865</Time>
 								<Renderable meta:RefKey="ParticleEffectTemplate">
 									<Base meta:RefKey="ParticleEffect">
 										<Name>FlightParticle</Name>
+										<Colour>255,255,255,139</Colour>
+										<Scale>0.6</Scale>
 									</Base>
 									<Overrides>
 										<OverrideTexture>
@@ -185,22 +197,21 @@
 										</OverrideTexture>
 									</Overrides>
 								</Renderable>
-								<UseLeap>true</UseLeap>
 								<Origin>Origin</Origin>
 							</MovementRenderable>
 							<RepeatEnd>
-								<Time>0.204397827</Time>
+								<Time>0.192004591</Time>
 							</RepeatEnd>
 						</Timeline>
 						<Timeline>
 							<Debuff>
 								<Duration LockDuration="False">0.0194403082</Duration>
-								<Time>0.1802034</Time>
+								<Time>0.169793084</Time>
 								<Buff meta:RefKey="Buff">
 									<UseParentNameAndIcon>true</UseParentNameAndIcon>
 									<Statistics meta:RefKey="Statistics">
-										<Root>0.5</Root>
-										<Fumble>0.5</Fumble>
+										<Root>0.3</Root>
+										<Fumble>0.3</Fumble>
 									</Statistics>
 									<Duration>1</Duration>
 								</Buff>

diff --git a/android/assetsraw/Particles/QuillSpray.xml b/android/assetsraw/Particles/QuillSpray.xml
@@ -10,19 +10,19 @@
 				<Keyframe>0|1</Keyframe>
 			</SizeMultiplier>
 			<Area>Border</Area>
-			<ParticleSpeed>1,1</ParticleSpeed>
+			<ParticleSpeed>1.4,1.8</ParticleSpeed>
 			<ParticleRotation>0,360</ParticleRotation>
 			<RateKeyframes>
 				<Keyframe>0|20</Keyframe>
 			</RateKeyframes>
 			<SingleBurst>true</SingleBurst>
 			<Particles>
 				<Particle>
-					<Lifetime>0.4,0.5</Lifetime>
+					<Lifetime>0.25,0.35</Lifetime>
 					<VelocityAligned>true</VelocityAligned>
 					<SizeKeyframes>
 						<Stream>
-							<Keyframe>0|0.2|0.4</Keyframe>
+							<Keyframe>0|0.1|0.2</Keyframe>
 						</Stream>
 					</SizeKeyframes>
 					<BlendMode>Multiplicative</BlendMode>

diff --git 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
@@ -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
@@ -129,15 +129,18 @@ 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)
 
 		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
@@ -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)