Merge lp:~widelands-dev/widelands/bug-999262_part2 into lp:widelands

[GunChleoc]

Fixed the ugly hack in Worker::informPlayer

- Renamed the "stone" attrib to match the World's "granite" resource
- Added a new optional [resources] section to ProductionSite conf files to handle "out of resource" messages.

The following building types now use these new message texts:

- Mines
- Fishers' buildings
- Quarries
- Wells
- Hunters' buildings
- Lumberjacks'/Woodcutters' buildings

[wl-zocker (wl-zocker)]

I assumed that since trees and animals can recover and the chance of getting water is 65%, there is no message for lumberjacks, hunters, and wells. Will this behavior change? This would be annoying for lumberjacks (which I have to keep a certain area free from trees) and wells (which I let run even the there is no more water in the ground). Well, just the two cents from a code-illiterate ;)

[GunChleoc (gunchleoc)]

Well, it's completely configurable and I'm open to suggestions. We could also make the frequency of messages configurable, so lumberjacks and hunters will only pop up once in a while.

Since I don't play often, I'm happy to hear from code illiterates as to what would be appropriate :)

[wl-zocker (wl-zocker)]

I currently do not have much time to play, but here is my appraisal:
Mines, fishers, quarries: Leave them as they currently are.
Hunters: After thinking about is, you can add them to the list. Animal recovering is quite slow, so it is not really worth having many hunters.
Wells: Never send a message about them.
Lumberjacks: I think the current logic sends the message as soon as the worker does not find the needed resource for the first time (e.g. when all stones are gone and the stonemason wants to cut the next stone). This would mean that the player gets informed after every tree the lumberjack cuts down. Since I usually do not watch my lumberjacks, I do not know how often this happens. Is it possible [*] to send a message when no tree has been cut for x minutes? (For simplicity, you can take the time currently used for the other messages.) Otherwise, just implement it. I (or other players) will complain if I am/they are unsatisfied.

[*] When I write of possible is such suggestions, I mean "technically possible and feasible by humans with an adequate amount of work/time without cluttering the code too much or feasible via script written in an adequate amount of time that does the work in not too much time".

[SirVer (sirver)]

I think lumberjacks should only send a message after ~10 failed attempts or so. Otherwise they will send too often.

Rest of the comments inlined in the code in r7115.

review: Needs Fixing

[SirVer (sirver)]

Ahh, save comment to quick again. That is a great change and fairly complex and I just wanted to say that you came a long way as a coder in a very short time.

[GunChleoc (gunchleoc)]

Thanks! Now that I have QT Creator, the code is so much easier to navigate.

I fixed the commented stuff, now I still need to implement the delays for the messages. So, please wait with merging until I give you a shout.

[GunChleoc (gunchleoc)]

OK, all done and ready for merging :)

The delay parameters might need some more tweaking, we'll just have to see how it behaves in a real game.

Buildings with message delay are hunters, lumberjacks and wells.

[SirVer (sirver)]

I changed a couple of nits:

- I moved the documentation of your new methods to the header (documentation in .cc files makes less sense. I know that we did that in the past, but for the future, documentation goes into the header).

- Added a disallow_copy_and_assign() to Productionsite.

- One more refactoring suggestion.

review: Needs Fixing

[GunChleoc (gunchleoc)]

I have completely shifted the definition of the notification from worker to productionsite.

[SirVer (sirver)]

looks good.

review: Approve

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2014-07-17 12:34:35 +0000
+++ src/ai/defaultai.cc	2014-07-23 04:48:33 +0000
@@ -596,7 +596,7 @@
 		// stones are not renewable, we will count them only if previous state si nonzero
 		if (field.stones_nearby_ > 0) {
 
-			int32_t const stone_attr = Map_Object_Descr::get_attribute_id("stone");
+			int32_t const stone_attr = Map_Object_Descr::get_attribute_id("granite");
 			field.stones_nearby_ = 0;
 
 			for (uint32_t j = 0; j < immovables.size(); ++j) {
@@ -1872,7 +1872,7 @@
 		if (map.find_immovables(
 		       Area<FCoords>(map.get_fcoords(site.site->get_position()), radius),
 		       nullptr,
-		       FindImmovableAttribute(Map_Object_Descr::get_attribute_id("stone"))) == 0) {
+				 FindImmovableAttribute(Map_Object_Descr::get_attribute_id("granite"))) == 0) {
 			// destruct the building and it's flag (via flag destruction)
 			// the destruction of the flag avoids that defaultAI will have too many
 			// unused roads - if needed the road will be rebuild directly.

=== modified file 'src/logic/militarysite.cc'
--- src/logic/militarysite.cc	2014-07-17 12:08:01 +0000
+++ src/logic/militarysite.cc	2014-07-23 04:48:33 +0000
@@ -782,7 +782,7 @@
 
 	// Inform the player, that we are under attack by adding a new entry to the
 	// message queue - a sound will automatically be played.
-	informPlayer(game, true);
+	notify_player(game, true);
 }
 
 bool MilitarySite::attack(Soldier & enemy)
@@ -824,7 +824,7 @@
 
 		// Inform the player, that we are under attack by adding a new entry to
 		// the message queue - a sound will automatically be played.
-		informPlayer(game);
+		notify_player(game);
 
 		return true;
 	} else {
@@ -931,7 +931,7 @@
 }
 
 /// Informs the player about an attack of his opponent.
-void MilitarySite::informPlayer(Game & game, bool const discovered)
+void MilitarySite::notify_player(Game & game, bool const discovered)
 {
 	// Add a message as long as no previous message was send from a point with
 	// radius <= 5 near the current location in the last 60 seconds

=== modified file 'src/logic/militarysite.h'
--- src/logic/militarysite.h	2014-07-11 22:53:34 +0000
+++ src/logic/militarysite.h	2014-07-23 04:48:33 +0000
@@ -146,7 +146,7 @@
 		(Soldier *, bool * stayhome = nullptr);
 	bool haveSoldierJob(Soldier &);
 	bool military_presence_kept(Game &);
-	void informPlayer(Game &, bool discovered = false);
+	void notify_player(Game &, bool discovered = false);
 	bool update_upgrade_requirements();
 	void update_normal_soldier_request();
 	void update_upgrade_soldier_request();

=== modified file 'src/logic/production_program.cc'
--- src/logic/production_program.cc	2014-07-16 08:23:42 +0000
+++ src/logic/production_program.cc	2014-07-23 04:48:33 +0000
@@ -1279,7 +1279,7 @@
 		//  will still produce enough.
 		//  e.g. mines have m_chance=5, wells have 65
 		if (m_chance <= 20) {
-			informPlayer(game, ps);
+			notify_player(game, ps);
 			// and change the default animation
 			ps.set_default_anim("empty");
 		}
@@ -1306,19 +1306,18 @@
 	return ps.program_step(game);
 }
 
-/// Copied from militarysite.cc, MilitarySite::informPlayer
 /// Informs the player about a mine that has run empty, if the mine has not
 /// sent this message within the last 60 minutes.
-void ProductionProgram::ActMine::informPlayer
+void ProductionProgram::ActMine::notify_player
 	(Game & game, ProductionSite & ps) const
 {
+	assert(!ps.descr().out_of_resource_title().empty());
+	assert(!ps.descr().out_of_resource_message().empty());
 	ps.send_message
 		(game,
 		 "mine",
-		 _("Main Vein Exhausted"),
-		 _
-		 ("This mine’s main vein is exhausted. Expect strongly diminished returns on investment. "
-		  "You should consider enhancing, dismantling or destroying it."),
+		 ps.descr().out_of_resource_title(),
+		 ps.descr().out_of_resource_message(),
 		 true,
 		 60 * 60 * 1000,
 		 0);

=== modified file 'src/logic/production_program.h'
--- src/logic/production_program.h	2014-07-14 19:48:07 +0000
+++ src/logic/production_program.h	2014-07-23 04:48:33 +0000
@@ -428,7 +428,7 @@
 		        const std::string& production_program_name,
 		        ProductionSite_Descr*);
 		virtual void execute(Game &, ProductionSite &) const override;
-		virtual void informPlayer(Game &, ProductionSite &) const;
+		virtual void notify_player(Game &, ProductionSite &) const;
 	private:
 		Resource_Index m_resource;
 		uint8_t        m_distance; // width/radius of mine

=== modified file 'src/logic/productionsite.cc'
--- src/logic/productionsite.cc	2014-07-15 10:02:22 +0000
+++ src/logic/productionsite.cc	2014-07-23 04:48:33 +0000
@@ -60,6 +60,19 @@
 	:
 	Building_Descr(_name, _descname, directory, prof, global_s, _tribe)
 {
+	Section * const section = prof.get_section("out_of_resource_notification");
+	if (section != nullptr)
+	{
+		m_out_of_resource_title = section->get_string("title", "");
+		m_out_of_resource_message = section->get_string("message", "");
+		m_out_of_resource_delay_attempts = section->get_natural("delay_attempts", 0);
+	}
+	else
+	{
+		m_out_of_resource_title = "";
+		m_out_of_resource_message = "";
+		m_out_of_resource_delay_attempts = 0;
+	}
 	while
 		(Section::Value const * const op = global_s.get_next_val("output"))
 		try {
@@ -185,7 +198,8 @@
 	m_last_stat_percent (0),
 	m_crude_percent     (0),
 	m_is_stopped        (false),
-	m_default_anim      ("idle")
+	m_default_anim      ("idle"),
+	m_out_of_resource_delay_counter(0)
 {
 	m_statistics_buffer[0] = '\0';
 	m_result_buffer[0] = '\0';
@@ -895,6 +909,31 @@
 }
 
 
+void ProductionSite::worker_failed_to_find_resource(Game & game)
+{
+	if (!descr().out_of_resource_title().empty() &&
+		m_out_of_resource_delay_counter >=
+			descr().out_of_resource_delay_attempts()
+		)
+	{
+		assert(!descr().out_of_resource_message().empty());
+		send_message
+			(game,
+			 "produce",
+			 descr().out_of_resource_title(),
+			 descr().out_of_resource_message(),
+			 true,
+			 1800000, 0);
+	}
+	if (m_out_of_resource_delay_counter++ >=
+			descr().out_of_resource_delay_attempts()
+		)
+	{
+		m_out_of_resource_delay_counter = 0;
+	}
+}
+
+
 /// Changes the default anim string to \li anim
 void ProductionSite::set_default_anim(std::string anim)
 {
@@ -907,4 +946,5 @@
 	m_default_anim = anim;
 }
 
+
 }

=== modified file 'src/logic/productionsite.h'
--- src/logic/productionsite.h	2014-07-11 22:53:34 +0000
+++ src/logic/productionsite.h	2014-07-23 04:48:33 +0000
@@ -26,6 +26,7 @@
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "logic/bill_of_materials.h"
 #include "logic/building.h"
 #include "logic/production_program.h"
@@ -89,6 +90,16 @@
 	typedef std::map<std::string, ProductionProgram *> Programs;
 	const Programs & programs() const {return m_programs;}
 
+	const std::string& out_of_resource_title() const {
+		return m_out_of_resource_title;
+	}
+
+	const std::string& out_of_resource_message() const {
+		return m_out_of_resource_message;
+	}
+	uint32_t out_of_resource_delay_attempts() const {
+		return m_out_of_resource_delay_attempts;
+	}
 
 private:
 	BillOfMaterials m_working_positions;
@@ -96,6 +107,9 @@
 	Output   m_output_ware_types;
 	Output   m_output_worker_types;
 	Programs m_programs;
+	std::string m_out_of_resource_title;
+	std::string m_out_of_resource_message;
+	uint32_t    m_out_of_resource_delay_attempts;
 };
 
 class ProductionSite : public Building {
@@ -165,6 +179,9 @@
 
 	bool can_start_working() const;
 
+	/// sends a message to the player if the building's resource can't be found
+	void worker_failed_to_find_resource(Game & game);
+
 	void set_default_anim(std::string);
 
 protected:
@@ -253,6 +270,11 @@
 	uint32_t                 m_crude_percent; //integer0-10000000, to be shirink to range 0-10
 	bool                     m_is_stopped;
 	std::string              m_default_anim; // normally "idle", "empty", if empty mine.
+
+private:
+	uint32_t m_out_of_resource_delay_counter;
+
+	DISALLOW_COPY_AND_ASSIGN(ProductionSite);
 };
 
 /**

=== modified file 'src/logic/worker.cc'
--- src/logic/worker.cc	2014-07-17 09:15:53 +0000
+++ src/logic/worker.cc	2014-07-23 04:48:33 +0000
@@ -23,8 +23,6 @@
 #include <memory>
 #include <tuple>
 
-#include <boost/format.hpp>
-
 #include "base/macros.h"
 #include "base/wexception.h"
 #include "economy/economy.h"
@@ -403,10 +401,10 @@
 				send_signal(game, "fail"); //  no object found, cannot run program
 				pop_task(game);
 				if (!found_reserved)
-					informPlayer
-						(game,
-						 ref_cast<Building, PlayerImmovable>(*get_location(game)),
-						 Map_Object_Descr::get_attribute_name(action.iparam2));
+				{
+					if (upcast(ProductionSite, productionsite, get_location(game)))
+						productionsite->worker_failed_to_find_resource(game);
+				}
 				return true;
 			}
 			std::vector<ImmovableFound> list;
@@ -446,10 +444,8 @@
 			if (action.iparam1 < area.radius) {
 				send_signal(game, "fail"); //  no object found, cannot run program
 				pop_task(game);
-				informPlayer
-					(game,
-					 ref_cast<Building, PlayerImmovable>(*get_location(game)),
-					 Map_Object_Descr::get_attribute_name(action.iparam2));
+				if (upcast(ProductionSite, productionsite, get_location(game)))
+					productionsite->worker_failed_to_find_resource(game);
 				return true;
 			}
 			std::vector<Bob *> list;
@@ -575,10 +571,8 @@
 	if (!map.find_reachable_fields(area, &list, cstep, functor)) {
 		molog("  no space found\n");
 
-		informPlayer
-			(game,
-			 ref_cast<Building, PlayerImmovable>(*get_location(game)),
-			 action.sparam1);
+		if (upcast(ProductionSite, productionsite, get_location(game)))
+			productionsite->worker_failed_to_find_resource(game);
 
 		send_signal(game, "fail");
 		pop_task(game);
@@ -593,42 +587,6 @@
 	return true;
 }
 
-// Informs the player about a building that cannot find resources any more,
-void Worker::informPlayer
-	(Game & game, Building & building, std::string res_type) const
-{
-	// NOTE this is just an ugly hack for now, to avoid getting messages
-	// NOTE for farms, reed yards, vineyards, etc.
-	if ((res_type != "fish") && (res_type != "stone"))
-		return;
-	// NOTE  AND fish_breeders
-	if (building.descr().name() == "fish_breeders_house")
-		return;
-
-	// TODO "stone" is defined as "granite" in the world. But this code is
-	// erroneus anyways: it translates immovable attribute stone as resource
-	// granite. Instead, the immovable attributes should be made translatable in
-	// the world or the quarry should define its out of stone message in its
-	// configuartion.
-	if (res_type == "stone") res_type = "granite";
-
-	// Translate the Resource name (if it is defined by the world)
-	const World & world = game.world();
-	int32_t residx = world.get_resource(res_type.c_str());
-	if (residx != -1)
-		res_type = world.get_resource(residx)->descname();
-
-	building.send_message
-		(game,
-		 "mine",
-		 (boost::format(_("Out of %s")) % res_type).str(),
-		 (boost::format(_("The worker of this building cannot find any more %s.")) % res_type).str(),
-		 true,
-		 1800000, 0);
-}
-
-
-
 /**
  * walk \<where\>
  *

=== modified file 'src/logic/worker.h'
--- src/logic/worker.h	2014-07-16 08:25:35 +0000
+++ src/logic/worker.h	2014-07-23 04:48:33 +0000
@@ -245,10 +245,6 @@
 	bool run_playFX           (Game &, State &, const Action &);
 	bool run_construct        (Game &, State &, const Action &);
 
-	// Displays a message to the player if a find... program can't be
-	// executed
-	void informPlayer(Game &, Building &, std::string) const;
-
 	OPtr<PlayerImmovable> m_location; ///< meta location of the worker
 	Economy          * m_economy;      ///< economy this worker is registered in
 	OPtr<WareInstance>    m_carried_ware; ///< ware we are carrying

=== modified file 'tribes/atlanteans/blackroot_farm/conf'
--- tribes/atlanteans/blackroot_farm/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/blackroot_farm/conf	2014-07-23 04:48:33 +0000
@@ -36,6 +36,11 @@
 call=harvest_blackroot
 return=skipped
 
+[out_of_resource_notification]
+title=_Out of Fields
+message=_The farmer working at this blackroot farm has no cleared soil to plant his seeds.
+delay_attempts=10
+
 [idle]
 pics=blackroot_farm_i_??.png  # ???
 hotspot=74 60

=== modified file 'tribes/atlanteans/coalmine/conf'
--- tribes/atlanteans/coalmine/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/coalmine/conf	2014-07-23 04:48:33 +0000
@@ -39,6 +39,10 @@
 mine=coal 4 100 5 2
 produce=coal:3
 
+[out_of_resource_notification]
+title=_Main Coal Vein Exhausted.
+message=_This coal mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider dismantling or destroying it.
+
 [idle]
 pics=coalmine_i_??.png
 hotspot=50 56

=== modified file 'tribes/atlanteans/crystalmine/conf'
--- tribes/atlanteans/crystalmine/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/crystalmine/conf	2014-07-23 04:48:33 +0000
@@ -83,6 +83,10 @@
 call=mine_diamond
 return=skipped
 
+[out_of_resource_notification]
+title=_Main Crystal Vein Exhausted.
+message=_This crystal mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider dismantling or destroying it.
+
 [idle]
 pics=crystalmine_i_??.png
 hotspot=50 56

=== modified file 'tribes/atlanteans/farm/conf'
--- tribes/atlanteans/farm/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/farm/conf	2014-07-23 04:48:33 +0000
@@ -39,6 +39,11 @@
 playFX=../../../sound/farm/farm_animal 192
 return=skipped
 
+[out_of_resource_notification]
+title=_Out of Fields
+message=_The farmer working at this farm has no cleared soil to plant his seeds.
+delay_attempts=10
+
 [idle]
 pics=farm_i_??.png  # ???
 hotspot=74 60

=== modified file 'tribes/atlanteans/fishers_house/conf'
--- tribes/atlanteans/fishers_house/conf	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/fishers_house/conf	2014-07-23 04:48:33 +0000
@@ -22,6 +22,10 @@
 sleep=16000
 worker=fish
 
+[out_of_resource_notification]
+title=_Out of Fish
+message=_The fisher working out of this fisher’s house can’t find any fish in his working radius. Remember that you can increase the number of existing fish by building a fishbreeder’s house.
+
 [idle]
 pics=fishers_house_i_??.png  # ???
 hotspot=34 42

=== modified file 'tribes/atlanteans/goldmine/conf'
--- tribes/atlanteans/goldmine/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/goldmine/conf	2014-07-23 04:48:33 +0000
@@ -40,6 +40,10 @@
 mine=gold 4 100 5 2
 produce=goldore
 
+[out_of_resource_notification]
+title=_Main Gold Vein Exhausted.
+message=_This gold mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider dismantling or destroying it.
+
 [idle]
 pics=goldmine_i_??.png
 hotspot=50 56

=== modified file 'tribes/atlanteans/hunters_house/conf'
--- tribes/atlanteans/hunters_house/conf	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/hunters_house/conf	2014-07-23 04:48:33 +0000
@@ -22,6 +22,12 @@
 sleep=35000
 worker=hunt
 
+[out_of_resource_notification]
+# TRANSLATORS: "Game" means animals that you can hunt
+title=_Out of Game
+message=_The hunter working out of this hunter’s house can’t find any game in his working radius. Remember that you can increase the number of existing fish by building a fishbreeder’s house.
+delay_attempts=10
+
 [idle]
 pics=hunters_house_i_??.png
 hotspot=36 44

=== modified file 'tribes/atlanteans/ironmine/conf'
--- tribes/atlanteans/ironmine/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/ironmine/conf	2014-07-23 04:48:33 +0000
@@ -40,6 +40,10 @@
 mine=iron 4 100 5 2
 produce=ironore:2
 
+[out_of_resource_notification]
+title=_Main Iron Vein Exhausted.
+message=_This iron mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider dismantling or destroying it.
+
 [idle]
 pics=ironmine_i_??.png
 hotspot=50 56

=== modified file 'tribes/atlanteans/quarry/conf'
--- tribes/atlanteans/quarry/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/quarry/conf	2014-07-23 04:48:33 +0000
@@ -19,8 +19,12 @@
 work=_Work
 
 [work]
-worker=cut_stone  # This order is on purpose so that the productivity 
-sleep=25000       # drops fast once all stones are gone.     
+worker=cut_stone  # This order is on purpose so that the productivity
+sleep=25000       # drops fast once all stones are gone.
+
+[out_of_resource_notification]
+title=_Out of Rocks
+message=_The stonecutter working at this quarry can’t find any rocks in his working radius.
 
 [idle]
 pics=quarry_i_??.png  # ???

=== modified file 'tribes/atlanteans/stonecutter/conf'
--- tribes/atlanteans/stonecutter/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/stonecutter/conf	2014-07-23 04:48:33 +0000
@@ -6,7 +6,7 @@
 carrier=1
 
 [cut_stone]
-0=findobject attrib:stone radius:6
+0=findobject attrib:granite radius:6
 1=walk object
 2=playFX ../../../sound/stonecutting/stonecutter 192
 3=animation hacking 10000

=== modified file 'tribes/atlanteans/well/conf'
--- tribes/atlanteans/well/conf	2014-06-06 20:27:28 +0000
+++ tribes/atlanteans/well/conf	2014-07-23 04:48:33 +0000
@@ -22,6 +22,11 @@
 mine=water 1 100 65 2
 produce=water
 
+[out_of_resource_notification]
+title=_Out of Water
+message=_The carrier working at this well can’t find any water in his working radius.
+delay_attempts=50
+
 [idle]
 pics=well_i_??.png  # ???
 hotspot=31 32

=== modified file 'tribes/atlanteans/woodcutters_house/conf'
--- tribes/atlanteans/woodcutters_house/conf	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/woodcutters_house/conf	2014-07-23 04:48:33 +0000
@@ -23,6 +23,11 @@
 sleep=30000 # Barbarian lumberjack sleeps 25000
 worker=harvest
 
+[out_of_resource_notification]
+title=_Out of Trees
+message=_The woodcutter working at this woodcutter’s house can’t find any trees in his working radius. You should consider dismantling or destroying the building or building a forester’s house.
+delay_attempts=60
+
 [idle]
 pics=woodcutters_house_i_??.png
 hotspot=37 44

=== modified file 'tribes/barbarians/coalmine/conf'
--- tribes/barbarians/coalmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/barbarians/coalmine/conf	2014-07-23 04:48:33 +0000
@@ -30,6 +30,10 @@
 mine=coal 2 33 5 17
 produce=coal:2
 
+[out_of_resource_notification]
+title=_Main Coal Vein Exhausted
+message=_This coal mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it.
+
 [idle]
 pics=coalmine_i_??.png
 hotspot=21 36

=== modified file 'tribes/barbarians/deep_coalmine/conf'
--- tribes/barbarians/deep_coalmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/barbarians/deep_coalmine/conf	2014-07-23 04:48:33 +0000
@@ -36,6 +36,10 @@
 mine=coal 2 66 5 17
 produce=coal:2
 
+[out_of_resource_notification]
+title=_Main Coal Vein Exhausted
+message=_This coal mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it.
+
 [idle]
 pics=deep_coalmine_i_??.png
 hotspot=21 37

=== modified file 'tribes/barbarians/deep_goldmine/conf'
--- tribes/barbarians/deep_goldmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/barbarians/deep_goldmine/conf	2014-07-23 04:48:33 +0000
@@ -36,6 +36,10 @@
 mine=gold 2 66 5 17
 produce=goldore:2
 
+[out_of_resource_notification]
+title=_Main Gold Vein Exhausted
+message=_This gold mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it.
+
 [idle]
 pics=deep_goldmine_i_??.png
 hotspot=21 37

=== modified file 'tribes/barbarians/deep_oremine/conf'
--- tribes/barbarians/deep_oremine/conf	2014-04-13 19:23:43 +0000
+++ tribes/barbarians/deep_oremine/conf	2014-07-23 04:48:33 +0000
@@ -36,6 +36,10 @@
 mine=iron 2 66 5 17
 produce=ironore:1
 
+[out_of_resource_notification]
+title=_Main Iron Vein Exhausted
+message=_This iron mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it.
+
 [build]
 pics=deep_oremine_b_??.png
 hotspot=21 37

=== modified file 'tribes/barbarians/deeper_coalmine/conf'
--- tribes/barbarians/deeper_coalmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/barbarians/deeper_coalmine/conf	2014-07-23 04:48:33 +0000
@@ -35,6 +35,10 @@
 mine=coal 2 100 10 2
 produce=coal:3
 
+[out_of_resource_notification]
+title=_Main Coal Vein Exhausted
+message=_This coal mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it.
+
 [idle]
 pics=deeper_coalmine_i_??.png
 hotspot=60 37

=== modified file 'tribes/barbarians/deeper_goldmine/conf'
--- tribes/barbarians/deeper_goldmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/barbarians/deeper_goldmine/conf	2014-07-23 04:48:33 +0000
@@ -35,6 +35,10 @@
 mine=gold 2 100 10 2
 produce=goldore:2
 
+[out_of_resource_notification]
+title=_Main Gold Vein Exhausted
+message=_This gold mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it.
+
 [idle]
 pics=deeper_goldmine_i_??.png
 hotspot=60 37

=== modified file 'tribes/barbarians/deeper_oremine/conf'
--- tribes/barbarians/deeper_oremine/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/deeper_oremine/conf	2014-07-23 04:48:33 +0000
@@ -38,6 +38,10 @@
 mine=iron 2 100 10 2
 produce=ironore:2
 
+[out_of_resource_notification]
+title=_Main Iron Vein Exhausted
+message=_This iron mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it.
+
 [idle]
 pics=deeper_oremine_i_??.png
 hotspot=60 37

=== modified file 'tribes/barbarians/farm/conf'
--- tribes/barbarians/farm/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/farm/conf	2014-07-23 04:48:33 +0000
@@ -36,6 +36,11 @@
 playFX=../../../sound/farm/farm_animal 192
 return=skipped
 
+[out_of_resource_notification]
+title=_Out of Fields
+message=_The farmer working at this farm has no cleared soil to plant his seeds.
+delay_attempts=10
+
 [idle]
 pics=farm_i_??.png  # ???
 hotspot=72 73

=== modified file 'tribes/barbarians/fishers_hut/conf'
--- tribes/barbarians/fishers_hut/conf	2014-05-25 17:43:56 +0000
+++ tribes/barbarians/fishers_hut/conf	2014-07-23 04:48:33 +0000
@@ -21,6 +21,10 @@
 sleep=18000
 worker=fish
 
+[out_of_resource_notification]
+title=_Out of Fish
+message=_The fisher working out of this fisher’s hut can’t find any fish in his working radius.
+
 [idle]
 pics=fishers_hut_i_??.png  # ???
 hotspot=39 40

=== modified file 'tribes/barbarians/goldmine/conf'
--- tribes/barbarians/goldmine/conf	2014-04-13 19:23:43 +0000
+++ tribes/barbarians/goldmine/conf	2014-07-23 04:48:33 +0000
@@ -31,6 +31,10 @@
 mine=gold 2 33 5 17
 produce=goldore
 
+[out_of_resource_notification]
+title=_Main Gold Vein Exhausted
+message=_This gold mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it.
+
 [idle]
 pics=goldmine_i_??.png
 hotspot=21 36

=== modified file 'tribes/barbarians/granitemine/conf'
--- tribes/barbarians/granitemine/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/granitemine/conf	2014-07-23 04:48:33 +0000
@@ -28,6 +28,10 @@
 mine=granite 2 100 5 17
 produce=raw_stone:2
 
+[out_of_resource_notification]
+title=_Main Granite Vein Exhausted
+message=_This granite mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it.
+
 [idle]
 pics=granitemine_i_??.png
 hotspot=42 35

=== modified file 'tribes/barbarians/hunters_hut/conf'
--- tribes/barbarians/hunters_hut/conf	2014-05-25 17:43:56 +0000
+++ tribes/barbarians/hunters_hut/conf	2014-07-23 04:48:33 +0000
@@ -22,6 +22,12 @@
 sleep=35000
 worker=hunt
 
+[out_of_resource_notification]
+# TRANSLATORS: "Game" means animals that you can hunt
+title=_Out of Game
+message=_The hunter working out of this hunter’s hut can’t find any game in his working radius. Remember that you can build a gamekeeper’s hut to release more game into the wild.
+delay_attempts=10
+
 [idle]
 pics=hunters_hut_i_??.png
 hotspot=45 40

=== modified file 'tribes/barbarians/lumberjacks_hut/conf'
--- tribes/barbarians/lumberjacks_hut/conf	2014-03-15 11:29:32 +0000
+++ tribes/barbarians/lumberjacks_hut/conf	2014-07-23 04:48:33 +0000
@@ -21,6 +21,11 @@
 sleep=25000 # sleeps shorter than any other tribes
 worker=chop
 
+[out_of_resource_notification]
+title=_Out of Trees
+message=_The lumberjack working at this lumberjack’s hut can’t find any trees in his working radius. You should consider dismantling or destroying the building or building a rangers’s hut.
+delay_attempts=60
+
 [idle]
 pics=lumberjacks_hut_i_??.png
 hotspot=40 38

=== modified file 'tribes/barbarians/oremine/conf'
--- tribes/barbarians/oremine/conf	2014-04-13 19:23:43 +0000
+++ tribes/barbarians/oremine/conf	2014-07-23 04:48:33 +0000
@@ -31,6 +31,10 @@
 mine=iron 2 33 5 17
 produce=ironore
 
+[out_of_resource_notification]
+title=_Main Iron Vein Exhausted
+message=_This iron mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it.
+
 [idle]
 pics=oremine_i_??.png
 hotspot=21 36

=== modified file 'tribes/barbarians/quarry/conf'
--- tribes/barbarians/quarry/conf	2014-07-15 10:02:22 +0000
+++ tribes/barbarians/quarry/conf	2014-07-23 04:48:33 +0000
@@ -18,9 +18,13 @@
 work=_Work
 
 [work]
-worker=cut   # This order is on purpose so that the productivity 
+worker=cut   # This order is on purpose so that the productivity
 sleep=25000  # drops fast once all stones are gone.
 
+[out_of_resource_notification]
+title=_Out of Rocks
+message=_The stonemason working at this quarry can’t find any rocks in his working radius.
+
 [idle]
 pics=quarry_i_??.png  # ???
 hotspot=45 40

=== modified file 'tribes/barbarians/reed_yard/conf'
--- tribes/barbarians/reed_yard/conf	2014-03-15 11:54:07 +0000
+++ tribes/barbarians/reed_yard/conf	2014-07-23 04:48:33 +0000
@@ -33,6 +33,11 @@
 call=harvest_reed
 return=skipped
 
+[out_of_resource_notification]
+title=_Out of Fields
+message=_The gardener working at this reed yard has no cleared soil to plant his seeds.
+delay_attempts=10
+
 [idle]
 pics=reed_yard_i_??.png  # ???
 hotspot=46 44

=== modified file 'tribes/barbarians/stonemason/conf'
--- tribes/barbarians/stonemason/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/stonemason/conf	2014-07-23 04:48:33 +0000
@@ -6,7 +6,7 @@
 carrier=1
 
 [cut]
-0=findobject attrib:stone radius:6
+0=findobject attrib:granite radius:6
 1=walk object
 2=playFX ../../../sound/stonecutting/stonecutter 192
 3=animation hacking 10000

=== modified file 'tribes/barbarians/well/conf'
--- tribes/barbarians/well/conf	2014-06-06 20:27:28 +0000
+++ tribes/barbarians/well/conf	2014-07-23 04:48:33 +0000
@@ -23,6 +23,11 @@
 mine=water 1 100 65 2
 produce=water
 
+[out_of_resource_notification]
+title=_Out of Water
+message=_The carrier working at this well can’t find any water in his working radius.
+delay_attempts=50
+
 [idle]
 pics=well_i_??.png
 hotspot=19 33

=== modified file 'tribes/empire/coalmine/conf'
--- tribes/empire/coalmine/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/coalmine/conf	2014-07-23 04:48:33 +0000
@@ -36,6 +36,10 @@
 mine=coal 2 50 5 17
 produce=coal
 
+[out_of_resource_notification]
+title=_Main Coal Vein Exhausted
+message=_This coal mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it.
+
 [idle]
 pics=coalmine_i_??.png
 hotspot=49 49

=== modified file 'tribes/empire/deep_coalmine/conf'
--- tribes/empire/deep_coalmine/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/deep_coalmine/conf	2014-07-23 04:48:33 +0000
@@ -37,6 +37,10 @@
 mine=coal 2 100 5 2
 produce=coal:3
 
+[out_of_resource_notification]
+title=_Main Coal Vein Exhausted
+message=_This coal mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it.
+
 [idle]
 pics=deep_coalmine_i_??.png
 hotspot=49 61

=== modified file 'tribes/empire/deep_goldmine/conf'
--- tribes/empire/deep_goldmine/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/deep_goldmine/conf	2014-07-23 04:48:33 +0000
@@ -37,6 +37,10 @@
 mine=gold 2 100 5 2
 produce=goldore:2
 
+[out_of_resource_notification]
+title=_Main Gold Vein Exhausted
+message=_This gold mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it.
+
 [idle]
 pics=deep_goldmine_i_??.png
 hotspot=49 61

=== modified file 'tribes/empire/deep_marblemine/conf'
--- tribes/empire/deep_marblemine/conf	2014-04-18 12:43:49 +0000
+++ tribes/empire/deep_marblemine/conf	2014-07-23 04:48:33 +0000
@@ -36,6 +36,10 @@
 mine=granite 2 100 5 2
 produce=marble stone:2
 
+[out_of_resource_notification]
+title=_Main Marble Vein Exhausted
+message=_This marble mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it.
+
 [idle]
 pics=deep_marblemine_i_??.png
 hotspot=49 61

=== modified file 'tribes/empire/deep_oremine/conf'
--- tribes/empire/deep_oremine/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/deep_oremine/conf	2014-07-23 04:48:33 +0000
@@ -37,6 +37,10 @@
 mine=iron 2 100 5 2
 produce=ironore:2
 
+[out_of_resource_notification]
+title=_Main Iron Vein Exhausted
+message=_This iron mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it.
+
 [idle]
 pics=deep_oremine_i_??.png
 hotspot=49 61

=== modified file 'tribes/empire/farm/conf'
--- tribes/empire/farm/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/farm/conf	2014-07-23 04:48:33 +0000
@@ -39,6 +39,11 @@
 playFX=../../../sound/farm/farm_animal 192
 return=skipped
 
+[out_of_resource_notification]
+title=_Out of Fields
+message=_The farmer working at this farm has no cleared soil to plant his seeds.
+delay_attempts=10
+
 [idle]
 pics=farm_i_??.png  # ???
 hotspot=82 74

=== modified file 'tribes/empire/fishers_house/conf'
--- tribes/empire/fishers_house/conf	2014-05-26 20:36:01 +0000
+++ tribes/empire/fishers_house/conf	2014-07-23 04:48:33 +0000
@@ -23,6 +23,10 @@
 sleep=17000
 worker=fish
 
+[out_of_resource_notification]
+title=_Out of Fish
+message=_The fisher working in this fisher’s house can’t find any fish in his working radius.
+
 [idle]
 pics=fishers_house_i_??.png  # ???
 hotspot=42 60

=== modified file 'tribes/empire/goldmine/conf'
--- tribes/empire/goldmine/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/goldmine/conf	2014-07-23 04:48:33 +0000
@@ -37,6 +37,10 @@
 mine=gold 2 50 5 17
 produce=goldore
 
+[out_of_resource_notification]
+title=_Main Gold Vein Exhausted
+message=_This gold mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it.
+
 [idle]
 pics=goldmine_i_??.png
 hotspot=49 49

=== modified file 'tribes/empire/hunters_house/conf'
--- tribes/empire/hunters_house/conf	2014-05-26 20:36:01 +0000
+++ tribes/empire/hunters_house/conf	2014-07-23 04:48:33 +0000
@@ -22,6 +22,12 @@
 sleep=35000
 worker=hunt
 
+[out_of_resource_notification]
+# TRANSLATORS: "Game" means animals that you can hunt
+title=_Out of Game
+message=_The hunter working out of this hunter’s house can’t find any game in his working radius.
+delay_attempts=10
+
 [idle]
 pics=hunters_house_i_??.png
 hotspot=54 55

=== modified file 'tribes/empire/lumberjacks_house/conf'
--- tribes/empire/lumberjacks_house/conf	2014-05-26 20:36:01 +0000
+++ tribes/empire/lumberjacks_house/conf	2014-07-23 04:48:33 +0000
@@ -23,6 +23,11 @@
 sleep=30000 # Barbarian lumberjack sleeps 25000
 worker=chop
 
+[out_of_resource_notification]
+title=_Out of Trees
+message=_The lumberjack working at this lumberjack’s house can’t find any trees in his working radius. You should consider dismantling or destroying the building or building a forester’s house.
+delay_attempts=60
+
 [idle]
 pics=lumberjacks_house_i_??.png
 hotspot=40 59

=== modified file 'tribes/empire/marblemine/conf'
--- tribes/empire/marblemine/conf	2014-06-14 14:20:22 +0000
+++ tribes/empire/marblemine/conf	2014-07-23 04:48:33 +0000
@@ -48,6 +48,10 @@
 mine=granite 2 50 5 17
 produce=stone:2
 
+[out_of_resource_notification]
+title=_Main Marble Vein Exhausted
+message=_This marble mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it.
+
 [work]
 call=mine_marble
 call=mine_stone

=== modified file 'tribes/empire/oremine/conf'
--- tribes/empire/oremine/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/oremine/conf	2014-07-23 04:48:33 +0000
@@ -37,6 +37,10 @@
 mine=iron 2 50 5 17
 produce=ironore:2
 
+[out_of_resource_notification]
+title=_Main Iron Vein Exhausted
+message=_This iron mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it.
+
 [idle]
 pics=oremine_i_??.png
 hotspot=49 49

=== modified file 'tribes/empire/quarry/conf'
--- tribes/empire/quarry/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/quarry/conf	2014-07-23 04:48:33 +0000
@@ -22,11 +22,11 @@
 work=_Work
 
 [mine_stone]
-worker=cut_stone  # This order is on purpose so that the productivity 
+worker=cut_stone  # This order is on purpose so that the productivity
 sleep=25000       # drops fast once all stones are gone.
 
 [mine_marble]
-worker=cut_marble  # This order is on purpose so that the productivity 
+worker=cut_marble  # This order is on purpose so that the productivity
 sleep=25000        # drops fast once all stones are gone.
 
 [work]
@@ -39,6 +39,10 @@
 call=mine_marble # 2 of 7 times it finds marble
 return=skipped
 
+[out_of_resource_notification]
+title=_Out of Rocks
+message=_The stonemason working at this quarry can’t find any rocks in his working radius.
+
 [idle]
 pics=quarry_i_??.png  # ???
 hotspot=42 57

=== modified file 'tribes/empire/stonemason/conf'
--- tribes/empire/stonemason/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/stonemason/conf	2014-07-23 04:48:33 +0000
@@ -7,7 +7,7 @@
 carrier=1
 
 [cut_stone]
-0=findobject attrib:stone radius:6
+0=findobject attrib:granite radius:6
 1=walk object
 2=playFX ../../../sound/stonecutting/stonecutter 220
 3=animation hacking 10000
@@ -16,7 +16,7 @@
 6=return
 
 [cut_marble]
-0=findobject attrib:stone radius:6
+0=findobject attrib:granite radius:6
 1=walk object
 2=playFX ../../../sound/stonecutting/stonecutter 220
 3=animation hacking 10000

=== modified file 'tribes/empire/vineyard/conf'
--- tribes/empire/vineyard/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/vineyard/conf	2014-07-23 04:48:33 +0000
@@ -38,6 +38,11 @@
 call=harvest_vine
 return=skipped
 
+[out_of_resource_notification]
+title=_Out of Fields
+message=_The farmer working at this vineyard has no cleared soil to plant his seeds.
+delay_attempts=10
+
 [idle]
 pics=vineyard_i_??.png  # ???
 hotspot=53 53

=== modified file 'tribes/empire/well/conf'
--- tribes/empire/well/conf	2014-06-06 20:27:28 +0000
+++ tribes/empire/well/conf	2014-07-23 04:48:33 +0000
@@ -26,6 +26,11 @@
 mine=water 1 100 65 2
 produce=water
 
+[out_of_resource_notification]
+title=_Out of Water
+message=_The carrier working at this well can’t find any water in his working radius.
+delay_attempts=50
+
 [idle]
 pics=well_i_??.png  # ???
 hotspot=43 58

=== modified file 'world/immovables/stones/blackland_stones1/init.lua'
--- world/immovables/stones/blackland_stones1/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/blackland_stones1/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 1",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "remove="

=== modified file 'world/immovables/stones/blackland_stones2/init.lua'
--- world/immovables/stones/blackland_stones2/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/blackland_stones2/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 2",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=blackland_stones1"

=== modified file 'world/immovables/stones/blackland_stones3/init.lua'
--- world/immovables/stones/blackland_stones3/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/blackland_stones3/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 3",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=blackland_stones2"

=== modified file 'world/immovables/stones/blackland_stones4/init.lua'
--- world/immovables/stones/blackland_stones4/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/blackland_stones4/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 4",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=blackland_stones3"

=== modified file 'world/immovables/stones/blackland_stones5/init.lua'
--- world/immovables/stones/blackland_stones5/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/blackland_stones5/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 5",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=blackland_stones4"

=== modified file 'world/immovables/stones/blackland_stones6/init.lua'
--- world/immovables/stones/blackland_stones6/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/blackland_stones6/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 6",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=blackland_stones5"

=== modified file 'world/immovables/stones/desert_stones1/init.lua'
--- world/immovables/stones/desert_stones1/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/desert_stones1/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 1",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "remove="

=== modified file 'world/immovables/stones/desert_stones2/init.lua'
--- world/immovables/stones/desert_stones2/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/desert_stones2/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 2",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=desert_stones1"

=== modified file 'world/immovables/stones/desert_stones3/init.lua'
--- world/immovables/stones/desert_stones3/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/desert_stones3/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 3",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=desert_stones2"

=== modified file 'world/immovables/stones/desert_stones4/init.lua'
--- world/immovables/stones/desert_stones4/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/desert_stones4/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 4",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=desert_stones3"

=== modified file 'world/immovables/stones/desert_stones5/init.lua'
--- world/immovables/stones/desert_stones5/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/desert_stones5/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 5",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=desert_stones4"

=== modified file 'world/immovables/stones/desert_stones6/init.lua'
--- world/immovables/stones/desert_stones6/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/desert_stones6/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 6",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=desert_stones5"

=== modified file 'world/immovables/stones/greenland_stones1/init.lua'
--- world/immovables/stones/greenland_stones1/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/greenland_stones1/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 1",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "remove="

=== modified file 'world/immovables/stones/greenland_stones2/init.lua'
--- world/immovables/stones/greenland_stones2/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/greenland_stones2/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 2",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=greenland_stones1"

=== modified file 'world/immovables/stones/greenland_stones3/init.lua'
--- world/immovables/stones/greenland_stones3/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/greenland_stones3/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 3",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=greenland_stones2"

=== modified file 'world/immovables/stones/greenland_stones4/init.lua'
--- world/immovables/stones/greenland_stones4/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/greenland_stones4/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 4",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=greenland_stones3"

=== modified file 'world/immovables/stones/greenland_stones5/init.lua'
--- world/immovables/stones/greenland_stones5/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/greenland_stones5/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 5",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=greenland_stones4"

=== modified file 'world/immovables/stones/greenland_stones6/init.lua'
--- world/immovables/stones/greenland_stones6/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/greenland_stones6/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 6",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=greenland_stones5"

=== modified file 'world/immovables/stones/winterland_stones1/init.lua'
--- world/immovables/stones/winterland_stones1/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/winterland_stones1/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 1",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "remove="

=== modified file 'world/immovables/stones/winterland_stones2/init.lua'
--- world/immovables/stones/winterland_stones2/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/winterland_stones2/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 2",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=winterland_stones1"

=== modified file 'world/immovables/stones/winterland_stones3/init.lua'
--- world/immovables/stones/winterland_stones3/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/winterland_stones3/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 3",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=winterland_stones2"

=== modified file 'world/immovables/stones/winterland_stones4/init.lua'
--- world/immovables/stones/winterland_stones4/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/winterland_stones4/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 4",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=winterland_stones3"

=== modified file 'world/immovables/stones/winterland_stones5/init.lua'
--- world/immovables/stones/winterland_stones5/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/winterland_stones5/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 5",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=winterland_stones4"

=== modified file 'world/immovables/stones/winterland_stones6/init.lua'
--- world/immovables/stones/winterland_stones6/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/stones/winterland_stones6/init.lua	2014-07-23 04:48:33 +0000
@@ -12,7 +12,7 @@
    descname = _ "Stones 6",
    editor_category = "stones",
    size = "big",
-   attributes = { "stone" },
+   attributes = { "granite" },
    programs = {
       shrink = {
          "transform=winterland_stones5"