Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sam/exp-fix' into 'master'

Browse Source 
Fixed exp fix mistake and fixed lava, campfire, and bomb damage.

See merge request veloren/veloren!2845
This commit is contained in:
Joshua Barretto 2021-09-15 13:04:43 +00:00
commit eb70e68be8
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/combat.rs
View File

@ -905,13 +905,13 @@ pub fn combat_rating(
msm: &MaterialStatManifest, msm: &MaterialStatManifest,
) -> f32 { ) -> f32 {
const WEAPON_WEIGHT: f32 = 1.0; const WEAPON_WEIGHT: f32 = 1.0;
const HEALTH_WEIGHT: f32 = 5.0; const HEALTH_WEIGHT: f32 = 0.5;
const ENERGY_WEIGHT: f32 = 0.5; const ENERGY_WEIGHT: f32 = 0.5;
const SKILLS_WEIGHT: f32 = 1.0; const SKILLS_WEIGHT: f32 = 1.0;
const POISE_WEIGHT: f32 = 0.5; const POISE_WEIGHT: f32 = 0.5;
const CRIT_WEIGHT: f32 = 0.6; const CRIT_WEIGHT: f32 = 0.6;
// Assumes a "standard" max health of 100 // Assumes a "standard" max health of 100
let health_rating = health.base_max() let health_rating = 10.0 * health.base_max()
/ 100.0 / 100.0
/ (1.0 - Damage::compute_damage_reduction(Some(inventory), None, None)).max(0.00001); / (1.0 - Damage::compute_damage_reduction(Some(inventory), None, None)).max(0.00001);

4
common/systems/src/buff.rs
View File

@ -113,7 +113,7 @@ impl<'a> System<'a> for Sys {
entity, entity,
buff_change: BuffChange::Add(Buff::new( buff_change: BuffChange::Add(Buff::new(
BuffKind::Burning, BuffKind::Burning,
BuffData::new(200.0, None), BuffData::new(20.0, None),
vec![BuffCategory::Natural], vec![BuffCategory::Natural],
BuffSource::World, BuffSource::World,
)), )),
@ -199,7 +199,7 @@ impl<'a> System<'a> for Sys {
*accumulated += *rate * dt; *accumulated += *rate * dt;
// Apply health change only once per second, per health, or // Apply health change only once per second, per health, or
// when a buff is removed // when a buff is removed
if accumulated.abs() > rate.abs().min(10.0) if accumulated.abs() > rate.abs().min(1.0)
|| buff.time.map_or(false, |dur| dur == Duration::default()) || buff.time.map_or(false, |dur| dur == Duration::default())
{ {
let (cause, by) = if *accumulated < 0.0 { let (cause, by) = if *accumulated < 0.0 {

2
server/src/cmd.rs
View File

@ -1317,7 +1317,7 @@ fn handle_spawn_campfire(
Aura::new( Aura::new(
AuraKind::Buff { AuraKind::Buff {
kind: BuffKind::Burning, kind: BuffKind::Burning,
data: BuffData::new(20.0, Some(Duration::from_secs(10))), data: BuffData::new(2.0, Some(Duration::from_secs(10))),
category: BuffCategory::Natural, category: BuffCategory::Natural,
source: BuffSource::World, source: BuffSource::World,
}, },

2
server/src/events/entity_creation.rs
View File

@ -271,7 +271,7 @@ pub fn handle_create_waypoint(server: &mut Server, pos: Vec3<f32>) {
Aura::new( Aura::new(
AuraKind::Buff { AuraKind::Buff {
kind: BuffKind::Burning, kind: BuffKind::Burning,
data: BuffData::new(20.0, Some(Duration::from_secs(10))), data: BuffData::new(2.0, Some(Duration::from_secs(10))),
category: BuffCategory::Natural, category: BuffCategory::Natural,
source: BuffSource::World, source: BuffSource::World,
}, },

4
server/src/sys/object.rs
View File

@ -54,7 +54,7 @@ impl<'a> System<'a> for Sys {
RadiusEffect::Entity(Effect::Damage(Damage { RadiusEffect::Entity(Effect::Damage(Damage {
source: DamageSource::Explosion, source: DamageSource::Explosion,
kind: DamageKind::Energy, kind: DamageKind::Energy,
value: 400.0, value: 40.0,
})), })),
RadiusEffect::Entity(Effect::PoiseChange(PoiseChange { RadiusEffect::Entity(Effect::PoiseChange(PoiseChange {
source: PoiseSource::Explosion, source: PoiseSource::Explosion,
@ -148,7 +148,7 @@ impl<'a> System<'a> for Sys {
RadiusEffect::Entity(Effect::Damage(Damage { RadiusEffect::Entity(Effect::Damage(Damage {
source: DamageSource::Explosion, source: DamageSource::Explosion,
kind: DamageKind::Energy, kind: DamageKind::Energy,
value: 50.0, value: 5.0,
})), })),
RadiusEffect::Entity(Effect::PoiseChange(PoiseChange { RadiusEffect::Entity(Effect::PoiseChange(PoiseChange {
source: PoiseSource::Explosion, source: PoiseSource::Explosion,