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 'slipped/changes' into 'master'

Browse Source 
buff guards

See merge request veloren/veloren!2816
This commit is contained in:
Samuel Keiffer 2021-09-06 05:06:39 +00:00
commit d5bf9eb6ad
13 changed files with 31 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/common/entity/village/guard.ron
View File

@ -5,8 +5,12 @@ EntityConfig (
loot: Uninit,
hands: TwoHanded(Item("common.items.weapons.sword.iron-4")),
hands: TwoHanded(Choice([
(1.0, Some(Item("common.items.weapons.sword.cobalt-0"))),
(2.0, Some(Item("common.items.weapons.bow.metal-2"))),
(1.0, Some(Item("common.items.weapons.axe.cobalt_axe-0"))),
])),
meta: [
SkillSetAsset("common.skillset.village.guard"),
],

4
assets/common/items/armor/leather_plate/belt.ron
View File

@ -4,8 +4,8 @@ ItemDef(
kind: Armor((
kind: Belt("LeatherPlate"),
stats: (
protection: Normal(4.0),
poise_resilience: Normal(0.0),
protection: Normal(8.0),
poise_resilience: Normal(2.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,

4
assets/common/items/armor/leather_plate/chest.ron
View File

@ -4,8 +4,8 @@ ItemDef(
kind: Armor((
kind: Chest("LeatherPlate"),
stats: (
protection: Normal(25.0),
poise_resilience: Normal(0.0),
protection: Normal(48.0),
poise_resilience: Normal(12.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,

4
assets/common/items/armor/leather_plate/foot.ron
View File

@ -4,8 +4,8 @@ ItemDef(
kind: Armor((
kind: Foot("LeatherPlate"),
stats: (
protection: Normal(5.0),
poise_resilience: Normal(0.0),
protection: Normal(16.0),
poise_resilience: Normal(4.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,

4
assets/common/items/armor/leather_plate/hand.ron
View File

@ -4,8 +4,8 @@ ItemDef(
kind: Armor((
kind: Hand("LeatherPlate"),
stats: (
protection: Normal(10.0),
poise_resilience: Normal(0.0),
protection: Normal(16.0),
poise_resilience: Normal(4.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,

4
assets/common/items/armor/leather_plate/pants.ron
View File

@ -4,8 +4,8 @@ ItemDef(
kind: Armor((
kind: Pants("LeatherPlate"),
stats: (
protection: Normal(20.0),
poise_resilience: Normal(0.0),
protection: Normal(32.0),
poise_resilience: Normal(8.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,

4
assets/common/items/armor/leather_plate/shoulder.ron
View File

@ -4,8 +4,8 @@ ItemDef(
kind: Armor((
kind: Shoulder("LeatherPlate"),
stats: (
protection: Normal(15.0),
poise_resilience: Normal(0.0),
protection: Normal(32.0),
poise_resilience: Normal(8.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,

4
assets/common/items/npc_armor/chest/leather_blue.ron
View File

@ -5,8 +5,8 @@ ItemDef(
(
kind: Chest("LeatherBlue"),
stats: (
protection: Normal(5.0),
poise_resilience: Normal(5.0),
protection: Normal(40.0),
poise_resilience: Normal(10.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,

2
assets/common/items/npc_armor/pants/leather_blue.ron
View File

@ -5,7 +5,7 @@ ItemDef(
(
kind: Pants("LeatherBlue"),
stats: (
protection: Normal(10.0),
protection: Normal(20.0),
poise_resilience: Normal(10.0),
energy_max: 0,
energy_reward: 0.0,

7
assets/common/loadout/world/traveler.ron
View File

@ -1,10 +1,9 @@
({
ActiveMainhand: Choice([
(1.0, Some(Item("common.items.weapons.sword.wood-2"))),
(1.0, Some(Item("common.items.weapons.sword.starter"))),
(1.0, Some(Item("common.items.weapons.sword.wood-0"))),
(1.0, Some(Item("common.items.weapons.bow.starter"))),
(1.0, Some(Item("common.items.weapons.sword.iron-0"))),
(1.0, Some(Item("common.items.weapons.bow.hardwood-2"))),
(1.0, Some(Item("common.items.weapons.axe.steel_axe-0"))),
(1.0, Some(Item("common.items.weapons.staff.frostwood_torch"))),
]),
Armor(Chest): Item("common.items.npc_armor.chest.leather_blue"),

25
assets/common/skillset/village/guard.ron
View File

@ -1,24 +1,5 @@
([
Group(Weapon(Sword)),
// TripleStrike
Skill((Sword(TsCombo), None)),
Skill((Sword(TsDamage), Some(1))),
Skill((Sword(TsRegen), Some(1))),
Skill((Sword(TsSpeed), Some(1))),
// Dash
Skill((Sword(DDamage), Some(1))),
Skill((Sword(DCost), Some(1))),
Skill((Sword(DDrain), Some(1))),
Skill((Sword(DScaling), Some(1))),
Skill((Sword(DSpeed), None)),
Skill((Sword(DInfinite), None)),
// Spin of death
Skill((Sword(UnlockSpin), None)),
Skill((Sword(SDamage), Some(1))),
Skill((Sword(SSpeed), Some(1))),
Skill((Sword(SSpins), Some(2))),
Skill((Sword(SCost), Some(1))),
Tree("common.skillset.dungeon.tier-5.sword"),
Tree("common.skillset.dungeon.tier-5.bow"),
Tree("common.skillset.dungeon.tier-5.axe"),
])

2
server/src/rtsim/entity.rs
View File

@ -501,7 +501,7 @@ impl Entity {
let time_to_move = if time_to_move.is_none() {
// Time increment is how long raiders stay at a site about. Is longer for
// home site and shorter for target site.
let time_increment = if raid_complete { 300.0 } else { 60.0 };
let time_increment = if raid_complete { 600.0 } else { 60.0 };
Some((time.0 / time_increment).ceil() * time_increment + time_increment)
} else {
time_to_move

8
world/src/site/settlement/mod.rs
View File

@ -895,7 +895,7 @@ impl Settlement {
let entity_wpos = Vec3::new(wpos2d.x as f32, wpos2d.y as f32, col_sample.alt + 3.0);
if matches!(sample.plot, Some(Plot::Town { .. }))
&& RandomField::new(self.seed).chance(Vec3::from(wpos2d), 1.0 / (50.0 * 40.0))
&& RandomField::new(self.seed).chance(Vec3::from(wpos2d), 1.0 / (20.0 * 40.0))
{
let is_dummy =
RandomField::new(self.seed + 1).chance(Vec3::from(wpos2d), 1.0 / 15.0);
@ -1004,13 +1004,13 @@ fn bird(pos: Vec3<f32>, dynamic_rng: &mut impl Rng) -> EntityInfo {
fn humanoid(pos: Vec3<f32>, economy: &SiteInformation, dynamic_rng: &mut impl Rng) -> EntityInfo {
let entity = EntityInfo::at(pos);
match dynamic_rng.gen_range(0..12) {
0 => entity
match dynamic_rng.gen_range(0..8) {
0 | 1 => entity
.with_agent_mark(agent::Mark::Guard)
.with_lazy_loadout(guard_loadout)
.with_level(dynamic_rng.gen_range(10..15))
.with_asset_expect("common.entity.village.guard"),
1 | 2 => entity
2 => entity
.with_agent_mark(agent::Mark::Merchant)
.with_economy(economy)
.with_lazy_loadout(merchant_loadout)