From 3c623c6801185f20cd9921c5b7a046e7850c6988 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Mon, 6 Sep 2021 00:01:26 -0400
Subject: [PATCH] address comments, boost village pop, lower raid chance

---
 assets/common/entity/village/guard.ron   | 4 +++-
 assets/common/loadout/world/traveler.ron | 3 ++-
 assets/common/skillset/village/guard.ron | 1 +
 server/src/rtsim/entity.rs               | 2 +-
 world/src/site/settlement/mod.rs         | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/assets/common/entity/village/guard.ron b/assets/common/entity/village/guard.ron
index 3d3a0e6dbf..0b344ac502 100644
--- a/assets/common/entity/village/guard.ron
+++ b/assets/common/entity/village/guard.ron
@@ -6,8 +6,10 @@ EntityConfig (
     loot: Uninit,
 
     hands: TwoHanded(Choice([
-        (2.0, Some(Item("common.items.weapons.sword.cobalt-0"))),
+        (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/loadout/world/traveler.ron b/assets/common/loadout/world/traveler.ron
index 4a5dcdb187..c4759de18a 100644
--- a/assets/common/loadout/world/traveler.ron
+++ b/assets/common/loadout/world/traveler.ron
@@ -1,8 +1,9 @@
 ({
     ActiveMainhand: Choice([
-        (1.0, Some(Item("common.items.weapons.sword.wood-2"))),
         (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 0aaeaea17c..9ea3d18f37 100644
--- a/assets/common/skillset/village/guard.ron
+++ b/assets/common/skillset/village/guard.ron
@@ -1,4 +1,5 @@
 ([
     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 8b1c1f81d2..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);