[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Review: Approve I did a bit of cleanup - most of it for elegance. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Continuous integration builds have changed state: Travis build 1213. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/147134509. Appveyor build 1052. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1570086_unify_terrain_names-1052. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Continuous integration builds have changed state: Travis build 1178. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/143749080. Appveyor build 1016. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1570086_unify_terrain_names-1016. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Continuous integration builds have changed state: Travis build 1178. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/143749080. Appveyor build 1016. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1570086_unify_terrain_names-1016. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Bunnybot encountered an error while working on this merge proposal: -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Tested also the atlantean campaign. First it did not work but after deleting the build directory and compiling from scratch, the campaign could be completed. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Thanks ! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Yep, that saveloading code has a complicated control flow. I will be back at my computer again in 2 weeks and I could have a look to get it into the correct lookup table. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Review: Resubmit The problem here is, that the PostWorldLookupTable isn't used when a scenario map get loaded. Loading a scenario takes care only of the OneWorldLookupTable. But i don't know why... A solution is to add the changed names also to the OneWorldLookupTable. But i 'feel' this isn't a good solution. Nevertheless i propose it for review. All tests are working and creating random maps do also work. I have tried to find all 'old' names in the data folder as well in the src directory and changed them accordingly. Not tested is the atlantean campaign. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Yes, have everything in English, add it to the legacy table (if you haven't already done so) and then grep for all the German names to make sure that we haven't missed anything in some scenario/LUA code. We will also need to test load old maps to make sure that the legacy table is complete. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
I am not sure what your are want to do now. I understand you want to rename also the 'name' attribute into english terms? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
I agree. Let's do this change for Build 19 and grep for the old names to make sure that we haven't broken anything in our own scenarios. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
> The map get loaded without errors but the scripting does not work. That is what i meant earlier. This is true for old scenarios as well: the one world lookup table will only fix names for savegames/maps packets that we control. The lua scripting serialized blob inside the loaded scenarios/games however is opaque to us and will have referenced these names as well potentially. this is beyond our control to fix and those games will break. I think that is an acceptable risk since very few scenarios are out in the wild and as I said, I think we changed the API for b19 already in a non-backwards compatible manner. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Continuous integration builds have changed state: Travis build 1175. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/142866451. Appveyor build 1013. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1570086_unify_terrain_names-1013. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Review: Resubmit I should read the errors better: > Reading Terrain Data ... WidelandsMapLoader::load_map_complete() for '00Test' > took 2ms > Scenario not started: Game data error: terrain: Terrain 'steppe' exists in > map, not in world! The map get loaded without errors but the scripting does not work. Now the branch is changed to use the old 'name's. After some adjustments to the tests to fit with the new names of the images and the subfolders, all tests run without errors. If it is wanted the 'name's could be changed later on. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
The changes in PostOneWorldLegacyLookupTable() should take care of incompatibilities. It just changes "old_terrain_name" with "new_terrain_name" if an older map or a savgame get loaded. This is tested and works. Scenarios (campaigns) do also work. But i have not tested the altantean campaign, the only one i believe where terrain changes comes into game. I guess the tests fail because they are using old 'name'-terms of terrains whereas the name-change with PostOneWorldLegacyLookupTable() is already done. I look into this. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Renaming the 'name' fields of the terrains is a backwards incompatible change - i.e. it make break scenarios. I think we did some API changes in the Lua code that were backwards incompatible and deemed it okay for b19 (where we break basically everything anyways), but I am not sure. Gun, do you remember? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Review: Needs Fixing Hm, the tests do not run through. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Continuous integration builds have changed state: Travis build 1169. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/140925592. Appveyor build 1007. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1570086_unify_terrain_names-1007. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Bunnybot encountered an error while working on this merge proposal: The read operation timed out -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Continuous integration builds have changed state: Travis build 1169. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/140925592. Appveyor build 1007. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1570086_unify_terrain_names-1007. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Review: Resubmit -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Don't test yet, i have forgotton to change the init.lua... :-S Update is in progress -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Thanks for renaming :) To me, "flows" looks like somebody can'r spell ;) https://dict.leo.org/ende/index_de.html#/search=Eisscholle https://dict.leo.org/ende/index_de.html#/search=floe -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
:-D done renaming ice_flows -> ice_floes "floes" looks so un-english ;) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
Code LGTM, just 1 nit: "ice_flows" should be "ice_floes". Not compiled or tested. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands
kaputtnik has proposed merging
lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands.
Commit message:
Unify german spelled terrains to english spelling.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1570086 in widelands: "Unify terrain names; put animated terrains in
subfolders"
https://bugs.launchpad.net/widelands/+bug/1570086
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1570086_unify_terrain_names/+merge/298572
Unify german spelled terrains to english spelling.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1570086_unify_terrain_names into lp:widelands.
=== modified file 'data/world/terrains/init.lua'
--- data/world/terrains/init.lua 2016-03-01 06:50:23 +
+++ data/world/terrains/init.lua 2016-06-28 20:15:55 +
@@ -1,6 +1,6 @@
-- Categories for the editor.
world:new_editor_terrain_category{
- name = "green",
+ name = "summer",
descname = _ "Summer",
picture = "world/pics/editor_terrain_category_green.png",
}
@@ -27,13 +27,13 @@
pics_dir = path.dirname(__file__) .. "pics/"
world:new_terrain_type{
-- The internal name of this terrain.
- name = "wiese1",
+ name = "summer_meadow1",
-- The name that will be used in UI and translated.
descname = _ "Meadow 1",
-- The category for sorting this into menus in the editor.
- editor_category = "green",
+ editor_category = "summer",
-- Type of terrain. Describes if the terrain is walkable, swimmable, if
-- mines or buildings can be build on it, if flags can be build on it and so
@@ -63,7 +63,7 @@
default_resource_amount = 10,
-- The images used for this terrain.
- textures = { pics_dir .. "green/wiese1_00.png" },
+ textures = { pics_dir .. "summer/meadow1_00.png" },
-- This describes the z layer of the terrain when rendered next to another
-- one and blending slightly over it to hide the triangles.
@@ -82,9 +82,9 @@
world:new_terrain_type{
- name = "wiese2",
+ name = "summer_meadow2",
descname = _ "Meadow 2",
- editor_category = "green",
+ editor_category = "summer",
is = "arable",
tooltips = {
-- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
@@ -93,7 +93,7 @@
valid_resources = {"water"},
default_resource = "water",
default_resource_amount = 10,
- textures = { pics_dir .. "green/wiese2_00.png" },
+ textures = { pics_dir .. "summer/meadow2_00.png" },
dither_layer = 350,
temperature = 100,
humidity = 0.6,
@@ -103,9 +103,9 @@
world:new_terrain_type{
- name = "wiese3",
+ name = "summer_meadow3",
descname = _ "Meadow 3",
- editor_category = "green",
+ editor_category = "summer",
is = "arable",
tooltips = {
-- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
@@ -114,7 +114,7 @@
valid_resources = {"water"},
default_resource = "water",
default_resource_amount = 10,
- textures = { pics_dir .. "green/wiese3_00.png" },
+ textures = { pics_dir .. "summer/meadow3_00.png" },
dither_layer = 350,
temperature = 105,
humidity = 0.55,
@@ -123,9 +123,9 @@
world:new_terrain_type{
- name = "wiese4",
+ name = "summer_meadow4",
descname = _ "Meadow 4",
- editor_category = "green",
+ editor_category = "summer",
is = "arable",
tooltips = {
-- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
@@ -134,7 +134,7 @@
valid_resources = {"water"},
default_resource = "water",
default_resource_amount = 10,
- textures = { pics_dir .. "green/wiese4_00.png" },
+ textures = { pics_dir .. "summer/meadow4_00.png" },
dither_layer = 350,
temperature = 110,
humidity = 0.65,
@@ -143,14 +143,14 @@
world:new_terrain_type{
- name = "steppe",
+ name = "summer_steppe",
descname = _ "Steppe",
- editor_category = "green",
+ editor_category = "summer",
is = "arable",
valid_resources = { "water" },
default_resource = "water",
default_resource_amount = 5,
- textures = { pics_dir .. "green/steppe_00.png" },
+ textures = { pics_dir .. "summer/steppe_00.png" },
dither_layer = 330,
temperature = 100,
humidity = 0.4,
@@ -159,14 +159,14 @@
world:new_terrain_type{
- name = "steppe_kahl",
+ name = "summe
