Merge branch 'fix-form-skill-xp'
This commit is contained in:
commit
fdc5d9fab7
11 changed files with 105 additions and 9 deletions
|
|
@ -119,7 +119,10 @@ namespace RacesOfValheim
|
||||||
if (Time.time >= nextPulse)
|
if (Time.time >= nextPulse)
|
||||||
{
|
{
|
||||||
nextPulse = Time.time + AlfarPowerConfig.ArchonPulseInterval.Value;
|
nextPulse = Time.time + AlfarPowerConfig.ArchonPulseInterval.Value;
|
||||||
AlfarPowers.Pulse(player, AlfarPowerConfig.ArchonPulseRadius.Value, AlfarPowerConfig.ArchonPulseDamage.Value);
|
// The pulse fires on its own while the form lasts, so it earns what an aura does:
|
||||||
|
// a tenth of a hit per second, once per pulse that struck something.
|
||||||
|
if (AlfarPowers.Pulse(player, AlfarPowerConfig.ArchonPulseRadius.Value, AlfarPowerConfig.ArchonPulseDamage.Value))
|
||||||
|
FormMelee.RaiseSkill(Skills.SkillType.ElementalMagic, 0.1f * AlfarPowerConfig.ArchonPulseInterval.Value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -148,12 +148,17 @@ namespace RacesOfValheim
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>A pulse of lightning on every hostile creature within a radius of the Alfr.</summary>
|
/// <summary>A pulse of lightning on every hostile creature within a radius of the Alfr.</summary>
|
||||||
public static void Pulse(Player player, float radius, float damage)
|
/// <returns>True if it struck at least one creature.</returns>
|
||||||
|
public static bool Pulse(Player player, float radius, float damage)
|
||||||
{
|
{
|
||||||
|
bool struck = false;
|
||||||
foreach (Character character in CharactersIn(player.transform.position, radius))
|
foreach (Character character in CharactersIn(player.transform.position, radius))
|
||||||
{
|
{
|
||||||
if (IsHostile(player, character)) Strike(player, character, damage, character.GetCenterPoint());
|
if (!IsHostile(player, character)) continue;
|
||||||
|
Strike(player, character, damage, character.GetCenterPoint());
|
||||||
|
struck = true;
|
||||||
}
|
}
|
||||||
|
return struck;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static IEnumerable<Character> CharactersIn(Vector3 center, float radius)
|
private static IEnumerable<Character> CharactersIn(Vector3 center, float radius)
|
||||||
|
|
@ -396,7 +401,11 @@ namespace RacesOfValheim
|
||||||
AlfarEitr.Spend(player, cost);
|
AlfarEitr.Spend(player, cost);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsHostile(player, target)) Strike(player, target, AlfarPowerConfig.BeamDps.Value * tick, end);
|
if (IsHostile(player, target))
|
||||||
|
{
|
||||||
|
Strike(player, target, AlfarPowerConfig.BeamDps.Value * tick, end);
|
||||||
|
FormMelee.RaiseSkill(Skills.SkillType.ElementalMagic, tick); // a full hit per second on target
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void RaiseHand(Player player)
|
private static void RaiseHand(Player player)
|
||||||
|
|
@ -548,14 +557,19 @@ namespace RacesOfValheim
|
||||||
const float tick = 0.5f;
|
const float tick = 0.5f;
|
||||||
nextTick = Time.time + tick;
|
nextTick = Time.time + tick;
|
||||||
|
|
||||||
|
bool struck = false;
|
||||||
foreach (Collider collider in Physics.OverlapSphere(transform.position, Radius, ~0, QueryTriggerInteraction.Ignore))
|
foreach (Collider collider in Physics.OverlapSphere(transform.position, Radius, ~0, QueryTriggerInteraction.Ignore))
|
||||||
{
|
{
|
||||||
Character character = collider.GetComponentInParent<Character>();
|
Character character = collider.GetComponentInParent<Character>();
|
||||||
if (character == null || character == Owner || character.IsDead() || character.IsTamed()) continue;
|
if (character == null || character == Owner || character.IsDead() || character.IsTamed()) continue;
|
||||||
if (!BaseAI.IsEnemy(Owner, character)) continue;
|
if (!BaseAI.IsEnemy(Owner, character)) continue;
|
||||||
AlfarPowers.Strike(Owner, character, DamagePerSecond * tick, character.GetCenterPoint());
|
AlfarPowers.Strike(Owner, character, DamagePerSecond * tick, character.GetCenterPoint());
|
||||||
|
struck = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Once per tick, not per creature: a full hit per second the storm strikes something.
|
||||||
|
if (struck && Owner == Player.m_localPlayer) FormMelee.RaiseSkill(Skills.SkillType.ElementalMagic, tick);
|
||||||
|
|
||||||
Vector2 offset = Random.insideUnitCircle * Radius;
|
Vector2 offset = Random.insideUnitCircle * Radius;
|
||||||
AlfarFx.Spawn("fx_JotunWitch_LightningBolt_Explosion", transform.position + new Vector3(offset.x, 0f, offset.y));
|
AlfarFx.Spawn("fx_JotunWitch_LightningBolt_Explosion", transform.position + new Vector3(offset.x, 0f, offset.y));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1191,6 +1191,7 @@ namespace RacesOfValheim
|
||||||
|
|
||||||
int layerMask = LayerMask.GetMask("character", "character_net", "character_ghost");
|
int layerMask = LayerMask.GetMask("character", "character_net", "character_ghost");
|
||||||
var colliders = Physics.OverlapSphere(center, radius, layerMask);
|
var colliders = Physics.OverlapSphere(center, radius, layerMask);
|
||||||
|
bool hitCreature = false;
|
||||||
|
|
||||||
foreach (var col in colliders)
|
foreach (var col in colliders)
|
||||||
{
|
{
|
||||||
|
|
@ -1241,10 +1242,16 @@ namespace RacesOfValheim
|
||||||
// kill). ApplyDamage() skipped all of that: it edited the local copy of a
|
// kill). ApplyDamage() skipped all of that: it edited the local copy of a
|
||||||
// character we usually do not own, and the owner overwrote it on the next sync.
|
// character we usually do not own, and the owner overwrote it on the next sync.
|
||||||
c.Damage(hd);
|
c.Damage(hd);
|
||||||
|
hitCreature = true;
|
||||||
|
|
||||||
SpawnBloodVFX(c);
|
SpawnBloodVFX(c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The aura scales with Blood Magic but called Damage directly, so it never paid
|
||||||
|
// the skill back. Passive and always on, so it earns what the Skadi's Frost Aura
|
||||||
|
// does: a tenth of a hit per second of draining, once per tick, not per victim.
|
||||||
|
if (hitCreature) FormMelee.RaiseSkill(Skills.SkillType.BloodMagic, 0.1f * AswidConfig.AuraTickInterval.Value);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -774,6 +774,7 @@ namespace RacesOfValheim
|
||||||
Collider[] hits = Physics.OverlapSphere(attackPoint, attackRadius, layerMask);
|
Collider[] hits = Physics.OverlapSphere(attackPoint, attackRadius, layerMask);
|
||||||
FormMelee.LogSwing(FormLabel, hits.Length);
|
FormMelee.LogSwing(FormLabel, hits.Length);
|
||||||
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
||||||
|
bool hitCreature = false;
|
||||||
|
|
||||||
foreach (Collider hit in hits)
|
foreach (Collider hit in hits)
|
||||||
{
|
{
|
||||||
|
|
@ -823,10 +824,13 @@ namespace RacesOfValheim
|
||||||
FormMelee.LogHit(FormLabel, target, totalDamage);
|
FormMelee.LogHit(FormLabel, target, totalDamage);
|
||||||
target.Damage(hitData);
|
target.Damage(hitData);
|
||||||
FormMelee.GrantAdrenaline(target);
|
FormMelee.GrantAdrenaline(target);
|
||||||
|
if (target is Character) hitCreature = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (hitCreature) FormMelee.RaiseSkill(Skills.SkillType.Unarmed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1067,6 +1071,7 @@ namespace RacesOfValheim
|
||||||
Collider[] hits = Physics.OverlapSphere(attackPoint, attackRadius, layerMask);
|
Collider[] hits = Physics.OverlapSphere(attackPoint, attackRadius, layerMask);
|
||||||
FormMelee.LogSwing(FormLabel, hits.Length);
|
FormMelee.LogSwing(FormLabel, hits.Length);
|
||||||
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
||||||
|
bool hitCreature = false;
|
||||||
|
|
||||||
foreach (Collider hit in hits)
|
foreach (Collider hit in hits)
|
||||||
{
|
{
|
||||||
|
|
@ -1106,6 +1111,7 @@ namespace RacesOfValheim
|
||||||
FormMelee.LogHit(FormLabel, target, totalDamage);
|
FormMelee.LogHit(FormLabel, target, totalDamage);
|
||||||
target.Damage(hitData);
|
target.Damage(hitData);
|
||||||
FormMelee.GrantAdrenaline(target, 0.2f); // one 0.2s tick: a full hit per second of breath
|
FormMelee.GrantAdrenaline(target, 0.2f); // one 0.2s tick: a full hit per second of breath
|
||||||
|
if (target is Character) hitCreature = true;
|
||||||
|
|
||||||
if (ZNetScene.instance != null)
|
if (ZNetScene.instance != null)
|
||||||
{
|
{
|
||||||
|
|
@ -1115,6 +1121,8 @@ namespace RacesOfValheim
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (hitCreature) FormMelee.RaiseSkill(Skills.SkillType.ElementalMagic, 0.2f); // one 0.2s tick: a full swing's worth per second of breath
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerator ClawRoutine()
|
private IEnumerator ClawRoutine()
|
||||||
|
|
@ -1231,6 +1239,7 @@ namespace RacesOfValheim
|
||||||
Collider[] hits = Physics.OverlapSphere(attackPoint, attackRadius, layerMask);
|
Collider[] hits = Physics.OverlapSphere(attackPoint, attackRadius, layerMask);
|
||||||
FormMelee.LogSwing(FormLabel, hits.Length);
|
FormMelee.LogSwing(FormLabel, hits.Length);
|
||||||
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
||||||
|
bool hitCreature = false;
|
||||||
|
|
||||||
foreach (Collider hit in hits)
|
foreach (Collider hit in hits)
|
||||||
{
|
{
|
||||||
|
|
@ -1280,10 +1289,13 @@ namespace RacesOfValheim
|
||||||
FormMelee.LogHit(FormLabel, target, totalDamage);
|
FormMelee.LogHit(FormLabel, target, totalDamage);
|
||||||
target.Damage(hitData);
|
target.Damage(hitData);
|
||||||
FormMelee.GrantAdrenaline(target);
|
FormMelee.GrantAdrenaline(target);
|
||||||
|
if (target is Character) hitCreature = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (hitCreature) FormMelee.RaiseSkill(Skills.SkillType.Unarmed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1446,6 +1458,7 @@ namespace RacesOfValheim
|
||||||
Collider[] hits = Physics.OverlapSphere(attackPoint, attackRadius, layerMask);
|
Collider[] hits = Physics.OverlapSphere(attackPoint, attackRadius, layerMask);
|
||||||
FormMelee.LogSwing(FormLabel, hits.Length);
|
FormMelee.LogSwing(FormLabel, hits.Length);
|
||||||
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
||||||
|
bool hitCreature = false;
|
||||||
|
|
||||||
foreach (Collider hit in hits)
|
foreach (Collider hit in hits)
|
||||||
{
|
{
|
||||||
|
|
@ -1495,10 +1508,13 @@ namespace RacesOfValheim
|
||||||
FormMelee.LogHit(FormLabel, target, totalDamage);
|
FormMelee.LogHit(FormLabel, target, totalDamage);
|
||||||
target.Damage(hitData);
|
target.Damage(hitData);
|
||||||
FormMelee.GrantAdrenaline(target);
|
FormMelee.GrantAdrenaline(target);
|
||||||
|
if (target is Character) hitCreature = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (hitCreature) FormMelee.RaiseSkill(Skills.SkillType.Unarmed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1654,6 +1670,7 @@ namespace RacesOfValheim
|
||||||
Collider[] hits = Physics.OverlapSphere(attackPoint, attackRadius, layerMask);
|
Collider[] hits = Physics.OverlapSphere(attackPoint, attackRadius, layerMask);
|
||||||
FormMelee.LogSwing(FormLabel, hits.Length);
|
FormMelee.LogSwing(FormLabel, hits.Length);
|
||||||
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
||||||
|
bool hitCreature = false;
|
||||||
|
|
||||||
foreach (Collider hit in hits)
|
foreach (Collider hit in hits)
|
||||||
{
|
{
|
||||||
|
|
@ -1703,10 +1720,13 @@ namespace RacesOfValheim
|
||||||
FormMelee.LogHit(FormLabel, target, totalDamage);
|
FormMelee.LogHit(FormLabel, target, totalDamage);
|
||||||
target.Damage(hitData);
|
target.Damage(hitData);
|
||||||
FormMelee.GrantAdrenaline(target);
|
FormMelee.GrantAdrenaline(target);
|
||||||
|
if (target is Character) hitCreature = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (hitCreature) FormMelee.RaiseSkill(Skills.SkillType.Unarmed);
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerator UlvJumpAttackRoutine()
|
private IEnumerator UlvJumpAttackRoutine()
|
||||||
|
|
|
||||||
|
|
@ -368,6 +368,21 @@ namespace RacesOfValheim
|
||||||
player.AddAdrenaline(perHit * character.m_enemyAdrenalineMultiplier * scale);
|
player.AddAdrenaline(perHit * character.m_enemyAdrenalineMultiplier * scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The skill experience vanilla gives for a weapon hit, which a hand-built hit never got.
|
||||||
|
/// Vanilla raises the skill inside Attack (once per swing that landed on a creature) and
|
||||||
|
/// inside Projectile.OnHit; Character.Damage never does, so a form that calls Damage
|
||||||
|
/// directly left its skill at whatever level the player brought in. Call it once per
|
||||||
|
/// swing or tick, after the loop, never once per target. amount lets a damage-over-time
|
||||||
|
/// tick pay a fraction of a swing.
|
||||||
|
/// </summary>
|
||||||
|
public static void RaiseSkill(Skills.SkillType skill, float amount = 1f)
|
||||||
|
{
|
||||||
|
Player player = Player.m_localPlayer;
|
||||||
|
if (player == null || amount <= 0f) return;
|
||||||
|
player.RaiseSkill(skill, amount);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Charges a form attack's stamina the way vanilla charges a weapon's (Attack.GetAttackStamina):
|
/// Charges a form attack's stamina the way vanilla charges a weapon's (Attack.GetAttackStamina):
|
||||||
/// the equipment modifier, status effects (meads, race passives), then up to a third off with
|
/// the equipment modifier, status effects (meads, race passives), then up to a third off with
|
||||||
|
|
|
||||||
|
|
@ -874,8 +874,8 @@ namespace RacesOfValheim
|
||||||
int foodDuration = Mathf.RoundToInt(TrentaConfig.FoodDurationMultiplier);
|
int foodDuration = Mathf.RoundToInt(TrentaConfig.FoodDurationMultiplier);
|
||||||
|
|
||||||
int purpleRainRadius = Mathf.RoundToInt(TrentaConfig.PurpleRainRadius);
|
int purpleRainRadius = Mathf.RoundToInt(TrentaConfig.PurpleRainRadius);
|
||||||
int purpleRainHeal = Mathf.RoundToInt(TrentaConfig.PurpleRainHealAmount);
|
int purpleRainHeal = Mathf.RoundToInt(TrentaConfig.PurpleRainHealFor(Player.m_localPlayer));
|
||||||
int purpleRainPoison = Mathf.RoundToInt(TrentaConfig.PurpleRainPoisonDamage);
|
int purpleRainPoison = Mathf.RoundToInt(TrentaConfig.PurpleRainPoisonFor(Player.m_localPlayer));
|
||||||
int purpleRainCooldown = Mathf.RoundToInt(TrentaConfigManagement.PurpleRainCooldown.Value);
|
int purpleRainCooldown = Mathf.RoundToInt(TrentaConfigManagement.PurpleRainCooldown.Value);
|
||||||
int purpleRainMuspellCooldown = Mathf.RoundToInt(TrentaConfigManagement.MuspellPurpleRainCooldown.Value);
|
int purpleRainMuspellCooldown = Mathf.RoundToInt(TrentaConfigManagement.MuspellPurpleRainCooldown.Value);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -599,6 +599,7 @@ namespace RacesOfValheim
|
||||||
int layerMask = LayerMask.GetMask("Default", "static_solid", "Default_small", "piece", "piece_nonsolid", "terrain", "character", "character_net", "character_ghost", "hitbox", "character_noenv", "vehicle");
|
int layerMask = LayerMask.GetMask("Default", "static_solid", "Default_small", "piece", "piece_nonsolid", "terrain", "character", "character_net", "character_ghost", "hitbox", "character_noenv", "vehicle");
|
||||||
Collider[] hits = Physics.OverlapSphere(attackPoint, radius, layerMask);
|
Collider[] hits = Physics.OverlapSphere(attackPoint, radius, layerMask);
|
||||||
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
System.Collections.Generic.HashSet<GameObject> hitObjects = new System.Collections.Generic.HashSet<GameObject>();
|
||||||
|
bool hitCreature = false;
|
||||||
|
|
||||||
foreach (Collider hit in hits)
|
foreach (Collider hit in hits)
|
||||||
{
|
{
|
||||||
|
|
@ -641,7 +642,10 @@ namespace RacesOfValheim
|
||||||
|
|
||||||
target.Damage(hitData);
|
target.Damage(hitData);
|
||||||
FormMelee.GrantAdrenaline(target);
|
FormMelee.GrantAdrenaline(target);
|
||||||
|
if (characterTarget != null) hitCreature = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (hitCreature) FormMelee.RaiseSkill(Skills.SkillType.Unarmed);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDestroy()
|
private void OnDestroy()
|
||||||
|
|
|
||||||
|
|
@ -196,7 +196,14 @@ namespace RacesOfValheim
|
||||||
|
|
||||||
// The Trenta stands in its own rain and is healed by it too. It used to be left out, so
|
// The Trenta stands in its own rain and is healed by it too. It used to be left out, so
|
||||||
// a lone Trenta cast a heal that never touched anyone.
|
// a lone Trenta cast a heal that never touched anyone.
|
||||||
player.Heal(TrentaConfig.PurpleRainHealAmount, true);
|
float heal = TrentaConfig.PurpleRainHealFor(player);
|
||||||
|
float poison = TrentaConfig.PurpleRainPoisonFor(player);
|
||||||
|
player.Heal(heal, true);
|
||||||
|
|
||||||
|
// Blood Magic experience once per cast that reached someone besides the caster, the
|
||||||
|
// way a vanilla staff pays per cast: healing only yourself earns nothing, or the
|
||||||
|
// skill would level by casting into an empty field on cooldown.
|
||||||
|
bool reachedSomeone = false;
|
||||||
|
|
||||||
HashSet<Character> hit = new HashSet<Character>();
|
HashSet<Character> hit = new HashSet<Character>();
|
||||||
foreach (Collider collider in Physics.OverlapSphere(player.transform.position, TrentaConfig.PurpleRainRadius))
|
foreach (Collider collider in Physics.OverlapSphere(player.transform.position, TrentaConfig.PurpleRainRadius))
|
||||||
|
|
@ -209,16 +216,20 @@ namespace RacesOfValheim
|
||||||
if (BaseAI.IsEnemy(player, character))
|
if (BaseAI.IsEnemy(player, character))
|
||||||
{
|
{
|
||||||
HitData hitData = new HitData();
|
HitData hitData = new HitData();
|
||||||
hitData.m_damage.m_poison = TrentaConfig.PurpleRainPoisonDamage;
|
hitData.m_damage.m_poison = poison;
|
||||||
|
hitData.m_skill = Skills.SkillType.BloodMagic;
|
||||||
hitData.SetAttacker(player);
|
hitData.SetAttacker(player);
|
||||||
hitData.m_dir = Vector3.zero;
|
hitData.m_dir = Vector3.zero;
|
||||||
character.Damage(hitData);
|
character.Damage(hitData);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
character.Heal(TrentaConfig.PurpleRainHealAmount, true);
|
character.Heal(heal, true);
|
||||||
}
|
}
|
||||||
|
reachedSomeone = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (reachedSomeone) FormMelee.RaiseSkill(Skills.SkillType.BloodMagic);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
|
|
@ -120,6 +120,16 @@ namespace RacesOfValheim
|
||||||
public static float PurpleRainRadius => TrentaConfigManagement.PurpleRainRadius.Value;
|
public static float PurpleRainRadius => TrentaConfigManagement.PurpleRainRadius.Value;
|
||||||
public static float PurpleRainHealAmount => TrentaConfigManagement.PurpleRainHealAmount.Value;
|
public static float PurpleRainHealAmount => TrentaConfigManagement.PurpleRainHealAmount.Value;
|
||||||
public static float PurpleRainPoisonDamage => TrentaConfigManagement.PurpleRainPoisonDamage.Value;
|
public static float PurpleRainPoisonDamage => TrentaConfigManagement.PurpleRainPoisonDamage.Value;
|
||||||
|
|
||||||
|
// The base figures plus the Blood Magic bonus, scaled linearly up to the full bonus at
|
||||||
|
// level 100 - the same shape as the Aswid's Vampiric Aura. The compendium reads these
|
||||||
|
// too, so its numbers follow the player's skill.
|
||||||
|
public static float PurpleRainHealFor(Player player) =>
|
||||||
|
PurpleRainHealAmount + BloodMagicFactor(player) * TrentaConfigManagement.PurpleRainBloodMagicHeal.Value;
|
||||||
|
public static float PurpleRainPoisonFor(Player player) =>
|
||||||
|
PurpleRainPoisonDamage + BloodMagicFactor(player) * TrentaConfigManagement.PurpleRainBloodMagicPoison.Value;
|
||||||
|
private static float BloodMagicFactor(Player player) =>
|
||||||
|
player != null ? player.GetSkillFactor(Skills.SkillType.BloodMagic) : 0f;
|
||||||
// A Poison-type hit; vanilla's own
|
// A Poison-type hit; vanilla's own
|
||||||
// poison-on-hit handling takes over from
|
// poison-on-hit handling takes over from
|
||||||
// there, same as SkeletonRace's fire aura
|
// there, same as SkeletonRace's fire aura
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,8 @@ namespace RacesOfValheim
|
||||||
public static ConfigEntry<float> PurpleRainRadius;
|
public static ConfigEntry<float> PurpleRainRadius;
|
||||||
public static ConfigEntry<float> PurpleRainHealAmount;
|
public static ConfigEntry<float> PurpleRainHealAmount;
|
||||||
public static ConfigEntry<float> PurpleRainPoisonDamage;
|
public static ConfigEntry<float> PurpleRainPoisonDamage;
|
||||||
|
public static ConfigEntry<float> PurpleRainBloodMagicHeal;
|
||||||
|
public static ConfigEntry<float> PurpleRainBloodMagicPoison;
|
||||||
|
|
||||||
// ─── Bonemass (tier 4+, passive) ──────────────────────────────────────
|
// ─── Bonemass (tier 4+, passive) ──────────────────────────────────────
|
||||||
public static ConfigEntry<float> SwimStaminaRegen;
|
public static ConfigEntry<float> SwimStaminaRegen;
|
||||||
|
|
@ -116,6 +118,10 @@ namespace RacesOfValheim
|
||||||
new ConfigDescription("Flat heal applied to you and to every ally hit.", new AcceptableValueRange<float>(0f, 200f)));
|
new ConfigDescription("Flat heal applied to you and to every ally hit.", new AcceptableValueRange<float>(0f, 200f)));
|
||||||
PurpleRainPoisonDamage = config.Bind(purpleRain, "Enemy Poison Damage", 40f,
|
PurpleRainPoisonDamage = config.Bind(purpleRain, "Enemy Poison Damage", 40f,
|
||||||
new ConfigDescription("Flat poison damage applied to every enemy hit.", new AcceptableValueRange<float>(0f, 200f)));
|
new ConfigDescription("Flat poison damage applied to every enemy hit.", new AcceptableValueRange<float>(0f, 200f)));
|
||||||
|
PurpleRainBloodMagicHeal = config.Bind(purpleRain, "Blood Magic Heal Bonus", 40f,
|
||||||
|
new ConfigDescription("Extra heal at 100 Blood Magic skill, added to Ally Heal Amount (scales linearly from 0).", new AcceptableValueRange<float>(0f, 200f)));
|
||||||
|
PurpleRainBloodMagicPoison = config.Bind(purpleRain, "Blood Magic Poison Bonus", 40f,
|
||||||
|
new ConfigDescription("Extra poison damage at 100 Blood Magic skill, added to Enemy Poison Damage (scales linearly from 0).", new AcceptableValueRange<float>(0f, 200f)));
|
||||||
|
|
||||||
const string bonemass = "Trenta - Bonemass";
|
const string bonemass = "Trenta - Bonemass";
|
||||||
SwimStaminaRegen = config.Bind(bonemass, "Swim Stamina Regen", 0.1f,
|
SwimStaminaRegen = config.Bind(bonemass, "Swim Stamina Regen", 0.1f,
|
||||||
|
|
|
||||||
|
|
@ -435,6 +435,7 @@ namespace RacesOfValheim
|
||||||
float totalDamage = baseDamage + unarmedSkillLevel;
|
float totalDamage = baseDamage + unarmedSkillLevel;
|
||||||
|
|
||||||
HashSet<GameObject> hit = new HashSet<GameObject>();
|
HashSet<GameObject> hit = new HashSet<GameObject>();
|
||||||
|
bool hitCreature = false;
|
||||||
foreach (Collider collider in Physics.OverlapSphere(center, radius))
|
foreach (Collider collider in Physics.OverlapSphere(center, radius))
|
||||||
{
|
{
|
||||||
Character target = collider.GetComponentInParent<Character>();
|
Character target = collider.GetComponentInParent<Character>();
|
||||||
|
|
@ -442,7 +443,12 @@ namespace RacesOfValheim
|
||||||
if (!BaseAI.IsEnemy(player, target)) continue;
|
if (!BaseAI.IsEnemy(player, target)) continue;
|
||||||
|
|
||||||
DealDamage(player, target, totalDamage, HitData.DamageType.Blunt, Vector3.zero);
|
DealDamage(player, target, totalDamage, HitData.DamageType.Blunt, Vector3.zero);
|
||||||
|
hitCreature = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The spike projectile levels Unarmed through vanilla's Projectile.OnHit; the stomp
|
||||||
|
// calls Damage directly and has to raise the skill itself.
|
||||||
|
if (hitCreature) FormMelee.RaiseSkill(Skills.SkillType.Unarmed);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue