buff guards

assets/common/entity/village/guard.ron

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

assets/common/items/armor/leather_plate/belt.ron

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

assets/common/items/armor/leather_plate/chest.ron

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

assets/common/items/armor/leather_plate/foot.ron

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

assets/common/items/armor/leather_plate/hand.ron

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

assets/common/items/armor/leather_plate/pants.ron

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

assets/common/items/armor/leather_plate/shoulder.ron

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

assets/common/items/npc_armor/chest/leather_blue.ron

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

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,

assets/common/loadout/world/traveler.ron

@@ -1,9 +1,7 @@
 ({
     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.iron-0"))),
-        (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.bow.hardwood-2"))),
     ]),
 

assets/common/skillset/village/guard.ron

@@ -1,24 +1,4 @@
 ([
-    Group(Weapon(Sword)),
+    Tree("common.skillset.dungeon.tier-5.sword"),
-
+    Tree("common.skillset.dungeon.tier-5.bow"),
-    // 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))),
 ])

world/src/site/settlement/mod.rs

@@ -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) {
+    match dynamic_rng.gen_range(0..8) {
-        0 => entity
+        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)