diff --git a/assets/common/entity/village/guard.ron b/assets/common/entity/village/guard.ron index fc31245bca..0b344ac502 100644 --- a/assets/common/entity/village/guard.ron +++ b/assets/common/entity/village/guard.ron @@ -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"), ], diff --git a/assets/common/items/armor/leather_plate/belt.ron b/assets/common/items/armor/leather_plate/belt.ron index e3fe38f8ed..5e0287a31c 100644 --- a/assets/common/items/armor/leather_plate/belt.ron +++ b/assets/common/items/armor/leather_plate/belt.ron @@ -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, diff --git a/assets/common/items/armor/leather_plate/chest.ron b/assets/common/items/armor/leather_plate/chest.ron index 03a91dbee8..31607eec34 100644 --- a/assets/common/items/armor/leather_plate/chest.ron +++ b/assets/common/items/armor/leather_plate/chest.ron @@ -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, diff --git a/assets/common/items/armor/leather_plate/foot.ron b/assets/common/items/armor/leather_plate/foot.ron index 022d487b8f..eed1dc7010 100644 --- a/assets/common/items/armor/leather_plate/foot.ron +++ b/assets/common/items/armor/leather_plate/foot.ron @@ -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, diff --git a/assets/common/items/armor/leather_plate/hand.ron b/assets/common/items/armor/leather_plate/hand.ron index e63d9b9c6a..2a3b43b46a 100644 --- a/assets/common/items/armor/leather_plate/hand.ron +++ b/assets/common/items/armor/leather_plate/hand.ron @@ -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, diff --git a/assets/common/items/armor/leather_plate/pants.ron b/assets/common/items/armor/leather_plate/pants.ron index 938774f1a8..10390e03e4 100644 --- a/assets/common/items/armor/leather_plate/pants.ron +++ b/assets/common/items/armor/leather_plate/pants.ron @@ -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, diff --git a/assets/common/items/armor/leather_plate/shoulder.ron b/assets/common/items/armor/leather_plate/shoulder.ron index a536b4d2f3..6c80726cd3 100644 --- a/assets/common/items/armor/leather_plate/shoulder.ron +++ b/assets/common/items/armor/leather_plate/shoulder.ron @@ -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, diff --git a/assets/common/items/npc_armor/chest/leather_blue.ron b/assets/common/items/npc_armor/chest/leather_blue.ron index d779fb5b88..424ecbc6f7 100644 --- a/assets/common/items/npc_armor/chest/leather_blue.ron +++ b/assets/common/items/npc_armor/chest/leather_blue.ron @@ -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, diff --git a/assets/common/items/npc_armor/pants/leather_blue.ron b/assets/common/items/npc_armor/pants/leather_blue.ron index ee1cf3e87f..613bb5a21f 100644 --- a/assets/common/items/npc_armor/pants/leather_blue.ron +++ b/assets/common/items/npc_armor/pants/leather_blue.ron @@ -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, diff --git a/assets/common/loadout/world/traveler.ron b/assets/common/loadout/world/traveler.ron index 2a38bafaef..c4759de18a 100644 --- a/assets/common/loadout/world/traveler.ron +++ b/assets/common/loadout/world/traveler.ron @@ -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"), diff --git a/assets/common/skillset/village/guard.ron b/assets/common/skillset/village/guard.ron index ad041b0f2d..9ea3d18f37 100644 --- a/assets/common/skillset/village/guard.ron +++ b/assets/common/skillset/village/guard.ron @@ -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"), ]) diff --git a/server/src/rtsim/entity.rs b/server/src/rtsim/entity.rs index 6cd177872e..d5daf4ee12 100644 --- a/server/src/rtsim/entity.rs +++ b/server/src/rtsim/entity.rs @@ -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 diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs index 5b2377de6c..0e8092e1f1 100644 --- a/world/src/site/settlement/mod.rs +++ b/world/src/site/settlement/mod.rs @@ -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, dynamic_rng: &mut impl Rng) -> EntityInfo { fn humanoid(pos: Vec3, 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)