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

address comments, boost village pop, lower raid chance

Browse Source
This commit is contained in:
jshipsey 2021-09-06 00:01:26 -04:00
parent da9585205c
commit 3c623c6801
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,10 @@ EntityConfig (
loot: Uninit, loot: Uninit,
hands: TwoHanded(Choice([ 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"))), (2.0, Some(Item("common.items.weapons.bow.metal-2"))),
(1.0, Some(Item("common.items.weapons.axe.cobalt_axe-0"))),
])), ])),
meta: [ meta: [
SkillSetAsset("common.skillset.village.guard"), SkillSetAsset("common.skillset.village.guard"),

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

@ -1,8 +1,9 @@
({ ({
ActiveMainhand: Choice([ 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.sword.iron-0"))),
(1.0, Some(Item("common.items.weapons.bow.hardwood-2"))), (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"), Armor(Chest): Item("common.items.npc_armor.chest.leather_blue"),

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

@ -1,4 +1,5 @@
([ ([
Tree("common.skillset.dungeon.tier-5.sword"), Tree("common.skillset.dungeon.tier-5.sword"),
Tree("common.skillset.dungeon.tier-5.bow"), 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() { let time_to_move = if time_to_move.is_none() {
// Time increment is how long raiders stay at a site about. Is longer for // Time increment is how long raiders stay at a site about. Is longer for
// home site and shorter for target site. // 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) Some((time.0 / time_increment).ceil() * time_increment + time_increment)
} else { } else {
time_to_move time_to_move

2
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); 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 { .. })) 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 = let is_dummy =
RandomField::new(self.seed + 1).chance(Vec3::from(wpos2d), 1.0 / 15.0); RandomField::new(self.seed + 1).chance(Vec3::from(wpos2d), 1.0 / 15.0);