Merge lp:~widelands-dev/widelands/fix_world_names into lp:widelands

[GunChleoc]

Some of the skeletons are actually seashells, so I did some renaming.

[SirVer (sirver)]

Do you really want to do this? I ask because I think that seashells are a kind of skeleton :P.

Also, the implications here are that all maps created between the one world merge and this will be unloadable (and there have been at least 2 linked in the forums already) without adding another layer of compatibility code, which I'd rather avoid.

If you really want to get that in, there need to be changes on the one world legacy table to load old maps and some testing with old maps (from the homepage) need to be done.

review: Needs Fixing

[Teppo Mäenpää (kxq)]

> another layer of compatibility code, which I'd rather avoid.

Could this be in one of those cases where polishing the English should be done at Widelands-to British/American/whatever translations instead of the Widelands code itself?

[GunChleoc (gunchleoc)]

If it's creating a problem, leave it - it is not that important.

I will add translator comments instead, so translators will know that it's a seashell if they're paying attention.

[GunChleoc (gunchleoc)]

I had another idea: what will heppen if I change just the localization string, e.g.

name = "skeleton4",
descname = _ "Seashell",

Will that cause problems?

[SirVer (sirver)]

No, changing the descname is fine and can be done without issues. I think this is preferable to Teppos suggestion actually.

[GunChleoc (gunchleoc)]

OK, new branch: https://code.launchpad.net/~widelands-dev/widelands/skeletons2seashells

Let's scrap this one.

=== modified file 'src/map_io/s2map.cc'
--- src/map_io/s2map.cc	2014-07-05 14:22:44 +0000
+++ src/map_io/s2map.cc	2014-07-12 20:29:25 +0000
@@ -785,8 +785,8 @@
 			case BOB_STANDING_STONES7: bobname = "sstones7";  break;
 
 			case BOB_SKELETON1:        bobname = "skeleton1"; break;
-			case BOB_SKELETON2:        bobname = "skeleton2"; break;
-			case BOB_SKELETON3:        bobname = "skeleton3"; break;
+			case BOB_SKELETON2:        bobname = "seashell2"; break;
+			case BOB_SKELETON3:        bobname = "skeleton2"; break;
 
 			case BOB_CACTUS1:
 				bobname = m_worldtype != S2_Map_Loader::WINTERLAND ? "cactus1" : "snowman";

=== renamed directory 'world/immovables/skeleton4' => 'world/immovables/seashell1'
=== modified file 'world/immovables/seashell1/init.lua'
--- world/immovables/skeleton4/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/seashell1/init.lua	2014-07-12 20:29:25 +0000
@@ -1,8 +1,8 @@
 dirname = path.dirname(__file__)
 
 world:new_immovable_type{
-   name = "skeleton4",
-   descname = _ "Skeleton",
+   name = "seashell1",
+   descname = _ "Seashell",
    editor_category = "miscellaneous",
    size = "none",
    attributes = {},

=== renamed directory 'world/immovables/skeleton2' => 'world/immovables/seashell2'
=== modified file 'world/immovables/seashell2/init.lua'
--- world/immovables/skeleton2/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/seashell2/init.lua	2014-07-12 20:29:25 +0000
@@ -1,8 +1,8 @@
 dirname = path.dirname(__file__)
 
 world:new_immovable_type{
-   name = "skeleton2",
-   descname = _ "Skeleton",
+   name = "seashell2",
+   descname = _ "Seashell",
    editor_category = "miscellaneous",
    size = "none",
    attributes = {},

=== renamed directory 'world/immovables/skeleton3' => 'world/immovables/skeleton2'
=== modified file 'world/immovables/skeleton2/init.lua'
--- world/immovables/skeleton3/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/skeleton2/init.lua	2014-07-12 20:29:25 +0000
@@ -1,7 +1,7 @@
 dirname = path.dirname(__file__)
 
 world:new_immovable_type{
-   name = "skeleton3",
+   name = "skeleton2",
    descname = _ "Skeleton",
    editor_category = "miscellaneous",
    size = "none",

=== modified file 'world/immovables/track_winter/init.lua'
--- world/immovables/track_winter/init.lua	2014-05-03 08:40:59 +0000
+++ world/immovables/track_winter/init.lua	2014-07-12 20:29:25 +0000
@@ -2,6 +2,7 @@
 
 world:new_immovable_type{
    name = "track_winter",
+   -- TRANSLATORS: This track is made of footprints in the snow
    descname = _ "Track",
    editor_category = "miscellaneous",
    size = "none",

=== modified file 'world/init.lua'
--- world/init.lua	2014-06-22 10:58:43 +0000
+++ world/init.lua	2014-07-12 20:29:25 +0000
@@ -93,10 +93,10 @@
 include "world/immovables/ruin3/init.lua"
 include "world/immovables/ruin4/init.lua"
 include "world/immovables/ruin5/init.lua"
+include "world/immovables/seashell1/init.lua"
+include "world/immovables/seashell2/init.lua"
 include "world/immovables/skeleton1/init.lua"
 include "world/immovables/skeleton2/init.lua"
-include "world/immovables/skeleton3/init.lua"
-include "world/immovables/skeleton4/init.lua"
 include "world/immovables/track_winter/init.lua"
 
 -- Standing Stones

=== modified file 'world/map_generation.lua'
--- world/map_generation.lua	2014-06-10 18:02:00 +0000
+++ world/map_generation.lua	2014-07-12 20:29:25 +0000
@@ -111,7 +111,7 @@
       {
          name = "wasteland_doodads",
          immovables = {
-            "skeleton1", "skeleton2", "skeleton3", "cactus1",
+            "seashell2", "skeleton1", "skeleton2", "cactus1",
             "cactus2", "fallentree", "deadtree1", "deadtree2",
             "deadtree3", "deadtree4"
          },
@@ -299,7 +299,7 @@
       {
          name = "wasteland_doodads",
          immovables = {
-            "skeleton1", "skeleton2", "skeleton3", "cactus1",
+            "seashell2", "skeleton1", "skeleton2", "cactus1",
             "cactus2", "fallentree", "deadtree1", "deadtree2",
             "deadtree3", "deadtree4"
          },
@@ -469,7 +469,7 @@
       {
          name = "wasteland_doodads",
          immovables = {
-            "skeleton1", "skeleton2", "skeleton3", "cactus1",
+            "seashell2", "skeleton1", "skeleton2", "cactus1",
             "cactus2", "fallentree", "deadtree1", "deadtree5",
             "deadtree6", "deadtree4"
          },
@@ -656,7 +656,7 @@
       {
          name = "wasteland_doodads",
          immovables = {
-            "skeleton1", "skeleton2", "skeleton3", "deadtree1",
+            "seashell2", "skeleton1", "skeleton2", "deadtree1",
             "deadtree2", "deadtree3", "deadtree4"
          },
          critters = {},