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

[GunChleoc]

Editor categorized item selection menu overhaul:
- Overhauled the selection menu for critters to give them categories
- Made the background a bit darker, because critters were hard to see
- Added an option "items per row" and rearranged the terrains and immovables
- Renamed critter animation files for consistency

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1755. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/182872335.
Appveyor build 1595. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_critter_editor_categories-1595.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1755. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/182872335.
Appveyor build 1595. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_critter_editor_categories-1595.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1755. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/182872335.
Appveyor build 1595. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_critter_editor_categories-1595.

[SirVer (sirver)]

Reviewed code (comments in a commit) and tested. lgtm, just some nits.

review: Approve

[GunChleoc (gunchleoc)]

A quick comment to the comments:

The reordering was done to make the UI more consistent, e.g. that we always have arable terrains first, or that immovables look clean and not all over the place.

The different terrain window sizes were probably done on purpose as well to group the same types of terrain as much as possible - I coded this a few months ago, so I don't remember 100% right now.

I haven't looked at how the order of Editor elements might affect savegames - we should saveload a map and check if it still looks the same just to be sure.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1778. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/184970308.
Appveyor build 1616. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_critter_editor_categories-1616.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1780. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/185123561.
Appveyor build 1618. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_critter_editor_categories-1618.

[toptopple (7010622-q-deactivatedaccount)]

I am a bit sceptical about the amount of redundant text that appears in the selection windows of Immovables and Animals. You have also added the text to the Animals window which didn't show it before. The standard text showing everywhere is "Click to select an item. Use the Ctrl key to select multiple items." I wonder for what is it good?

1. "Click to select an item." is redundant, everyone using this tool can be expected to guess this.
2. "Use the Ctrl key to select multiple items." This is useful information, but is it enough and is it in the right place? Once you understood the message, this text still appears as graphic clutter during all your editor work (more or less) and consuming needed view space. Then, have you looked at the "Duck" window and how the text appears there? It's a monument of redundancy and it will not take long until people will start asking "Why?".

I further find two things:

A) Help texts of the mentioned type can be placed as a hover-text on a small Help button, like e.g showing "?", in the bottom right of each selection window. You can even put more information there, e.g. on what multiple selections can be used for. Then this type of text can disappear from the displays.
B) What could, additionally, indeed show in the bottom of the displays is an explanatory text for the chosen category (tab) if there is a special practical relevance to these items. E.g. the "Rocks" tab could say "Items here can be mined for the Stone and Marble resource.". Or. "Dead trees can never be removed." Etc.

Hope this can give some ideas which are useful.

review: Needs Fixing

[GunChleoc (gunchleoc)]

@toptopple: Your ideas are unrelated to this branch, we should create a new bug for them though - will yo do the honours?

@SirVer: I'd like to hear you opinion on

https://code.launchpad.net/~widelands-dev/widelands/critter_editor_categories/+merge/312967/comments/814078

[toptopple (7010622-q-deactivatedaccount)]

>@toptopple: Your ideas are unrelated to this branch ..

Not quite! If you consent to withdraw the new text feature from the Animals menu, I could drop the "Needs Fixing" evaluation. Certainly something has to be done with the "Duck" page, which is new and whose appearance seems undesirable (because of oversized redundant text).

[kaputtnik (franku)]

> 1. "Click to select an item." is redundant, everyone using this tool can be expected to guess this.

While i agree here, those string changes have to be in another branch.

To this one: Is it possible to have images aligned at the bottom of each row? Currently they are aligned at the top. This most confusing in the plants tab for the last cactus. But i think for trees it would also be good to align them on the bottom (if possible).

[SirVer (sirver)]

> The reordering was done to make the UI more consistent, e.g. that we always have arable terrains first, or that immovables look clean and not all over the place.
>The different terrain window sizes were probably done on purpose as well to group the same types of terrain as much as possible - I coded this a few months ago, so I don't remember 100% right now.

That seems sensible to me. I just dislike that the windows now change size when switching tabs - I wondered if changing the number of columns vs rows would be an easy fix - but if this change did not happen in this branch, it does not block this review.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

HTTP Error 500: Internal Server Error

[kaputtnik (franku)]

> The different terrain window sizes were probably done on purpose as well to group the same types of > terrain as much as possible - I coded this a few months ago, so I don't remember 100% right now.

I guess one could not be sure that this ordering assumption is ever valid. E.g. when one arable terrain is added, the order of "arable terrains first" may result in an ugly ordering, or switching window sizes is much bad. So for the terrains menu it would maybe better to have equal values for 'items_per_row' for each tab (summer, wasteland, ...). For the immovables and critters i think the ordering is ok.

> I haven't looked at how the order of Editor elements might affect savegames - we should saveload a > map and check if it still looks the same just to be sure.

Loaded old maps and saveload a map with this branch, they still look the same.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1780. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/185123561.
Appveyor build 1618. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_critter_editor_categories-1618.

[GunChleoc (gunchleoc)]

Thanks for testing! I will see about making the terrain menus the same width when I get home.

@topopple: while the explanation is looking awkward with the duck now, it is old code in a superclass for the terrain, immovables and animals tools. Implementing a ? button will mean quite a bit of new code, so I really don't want to do that in this branch - it will make this diff even bigger. So, time for a new bug ;)

[toptopple (7010622-q-deactivatedaccount)]

@GunChleoc: while the code may be old, it is fact that in latest version (8236) the disturbing text does not show in the Animals menu, so we must assume this branch is responsible for its appearance. Can you agree with that? I have seen the text goes away when any item is selected, but I still hold it is preferable to deactivate the text in Animals until a better solution for this aid is found.

[GunChleoc (gunchleoc)]

@toptopple: As I said, the code is in a superclass. Deactivating it for the animals only is more complicated than implementing the ? button, and would lead to really bad code that we would need to remember to rip out again later.

I really am in favour of implementing your suggestion, just not in this branch - If I do this now, I will have to wait for another code review before we can get this in at all.

[GunChleoc (gunchleoc)]

Terrain menus now have a uniform width of 6.

Now that I could look at it again, I know why I gave them different width: The second row was all mountains for all tabs. This is now no longer true. Somebody please give it a spin to make sure that this change is indeed better.

[kaputtnik (franku)]

Having the same width of all terrain related tabs is better than switching the window size :-)

The width of 6 is not like before, so a bit uncommon, but no showstopper.

For my other question i will create another Bug report then, so this can go in.

> Is it possible to have images aligned at the bottom of each row?
> Currently they are aligned at the top. This most confusing in the
> plants tab for the last cactus. But i think for trees it would
> also be good to align them on the bottom (if possible).

[GunChleoc (gunchleoc)]

Thanks!

@bunnybot merge

=== renamed file 'data/images/wui/editor/fsel_editor_place_bob.png' => 'data/images/wui/editor/fsel_editor_place_critter.png'
=== added file 'data/images/wui/window_background_dark.png'
Binary files data/images/wui/window_background_dark.png	1970-01-01 00:00:00 +0000 and data/images/wui/window_background_dark.png	2017-01-17 08:56:03 +0000 differ
=== renamed file 'data/world/critters/badger/badger_idle_00.png' => 'data/world/critters/badger/idle_00.png'
=== renamed file 'data/world/critters/badger/badger_idle_01.png' => 'data/world/critters/badger/idle_01.png'
=== renamed file 'data/world/critters/badger/badger_idle_02.png' => 'data/world/critters/badger/idle_02.png'
=== renamed file 'data/world/critters/badger/badger_idle_03.png' => 'data/world/critters/badger/idle_03.png'
=== renamed file 'data/world/critters/badger/badger_idle_04.png' => 'data/world/critters/badger/idle_04.png'
=== renamed file 'data/world/critters/badger/badger_idle_05.png' => 'data/world/critters/badger/idle_05.png'
=== renamed file 'data/world/critters/badger/badger_idle_06.png' => 'data/world/critters/badger/idle_06.png'
=== modified file 'data/world/critters/badger/init.lua'
--- data/world/critters/badger/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/badger/init.lua	2017-01-17 08:56:03 +0000
@@ -2,16 +2,17 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "badger_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       hotspot = { 9, 12 },
       fps = 20,
    },
 }
-add_walking_animations(animations, dirname, "badger_walk", {13, 15}, 20)
+add_walking_animations(animations, dirname, "walk", {13, 15}, 20)
 
 world:new_critter_type{
    name = "badger",
    descname = _ "Badger",
+   editor_category = "critters_carnivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/badger/badger_walk_e_00.png' => 'data/world/critters/badger/walk_e_00.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_01.png' => 'data/world/critters/badger/walk_e_01.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_02.png' => 'data/world/critters/badger/walk_e_02.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_03.png' => 'data/world/critters/badger/walk_e_03.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_04.png' => 'data/world/critters/badger/walk_e_04.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_05.png' => 'data/world/critters/badger/walk_e_05.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_06.png' => 'data/world/critters/badger/walk_e_06.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_07.png' => 'data/world/critters/badger/walk_e_07.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_08.png' => 'data/world/critters/badger/walk_e_08.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_09.png' => 'data/world/critters/badger/walk_e_09.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_10.png' => 'data/world/critters/badger/walk_e_10.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_11.png' => 'data/world/critters/badger/walk_e_11.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_12.png' => 'data/world/critters/badger/walk_e_12.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_13.png' => 'data/world/critters/badger/walk_e_13.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_14.png' => 'data/world/critters/badger/walk_e_14.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_15.png' => 'data/world/critters/badger/walk_e_15.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_16.png' => 'data/world/critters/badger/walk_e_16.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_17.png' => 'data/world/critters/badger/walk_e_17.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_18.png' => 'data/world/critters/badger/walk_e_18.png'
=== renamed file 'data/world/critters/badger/badger_walk_e_19.png' => 'data/world/critters/badger/walk_e_19.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_00.png' => 'data/world/critters/badger/walk_ne_00.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_01.png' => 'data/world/critters/badger/walk_ne_01.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_02.png' => 'data/world/critters/badger/walk_ne_02.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_03.png' => 'data/world/critters/badger/walk_ne_03.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_04.png' => 'data/world/critters/badger/walk_ne_04.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_05.png' => 'data/world/critters/badger/walk_ne_05.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_06.png' => 'data/world/critters/badger/walk_ne_06.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_07.png' => 'data/world/critters/badger/walk_ne_07.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_08.png' => 'data/world/critters/badger/walk_ne_08.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_09.png' => 'data/world/critters/badger/walk_ne_09.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_10.png' => 'data/world/critters/badger/walk_ne_10.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_11.png' => 'data/world/critters/badger/walk_ne_11.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_12.png' => 'data/world/critters/badger/walk_ne_12.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_13.png' => 'data/world/critters/badger/walk_ne_13.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_14.png' => 'data/world/critters/badger/walk_ne_14.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_15.png' => 'data/world/critters/badger/walk_ne_15.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_16.png' => 'data/world/critters/badger/walk_ne_16.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_17.png' => 'data/world/critters/badger/walk_ne_17.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_18.png' => 'data/world/critters/badger/walk_ne_18.png'
=== renamed file 'data/world/critters/badger/badger_walk_ne_19.png' => 'data/world/critters/badger/walk_ne_19.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_00.png' => 'data/world/critters/badger/walk_nw_00.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_01.png' => 'data/world/critters/badger/walk_nw_01.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_02.png' => 'data/world/critters/badger/walk_nw_02.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_03.png' => 'data/world/critters/badger/walk_nw_03.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_04.png' => 'data/world/critters/badger/walk_nw_04.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_05.png' => 'data/world/critters/badger/walk_nw_05.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_06.png' => 'data/world/critters/badger/walk_nw_06.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_07.png' => 'data/world/critters/badger/walk_nw_07.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_08.png' => 'data/world/critters/badger/walk_nw_08.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_09.png' => 'data/world/critters/badger/walk_nw_09.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_10.png' => 'data/world/critters/badger/walk_nw_10.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_11.png' => 'data/world/critters/badger/walk_nw_11.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_12.png' => 'data/world/critters/badger/walk_nw_12.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_13.png' => 'data/world/critters/badger/walk_nw_13.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_14.png' => 'data/world/critters/badger/walk_nw_14.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_15.png' => 'data/world/critters/badger/walk_nw_15.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_16.png' => 'data/world/critters/badger/walk_nw_16.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_17.png' => 'data/world/critters/badger/walk_nw_17.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_18.png' => 'data/world/critters/badger/walk_nw_18.png'
=== renamed file 'data/world/critters/badger/badger_walk_nw_19.png' => 'data/world/critters/badger/walk_nw_19.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_00.png' => 'data/world/critters/badger/walk_se_00.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_01.png' => 'data/world/critters/badger/walk_se_01.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_02.png' => 'data/world/critters/badger/walk_se_02.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_03.png' => 'data/world/critters/badger/walk_se_03.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_04.png' => 'data/world/critters/badger/walk_se_04.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_05.png' => 'data/world/critters/badger/walk_se_05.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_06.png' => 'data/world/critters/badger/walk_se_06.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_07.png' => 'data/world/critters/badger/walk_se_07.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_08.png' => 'data/world/critters/badger/walk_se_08.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_09.png' => 'data/world/critters/badger/walk_se_09.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_10.png' => 'data/world/critters/badger/walk_se_10.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_11.png' => 'data/world/critters/badger/walk_se_11.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_12.png' => 'data/world/critters/badger/walk_se_12.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_13.png' => 'data/world/critters/badger/walk_se_13.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_14.png' => 'data/world/critters/badger/walk_se_14.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_15.png' => 'data/world/critters/badger/walk_se_15.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_16.png' => 'data/world/critters/badger/walk_se_16.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_17.png' => 'data/world/critters/badger/walk_se_17.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_18.png' => 'data/world/critters/badger/walk_se_18.png'
=== renamed file 'data/world/critters/badger/badger_walk_se_19.png' => 'data/world/critters/badger/walk_se_19.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_00.png' => 'data/world/critters/badger/walk_sw_00.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_01.png' => 'data/world/critters/badger/walk_sw_01.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_02.png' => 'data/world/critters/badger/walk_sw_02.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_03.png' => 'data/world/critters/badger/walk_sw_03.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_04.png' => 'data/world/critters/badger/walk_sw_04.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_05.png' => 'data/world/critters/badger/walk_sw_05.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_06.png' => 'data/world/critters/badger/walk_sw_06.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_07.png' => 'data/world/critters/badger/walk_sw_07.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_08.png' => 'data/world/critters/badger/walk_sw_08.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_09.png' => 'data/world/critters/badger/walk_sw_09.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_10.png' => 'data/world/critters/badger/walk_sw_10.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_11.png' => 'data/world/critters/badger/walk_sw_11.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_12.png' => 'data/world/critters/badger/walk_sw_12.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_13.png' => 'data/world/critters/badger/walk_sw_13.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_14.png' => 'data/world/critters/badger/walk_sw_14.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_15.png' => 'data/world/critters/badger/walk_sw_15.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_16.png' => 'data/world/critters/badger/walk_sw_16.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_17.png' => 'data/world/critters/badger/walk_sw_17.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_18.png' => 'data/world/critters/badger/walk_sw_18.png'
=== renamed file 'data/world/critters/badger/badger_walk_sw_19.png' => 'data/world/critters/badger/walk_sw_19.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_00.png' => 'data/world/critters/badger/walk_w_00.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_01.png' => 'data/world/critters/badger/walk_w_01.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_02.png' => 'data/world/critters/badger/walk_w_02.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_03.png' => 'data/world/critters/badger/walk_w_03.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_04.png' => 'data/world/critters/badger/walk_w_04.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_05.png' => 'data/world/critters/badger/walk_w_05.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_06.png' => 'data/world/critters/badger/walk_w_06.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_07.png' => 'data/world/critters/badger/walk_w_07.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_08.png' => 'data/world/critters/badger/walk_w_08.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_09.png' => 'data/world/critters/badger/walk_w_09.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_10.png' => 'data/world/critters/badger/walk_w_10.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_11.png' => 'data/world/critters/badger/walk_w_11.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_12.png' => 'data/world/critters/badger/walk_w_12.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_13.png' => 'data/world/critters/badger/walk_w_13.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_14.png' => 'data/world/critters/badger/walk_w_14.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_15.png' => 'data/world/critters/badger/walk_w_15.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_16.png' => 'data/world/critters/badger/walk_w_16.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_17.png' => 'data/world/critters/badger/walk_w_17.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_18.png' => 'data/world/critters/badger/walk_w_18.png'
=== renamed file 'data/world/critters/badger/badger_walk_w_19.png' => 'data/world/critters/badger/walk_w_19.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_00.png' => 'data/world/critters/brownbear/idle_00.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_01.png' => 'data/world/critters/brownbear/idle_01.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_02.png' => 'data/world/critters/brownbear/idle_02.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_03.png' => 'data/world/critters/brownbear/idle_03.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_04.png' => 'data/world/critters/brownbear/idle_04.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_05.png' => 'data/world/critters/brownbear/idle_05.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_06.png' => 'data/world/critters/brownbear/idle_06.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_07.png' => 'data/world/critters/brownbear/idle_07.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_08.png' => 'data/world/critters/brownbear/idle_08.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_09.png' => 'data/world/critters/brownbear/idle_09.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_10.png' => 'data/world/critters/brownbear/idle_10.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_11.png' => 'data/world/critters/brownbear/idle_11.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_12.png' => 'data/world/critters/brownbear/idle_12.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_13.png' => 'data/world/critters/brownbear/idle_13.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_14.png' => 'data/world/critters/brownbear/idle_14.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_15.png' => 'data/world/critters/brownbear/idle_15.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_16.png' => 'data/world/critters/brownbear/idle_16.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_17.png' => 'data/world/critters/brownbear/idle_17.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_18.png' => 'data/world/critters/brownbear/idle_18.png'
=== renamed file 'data/world/critters/brownbear/brownbear_idle_19.png' => 'data/world/critters/brownbear/idle_19.png'
=== modified file 'data/world/critters/brownbear/init.lua'
--- data/world/critters/brownbear/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/brownbear/init.lua	2017-01-17 08:56:03 +0000
@@ -2,16 +2,17 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "brownbear_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       hotspot = {21, 16},
       fps = 20
    },
 }
-add_walking_animations(animations, dirname, "brownbear_walk", {24, 24}, 4)
+add_walking_animations(animations, dirname, "walk", {24, 24}, 4)
 
 world:new_critter_type{
    name = "brownbear",
    descname = _ "Brown bear",
+   editor_category = "critters_carnivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_00.png' => 'data/world/critters/brownbear/walk_e_00.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_01.png' => 'data/world/critters/brownbear/walk_e_01.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_02.png' => 'data/world/critters/brownbear/walk_e_02.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_03.png' => 'data/world/critters/brownbear/walk_e_03.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_04.png' => 'data/world/critters/brownbear/walk_e_04.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_05.png' => 'data/world/critters/brownbear/walk_e_05.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_06.png' => 'data/world/critters/brownbear/walk_e_06.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_07.png' => 'data/world/critters/brownbear/walk_e_07.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_08.png' => 'data/world/critters/brownbear/walk_e_08.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_09.png' => 'data/world/critters/brownbear/walk_e_09.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_10.png' => 'data/world/critters/brownbear/walk_e_10.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_11.png' => 'data/world/critters/brownbear/walk_e_11.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_12.png' => 'data/world/critters/brownbear/walk_e_12.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_13.png' => 'data/world/critters/brownbear/walk_e_13.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_14.png' => 'data/world/critters/brownbear/walk_e_14.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_15.png' => 'data/world/critters/brownbear/walk_e_15.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_16.png' => 'data/world/critters/brownbear/walk_e_16.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_17.png' => 'data/world/critters/brownbear/walk_e_17.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_18.png' => 'data/world/critters/brownbear/walk_e_18.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_e_19.png' => 'data/world/critters/brownbear/walk_e_19.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_00.png' => 'data/world/critters/brownbear/walk_ne_00.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_01.png' => 'data/world/critters/brownbear/walk_ne_01.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_02.png' => 'data/world/critters/brownbear/walk_ne_02.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_03.png' => 'data/world/critters/brownbear/walk_ne_03.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_04.png' => 'data/world/critters/brownbear/walk_ne_04.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_05.png' => 'data/world/critters/brownbear/walk_ne_05.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_06.png' => 'data/world/critters/brownbear/walk_ne_06.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_07.png' => 'data/world/critters/brownbear/walk_ne_07.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_08.png' => 'data/world/critters/brownbear/walk_ne_08.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_09.png' => 'data/world/critters/brownbear/walk_ne_09.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_10.png' => 'data/world/critters/brownbear/walk_ne_10.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_11.png' => 'data/world/critters/brownbear/walk_ne_11.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_12.png' => 'data/world/critters/brownbear/walk_ne_12.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_13.png' => 'data/world/critters/brownbear/walk_ne_13.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_14.png' => 'data/world/critters/brownbear/walk_ne_14.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_15.png' => 'data/world/critters/brownbear/walk_ne_15.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_16.png' => 'data/world/critters/brownbear/walk_ne_16.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_17.png' => 'data/world/critters/brownbear/walk_ne_17.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_18.png' => 'data/world/critters/brownbear/walk_ne_18.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_ne_19.png' => 'data/world/critters/brownbear/walk_ne_19.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_00.png' => 'data/world/critters/brownbear/walk_nw_00.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_01.png' => 'data/world/critters/brownbear/walk_nw_01.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_02.png' => 'data/world/critters/brownbear/walk_nw_02.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_03.png' => 'data/world/critters/brownbear/walk_nw_03.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_04.png' => 'data/world/critters/brownbear/walk_nw_04.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_05.png' => 'data/world/critters/brownbear/walk_nw_05.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_06.png' => 'data/world/critters/brownbear/walk_nw_06.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_07.png' => 'data/world/critters/brownbear/walk_nw_07.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_08.png' => 'data/world/critters/brownbear/walk_nw_08.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_09.png' => 'data/world/critters/brownbear/walk_nw_09.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_10.png' => 'data/world/critters/brownbear/walk_nw_10.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_11.png' => 'data/world/critters/brownbear/walk_nw_11.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_12.png' => 'data/world/critters/brownbear/walk_nw_12.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_13.png' => 'data/world/critters/brownbear/walk_nw_13.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_14.png' => 'data/world/critters/brownbear/walk_nw_14.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_15.png' => 'data/world/critters/brownbear/walk_nw_15.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_16.png' => 'data/world/critters/brownbear/walk_nw_16.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_17.png' => 'data/world/critters/brownbear/walk_nw_17.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_18.png' => 'data/world/critters/brownbear/walk_nw_18.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_nw_19.png' => 'data/world/critters/brownbear/walk_nw_19.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_00.png' => 'data/world/critters/brownbear/walk_se_00.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_01.png' => 'data/world/critters/brownbear/walk_se_01.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_02.png' => 'data/world/critters/brownbear/walk_se_02.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_03.png' => 'data/world/critters/brownbear/walk_se_03.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_04.png' => 'data/world/critters/brownbear/walk_se_04.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_05.png' => 'data/world/critters/brownbear/walk_se_05.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_06.png' => 'data/world/critters/brownbear/walk_se_06.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_07.png' => 'data/world/critters/brownbear/walk_se_07.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_08.png' => 'data/world/critters/brownbear/walk_se_08.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_09.png' => 'data/world/critters/brownbear/walk_se_09.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_10.png' => 'data/world/critters/brownbear/walk_se_10.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_11.png' => 'data/world/critters/brownbear/walk_se_11.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_12.png' => 'data/world/critters/brownbear/walk_se_12.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_13.png' => 'data/world/critters/brownbear/walk_se_13.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_14.png' => 'data/world/critters/brownbear/walk_se_14.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_15.png' => 'data/world/critters/brownbear/walk_se_15.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_16.png' => 'data/world/critters/brownbear/walk_se_16.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_17.png' => 'data/world/critters/brownbear/walk_se_17.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_18.png' => 'data/world/critters/brownbear/walk_se_18.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_se_19.png' => 'data/world/critters/brownbear/walk_se_19.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_00.png' => 'data/world/critters/brownbear/walk_sw_00.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_01.png' => 'data/world/critters/brownbear/walk_sw_01.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_02.png' => 'data/world/critters/brownbear/walk_sw_02.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_03.png' => 'data/world/critters/brownbear/walk_sw_03.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_04.png' => 'data/world/critters/brownbear/walk_sw_04.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_05.png' => 'data/world/critters/brownbear/walk_sw_05.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_06.png' => 'data/world/critters/brownbear/walk_sw_06.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_07.png' => 'data/world/critters/brownbear/walk_sw_07.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_08.png' => 'data/world/critters/brownbear/walk_sw_08.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_09.png' => 'data/world/critters/brownbear/walk_sw_09.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_10.png' => 'data/world/critters/brownbear/walk_sw_10.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_11.png' => 'data/world/critters/brownbear/walk_sw_11.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_12.png' => 'data/world/critters/brownbear/walk_sw_12.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_13.png' => 'data/world/critters/brownbear/walk_sw_13.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_14.png' => 'data/world/critters/brownbear/walk_sw_14.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_15.png' => 'data/world/critters/brownbear/walk_sw_15.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_16.png' => 'data/world/critters/brownbear/walk_sw_16.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_17.png' => 'data/world/critters/brownbear/walk_sw_17.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_18.png' => 'data/world/critters/brownbear/walk_sw_18.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_sw_19.png' => 'data/world/critters/brownbear/walk_sw_19.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_00.png' => 'data/world/critters/brownbear/walk_w_00.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_01.png' => 'data/world/critters/brownbear/walk_w_01.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_02.png' => 'data/world/critters/brownbear/walk_w_02.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_03.png' => 'data/world/critters/brownbear/walk_w_03.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_04.png' => 'data/world/critters/brownbear/walk_w_04.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_05.png' => 'data/world/critters/brownbear/walk_w_05.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_06.png' => 'data/world/critters/brownbear/walk_w_06.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_07.png' => 'data/world/critters/brownbear/walk_w_07.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_08.png' => 'data/world/critters/brownbear/walk_w_08.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_09.png' => 'data/world/critters/brownbear/walk_w_09.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_10.png' => 'data/world/critters/brownbear/walk_w_10.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_11.png' => 'data/world/critters/brownbear/walk_w_11.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_12.png' => 'data/world/critters/brownbear/walk_w_12.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_13.png' => 'data/world/critters/brownbear/walk_w_13.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_14.png' => 'data/world/critters/brownbear/walk_w_14.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_15.png' => 'data/world/critters/brownbear/walk_w_15.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_16.png' => 'data/world/critters/brownbear/walk_w_16.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_17.png' => 'data/world/critters/brownbear/walk_w_17.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_18.png' => 'data/world/critters/brownbear/walk_w_18.png'
=== renamed file 'data/world/critters/brownbear/brownbear_walk_w_19.png' => 'data/world/critters/brownbear/walk_w_19.png'
=== renamed file 'data/world/critters/bunny/bunny_idle.png' => 'data/world/critters/bunny/idle.png'
=== modified file 'data/world/critters/bunny/init.lua'
--- data/world/critters/bunny/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/bunny/init.lua	2017-01-17 08:56:03 +0000
@@ -2,15 +2,16 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "bunny_idle.png"),
+      pictures = path.list_files(dirname .. "idle.png"),
       hotspot = { 4, 9 },
    },
 }
-add_walking_animations(animations, dirname, "bunny_walk", {5, 9}, 4)
+add_walking_animations(animations, dirname, "walk", {5, 9}, 4)
 
 world:new_critter_type{
    name = "bunny",
    descname = _ "Bunny",
+   editor_category = "critters_herbivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/bunny/bunny_walk_e_00.png' => 'data/world/critters/bunny/walk_e_00.png'
=== renamed file 'data/world/critters/bunny/bunny_walk_e_01.png' => 'data/world/critters/bunny/walk_e_01.png'
=== renamed file 'data/world/critters/bunny/bunny_walk_ne_00.png' => 'data/world/critters/bunny/walk_ne_00.png'
=== renamed file 'data/world/critters/bunny/bunny_walk_ne_01.png' => 'data/world/critters/bunny/walk_ne_01.png'
=== renamed file 'data/world/critters/bunny/bunny_walk_nw_00.png' => 'data/world/critters/bunny/walk_nw_00.png'
=== renamed file 'data/world/critters/bunny/bunny_walk_nw_01.png' => 'data/world/critters/bunny/walk_nw_01.png'
=== renamed file 'data/world/critters/bunny/bunny_walk_se_00.png' => 'data/world/critters/bunny/walk_se_00.png'
=== renamed file 'data/world/critters/bunny/bunny_walk_se_01.png' => 'data/world/critters/bunny/walk_se_01.png'
=== renamed file 'data/world/critters/bunny/bunny_walk_sw_00.png' => 'data/world/critters/bunny/walk_sw_00.png'
=== renamed file 'data/world/critters/bunny/bunny_walk_sw_01.png' => 'data/world/critters/bunny/walk_sw_01.png'
=== renamed file 'data/world/critters/bunny/bunny_walk_w_00.png' => 'data/world/critters/bunny/walk_w_00.png'
=== renamed file 'data/world/critters/bunny/bunny_walk_w_01.png' => 'data/world/critters/bunny/walk_w_01.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_00.png' => 'data/world/critters/chamois/idle_00.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_01.png' => 'data/world/critters/chamois/idle_01.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_02.png' => 'data/world/critters/chamois/idle_02.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_03.png' => 'data/world/critters/chamois/idle_03.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_04.png' => 'data/world/critters/chamois/idle_04.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_05.png' => 'data/world/critters/chamois/idle_05.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_06.png' => 'data/world/critters/chamois/idle_06.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_07.png' => 'data/world/critters/chamois/idle_07.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_08.png' => 'data/world/critters/chamois/idle_08.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_09.png' => 'data/world/critters/chamois/idle_09.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_10.png' => 'data/world/critters/chamois/idle_10.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_11.png' => 'data/world/critters/chamois/idle_11.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_12.png' => 'data/world/critters/chamois/idle_12.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_13.png' => 'data/world/critters/chamois/idle_13.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_14.png' => 'data/world/critters/chamois/idle_14.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_15.png' => 'data/world/critters/chamois/idle_15.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_16.png' => 'data/world/critters/chamois/idle_16.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_17.png' => 'data/world/critters/chamois/idle_17.png'
=== renamed file 'data/world/critters/chamois/chamois_idle_18.png' => 'data/world/critters/chamois/idle_18.png'
=== modified file 'data/world/critters/chamois/init.lua'
--- data/world/critters/chamois/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/chamois/init.lua	2017-01-17 08:56:03 +0000
@@ -2,16 +2,17 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "chamois_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       hotspot = { 11, 13 },
       fps = 20,
    },
 }
-add_walking_animations(animations, dirname, "chamois_walk", {11, 20}, 20)
+add_walking_animations(animations, dirname, "walk", {11, 20}, 20)
 
 world:new_critter_type{
    name = "chamois",
    descname = _ "Chamois",
+   editor_category = "critters_herbivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/chamois/chamois_walk_e_00.png' => 'data/world/critters/chamois/walk_e_00.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_01.png' => 'data/world/critters/chamois/walk_e_01.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_02.png' => 'data/world/critters/chamois/walk_e_02.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_03.png' => 'data/world/critters/chamois/walk_e_03.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_04.png' => 'data/world/critters/chamois/walk_e_04.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_05.png' => 'data/world/critters/chamois/walk_e_05.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_06.png' => 'data/world/critters/chamois/walk_e_06.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_07.png' => 'data/world/critters/chamois/walk_e_07.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_08.png' => 'data/world/critters/chamois/walk_e_08.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_09.png' => 'data/world/critters/chamois/walk_e_09.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_10.png' => 'data/world/critters/chamois/walk_e_10.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_11.png' => 'data/world/critters/chamois/walk_e_11.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_12.png' => 'data/world/critters/chamois/walk_e_12.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_13.png' => 'data/world/critters/chamois/walk_e_13.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_14.png' => 'data/world/critters/chamois/walk_e_14.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_15.png' => 'data/world/critters/chamois/walk_e_15.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_16.png' => 'data/world/critters/chamois/walk_e_16.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_17.png' => 'data/world/critters/chamois/walk_e_17.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_18.png' => 'data/world/critters/chamois/walk_e_18.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_e_19.png' => 'data/world/critters/chamois/walk_e_19.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_00.png' => 'data/world/critters/chamois/walk_ne_00.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_01.png' => 'data/world/critters/chamois/walk_ne_01.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_02.png' => 'data/world/critters/chamois/walk_ne_02.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_03.png' => 'data/world/critters/chamois/walk_ne_03.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_04.png' => 'data/world/critters/chamois/walk_ne_04.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_05.png' => 'data/world/critters/chamois/walk_ne_05.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_06.png' => 'data/world/critters/chamois/walk_ne_06.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_07.png' => 'data/world/critters/chamois/walk_ne_07.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_08.png' => 'data/world/critters/chamois/walk_ne_08.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_09.png' => 'data/world/critters/chamois/walk_ne_09.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_10.png' => 'data/world/critters/chamois/walk_ne_10.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_11.png' => 'data/world/critters/chamois/walk_ne_11.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_12.png' => 'data/world/critters/chamois/walk_ne_12.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_13.png' => 'data/world/critters/chamois/walk_ne_13.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_14.png' => 'data/world/critters/chamois/walk_ne_14.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_15.png' => 'data/world/critters/chamois/walk_ne_15.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_16.png' => 'data/world/critters/chamois/walk_ne_16.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_17.png' => 'data/world/critters/chamois/walk_ne_17.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_18.png' => 'data/world/critters/chamois/walk_ne_18.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_ne_19.png' => 'data/world/critters/chamois/walk_ne_19.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_00.png' => 'data/world/critters/chamois/walk_nw_00.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_01.png' => 'data/world/critters/chamois/walk_nw_01.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_02.png' => 'data/world/critters/chamois/walk_nw_02.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_03.png' => 'data/world/critters/chamois/walk_nw_03.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_04.png' => 'data/world/critters/chamois/walk_nw_04.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_05.png' => 'data/world/critters/chamois/walk_nw_05.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_06.png' => 'data/world/critters/chamois/walk_nw_06.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_07.png' => 'data/world/critters/chamois/walk_nw_07.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_08.png' => 'data/world/critters/chamois/walk_nw_08.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_09.png' => 'data/world/critters/chamois/walk_nw_09.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_10.png' => 'data/world/critters/chamois/walk_nw_10.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_11.png' => 'data/world/critters/chamois/walk_nw_11.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_12.png' => 'data/world/critters/chamois/walk_nw_12.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_13.png' => 'data/world/critters/chamois/walk_nw_13.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_14.png' => 'data/world/critters/chamois/walk_nw_14.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_15.png' => 'data/world/critters/chamois/walk_nw_15.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_16.png' => 'data/world/critters/chamois/walk_nw_16.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_17.png' => 'data/world/critters/chamois/walk_nw_17.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_18.png' => 'data/world/critters/chamois/walk_nw_18.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_nw_19.png' => 'data/world/critters/chamois/walk_nw_19.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_00.png' => 'data/world/critters/chamois/walk_se_00.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_01.png' => 'data/world/critters/chamois/walk_se_01.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_02.png' => 'data/world/critters/chamois/walk_se_02.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_03.png' => 'data/world/critters/chamois/walk_se_03.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_04.png' => 'data/world/critters/chamois/walk_se_04.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_05.png' => 'data/world/critters/chamois/walk_se_05.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_06.png' => 'data/world/critters/chamois/walk_se_06.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_07.png' => 'data/world/critters/chamois/walk_se_07.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_08.png' => 'data/world/critters/chamois/walk_se_08.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_09.png' => 'data/world/critters/chamois/walk_se_09.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_10.png' => 'data/world/critters/chamois/walk_se_10.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_11.png' => 'data/world/critters/chamois/walk_se_11.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_12.png' => 'data/world/critters/chamois/walk_se_12.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_13.png' => 'data/world/critters/chamois/walk_se_13.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_14.png' => 'data/world/critters/chamois/walk_se_14.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_15.png' => 'data/world/critters/chamois/walk_se_15.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_16.png' => 'data/world/critters/chamois/walk_se_16.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_17.png' => 'data/world/critters/chamois/walk_se_17.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_18.png' => 'data/world/critters/chamois/walk_se_18.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_se_19.png' => 'data/world/critters/chamois/walk_se_19.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_00.png' => 'data/world/critters/chamois/walk_sw_00.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_01.png' => 'data/world/critters/chamois/walk_sw_01.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_02.png' => 'data/world/critters/chamois/walk_sw_02.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_03.png' => 'data/world/critters/chamois/walk_sw_03.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_04.png' => 'data/world/critters/chamois/walk_sw_04.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_05.png' => 'data/world/critters/chamois/walk_sw_05.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_06.png' => 'data/world/critters/chamois/walk_sw_06.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_07.png' => 'data/world/critters/chamois/walk_sw_07.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_08.png' => 'data/world/critters/chamois/walk_sw_08.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_09.png' => 'data/world/critters/chamois/walk_sw_09.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_10.png' => 'data/world/critters/chamois/walk_sw_10.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_11.png' => 'data/world/critters/chamois/walk_sw_11.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_12.png' => 'data/world/critters/chamois/walk_sw_12.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_13.png' => 'data/world/critters/chamois/walk_sw_13.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_14.png' => 'data/world/critters/chamois/walk_sw_14.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_15.png' => 'data/world/critters/chamois/walk_sw_15.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_16.png' => 'data/world/critters/chamois/walk_sw_16.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_17.png' => 'data/world/critters/chamois/walk_sw_17.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_18.png' => 'data/world/critters/chamois/walk_sw_18.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_sw_19.png' => 'data/world/critters/chamois/walk_sw_19.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_00.png' => 'data/world/critters/chamois/walk_w_00.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_01.png' => 'data/world/critters/chamois/walk_w_01.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_02.png' => 'data/world/critters/chamois/walk_w_02.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_03.png' => 'data/world/critters/chamois/walk_w_03.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_04.png' => 'data/world/critters/chamois/walk_w_04.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_05.png' => 'data/world/critters/chamois/walk_w_05.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_06.png' => 'data/world/critters/chamois/walk_w_06.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_07.png' => 'data/world/critters/chamois/walk_w_07.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_08.png' => 'data/world/critters/chamois/walk_w_08.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_09.png' => 'data/world/critters/chamois/walk_w_09.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_10.png' => 'data/world/critters/chamois/walk_w_10.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_11.png' => 'data/world/critters/chamois/walk_w_11.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_12.png' => 'data/world/critters/chamois/walk_w_12.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_13.png' => 'data/world/critters/chamois/walk_w_13.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_14.png' => 'data/world/critters/chamois/walk_w_14.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_15.png' => 'data/world/critters/chamois/walk_w_15.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_16.png' => 'data/world/critters/chamois/walk_w_16.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_17.png' => 'data/world/critters/chamois/walk_w_17.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_18.png' => 'data/world/critters/chamois/walk_w_18.png'
=== renamed file 'data/world/critters/chamois/chamois_walk_w_19.png' => 'data/world/critters/chamois/walk_w_19.png'
=== renamed file 'data/world/critters/deer/deer_idle_00.png' => 'data/world/critters/deer/idle_00.png'
=== renamed file 'data/world/critters/deer/deer_idle_01.png' => 'data/world/critters/deer/idle_01.png'
=== renamed file 'data/world/critters/deer/deer_idle_02.png' => 'data/world/critters/deer/idle_02.png'
=== renamed file 'data/world/critters/deer/deer_idle_03.png' => 'data/world/critters/deer/idle_03.png'
=== renamed file 'data/world/critters/deer/deer_idle_04.png' => 'data/world/critters/deer/idle_04.png'
=== renamed file 'data/world/critters/deer/deer_idle_05.png' => 'data/world/critters/deer/idle_05.png'
=== renamed file 'data/world/critters/deer/deer_idle_06.png' => 'data/world/critters/deer/idle_06.png'
=== renamed file 'data/world/critters/deer/deer_idle_07.png' => 'data/world/critters/deer/idle_07.png'
=== renamed file 'data/world/critters/deer/deer_idle_08.png' => 'data/world/critters/deer/idle_08.png'
=== renamed file 'data/world/critters/deer/deer_idle_09.png' => 'data/world/critters/deer/idle_09.png'
=== renamed file 'data/world/critters/deer/deer_idle_10.png' => 'data/world/critters/deer/idle_10.png'
=== renamed file 'data/world/critters/deer/deer_idle_11.png' => 'data/world/critters/deer/idle_11.png'
=== renamed file 'data/world/critters/deer/deer_idle_12.png' => 'data/world/critters/deer/idle_12.png'
=== renamed file 'data/world/critters/deer/deer_idle_13.png' => 'data/world/critters/deer/idle_13.png'
=== renamed file 'data/world/critters/deer/deer_idle_14.png' => 'data/world/critters/deer/idle_14.png'
=== renamed file 'data/world/critters/deer/deer_idle_15.png' => 'data/world/critters/deer/idle_15.png'
=== renamed file 'data/world/critters/deer/deer_idle_16.png' => 'data/world/critters/deer/idle_16.png'
=== renamed file 'data/world/critters/deer/deer_idle_17.png' => 'data/world/critters/deer/idle_17.png'
=== renamed file 'data/world/critters/deer/deer_idle_18.png' => 'data/world/critters/deer/idle_18.png'
=== renamed file 'data/world/critters/deer/deer_idle_19.png' => 'data/world/critters/deer/idle_19.png'
=== modified file 'data/world/critters/deer/init.lua'
--- data/world/critters/deer/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/deer/init.lua	2017-01-17 08:56:03 +0000
@@ -2,16 +2,17 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "deer_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       hotspot = { 1, 10 },
       fps = 20,
    },
 }
-add_walking_animations(animations, dirname, "deer_walk", {15, 25}, 20)
+add_walking_animations(animations, dirname, "walk", {15, 25}, 20)
 
 world:new_critter_type{
    name = "deer",
    descname = _ "Deer",
+   editor_category = "critters_herbivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/deer/deer_walk_e_00.png' => 'data/world/critters/deer/walk_e_00.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_01.png' => 'data/world/critters/deer/walk_e_01.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_02.png' => 'data/world/critters/deer/walk_e_02.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_03.png' => 'data/world/critters/deer/walk_e_03.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_04.png' => 'data/world/critters/deer/walk_e_04.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_05.png' => 'data/world/critters/deer/walk_e_05.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_06.png' => 'data/world/critters/deer/walk_e_06.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_07.png' => 'data/world/critters/deer/walk_e_07.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_08.png' => 'data/world/critters/deer/walk_e_08.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_09.png' => 'data/world/critters/deer/walk_e_09.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_10.png' => 'data/world/critters/deer/walk_e_10.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_11.png' => 'data/world/critters/deer/walk_e_11.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_12.png' => 'data/world/critters/deer/walk_e_12.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_13.png' => 'data/world/critters/deer/walk_e_13.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_14.png' => 'data/world/critters/deer/walk_e_14.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_15.png' => 'data/world/critters/deer/walk_e_15.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_16.png' => 'data/world/critters/deer/walk_e_16.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_17.png' => 'data/world/critters/deer/walk_e_17.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_18.png' => 'data/world/critters/deer/walk_e_18.png'
=== renamed file 'data/world/critters/deer/deer_walk_e_19.png' => 'data/world/critters/deer/walk_e_19.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_00.png' => 'data/world/critters/deer/walk_ne_00.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_01.png' => 'data/world/critters/deer/walk_ne_01.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_02.png' => 'data/world/critters/deer/walk_ne_02.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_03.png' => 'data/world/critters/deer/walk_ne_03.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_04.png' => 'data/world/critters/deer/walk_ne_04.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_05.png' => 'data/world/critters/deer/walk_ne_05.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_06.png' => 'data/world/critters/deer/walk_ne_06.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_07.png' => 'data/world/critters/deer/walk_ne_07.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_08.png' => 'data/world/critters/deer/walk_ne_08.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_09.png' => 'data/world/critters/deer/walk_ne_09.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_10.png' => 'data/world/critters/deer/walk_ne_10.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_11.png' => 'data/world/critters/deer/walk_ne_11.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_12.png' => 'data/world/critters/deer/walk_ne_12.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_13.png' => 'data/world/critters/deer/walk_ne_13.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_14.png' => 'data/world/critters/deer/walk_ne_14.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_15.png' => 'data/world/critters/deer/walk_ne_15.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_16.png' => 'data/world/critters/deer/walk_ne_16.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_17.png' => 'data/world/critters/deer/walk_ne_17.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_18.png' => 'data/world/critters/deer/walk_ne_18.png'
=== renamed file 'data/world/critters/deer/deer_walk_ne_19.png' => 'data/world/critters/deer/walk_ne_19.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_00.png' => 'data/world/critters/deer/walk_nw_00.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_01.png' => 'data/world/critters/deer/walk_nw_01.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_02.png' => 'data/world/critters/deer/walk_nw_02.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_03.png' => 'data/world/critters/deer/walk_nw_03.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_04.png' => 'data/world/critters/deer/walk_nw_04.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_05.png' => 'data/world/critters/deer/walk_nw_05.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_06.png' => 'data/world/critters/deer/walk_nw_06.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_07.png' => 'data/world/critters/deer/walk_nw_07.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_08.png' => 'data/world/critters/deer/walk_nw_08.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_09.png' => 'data/world/critters/deer/walk_nw_09.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_10.png' => 'data/world/critters/deer/walk_nw_10.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_11.png' => 'data/world/critters/deer/walk_nw_11.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_12.png' => 'data/world/critters/deer/walk_nw_12.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_13.png' => 'data/world/critters/deer/walk_nw_13.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_14.png' => 'data/world/critters/deer/walk_nw_14.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_15.png' => 'data/world/critters/deer/walk_nw_15.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_16.png' => 'data/world/critters/deer/walk_nw_16.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_17.png' => 'data/world/critters/deer/walk_nw_17.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_18.png' => 'data/world/critters/deer/walk_nw_18.png'
=== renamed file 'data/world/critters/deer/deer_walk_nw_19.png' => 'data/world/critters/deer/walk_nw_19.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_00.png' => 'data/world/critters/deer/walk_se_00.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_01.png' => 'data/world/critters/deer/walk_se_01.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_02.png' => 'data/world/critters/deer/walk_se_02.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_03.png' => 'data/world/critters/deer/walk_se_03.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_04.png' => 'data/world/critters/deer/walk_se_04.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_05.png' => 'data/world/critters/deer/walk_se_05.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_06.png' => 'data/world/critters/deer/walk_se_06.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_07.png' => 'data/world/critters/deer/walk_se_07.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_08.png' => 'data/world/critters/deer/walk_se_08.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_09.png' => 'data/world/critters/deer/walk_se_09.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_10.png' => 'data/world/critters/deer/walk_se_10.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_11.png' => 'data/world/critters/deer/walk_se_11.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_12.png' => 'data/world/critters/deer/walk_se_12.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_13.png' => 'data/world/critters/deer/walk_se_13.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_14.png' => 'data/world/critters/deer/walk_se_14.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_15.png' => 'data/world/critters/deer/walk_se_15.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_16.png' => 'data/world/critters/deer/walk_se_16.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_17.png' => 'data/world/critters/deer/walk_se_17.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_18.png' => 'data/world/critters/deer/walk_se_18.png'
=== renamed file 'data/world/critters/deer/deer_walk_se_19.png' => 'data/world/critters/deer/walk_se_19.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_00.png' => 'data/world/critters/deer/walk_sw_00.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_01.png' => 'data/world/critters/deer/walk_sw_01.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_02.png' => 'data/world/critters/deer/walk_sw_02.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_03.png' => 'data/world/critters/deer/walk_sw_03.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_04.png' => 'data/world/critters/deer/walk_sw_04.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_05.png' => 'data/world/critters/deer/walk_sw_05.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_06.png' => 'data/world/critters/deer/walk_sw_06.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_07.png' => 'data/world/critters/deer/walk_sw_07.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_08.png' => 'data/world/critters/deer/walk_sw_08.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_09.png' => 'data/world/critters/deer/walk_sw_09.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_10.png' => 'data/world/critters/deer/walk_sw_10.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_11.png' => 'data/world/critters/deer/walk_sw_11.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_12.png' => 'data/world/critters/deer/walk_sw_12.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_13.png' => 'data/world/critters/deer/walk_sw_13.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_14.png' => 'data/world/critters/deer/walk_sw_14.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_15.png' => 'data/world/critters/deer/walk_sw_15.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_16.png' => 'data/world/critters/deer/walk_sw_16.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_17.png' => 'data/world/critters/deer/walk_sw_17.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_18.png' => 'data/world/critters/deer/walk_sw_18.png'
=== renamed file 'data/world/critters/deer/deer_walk_sw_19.png' => 'data/world/critters/deer/walk_sw_19.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_00.png' => 'data/world/critters/deer/walk_w_00.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_01.png' => 'data/world/critters/deer/walk_w_01.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_02.png' => 'data/world/critters/deer/walk_w_02.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_03.png' => 'data/world/critters/deer/walk_w_03.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_04.png' => 'data/world/critters/deer/walk_w_04.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_05.png' => 'data/world/critters/deer/walk_w_05.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_06.png' => 'data/world/critters/deer/walk_w_06.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_07.png' => 'data/world/critters/deer/walk_w_07.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_08.png' => 'data/world/critters/deer/walk_w_08.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_09.png' => 'data/world/critters/deer/walk_w_09.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_10.png' => 'data/world/critters/deer/walk_w_10.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_11.png' => 'data/world/critters/deer/walk_w_11.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_12.png' => 'data/world/critters/deer/walk_w_12.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_13.png' => 'data/world/critters/deer/walk_w_13.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_14.png' => 'data/world/critters/deer/walk_w_14.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_15.png' => 'data/world/critters/deer/walk_w_15.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_16.png' => 'data/world/critters/deer/walk_w_16.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_17.png' => 'data/world/critters/deer/walk_w_17.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_18.png' => 'data/world/critters/deer/walk_w_18.png'
=== renamed file 'data/world/critters/deer/deer_walk_w_19.png' => 'data/world/critters/deer/walk_w_19.png'
=== renamed file 'data/world/critters/duck/duck_00.png' => 'data/world/critters/duck/idle_00.png'
=== renamed file 'data/world/critters/duck/duck_01.png' => 'data/world/critters/duck/idle_01.png'
=== renamed file 'data/world/critters/duck/duck_02.png' => 'data/world/critters/duck/idle_02.png'
=== renamed file 'data/world/critters/duck/duck_03.png' => 'data/world/critters/duck/idle_03.png'
=== renamed file 'data/world/critters/duck/duck_04.png' => 'data/world/critters/duck/idle_04.png'
=== renamed file 'data/world/critters/duck/duck_05.png' => 'data/world/critters/duck/idle_05.png'
=== renamed file 'data/world/critters/duck/duck_06.png' => 'data/world/critters/duck/idle_06.png'
=== renamed file 'data/world/critters/duck/duck_07.png' => 'data/world/critters/duck/idle_07.png'
=== modified file 'data/world/critters/duck/init.lua'
--- data/world/critters/duck/init.lua	2016-01-28 05:24:34 +0000
+++ data/world/critters/duck/init.lua	2017-01-17 08:56:03 +0000
@@ -2,7 +2,7 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "duck_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       sound_effect = {
          directory = dirname,
          name = "duck",
@@ -11,11 +11,12 @@
       fps = 4,
    },
 }
-add_walking_animations(animations, dirname, "duck_walk", {5, 10})
+add_walking_animations(animations, dirname, "walk", {5, 10})
 
 world:new_critter_type{
    name = "duck",
    descname = _ "Duck",
+   editor_category = "critters_aquatic",
    attributes = { "swimming" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/duck/duck_walk_e_00.png' => 'data/world/critters/duck/walk_e_00.png'
=== renamed file 'data/world/critters/duck/duck_walk_ne_00.png' => 'data/world/critters/duck/walk_ne_00.png'
=== renamed file 'data/world/critters/duck/duck_walk_nw_00.png' => 'data/world/critters/duck/walk_nw_00.png'
=== renamed file 'data/world/critters/duck/duck_walk_se_00.png' => 'data/world/critters/duck/walk_se_00.png'
=== renamed file 'data/world/critters/duck/duck_walk_sw_00.png' => 'data/world/critters/duck/walk_sw_00.png'
=== renamed file 'data/world/critters/duck/duck_walk_w_00.png' => 'data/world/critters/duck/walk_w_00.png'
=== renamed file 'data/world/critters/elk/elk_idle_00.png' => 'data/world/critters/elk/idle_00.png'
=== renamed file 'data/world/critters/elk/elk_idle_01.png' => 'data/world/critters/elk/idle_01.png'
=== renamed file 'data/world/critters/elk/elk_idle_02.png' => 'data/world/critters/elk/idle_02.png'
=== renamed file 'data/world/critters/elk/elk_idle_03.png' => 'data/world/critters/elk/idle_03.png'
=== renamed file 'data/world/critters/elk/elk_idle_04.png' => 'data/world/critters/elk/idle_04.png'
=== renamed file 'data/world/critters/elk/elk_idle_05.png' => 'data/world/critters/elk/idle_05.png'
=== renamed file 'data/world/critters/elk/elk_idle_06.png' => 'data/world/critters/elk/idle_06.png'
=== renamed file 'data/world/critters/elk/elk_idle_07.png' => 'data/world/critters/elk/idle_07.png'
=== renamed file 'data/world/critters/elk/elk_idle_08.png' => 'data/world/critters/elk/idle_08.png'
=== renamed file 'data/world/critters/elk/elk_idle_09.png' => 'data/world/critters/elk/idle_09.png'
=== renamed file 'data/world/critters/elk/elk_idle_10.png' => 'data/world/critters/elk/idle_10.png'
=== renamed file 'data/world/critters/elk/elk_idle_11.png' => 'data/world/critters/elk/idle_11.png'
=== renamed file 'data/world/critters/elk/elk_idle_12.png' => 'data/world/critters/elk/idle_12.png'
=== renamed file 'data/world/critters/elk/elk_idle_13.png' => 'data/world/critters/elk/idle_13.png'
=== renamed file 'data/world/critters/elk/elk_idle_14.png' => 'data/world/critters/elk/idle_14.png'
=== renamed file 'data/world/critters/elk/elk_idle_15.png' => 'data/world/critters/elk/idle_15.png'
=== renamed file 'data/world/critters/elk/elk_idle_16.png' => 'data/world/critters/elk/idle_16.png'
=== renamed file 'data/world/critters/elk/elk_idle_17.png' => 'data/world/critters/elk/idle_17.png'
=== renamed file 'data/world/critters/elk/elk_idle_18.png' => 'data/world/critters/elk/idle_18.png'
=== renamed file 'data/world/critters/elk/elk_idle_19.png' => 'data/world/critters/elk/idle_19.png'
=== modified file 'data/world/critters/elk/init.lua'
--- data/world/critters/elk/init.lua	2016-06-14 10:49:53 +0000
+++ data/world/critters/elk/init.lua	2017-01-17 08:56:03 +0000
@@ -2,7 +2,7 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "elk_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       hotspot = { 15, 27 },
       fps = 20,
       sound_effect = {
@@ -12,11 +12,12 @@
       },
    },
 }
-add_walking_animations(animations, dirname, "elk_walk", {21, 34}, 20)
+add_walking_animations(animations, dirname, "walk", {21, 34}, 20)
 
 world:new_critter_type{
    name = "elk",
    descname = _ "Elk",
+   editor_category = "critters_herbivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/elk/elk_walk_e_00.png' => 'data/world/critters/elk/walk_e_00.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_01.png' => 'data/world/critters/elk/walk_e_01.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_02.png' => 'data/world/critters/elk/walk_e_02.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_03.png' => 'data/world/critters/elk/walk_e_03.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_04.png' => 'data/world/critters/elk/walk_e_04.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_05.png' => 'data/world/critters/elk/walk_e_05.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_06.png' => 'data/world/critters/elk/walk_e_06.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_07.png' => 'data/world/critters/elk/walk_e_07.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_08.png' => 'data/world/critters/elk/walk_e_08.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_09.png' => 'data/world/critters/elk/walk_e_09.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_10.png' => 'data/world/critters/elk/walk_e_10.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_11.png' => 'data/world/critters/elk/walk_e_11.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_12.png' => 'data/world/critters/elk/walk_e_12.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_13.png' => 'data/world/critters/elk/walk_e_13.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_14.png' => 'data/world/critters/elk/walk_e_14.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_15.png' => 'data/world/critters/elk/walk_e_15.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_16.png' => 'data/world/critters/elk/walk_e_16.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_17.png' => 'data/world/critters/elk/walk_e_17.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_18.png' => 'data/world/critters/elk/walk_e_18.png'
=== renamed file 'data/world/critters/elk/elk_walk_e_19.png' => 'data/world/critters/elk/walk_e_19.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_00.png' => 'data/world/critters/elk/walk_ne_00.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_01.png' => 'data/world/critters/elk/walk_ne_01.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_02.png' => 'data/world/critters/elk/walk_ne_02.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_03.png' => 'data/world/critters/elk/walk_ne_03.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_04.png' => 'data/world/critters/elk/walk_ne_04.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_05.png' => 'data/world/critters/elk/walk_ne_05.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_06.png' => 'data/world/critters/elk/walk_ne_06.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_07.png' => 'data/world/critters/elk/walk_ne_07.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_08.png' => 'data/world/critters/elk/walk_ne_08.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_09.png' => 'data/world/critters/elk/walk_ne_09.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_10.png' => 'data/world/critters/elk/walk_ne_10.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_11.png' => 'data/world/critters/elk/walk_ne_11.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_12.png' => 'data/world/critters/elk/walk_ne_12.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_13.png' => 'data/world/critters/elk/walk_ne_13.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_14.png' => 'data/world/critters/elk/walk_ne_14.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_15.png' => 'data/world/critters/elk/walk_ne_15.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_16.png' => 'data/world/critters/elk/walk_ne_16.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_17.png' => 'data/world/critters/elk/walk_ne_17.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_18.png' => 'data/world/critters/elk/walk_ne_18.png'
=== renamed file 'data/world/critters/elk/elk_walk_ne_19.png' => 'data/world/critters/elk/walk_ne_19.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_00.png' => 'data/world/critters/elk/walk_nw_00.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_01.png' => 'data/world/critters/elk/walk_nw_01.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_02.png' => 'data/world/critters/elk/walk_nw_02.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_03.png' => 'data/world/critters/elk/walk_nw_03.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_04.png' => 'data/world/critters/elk/walk_nw_04.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_05.png' => 'data/world/critters/elk/walk_nw_05.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_06.png' => 'data/world/critters/elk/walk_nw_06.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_07.png' => 'data/world/critters/elk/walk_nw_07.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_08.png' => 'data/world/critters/elk/walk_nw_08.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_09.png' => 'data/world/critters/elk/walk_nw_09.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_10.png' => 'data/world/critters/elk/walk_nw_10.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_11.png' => 'data/world/critters/elk/walk_nw_11.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_12.png' => 'data/world/critters/elk/walk_nw_12.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_13.png' => 'data/world/critters/elk/walk_nw_13.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_14.png' => 'data/world/critters/elk/walk_nw_14.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_15.png' => 'data/world/critters/elk/walk_nw_15.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_16.png' => 'data/world/critters/elk/walk_nw_16.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_17.png' => 'data/world/critters/elk/walk_nw_17.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_18.png' => 'data/world/critters/elk/walk_nw_18.png'
=== renamed file 'data/world/critters/elk/elk_walk_nw_19.png' => 'data/world/critters/elk/walk_nw_19.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_00.png' => 'data/world/critters/elk/walk_se_00.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_01.png' => 'data/world/critters/elk/walk_se_01.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_02.png' => 'data/world/critters/elk/walk_se_02.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_03.png' => 'data/world/critters/elk/walk_se_03.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_04.png' => 'data/world/critters/elk/walk_se_04.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_05.png' => 'data/world/critters/elk/walk_se_05.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_06.png' => 'data/world/critters/elk/walk_se_06.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_07.png' => 'data/world/critters/elk/walk_se_07.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_08.png' => 'data/world/critters/elk/walk_se_08.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_09.png' => 'data/world/critters/elk/walk_se_09.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_10.png' => 'data/world/critters/elk/walk_se_10.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_11.png' => 'data/world/critters/elk/walk_se_11.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_12.png' => 'data/world/critters/elk/walk_se_12.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_13.png' => 'data/world/critters/elk/walk_se_13.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_14.png' => 'data/world/critters/elk/walk_se_14.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_15.png' => 'data/world/critters/elk/walk_se_15.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_16.png' => 'data/world/critters/elk/walk_se_16.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_17.png' => 'data/world/critters/elk/walk_se_17.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_18.png' => 'data/world/critters/elk/walk_se_18.png'
=== renamed file 'data/world/critters/elk/elk_walk_se_19.png' => 'data/world/critters/elk/walk_se_19.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_00.png' => 'data/world/critters/elk/walk_sw_00.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_01.png' => 'data/world/critters/elk/walk_sw_01.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_02.png' => 'data/world/critters/elk/walk_sw_02.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_03.png' => 'data/world/critters/elk/walk_sw_03.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_04.png' => 'data/world/critters/elk/walk_sw_04.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_05.png' => 'data/world/critters/elk/walk_sw_05.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_06.png' => 'data/world/critters/elk/walk_sw_06.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_07.png' => 'data/world/critters/elk/walk_sw_07.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_08.png' => 'data/world/critters/elk/walk_sw_08.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_09.png' => 'data/world/critters/elk/walk_sw_09.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_10.png' => 'data/world/critters/elk/walk_sw_10.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_11.png' => 'data/world/critters/elk/walk_sw_11.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_12.png' => 'data/world/critters/elk/walk_sw_12.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_13.png' => 'data/world/critters/elk/walk_sw_13.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_14.png' => 'data/world/critters/elk/walk_sw_14.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_15.png' => 'data/world/critters/elk/walk_sw_15.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_16.png' => 'data/world/critters/elk/walk_sw_16.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_17.png' => 'data/world/critters/elk/walk_sw_17.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_18.png' => 'data/world/critters/elk/walk_sw_18.png'
=== renamed file 'data/world/critters/elk/elk_walk_sw_19.png' => 'data/world/critters/elk/walk_sw_19.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_00.png' => 'data/world/critters/elk/walk_w_00.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_01.png' => 'data/world/critters/elk/walk_w_01.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_02.png' => 'data/world/critters/elk/walk_w_02.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_03.png' => 'data/world/critters/elk/walk_w_03.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_04.png' => 'data/world/critters/elk/walk_w_04.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_05.png' => 'data/world/critters/elk/walk_w_05.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_06.png' => 'data/world/critters/elk/walk_w_06.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_07.png' => 'data/world/critters/elk/walk_w_07.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_08.png' => 'data/world/critters/elk/walk_w_08.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_09.png' => 'data/world/critters/elk/walk_w_09.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_10.png' => 'data/world/critters/elk/walk_w_10.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_11.png' => 'data/world/critters/elk/walk_w_11.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_12.png' => 'data/world/critters/elk/walk_w_12.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_13.png' => 'data/world/critters/elk/walk_w_13.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_14.png' => 'data/world/critters/elk/walk_w_14.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_15.png' => 'data/world/critters/elk/walk_w_15.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_16.png' => 'data/world/critters/elk/walk_w_16.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_17.png' => 'data/world/critters/elk/walk_w_17.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_18.png' => 'data/world/critters/elk/walk_w_18.png'
=== renamed file 'data/world/critters/elk/elk_walk_w_19.png' => 'data/world/critters/elk/walk_w_19.png'
=== renamed file 'data/world/critters/fox/fox_idle_00.png' => 'data/world/critters/fox/idle_00.png'
=== renamed file 'data/world/critters/fox/fox_idle_01.png' => 'data/world/critters/fox/idle_01.png'
=== renamed file 'data/world/critters/fox/fox_idle_02.png' => 'data/world/critters/fox/idle_02.png'
=== renamed file 'data/world/critters/fox/fox_idle_03.png' => 'data/world/critters/fox/idle_03.png'
=== renamed file 'data/world/critters/fox/fox_idle_04.png' => 'data/world/critters/fox/idle_04.png'
=== renamed file 'data/world/critters/fox/fox_idle_05.png' => 'data/world/critters/fox/idle_05.png'
=== renamed file 'data/world/critters/fox/fox_idle_06.png' => 'data/world/critters/fox/idle_06.png'
=== renamed file 'data/world/critters/fox/fox_idle_07.png' => 'data/world/critters/fox/idle_07.png'
=== renamed file 'data/world/critters/fox/fox_idle_08.png' => 'data/world/critters/fox/idle_08.png'
=== renamed file 'data/world/critters/fox/fox_idle_09.png' => 'data/world/critters/fox/idle_09.png'
=== renamed file 'data/world/critters/fox/fox_idle_10.png' => 'data/world/critters/fox/idle_10.png'
=== renamed file 'data/world/critters/fox/fox_idle_11.png' => 'data/world/critters/fox/idle_11.png'
=== renamed file 'data/world/critters/fox/fox_idle_12.png' => 'data/world/critters/fox/idle_12.png'
=== renamed file 'data/world/critters/fox/fox_idle_13.png' => 'data/world/critters/fox/idle_13.png'
=== renamed file 'data/world/critters/fox/fox_idle_14.png' => 'data/world/critters/fox/idle_14.png'
=== renamed file 'data/world/critters/fox/fox_idle_15.png' => 'data/world/critters/fox/idle_15.png'
=== renamed file 'data/world/critters/fox/fox_idle_16.png' => 'data/world/critters/fox/idle_16.png'
=== renamed file 'data/world/critters/fox/fox_idle_17.png' => 'data/world/critters/fox/idle_17.png'
=== renamed file 'data/world/critters/fox/fox_idle_18.png' => 'data/world/critters/fox/idle_18.png'
=== renamed file 'data/world/critters/fox/fox_idle_19.png' => 'data/world/critters/fox/idle_19.png'
=== modified file 'data/world/critters/fox/init.lua'
--- data/world/critters/fox/init.lua	2016-06-14 10:49:53 +0000
+++ data/world/critters/fox/init.lua	2017-01-17 08:56:03 +0000
@@ -2,7 +2,7 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "fox_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       sound_effect = {
          -- Sound files with numbers starting for 10 are generating silence. Remove when we move the sound triggering to programs
          directory = "sound/animals",
@@ -12,11 +12,12 @@
       fps = 10,
    },
 }
-add_walking_animations(animations, dirname, "fox_walk", {11, 14}, 20)
+add_walking_animations(animations, dirname, "walk", {11, 14}, 20)
 
 world:new_critter_type{
    name = "fox",
    descname = _ "Fox",
+   editor_category = "critters_carnivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/fox/fox_walk_e_00.png' => 'data/world/critters/fox/walk_e_00.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_01.png' => 'data/world/critters/fox/walk_e_01.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_02.png' => 'data/world/critters/fox/walk_e_02.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_03.png' => 'data/world/critters/fox/walk_e_03.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_04.png' => 'data/world/critters/fox/walk_e_04.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_05.png' => 'data/world/critters/fox/walk_e_05.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_06.png' => 'data/world/critters/fox/walk_e_06.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_07.png' => 'data/world/critters/fox/walk_e_07.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_08.png' => 'data/world/critters/fox/walk_e_08.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_09.png' => 'data/world/critters/fox/walk_e_09.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_10.png' => 'data/world/critters/fox/walk_e_10.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_11.png' => 'data/world/critters/fox/walk_e_11.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_12.png' => 'data/world/critters/fox/walk_e_12.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_13.png' => 'data/world/critters/fox/walk_e_13.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_14.png' => 'data/world/critters/fox/walk_e_14.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_15.png' => 'data/world/critters/fox/walk_e_15.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_16.png' => 'data/world/critters/fox/walk_e_16.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_17.png' => 'data/world/critters/fox/walk_e_17.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_18.png' => 'data/world/critters/fox/walk_e_18.png'
=== renamed file 'data/world/critters/fox/fox_walk_e_19.png' => 'data/world/critters/fox/walk_e_19.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_00.png' => 'data/world/critters/fox/walk_ne_00.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_01.png' => 'data/world/critters/fox/walk_ne_01.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_02.png' => 'data/world/critters/fox/walk_ne_02.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_03.png' => 'data/world/critters/fox/walk_ne_03.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_04.png' => 'data/world/critters/fox/walk_ne_04.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_05.png' => 'data/world/critters/fox/walk_ne_05.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_06.png' => 'data/world/critters/fox/walk_ne_06.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_07.png' => 'data/world/critters/fox/walk_ne_07.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_08.png' => 'data/world/critters/fox/walk_ne_08.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_09.png' => 'data/world/critters/fox/walk_ne_09.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_10.png' => 'data/world/critters/fox/walk_ne_10.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_11.png' => 'data/world/critters/fox/walk_ne_11.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_12.png' => 'data/world/critters/fox/walk_ne_12.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_13.png' => 'data/world/critters/fox/walk_ne_13.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_14.png' => 'data/world/critters/fox/walk_ne_14.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_15.png' => 'data/world/critters/fox/walk_ne_15.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_16.png' => 'data/world/critters/fox/walk_ne_16.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_17.png' => 'data/world/critters/fox/walk_ne_17.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_18.png' => 'data/world/critters/fox/walk_ne_18.png'
=== renamed file 'data/world/critters/fox/fox_walk_ne_19.png' => 'data/world/critters/fox/walk_ne_19.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_00.png' => 'data/world/critters/fox/walk_nw_00.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_01.png' => 'data/world/critters/fox/walk_nw_01.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_02.png' => 'data/world/critters/fox/walk_nw_02.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_03.png' => 'data/world/critters/fox/walk_nw_03.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_04.png' => 'data/world/critters/fox/walk_nw_04.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_05.png' => 'data/world/critters/fox/walk_nw_05.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_06.png' => 'data/world/critters/fox/walk_nw_06.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_07.png' => 'data/world/critters/fox/walk_nw_07.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_08.png' => 'data/world/critters/fox/walk_nw_08.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_09.png' => 'data/world/critters/fox/walk_nw_09.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_10.png' => 'data/world/critters/fox/walk_nw_10.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_11.png' => 'data/world/critters/fox/walk_nw_11.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_12.png' => 'data/world/critters/fox/walk_nw_12.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_13.png' => 'data/world/critters/fox/walk_nw_13.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_14.png' => 'data/world/critters/fox/walk_nw_14.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_15.png' => 'data/world/critters/fox/walk_nw_15.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_16.png' => 'data/world/critters/fox/walk_nw_16.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_17.png' => 'data/world/critters/fox/walk_nw_17.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_18.png' => 'data/world/critters/fox/walk_nw_18.png'
=== renamed file 'data/world/critters/fox/fox_walk_nw_19.png' => 'data/world/critters/fox/walk_nw_19.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_00.png' => 'data/world/critters/fox/walk_se_00.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_01.png' => 'data/world/critters/fox/walk_se_01.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_02.png' => 'data/world/critters/fox/walk_se_02.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_03.png' => 'data/world/critters/fox/walk_se_03.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_04.png' => 'data/world/critters/fox/walk_se_04.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_05.png' => 'data/world/critters/fox/walk_se_05.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_06.png' => 'data/world/critters/fox/walk_se_06.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_07.png' => 'data/world/critters/fox/walk_se_07.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_08.png' => 'data/world/critters/fox/walk_se_08.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_09.png' => 'data/world/critters/fox/walk_se_09.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_10.png' => 'data/world/critters/fox/walk_se_10.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_11.png' => 'data/world/critters/fox/walk_se_11.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_12.png' => 'data/world/critters/fox/walk_se_12.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_13.png' => 'data/world/critters/fox/walk_se_13.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_14.png' => 'data/world/critters/fox/walk_se_14.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_15.png' => 'data/world/critters/fox/walk_se_15.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_16.png' => 'data/world/critters/fox/walk_se_16.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_17.png' => 'data/world/critters/fox/walk_se_17.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_18.png' => 'data/world/critters/fox/walk_se_18.png'
=== renamed file 'data/world/critters/fox/fox_walk_se_19.png' => 'data/world/critters/fox/walk_se_19.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_00.png' => 'data/world/critters/fox/walk_sw_00.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_01.png' => 'data/world/critters/fox/walk_sw_01.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_02.png' => 'data/world/critters/fox/walk_sw_02.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_03.png' => 'data/world/critters/fox/walk_sw_03.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_04.png' => 'data/world/critters/fox/walk_sw_04.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_05.png' => 'data/world/critters/fox/walk_sw_05.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_06.png' => 'data/world/critters/fox/walk_sw_06.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_07.png' => 'data/world/critters/fox/walk_sw_07.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_08.png' => 'data/world/critters/fox/walk_sw_08.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_09.png' => 'data/world/critters/fox/walk_sw_09.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_10.png' => 'data/world/critters/fox/walk_sw_10.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_11.png' => 'data/world/critters/fox/walk_sw_11.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_12.png' => 'data/world/critters/fox/walk_sw_12.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_13.png' => 'data/world/critters/fox/walk_sw_13.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_14.png' => 'data/world/critters/fox/walk_sw_14.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_15.png' => 'data/world/critters/fox/walk_sw_15.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_16.png' => 'data/world/critters/fox/walk_sw_16.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_17.png' => 'data/world/critters/fox/walk_sw_17.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_18.png' => 'data/world/critters/fox/walk_sw_18.png'
=== renamed file 'data/world/critters/fox/fox_walk_sw_19.png' => 'data/world/critters/fox/walk_sw_19.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_00.png' => 'data/world/critters/fox/walk_w_00.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_01.png' => 'data/world/critters/fox/walk_w_01.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_02.png' => 'data/world/critters/fox/walk_w_02.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_03.png' => 'data/world/critters/fox/walk_w_03.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_04.png' => 'data/world/critters/fox/walk_w_04.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_05.png' => 'data/world/critters/fox/walk_w_05.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_06.png' => 'data/world/critters/fox/walk_w_06.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_07.png' => 'data/world/critters/fox/walk_w_07.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_08.png' => 'data/world/critters/fox/walk_w_08.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_09.png' => 'data/world/critters/fox/walk_w_09.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_10.png' => 'data/world/critters/fox/walk_w_10.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_11.png' => 'data/world/critters/fox/walk_w_11.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_12.png' => 'data/world/critters/fox/walk_w_12.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_13.png' => 'data/world/critters/fox/walk_w_13.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_14.png' => 'data/world/critters/fox/walk_w_14.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_15.png' => 'data/world/critters/fox/walk_w_15.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_16.png' => 'data/world/critters/fox/walk_w_16.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_17.png' => 'data/world/critters/fox/walk_w_17.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_18.png' => 'data/world/critters/fox/walk_w_18.png'
=== renamed file 'data/world/critters/fox/fox_walk_w_19.png' => 'data/world/critters/fox/walk_w_19.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_00.png' => 'data/world/critters/lynx/idle_00.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_01.png' => 'data/world/critters/lynx/idle_01.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_02.png' => 'data/world/critters/lynx/idle_02.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_03.png' => 'data/world/critters/lynx/idle_03.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_04.png' => 'data/world/critters/lynx/idle_04.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_05.png' => 'data/world/critters/lynx/idle_05.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_06.png' => 'data/world/critters/lynx/idle_06.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_07.png' => 'data/world/critters/lynx/idle_07.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_08.png' => 'data/world/critters/lynx/idle_08.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_09.png' => 'data/world/critters/lynx/idle_09.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_10.png' => 'data/world/critters/lynx/idle_10.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_11.png' => 'data/world/critters/lynx/idle_11.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_12.png' => 'data/world/critters/lynx/idle_12.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_13.png' => 'data/world/critters/lynx/idle_13.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_14.png' => 'data/world/critters/lynx/idle_14.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_15.png' => 'data/world/critters/lynx/idle_15.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_16.png' => 'data/world/critters/lynx/idle_16.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_17.png' => 'data/world/critters/lynx/idle_17.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_18.png' => 'data/world/critters/lynx/idle_18.png'
=== renamed file 'data/world/critters/lynx/lynx_idle_19.png' => 'data/world/critters/lynx/idle_19.png'
=== modified file 'data/world/critters/lynx/init.lua'
--- data/world/critters/lynx/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/lynx/init.lua	2017-01-17 08:56:03 +0000
@@ -2,16 +2,17 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "lynx_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       hotspot = { 8, 14 },
       fps = 20,
    },
 }
-add_walking_animations(animations, dirname, "lynx_walk", {11, 21}, 20)
+add_walking_animations(animations, dirname, "walk", {11, 21}, 20)
 
 world:new_critter_type{
    name = "lynx",
    descname = _ "Lynx",
+   editor_category = "critters_carnivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/lynx/lynx_walk_e_00.png' => 'data/world/critters/lynx/walk_e_00.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_01.png' => 'data/world/critters/lynx/walk_e_01.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_02.png' => 'data/world/critters/lynx/walk_e_02.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_03.png' => 'data/world/critters/lynx/walk_e_03.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_04.png' => 'data/world/critters/lynx/walk_e_04.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_05.png' => 'data/world/critters/lynx/walk_e_05.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_06.png' => 'data/world/critters/lynx/walk_e_06.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_07.png' => 'data/world/critters/lynx/walk_e_07.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_08.png' => 'data/world/critters/lynx/walk_e_08.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_09.png' => 'data/world/critters/lynx/walk_e_09.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_10.png' => 'data/world/critters/lynx/walk_e_10.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_11.png' => 'data/world/critters/lynx/walk_e_11.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_12.png' => 'data/world/critters/lynx/walk_e_12.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_13.png' => 'data/world/critters/lynx/walk_e_13.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_14.png' => 'data/world/critters/lynx/walk_e_14.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_15.png' => 'data/world/critters/lynx/walk_e_15.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_16.png' => 'data/world/critters/lynx/walk_e_16.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_17.png' => 'data/world/critters/lynx/walk_e_17.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_18.png' => 'data/world/critters/lynx/walk_e_18.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_e_19.png' => 'data/world/critters/lynx/walk_e_19.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_00.png' => 'data/world/critters/lynx/walk_ne_00.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_01.png' => 'data/world/critters/lynx/walk_ne_01.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_02.png' => 'data/world/critters/lynx/walk_ne_02.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_03.png' => 'data/world/critters/lynx/walk_ne_03.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_04.png' => 'data/world/critters/lynx/walk_ne_04.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_05.png' => 'data/world/critters/lynx/walk_ne_05.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_06.png' => 'data/world/critters/lynx/walk_ne_06.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_07.png' => 'data/world/critters/lynx/walk_ne_07.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_08.png' => 'data/world/critters/lynx/walk_ne_08.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_09.png' => 'data/world/critters/lynx/walk_ne_09.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_10.png' => 'data/world/critters/lynx/walk_ne_10.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_11.png' => 'data/world/critters/lynx/walk_ne_11.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_12.png' => 'data/world/critters/lynx/walk_ne_12.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_13.png' => 'data/world/critters/lynx/walk_ne_13.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_14.png' => 'data/world/critters/lynx/walk_ne_14.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_15.png' => 'data/world/critters/lynx/walk_ne_15.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_16.png' => 'data/world/critters/lynx/walk_ne_16.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_17.png' => 'data/world/critters/lynx/walk_ne_17.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_18.png' => 'data/world/critters/lynx/walk_ne_18.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_ne_19.png' => 'data/world/critters/lynx/walk_ne_19.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_00.png' => 'data/world/critters/lynx/walk_nw_00.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_01.png' => 'data/world/critters/lynx/walk_nw_01.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_02.png' => 'data/world/critters/lynx/walk_nw_02.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_03.png' => 'data/world/critters/lynx/walk_nw_03.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_04.png' => 'data/world/critters/lynx/walk_nw_04.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_05.png' => 'data/world/critters/lynx/walk_nw_05.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_06.png' => 'data/world/critters/lynx/walk_nw_06.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_07.png' => 'data/world/critters/lynx/walk_nw_07.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_08.png' => 'data/world/critters/lynx/walk_nw_08.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_09.png' => 'data/world/critters/lynx/walk_nw_09.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_10.png' => 'data/world/critters/lynx/walk_nw_10.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_11.png' => 'data/world/critters/lynx/walk_nw_11.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_12.png' => 'data/world/critters/lynx/walk_nw_12.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_13.png' => 'data/world/critters/lynx/walk_nw_13.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_14.png' => 'data/world/critters/lynx/walk_nw_14.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_15.png' => 'data/world/critters/lynx/walk_nw_15.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_16.png' => 'data/world/critters/lynx/walk_nw_16.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_17.png' => 'data/world/critters/lynx/walk_nw_17.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_18.png' => 'data/world/critters/lynx/walk_nw_18.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_nw_19.png' => 'data/world/critters/lynx/walk_nw_19.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_00.png' => 'data/world/critters/lynx/walk_se_00.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_01.png' => 'data/world/critters/lynx/walk_se_01.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_02.png' => 'data/world/critters/lynx/walk_se_02.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_03.png' => 'data/world/critters/lynx/walk_se_03.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_04.png' => 'data/world/critters/lynx/walk_se_04.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_05.png' => 'data/world/critters/lynx/walk_se_05.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_06.png' => 'data/world/critters/lynx/walk_se_06.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_07.png' => 'data/world/critters/lynx/walk_se_07.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_08.png' => 'data/world/critters/lynx/walk_se_08.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_09.png' => 'data/world/critters/lynx/walk_se_09.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_10.png' => 'data/world/critters/lynx/walk_se_10.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_11.png' => 'data/world/critters/lynx/walk_se_11.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_12.png' => 'data/world/critters/lynx/walk_se_12.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_13.png' => 'data/world/critters/lynx/walk_se_13.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_14.png' => 'data/world/critters/lynx/walk_se_14.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_15.png' => 'data/world/critters/lynx/walk_se_15.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_16.png' => 'data/world/critters/lynx/walk_se_16.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_17.png' => 'data/world/critters/lynx/walk_se_17.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_18.png' => 'data/world/critters/lynx/walk_se_18.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_se_19.png' => 'data/world/critters/lynx/walk_se_19.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_00.png' => 'data/world/critters/lynx/walk_sw_00.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_01.png' => 'data/world/critters/lynx/walk_sw_01.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_02.png' => 'data/world/critters/lynx/walk_sw_02.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_03.png' => 'data/world/critters/lynx/walk_sw_03.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_04.png' => 'data/world/critters/lynx/walk_sw_04.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_05.png' => 'data/world/critters/lynx/walk_sw_05.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_06.png' => 'data/world/critters/lynx/walk_sw_06.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_07.png' => 'data/world/critters/lynx/walk_sw_07.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_08.png' => 'data/world/critters/lynx/walk_sw_08.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_09.png' => 'data/world/critters/lynx/walk_sw_09.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_10.png' => 'data/world/critters/lynx/walk_sw_10.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_11.png' => 'data/world/critters/lynx/walk_sw_11.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_12.png' => 'data/world/critters/lynx/walk_sw_12.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_13.png' => 'data/world/critters/lynx/walk_sw_13.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_14.png' => 'data/world/critters/lynx/walk_sw_14.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_15.png' => 'data/world/critters/lynx/walk_sw_15.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_16.png' => 'data/world/critters/lynx/walk_sw_16.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_17.png' => 'data/world/critters/lynx/walk_sw_17.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_18.png' => 'data/world/critters/lynx/walk_sw_18.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_sw_19.png' => 'data/world/critters/lynx/walk_sw_19.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_00.png' => 'data/world/critters/lynx/walk_w_00.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_01.png' => 'data/world/critters/lynx/walk_w_01.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_02.png' => 'data/world/critters/lynx/walk_w_02.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_03.png' => 'data/world/critters/lynx/walk_w_03.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_04.png' => 'data/world/critters/lynx/walk_w_04.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_05.png' => 'data/world/critters/lynx/walk_w_05.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_06.png' => 'data/world/critters/lynx/walk_w_06.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_07.png' => 'data/world/critters/lynx/walk_w_07.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_08.png' => 'data/world/critters/lynx/walk_w_08.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_09.png' => 'data/world/critters/lynx/walk_w_09.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_10.png' => 'data/world/critters/lynx/walk_w_10.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_11.png' => 'data/world/critters/lynx/walk_w_11.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_12.png' => 'data/world/critters/lynx/walk_w_12.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_13.png' => 'data/world/critters/lynx/walk_w_13.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_14.png' => 'data/world/critters/lynx/walk_w_14.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_15.png' => 'data/world/critters/lynx/walk_w_15.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_16.png' => 'data/world/critters/lynx/walk_w_16.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_17.png' => 'data/world/critters/lynx/walk_w_17.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_18.png' => 'data/world/critters/lynx/walk_w_18.png'
=== renamed file 'data/world/critters/lynx/lynx_walk_w_19.png' => 'data/world/critters/lynx/walk_w_19.png'
=== renamed file 'data/world/critters/marten/marten_idle_00.png' => 'data/world/critters/marten/idle_00.png'
=== renamed file 'data/world/critters/marten/marten_idle_01.png' => 'data/world/critters/marten/idle_01.png'
=== renamed file 'data/world/critters/marten/marten_idle_02.png' => 'data/world/critters/marten/idle_02.png'
=== renamed file 'data/world/critters/marten/marten_idle_03.png' => 'data/world/critters/marten/idle_03.png'
=== renamed file 'data/world/critters/marten/marten_idle_04.png' => 'data/world/critters/marten/idle_04.png'
=== renamed file 'data/world/critters/marten/marten_idle_05.png' => 'data/world/critters/marten/idle_05.png'
=== renamed file 'data/world/critters/marten/marten_idle_06.png' => 'data/world/critters/marten/idle_06.png'
=== renamed file 'data/world/critters/marten/marten_idle_07.png' => 'data/world/critters/marten/idle_07.png'
=== renamed file 'data/world/critters/marten/marten_idle_08.png' => 'data/world/critters/marten/idle_08.png'
=== renamed file 'data/world/critters/marten/marten_idle_09.png' => 'data/world/critters/marten/idle_09.png'
=== renamed file 'data/world/critters/marten/marten_idle_10.png' => 'data/world/critters/marten/idle_10.png'
=== renamed file 'data/world/critters/marten/marten_idle_11.png' => 'data/world/critters/marten/idle_11.png'
=== renamed file 'data/world/critters/marten/marten_idle_12.png' => 'data/world/critters/marten/idle_12.png'
=== renamed file 'data/world/critters/marten/marten_idle_13.png' => 'data/world/critters/marten/idle_13.png'
=== renamed file 'data/world/critters/marten/marten_idle_14.png' => 'data/world/critters/marten/idle_14.png'
=== renamed file 'data/world/critters/marten/marten_idle_15.png' => 'data/world/critters/marten/idle_15.png'
=== renamed file 'data/world/critters/marten/marten_idle_16.png' => 'data/world/critters/marten/idle_16.png'
=== renamed file 'data/world/critters/marten/marten_idle_17.png' => 'data/world/critters/marten/idle_17.png'
=== renamed file 'data/world/critters/marten/marten_idle_18.png' => 'data/world/critters/marten/idle_18.png'
=== renamed file 'data/world/critters/marten/marten_idle_19.png' => 'data/world/critters/marten/idle_19.png'
=== modified file 'data/world/critters/marten/init.lua'
--- data/world/critters/marten/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/marten/init.lua	2017-01-17 08:56:03 +0000
@@ -2,16 +2,17 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "marten_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       hotspot = { 11, 11 },
       fps = 20,
    },
 }
-add_walking_animations(animations, dirname, "marten_walk", {15, 14}, 20)
+add_walking_animations(animations, dirname, "walk", {15, 14}, 20)
 
 world:new_critter_type{
    name = "marten",
    descname = _ "Marten",
+   editor_category = "critters_carnivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/marten/marten_walk_e_00.png' => 'data/world/critters/marten/walk_e_00.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_01.png' => 'data/world/critters/marten/walk_e_01.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_02.png' => 'data/world/critters/marten/walk_e_02.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_03.png' => 'data/world/critters/marten/walk_e_03.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_04.png' => 'data/world/critters/marten/walk_e_04.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_05.png' => 'data/world/critters/marten/walk_e_05.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_06.png' => 'data/world/critters/marten/walk_e_06.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_07.png' => 'data/world/critters/marten/walk_e_07.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_08.png' => 'data/world/critters/marten/walk_e_08.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_09.png' => 'data/world/critters/marten/walk_e_09.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_10.png' => 'data/world/critters/marten/walk_e_10.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_11.png' => 'data/world/critters/marten/walk_e_11.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_12.png' => 'data/world/critters/marten/walk_e_12.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_13.png' => 'data/world/critters/marten/walk_e_13.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_14.png' => 'data/world/critters/marten/walk_e_14.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_15.png' => 'data/world/critters/marten/walk_e_15.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_16.png' => 'data/world/critters/marten/walk_e_16.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_17.png' => 'data/world/critters/marten/walk_e_17.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_18.png' => 'data/world/critters/marten/walk_e_18.png'
=== renamed file 'data/world/critters/marten/marten_walk_e_19.png' => 'data/world/critters/marten/walk_e_19.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_00.png' => 'data/world/critters/marten/walk_ne_00.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_01.png' => 'data/world/critters/marten/walk_ne_01.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_02.png' => 'data/world/critters/marten/walk_ne_02.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_03.png' => 'data/world/critters/marten/walk_ne_03.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_04.png' => 'data/world/critters/marten/walk_ne_04.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_05.png' => 'data/world/critters/marten/walk_ne_05.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_06.png' => 'data/world/critters/marten/walk_ne_06.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_07.png' => 'data/world/critters/marten/walk_ne_07.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_08.png' => 'data/world/critters/marten/walk_ne_08.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_09.png' => 'data/world/critters/marten/walk_ne_09.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_10.png' => 'data/world/critters/marten/walk_ne_10.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_11.png' => 'data/world/critters/marten/walk_ne_11.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_12.png' => 'data/world/critters/marten/walk_ne_12.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_13.png' => 'data/world/critters/marten/walk_ne_13.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_14.png' => 'data/world/critters/marten/walk_ne_14.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_15.png' => 'data/world/critters/marten/walk_ne_15.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_16.png' => 'data/world/critters/marten/walk_ne_16.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_17.png' => 'data/world/critters/marten/walk_ne_17.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_18.png' => 'data/world/critters/marten/walk_ne_18.png'
=== renamed file 'data/world/critters/marten/marten_walk_ne_19.png' => 'data/world/critters/marten/walk_ne_19.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_00.png' => 'data/world/critters/marten/walk_nw_00.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_01.png' => 'data/world/critters/marten/walk_nw_01.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_02.png' => 'data/world/critters/marten/walk_nw_02.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_03.png' => 'data/world/critters/marten/walk_nw_03.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_04.png' => 'data/world/critters/marten/walk_nw_04.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_05.png' => 'data/world/critters/marten/walk_nw_05.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_06.png' => 'data/world/critters/marten/walk_nw_06.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_07.png' => 'data/world/critters/marten/walk_nw_07.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_08.png' => 'data/world/critters/marten/walk_nw_08.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_09.png' => 'data/world/critters/marten/walk_nw_09.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_10.png' => 'data/world/critters/marten/walk_nw_10.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_11.png' => 'data/world/critters/marten/walk_nw_11.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_12.png' => 'data/world/critters/marten/walk_nw_12.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_13.png' => 'data/world/critters/marten/walk_nw_13.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_14.png' => 'data/world/critters/marten/walk_nw_14.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_15.png' => 'data/world/critters/marten/walk_nw_15.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_16.png' => 'data/world/critters/marten/walk_nw_16.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_17.png' => 'data/world/critters/marten/walk_nw_17.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_18.png' => 'data/world/critters/marten/walk_nw_18.png'
=== renamed file 'data/world/critters/marten/marten_walk_nw_19.png' => 'data/world/critters/marten/walk_nw_19.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_00.png' => 'data/world/critters/marten/walk_se_00.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_01.png' => 'data/world/critters/marten/walk_se_01.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_02.png' => 'data/world/critters/marten/walk_se_02.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_03.png' => 'data/world/critters/marten/walk_se_03.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_04.png' => 'data/world/critters/marten/walk_se_04.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_05.png' => 'data/world/critters/marten/walk_se_05.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_06.png' => 'data/world/critters/marten/walk_se_06.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_07.png' => 'data/world/critters/marten/walk_se_07.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_08.png' => 'data/world/critters/marten/walk_se_08.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_09.png' => 'data/world/critters/marten/walk_se_09.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_10.png' => 'data/world/critters/marten/walk_se_10.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_11.png' => 'data/world/critters/marten/walk_se_11.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_12.png' => 'data/world/critters/marten/walk_se_12.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_13.png' => 'data/world/critters/marten/walk_se_13.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_14.png' => 'data/world/critters/marten/walk_se_14.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_15.png' => 'data/world/critters/marten/walk_se_15.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_16.png' => 'data/world/critters/marten/walk_se_16.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_17.png' => 'data/world/critters/marten/walk_se_17.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_18.png' => 'data/world/critters/marten/walk_se_18.png'
=== renamed file 'data/world/critters/marten/marten_walk_se_19.png' => 'data/world/critters/marten/walk_se_19.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_00.png' => 'data/world/critters/marten/walk_sw_00.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_01.png' => 'data/world/critters/marten/walk_sw_01.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_02.png' => 'data/world/critters/marten/walk_sw_02.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_03.png' => 'data/world/critters/marten/walk_sw_03.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_04.png' => 'data/world/critters/marten/walk_sw_04.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_05.png' => 'data/world/critters/marten/walk_sw_05.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_06.png' => 'data/world/critters/marten/walk_sw_06.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_07.png' => 'data/world/critters/marten/walk_sw_07.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_08.png' => 'data/world/critters/marten/walk_sw_08.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_09.png' => 'data/world/critters/marten/walk_sw_09.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_10.png' => 'data/world/critters/marten/walk_sw_10.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_11.png' => 'data/world/critters/marten/walk_sw_11.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_12.png' => 'data/world/critters/marten/walk_sw_12.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_13.png' => 'data/world/critters/marten/walk_sw_13.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_14.png' => 'data/world/critters/marten/walk_sw_14.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_15.png' => 'data/world/critters/marten/walk_sw_15.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_16.png' => 'data/world/critters/marten/walk_sw_16.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_17.png' => 'data/world/critters/marten/walk_sw_17.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_18.png' => 'data/world/critters/marten/walk_sw_18.png'
=== renamed file 'data/world/critters/marten/marten_walk_sw_19.png' => 'data/world/critters/marten/walk_sw_19.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_00.png' => 'data/world/critters/marten/walk_w_00.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_01.png' => 'data/world/critters/marten/walk_w_01.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_02.png' => 'data/world/critters/marten/walk_w_02.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_03.png' => 'data/world/critters/marten/walk_w_03.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_04.png' => 'data/world/critters/marten/walk_w_04.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_05.png' => 'data/world/critters/marten/walk_w_05.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_06.png' => 'data/world/critters/marten/walk_w_06.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_07.png' => 'data/world/critters/marten/walk_w_07.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_08.png' => 'data/world/critters/marten/walk_w_08.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_09.png' => 'data/world/critters/marten/walk_w_09.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_10.png' => 'data/world/critters/marten/walk_w_10.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_11.png' => 'data/world/critters/marten/walk_w_11.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_12.png' => 'data/world/critters/marten/walk_w_12.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_13.png' => 'data/world/critters/marten/walk_w_13.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_14.png' => 'data/world/critters/marten/walk_w_14.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_15.png' => 'data/world/critters/marten/walk_w_15.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_16.png' => 'data/world/critters/marten/walk_w_16.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_17.png' => 'data/world/critters/marten/walk_w_17.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_18.png' => 'data/world/critters/marten/walk_w_18.png'
=== renamed file 'data/world/critters/marten/marten_walk_w_19.png' => 'data/world/critters/marten/walk_w_19.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_00.png' => 'data/world/critters/reindeer/idle_00.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_01.png' => 'data/world/critters/reindeer/idle_01.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_02.png' => 'data/world/critters/reindeer/idle_02.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_03.png' => 'data/world/critters/reindeer/idle_03.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_04.png' => 'data/world/critters/reindeer/idle_04.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_05.png' => 'data/world/critters/reindeer/idle_05.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_06.png' => 'data/world/critters/reindeer/idle_06.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_07.png' => 'data/world/critters/reindeer/idle_07.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_08.png' => 'data/world/critters/reindeer/idle_08.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_09.png' => 'data/world/critters/reindeer/idle_09.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_10.png' => 'data/world/critters/reindeer/idle_10.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_11.png' => 'data/world/critters/reindeer/idle_11.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_12.png' => 'data/world/critters/reindeer/idle_12.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_13.png' => 'data/world/critters/reindeer/idle_13.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_14.png' => 'data/world/critters/reindeer/idle_14.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_15.png' => 'data/world/critters/reindeer/idle_15.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_16.png' => 'data/world/critters/reindeer/idle_16.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_17.png' => 'data/world/critters/reindeer/idle_17.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_18.png' => 'data/world/critters/reindeer/idle_18.png'
=== renamed file 'data/world/critters/reindeer/reindeer_idle_19.png' => 'data/world/critters/reindeer/idle_19.png'
=== modified file 'data/world/critters/reindeer/init.lua'
--- data/world/critters/reindeer/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/reindeer/init.lua	2017-01-17 08:56:03 +0000
@@ -2,16 +2,17 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "reindeer_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       hotspot = { 23, 21 },
       fps = 20,
    },
 }
-add_walking_animations(animations, dirname, "reindeer_walk", {25, 30}, 20)
+add_walking_animations(animations, dirname, "walk", {25, 30}, 20)
 
 world:new_critter_type{
    name = "reindeer",
    descname = _ "Reindeer",
+   editor_category = "critters_herbivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_00.png' => 'data/world/critters/reindeer/walk_e_00.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_01.png' => 'data/world/critters/reindeer/walk_e_01.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_02.png' => 'data/world/critters/reindeer/walk_e_02.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_03.png' => 'data/world/critters/reindeer/walk_e_03.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_04.png' => 'data/world/critters/reindeer/walk_e_04.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_05.png' => 'data/world/critters/reindeer/walk_e_05.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_06.png' => 'data/world/critters/reindeer/walk_e_06.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_07.png' => 'data/world/critters/reindeer/walk_e_07.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_08.png' => 'data/world/critters/reindeer/walk_e_08.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_09.png' => 'data/world/critters/reindeer/walk_e_09.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_10.png' => 'data/world/critters/reindeer/walk_e_10.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_11.png' => 'data/world/critters/reindeer/walk_e_11.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_12.png' => 'data/world/critters/reindeer/walk_e_12.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_13.png' => 'data/world/critters/reindeer/walk_e_13.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_14.png' => 'data/world/critters/reindeer/walk_e_14.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_15.png' => 'data/world/critters/reindeer/walk_e_15.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_16.png' => 'data/world/critters/reindeer/walk_e_16.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_17.png' => 'data/world/critters/reindeer/walk_e_17.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_18.png' => 'data/world/critters/reindeer/walk_e_18.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_e_19.png' => 'data/world/critters/reindeer/walk_e_19.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_00.png' => 'data/world/critters/reindeer/walk_ne_00.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_01.png' => 'data/world/critters/reindeer/walk_ne_01.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_02.png' => 'data/world/critters/reindeer/walk_ne_02.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_03.png' => 'data/world/critters/reindeer/walk_ne_03.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_04.png' => 'data/world/critters/reindeer/walk_ne_04.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_05.png' => 'data/world/critters/reindeer/walk_ne_05.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_06.png' => 'data/world/critters/reindeer/walk_ne_06.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_07.png' => 'data/world/critters/reindeer/walk_ne_07.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_08.png' => 'data/world/critters/reindeer/walk_ne_08.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_09.png' => 'data/world/critters/reindeer/walk_ne_09.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_10.png' => 'data/world/critters/reindeer/walk_ne_10.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_11.png' => 'data/world/critters/reindeer/walk_ne_11.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_12.png' => 'data/world/critters/reindeer/walk_ne_12.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_13.png' => 'data/world/critters/reindeer/walk_ne_13.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_14.png' => 'data/world/critters/reindeer/walk_ne_14.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_15.png' => 'data/world/critters/reindeer/walk_ne_15.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_16.png' => 'data/world/critters/reindeer/walk_ne_16.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_17.png' => 'data/world/critters/reindeer/walk_ne_17.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_18.png' => 'data/world/critters/reindeer/walk_ne_18.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_ne_19.png' => 'data/world/critters/reindeer/walk_ne_19.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_00.png' => 'data/world/critters/reindeer/walk_nw_00.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_01.png' => 'data/world/critters/reindeer/walk_nw_01.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_02.png' => 'data/world/critters/reindeer/walk_nw_02.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_03.png' => 'data/world/critters/reindeer/walk_nw_03.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_04.png' => 'data/world/critters/reindeer/walk_nw_04.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_05.png' => 'data/world/critters/reindeer/walk_nw_05.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_06.png' => 'data/world/critters/reindeer/walk_nw_06.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_07.png' => 'data/world/critters/reindeer/walk_nw_07.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_08.png' => 'data/world/critters/reindeer/walk_nw_08.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_09.png' => 'data/world/critters/reindeer/walk_nw_09.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_10.png' => 'data/world/critters/reindeer/walk_nw_10.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_11.png' => 'data/world/critters/reindeer/walk_nw_11.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_12.png' => 'data/world/critters/reindeer/walk_nw_12.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_13.png' => 'data/world/critters/reindeer/walk_nw_13.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_14.png' => 'data/world/critters/reindeer/walk_nw_14.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_15.png' => 'data/world/critters/reindeer/walk_nw_15.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_16.png' => 'data/world/critters/reindeer/walk_nw_16.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_17.png' => 'data/world/critters/reindeer/walk_nw_17.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_18.png' => 'data/world/critters/reindeer/walk_nw_18.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_nw_19.png' => 'data/world/critters/reindeer/walk_nw_19.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_00.png' => 'data/world/critters/reindeer/walk_se_00.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_01.png' => 'data/world/critters/reindeer/walk_se_01.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_02.png' => 'data/world/critters/reindeer/walk_se_02.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_03.png' => 'data/world/critters/reindeer/walk_se_03.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_04.png' => 'data/world/critters/reindeer/walk_se_04.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_05.png' => 'data/world/critters/reindeer/walk_se_05.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_06.png' => 'data/world/critters/reindeer/walk_se_06.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_07.png' => 'data/world/critters/reindeer/walk_se_07.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_08.png' => 'data/world/critters/reindeer/walk_se_08.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_09.png' => 'data/world/critters/reindeer/walk_se_09.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_10.png' => 'data/world/critters/reindeer/walk_se_10.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_11.png' => 'data/world/critters/reindeer/walk_se_11.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_12.png' => 'data/world/critters/reindeer/walk_se_12.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_13.png' => 'data/world/critters/reindeer/walk_se_13.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_14.png' => 'data/world/critters/reindeer/walk_se_14.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_15.png' => 'data/world/critters/reindeer/walk_se_15.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_16.png' => 'data/world/critters/reindeer/walk_se_16.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_17.png' => 'data/world/critters/reindeer/walk_se_17.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_18.png' => 'data/world/critters/reindeer/walk_se_18.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_se_19.png' => 'data/world/critters/reindeer/walk_se_19.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_00.png' => 'data/world/critters/reindeer/walk_sw_00.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_01.png' => 'data/world/critters/reindeer/walk_sw_01.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_02.png' => 'data/world/critters/reindeer/walk_sw_02.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_03.png' => 'data/world/critters/reindeer/walk_sw_03.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_04.png' => 'data/world/critters/reindeer/walk_sw_04.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_05.png' => 'data/world/critters/reindeer/walk_sw_05.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_06.png' => 'data/world/critters/reindeer/walk_sw_06.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_07.png' => 'data/world/critters/reindeer/walk_sw_07.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_08.png' => 'data/world/critters/reindeer/walk_sw_08.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_09.png' => 'data/world/critters/reindeer/walk_sw_09.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_10.png' => 'data/world/critters/reindeer/walk_sw_10.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_11.png' => 'data/world/critters/reindeer/walk_sw_11.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_12.png' => 'data/world/critters/reindeer/walk_sw_12.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_13.png' => 'data/world/critters/reindeer/walk_sw_13.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_14.png' => 'data/world/critters/reindeer/walk_sw_14.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_15.png' => 'data/world/critters/reindeer/walk_sw_15.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_16.png' => 'data/world/critters/reindeer/walk_sw_16.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_17.png' => 'data/world/critters/reindeer/walk_sw_17.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_18.png' => 'data/world/critters/reindeer/walk_sw_18.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_sw_19.png' => 'data/world/critters/reindeer/walk_sw_19.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_00.png' => 'data/world/critters/reindeer/walk_w_00.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_01.png' => 'data/world/critters/reindeer/walk_w_01.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_02.png' => 'data/world/critters/reindeer/walk_w_02.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_03.png' => 'data/world/critters/reindeer/walk_w_03.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_04.png' => 'data/world/critters/reindeer/walk_w_04.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_05.png' => 'data/world/critters/reindeer/walk_w_05.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_06.png' => 'data/world/critters/reindeer/walk_w_06.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_07.png' => 'data/world/critters/reindeer/walk_w_07.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_08.png' => 'data/world/critters/reindeer/walk_w_08.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_09.png' => 'data/world/critters/reindeer/walk_w_09.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_10.png' => 'data/world/critters/reindeer/walk_w_10.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_11.png' => 'data/world/critters/reindeer/walk_w_11.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_12.png' => 'data/world/critters/reindeer/walk_w_12.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_13.png' => 'data/world/critters/reindeer/walk_w_13.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_14.png' => 'data/world/critters/reindeer/walk_w_14.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_15.png' => 'data/world/critters/reindeer/walk_w_15.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_16.png' => 'data/world/critters/reindeer/walk_w_16.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_17.png' => 'data/world/critters/reindeer/walk_w_17.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_18.png' => 'data/world/critters/reindeer/walk_w_18.png'
=== renamed file 'data/world/critters/reindeer/reindeer_walk_w_19.png' => 'data/world/critters/reindeer/walk_w_19.png'
=== renamed file 'data/world/critters/sheep/sheep_00.png' => 'data/world/critters/sheep/idle_00.png'
=== renamed file 'data/world/critters/sheep/sheep_01.png' => 'data/world/critters/sheep/idle_01.png'
=== renamed file 'data/world/critters/sheep/sheep_02.png' => 'data/world/critters/sheep/idle_02.png'
=== renamed file 'data/world/critters/sheep/sheep_03.png' => 'data/world/critters/sheep/idle_03.png'
=== renamed file 'data/world/critters/sheep/sheep_04.png' => 'data/world/critters/sheep/idle_04.png'
=== renamed file 'data/world/critters/sheep/sheep_05.png' => 'data/world/critters/sheep/idle_05.png'
=== renamed file 'data/world/critters/sheep/sheep_06.png' => 'data/world/critters/sheep/idle_06.png'
=== renamed file 'data/world/critters/sheep/sheep_07.png' => 'data/world/critters/sheep/idle_07.png'
=== renamed file 'data/world/critters/sheep/sheep_08.png' => 'data/world/critters/sheep/idle_08.png'
=== renamed file 'data/world/critters/sheep/sheep_09.png' => 'data/world/critters/sheep/idle_09.png'
=== renamed file 'data/world/critters/sheep/sheep_10.png' => 'data/world/critters/sheep/idle_10.png'
=== renamed file 'data/world/critters/sheep/sheep_11.png' => 'data/world/critters/sheep/idle_11.png'
=== renamed file 'data/world/critters/sheep/sheep_12.png' => 'data/world/critters/sheep/idle_12.png'
=== renamed file 'data/world/critters/sheep/sheep_13.png' => 'data/world/critters/sheep/idle_13.png'
=== renamed file 'data/world/critters/sheep/sheep_14.png' => 'data/world/critters/sheep/idle_14.png'
=== renamed file 'data/world/critters/sheep/sheep_15.png' => 'data/world/critters/sheep/idle_15.png'
=== renamed file 'data/world/critters/sheep/sheep_16.png' => 'data/world/critters/sheep/idle_16.png'
=== renamed file 'data/world/critters/sheep/sheep_17.png' => 'data/world/critters/sheep/idle_17.png'
=== renamed file 'data/world/critters/sheep/sheep_18.png' => 'data/world/critters/sheep/idle_18.png'
=== renamed file 'data/world/critters/sheep/sheep_19.png' => 'data/world/critters/sheep/idle_19.png'
=== modified file 'data/world/critters/sheep/init.lua'
--- data/world/critters/sheep/init.lua	2016-01-28 05:24:34 +0000
+++ data/world/critters/sheep/init.lua	2017-01-17 08:56:03 +0000
@@ -2,7 +2,7 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "sheep_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       sound_effect = {
          directory = "sound/farm",
          name = "sheep",
@@ -11,11 +11,12 @@
       fps = 20,
    },
 }
-add_walking_animations(animations, dirname, "sheep_walk", {15, 25}, 20)
+add_walking_animations(animations, dirname, "walk", {15, 25}, 20)
 
 world:new_critter_type{
    name = "sheep",
    descname = _ "Sheep",
+   editor_category = "critters_herbivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/sheep/sheep_walk_e_00.png' => 'data/world/critters/sheep/walk_e_00.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_01.png' => 'data/world/critters/sheep/walk_e_01.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_02.png' => 'data/world/critters/sheep/walk_e_02.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_03.png' => 'data/world/critters/sheep/walk_e_03.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_04.png' => 'data/world/critters/sheep/walk_e_04.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_05.png' => 'data/world/critters/sheep/walk_e_05.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_06.png' => 'data/world/critters/sheep/walk_e_06.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_07.png' => 'data/world/critters/sheep/walk_e_07.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_08.png' => 'data/world/critters/sheep/walk_e_08.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_09.png' => 'data/world/critters/sheep/walk_e_09.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_10.png' => 'data/world/critters/sheep/walk_e_10.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_11.png' => 'data/world/critters/sheep/walk_e_11.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_12.png' => 'data/world/critters/sheep/walk_e_12.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_13.png' => 'data/world/critters/sheep/walk_e_13.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_14.png' => 'data/world/critters/sheep/walk_e_14.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_15.png' => 'data/world/critters/sheep/walk_e_15.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_16.png' => 'data/world/critters/sheep/walk_e_16.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_17.png' => 'data/world/critters/sheep/walk_e_17.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_18.png' => 'data/world/critters/sheep/walk_e_18.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_e_19.png' => 'data/world/critters/sheep/walk_e_19.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_00.png' => 'data/world/critters/sheep/walk_ne_00.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_01.png' => 'data/world/critters/sheep/walk_ne_01.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_02.png' => 'data/world/critters/sheep/walk_ne_02.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_03.png' => 'data/world/critters/sheep/walk_ne_03.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_04.png' => 'data/world/critters/sheep/walk_ne_04.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_05.png' => 'data/world/critters/sheep/walk_ne_05.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_06.png' => 'data/world/critters/sheep/walk_ne_06.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_07.png' => 'data/world/critters/sheep/walk_ne_07.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_08.png' => 'data/world/critters/sheep/walk_ne_08.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_09.png' => 'data/world/critters/sheep/walk_ne_09.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_10.png' => 'data/world/critters/sheep/walk_ne_10.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_11.png' => 'data/world/critters/sheep/walk_ne_11.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_12.png' => 'data/world/critters/sheep/walk_ne_12.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_13.png' => 'data/world/critters/sheep/walk_ne_13.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_14.png' => 'data/world/critters/sheep/walk_ne_14.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_15.png' => 'data/world/critters/sheep/walk_ne_15.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_16.png' => 'data/world/critters/sheep/walk_ne_16.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_17.png' => 'data/world/critters/sheep/walk_ne_17.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_18.png' => 'data/world/critters/sheep/walk_ne_18.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_ne_19.png' => 'data/world/critters/sheep/walk_ne_19.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_00.png' => 'data/world/critters/sheep/walk_nw_00.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_01.png' => 'data/world/critters/sheep/walk_nw_01.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_02.png' => 'data/world/critters/sheep/walk_nw_02.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_03.png' => 'data/world/critters/sheep/walk_nw_03.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_04.png' => 'data/world/critters/sheep/walk_nw_04.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_05.png' => 'data/world/critters/sheep/walk_nw_05.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_06.png' => 'data/world/critters/sheep/walk_nw_06.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_07.png' => 'data/world/critters/sheep/walk_nw_07.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_08.png' => 'data/world/critters/sheep/walk_nw_08.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_09.png' => 'data/world/critters/sheep/walk_nw_09.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_10.png' => 'data/world/critters/sheep/walk_nw_10.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_11.png' => 'data/world/critters/sheep/walk_nw_11.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_12.png' => 'data/world/critters/sheep/walk_nw_12.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_13.png' => 'data/world/critters/sheep/walk_nw_13.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_14.png' => 'data/world/critters/sheep/walk_nw_14.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_15.png' => 'data/world/critters/sheep/walk_nw_15.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_16.png' => 'data/world/critters/sheep/walk_nw_16.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_17.png' => 'data/world/critters/sheep/walk_nw_17.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_18.png' => 'data/world/critters/sheep/walk_nw_18.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_nw_19.png' => 'data/world/critters/sheep/walk_nw_19.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_00.png' => 'data/world/critters/sheep/walk_se_00.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_01.png' => 'data/world/critters/sheep/walk_se_01.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_02.png' => 'data/world/critters/sheep/walk_se_02.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_03.png' => 'data/world/critters/sheep/walk_se_03.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_04.png' => 'data/world/critters/sheep/walk_se_04.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_05.png' => 'data/world/critters/sheep/walk_se_05.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_06.png' => 'data/world/critters/sheep/walk_se_06.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_07.png' => 'data/world/critters/sheep/walk_se_07.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_08.png' => 'data/world/critters/sheep/walk_se_08.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_09.png' => 'data/world/critters/sheep/walk_se_09.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_10.png' => 'data/world/critters/sheep/walk_se_10.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_11.png' => 'data/world/critters/sheep/walk_se_11.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_12.png' => 'data/world/critters/sheep/walk_se_12.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_13.png' => 'data/world/critters/sheep/walk_se_13.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_14.png' => 'data/world/critters/sheep/walk_se_14.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_15.png' => 'data/world/critters/sheep/walk_se_15.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_16.png' => 'data/world/critters/sheep/walk_se_16.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_17.png' => 'data/world/critters/sheep/walk_se_17.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_18.png' => 'data/world/critters/sheep/walk_se_18.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_se_19.png' => 'data/world/critters/sheep/walk_se_19.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_00.png' => 'data/world/critters/sheep/walk_sw_00.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_01.png' => 'data/world/critters/sheep/walk_sw_01.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_02.png' => 'data/world/critters/sheep/walk_sw_02.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_03.png' => 'data/world/critters/sheep/walk_sw_03.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_04.png' => 'data/world/critters/sheep/walk_sw_04.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_05.png' => 'data/world/critters/sheep/walk_sw_05.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_06.png' => 'data/world/critters/sheep/walk_sw_06.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_07.png' => 'data/world/critters/sheep/walk_sw_07.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_08.png' => 'data/world/critters/sheep/walk_sw_08.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_09.png' => 'data/world/critters/sheep/walk_sw_09.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_10.png' => 'data/world/critters/sheep/walk_sw_10.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_11.png' => 'data/world/critters/sheep/walk_sw_11.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_12.png' => 'data/world/critters/sheep/walk_sw_12.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_13.png' => 'data/world/critters/sheep/walk_sw_13.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_14.png' => 'data/world/critters/sheep/walk_sw_14.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_15.png' => 'data/world/critters/sheep/walk_sw_15.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_16.png' => 'data/world/critters/sheep/walk_sw_16.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_17.png' => 'data/world/critters/sheep/walk_sw_17.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_18.png' => 'data/world/critters/sheep/walk_sw_18.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_sw_19.png' => 'data/world/critters/sheep/walk_sw_19.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_00.png' => 'data/world/critters/sheep/walk_w_00.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_01.png' => 'data/world/critters/sheep/walk_w_01.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_02.png' => 'data/world/critters/sheep/walk_w_02.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_03.png' => 'data/world/critters/sheep/walk_w_03.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_04.png' => 'data/world/critters/sheep/walk_w_04.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_05.png' => 'data/world/critters/sheep/walk_w_05.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_06.png' => 'data/world/critters/sheep/walk_w_06.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_07.png' => 'data/world/critters/sheep/walk_w_07.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_08.png' => 'data/world/critters/sheep/walk_w_08.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_09.png' => 'data/world/critters/sheep/walk_w_09.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_10.png' => 'data/world/critters/sheep/walk_w_10.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_11.png' => 'data/world/critters/sheep/walk_w_11.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_12.png' => 'data/world/critters/sheep/walk_w_12.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_13.png' => 'data/world/critters/sheep/walk_w_13.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_14.png' => 'data/world/critters/sheep/walk_w_14.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_15.png' => 'data/world/critters/sheep/walk_w_15.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_16.png' => 'data/world/critters/sheep/walk_w_16.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_17.png' => 'data/world/critters/sheep/walk_w_17.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_18.png' => 'data/world/critters/sheep/walk_w_18.png'
=== renamed file 'data/world/critters/sheep/sheep_walk_w_19.png' => 'data/world/critters/sheep/walk_w_19.png'
=== renamed file 'data/world/critters/stag/stag_idle_00.png' => 'data/world/critters/stag/idle_00.png'
=== renamed file 'data/world/critters/stag/stag_idle_01.png' => 'data/world/critters/stag/idle_01.png'
=== renamed file 'data/world/critters/stag/stag_idle_02.png' => 'data/world/critters/stag/idle_02.png'
=== renamed file 'data/world/critters/stag/stag_idle_03.png' => 'data/world/critters/stag/idle_03.png'
=== renamed file 'data/world/critters/stag/stag_idle_04.png' => 'data/world/critters/stag/idle_04.png'
=== renamed file 'data/world/critters/stag/stag_idle_05.png' => 'data/world/critters/stag/idle_05.png'
=== renamed file 'data/world/critters/stag/stag_idle_06.png' => 'data/world/critters/stag/idle_06.png'
=== renamed file 'data/world/critters/stag/stag_idle_07.png' => 'data/world/critters/stag/idle_07.png'
=== renamed file 'data/world/critters/stag/stag_idle_08.png' => 'data/world/critters/stag/idle_08.png'
=== renamed file 'data/world/critters/stag/stag_idle_09.png' => 'data/world/critters/stag/idle_09.png'
=== renamed file 'data/world/critters/stag/stag_idle_10.png' => 'data/world/critters/stag/idle_10.png'
=== renamed file 'data/world/critters/stag/stag_idle_11.png' => 'data/world/critters/stag/idle_11.png'
=== renamed file 'data/world/critters/stag/stag_idle_12.png' => 'data/world/critters/stag/idle_12.png'
=== renamed file 'data/world/critters/stag/stag_idle_13.png' => 'data/world/critters/stag/idle_13.png'
=== renamed file 'data/world/critters/stag/stag_idle_14.png' => 'data/world/critters/stag/idle_14.png'
=== renamed file 'data/world/critters/stag/stag_idle_15.png' => 'data/world/critters/stag/idle_15.png'
=== renamed file 'data/world/critters/stag/stag_idle_16.png' => 'data/world/critters/stag/idle_16.png'
=== renamed file 'data/world/critters/stag/stag_idle_17.png' => 'data/world/critters/stag/idle_17.png'
=== renamed file 'data/world/critters/stag/stag_idle_18.png' => 'data/world/critters/stag/idle_18.png'
=== renamed file 'data/world/critters/stag/stag_idle_19.png' => 'data/world/critters/stag/idle_19.png'
=== modified file 'data/world/critters/stag/init.lua'
--- data/world/critters/stag/init.lua	2016-06-14 10:49:53 +0000
+++ data/world/critters/stag/init.lua	2017-01-17 08:56:03 +0000
@@ -2,7 +2,7 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "stag_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       sound_effect = {
          -- Sound files with numbers starting for 10 are generating silence. Remove when we move the sound triggering to programs
          directory = "sound/animals",
@@ -12,11 +12,12 @@
       fps = 20,
    },
 }
-add_walking_animations(animations, dirname, "stag_walk", {25, 30}, 20)
+add_walking_animations(animations, dirname, "walk", {25, 30}, 20)
 
 world:new_critter_type{
    name = "stag",
    descname = _ "Stag",
+   editor_category = "critters_herbivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/stag/stag_walk_e_00.png' => 'data/world/critters/stag/walk_e_00.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_01.png' => 'data/world/critters/stag/walk_e_01.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_02.png' => 'data/world/critters/stag/walk_e_02.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_03.png' => 'data/world/critters/stag/walk_e_03.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_04.png' => 'data/world/critters/stag/walk_e_04.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_05.png' => 'data/world/critters/stag/walk_e_05.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_06.png' => 'data/world/critters/stag/walk_e_06.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_07.png' => 'data/world/critters/stag/walk_e_07.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_08.png' => 'data/world/critters/stag/walk_e_08.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_09.png' => 'data/world/critters/stag/walk_e_09.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_10.png' => 'data/world/critters/stag/walk_e_10.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_11.png' => 'data/world/critters/stag/walk_e_11.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_12.png' => 'data/world/critters/stag/walk_e_12.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_13.png' => 'data/world/critters/stag/walk_e_13.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_14.png' => 'data/world/critters/stag/walk_e_14.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_15.png' => 'data/world/critters/stag/walk_e_15.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_16.png' => 'data/world/critters/stag/walk_e_16.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_17.png' => 'data/world/critters/stag/walk_e_17.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_18.png' => 'data/world/critters/stag/walk_e_18.png'
=== renamed file 'data/world/critters/stag/stag_walk_e_19.png' => 'data/world/critters/stag/walk_e_19.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_00.png' => 'data/world/critters/stag/walk_ne_00.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_01.png' => 'data/world/critters/stag/walk_ne_01.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_02.png' => 'data/world/critters/stag/walk_ne_02.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_03.png' => 'data/world/critters/stag/walk_ne_03.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_04.png' => 'data/world/critters/stag/walk_ne_04.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_05.png' => 'data/world/critters/stag/walk_ne_05.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_06.png' => 'data/world/critters/stag/walk_ne_06.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_07.png' => 'data/world/critters/stag/walk_ne_07.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_08.png' => 'data/world/critters/stag/walk_ne_08.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_09.png' => 'data/world/critters/stag/walk_ne_09.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_10.png' => 'data/world/critters/stag/walk_ne_10.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_11.png' => 'data/world/critters/stag/walk_ne_11.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_12.png' => 'data/world/critters/stag/walk_ne_12.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_13.png' => 'data/world/critters/stag/walk_ne_13.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_14.png' => 'data/world/critters/stag/walk_ne_14.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_15.png' => 'data/world/critters/stag/walk_ne_15.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_16.png' => 'data/world/critters/stag/walk_ne_16.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_17.png' => 'data/world/critters/stag/walk_ne_17.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_18.png' => 'data/world/critters/stag/walk_ne_18.png'
=== renamed file 'data/world/critters/stag/stag_walk_ne_19.png' => 'data/world/critters/stag/walk_ne_19.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_00.png' => 'data/world/critters/stag/walk_nw_00.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_01.png' => 'data/world/critters/stag/walk_nw_01.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_02.png' => 'data/world/critters/stag/walk_nw_02.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_03.png' => 'data/world/critters/stag/walk_nw_03.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_04.png' => 'data/world/critters/stag/walk_nw_04.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_05.png' => 'data/world/critters/stag/walk_nw_05.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_06.png' => 'data/world/critters/stag/walk_nw_06.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_07.png' => 'data/world/critters/stag/walk_nw_07.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_08.png' => 'data/world/critters/stag/walk_nw_08.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_09.png' => 'data/world/critters/stag/walk_nw_09.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_10.png' => 'data/world/critters/stag/walk_nw_10.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_11.png' => 'data/world/critters/stag/walk_nw_11.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_12.png' => 'data/world/critters/stag/walk_nw_12.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_13.png' => 'data/world/critters/stag/walk_nw_13.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_14.png' => 'data/world/critters/stag/walk_nw_14.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_15.png' => 'data/world/critters/stag/walk_nw_15.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_16.png' => 'data/world/critters/stag/walk_nw_16.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_17.png' => 'data/world/critters/stag/walk_nw_17.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_18.png' => 'data/world/critters/stag/walk_nw_18.png'
=== renamed file 'data/world/critters/stag/stag_walk_nw_19.png' => 'data/world/critters/stag/walk_nw_19.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_00.png' => 'data/world/critters/stag/walk_se_00.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_01.png' => 'data/world/critters/stag/walk_se_01.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_02.png' => 'data/world/critters/stag/walk_se_02.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_03.png' => 'data/world/critters/stag/walk_se_03.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_04.png' => 'data/world/critters/stag/walk_se_04.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_05.png' => 'data/world/critters/stag/walk_se_05.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_06.png' => 'data/world/critters/stag/walk_se_06.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_07.png' => 'data/world/critters/stag/walk_se_07.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_08.png' => 'data/world/critters/stag/walk_se_08.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_09.png' => 'data/world/critters/stag/walk_se_09.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_10.png' => 'data/world/critters/stag/walk_se_10.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_11.png' => 'data/world/critters/stag/walk_se_11.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_12.png' => 'data/world/critters/stag/walk_se_12.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_13.png' => 'data/world/critters/stag/walk_se_13.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_14.png' => 'data/world/critters/stag/walk_se_14.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_15.png' => 'data/world/critters/stag/walk_se_15.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_16.png' => 'data/world/critters/stag/walk_se_16.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_17.png' => 'data/world/critters/stag/walk_se_17.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_18.png' => 'data/world/critters/stag/walk_se_18.png'
=== renamed file 'data/world/critters/stag/stag_walk_se_19.png' => 'data/world/critters/stag/walk_se_19.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_00.png' => 'data/world/critters/stag/walk_sw_00.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_01.png' => 'data/world/critters/stag/walk_sw_01.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_02.png' => 'data/world/critters/stag/walk_sw_02.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_03.png' => 'data/world/critters/stag/walk_sw_03.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_04.png' => 'data/world/critters/stag/walk_sw_04.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_05.png' => 'data/world/critters/stag/walk_sw_05.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_06.png' => 'data/world/critters/stag/walk_sw_06.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_07.png' => 'data/world/critters/stag/walk_sw_07.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_08.png' => 'data/world/critters/stag/walk_sw_08.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_09.png' => 'data/world/critters/stag/walk_sw_09.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_10.png' => 'data/world/critters/stag/walk_sw_10.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_11.png' => 'data/world/critters/stag/walk_sw_11.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_12.png' => 'data/world/critters/stag/walk_sw_12.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_13.png' => 'data/world/critters/stag/walk_sw_13.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_14.png' => 'data/world/critters/stag/walk_sw_14.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_15.png' => 'data/world/critters/stag/walk_sw_15.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_16.png' => 'data/world/critters/stag/walk_sw_16.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_17.png' => 'data/world/critters/stag/walk_sw_17.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_18.png' => 'data/world/critters/stag/walk_sw_18.png'
=== renamed file 'data/world/critters/stag/stag_walk_sw_19.png' => 'data/world/critters/stag/walk_sw_19.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_00.png' => 'data/world/critters/stag/walk_w_00.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_01.png' => 'data/world/critters/stag/walk_w_01.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_02.png' => 'data/world/critters/stag/walk_w_02.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_03.png' => 'data/world/critters/stag/walk_w_03.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_04.png' => 'data/world/critters/stag/walk_w_04.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_05.png' => 'data/world/critters/stag/walk_w_05.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_06.png' => 'data/world/critters/stag/walk_w_06.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_07.png' => 'data/world/critters/stag/walk_w_07.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_08.png' => 'data/world/critters/stag/walk_w_08.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_09.png' => 'data/world/critters/stag/walk_w_09.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_10.png' => 'data/world/critters/stag/walk_w_10.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_11.png' => 'data/world/critters/stag/walk_w_11.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_12.png' => 'data/world/critters/stag/walk_w_12.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_13.png' => 'data/world/critters/stag/walk_w_13.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_14.png' => 'data/world/critters/stag/walk_w_14.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_15.png' => 'data/world/critters/stag/walk_w_15.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_16.png' => 'data/world/critters/stag/walk_w_16.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_17.png' => 'data/world/critters/stag/walk_w_17.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_18.png' => 'data/world/critters/stag/walk_w_18.png'
=== renamed file 'data/world/critters/stag/stag_walk_w_19.png' => 'data/world/critters/stag/walk_w_19.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_00.png' => 'data/world/critters/wildboar/idle_00.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_01.png' => 'data/world/critters/wildboar/idle_01.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_02.png' => 'data/world/critters/wildboar/idle_02.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_03.png' => 'data/world/critters/wildboar/idle_03.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_04.png' => 'data/world/critters/wildboar/idle_04.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_05.png' => 'data/world/critters/wildboar/idle_05.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_06.png' => 'data/world/critters/wildboar/idle_06.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_07.png' => 'data/world/critters/wildboar/idle_07.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_08.png' => 'data/world/critters/wildboar/idle_08.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_09.png' => 'data/world/critters/wildboar/idle_09.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_10.png' => 'data/world/critters/wildboar/idle_10.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_11.png' => 'data/world/critters/wildboar/idle_11.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_12.png' => 'data/world/critters/wildboar/idle_12.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_13.png' => 'data/world/critters/wildboar/idle_13.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_14.png' => 'data/world/critters/wildboar/idle_14.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_15.png' => 'data/world/critters/wildboar/idle_15.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_16.png' => 'data/world/critters/wildboar/idle_16.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_17.png' => 'data/world/critters/wildboar/idle_17.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_18.png' => 'data/world/critters/wildboar/idle_18.png'
=== renamed file 'data/world/critters/wildboar/wildboar_idle_19.png' => 'data/world/critters/wildboar/idle_19.png'
=== modified file 'data/world/critters/wildboar/init.lua'
--- data/world/critters/wildboar/init.lua	2016-06-09 07:03:20 +0000
+++ data/world/critters/wildboar/init.lua	2017-01-17 08:56:03 +0000
@@ -2,7 +2,7 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "wildboar_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       hotspot = { 10, 18 },
       fps = 20,
       sound_effect = {
@@ -11,11 +11,12 @@
       },
    },
 }
-add_walking_animations(animations, dirname, "wildboar_walk", {20, 22}, 20)
+add_walking_animations(animations, dirname, "walk", {20, 22}, 20)
 
 world:new_critter_type{
    name = "wildboar",
    descname = _ "Wild boar",
+   editor_category = "critters_herbivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_00.png' => 'data/world/critters/wildboar/walk_e_00.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_01.png' => 'data/world/critters/wildboar/walk_e_01.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_02.png' => 'data/world/critters/wildboar/walk_e_02.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_03.png' => 'data/world/critters/wildboar/walk_e_03.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_04.png' => 'data/world/critters/wildboar/walk_e_04.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_05.png' => 'data/world/critters/wildboar/walk_e_05.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_06.png' => 'data/world/critters/wildboar/walk_e_06.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_07.png' => 'data/world/critters/wildboar/walk_e_07.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_08.png' => 'data/world/critters/wildboar/walk_e_08.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_09.png' => 'data/world/critters/wildboar/walk_e_09.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_10.png' => 'data/world/critters/wildboar/walk_e_10.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_11.png' => 'data/world/critters/wildboar/walk_e_11.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_12.png' => 'data/world/critters/wildboar/walk_e_12.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_13.png' => 'data/world/critters/wildboar/walk_e_13.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_14.png' => 'data/world/critters/wildboar/walk_e_14.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_15.png' => 'data/world/critters/wildboar/walk_e_15.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_16.png' => 'data/world/critters/wildboar/walk_e_16.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_17.png' => 'data/world/critters/wildboar/walk_e_17.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_18.png' => 'data/world/critters/wildboar/walk_e_18.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_e_19.png' => 'data/world/critters/wildboar/walk_e_19.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_00.png' => 'data/world/critters/wildboar/walk_ne_00.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_01.png' => 'data/world/critters/wildboar/walk_ne_01.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_02.png' => 'data/world/critters/wildboar/walk_ne_02.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_03.png' => 'data/world/critters/wildboar/walk_ne_03.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_04.png' => 'data/world/critters/wildboar/walk_ne_04.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_05.png' => 'data/world/critters/wildboar/walk_ne_05.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_06.png' => 'data/world/critters/wildboar/walk_ne_06.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_07.png' => 'data/world/critters/wildboar/walk_ne_07.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_08.png' => 'data/world/critters/wildboar/walk_ne_08.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_09.png' => 'data/world/critters/wildboar/walk_ne_09.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_10.png' => 'data/world/critters/wildboar/walk_ne_10.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_11.png' => 'data/world/critters/wildboar/walk_ne_11.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_12.png' => 'data/world/critters/wildboar/walk_ne_12.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_13.png' => 'data/world/critters/wildboar/walk_ne_13.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_14.png' => 'data/world/critters/wildboar/walk_ne_14.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_15.png' => 'data/world/critters/wildboar/walk_ne_15.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_16.png' => 'data/world/critters/wildboar/walk_ne_16.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_17.png' => 'data/world/critters/wildboar/walk_ne_17.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_18.png' => 'data/world/critters/wildboar/walk_ne_18.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_ne_19.png' => 'data/world/critters/wildboar/walk_ne_19.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_00.png' => 'data/world/critters/wildboar/walk_nw_00.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_01.png' => 'data/world/critters/wildboar/walk_nw_01.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_02.png' => 'data/world/critters/wildboar/walk_nw_02.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_03.png' => 'data/world/critters/wildboar/walk_nw_03.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_04.png' => 'data/world/critters/wildboar/walk_nw_04.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_05.png' => 'data/world/critters/wildboar/walk_nw_05.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_06.png' => 'data/world/critters/wildboar/walk_nw_06.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_07.png' => 'data/world/critters/wildboar/walk_nw_07.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_08.png' => 'data/world/critters/wildboar/walk_nw_08.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_09.png' => 'data/world/critters/wildboar/walk_nw_09.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_10.png' => 'data/world/critters/wildboar/walk_nw_10.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_11.png' => 'data/world/critters/wildboar/walk_nw_11.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_12.png' => 'data/world/critters/wildboar/walk_nw_12.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_13.png' => 'data/world/critters/wildboar/walk_nw_13.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_14.png' => 'data/world/critters/wildboar/walk_nw_14.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_15.png' => 'data/world/critters/wildboar/walk_nw_15.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_16.png' => 'data/world/critters/wildboar/walk_nw_16.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_17.png' => 'data/world/critters/wildboar/walk_nw_17.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_18.png' => 'data/world/critters/wildboar/walk_nw_18.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_nw_19.png' => 'data/world/critters/wildboar/walk_nw_19.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_00.png' => 'data/world/critters/wildboar/walk_se_00.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_01.png' => 'data/world/critters/wildboar/walk_se_01.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_02.png' => 'data/world/critters/wildboar/walk_se_02.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_03.png' => 'data/world/critters/wildboar/walk_se_03.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_04.png' => 'data/world/critters/wildboar/walk_se_04.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_05.png' => 'data/world/critters/wildboar/walk_se_05.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_06.png' => 'data/world/critters/wildboar/walk_se_06.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_07.png' => 'data/world/critters/wildboar/walk_se_07.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_08.png' => 'data/world/critters/wildboar/walk_se_08.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_09.png' => 'data/world/critters/wildboar/walk_se_09.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_10.png' => 'data/world/critters/wildboar/walk_se_10.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_11.png' => 'data/world/critters/wildboar/walk_se_11.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_12.png' => 'data/world/critters/wildboar/walk_se_12.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_13.png' => 'data/world/critters/wildboar/walk_se_13.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_14.png' => 'data/world/critters/wildboar/walk_se_14.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_15.png' => 'data/world/critters/wildboar/walk_se_15.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_16.png' => 'data/world/critters/wildboar/walk_se_16.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_17.png' => 'data/world/critters/wildboar/walk_se_17.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_18.png' => 'data/world/critters/wildboar/walk_se_18.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_se_19.png' => 'data/world/critters/wildboar/walk_se_19.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_00.png' => 'data/world/critters/wildboar/walk_sw_00.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_01.png' => 'data/world/critters/wildboar/walk_sw_01.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_02.png' => 'data/world/critters/wildboar/walk_sw_02.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_03.png' => 'data/world/critters/wildboar/walk_sw_03.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_04.png' => 'data/world/critters/wildboar/walk_sw_04.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_05.png' => 'data/world/critters/wildboar/walk_sw_05.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_06.png' => 'data/world/critters/wildboar/walk_sw_06.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_07.png' => 'data/world/critters/wildboar/walk_sw_07.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_08.png' => 'data/world/critters/wildboar/walk_sw_08.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_09.png' => 'data/world/critters/wildboar/walk_sw_09.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_10.png' => 'data/world/critters/wildboar/walk_sw_10.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_11.png' => 'data/world/critters/wildboar/walk_sw_11.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_12.png' => 'data/world/critters/wildboar/walk_sw_12.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_13.png' => 'data/world/critters/wildboar/walk_sw_13.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_14.png' => 'data/world/critters/wildboar/walk_sw_14.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_15.png' => 'data/world/critters/wildboar/walk_sw_15.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_16.png' => 'data/world/critters/wildboar/walk_sw_16.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_17.png' => 'data/world/critters/wildboar/walk_sw_17.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_18.png' => 'data/world/critters/wildboar/walk_sw_18.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_sw_19.png' => 'data/world/critters/wildboar/walk_sw_19.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_00.png' => 'data/world/critters/wildboar/walk_w_00.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_01.png' => 'data/world/critters/wildboar/walk_w_01.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_02.png' => 'data/world/critters/wildboar/walk_w_02.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_03.png' => 'data/world/critters/wildboar/walk_w_03.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_04.png' => 'data/world/critters/wildboar/walk_w_04.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_05.png' => 'data/world/critters/wildboar/walk_w_05.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_06.png' => 'data/world/critters/wildboar/walk_w_06.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_07.png' => 'data/world/critters/wildboar/walk_w_07.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_08.png' => 'data/world/critters/wildboar/walk_w_08.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_09.png' => 'data/world/critters/wildboar/walk_w_09.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_10.png' => 'data/world/critters/wildboar/walk_w_10.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_11.png' => 'data/world/critters/wildboar/walk_w_11.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_12.png' => 'data/world/critters/wildboar/walk_w_12.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_13.png' => 'data/world/critters/wildboar/walk_w_13.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_14.png' => 'data/world/critters/wildboar/walk_w_14.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_15.png' => 'data/world/critters/wildboar/walk_w_15.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_16.png' => 'data/world/critters/wildboar/walk_w_16.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_17.png' => 'data/world/critters/wildboar/walk_w_17.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_18.png' => 'data/world/critters/wildboar/walk_w_18.png'
=== renamed file 'data/world/critters/wildboar/wildboar_walk_w_19.png' => 'data/world/critters/wildboar/walk_w_19.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_00.png' => 'data/world/critters/wisent/idle_00.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_01.png' => 'data/world/critters/wisent/idle_01.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_02.png' => 'data/world/critters/wisent/idle_02.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_03.png' => 'data/world/critters/wisent/idle_03.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_04.png' => 'data/world/critters/wisent/idle_04.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_05.png' => 'data/world/critters/wisent/idle_05.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_06.png' => 'data/world/critters/wisent/idle_06.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_07.png' => 'data/world/critters/wisent/idle_07.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_08.png' => 'data/world/critters/wisent/idle_08.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_09.png' => 'data/world/critters/wisent/idle_09.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_10.png' => 'data/world/critters/wisent/idle_10.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_11.png' => 'data/world/critters/wisent/idle_11.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_12.png' => 'data/world/critters/wisent/idle_12.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_13.png' => 'data/world/critters/wisent/idle_13.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_14.png' => 'data/world/critters/wisent/idle_14.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_15.png' => 'data/world/critters/wisent/idle_15.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_16.png' => 'data/world/critters/wisent/idle_16.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_17.png' => 'data/world/critters/wisent/idle_17.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_18.png' => 'data/world/critters/wisent/idle_18.png'
=== renamed file 'data/world/critters/wisent/wisent_idle_19.png' => 'data/world/critters/wisent/idle_19.png'
=== modified file 'data/world/critters/wisent/init.lua'
--- data/world/critters/wisent/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/critters/wisent/init.lua	2017-01-17 08:56:03 +0000
@@ -2,16 +2,17 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "wisent_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       hotspot = { 14, 27 },
       fps = 20,
    },
 }
-add_walking_animations(animations, dirname, "wisent_walk", {24, 32}, 20)
+add_walking_animations(animations, dirname, "walk", {24, 32}, 20)
 
 world:new_critter_type{
    name = "wisent",
    descname = _ "Wisent",
+   editor_category = "critters_herbivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/wisent/wisent_walk_e_00.png' => 'data/world/critters/wisent/walk_e_00.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_01.png' => 'data/world/critters/wisent/walk_e_01.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_02.png' => 'data/world/critters/wisent/walk_e_02.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_03.png' => 'data/world/critters/wisent/walk_e_03.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_04.png' => 'data/world/critters/wisent/walk_e_04.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_05.png' => 'data/world/critters/wisent/walk_e_05.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_06.png' => 'data/world/critters/wisent/walk_e_06.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_07.png' => 'data/world/critters/wisent/walk_e_07.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_08.png' => 'data/world/critters/wisent/walk_e_08.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_09.png' => 'data/world/critters/wisent/walk_e_09.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_10.png' => 'data/world/critters/wisent/walk_e_10.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_11.png' => 'data/world/critters/wisent/walk_e_11.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_12.png' => 'data/world/critters/wisent/walk_e_12.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_13.png' => 'data/world/critters/wisent/walk_e_13.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_14.png' => 'data/world/critters/wisent/walk_e_14.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_15.png' => 'data/world/critters/wisent/walk_e_15.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_16.png' => 'data/world/critters/wisent/walk_e_16.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_17.png' => 'data/world/critters/wisent/walk_e_17.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_18.png' => 'data/world/critters/wisent/walk_e_18.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_e_19.png' => 'data/world/critters/wisent/walk_e_19.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_00.png' => 'data/world/critters/wisent/walk_ne_00.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_01.png' => 'data/world/critters/wisent/walk_ne_01.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_02.png' => 'data/world/critters/wisent/walk_ne_02.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_03.png' => 'data/world/critters/wisent/walk_ne_03.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_04.png' => 'data/world/critters/wisent/walk_ne_04.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_05.png' => 'data/world/critters/wisent/walk_ne_05.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_06.png' => 'data/world/critters/wisent/walk_ne_06.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_07.png' => 'data/world/critters/wisent/walk_ne_07.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_08.png' => 'data/world/critters/wisent/walk_ne_08.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_09.png' => 'data/world/critters/wisent/walk_ne_09.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_10.png' => 'data/world/critters/wisent/walk_ne_10.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_11.png' => 'data/world/critters/wisent/walk_ne_11.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_12.png' => 'data/world/critters/wisent/walk_ne_12.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_13.png' => 'data/world/critters/wisent/walk_ne_13.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_14.png' => 'data/world/critters/wisent/walk_ne_14.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_15.png' => 'data/world/critters/wisent/walk_ne_15.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_16.png' => 'data/world/critters/wisent/walk_ne_16.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_17.png' => 'data/world/critters/wisent/walk_ne_17.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_18.png' => 'data/world/critters/wisent/walk_ne_18.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_ne_19.png' => 'data/world/critters/wisent/walk_ne_19.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_00.png' => 'data/world/critters/wisent/walk_nw_00.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_01.png' => 'data/world/critters/wisent/walk_nw_01.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_02.png' => 'data/world/critters/wisent/walk_nw_02.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_03.png' => 'data/world/critters/wisent/walk_nw_03.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_04.png' => 'data/world/critters/wisent/walk_nw_04.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_05.png' => 'data/world/critters/wisent/walk_nw_05.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_06.png' => 'data/world/critters/wisent/walk_nw_06.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_07.png' => 'data/world/critters/wisent/walk_nw_07.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_08.png' => 'data/world/critters/wisent/walk_nw_08.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_09.png' => 'data/world/critters/wisent/walk_nw_09.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_10.png' => 'data/world/critters/wisent/walk_nw_10.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_11.png' => 'data/world/critters/wisent/walk_nw_11.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_12.png' => 'data/world/critters/wisent/walk_nw_12.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_13.png' => 'data/world/critters/wisent/walk_nw_13.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_14.png' => 'data/world/critters/wisent/walk_nw_14.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_15.png' => 'data/world/critters/wisent/walk_nw_15.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_16.png' => 'data/world/critters/wisent/walk_nw_16.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_17.png' => 'data/world/critters/wisent/walk_nw_17.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_18.png' => 'data/world/critters/wisent/walk_nw_18.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_nw_19.png' => 'data/world/critters/wisent/walk_nw_19.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_00.png' => 'data/world/critters/wisent/walk_se_00.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_01.png' => 'data/world/critters/wisent/walk_se_01.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_02.png' => 'data/world/critters/wisent/walk_se_02.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_03.png' => 'data/world/critters/wisent/walk_se_03.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_04.png' => 'data/world/critters/wisent/walk_se_04.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_05.png' => 'data/world/critters/wisent/walk_se_05.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_06.png' => 'data/world/critters/wisent/walk_se_06.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_07.png' => 'data/world/critters/wisent/walk_se_07.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_08.png' => 'data/world/critters/wisent/walk_se_08.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_09.png' => 'data/world/critters/wisent/walk_se_09.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_10.png' => 'data/world/critters/wisent/walk_se_10.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_11.png' => 'data/world/critters/wisent/walk_se_11.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_12.png' => 'data/world/critters/wisent/walk_se_12.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_13.png' => 'data/world/critters/wisent/walk_se_13.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_14.png' => 'data/world/critters/wisent/walk_se_14.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_15.png' => 'data/world/critters/wisent/walk_se_15.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_16.png' => 'data/world/critters/wisent/walk_se_16.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_17.png' => 'data/world/critters/wisent/walk_se_17.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_18.png' => 'data/world/critters/wisent/walk_se_18.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_se_19.png' => 'data/world/critters/wisent/walk_se_19.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_00.png' => 'data/world/critters/wisent/walk_sw_00.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_01.png' => 'data/world/critters/wisent/walk_sw_01.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_02.png' => 'data/world/critters/wisent/walk_sw_02.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_03.png' => 'data/world/critters/wisent/walk_sw_03.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_04.png' => 'data/world/critters/wisent/walk_sw_04.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_05.png' => 'data/world/critters/wisent/walk_sw_05.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_06.png' => 'data/world/critters/wisent/walk_sw_06.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_07.png' => 'data/world/critters/wisent/walk_sw_07.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_08.png' => 'data/world/critters/wisent/walk_sw_08.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_09.png' => 'data/world/critters/wisent/walk_sw_09.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_10.png' => 'data/world/critters/wisent/walk_sw_10.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_11.png' => 'data/world/critters/wisent/walk_sw_11.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_12.png' => 'data/world/critters/wisent/walk_sw_12.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_13.png' => 'data/world/critters/wisent/walk_sw_13.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_14.png' => 'data/world/critters/wisent/walk_sw_14.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_15.png' => 'data/world/critters/wisent/walk_sw_15.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_16.png' => 'data/world/critters/wisent/walk_sw_16.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_17.png' => 'data/world/critters/wisent/walk_sw_17.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_18.png' => 'data/world/critters/wisent/walk_sw_18.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_sw_19.png' => 'data/world/critters/wisent/walk_sw_19.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_00.png' => 'data/world/critters/wisent/walk_w_00.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_01.png' => 'data/world/critters/wisent/walk_w_01.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_02.png' => 'data/world/critters/wisent/walk_w_02.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_03.png' => 'data/world/critters/wisent/walk_w_03.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_04.png' => 'data/world/critters/wisent/walk_w_04.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_05.png' => 'data/world/critters/wisent/walk_w_05.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_06.png' => 'data/world/critters/wisent/walk_w_06.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_07.png' => 'data/world/critters/wisent/walk_w_07.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_08.png' => 'data/world/critters/wisent/walk_w_08.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_09.png' => 'data/world/critters/wisent/walk_w_09.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_10.png' => 'data/world/critters/wisent/walk_w_10.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_11.png' => 'data/world/critters/wisent/walk_w_11.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_12.png' => 'data/world/critters/wisent/walk_w_12.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_13.png' => 'data/world/critters/wisent/walk_w_13.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_14.png' => 'data/world/critters/wisent/walk_w_14.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_15.png' => 'data/world/critters/wisent/walk_w_15.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_16.png' => 'data/world/critters/wisent/walk_w_16.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_17.png' => 'data/world/critters/wisent/walk_w_17.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_18.png' => 'data/world/critters/wisent/walk_w_18.png'
=== renamed file 'data/world/critters/wisent/wisent_walk_w_19.png' => 'data/world/critters/wisent/walk_w_19.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_00.png' => 'data/world/critters/wolf/idle_00.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_01.png' => 'data/world/critters/wolf/idle_01.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_02.png' => 'data/world/critters/wolf/idle_02.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_03.png' => 'data/world/critters/wolf/idle_03.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_04.png' => 'data/world/critters/wolf/idle_04.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_05.png' => 'data/world/critters/wolf/idle_05.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_06.png' => 'data/world/critters/wolf/idle_06.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_07.png' => 'data/world/critters/wolf/idle_07.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_08.png' => 'data/world/critters/wolf/idle_08.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_09.png' => 'data/world/critters/wolf/idle_09.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_10.png' => 'data/world/critters/wolf/idle_10.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_11.png' => 'data/world/critters/wolf/idle_11.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_12.png' => 'data/world/critters/wolf/idle_12.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_13.png' => 'data/world/critters/wolf/idle_13.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_14.png' => 'data/world/critters/wolf/idle_14.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_15.png' => 'data/world/critters/wolf/idle_15.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_16.png' => 'data/world/critters/wolf/idle_16.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_17.png' => 'data/world/critters/wolf/idle_17.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_18.png' => 'data/world/critters/wolf/idle_18.png'
=== renamed file 'data/world/critters/wolf/wolf_idle_19.png' => 'data/world/critters/wolf/idle_19.png'
=== modified file 'data/world/critters/wolf/init.lua'
--- data/world/critters/wolf/init.lua	2016-06-14 10:49:53 +0000
+++ data/world/critters/wolf/init.lua	2017-01-17 08:56:03 +0000
@@ -2,7 +2,7 @@
 
 animations = {
    idle = {
-      pictures = path.list_files(dirname .. "wolf_idle_??.png"),
+      pictures = path.list_files(dirname .. "idle_??.png"),
       hotspot = { 8, 15 },
       fps = 10,
       sound_effect = {
@@ -12,11 +12,12 @@
       },
    },
 }
-add_walking_animations(animations, dirname, "wolf_walk", {19, 19}, 20)
+add_walking_animations(animations, dirname, "walk", {19, 19}, 20)
 
 world:new_critter_type{
    name = "wolf",
    descname = _ "Wolf",
+   editor_category = "critters_carnivores",
    attributes = { "eatable" },
    programs = {
       remove = { "remove" },

=== renamed file 'data/world/critters/wolf/wolf_walk_e_00.png' => 'data/world/critters/wolf/walk_e_00.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_01.png' => 'data/world/critters/wolf/walk_e_01.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_02.png' => 'data/world/critters/wolf/walk_e_02.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_03.png' => 'data/world/critters/wolf/walk_e_03.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_04.png' => 'data/world/critters/wolf/walk_e_04.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_05.png' => 'data/world/critters/wolf/walk_e_05.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_06.png' => 'data/world/critters/wolf/walk_e_06.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_07.png' => 'data/world/critters/wolf/walk_e_07.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_08.png' => 'data/world/critters/wolf/walk_e_08.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_09.png' => 'data/world/critters/wolf/walk_e_09.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_10.png' => 'data/world/critters/wolf/walk_e_10.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_11.png' => 'data/world/critters/wolf/walk_e_11.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_12.png' => 'data/world/critters/wolf/walk_e_12.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_13.png' => 'data/world/critters/wolf/walk_e_13.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_14.png' => 'data/world/critters/wolf/walk_e_14.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_15.png' => 'data/world/critters/wolf/walk_e_15.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_16.png' => 'data/world/critters/wolf/walk_e_16.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_17.png' => 'data/world/critters/wolf/walk_e_17.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_18.png' => 'data/world/critters/wolf/walk_e_18.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_e_19.png' => 'data/world/critters/wolf/walk_e_19.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_00.png' => 'data/world/critters/wolf/walk_ne_00.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_01.png' => 'data/world/critters/wolf/walk_ne_01.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_02.png' => 'data/world/critters/wolf/walk_ne_02.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_03.png' => 'data/world/critters/wolf/walk_ne_03.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_04.png' => 'data/world/critters/wolf/walk_ne_04.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_05.png' => 'data/world/critters/wolf/walk_ne_05.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_06.png' => 'data/world/critters/wolf/walk_ne_06.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_07.png' => 'data/world/critters/wolf/walk_ne_07.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_08.png' => 'data/world/critters/wolf/walk_ne_08.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_09.png' => 'data/world/critters/wolf/walk_ne_09.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_10.png' => 'data/world/critters/wolf/walk_ne_10.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_11.png' => 'data/world/critters/wolf/walk_ne_11.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_12.png' => 'data/world/critters/wolf/walk_ne_12.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_13.png' => 'data/world/critters/wolf/walk_ne_13.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_14.png' => 'data/world/critters/wolf/walk_ne_14.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_15.png' => 'data/world/critters/wolf/walk_ne_15.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_16.png' => 'data/world/critters/wolf/walk_ne_16.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_17.png' => 'data/world/critters/wolf/walk_ne_17.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_18.png' => 'data/world/critters/wolf/walk_ne_18.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_ne_19.png' => 'data/world/critters/wolf/walk_ne_19.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_00.png' => 'data/world/critters/wolf/walk_nw_00.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_01.png' => 'data/world/critters/wolf/walk_nw_01.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_02.png' => 'data/world/critters/wolf/walk_nw_02.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_03.png' => 'data/world/critters/wolf/walk_nw_03.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_04.png' => 'data/world/critters/wolf/walk_nw_04.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_05.png' => 'data/world/critters/wolf/walk_nw_05.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_06.png' => 'data/world/critters/wolf/walk_nw_06.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_07.png' => 'data/world/critters/wolf/walk_nw_07.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_08.png' => 'data/world/critters/wolf/walk_nw_08.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_09.png' => 'data/world/critters/wolf/walk_nw_09.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_10.png' => 'data/world/critters/wolf/walk_nw_10.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_11.png' => 'data/world/critters/wolf/walk_nw_11.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_12.png' => 'data/world/critters/wolf/walk_nw_12.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_13.png' => 'data/world/critters/wolf/walk_nw_13.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_14.png' => 'data/world/critters/wolf/walk_nw_14.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_15.png' => 'data/world/critters/wolf/walk_nw_15.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_16.png' => 'data/world/critters/wolf/walk_nw_16.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_17.png' => 'data/world/critters/wolf/walk_nw_17.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_18.png' => 'data/world/critters/wolf/walk_nw_18.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_nw_19.png' => 'data/world/critters/wolf/walk_nw_19.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_00.png' => 'data/world/critters/wolf/walk_se_00.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_01.png' => 'data/world/critters/wolf/walk_se_01.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_02.png' => 'data/world/critters/wolf/walk_se_02.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_03.png' => 'data/world/critters/wolf/walk_se_03.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_04.png' => 'data/world/critters/wolf/walk_se_04.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_05.png' => 'data/world/critters/wolf/walk_se_05.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_06.png' => 'data/world/critters/wolf/walk_se_06.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_07.png' => 'data/world/critters/wolf/walk_se_07.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_08.png' => 'data/world/critters/wolf/walk_se_08.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_09.png' => 'data/world/critters/wolf/walk_se_09.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_10.png' => 'data/world/critters/wolf/walk_se_10.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_11.png' => 'data/world/critters/wolf/walk_se_11.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_12.png' => 'data/world/critters/wolf/walk_se_12.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_13.png' => 'data/world/critters/wolf/walk_se_13.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_14.png' => 'data/world/critters/wolf/walk_se_14.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_15.png' => 'data/world/critters/wolf/walk_se_15.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_16.png' => 'data/world/critters/wolf/walk_se_16.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_17.png' => 'data/world/critters/wolf/walk_se_17.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_18.png' => 'data/world/critters/wolf/walk_se_18.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_se_19.png' => 'data/world/critters/wolf/walk_se_19.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_00.png' => 'data/world/critters/wolf/walk_sw_00.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_01.png' => 'data/world/critters/wolf/walk_sw_01.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_02.png' => 'data/world/critters/wolf/walk_sw_02.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_03.png' => 'data/world/critters/wolf/walk_sw_03.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_04.png' => 'data/world/critters/wolf/walk_sw_04.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_05.png' => 'data/world/critters/wolf/walk_sw_05.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_06.png' => 'data/world/critters/wolf/walk_sw_06.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_07.png' => 'data/world/critters/wolf/walk_sw_07.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_08.png' => 'data/world/critters/wolf/walk_sw_08.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_09.png' => 'data/world/critters/wolf/walk_sw_09.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_10.png' => 'data/world/critters/wolf/walk_sw_10.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_11.png' => 'data/world/critters/wolf/walk_sw_11.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_12.png' => 'data/world/critters/wolf/walk_sw_12.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_13.png' => 'data/world/critters/wolf/walk_sw_13.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_14.png' => 'data/world/critters/wolf/walk_sw_14.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_15.png' => 'data/world/critters/wolf/walk_sw_15.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_16.png' => 'data/world/critters/wolf/walk_sw_16.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_17.png' => 'data/world/critters/wolf/walk_sw_17.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_18.png' => 'data/world/critters/wolf/walk_sw_18.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_sw_19.png' => 'data/world/critters/wolf/walk_sw_19.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_00.png' => 'data/world/critters/wolf/walk_w_00.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_01.png' => 'data/world/critters/wolf/walk_w_01.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_02.png' => 'data/world/critters/wolf/walk_w_02.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_03.png' => 'data/world/critters/wolf/walk_w_03.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_04.png' => 'data/world/critters/wolf/walk_w_04.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_05.png' => 'data/world/critters/wolf/walk_w_05.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_06.png' => 'data/world/critters/wolf/walk_w_06.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_07.png' => 'data/world/critters/wolf/walk_w_07.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_08.png' => 'data/world/critters/wolf/walk_w_08.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_09.png' => 'data/world/critters/wolf/walk_w_09.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_10.png' => 'data/world/critters/wolf/walk_w_10.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_11.png' => 'data/world/critters/wolf/walk_w_11.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_12.png' => 'data/world/critters/wolf/walk_w_12.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_13.png' => 'data/world/critters/wolf/walk_w_13.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_14.png' => 'data/world/critters/wolf/walk_w_14.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_15.png' => 'data/world/critters/wolf/walk_w_15.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_16.png' => 'data/world/critters/wolf/walk_w_16.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_17.png' => 'data/world/critters/wolf/walk_w_17.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_18.png' => 'data/world/critters/wolf/walk_w_18.png'
=== renamed file 'data/world/critters/wolf/wolf_walk_w_19.png' => 'data/world/critters/wolf/walk_w_19.png'
=== modified file 'data/world/immovables/ruin3/init.lua'
--- data/world/immovables/ruin3/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/immovables/ruin3/init.lua	2017-01-17 08:56:03 +0000
@@ -2,7 +2,7 @@
 
 world:new_immovable_type{
    name = "ruin3",
-   descname = _ "Ruin",
+   descname = _ "Tombstone",
    editor_category = "miscellaneous",
    size = "none",
    attributes = {},

=== modified file 'data/world/immovables/ruin4/init.lua'
--- data/world/immovables/ruin4/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/immovables/ruin4/init.lua	2017-01-17 08:56:03 +0000
@@ -2,7 +2,7 @@
 
 world:new_immovable_type{
    name = "ruin4",
-   descname = _ "Ruin",
+   descname = _ "Tombstone",
    editor_category = "miscellaneous",
    size = "none",
    attributes = {},

=== modified file 'data/world/immovables/ruin5/init.lua'
--- data/world/immovables/ruin5/init.lua	2015-11-03 18:18:27 +0000
+++ data/world/immovables/ruin5/init.lua	2017-01-17 08:56:03 +0000
@@ -2,7 +2,7 @@
 
 world:new_immovable_type{
    name = "ruin5",
-   descname = _ "Ruin",
+   descname = _ "Tombstone",
    editor_category = "miscellaneous",
    size = "none",
    attributes = {},

=== modified file 'data/world/init.lua'
--- data/world/init.lua	2016-10-15 07:29:09 +0000
+++ data/world/init.lua	2017-01-17 08:56:03 +0000
@@ -10,62 +10,99 @@
    name = "miscellaneous",
    descname = _ "Miscellaneous",
    picture = "world/immovables/ruin5/idle.png",
+   items_per_row = 6,
 }
 
 world:new_editor_immovable_category{
    name = "artifacts",
    descname = _ "Artifacts" .. "<br>" .. _ "These immovables are used by the win condition “Artifacts”.",
    picture = "world/immovables/manmade/artifacts/artifact00/idle.png",
+   items_per_row = 6,
 }
 
 world:new_editor_immovable_category{
    name = "plants",
    descname = _ "Plants",
    picture = "world/immovables/cactus3/idle.png",
+   items_per_row = 8,
 }
 
 world:new_editor_immovable_category{
    name = "standing_stones",
    descname = _ "Standing Stones",
    picture = "world/immovables/standing_stones/standing_stone4_desert/idle.png",
+   items_per_row = 4,
 }
 
 world:new_editor_immovable_category{
    name = "rocks",
    descname = _ "Rocks",
    picture = "world/immovables/rocks/greenland_rocks6/idle.png",
+   items_per_row = 6,
+}
+
+world:new_editor_immovable_category{
+   name = "trees_dead",
+   descname = _ "Dead Trees",
+   picture = "world/immovables/trees/deadtree2/idle.png",
+   items_per_row = 8,
 }
 
 world:new_editor_immovable_category{
    name = "trees_coniferous",
    descname = _ "Coniferous Trees",
    picture = "world/immovables/trees/spruce/old/idle_0.png",
-}
-
-world:new_editor_immovable_category{
-   name = "trees_dead",
-   descname = _ "Dead Trees",
-   picture = "world/immovables/trees/deadtree2/idle.png",
+   items_per_row = 8,
 }
 
 world:new_editor_immovable_category{
    name = "trees_deciduous",
    descname = _ "Deciduous Trees",
    picture = "world/immovables/trees/alder/old/idle_0.png",
+   items_per_row = 8,
 }
 
 world:new_editor_immovable_category{
    name = "trees_palm",
    descname = _ "Palm Trees",
    picture = "world/immovables/trees/palm_borassus/old/idle_0.png",
+   items_per_row = 8,
 }
 
 world:new_editor_immovable_category{
    name = "trees_wasteland",
    descname = _ "Wasteland Trees",
    picture = "world/immovables/trees/umbrella_red/old/idle_0.png",
-}
-
+   items_per_row = 8,
+}
+
+world:new_editor_critter_category {
+   name = "critters_herbivores",
+   -- TRANSLATORS: A category in the editor for placing animals on the map.
+   descname = _ "Herbivores",
+   picture = "world/critters/sheep/idle_00.png",
+   items_per_row = 10,
+}
+
+world:new_editor_critter_category {
+   name = "critters_carnivores",
+   -- TRANSLATORS: A category in the editor for placing animals on the map.
+   descname = _ "Carnivores",
+   picture = "world/critters/fox/idle_00.png",
+   items_per_row = 10,
+}
+
+world:new_editor_critter_category {
+   name = "critters_aquatic",
+   -- TRANSLATORS: A category in the editor for placing animals on the map.
+   descname = _ "Aquatic",
+   picture = "world/critters/duck/idle_00.png",
+   items_per_row = 10,
+}
+
+-- NOCOM(#codereview): I do not understand the reordering here. I think
+-- alphabetically is preferable to keep future diffs smaller. If there is a
+-- deeper reason behind the reordering, you should add a comment here.
 include "world/immovables/grass1/init.lua"
 include "world/immovables/grass2/init.lua"
 include "world/immovables/grass3/init.lua"
@@ -75,39 +112,40 @@
 include "world/immovables/bush4/init.lua"
 include "world/immovables/bush5/init.lua"
 include "world/immovables/cactus1/init.lua"
-include "world/immovables/cactus2/init.lua"
 include "world/immovables/cactus3/init.lua"
 include "world/immovables/cactus4/init.lua"
+include "world/immovables/cactus2/init.lua"
+include "world/immovables/pebble1/init.lua"
+include "world/immovables/pebble2/init.lua"
+include "world/immovables/pebble3/init.lua"
+include "world/immovables/pebble4/init.lua"
+include "world/immovables/pebble5/init.lua"
+include "world/immovables/pebble6/init.lua"
 include "world/immovables/manmade/artifacts/artifact00/init.lua"
 include "world/immovables/manmade/artifacts/artifact01/init.lua"
 include "world/immovables/manmade/artifacts/artifact02/init.lua"
 include "world/immovables/manmade/artifacts/artifact03/init.lua"
-include "world/immovables/manmade/bar-ruin00/init.lua"
-include "world/immovables/manmade/bar-ruin01/init.lua"
-include "world/immovables/manmade/bar-ruin02/init.lua"
-include "world/immovables/manmade/bar-ruin03/init.lua"
-include "world/immovables/manmade/debris00/init.lua"
-include "world/immovables/manmade/debris01/init.lua"
-include "world/immovables/manmade/debris02/init.lua"
-include "world/immovables/manmade/snowman/init.lua"
 include "world/immovables/mushroom1/init.lua"
 include "world/immovables/mushroom2/init.lua"
-include "world/immovables/pebble1/init.lua"
-include "world/immovables/pebble2/init.lua"
-include "world/immovables/pebble3/init.lua"
-include "world/immovables/pebble4/init.lua"
-include "world/immovables/pebble5/init.lua"
-include "world/immovables/pebble6/init.lua"
+include "world/immovables/manmade/snowman/init.lua"
 include "world/immovables/ruin1/init.lua"
 include "world/immovables/ruin2/init.lua"
+include "world/immovables/track_winter/init.lua"
 include "world/immovables/ruin3/init.lua"
 include "world/immovables/ruin4/init.lua"
 include "world/immovables/ruin5/init.lua"
+include "world/immovables/manmade/debris00/init.lua"
+include "world/immovables/manmade/debris02/init.lua"
+include "world/immovables/manmade/debris01/init.lua"
+include "world/immovables/manmade/bar-ruin00/init.lua"
+include "world/immovables/manmade/bar-ruin02/init.lua"
+include "world/immovables/manmade/bar-ruin03/init.lua"
+include "world/immovables/manmade/bar-ruin01/init.lua"
 include "world/immovables/skeleton1/init.lua"
+include "world/immovables/skeleton3/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
 include "world/immovables/standing_stones/standing_stone1_desert/init.lua"
@@ -203,19 +241,24 @@
    end
 end
 
-include "world/critters/badger/init.lua"
-include "world/critters/brownbear/init.lua"
+-- Herbivores
 include "world/critters/bunny/init.lua"
+include "world/critters/sheep/init.lua"
+include "world/critters/wisent/init.lua"
+include "world/critters/wildboar/init.lua"
 include "world/critters/chamois/init.lua"
 include "world/critters/deer/init.lua"
-include "world/critters/duck/init.lua"
+include "world/critters/reindeer/init.lua"
+include "world/critters/stag/init.lua"
 include "world/critters/elk/init.lua"
+
+-- Carnivores
+include "world/critters/marten/init.lua"
+include "world/critters/badger/init.lua"
+include "world/critters/lynx/init.lua"
 include "world/critters/fox/init.lua"
-include "world/critters/lynx/init.lua"
-include "world/critters/marten/init.lua"
-include "world/critters/reindeer/init.lua"
-include "world/critters/sheep/init.lua"
-include "world/critters/stag/init.lua"
-include "world/critters/wildboar/init.lua"
-include "world/critters/wisent/init.lua"
 include "world/critters/wolf/init.lua"
+include "world/critters/brownbear/init.lua"
+
+-- Aquatic animals
+include "world/critters/duck/init.lua"

=== modified file 'data/world/map_generation.lua'
--- data/world/map_generation.lua	2016-07-10 19:03:33 +0000
+++ data/world/map_generation.lua	2017-01-17 08:56:03 +0000
@@ -7,6 +7,11 @@
 --  Former greenland  --
 ------------------------
 
+-- NOCOM(#codereview): I hope reordering here does not break savegames? I think it should not.
+-- NOCOM(#codereview): A comment that reordering effects the editor?
+-- NOCOM(#codereview): When switching between wasteland and winter, the window
+-- size of the terrain selection jumps. Maybe reorder so that we always have
+-- the same num rows/cols?
 
 greenland = {
    heights = {

=== modified file 'data/world/terrains/init.lua'
--- data/world/terrains/init.lua	2016-07-25 08:35:15 +0000
+++ data/world/terrains/init.lua	2017-01-17 08:56:03 +0000
@@ -3,21 +3,25 @@
    name = "summer",
    descname = _ "Summer",
    picture = "world/pics/editor_terrain_category_green.png",
+   items_per_row = 6,
 }
 world:new_editor_terrain_category{
    name = "wasteland",
    descname = _ "Wasteland",
    picture = "world/pics/editor_terrain_category_wasteland.png",
+   items_per_row = 6,
 }
 world:new_editor_terrain_category{
    name = "winter",
    descname = _ "Winter",
    picture = "world/pics/editor_terrain_category_winter.png",
+   items_per_row = 6,
 }
 world:new_editor_terrain_category{
    name = "desert",
    descname = _ "Desert",
    picture = "world/pics/editor_terrain_category_desert.png",
+   items_per_row = 6,
 }
 
 ------------------------
@@ -189,6 +193,45 @@
    fertility = 0.45,
 }
 
+world:new_terrain_type{
+   name = "summer_forested_mountain1",
+   descname = _ "Forested Mountain 1",
+   editor_category = "summer",
+   is = "mineable",
+   -- You can add custom additional tooltip entries here.
+   tooltips = {
+      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
+      _"likes trees",
+   },
+   valid_resources = {"coal", "iron", "gold", "stones"},
+   default_resource = "",
+   default_resource_amount = 0,
+   textures = { pics_dir .. "summer/forested_mountain1_00.png" },
+   dither_layer = 71,
+   temperature = 50,
+   humidity = 0.75,
+   fertility = 0.5,
+}
+
+world:new_terrain_type{
+   name = "summer_forested_mountain2",
+   descname = _ "Forested Mountain 2",
+   editor_category = "summer",
+   is = "mineable",
+   -- You can add custom additional tooltip entries here.
+   tooltips = {
+      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
+      _"likes trees",
+   },
+   valid_resources = {"coal", "iron", "gold", "stones"},
+   default_resource = "",
+   default_resource_amount = 0,
+   textures = { pics_dir .. "summer/forested_mountain2_00.png" },
+   dither_layer = 71,
+   temperature = 50,
+   humidity = 0.75,
+   fertility = 0.5,
+}
 
 world:new_terrain_type{
    name = "summer_mountain1",
@@ -253,45 +296,19 @@
    fertility = 0.1,
 }
 
-
-world:new_terrain_type{
-   name = "summer_forested_mountain1",
-   descname = _ "Forested Mountain 1",
-   editor_category = "summer",
-   is = "mineable",
-   -- You can add custom additional tooltip entries here.
-   tooltips = {
-      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
-      _"likes trees",
-   },
-   valid_resources = {"coal", "iron", "gold", "stones"},
-   default_resource = "",
-   default_resource_amount = 0,
-   textures = { pics_dir .. "summer/forested_mountain1_00.png" },
-   dither_layer = 71,
-   temperature = 50,
-   humidity = 0.75,
-   fertility = 0.5,
-}
-
-world:new_terrain_type{
-   name = "summer_forested_mountain2",
-   descname = _ "Forested Mountain 2",
-   editor_category = "summer",
-   is = "mineable",
-   -- You can add custom additional tooltip entries here.
-   tooltips = {
-      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
-      _"likes trees",
-   },
-   valid_resources = {"coal", "iron", "gold", "stones"},
-   default_resource = "",
-   default_resource_amount = 0,
-   textures = { pics_dir .. "summer/forested_mountain2_00.png" },
-   dither_layer = 71,
-   temperature = 50,
-   humidity = 0.75,
-   fertility = 0.5,
+world:new_terrain_type{
+   name = "summer_beach",
+   descname = _ "Beach",
+   editor_category = "summer",
+   is = "walkable",
+   valid_resources = {},
+   default_resource = "",
+   default_resource_amount = 0,
+   textures = { pics_dir .. "summer/beach_00.png" },
+   dither_layer = 60,
+   temperature = 120,
+   humidity = 0.6,
+   fertility = 0.2,
 }
 
 world:new_terrain_type{
@@ -309,21 +326,6 @@
    humidity = 0.999,
    fertility = 0.1,
 }
-
-world:new_terrain_type{
-   name = "summer_beach",
-   descname = _ "Beach",
-   editor_category = "summer",
-   is = "walkable",
-   valid_resources = {},
-   default_resource = "",
-   default_resource_amount = 0,
-   textures = { pics_dir .. "summer/beach_00.png" },
-   dither_layer = 60,
-   temperature = 120,
-   humidity = 0.6,
-   fertility = 0.2,
-}
 world:new_terrain_type{
    name = "summer_snow",
    descname = _ "Snow",
@@ -515,6 +517,44 @@
 
 
 world:new_terrain_type{
+   name = "wasteland_forested_mountain1",
+   descname = _ "Forested Mountain 1",
+   editor_category = "wasteland",
+   is = "mineable",
+   tooltips = {
+      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
+      _"likes trees",
+   },
+   valid_resources = {"coal", "iron", "gold", "stones"},
+   default_resource = "",
+   default_resource_amount = 0,
+   textures = { pics_dir .. "wasteland/forested_mountain1_00.png" },
+   dither_layer = 81,
+   temperature = 110,
+   humidity = 0.15,
+   fertility = 0.95,
+}
+
+world:new_terrain_type{
+   name = "wasteland_forested_mountain2",
+   descname = _ "Forested Mountain 2",
+   editor_category = "wasteland",
+   is = "mineable",
+   tooltips = {
+      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
+      _"likes trees",
+   },
+   valid_resources = {"coal", "iron", "gold", "stones"},
+   default_resource = "",
+   default_resource_amount = 0,
+   textures = { pics_dir .. "wasteland/forested_mountain2_00.png" },
+   dither_layer = 81,
+   temperature = 95,
+   humidity = 0.2,
+   fertility = 0.4,
+}
+
+world:new_terrain_type{
    name = "wasteland_mountain1",
    descname = _ "Mountain 1",
    editor_category = "wasteland",
@@ -577,43 +617,6 @@
    fertility = 0.2,
 }
 
-world:new_terrain_type{
-   name = "wasteland_forested_mountain1",
-   descname = _ "Forested Mountain 1",
-   editor_category = "wasteland",
-   is = "mineable",
-   tooltips = {
-      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
-      _"likes trees",
-   },
-   valid_resources = {"coal", "iron", "gold", "stones"},
-   default_resource = "",
-   default_resource_amount = 0,
-   textures = { pics_dir .. "wasteland/forested_mountain1_00.png" },
-   dither_layer = 81,
-   temperature = 110,
-   humidity = 0.15,
-   fertility = 0.95,
-}
-
-world:new_terrain_type{
-   name = "wasteland_forested_mountain2",
-   descname = _ "Forested Mountain 2",
-   editor_category = "wasteland",
-   is = "mineable",
-   tooltips = {
-      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
-      _"likes trees",
-   },
-   valid_resources = {"coal", "iron", "gold", "stones"},
-   default_resource = "",
-   default_resource_amount = 0,
-   textures = { pics_dir .. "wasteland/forested_mountain2_00.png" },
-   dither_layer = 81,
-   temperature = 95,
-   humidity = 0.2,
-   fertility = 0.4,
-}
 
 world:new_terrain_type{
    name = "wasteland_beach",
@@ -796,6 +799,44 @@
 
 
 world:new_terrain_type{
+   name = "winter_forested_mountain1",
+   descname = _ "Forested Mountain 1",
+   editor_category = "winter",
+   is = "mineable",
+   tooltips = {
+      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
+      _"likes trees",
+   },
+   valid_resources = {"coal", "iron", "gold", "stones"},
+   default_resource = "",
+   default_resource_amount = 0,
+   textures = { pics_dir .. "winter/forested_mountain1_00.png" },
+   dither_layer = 101,
+   temperature = 35,
+   humidity = 0.7,
+   fertility = 0.4,
+}
+
+world:new_terrain_type{
+   name = "winter_forested_mountain2",
+   descname = _ "Forested Mountain 2",
+   editor_category = "winter",
+   is = "mineable",
+   tooltips = {
+      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
+      _"likes trees",
+   },
+   valid_resources = {"coal", "iron", "gold", "stones"},
+   default_resource = "",
+   default_resource_amount = 0,
+   textures = { pics_dir .. "winter/forested_mountain2_00.png" },
+   dither_layer = 101,
+   temperature = 35,
+   humidity = 0.7,
+   fertility = 0.4,
+}
+
+world:new_terrain_type{
    name = "winter_mountain1",
    descname = _ "Mountain 1",
    editor_category = "winter",
@@ -857,45 +898,6 @@
    humidity = 0.3,
    fertility = 0.05,
 }
-
-world:new_terrain_type{
-   name = "winter_forested_mountain1",
-   descname = _ "Forested Mountain 1",
-   editor_category = "winter",
-   is = "mineable",
-   tooltips = {
-      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
-      _"likes trees",
-   },
-   valid_resources = {"coal", "iron", "gold", "stones"},
-   default_resource = "",
-   default_resource_amount = 0,
-   textures = { pics_dir .. "winter/forested_mountain1_00.png" },
-   dither_layer = 101,
-   temperature = 35,
-   humidity = 0.7,
-   fertility = 0.4,
-}
-
-world:new_terrain_type{
-   name = "winter_forested_mountain2",
-   descname = _ "Forested Mountain 2",
-   editor_category = "winter",
-   is = "mineable",
-   tooltips = {
-      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
-      _"likes trees",
-   },
-   valid_resources = {"coal", "iron", "gold", "stones"},
-   default_resource = "",
-   default_resource_amount = 0,
-   textures = { pics_dir .. "winter/forested_mountain2_00.png" },
-   dither_layer = 101,
-   temperature = 35,
-   humidity = 0.7,
-   fertility = 0.4,
-}
-
 world:new_terrain_type{
    name = "ice",
    descname = _ "Ice",
@@ -984,6 +986,21 @@
 ---------------------
 
 world:new_terrain_type{
+   name = "desert4",
+   descname = _ "Desert 4",
+   editor_category = "desert",
+   is = "arable",
+   valid_resources = {"water"},
+   default_resource = "water",
+   default_resource_amount = 2,
+   textures = { pics_dir .. "desert/desert4_00.png" },
+   dither_layer = 270,
+   temperature = 168,
+   humidity = 0.001,
+   fertility = 0.1,
+}
+
+world:new_terrain_type{
    name = "drysoil",
    descname = _ "Dry Soil",
    editor_category = "desert",
@@ -1078,6 +1095,45 @@
 
 
 world:new_terrain_type{
+   name = "desert_forested_mountain1",
+   descname = _ "Forested Mountain 1",
+   editor_category = "desert",
+   is = "mineable",
+   tooltips = {
+      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
+      _"likes trees",
+   },
+   valid_resources = {"coal", "iron", "gold", "stones"},
+   default_resource = "",
+   default_resource_amount = 0,
+   textures = { pics_dir .. "desert/forested_mountain1_00.png" },
+   dither_layer = 71,
+   temperature = 141,
+   humidity = 0.5,
+   fertility = 0.5,
+}
+
+world:new_terrain_type{
+   name = "desert_forested_mountain2",
+   descname = _ "Forested Mountain 2",
+   editor_category = "desert",
+   is = "mineable",
+   tooltips = {
+      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
+      _"likes trees",
+   },
+   valid_resources = {"coal", "iron", "gold", "stones"},
+   default_resource = "",
+   default_resource_amount = 0,
+   textures = { pics_dir .. "desert/forested_mountain2_00.png" },
+   dither_layer = 141,
+   temperature = 120,
+   humidity = 0.5,
+   fertility = 0.5,
+}
+
+
+world:new_terrain_type{
    name = "mountain1",
    descname = _ "Mountain 1",
    editor_category = "desert",
@@ -1139,45 +1195,6 @@
    humidity = 0.05,
    fertility = 0.05,
 }
-
-world:new_terrain_type{
-   name = "desert_forested_mountain1",
-   descname = _ "Forested Mountain 1",
-   editor_category = "desert",
-   is = "mineable",
-   tooltips = {
-      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
-      _"likes trees",
-   },
-   valid_resources = {"coal", "iron", "gold", "stones"},
-   default_resource = "",
-   default_resource_amount = 0,
-   textures = { pics_dir .. "desert/forested_mountain1_00.png" },
-   dither_layer = 71,
-   temperature = 141,
-   humidity = 0.5,
-   fertility = 0.5,
-}
-
-world:new_terrain_type{
-   name = "desert_forested_mountain2",
-   descname = _ "Forested Mountain 2",
-   editor_category = "desert",
-   is = "mineable",
-   tooltips = {
-      -- TRANSLATORS: This is an entry in a terrain tooltip. Try to use 1 word if possible.
-      _"likes trees",
-   },
-   valid_resources = {"coal", "iron", "gold", "stones"},
-   default_resource = "",
-   default_resource_amount = 0,
-   textures = { pics_dir .. "desert/forested_mountain2_00.png" },
-   dither_layer = 141,
-   temperature = 120,
-   humidity = 0.5,
-   fertility = 0.5,
-}
-
 world:new_terrain_type{
    name = "desert1",
    descname = _ "Desert 1",
@@ -1227,22 +1244,6 @@
 
 
 world:new_terrain_type{
-   name = "desert4",
-   descname = _ "Desert 4",
-   editor_category = "desert",
-   is = "arable",
-   valid_resources = {"water"},
-   default_resource = "water",
-   default_resource_amount = 2,
-   textures = { pics_dir .. "desert/desert4_00.png" },
-   dither_layer = 270,
-   temperature = 168,
-   humidity = 0.001,
-   fertility = 0.1,
-}
-
-
-world:new_terrain_type{
    name = "desert_beach",
    descname = _ "Beach",
    editor_category = "desert",

=== modified file 'src/editor/CMakeLists.txt'
--- src/editor/CMakeLists.txt	2016-10-20 19:29:28 +0000
+++ src/editor/CMakeLists.txt	2017-01-17 08:56:03 +0000
@@ -9,8 +9,8 @@
     tools/decrease_height_tool.h
     tools/decrease_resources_tool.cc
     tools/decrease_resources_tool.h
-    tools/delete_bob_tool.cc
-    tools/delete_bob_tool.h
+    tools/delete_critter_tool.cc
+    tools/delete_critter_tool.h
     tools/delete_immovable_tool.cc
     tools/delete_immovable_tool.h
     tools/draw_tool.cc
@@ -28,8 +28,8 @@
     tools/multi_select.h
     tools/noise_height_tool.cc
     tools/noise_height_tool.h
-    tools/place_bob_tool.cc
-    tools/place_bob_tool.h
+    tools/place_critter_tool.cc
+    tools/place_critter_tool.h
     tools/place_immovable_tool.cc
     tools/place_immovable_tool.h
     tools/set_height_tool.cc
@@ -77,8 +77,8 @@
     ui_menus/tool_noise_height_options_menu.h
     ui_menus/tool_options_menu.cc
     ui_menus/tool_options_menu.h
-    ui_menus/tool_place_bob_options_menu.cc
-    ui_menus/tool_place_bob_options_menu.h
+    ui_menus/tool_place_critter_options_menu.cc
+    ui_menus/tool_place_critter_options_menu.h
     ui_menus/tool_place_immovable_options_menu.cc
     ui_menus/tool_place_immovable_options_menu.h
     ui_menus/tool_set_terrain_options_menu.cc

=== modified file 'src/editor/editorinteractive.h'
--- src/editor/editorinteractive.h	2016-11-20 08:08:18 +0000
+++ src/editor/editorinteractive.h	2017-01-17 08:56:03 +0000
@@ -28,7 +28,7 @@
 #include "editor/tools/info_tool.h"
 #include "editor/tools/make_infrastructure_tool.h"
 #include "editor/tools/noise_height_tool.h"
-#include "editor/tools/place_bob_tool.h"
+#include "editor/tools/place_critter_tool.h"
 #include "editor/tools/place_immovable_tool.h"
 #include "editor/tools/set_origin_tool.h"
 #include "editor/tools/set_port_space_tool.h"
@@ -56,7 +56,7 @@
 		     increase_height(decrease_height, set_height),
 		     noise_height(set_height),
 		     place_immovable(delete_immovable),
-		     place_bob(delete_bob),
+		     place_critter(delete_critter),
 		     increase_resources(decrease_resources, set_resources),
 		     set_port_space(unset_port_space),
 		     set_origin() {
@@ -76,8 +76,8 @@
 		EditorDeleteImmovableTool delete_immovable;
 		EditorPlaceImmovableTool place_immovable;
 		EditorSetStartingPosTool set_starting_pos;
-		EditorDeleteBobTool delete_bob;
-		EditorPlaceBobTool place_bob;
+		EditorDeleteCritterTool delete_critter;
+		EditorPlaceCritterTool place_critter;
 		EditorDecreaseResourcesTool decrease_resources;
 		EditorSetResourcesTool set_resources;
 		EditorIncreaseResourcesTool increase_resources;
@@ -173,7 +173,7 @@
 	UI::UniqueWindow::Registry noise_heightmenu_;
 	UI::UniqueWindow::Registry terrainmenu_;
 	UI::UniqueWindow::Registry immovablemenu_;
-	UI::UniqueWindow::Registry bobmenu_;
+	UI::UniqueWindow::Registry crittermenu_;
 	UI::UniqueWindow::Registry resourcesmenu_;
 	UI::UniqueWindow::Registry helpmenu_;
 

=== modified file 'src/editor/map_generator.cc'
--- src/editor/map_generator.cc	2016-12-14 22:11:52 +0000
+++ src/editor/map_generator.cc	2017-01-17 08:56:03 +0000
@@ -104,7 +104,7 @@
 
 	if (set_moveable && (num = bobCategory->num_critters())) {
 		egbase_.create_critter(
-		   fc, egbase_.world().get_bob(
+		   fc, egbase_.world().get_critter(
 		          bobCategory->get_critter(static_cast<size_t>(rng.rand() / (kMaxElevation / num)))
 		             .c_str()));
 	}

=== renamed file 'src/editor/tools/delete_bob_tool.cc' => 'src/editor/tools/delete_critter_tool.cc'
--- src/editor/tools/delete_bob_tool.cc	2016-08-04 15:49:05 +0000
+++ src/editor/tools/delete_critter_tool.cc	2017-01-17 08:56:03 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-#include "editor/tools/delete_bob_tool.h"
+#include "editor/tools/delete_critter_tool.h"
 
 #include "editor/editorinteractive.h"
 #include "logic/field.h"
@@ -27,12 +27,12 @@
 /**
  * Deletes the bob at the given location
 */
-int32_t
-EditorDeleteBobTool::handle_click_impl(const Widelands::World&,
-                                       const Widelands::NodeAndTriangle<Widelands::Coords>& center,
-                                       EditorInteractive& parent,
-                                       EditorActionArgs* args,
-                                       Widelands::Map* map) {
+int32_t EditorDeleteCritterTool::handle_click_impl(
+   const Widelands::World&,
+   const Widelands::NodeAndTriangle<Widelands::Coords>& center,
+   EditorInteractive& parent,
+   EditorActionArgs* args,
+   Widelands::Map* map) {
 	Widelands::EditorGameBase& egbase = parent.egbase();
 	const int32_t radius = args->sel_radius;
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords>> mr(
@@ -49,18 +49,18 @@
 	return radius + 2;
 }
 
-int32_t
-EditorDeleteBobTool::handle_undo_impl(const Widelands::World& world,
-                                      const Widelands::NodeAndTriangle<Widelands::Coords>& center,
-                                      EditorInteractive& parent,
-                                      EditorActionArgs* args,
-                                      Widelands::Map* map) {
+int32_t EditorDeleteCritterTool::handle_undo_impl(
+   const Widelands::World& world,
+   const Widelands::NodeAndTriangle<Widelands::Coords>& center,
+   EditorInteractive& parent,
+   EditorActionArgs* args,
+   Widelands::Map* map) {
 
-	uint32_t ret = parent.tools()->place_bob.handle_undo_impl(world, center, parent, args, map);
+	uint32_t ret = parent.tools()->place_critter.handle_undo_impl(world, center, parent, args, map);
 	args->old_bob_type.clear();
 	return ret;
 }
 
-EditorActionArgs EditorDeleteBobTool::format_args_impl(EditorInteractive& parent) {
+EditorActionArgs EditorDeleteCritterTool::format_args_impl(EditorInteractive& parent) {
 	return EditorTool::format_args_impl(parent);
 }

=== renamed file 'src/editor/tools/delete_bob_tool.h' => 'src/editor/tools/delete_critter_tool.h'
--- src/editor/tools/delete_bob_tool.h	2016-10-21 06:52:28 +0000
+++ src/editor/tools/delete_critter_tool.h	2017-01-17 08:56:03 +0000
@@ -17,14 +17,14 @@
  *
  */
 
-#ifndef WL_EDITOR_TOOLS_DELETE_BOB_TOOL_H
-#define WL_EDITOR_TOOLS_DELETE_BOB_TOOL_H
+#ifndef WL_EDITOR_TOOLS_DELETE_CRITTER_TOOL_H
+#define WL_EDITOR_TOOLS_DELETE_CRITTER_TOOL_H
 
 #include "editor/tools/tool.h"
 
-/// Deletes bob from the map.
-struct EditorDeleteBobTool : public EditorTool {
-	EditorDeleteBobTool() : EditorTool(*this, *this) {
+/// Deletes critter from the map.
+struct EditorDeleteCritterTool : public EditorTool {
+	EditorDeleteCritterTool() : EditorTool(*this, *this) {
 	}
 
 	int32_t handle_click_impl(const Widelands::World& world,
@@ -46,4 +46,4 @@
 	}
 };
 
-#endif  // end of include guard: WL_EDITOR_TOOLS_DELETE_BOB_TOOL_H
+#endif  // end of include guard: WL_EDITOR_TOOLS_DELETE_CRITTER_TOOL_H

=== renamed file 'src/editor/tools/place_bob_tool.cc' => 'src/editor/tools/place_critter_tool.cc'
--- src/editor/tools/place_bob_tool.cc	2016-08-04 15:49:05 +0000
+++ src/editor/tools/place_critter_tool.cc	2017-01-17 08:56:03 +0000
@@ -17,12 +17,13 @@
  *
  */
 
-#include "editor/tools/place_bob_tool.h"
+#include "editor/tools/place_critter_tool.h"
 
 #include "editor/editorinteractive.h"
 #include "logic/editor_game_base.h"
 #include "logic/field.h"
 #include "logic/map_objects/bob.h"
+#include "logic/map_objects/world/critter.h"
 #include "logic/map_objects/world/world.h"
 #include "logic/mapregion.h"
 
@@ -30,11 +31,11 @@
  * Choses an object to place randomly from all enabled
  * and places this on the current field
 */
-int32_t EditorPlaceBobTool::handle_click_impl(const Widelands::World& world,
-                                              const Widelands::NodeAndTriangle<>& center,
-                                              EditorInteractive& parent,
-                                              EditorActionArgs* args,
-                                              Widelands::Map* map) {
+int32_t EditorPlaceCritterTool::handle_click_impl(const Widelands::World& world,
+                                                  const Widelands::NodeAndTriangle<>& center,
+                                                  EditorInteractive& parent,
+                                                  EditorActionArgs* args,
+                                                  Widelands::Map* map) {
 
 	if (get_nr_enabled() && args->old_bob_type.empty()) {
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords>> mr(
@@ -43,7 +44,8 @@
 		do {
 			Widelands::Bob* const mbob = mr.location().field->get_first_bob();
 			args->old_bob_type.push_back((mbob ? &mbob->descr() : nullptr));
-			args->new_bob_type.push_back(world.get_bob_descr(get_random_enabled()));
+			args->new_bob_type.push_back(dynamic_cast<const Widelands::BobDescr*>(
+			   world.get_critter_descr(get_random_enabled())));
 		} while (mr.advance(*map));
 	}
 
@@ -67,12 +69,12 @@
 		return 0;
 }
 
-int32_t
-EditorPlaceBobTool::handle_undo_impl(const Widelands::World&,
-                                     const Widelands::NodeAndTriangle<Widelands::Coords>& center,
-                                     EditorInteractive& parent,
-                                     EditorActionArgs* args,
-                                     Widelands::Map* map) {
+int32_t EditorPlaceCritterTool::handle_undo_impl(
+   const Widelands::World&,
+   const Widelands::NodeAndTriangle<Widelands::Coords>& center,
+   EditorInteractive& parent,
+   EditorActionArgs* args,
+   Widelands::Map* map) {
 	if (!args->new_bob_type.empty()) {
 		Widelands::EditorGameBase& egbase = parent.egbase();
 		Widelands::MapRegion<Widelands::Area<Widelands::FCoords>> mr(
@@ -97,6 +99,6 @@
 		return 0;
 }
 
-EditorActionArgs EditorPlaceBobTool::format_args_impl(EditorInteractive& parent) {
+EditorActionArgs EditorPlaceCritterTool::format_args_impl(EditorInteractive& parent) {
 	return EditorTool::format_args_impl(parent);
 }

=== renamed file 'src/editor/tools/place_bob_tool.h' => 'src/editor/tools/place_critter_tool.h'
--- src/editor/tools/place_bob_tool.h	2016-10-21 06:52:28 +0000
+++ src/editor/tools/place_critter_tool.h	2017-01-17 08:56:03 +0000
@@ -17,15 +17,15 @@
  *
  */
 
-#ifndef WL_EDITOR_TOOLS_PLACE_BOB_TOOL_H
-#define WL_EDITOR_TOOLS_PLACE_BOB_TOOL_H
+#ifndef WL_EDITOR_TOOLS_PLACE_CRITTER_TOOL_H
+#define WL_EDITOR_TOOLS_PLACE_CRITTER_TOOL_H
 
-#include "editor/tools/delete_bob_tool.h"
+#include "editor/tools/delete_critter_tool.h"
 #include "editor/tools/multi_select.h"
 
-/// Places bobs on the map.
-struct EditorPlaceBobTool : public EditorTool, public MultiSelect {
-	EditorPlaceBobTool(EditorDeleteBobTool& tool) : EditorTool(tool, tool) {
+/// Places critters on the map.
+struct EditorPlaceCritterTool : public EditorTool, public MultiSelect {
+	EditorPlaceCritterTool(EditorDeleteCritterTool& tool) : EditorTool(tool, tool) {
 	}
 
 	int32_t handle_click_impl(const Widelands::World& world,
@@ -43,8 +43,8 @@
 	EditorActionArgs format_args_impl(EditorInteractive& parent) override;
 
 	const Image* get_sel_impl() const override {
-		return g_gr->images().get("images/wui/editor/fsel_editor_place_bob.png");
+		return g_gr->images().get("images/wui/editor/fsel_editor_place_critter.png");
 	}
 };
 
-#endif  // end of include guard: WL_EDITOR_TOOLS_PLACE_BOB_TOOL_H
+#endif  // end of include guard: WL_EDITOR_TOOLS_PLACE_CRITTER_TOOL_H

=== modified file 'src/editor/tools/tool.h'
--- src/editor/tools/tool.h	2016-11-03 07:20:57 +0000
+++ src/editor/tools/tool.h	2017-01-17 08:56:03 +0000
@@ -36,9 +36,9 @@
 
 /**
  * An editor tool is a tool that can be selected in the editor. Examples are:
- * modify height, place bob, place critter, place building. A Tool only makes
- * one function (like delete_building, place building, modify building are 3
- * tools).
+ * modify height, place immovable, place critter, place building. A Tool only
+ * makes one function (like delete_building, place building, modify building
+ * are 3 tools).
  */
 class EditorTool {
 public:

=== modified file 'src/editor/ui_menus/categorized_item_selection_menu.h'
--- src/editor/ui_menus/categorized_item_selection_menu.h	2016-11-23 08:31:25 +0000
+++ src/editor/ui_menus/categorized_item_selection_menu.h	2017-01-17 08:56:03 +0000
@@ -27,6 +27,7 @@
 #include "boost/format.hpp"
 
 #include "base/i18n.h"
+#include "graphic/graphic.h"
 #include "graphic/image.h"
 #include "logic/description_maintainer.h"
 #include "logic/map_objects/world/editor_category.h"
@@ -82,7 +83,7 @@
      descriptions_(descriptions),
      select_correct_tool_(select_correct_tool),
      protect_against_recursive_select_(false),
-     tab_panel_(this, 0, 0, nullptr),
+     tab_panel_(this, 0, 0, g_gr->images().get("images/wui/window_background_dark.png")),
      current_selection_names_(this,
                               0,
                               0,
@@ -93,6 +94,8 @@
                               g_gr->images().get("images/ui_basic/but1.png"),
                               UI::MultilineTextarea::ScrollMode::kNoScrolling),
      tool_(tool) {
+	current_selection_names_.set_background(
+	   g_gr->images().get("images/wui/window_background_dark.png"));
 	add(&tab_panel_, UI::Align::kCenter);
 
 	for (uint32_t category_index = 0; category_index < categories.size(); ++category_index) {
@@ -110,12 +113,10 @@
 		const int kSpacing = 5;
 		vertical->add_space(kSpacing);
 
-		const uint32_t items_in_row =
-		   static_cast<uint32_t>(std::ceil(std::sqrt(static_cast<float>(item_indices.size()))));
 		int nitems_handled = 0;
 		UI::Box* horizontal = nullptr;
 		for (const int i : item_indices) {
-			if (nitems_handled % items_in_row == 0) {
+			if (nitems_handled % category.items_per_row() == 0) {
 				horizontal = new UI::Box(vertical, 0, 0, UI::Box::Horizontal);
 				horizontal->add_space(kSpacing);
 

=== modified file 'src/editor/ui_menus/tool_menu.cc'
--- src/editor/ui_menus/tool_menu.cc	2016-10-16 09:31:42 +0000
+++ src/editor/ui_menus/tool_menu.cc	2017-01-17 08:56:03 +0000
@@ -27,14 +27,14 @@
 #include "editor/tools/increase_height_tool.h"
 #include "editor/tools/increase_resources_tool.h"
 #include "editor/tools/noise_height_tool.h"
-#include "editor/tools/place_bob_tool.h"
+#include "editor/tools/place_critter_tool.h"
 #include "editor/tools/place_immovable_tool.h"
 #include "editor/tools/set_port_space_tool.h"
 #include "editor/tools/set_terrain_tool.h"
 #include "editor/ui_menus/tool_change_height_options_menu.h"
 #include "editor/ui_menus/tool_change_resources_options_menu.h"
 #include "editor/ui_menus/tool_noise_height_options_menu.h"
-#include "editor/ui_menus/tool_place_bob_options_menu.h"
+#include "editor/ui_menus/tool_place_critter_options_menu.h"
 #include "editor/ui_menus/tool_place_immovable_options_menu.h"
 #include "editor/ui_menus/tool_set_terrain_options_menu.h"
 #include "graphic/graphic.h"
@@ -76,7 +76,7 @@
 		                          2 :
 		                          &current == &parent.tools()->place_immovable ?
 		                          3 :
-		                          &current == &parent.tools()->place_bob ?
+		                          &current == &parent.tools()->place_critter ?
 		                          4 :
 		                          &current == &parent.tools()->increase_resources ?
 		                          5 :
@@ -120,8 +120,8 @@
 		current_registry_pointer = &parent.immovablemenu_;
 		break;
 	case 4:
-		current_tool_pointer = &parent.tools()->place_bob;
-		current_registry_pointer = &parent.bobmenu_;
+		current_tool_pointer = &parent.tools()->place_critter;
+		current_registry_pointer = &parent.crittermenu_;
 		break;
 	case 5:
 		current_tool_pointer = &parent.tools()->increase_resources;
@@ -174,8 +174,8 @@
 				   parent, parent.tools()->place_immovable, *current_registry_pointer);
 				break;
 			case 4:
-				new EditorToolPlaceBobOptionsMenu(
-				   parent, parent.tools()->place_bob, *current_registry_pointer);
+				new EditorToolPlaceCritterOptionsMenu(
+				   parent, parent.tools()->place_critter, *current_registry_pointer);
 				break;
 			case 5:
 				new EditorToolChangeResourcesOptionsMenu(

=== renamed file 'src/editor/ui_menus/tool_place_bob_options_menu.cc' => 'src/editor/ui_menus/tool_place_critter_options_menu.cc'
--- src/editor/ui_menus/tool_place_bob_options_menu.cc	2016-12-01 18:12:41 +0000
+++ src/editor/ui_menus/tool_place_critter_options_menu.cc	2017-01-17 08:56:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2008 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,14 +17,13 @@
  *
  */
 
-#include "editor/ui_menus/tool_place_bob_options_menu.h"
+#include "editor/ui_menus/tool_place_critter_options_menu.h"
 
 #include <SDL_keycode.h>
 
 #include "base/i18n.h"
-#include "base/macros.h"
 #include "editor/editorinteractive.h"
-#include "editor/tools/place_bob_tool.h"
+#include "editor/tools/place_critter_tool.h"
 #include "graphic/graphic.h"
 #include "logic/map.h"
 #include "logic/map_objects/world/critter.h"
@@ -32,99 +31,35 @@
 #include "ui_basic/box.h"
 #include "ui_basic/button.h"
 #include "ui_basic/checkbox.h"
-#include "ui_basic/tabpanel.h"
 #include "ui_basic/textarea.h"
 #include "wlapplication.h"
 
-EditorToolPlaceBobOptionsMenu::EditorToolPlaceBobOptionsMenu(EditorInteractive& parent,
-                                                             EditorPlaceBobTool& pit,
-                                                             UI::UniqueWindow::Registry& registry)
-   : EditorToolOptionsMenu(parent, registry, 100, 100, _("Animals")),
-
-     tabpanel_(this, 0, 0, g_gr->images().get("images/ui_basic/but1.png")),
-     pit_(pit),
-     click_recursion_protect_(false) {
-	int32_t const space = 5;
+namespace {
+UI::Checkbox* create_critter_checkbox(UI::Panel* parent,
+                                      const Widelands::CritterDescr& critter_descr) {
+	const Image* pic = critter_descr.representative_image();
+	UI::Checkbox* cb = new UI::Checkbox(parent, Vector2i(0, 0), pic, critter_descr.descname());
+	const int kMinClickableArea = 24;
+	cb->set_desired_size(std::max<int>(pic->width(), kMinClickableArea),
+	                     std::max<int>(pic->height(), kMinClickableArea));
+	return cb;
+}
+
+}  // namespace
+
+EditorToolPlaceCritterOptionsMenu::EditorToolPlaceCritterOptionsMenu(
+   EditorInteractive& parent, EditorPlaceCritterTool& tool, UI::UniqueWindow::Registry& registry)
+   : EditorToolOptionsMenu(parent, registry, 0, 0, _("Animals")) {
 	const Widelands::World& world = parent.egbase().world();
-	int32_t const nr_bobs = world.get_nr_bobs();
-	const uint32_t bobs_in_row =
-	   std::max(std::min(static_cast<uint32_t>(ceil(sqrt(static_cast<double>(nr_bobs)))), 24U), 12U);
-
-	set_center_panel(&tabpanel_);
-
-	uint32_t width = 0, height = 0;
-	for (int32_t j = 0; j < nr_bobs; ++j) {
-		const Image* pic = world.get_bob_descr(j)->representative_image();
-		uint16_t w = pic->width();
-		uint16_t h = pic->height();
-		if (w > width)
-			width = w;
-		if (h > height)
-			height = h;
-	}
-
-	const Image* tab_icon = g_gr->images().get("images/ui_basic/list_first_entry.png");
-	Vector2i pos;
-	uint32_t cur_x = bobs_in_row;
-	int32_t i = 0;
-	UI::Box* box = nullptr;
-	while (i < nr_bobs) {
-		if (cur_x == bobs_in_row) {
-			cur_x = 0;
-			pos = Vector2i(5, 15);
-			box = new UI::Box(&tabpanel_, 0, 0, UI::Box::Horizontal);
-			tabpanel_.add("icons", tab_icon, box);
-		}
-
-		const Widelands::BobDescr& descr = *world.get_bob_descr(i);
-		upcast(Widelands::CritterDescr const, critter_descr, &descr);
-		UI::Checkbox& cb =
-		   *new UI::Checkbox(box, pos, descr.representative_image(),
-		                     critter_descr ? critter_descr->descname() : std::string());
-
-		cb.set_desired_size(width, height);
-		cb.set_state(pit_.is_enabled(i));
-		cb.changedto.connect(boost::bind(&EditorToolPlaceBobOptionsMenu::clicked, this, i, _1));
-		checkboxes_.push_back(&cb);
-		box->add(&cb, UI::Align::kLeft);
-		box->add_space(space);
-		pos.x += width + 1 + space;
-		++cur_x;
-		++i;
-	}
-
-	tabpanel_.activate(0);
+	multi_select_menu_.reset(
+	   new CategorizedItemSelectionMenu<Widelands::CritterDescr, EditorPlaceCritterTool>(
+	      this, world.editor_critter_categories(), world.critters(),
+	      [this](UI::Panel* cb_parent, const Widelands::CritterDescr& critter_descr) {
+		      return create_critter_checkbox(cb_parent, critter_descr);
+		   },
+	      [this] { select_correct_tool(); }, &tool));
+	set_center_panel(multi_select_menu_.get());
 }
 
-/**
- * This is called when one of the state boxes is toggled
-*/
-void EditorToolPlaceBobOptionsMenu::clicked(int32_t const n, bool const t) {
-	if (click_recursion_protect_)
-		return;
-
-	//  TODO(unknown): This code is erroneous. It checks the current key state. What it
-	//  TODO(unknown): needs is the key state at the time the mouse was clicked. See the
-	//  TODO(unknown): usage comment for get_key_state.
-	const bool multiselect = SDL_GetModState() & KMOD_CTRL;
-	if (!t && (!multiselect || pit_.get_nr_enabled() == 1)) {
-		checkboxes_[n]->set_state(true);
-		return;
-	}
-
-	if (!multiselect) {
-		for (uint32_t i = 0; pit_.get_nr_enabled(); ++i)
-			pit_.enable(i, false);
-
-		//  disable all checkboxes
-		click_recursion_protect_ = true;
-		for (uint32_t i = 0; i < checkboxes_.size(); ++i) {
-			if (i != static_cast<uint32_t>(n))
-				checkboxes_[i]->set_state(false);
-		}
-		click_recursion_protect_ = false;
-	}
-
-	pit_.enable(n, t);
-	select_correct_tool();
+EditorToolPlaceCritterOptionsMenu::~EditorToolPlaceCritterOptionsMenu() {
 }

=== renamed file 'src/editor/ui_menus/tool_place_bob_options_menu.h' => 'src/editor/ui_menus/tool_place_critter_options_menu.h'
--- src/editor/ui_menus/tool_place_bob_options_menu.h	2016-08-04 15:49:05 +0000
+++ src/editor/ui_menus/tool_place_critter_options_menu.h	2017-01-17 08:56:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002-2004, 2006-2011 by the Widelands Development Team
+ * Copyright (C) 2002-2016 by the Widelands Development Team
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,31 +17,30 @@
  *
  */
 
-#ifndef WL_EDITOR_UI_MENUS_TOOL_PLACE_BOB_OPTIONS_MENU_H
-#define WL_EDITOR_UI_MENUS_TOOL_PLACE_BOB_OPTIONS_MENU_H
+#ifndef WL_EDITOR_UI_MENUS_TOOL_PLACE_CRITTER_OPTIONS_MENU_H
+#define WL_EDITOR_UI_MENUS_TOOL_PLACE_CRITTER_OPTIONS_MENU_H
 
+#include <memory>
 #include <vector>
 
+#include "editor/tools/place_critter_tool.h"
+#include "editor/ui_menus/categorized_item_selection_menu.h"
 #include "editor/ui_menus/tool_options_menu.h"
-#include "ui_basic/tabpanel.h"
 
-struct EditorPlaceBobTool;
-namespace UI {
-struct Checkbox;
+class EditorInteractive;
+namespace Widelands {
+struct CritterDescr;
 }
 
-struct EditorToolPlaceBobOptionsMenu : public EditorToolOptionsMenu {
-	EditorToolPlaceBobOptionsMenu(EditorInteractive&,
-	                              EditorPlaceBobTool&,
-	                              UI::UniqueWindow::Registry&);
+struct EditorToolPlaceCritterOptionsMenu : public EditorToolOptionsMenu {
+	EditorToolPlaceCritterOptionsMenu(EditorInteractive&,
+	                                  EditorPlaceCritterTool&,
+	                                  UI::UniqueWindow::Registry&);
+	virtual ~EditorToolPlaceCritterOptionsMenu();
 
 private:
-	void clicked(int32_t, bool);
-
-	UI::TabPanel tabpanel_;
-	std::vector<UI::Checkbox*> checkboxes_;
-	EditorPlaceBobTool& pit_;
-	bool click_recursion_protect_;
+	std::unique_ptr<CategorizedItemSelectionMenu<Widelands::CritterDescr, EditorPlaceCritterTool>>
+	   multi_select_menu_;
 };
 
-#endif  // end of include guard: WL_EDITOR_UI_MENUS_TOOL_PLACE_BOB_OPTIONS_MENU_H
+#endif  // end of include guard: WL_EDITOR_UI_MENUS_TOOL_PLACE_CRITTER_OPTIONS_MENU_H

=== modified file 'src/editor/ui_menus/tool_set_terrain_options_menu.cc'
--- src/editor/ui_menus/tool_set_terrain_options_menu.cc	2016-10-16 20:35:47 +0000
+++ src/editor/ui_menus/tool_set_terrain_options_menu.cc	2017-01-17 08:56:03 +0000
@@ -88,7 +88,7 @@
 
 EditorToolSetTerrainOptionsMenu::EditorToolSetTerrainOptionsMenu(
    EditorInteractive& parent, EditorSetTerrainTool& tool, UI::UniqueWindow::Registry& registry)
-   : EditorToolOptionsMenu(parent, registry, 0, 0, _("Terrain Select")) {
+   : EditorToolOptionsMenu(parent, registry, 0, 0, _("Terrain")) {
 	const Widelands::World& world = parent.egbase().world();
 	multi_select_menu_.reset(
 	   new CategorizedItemSelectionMenu<Widelands::TerrainDescription, EditorSetTerrainTool>(

=== modified file 'src/logic/editor_game_base.cc'
--- src/logic/editor_game_base.cc	2016-12-18 17:02:44 +0000
+++ src/logic/editor_game_base.cc	2017-01-17 08:56:03 +0000
@@ -42,6 +42,7 @@
 #include "logic/map_objects/tribes/tribes.h"
 #include "logic/map_objects/tribes/ware_descr.h"
 #include "logic/map_objects/tribes/worker.h"
+#include "logic/map_objects/world/critter.h"
 #include "logic/map_objects/world/world.h"
 #include "logic/mapregion.h"
 #include "logic/player.h"
@@ -302,11 +303,12 @@
 Bob& EditorGameBase::create_critter(const Coords& c,
                                     DescriptionIndex const bob_type_idx,
                                     Player* owner) {
-	return create_bob(c, *world().get_bob_descr(bob_type_idx), owner);
+	const BobDescr* descr = dynamic_cast<const BobDescr*>(world().get_critter_descr(bob_type_idx));
+	return create_bob(c, *descr, owner);
 }
 
 Bob& EditorGameBase::create_critter(const Coords& c, const std::string& name, Player* owner) {
-	const BobDescr* descr = world().get_bob_descr(name);
+	const BobDescr* descr = dynamic_cast<const BobDescr*>(world().get_critter_descr(name));
 	if (descr == nullptr)
 		throw GameDataError("create_critter(%i,%i,%s,%s): critter not found", c.x, c.y, name.c_str(),
 		                    owner->get_name().c_str());

=== modified file 'src/logic/map_objects/tribes/worker.cc'
--- src/logic/map_objects/tribes/worker.cc	2016-12-14 22:11:52 +0000
+++ src/logic/map_objects/tribes/worker.cc	2017-01-17 08:56:03 +0000
@@ -304,7 +304,7 @@
 	int32_t const idx = game.logic_rand() % action.sparamv.size();
 
 	const std::string& bob = action.sparamv[idx];
-	state.ivar2 = game.world().get_bob(bob.c_str());
+	state.ivar2 = game.world().get_critter(bob.c_str());
 
 	if (state.ivar2 < 0) {
 		molog("  WARNING: Unknown bob %s\n", bob.c_str());

=== modified file 'src/logic/map_objects/world/critter.cc'
--- src/logic/map_objects/world/critter.cc	2016-12-03 12:51:06 +0000
+++ src/logic/map_objects/world/critter.cc	2017-01-17 08:56:03 +0000
@@ -97,8 +97,11 @@
 ===========================================================================
 */
 
-CritterDescr::CritterDescr(const std::string& init_descname, const LuaTable& table)
-   : BobDescr(init_descname, MapObjectType::CRITTER, MapObjectDescr::OwnerType::kWorld, table) {
+CritterDescr::CritterDescr(const std::string& init_descname,
+                           const LuaTable& table,
+                           const World& world)
+   : BobDescr(init_descname, MapObjectType::CRITTER, MapObjectDescr::OwnerType::kWorld, table),
+     editor_category_(nullptr) {
 	add_directional_animation(&walk_anims_, "walk");
 
 	add_attributes(
@@ -114,6 +117,13 @@
 			throw wexception("Parse error in program %s: %s", program_name.c_str(), e.what());
 		}
 	}
+	int editor_category_index =
+	   world.editor_critter_categories().get_index(table.get_string("editor_category"));
+	if (editor_category_index == Widelands::INVALID_INDEX) {
+		throw GameDataError(
+		   "Unknown editor_category: %s\n", table.get_string("editor_category").c_str());
+	}
+	editor_category_ = world.editor_critter_categories().get_mutable(editor_category_index);
 }
 
 CritterDescr::~CritterDescr() {
@@ -143,6 +153,10 @@
 	return is_swimming() ? MOVECAPS_SWIM : MOVECAPS_WALK;
 }
 
+const EditorCategory* CritterDescr::editor_category() const {
+	return editor_category_;
+}
+
 /*
 ==============================================================================
 
@@ -291,7 +305,7 @@
 
 			if (owner == "world") {
 				critter_name = lookup_table.lookup_critter(critter_name);
-				descr = dynamic_cast<const CritterDescr*>(egbase.world().get_bob_descr(critter_name));
+				descr = egbase.world().get_critter_descr(critter_name);
 			} else {
 				throw GameDataError(
 				   "Tribes don't have critters %s/%s", owner.c_str(), critter_name.c_str());

=== modified file 'src/logic/map_objects/world/critter.h'
--- src/logic/map_objects/world/critter.h	2016-08-04 15:49:05 +0000
+++ src/logic/map_objects/world/critter.h	2017-01-17 08:56:03 +0000
@@ -31,12 +31,13 @@
 
 struct CritterAction;
 struct CritterProgram;
+class World;
 
 //
 // Description
 //
 struct CritterDescr : BobDescr {
-	CritterDescr(const std::string& init_descname, const LuaTable&);
+	CritterDescr(const std::string& init_descname, const LuaTable&, const Widelands::World& world);
 	~CritterDescr() override;
 
 	Bob& create_object() const override;
@@ -49,10 +50,13 @@
 
 	CritterProgram const* get_program(const std::string&) const;
 
+	const EditorCategory* editor_category() const;
+
 private:
 	DirAnimations walk_anims_;
 	using Programs = std::map<std::string, CritterProgram*>;
 	Programs programs_;
+	EditorCategory* editor_category_;  // not owned.
 	DISALLOW_COPY_AND_ASSIGN(CritterDescr);
 };
 

=== modified file 'src/logic/map_objects/world/editor_category.cc'
--- src/logic/map_objects/world/editor_category.cc	2015-11-28 22:29:26 +0000
+++ src/logic/map_objects/world/editor_category.cc	2017-01-17 08:56:03 +0000
@@ -29,10 +29,14 @@
 EditorCategory::EditorCategory(const LuaTable& table)
    : name_(table.get_string("name")),
      descname_(table.get_string("descname")),
-     image_file_(table.get_string("picture")) {
+     image_file_(table.get_string("picture")),
+     items_per_row_(table.get_int("items_per_row")) {
 	if (!g_fs->file_exists(image_file_)) {
 		throw GameDataError("EditorCategory %s has non-existing \"picture\".", name_.c_str());
 	}
+	if (items_per_row_ <= 0) {
+		throw GameDataError("EditorCategory %s has less than 1 item per row.", name_.c_str());
+	}
 }
 
 const std::string& EditorCategory::name() const {
@@ -49,4 +53,8 @@
 	return image;
 }
 
+int EditorCategory::items_per_row() const {
+	return items_per_row_;
+}
+
 }  // namespace Widelands

=== modified file 'src/logic/map_objects/world/editor_category.h'
--- src/logic/map_objects/world/editor_category.h	2015-11-28 22:29:26 +0000
+++ src/logic/map_objects/world/editor_category.h	2017-01-17 08:56:03 +0000
@@ -44,10 +44,14 @@
 	/// The menu image for the category.
 	const Image* picture() const;
 
+	/// The number of items displayed in each row.
+	int items_per_row() const;
+
 private:
 	const std::string name_;
 	const std::string descname_;
 	const std::string image_file_;
+	const int items_per_row_;
 	DISALLOW_COPY_AND_ASSIGN(EditorCategory);
 };
 

=== modified file 'src/logic/map_objects/world/map_gen.cc'
--- src/logic/map_objects/world/map_gen.cc	2016-12-03 13:32:28 +0000
+++ src/logic/map_objects/world/map_gen.cc	2017-01-17 08:56:03 +0000
@@ -309,7 +309,7 @@
 					throw wexception("unknown immovable %s", category.get_immovable(jx).c_str());
 
 			for (size_t jx = 0; jx < category.num_critters(); jx++)
-				if (world.get_bob(category.get_critter(jx).c_str()) == Widelands::INVALID_INDEX)
+				if (world.get_critter(category.get_critter(jx).c_str()) == Widelands::INVALID_INDEX)
 					throw wexception("unknown critter %s", category.get_critter(jx).c_str());
 		}
 	}

=== modified file 'src/logic/map_objects/world/world.cc'
--- src/logic/map_objects/world/world.cc	2016-08-04 15:49:05 +0000
+++ src/logic/map_objects/world/world.cc	2017-01-17 08:56:03 +0000
@@ -24,7 +24,6 @@
 #include "base/i18n.h"
 #include "graphic/image_io.h"
 #include "logic/game_data_error.h"
-#include "logic/map_objects/bob.h"
 #include "logic/map_objects/immovable.h"
 #include "logic/map_objects/world/critter.h"
 #include "logic/map_objects/world/editor_category.h"
@@ -35,11 +34,12 @@
 namespace Widelands {
 
 World::World()
-   : bobs_(new DescriptionMaintainer<BobDescr>()),
+   : critters_(new DescriptionMaintainer<CritterDescr>()),
      immovables_(new DescriptionMaintainer<ImmovableDescr>()),
      terrains_(new DescriptionMaintainer<TerrainDescription>()),
      resources_(new DescriptionMaintainer<ResourceDescription>()),
      editor_terrain_categories_(new DescriptionMaintainer<EditorCategory>()),
+     editor_critter_categories_(new DescriptionMaintainer<EditorCategory>()),
      editor_immovable_categories_(new DescriptionMaintainer<EditorCategory>()) {
 }
 
@@ -79,7 +79,7 @@
 
 void World::add_critter_type(const LuaTable& table) {
 	i18n::Textdomain td("world");
-	bobs_->add(new CritterDescr(_(table.get_string("descname")), table));
+	critters_->add(new CritterDescr(_(table.get_string("descname")), table, *this));
 }
 
 const DescriptionMaintainer<ImmovableDescr>& World::immovables() const {
@@ -99,6 +99,14 @@
 	return *editor_terrain_categories_;
 }
 
+void World::add_editor_critter_category(const LuaTable& table) {
+	editor_critter_categories_->add(new EditorCategory(table));
+}
+
+const DescriptionMaintainer<EditorCategory>& World::editor_critter_categories() const {
+	return *editor_critter_categories_;
+}
+
 void World::add_editor_immovable_category(const LuaTable& table) {
 	editor_immovable_categories_->add(new EditorCategory(table));
 }
@@ -124,20 +132,20 @@
 	return i != INVALID_INDEX ? terrains_->get_mutable(i) : nullptr;
 }
 
-DescriptionIndex World::get_bob(char const* const l) const {
-	return bobs_->get_index(l);
-}
-
-BobDescr const* World::get_bob_descr(DescriptionIndex index) const {
-	return bobs_->get_mutable(index);
-}
-
-BobDescr const* World::get_bob_descr(const std::string& name) const {
-	return bobs_->exists(name.c_str());
-}
-
-int32_t World::get_nr_bobs() const {
-	return bobs_->size();
+DescriptionIndex World::get_critter(char const* const l) const {
+	return critters_->get_index(l);
+}
+
+const DescriptionMaintainer<CritterDescr>& World::critters() const {
+	return *critters_;
+}
+
+CritterDescr const* World::get_critter_descr(DescriptionIndex index) const {
+	return critters_->get_mutable(index);
+}
+
+CritterDescr const* World::get_critter_descr(const std::string& name) const {
+	return critters_->exists(name.c_str());
 }
 
 DescriptionIndex World::get_immovable_index(const std::string& name) const {

=== modified file 'src/logic/map_objects/world/world.h'
--- src/logic/map_objects/world/world.h	2016-02-11 15:05:53 +0000
+++ src/logic/map_objects/world/world.h	2017-01-17 08:56:03 +0000
@@ -31,13 +31,12 @@
 
 namespace Widelands {
 
-class BobDescr;
+struct CritterDescr;
 class EditorCategory;
 class EditorGameBase;
 class ImmovableDescr;
 class ResourceDescription;
 class TerrainDescription;
-struct CritterDescr;
 
 /// This is the in memory descriptions of the world and provides access to
 /// terrains, immovables and resources.
@@ -52,10 +51,10 @@
 	TerrainDescription& terrain_descr(DescriptionIndex i) const;
 	const TerrainDescription* terrain_descr(const std::string& name) const;
 
-	DescriptionIndex get_bob(char const* const l) const;
-	BobDescr const* get_bob_descr(DescriptionIndex index) const;
-	BobDescr const* get_bob_descr(const std::string& name) const;
-	int32_t get_nr_bobs() const;
+	const DescriptionMaintainer<CritterDescr>& critters() const;
+	DescriptionIndex get_critter(char const* const l) const;
+	CritterDescr const* get_critter_descr(DescriptionIndex index) const;
+	CritterDescr const* get_critter_descr(const std::string& name) const;
 
 	const DescriptionMaintainer<ImmovableDescr>& immovables() const;
 	DescriptionIndex get_immovable_index(const std::string& name) const;
@@ -81,10 +80,12 @@
 
 	/// Add an editor categories for grouping items in the editor.
 	void add_editor_terrain_category(const LuaTable& table);
+	void add_editor_critter_category(const LuaTable& table);
 	void add_editor_immovable_category(const LuaTable& table);
 
 	/// Access to the editor categories.
 	const DescriptionMaintainer<EditorCategory>& editor_terrain_categories() const;
+	const DescriptionMaintainer<EditorCategory>& editor_critter_categories() const;
 	const DescriptionMaintainer<EditorCategory>& editor_immovable_categories() const;
 
 	// Load the graphics for the world. Animations are loaded on
@@ -92,11 +93,12 @@
 	void load_graphics();
 
 private:
-	std::unique_ptr<DescriptionMaintainer<BobDescr>> bobs_;
+	std::unique_ptr<DescriptionMaintainer<CritterDescr>> critters_;
 	std::unique_ptr<DescriptionMaintainer<ImmovableDescr>> immovables_;
 	std::unique_ptr<DescriptionMaintainer<TerrainDescription>> terrains_;
 	std::unique_ptr<DescriptionMaintainer<ResourceDescription>> resources_;
 	std::unique_ptr<DescriptionMaintainer<EditorCategory>> editor_terrain_categories_;
+	std::unique_ptr<DescriptionMaintainer<EditorCategory>> editor_critter_categories_;
 	std::unique_ptr<DescriptionMaintainer<EditorCategory>> editor_immovable_categories_;
 
 	DISALLOW_COPY_AND_ASSIGN(World);

=== modified file 'src/map_io/map_bob_packet.cc'
--- src/map_io/map_bob_packet.cc	2016-08-04 15:49:05 +0000
+++ src/map_io/map_bob_packet.cc	2017-01-17 08:56:03 +0000
@@ -21,6 +21,7 @@
 
 #include "io/fileread.h"
 #include "logic/map_objects/tribes/tribe_descr.h"
+#include "logic/map_objects/world/critter.h"
 #include "logic/map_objects/world/world.h"
 #include "logic/player.h"
 #include "map_io/map_object_loader.h"
@@ -49,11 +50,11 @@
 	const std::string name = lookup_table.lookup_critter(read_name);
 	try {
 		const World& world = egbase.world();
-		DescriptionIndex const idx = world.get_bob(name.c_str());
+		DescriptionIndex const idx = world.get_critter(name.c_str());
 		if (idx == INVALID_INDEX)
 			throw GameDataError("world does not define bob type \"%s\"", name.c_str());
 
-		const BobDescr& descr = *world.get_bob_descr(idx);
+		const CritterDescr& descr = *world.get_critter_descr(idx);
 		descr.create(egbase, nullptr, coords);
 		// We do not register this object as needing loading. This packet is only
 		// in fresh maps, that are just started. As soon as the game saves

=== modified file 'src/map_io/s2map.cc'
--- src/map_io/s2map.cc	2016-12-14 22:11:52 +0000
+++ src/map_io/s2map.cc	2017-01-17 08:56:03 +0000
@@ -585,7 +585,7 @@
 			}
 
 			if (!bobname.empty()) {
-				Widelands::DescriptionIndex const idx = world.get_bob(bobname.c_str());
+				Widelands::DescriptionIndex const idx = world.get_critter(bobname.c_str());
 				if (idx == Widelands::INVALID_INDEX) {
 					throw wexception("Missing bob type %s", bobname.c_str());
 				}

=== modified file 'src/scripting/lua_root.cc'
--- src/scripting/lua_root.cc	2017-01-08 15:42:04 +0000
+++ src/scripting/lua_root.cc	2017-01-17 08:56:03 +0000
@@ -301,6 +301,7 @@
 const char LuaWorld::className[] = "World";
 const MethodType<LuaWorld> LuaWorld::Methods[] = {
    METHOD(LuaWorld, new_critter_type),
+   METHOD(LuaWorld, new_editor_critter_category),
    METHOD(LuaWorld, new_editor_immovable_category),
    METHOD(LuaWorld, new_editor_terrain_category),
    METHOD(LuaWorld, new_immovable_type),
@@ -489,6 +490,26 @@
 }
 
 /* RST
+	.. method:: new_editor_critter_category(table)
+
+		Like :func:`new_editor_terrain_category`, but for immovables.
+
+		:returns: :const:`nil`
+*/
+int LuaWorld::new_editor_critter_category(lua_State* L) {
+	if (lua_gettop(L) != 2) {
+		report_error(L, "Takes only one argument.");
+	}
+	try {
+		LuaTable table(L);
+		get_egbase(L).mutable_world()->add_editor_critter_category(table);
+	} catch (std::exception& e) {
+		report_error(L, "%s", e.what());
+	}
+	return 0;
+}
+
+/* RST
    .. method:: new_editor_immovable_category(table)
 
       Like :func:`new_editor_terrain_category`, but for immovables.

=== modified file 'src/scripting/lua_root.h'
--- src/scripting/lua_root.h	2016-08-04 15:49:05 +0000
+++ src/scripting/lua_root.h	2017-01-17 08:56:03 +0000
@@ -126,6 +126,7 @@
 	 * Lua methods
 	 */
 	int new_critter_type(lua_State* L);
+	int new_editor_critter_category(lua_State* L);
 	int new_editor_immovable_category(lua_State* L);
 	int new_editor_terrain_category(lua_State* L);
 	int new_immovable_type(lua_State* L);

=== modified file 'src/ui_basic/multilinetextarea.cc'
--- src/ui_basic/multilinetextarea.cc	2016-12-18 17:02:44 +0000
+++ src/ui_basic/multilinetextarea.cc	2017-01-17 08:56:03 +0000
@@ -46,7 +46,8 @@
      force_new_renderer_(false),
      use_old_renderer_(false),
      scrollbar_(this, get_w() - Scrollbar::kSize, 0, Scrollbar::kSize, h, button_background, false),
-     scrollmode_(scroll_mode) {
+     scrollmode_(scroll_mode),
+     pic_background_(nullptr) {
 	assert(scrollmode_ == MultilineTextarea::ScrollMode::kNoScrolling || Scrollbar::kSize <= w);
 	set_thinks(false);
 
@@ -144,6 +145,9 @@
  * Redraw the textarea
  */
 void MultilineTextarea::draw(RenderTarget& dst) {
+	if (pic_background_) {
+		dst.tile(Recti(0, 0, get_inner_w(), get_inner_h()), pic_background_, Vector2i(0, 0));
+	}
 	if (use_old_renderer_) {
 		rt.draw(dst, Vector2i(RICHTEXT_MARGIN, RICHTEXT_MARGIN - scrollbar_.get_scrollpos()));
 	} else {
@@ -186,6 +190,10 @@
 	scrollbar_.set_scrollpos(0);
 }
 
+void MultilineTextarea::set_background(const Image* background) {
+	pic_background_ = background;
+}
+
 std::string MultilineTextarea::make_richtext() {
 	std::string temp = richtext_escape(text_);
 	// Double paragraphs should generate an empty line.

=== modified file 'src/ui_basic/multilinetextarea.h'
--- src/ui_basic/multilinetextarea.h	2016-10-06 14:32:33 +0000
+++ src/ui_basic/multilinetextarea.h	2017-01-17 08:56:03 +0000
@@ -78,6 +78,8 @@
 	bool handle_mousewheel(uint32_t which, int32_t x, int32_t y) override;
 	void scroll_to_top();
 
+	void set_background(const Image* background);
+
 protected:
 	void layout() override;
 
@@ -101,6 +103,8 @@
 
 	Scrollbar scrollbar_;
 	ScrollMode scrollmode_;
+
+	const Image* pic_background_;
 };
 }