lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added xp value for mobs with MULTIATTACK flag

Browse source
This commit is contained in:
Llywelwyn 2023-07-30 05:40:17 +01:00
parent a17a2c8f11
commit 3e9f4f6fab
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/melee_combat_system.rs
View file

@ -1,7 +1,7 @@
use super::{ use super::{
gamelog, gamesystem, ArmourClassBonus, Attributes, EquipmentSlot, Equipped, HungerClock, HungerState, MeleeWeapon, gamelog, gamesystem, ArmourClassBonus, Attributes, EquipmentSlot, Equipped, HungerClock, HungerState, MeleeWeapon,
MultiAttack, Name, NaturalAttack, NaturalAttacks, ParticleBuilder, Pools, Position, Skill, Skills, SufferDamage, MultiAttack, Name, NaturalAttacks, ParticleBuilder, Pools, Position, Skill, Skills, SufferDamage, WantsToMelee,
WantsToMelee, WeaponAttribute, WeaponAttribute,
}; };
use specs::prelude::*; use specs::prelude::*;

9
src/raws/rawmaster.rs
View file

@ -194,6 +194,7 @@ pub fn spawn_named_mob(
} }
let mut eb; let mut eb;
let mut xp_value = 1;
// New entity with a position, name, combatstats, and viewshed // New entity with a position, name, combatstats, and viewshed
eb = ecs.create_entity().marked::<SimpleMarker<SerializeMe>>(); eb = ecs.create_entity().marked::<SimpleMarker<SerializeMe>>();
@ -209,7 +210,10 @@ pub fn spawn_named_mob(
"BLOCKS_TILE" => eb = eb.with(BlocksTile {}), "BLOCKS_TILE" => eb = eb.with(BlocksTile {}),
"BYSTANDER" => eb = eb.with(Bystander {}), "BYSTANDER" => eb = eb.with(Bystander {}),
"MONSTER" => eb = eb.with(Monster {}), "MONSTER" => eb = eb.with(Monster {}),
"MULTIATTACK" => eb = eb.with(MultiAttack {}), "MULTIATTACK" => {
eb = eb.with(MultiAttack {});
xp_value += 3;
}
_ => rltk::console::log(format!("Unrecognised flag: {}", flag.as_str())), _ => rltk::console::log(format!("Unrecognised flag: {}", flag.as_str())),
} }
} }
@ -271,7 +275,6 @@ pub fn spawn_named_mob(
// Should really use existing RNG here // Should really use existing RNG here
let mut rng = rltk::RandomNumberGenerator::new(); let mut rng = rltk::RandomNumberGenerator::new();
let mob_hp = npc_hp(&mut rng, mob_con, mob_level); let mob_hp = npc_hp(&mut rng, mob_con, mob_level);
let mob_mana = mana_at_level(&mut rng, mob_int, mob_level); let mob_mana = mana_at_level(&mut rng, mob_int, mob_level);
let mob_bac = if mob_template.bac.is_some() { mob_template.bac.unwrap() } else { 10 }; let mob_bac = if mob_template.bac.is_some() { mob_template.bac.unwrap() } else { 10 };
@ -324,7 +327,6 @@ pub fn spawn_named_mob(
eb = eb.with(natural); eb = eb.with(natural);
} }
let mut xp_value = 1;
xp_value += mob_level * mob_level; xp_value += mob_level * mob_level;
// if speed > 18, +5 // if speed > 18, +5
// if speed > 12, +3 // if speed > 12, +3
@ -340,6 +342,7 @@ pub fn spawn_named_mob(
if mob_level > 9 { if mob_level > 9 {
xp_value += 50; xp_value += 50;
} }
// Final xp value = 1 + level^2 + bonus for low ac + bonus for speed + bonus for multiattack + bonus for level>9
eb = eb.with(GrantsXP { amount: xp_value }); eb = eb.with(GrantsXP { amount: xp_value });