===================================================================
--- original.js
+++ change.js
@@ -771,8 +771,59 @@
 	var self = Container.call(this);
 	self.gameResources = resources;
 	self.iq = iq;
 });
+var VillagerBehavior = Container.expand(function (villager) {
+	var self = Container.call(this);
+	self.villager = villager;
+	self.decideNextAction = function () {
+		var needs = self.calculateNeeds();
+		var actions = self.defineActions();
+		var chosenAction = Object.keys(needs).find(need => needs[need]);
+		if (chosenAction) {
+			actions[chosenAction]();
+		} else {
+			actions['wander']();
+		}
+	};
+	self.calculateNeeds = function () {
+		return {
+			'rest': self.villager.energy < 20 || self.villager.tiredness >= 80,
+			'work': self.villager.energy >= 20 && self.villager.workplace && self.villager.tiredness < 80,
+			'food': self.villager.gameResources.food.amount < 20,
+			'wood': self.villager.gameResources.wood.amount < 20,
+			'rock': self.villager.gameResources.rock.amount < 20
+		};
+	};
+	self.defineActions = function () {
+		return {
+			'rest': function () {
+				self.villager.targetX = self.villager.home.x;
+				self.villager.targetY = self.villager.home.y;
+				self.villager.state = 'goingHomeToRest';
+			},
+			'work': function () {
+				self.villager.targetX = self.villager.workplace.x;
+				self.villager.targetY = self.villager.workplace.y;
+				self.villager.state = 'goingToWork';
+			},
+			'food': function () {
+				self.villager.state = 'seekingFood';
+			},
+			'wood': function () {
+				self.villager.state = 'seekingWood';
+			},
+			'rock': function () {
+				self.villager.state = 'seekingRock';
+			},
+			'wander': function () {
+				self.villager.targetX = Math.random() * 2048;
+				self.villager.targetY = Math.random() * 2732;
+				self.villager.state = 'wandering';
+			}
+		};
+	};
+});
 function globalSeekResource(villager, resourceType) {}
 this.weatherSystem = new WeatherSystem();
 Villager.prototype.moveTo = function (targetX, targetY, speed) {
 	var dx = targetX - this.x;
@@ -784,56 +835,8 @@
 		this.x += Math.cos(angle) * moveDistance;
 		this.y += Math.sin(angle) * moveDistance;
 	}
 };
-Villager.prototype.decideNextAction = function () {
-	var needs = this.calculateNeeds();
-	var actions = this.defineActions();
-	var chosenAction = Object.keys(needs).find(need => needs[need]);
-	if (chosenAction) {
-		actions[chosenAction]();
-	} else {
-		actions['wander']();
-	}
-};
-Villager.prototype.calculateNeeds = function () {
-	return {
-		'rest': this.energy < 20 || this.tiredness >= 80,
-		'work': this.energy >= 20 && this.workplace && this.tiredness < 80,
-		'food': this.gameResources.food.amount < 20,
-		'wood': this.gameResources.wood.amount < 20,
-		'rock': this.gameResources.rock.amount < 20
-	};
-};
-Villager.prototype.defineActions = function () {
-	var villager = this;
-	return {
-		'rest': function () {
-			villager.targetX = villager.home.x;
-			villager.targetY = villager.home.y;
-			villager.state = 'goingHomeToRest';
-		},
-		'work': function () {
-			villager.targetX = villager.workplace.x;
-			villager.targetY = villager.workplace.y;
-			villager.state = 'goingToWork';
-		},
-		'food': function () {
-			villager.state = 'seekingFood';
-		},
-		'wood': function () {
-			villager.state = 'seekingWood';
-		},
-		'rock': function () {
-			villager.state = 'seekingRock';
-		},
-		'wander': function () {
-			villager.targetX = Math.random() * 2048;
-			villager.targetY = Math.random() * 2732;
-			villager.state = 'wandering';
-		}
-	};
-};
 Villager.prototype.idle = function () {};
 Villager.prototype.goHomeToRest = function () {
 	this.moveTo(this.home.x, this.home.y, this.speed);
 	if (this.x === this.home.x && this.y === this.home.y) {