rebalanced weight

src/command.rs

@@ -30,7 +30,7 @@ impl UnitCommand {
 			UnitCommand::Move(dir) => {
 				let to = pos.map(|x| x + **dir).unwrap();
 				let terrain_summand = stamina_cost_at(pos, w) + stamina_cost_at(to, w);
-				let weight_summand = w.unitmap.get(pos).unwrap().get_weight() / 5;
+				let weight_summand = w.unitmap.get(pos).unwrap().get_weight();
 				terrain_summand + weight_summand
 			},
 			UnitCommand::Attack(..) => { 10 },
@@ -46,7 +46,7 @@ impl UnitCommand {
 					.nth(*i)
 					.unwrap()
 					.get_class()
-					.get_weight() / 2
+					.get_weight()
 			},
 			UnitCommand::BurnBuilding => 0,
 			UnitCommand::Craft(_) => 0,

src/item/food.rs

@@ -12,7 +12,7 @@ impl ItemClassTrait for FoodClass {
 	type Instance = Food;
 
 	fn get_name() -> &'static str { "Food" }
-	fn get_weight() -> u32 { 2 }
+	fn get_weight() -> u32 { 1 }
 	fn build() -> Item {
 		Item::Food(Food)
 	}

src/item/iron.rs

@@ -12,7 +12,7 @@ impl ItemClassTrait for IronClass {
 	type Instance = Iron;
 
 	fn get_name() -> &'static str { "Iron" }
-	fn get_weight() -> u32 { 10 }
+	fn get_weight() -> u32 { 3 }
 	fn build() -> Item {
 		Item::Iron(Iron)
 	}

src/item/iron_sword.rs

@@ -18,7 +18,7 @@ impl ItemClassTrait for IronSwordClass {
 	type Instance = IronSword;
 
 	fn get_name() -> &'static str { "IronSword" }
-	fn get_weight() -> u32 { 40 }
+	fn get_weight() -> u32 { 20 }
 	fn build() -> Item {
 		Item::IronSword(IronSword { health: 100 })
 	}

src/item/lance.rs

@@ -18,7 +18,7 @@ impl ItemClassTrait for LanceClass {
 	type Instance = Lance;
 
 	fn get_name() -> &'static str { "Lance" }
-	fn get_weight() -> u32 { 40 }
+	fn get_weight() -> u32 { 20 }
 	fn build() -> Item {
 		Item::Lance(Lance { health: 100 })
 	}

src/item/long_sword.rs

@@ -18,7 +18,7 @@ impl ItemClassTrait for LongSwordClass {
 	type Instance = LongSword;
 
 	fn get_name() -> &'static str { "LongSword" }
-	fn get_weight() -> u32 { 40 }
+	fn get_weight() -> u32 { 20 }
 	fn build() -> Item {
 		Item::LongSword(LongSword { health: 100 })
 	}

src/item/settlement_kit.rs

@@ -16,7 +16,7 @@ impl ItemClassTrait for SettlementKitClass {
 	type Instance = SettlementKit;
 
 	fn get_name() -> &'static str { "SettlementKit" }
-	fn get_weight() -> u32 { 100 }
+	fn get_weight() -> u32 { 20 }
 	fn build() -> Item {
 		Item::SettlementKit(SettlementKit)
 	}

src/item/stone.rs

@@ -12,7 +12,7 @@ impl ItemClassTrait for StoneClass {
 	type Instance = Stone;
 
 	fn get_name() -> &'static str { "Stone" }
-	fn get_weight() -> u32 { 10 }
+	fn get_weight() -> u32 { 3 }
 	fn build() -> Item {
 		Item::Stone(Stone)
 	}

src/item/wood.rs

@@ -12,7 +12,7 @@ impl ItemClassTrait for WoodClass {
 	type Instance = Wood;
 
 	fn get_name() -> &'static str { "Wood" }
-	fn get_weight() -> u32 { 4 }
+	fn get_weight() -> u32 { 2 }
 	fn build() -> Item {
 		Item::Wood(Wood)
 	}

src/item/wood_bow.rs

@@ -18,7 +18,7 @@ impl ItemClassTrait for WoodBowClass {
 	type Instance = WoodBow;
 
 	fn get_name() -> &'static str { "WoodBow" }
-	fn get_weight() -> u32 { 15 }
+	fn get_weight() -> u32 { 10 }
 	fn build() -> Item {
 		Item::WoodBow(WoodBow { health: 100 })
 	}

src/item/wood_sword.rs

@@ -18,7 +18,7 @@ impl ItemClassTrait for WoodSwordClass {
 	type Instance = WoodSword;
 
 	fn get_name() -> &'static str { "WoodSword" }
-	fn get_weight() -> u32 { 15 }
+	fn get_weight() -> u32 { 10 }
 	fn build() -> Item {
 		Item::WoodSword(WoodSword { health: 100 })
 	}

src/world/unitmap.rs

@@ -67,7 +67,8 @@ impl World {
 	fn reduce_food(&mut self) {
 		for p in Pos::iter_all() {
 			if let Some(ref mut unit) = self.unitmap.get_mut(p) {
-				unit.food = unit.food.saturating_sub(FOOD_PER_TURN);
+				let food_reduct = FOOD_PER_TURN + 2 * unit.get_weight() / 10;
+				unit.food = unit.food.saturating_sub(food_reduct);
 			}
 		}
 	}