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

Proposed by GunChleoc
Status: Merged
Merged at revision: 9076
Proposed branch: lp:~widelands-dev/widelands/mipmaps
Merge into: lp:widelands
Diff against target: 3640 lines (+640/-486)
29 files modified
data/scripting/mapobjects.lua (+109/-25)
data/tribes/buildings/productionsites/barbarians/shipyard/init.lua (+7/-18)
data/tribes/buildings/warehouses/barbarians/warehouse/init.lua (+5/-10)
data/tribes/frisians.lua (+0/-1)
data/tribes/immovables/barleyfield_harvested/init.lua (+0/-1)
data/tribes/immovables/barleyfield_medium/init.lua (+0/-1)
data/tribes/immovables/barleyfield_ripe/init.lua (+0/-1)
data/tribes/immovables/barleyfield_small/init.lua (+0/-1)
data/tribes/immovables/barleyfield_tiny/init.lua (+0/-1)
data/tribes/immovables/berry_bushes/blueberry/init.lua (+16/-28)
data/tribes/immovables/berry_bushes/currant_black/init.lua (+16/-28)
data/tribes/immovables/berry_bushes/currant_red/init.lua (+16/-28)
data/tribes/immovables/berry_bushes/desert_hackberry/init.lua (+16/-28)
data/tribes/immovables/berry_bushes/juniper/init.lua (+16/-28)
data/tribes/immovables/berry_bushes/raspberry/init.lua (+16/-28)
data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua (+16/-28)
data/tribes/immovables/berry_bushes/strawberry/init.lua (+16/-28)
data/tribes/immovables/pond_dry/init.lua (+0/-1)
data/tribes/immovables/pond_growing/init.lua (+0/-1)
data/tribes/immovables/pond_mature/init.lua (+0/-1)
data/tribes/immovables/shipconstruction_frisians/init.lua (+0/-1)
data/tribes/workers/barbarians/builder/init.lua (+6/-15)
data/tribes/workers/barbarians/recruit/init.lua (+2/-7)
data/tribes/workers/barbarians/shipwright/init.lua (+6/-14)
doc/sphinx/source/animations.rst (+190/-62)
src/graphic/animation.cc (+183/-92)
src/graphic/animation.h (+2/-2)
src/graphic/rendertarget.cc (+2/-2)
src/logic/map_objects/map_object.cc (+0/-5)
To merge this branch: bzr merge lp:~widelands-dev/widelands/mipmaps
Reviewer Review Type Date Requested Status
Benedikt Straub Approve
Review via email: mp+363780@code.launchpad.net

Commit message

Add support for Mipmaps into the engine.
For testing purposes, some animations have been converted:
- Barbarian Warehouse, Shipyard, Builder, Recruit, Shipwright
- Frisian berry bushes + ponds

Description of the change

This is the first step in a series to improve graphics quality in Widelands, hopefully for Build 21.

1. Implement support for Mipmaps
   https://en.wikipedia.org/wiki/Mipmap

2. Add support to the font renderer

3. Implement spritesheets, otherwise the number of files will explode

4. Implement compressed spritemaps, otherwise the filesize will explode.
   This is only feasible for immovables.

5. Re-export everything from Blender

To post a comment you must log in.
lp:~widelands-dev/widelands/mipmaps updated
8671. By GunChleoc

Remove test output.

Revision history for this message
Benedikt Straub (nordfriese) wrote :

Did you forget to add the mipmaps for some of your testcases? I can find them only for the BAR warehouse idle, BAR shipyard working and BAR recruit walk_*; not for the builder, shipwright, ponds and bushes ..?
And I get a crash sometimes because the small blueberry has unmatching image sizes.

The warehouse and shipyard look very different when zooming in than on normal scale, but I assume that that´s an error in the settings with which they were re-rendered in Blender, and not a bug in the branch.
I don´t see any difference between the "old" scaling algorithm and the new mipmap when zooming out though.

Will do a code review soonish…

Thanks for implementing this feature :)

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4545. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/499807851.
Appveyor build 4332. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mipmaps-4332.

Revision history for this message
GunChleoc (gunchleoc) wrote :

For the Barbarian units without mipmaps, that is on purpose to test the new convenience function for animations that don't have mipmaps yet.

> The warehouse and shipyard look very different when zooming in than on normal scale, but I assume that that´s an error in the settings with which they were re-rendered in Blender, and not a bug in the branch.

Exactly, I am having a problem with the roof textures and those 2 models at least don't look completely messed up. I only re-exported the big version.

There is a quality difference when zooming out - mipmaps are giving better quality. They are also giving better quality at 100% zoom, because nothing is recalculated there.

As to the Frisian berry bushes, could you create the mipmap files for us in this branch?

lp:~widelands-dev/widelands/mipmaps updated
8672. By Nordfriese

Added mipmaps for all bushes

Revision history for this message
Benedikt Straub (nordfriese) wrote :

Ah, okay.
I´m afraid several of the blend files for older models are messed up. I guess the creators somehow post-processed the renders without documenting how to, or these aren´t even the actual model files but some experiments that overwrote the originals…

I uploaded mipmaps for all bushes to this branch now and additionally pushed a new Java tool to the media repo that quickly creates mipmaps for all scales from a set of high-res input files.

Revision history for this message
Benedikt Straub (nordfriese) wrote :

Code looks good to me, some diff comments with smaller suggestions.

Will test this more thoroughly the next days…

Revision history for this message
GunChleoc (gunchleoc) :
lp:~widelands-dev/widelands/mipmaps updated
8673. By GunChleoc

Addressed code review.

8674. By GunChleoc

Merged trunk.

8675. By Nordfriese

Reference to MipmapMaker in animations.rst

Revision history for this message
Benedikt Straub (nordfriese) wrote :

Played with this branch the last days. I was unable to find or trigger any problems, everything works as expected. Code LGTM.

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks!

lp:~widelands-dev/widelands/mipmaps updated
8676. By GunChleoc

Merged trunk.

8677. By GunChleoc

Optimized new images.

8678. By GunChleoc

Merged trunk.

8679. By GunChleoc

Add missing animation file

8680. By GunChleoc

Merged trunk.

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

lp:~widelands-dev/widelands/mipmaps updated
8681. By GunChleoc

Merged trunk.

8682. By GunChleoc

Fix fps check and make clang happy.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4782. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/523935950.
Appveyor build 4534. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mipmaps-4534.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/scripting/mapobjects.lua'
2--- data/scripting/mapobjects.lua 2017-02-08 18:48:32 +0000
3+++ data/scripting/mapobjects.lua 2019-04-24 11:21:34 +0000
4@@ -9,10 +9,12 @@
5 -- RST
6 -- .. function:: print_loading_message(preamble, func)
7 --
8--- Prints a message containing the duration func() required to run.
9+-- Prints a message containing the duration func() required to run.
10 --
11 -- :arg preamble: The name of the item that was being loaded
12+-- :type preamble: :class:`string`
13 -- :arg func: The function to time execution off.
14+-- :type func: :class:`function`
15 function print_loading_message(preamble, func)
16 local start = ticks()
17 func()
18@@ -20,32 +22,114 @@
19 end
20
21
22--- RST
23--- .. function:: add_walking_animations(table, animationname, dirname, basename, hotspot, fps)
24---
25--- Adds 6 walk or sail animations - one for each walking direction - to 'table'.
26---
27--- :arg table: A table that the animation data is added to. It may already contain some animations.
28+-- Helper function for finding animation files with varying numbering length
29+function get_animation_files(prefix)
30+ local animation_files = path.list_files(prefix .. "_??.png")
31+ if #animation_files < 1 then
32+ animation_files = path.list_files(prefix .. "_???.png")
33+ end
34+ if #animation_files < 1 then
35+ animation_files = path.list_files(prefix .. "_?.png")
36+ end
37+ return animation_files
38+end
39+
40+
41+-- The mipmap scales supported by the engine.
42+-- Ensure that this always matches kSupportedScales in animations.cc
43+local supported_scales = { 0.5, 1, 2, 4 }
44+
45+
46+-- RST
47+-- .. function:: add_animation(animationtable, animationname, dirname, basename, hotspot [, fps])
48+--
49+-- Convenience function for adding an animation to `animationtable`.
50+-- Supports both simple animations and mipmaps.
51+-- See :ref:`animations` for more documentation and code examples.
52+--
53+-- :arg animationtable: The table that the animation data will be added to.
54+-- It may already contain some animations.
55+-- :type animationtable: :class:`table`
56+-- :arg animationname: The name of the animation to be added, e.g. ``idle``.
57+-- :type animationname: :class:`string`
58+-- :arg dirname: The name of the directory where the animation image files are located.
59+-- :type dirname: :class:`string`
60+-- :arg basename: The basename of the animation files. The filenames of the
61+-- animation files need to have the format ``<basename>_\d{2,3}.png`` for simple
62+-- file animations, and ``<basename>_<scale>_\d{2,3}.png`` for mipmaps.
63+-- Supported scales are ``0.5``, ``1``, ``2`` and ``4``.
64+-- :type basename: :class:`string`
65+-- :arg hotspot: The hotspot coordinates for blitting, e.g. ``{2, 20}``.
66+-- :type hotspot: :class:`array`
67+-- :arg fps: Frames per second. Only use this if the animation has more than
68+-- 1 frame, and if you need to deviate from the default frame rate.
69+-- :type fps: :class:`integer`
70+function add_animation(animationtable, animationname, dirname, basename, hotspot, fps)
71+ mipmap = {}
72+ for scale_idx, current_scale in ipairs(supported_scales) do
73+ local listed_files = get_animation_files(dirname .. basename .. "_" .. current_scale)
74+ if #listed_files > 0 then
75+ table.insert(
76+ mipmap,
77+ {
78+ scale = current_scale,
79+ files = listed_files,
80+ }
81+ )
82+ end
83+ end
84+ if #mipmap < 1 then
85+ table.insert(
86+ mipmap,
87+ {
88+ scale = 1,
89+ files = get_animation_files(dirname .. basename),
90+ }
91+ )
92+ end
93+ animationtable[animationname] = {
94+ mipmap = mipmap,
95+ hotspot = hotspot,
96+ }
97+ if (fps ~= nil) then
98+ animationtable[animationname]["fps"] = fps
99+ end
100+end
101+
102+
103+
104+-- RST
105+-- .. function:: add_walking_animations(animationtable, animationname, dirname, basename, hotspot [, fps])
106+--
107+-- Adds 6 walk or sail animations - one for each walking direction - to `animationtable`.
108+-- Supports both simple animations and mipmaps.
109+-- See :ref:`animations` for more documentation and code examples.
110+--
111+-- :arg animationtable: The table that the animation data will be added to.
112+-- It may already contain some animations.
113+-- :type animationtable: :class:`table`
114 -- :arg animationname: The name of the animation to be added, e.g. ``walkload``.
115+-- :type animationname: :class:`string`
116 -- :arg dirname: The name of the directory where the animation image files are located.
117--- :arg basename: The basename of the animation files. The filenames of the animation files need to have the format ``<basename>_(e|ne|se|sw|w|nw)_\d+.png``
118--- :arg hotspot: The hotspot coordinates for blitting, e.g. ``{ 2, 20 }``.
119--- :arg fps: Frames per second. Only use this if the animation has more than 1 frame, and if you need to deviate from the default frame rate.
120-function add_walking_animations(table, animationname, dirname, basename, hotspot, fps)
121- if (fps ~= nil) then
122- for idx, dir in ipairs{ "ne", "e", "se", "sw", "w", "nw" } do
123- table[animationname .. "_" .. dir] = {
124- pictures = path.list_files(dirname .. basename .. "_" .. dir .. "_??.png"),
125- hotspot = hotspot,
126- fps = fps,
127- }
128- end
129- else
130- for idx, dir in ipairs{ "ne", "e", "se", "sw", "w", "nw" } do
131- table[animationname .. "_" .. dir] = {
132- pictures = path.list_files(dirname .. basename .. "_" .. dir .. "_??.png"),
133- hotspot = hotspot,
134- }
135+-- :type dirname: :class:`string`
136+-- :arg basename: The basename of the animation files. The filenames of the
137+-- animation files need to have the format
138+-- ``<basename>_(e|ne|se|sw|w|nw)_\d{2,3}.png`` for simple animations, and
139+-- ``<basename>_(e|ne|se|sw|w|nw)_<scale>_\d{2,3}.png`` for mipmaps.
140+-- Supported scales are ``0.5``, ``1``, ``2`` and ``4``.
141+-- :type basename: :class:`string`
142+-- :arg hotspot: The hotspot coordinates for blitting, e.g. ``{2, 20}``.
143+-- :type hotspot: :class:`array`
144+-- :arg fps: Frames per second. Only use this if the animation has more than
145+-- 1 frame, and if you need to deviate from the default frame rate.
146+-- :type fps: :class:`integer`
147+function add_walking_animations(animationtable, animationname, dirname, basename, hotspot, fps)
148+ for idx, dir in ipairs{ "ne", "e", "se", "sw", "w", "nw" } do
149+ if fps ~= nil then
150+ add_animation(animationtable, animationname .. "_" .. dir, dirname, basename .. "_" .. dir, hotspot, fps)
151+ else
152+ add_animation(animationtable, animationname .. "_" .. dir, dirname, basename .. "_" .. dir, hotspot)
153 end
154 end
155 end
156+
157
158=== added file 'data/tribes/buildings/productionsites/barbarians/barracks/build_00.png'
159Binary files data/tribes/buildings/productionsites/barbarians/barracks/build_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/barracks/build_00.png 2019-04-24 11:21:34 +0000 differ
160=== removed file 'data/tribes/buildings/productionsites/barbarians/barracks/build_00.png'
161Binary files data/tribes/buildings/productionsites/barbarians/barracks/build_00.png 2019-03-30 06:46:25 +0000 and data/tribes/buildings/productionsites/barbarians/barracks/build_00.png 1970-01-01 00:00:00 +0000 differ
162=== modified file 'data/tribes/buildings/productionsites/barbarians/shipyard/init.lua'
163--- data/tribes/buildings/productionsites/barbarians/shipyard/init.lua 2018-09-06 09:21:44 +0000
164+++ data/tribes/buildings/productionsites/barbarians/shipyard/init.lua 2019-04-24 11:21:34 +0000
165@@ -1,5 +1,11 @@
166 dirname = path.dirname(__file__)
167
168+animations = {}
169+add_animation(animations, "idle", dirname, "idle", { 62, 48 })
170+add_animation(animations, "build", dirname, "build", { 62, 48 })
171+add_animation(animations, "unoccupied", dirname, "unoccupied", { 62, 48 })
172+add_animation(animations, "working", dirname, "working", { 62, 48 })
173+
174 tribes:new_productionsite_type {
175 msgctxt = "barbarians_building",
176 name = "barbarians_shipyard",
177@@ -22,24 +28,7 @@
178 granite = 2
179 },
180
181- animations = {
182- idle = {
183- pictures = path.list_files(dirname .. "idle_??.png"),
184- hotspot = { 62, 48 },
185- },
186- build = {
187- pictures = path.list_files(dirname .. "build_??.png"),
188- hotspot = { 62, 48 },
189- },
190- unoccupied = {
191- pictures = path.list_files(dirname .. "unoccupied_??.png"),
192- hotspot = { 62, 48 },
193- },
194- working = {
195- pictures = path.list_files(dirname .. "working_??.png"),
196- hotspot = { 62, 48 },
197- },
198- },
199+ animations = animations,
200
201 aihints = {
202 needs_water = true,
203
204=== added file 'data/tribes/buildings/productionsites/barbarians/shipyard/working_0.5_00.png'
205Binary files data/tribes/buildings/productionsites/barbarians/shipyard/working_0.5_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/shipyard/working_0.5_00.png 2019-04-24 11:21:34 +0000 differ
206=== added file 'data/tribes/buildings/productionsites/barbarians/shipyard/working_0.5_00_pc.png'
207Binary files data/tribes/buildings/productionsites/barbarians/shipyard/working_0.5_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/shipyard/working_0.5_00_pc.png 2019-04-24 11:21:34 +0000 differ
208=== renamed file 'data/tribes/buildings/productionsites/barbarians/shipyard/working_00.png' => 'data/tribes/buildings/productionsites/barbarians/shipyard/working_1_00.png'
209=== renamed file 'data/tribes/buildings/productionsites/barbarians/shipyard/working_00_pc.png' => 'data/tribes/buildings/productionsites/barbarians/shipyard/working_1_00_pc.png'
210=== added file 'data/tribes/buildings/productionsites/barbarians/shipyard/working_2_00.png'
211Binary files data/tribes/buildings/productionsites/barbarians/shipyard/working_2_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/shipyard/working_2_00.png 2019-04-24 11:21:34 +0000 differ
212=== added file 'data/tribes/buildings/productionsites/barbarians/shipyard/working_2_00_pc.png'
213Binary files data/tribes/buildings/productionsites/barbarians/shipyard/working_2_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/shipyard/working_2_00_pc.png 2019-04-24 11:21:34 +0000 differ
214=== added file 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_0.5_00.png'
215Binary files data/tribes/buildings/warehouses/barbarians/warehouse/idle_0.5_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/warehouses/barbarians/warehouse/idle_0.5_00.png 2019-04-24 11:21:34 +0000 differ
216=== added file 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_0.5_00_pc.png'
217Binary files data/tribes/buildings/warehouses/barbarians/warehouse/idle_0.5_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/warehouses/barbarians/warehouse/idle_0.5_00_pc.png 2019-04-24 11:21:34 +0000 differ
218=== renamed file 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_00.png' => 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_1_00.png'
219=== renamed file 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_00_pc.png' => 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_1_00_pc.png'
220=== added file 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_2_00.png'
221Binary files data/tribes/buildings/warehouses/barbarians/warehouse/idle_2_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/warehouses/barbarians/warehouse/idle_2_00.png 2019-04-24 11:21:34 +0000 differ
222=== added file 'data/tribes/buildings/warehouses/barbarians/warehouse/idle_2_00_pc.png'
223Binary files data/tribes/buildings/warehouses/barbarians/warehouse/idle_2_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/warehouses/barbarians/warehouse/idle_2_00_pc.png 2019-04-24 11:21:34 +0000 differ
224=== modified file 'data/tribes/buildings/warehouses/barbarians/warehouse/init.lua'
225--- data/tribes/buildings/warehouses/barbarians/warehouse/init.lua 2018-05-27 06:34:40 +0000
226+++ data/tribes/buildings/warehouses/barbarians/warehouse/init.lua 2019-04-24 11:21:34 +0000
227@@ -1,5 +1,9 @@
228 dirname = path.dirname(__file__)
229
230+animations = {}
231+add_animation(animations, "idle", dirname, "idle", { 60, 78 })
232+add_animation(animations, "build", dirname, "build", { 60, 78 })
233+
234 tribes:new_warehouse_type {
235 msgctxt = "barbarians_building",
236 name = "barbarians_warehouse",
237@@ -23,16 +27,7 @@
238 grout = 1
239 },
240
241- animations = {
242- idle = {
243- pictures = path.list_files(dirname .. "idle_??.png"),
244- hotspot = { 60, 78 }
245- },
246- build = {
247- pictures = path.list_files(dirname .. "build_??.png"),
248- hotspot = { 60, 78 },
249- }
250- },
251+ animations = animations,
252
253 aihints = {},
254
255
256=== modified file 'data/tribes/frisians.lua'
257--- data/tribes/frisians.lua 2018-10-19 14:27:06 +0000
258+++ data/tribes/frisians.lua 2019-04-24 11:21:34 +0000
259@@ -12,7 +12,6 @@
260 pictures = path.list_files (dirname .. "images/frisians/flag_??.png"),
261 hotspot = { 10, 39 },
262 fps = 10,
263- scale = 4.2,
264 }
265 },
266
267
268=== modified file 'data/tribes/images/frisians/flag_00.png'
269Binary files data/tribes/images/frisians/flag_00.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_00.png 2019-04-24 11:21:34 +0000 differ
270=== modified file 'data/tribes/images/frisians/flag_00_pc.png'
271Binary files data/tribes/images/frisians/flag_00_pc.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_00_pc.png 2019-04-24 11:21:34 +0000 differ
272=== modified file 'data/tribes/images/frisians/flag_01.png'
273Binary files data/tribes/images/frisians/flag_01.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_01.png 2019-04-24 11:21:34 +0000 differ
274=== modified file 'data/tribes/images/frisians/flag_01_pc.png'
275Binary files data/tribes/images/frisians/flag_01_pc.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_01_pc.png 2019-04-24 11:21:34 +0000 differ
276=== modified file 'data/tribes/images/frisians/flag_02.png'
277Binary files data/tribes/images/frisians/flag_02.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_02.png 2019-04-24 11:21:34 +0000 differ
278=== modified file 'data/tribes/images/frisians/flag_02_pc.png'
279Binary files data/tribes/images/frisians/flag_02_pc.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_02_pc.png 2019-04-24 11:21:34 +0000 differ
280=== modified file 'data/tribes/images/frisians/flag_03.png'
281Binary files data/tribes/images/frisians/flag_03.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_03.png 2019-04-24 11:21:34 +0000 differ
282=== modified file 'data/tribes/images/frisians/flag_03_pc.png'
283Binary files data/tribes/images/frisians/flag_03_pc.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_03_pc.png 2019-04-24 11:21:34 +0000 differ
284=== modified file 'data/tribes/images/frisians/flag_04.png'
285Binary files data/tribes/images/frisians/flag_04.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_04.png 2019-04-24 11:21:34 +0000 differ
286=== modified file 'data/tribes/images/frisians/flag_04_pc.png'
287Binary files data/tribes/images/frisians/flag_04_pc.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_04_pc.png 2019-04-24 11:21:34 +0000 differ
288=== modified file 'data/tribes/images/frisians/flag_05.png'
289Binary files data/tribes/images/frisians/flag_05.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_05.png 2019-04-24 11:21:34 +0000 differ
290=== modified file 'data/tribes/images/frisians/flag_05_pc.png'
291Binary files data/tribes/images/frisians/flag_05_pc.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_05_pc.png 2019-04-24 11:21:34 +0000 differ
292=== modified file 'data/tribes/images/frisians/flag_06.png'
293Binary files data/tribes/images/frisians/flag_06.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_06.png 2019-04-24 11:21:34 +0000 differ
294=== modified file 'data/tribes/images/frisians/flag_06_pc.png'
295Binary files data/tribes/images/frisians/flag_06_pc.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_06_pc.png 2019-04-24 11:21:34 +0000 differ
296=== modified file 'data/tribes/images/frisians/flag_07.png'
297Binary files data/tribes/images/frisians/flag_07.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_07.png 2019-04-24 11:21:34 +0000 differ
298=== modified file 'data/tribes/images/frisians/flag_07_pc.png'
299Binary files data/tribes/images/frisians/flag_07_pc.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_07_pc.png 2019-04-24 11:21:34 +0000 differ
300=== modified file 'data/tribes/images/frisians/flag_08.png'
301Binary files data/tribes/images/frisians/flag_08.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_08.png 2019-04-24 11:21:34 +0000 differ
302=== modified file 'data/tribes/images/frisians/flag_08_pc.png'
303Binary files data/tribes/images/frisians/flag_08_pc.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_08_pc.png 2019-04-24 11:21:34 +0000 differ
304=== modified file 'data/tribes/images/frisians/flag_09.png'
305Binary files data/tribes/images/frisians/flag_09.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_09.png 2019-04-24 11:21:34 +0000 differ
306=== modified file 'data/tribes/images/frisians/flag_09_pc.png'
307Binary files data/tribes/images/frisians/flag_09_pc.png 2019-03-30 06:46:25 +0000 and data/tribes/images/frisians/flag_09_pc.png 2019-04-24 11:21:34 +0000 differ
308=== modified file 'data/tribes/immovables/barleyfield_harvested/idle_00.png'
309Binary files data/tribes/immovables/barleyfield_harvested/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/barleyfield_harvested/idle_00.png 2019-04-24 11:21:34 +0000 differ
310=== modified file 'data/tribes/immovables/barleyfield_harvested/init.lua'
311--- data/tribes/immovables/barleyfield_harvested/init.lua 2018-02-05 12:57:52 +0000
312+++ data/tribes/immovables/barleyfield_harvested/init.lua 2019-04-24 11:21:34 +0000
313@@ -18,7 +18,6 @@
314 idle = {
315 pictures = path.list_files(dirname .. "idle_??.png"),
316 hotspot = { 21, 34 },
317- scale = 2.5,
318 },
319 }
320 }
321
322=== modified file 'data/tribes/immovables/barleyfield_medium/idle_00.png'
323Binary files data/tribes/immovables/barleyfield_medium/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/barleyfield_medium/idle_00.png 2019-04-24 11:21:34 +0000 differ
324=== modified file 'data/tribes/immovables/barleyfield_medium/init.lua'
325--- data/tribes/immovables/barleyfield_medium/init.lua 2018-02-05 12:57:52 +0000
326+++ data/tribes/immovables/barleyfield_medium/init.lua 2019-04-24 11:21:34 +0000
327@@ -19,7 +19,6 @@
328 idle = {
329 pictures = path.list_files(dirname .. "idle_??.png"),
330 hotspot = { 21, 33 },
331- scale = 2.5,
332 },
333 }
334 }
335
336=== modified file 'data/tribes/immovables/barleyfield_ripe/idle_00.png'
337Binary files data/tribes/immovables/barleyfield_ripe/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/barleyfield_ripe/idle_00.png 2019-04-24 11:21:34 +0000 differ
338=== modified file 'data/tribes/immovables/barleyfield_ripe/init.lua'
339--- data/tribes/immovables/barleyfield_ripe/init.lua 2018-02-05 12:57:52 +0000
340+++ data/tribes/immovables/barleyfield_ripe/init.lua 2019-04-24 11:21:34 +0000
341@@ -22,7 +22,6 @@
342 idle = {
343 pictures = path.list_files (dirname .. "idle_??.png"),
344 hotspot = { 21, 34 },
345- scale = 2.5,
346 },
347 }
348 }
349
350=== modified file 'data/tribes/immovables/barleyfield_small/idle_00.png'
351Binary files data/tribes/immovables/barleyfield_small/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/barleyfield_small/idle_00.png 2019-04-24 11:21:34 +0000 differ
352=== modified file 'data/tribes/immovables/barleyfield_small/init.lua'
353--- data/tribes/immovables/barleyfield_small/init.lua 2018-02-05 12:57:52 +0000
354+++ data/tribes/immovables/barleyfield_small/init.lua 2019-04-24 11:21:34 +0000
355@@ -19,7 +19,6 @@
356 idle = {
357 pictures = path.list_files(dirname .. "idle_??.png"),
358 hotspot = { 21, 25 },
359- scale = 2.5,
360 },
361 }
362 }
363
364=== modified file 'data/tribes/immovables/barleyfield_tiny/idle_00.png'
365Binary files data/tribes/immovables/barleyfield_tiny/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/barleyfield_tiny/idle_00.png 2019-04-24 11:21:34 +0000 differ
366=== modified file 'data/tribes/immovables/barleyfield_tiny/init.lua'
367--- data/tribes/immovables/barleyfield_tiny/init.lua 2018-02-05 12:57:52 +0000
368+++ data/tribes/immovables/barleyfield_tiny/init.lua 2019-04-24 11:21:34 +0000
369@@ -19,7 +19,6 @@
370 idle = {
371 pictures = path.list_files(dirname .. "idle_??.png"),
372 hotspot = { 21, 13 },
373- scale = 2.5,
374 },
375 }
376 }
377
378=== modified file 'data/tribes/immovables/berry_bushes/blueberry/init.lua'
379--- data/tribes/immovables/berry_bushes/blueberry/init.lua 2019-01-12 13:10:40 +0000
380+++ data/tribes/immovables/berry_bushes/blueberry/init.lua 2019-04-24 11:21:34 +0000
381@@ -9,6 +9,9 @@
382 pickiness = 15, -- Lower means it is less picky, i.e. it can deal better.
383 }
384
385+animations = {}
386+add_animation(animations, "idle", dirname, "tiny/idle", { 6, 7 })
387+
388 tribes:new_immovable_type {
389 msgctxt = "immovable",
390 name = "berry_bush_blueberry_tiny",
391@@ -24,15 +27,12 @@
392 "grow=berry_bush_blueberry_small",
393 },
394 },
395- animations = {
396- idle = {
397- pictures = path.list_files (dirname .. "tiny/idle_?.png"),
398- hotspot = {6, 7},
399- scale = 3,
400- },
401- },
402+ animations = animations,
403 }
404
405+animations = {}
406+add_animation(animations, "idle", dirname, "small/idle", { 12, 13 })
407+
408 tribes:new_immovable_type {
409 msgctxt = "immovable",
410 name = "berry_bush_blueberry_small",
411@@ -48,15 +48,12 @@
412 "grow=berry_bush_blueberry_medium",
413 },
414 },
415- animations = {
416- idle = {
417- pictures = path.list_files (dirname .. "small/idle_?.png"),
418- hotspot = {12, 13},
419- scale = 3,
420- },
421- },
422+ animations = animations,
423 }
424
425+animations = {}
426+add_animation(animations, "idle", dirname, "medium/idle", { 15, 16 })
427+
428 tribes:new_immovable_type {
429 msgctxt = "immovable",
430 name = "berry_bush_blueberry_medium",
431@@ -72,15 +69,12 @@
432 "grow=berry_bush_blueberry_ripe",
433 },
434 },
435- animations = {
436- idle = {
437- pictures = path.list_files (dirname .. "medium/idle_?.png"),
438- hotspot = {15, 16},
439- scale = 3,
440- },
441- },
442+ animations = animations,
443 }
444
445+animations = {}
446+add_animation(animations, "idle", dirname, "ripe/idle", { 15, 16 })
447+
448 tribes:new_immovable_type {
449 msgctxt = "immovable",
450 name = "berry_bush_blueberry_ripe",
451@@ -98,11 +92,5 @@
452 "remove=",
453 }
454 },
455- animations = {
456- idle = {
457- pictures = path.list_files (dirname .. "ripe/idle_?.png"),
458- hotspot = {15, 16},
459- scale = 3,
460- },
461- },
462+ animations = animations,
463 }
464
465=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_0.png'
466Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
467=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_1.png'
468Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
469=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_2.png'
470Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
471=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_3.png'
472Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
473=== removed file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.png'
474Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_0.png 1970-01-01 00:00:00 +0000 differ
475=== removed file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_1.png'
476Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_1.png 1970-01-01 00:00:00 +0000 differ
477=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_0.png'
478Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
479=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_1.png'
480Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
481=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_2.png'
482Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
483=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_3.png'
484Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
485=== removed file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_2.png'
486Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_2.png 1970-01-01 00:00:00 +0000 differ
487=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_0.png'
488Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
489=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_1.png'
490Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
491=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_2.png'
492Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
493=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_3.png'
494Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
495=== removed file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_3.png'
496Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_3.png 1970-01-01 00:00:00 +0000 differ
497=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_0.png'
498Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
499=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_1.png'
500Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
501=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_2.png'
502Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
503=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_3.png'
504Binary files data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
505=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_0.png'
506Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
507=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_1.png'
508Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
509=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_2.png'
510Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
511=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_3.png'
512Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
513=== removed file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.png'
514Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_0.png 1970-01-01 00:00:00 +0000 differ
515=== removed file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1.png'
516Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1.png 1970-01-01 00:00:00 +0000 differ
517=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_0.png'
518Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
519=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_1.png'
520Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
521=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_2.png'
522Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
523=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_3.png'
524Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
525=== removed file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2.png'
526Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2.png 1970-01-01 00:00:00 +0000 differ
527=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_0.png'
528Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
529=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_1.png'
530Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
531=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_2.png'
532Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
533=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_3.png'
534Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
535=== removed file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_3.png'
536Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_3.png 1970-01-01 00:00:00 +0000 differ
537=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_0.png'
538Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
539=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_1.png'
540Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
541=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_2.png'
542Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
543=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_3.png'
544Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
545=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_0.png'
546Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
547=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_1.png'
548Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
549=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_2.png'
550Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
551=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_3.png'
552Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
553=== removed file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_0.png'
554Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_0.png 1970-01-01 00:00:00 +0000 differ
555=== removed file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_1.png'
556Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_1.png 1970-01-01 00:00:00 +0000 differ
557=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_1_0.png'
558Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
559=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_1_1.png'
560Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
561=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_1_2.png'
562Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
563=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_1_3.png'
564Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
565=== removed file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_2.png'
566Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_2.png 1970-01-01 00:00:00 +0000 differ
567=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_2_0.png'
568Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
569=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_2_1.png'
570Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
571=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_2_2.png'
572Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
573=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_2_3.png'
574Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
575=== removed file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_3.png'
576Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_3.png 1970-01-01 00:00:00 +0000 differ
577=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_4_0.png'
578Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
579=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_4_1.png'
580Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
581=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_4_2.png'
582Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
583=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/idle_4_3.png'
584Binary files data/tribes/immovables/berry_bushes/blueberry/small/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
585=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_0.png'
586Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
587=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_1.png'
588Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
589=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_2.png'
590Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
591=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_3.png'
592Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
593=== removed file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.png'
594Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_0.png 1970-01-01 00:00:00 +0000 differ
595=== removed file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1.png'
596Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1.png 1970-01-01 00:00:00 +0000 differ
597=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_0.png'
598Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
599=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_1.png'
600Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
601=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_2.png'
602Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
603=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_3.png'
604Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
605=== removed file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2.png'
606Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2.png 1970-01-01 00:00:00 +0000 differ
607=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_0.png'
608Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
609=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_1.png'
610Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
611=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_2.png'
612Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
613=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_3.png'
614Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
615=== removed file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_3.png'
616Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_3.png 1970-01-01 00:00:00 +0000 differ
617=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_0.png'
618Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
619=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_1.png'
620Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
621=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_2.png'
622Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
623=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_3.png'
624Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
625=== modified file 'data/tribes/immovables/berry_bushes/currant_black/init.lua'
626--- data/tribes/immovables/berry_bushes/currant_black/init.lua 2018-11-03 11:27:18 +0000
627+++ data/tribes/immovables/berry_bushes/currant_black/init.lua 2019-04-24 11:21:34 +0000
628@@ -7,6 +7,9 @@
629 pickiness = 50,
630 }
631
632+animations = {}
633+add_animation(animations, "idle", dirname, "tiny/idle", { 4, 10 })
634+
635 tribes:new_immovable_type {
636 msgctxt = "immovable",
637 name = "berry_bush_currant_black_tiny",
638@@ -22,15 +25,12 @@
639 "grow=berry_bush_currant_black_small",
640 },
641 },
642- animations = {
643- idle = {
644- pictures = path.list_files (dirname .. "tiny/idle_?.png"),
645- hotspot = {4, 10},
646- scale = 3,
647- },
648- },
649+ animations = animations,
650 }
651
652+animations = {}
653+add_animation(animations, "idle", dirname, "small/idle", { 8, 20 })
654+
655 tribes:new_immovable_type {
656 msgctxt = "immovable",
657 name = "berry_bush_currant_black_small",
658@@ -46,15 +46,12 @@
659 "grow=berry_bush_currant_black_medium",
660 },
661 },
662- animations = {
663- idle = {
664- pictures = path.list_files (dirname .. "small/idle_?.png"),
665- hotspot = {8, 20},
666- scale = 3,
667- },
668- },
669+ animations = animations,
670 }
671
672+animations = {}
673+add_animation(animations, "idle", dirname, "medium/idle", { 13, 33 })
674+
675 tribes:new_immovable_type {
676 msgctxt = "immovable",
677 name = "berry_bush_currant_black_medium",
678@@ -70,15 +67,12 @@
679 "grow=berry_bush_currant_black_ripe",
680 },
681 },
682- animations = {
683- idle = {
684- pictures = path.list_files (dirname .. "medium/idle_?.png"),
685- hotspot = {13, 33},
686- scale = 3,
687- },
688- },
689+ animations = animations,
690 }
691
692+animations = {}
693+add_animation(animations, "idle", dirname, "ripe/idle", { 13, 33 })
694+
695 tribes:new_immovable_type {
696 msgctxt = "immovable",
697 name = "berry_bush_currant_black_ripe",
698@@ -96,11 +90,5 @@
699 "remove=",
700 }
701 },
702- animations = {
703- idle = {
704- pictures = path.list_files (dirname .. "ripe/idle_?.png"),
705- hotspot = {13, 33},
706- scale = 3,
707- },
708- },
709+ animations = animations,
710 }
711
712=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_0.png'
713Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
714=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_1.png'
715Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
716=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_2.png'
717Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
718=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_3.png'
719Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
720=== removed file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.png'
721Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_0.png 1970-01-01 00:00:00 +0000 differ
722=== removed file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_1.png'
723Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_1.png 1970-01-01 00:00:00 +0000 differ
724=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_0.png'
725Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
726=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_1.png'
727Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
728=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_2.png'
729Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
730=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_3.png'
731Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
732=== removed file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_2.png'
733Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_2.png 1970-01-01 00:00:00 +0000 differ
734=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_0.png'
735Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
736=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_1.png'
737Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
738=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_2.png'
739Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
740=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_3.png'
741Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
742=== removed file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_3.png'
743Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_3.png 1970-01-01 00:00:00 +0000 differ
744=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_0.png'
745Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
746=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_1.png'
747Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
748=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_2.png'
749Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
750=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_3.png'
751Binary files data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
752=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_0.png'
753Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
754=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_1.png'
755Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
756=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_2.png'
757Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
758=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_3.png'
759Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
760=== removed file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.png'
761Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_0.png 1970-01-01 00:00:00 +0000 differ
762=== removed file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1.png'
763Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1.png 1970-01-01 00:00:00 +0000 differ
764=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_0.png'
765Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
766=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_1.png'
767Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
768=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_2.png'
769Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
770=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_3.png'
771Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
772=== removed file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2.png'
773Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2.png 1970-01-01 00:00:00 +0000 differ
774=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_0.png'
775Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
776=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_1.png'
777Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
778=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_2.png'
779Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
780=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_3.png'
781Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
782=== removed file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_3.png'
783Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_3.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_3.png 1970-01-01 00:00:00 +0000 differ
784=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_0.png'
785Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
786=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_1.png'
787Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
788=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_2.png'
789Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
790=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_3.png'
791Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
792=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_0.png'
793Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
794=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_1.png'
795Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
796=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_2.png'
797Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
798=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_3.png'
799Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
800=== removed file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_0.png'
801Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_0.png 1970-01-01 00:00:00 +0000 differ
802=== removed file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_1.png'
803Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_1.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_1.png 1970-01-01 00:00:00 +0000 differ
804=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_1_0.png'
805Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
806=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_1_1.png'
807Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
808=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_1_2.png'
809Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
810=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_1_3.png'
811Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
812=== removed file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_2.png'
813Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_2.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_2.png 1970-01-01 00:00:00 +0000 differ
814=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_2_0.png'
815Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
816=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_2_1.png'
817Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
818=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_2_2.png'
819Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
820=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_2_3.png'
821Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
822=== removed file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_3.png'
823Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_3.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_3.png 1970-01-01 00:00:00 +0000 differ
824=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_4_0.png'
825Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
826=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_4_1.png'
827Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
828=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_4_2.png'
829Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
830=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/idle_4_3.png'
831Binary files data/tribes/immovables/berry_bushes/currant_black/small/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
832=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_0.png'
833Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
834=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_1.png'
835Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
836=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_2.png'
837Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
838=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_3.png'
839Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
840=== removed file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.png'
841Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_0.png 1970-01-01 00:00:00 +0000 differ
842=== removed file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1.png'
843Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1.png 1970-01-01 00:00:00 +0000 differ
844=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_0.png'
845Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
846=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_1.png'
847Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
848=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_2.png'
849Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
850=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_3.png'
851Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
852=== removed file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2.png'
853Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2.png 1970-01-01 00:00:00 +0000 differ
854=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_0.png'
855Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
856=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_1.png'
857Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
858=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_2.png'
859Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
860=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_3.png'
861Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
862=== removed file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_3.png'
863Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_3.png 1970-01-01 00:00:00 +0000 differ
864=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_0.png'
865Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
866=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_1.png'
867Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
868=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_2.png'
869Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
870=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_3.png'
871Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
872=== modified file 'data/tribes/immovables/berry_bushes/currant_red/init.lua'
873--- data/tribes/immovables/berry_bushes/currant_red/init.lua 2018-11-03 11:27:18 +0000
874+++ data/tribes/immovables/berry_bushes/currant_red/init.lua 2019-04-24 11:21:34 +0000
875@@ -7,6 +7,9 @@
876 pickiness = 40,
877 }
878
879+animations = {}
880+add_animation(animations, "idle", dirname, "tiny/idle", { 4, 10 })
881+
882 tribes:new_immovable_type {
883 msgctxt = "immovable",
884 name = "berry_bush_currant_red_tiny",
885@@ -22,15 +25,12 @@
886 "grow=berry_bush_currant_red_small",
887 },
888 },
889- animations = {
890- idle = {
891- pictures = path.list_files (dirname .. "tiny/idle_?.png"),
892- hotspot = {4, 10},
893- scale = 3,
894- },
895- },
896+ animations = animations,
897 }
898
899+animations = {}
900+add_animation(animations, "idle", dirname, "small/idle", { 8, 20 })
901+
902 tribes:new_immovable_type {
903 msgctxt = "immovable",
904 name = "berry_bush_currant_red_small",
905@@ -46,15 +46,12 @@
906 "grow=berry_bush_currant_red_medium",
907 },
908 },
909- animations = {
910- idle = {
911- pictures = path.list_files (dirname .. "small/idle_?.png"),
912- hotspot = {8, 20},
913- scale = 3,
914- },
915- },
916+ animations = animations,
917 }
918
919+animations = {}
920+add_animation(animations, "idle", dirname, "medium/idle", { 13, 33 })
921+
922 tribes:new_immovable_type {
923 msgctxt = "immovable",
924 name = "berry_bush_currant_red_medium",
925@@ -70,15 +67,12 @@
926 "grow=berry_bush_currant_red_ripe",
927 },
928 },
929- animations = {
930- idle = {
931- pictures = path.list_files (dirname .. "medium/idle_?.png"),
932- hotspot = {13, 33},
933- scale = 3,
934- },
935- },
936+ animations = animations,
937 }
938
939+animations = {}
940+add_animation(animations, "idle", dirname, "ripe/idle", { 13, 33 })
941+
942 tribes:new_immovable_type {
943 msgctxt = "immovable",
944 name = "berry_bush_currant_red_ripe",
945@@ -96,11 +90,5 @@
946 "remove=",
947 }
948 },
949- animations = {
950- idle = {
951- pictures = path.list_files (dirname .. "ripe/idle_?.png"),
952- hotspot = {13, 33},
953- scale = 3,
954- },
955- },
956+ animations = animations,
957 }
958
959=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_0.png'
960Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
961=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_1.png'
962Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
963=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_2.png'
964Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
965=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_3.png'
966Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
967=== removed file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.png'
968Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_0.png 1970-01-01 00:00:00 +0000 differ
969=== removed file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_1.png'
970Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_1.png 1970-01-01 00:00:00 +0000 differ
971=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_0.png'
972Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
973=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_1.png'
974Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
975=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_2.png'
976Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
977=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_3.png'
978Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
979=== removed file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_2.png'
980Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_2.png 1970-01-01 00:00:00 +0000 differ
981=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_0.png'
982Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
983=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_1.png'
984Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
985=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_2.png'
986Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
987=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_3.png'
988Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
989=== removed file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_3.png'
990Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_3.png 1970-01-01 00:00:00 +0000 differ
991=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_0.png'
992Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
993=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_1.png'
994Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
995=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_2.png'
996Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
997=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_3.png'
998Binary files data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
999=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_0.png'
1000Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1001=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_1.png'
1002Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1003=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_2.png'
1004Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1005=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_3.png'
1006Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1007=== removed file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.png'
1008Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_0.png 1970-01-01 00:00:00 +0000 differ
1009=== removed file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1.png'
1010Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1.png 1970-01-01 00:00:00 +0000 differ
1011=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_0.png'
1012Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1013=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_1.png'
1014Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1015=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_2.png'
1016Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1017=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_3.png'
1018Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1019=== removed file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2.png'
1020Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2.png 1970-01-01 00:00:00 +0000 differ
1021=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_0.png'
1022Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1023=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_1.png'
1024Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1025=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_2.png'
1026Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1027=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_3.png'
1028Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1029=== removed file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_3.png'
1030Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_3.png 1970-01-01 00:00:00 +0000 differ
1031=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_0.png'
1032Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1033=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_1.png'
1034Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1035=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_2.png'
1036Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1037=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_3.png'
1038Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1039=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_0.png'
1040Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1041=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_1.png'
1042Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1043=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_2.png'
1044Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1045=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_3.png'
1046Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1047=== removed file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_0.png'
1048Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_0.png 1970-01-01 00:00:00 +0000 differ
1049=== removed file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_1.png'
1050Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_1.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_1.png 1970-01-01 00:00:00 +0000 differ
1051=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_1_0.png'
1052Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1053=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_1_1.png'
1054Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1055=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_1_2.png'
1056Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1057=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_1_3.png'
1058Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1059=== removed file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_2.png'
1060Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_2.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_2.png 1970-01-01 00:00:00 +0000 differ
1061=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_2_0.png'
1062Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1063=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_2_1.png'
1064Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1065=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_2_2.png'
1066Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1067=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_2_3.png'
1068Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1069=== removed file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_3.png'
1070Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_3.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_3.png 1970-01-01 00:00:00 +0000 differ
1071=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_4_0.png'
1072Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1073=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_4_1.png'
1074Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1075=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_4_2.png'
1076Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1077=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/idle_4_3.png'
1078Binary files data/tribes/immovables/berry_bushes/currant_red/small/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1079=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_0.png'
1080Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1081=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_1.png'
1082Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1083=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_2.png'
1084Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1085=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_3.png'
1086Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1087=== removed file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.png'
1088Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_0.png 1970-01-01 00:00:00 +0000 differ
1089=== removed file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1.png'
1090Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1.png 1970-01-01 00:00:00 +0000 differ
1091=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_0.png'
1092Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1093=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_1.png'
1094Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1095=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_2.png'
1096Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1097=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_3.png'
1098Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1099=== removed file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2.png'
1100Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2.png 1970-01-01 00:00:00 +0000 differ
1101=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_0.png'
1102Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1103=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_1.png'
1104Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1105=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_2.png'
1106Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1107=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_3.png'
1108Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1109=== removed file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_3.png'
1110Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_3.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_3.png 1970-01-01 00:00:00 +0000 differ
1111=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_0.png'
1112Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1113=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_1.png'
1114Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1115=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_2.png'
1116Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1117=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_3.png'
1118Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1119=== modified file 'data/tribes/immovables/berry_bushes/desert_hackberry/init.lua'
1120--- data/tribes/immovables/berry_bushes/desert_hackberry/init.lua 2018-11-03 11:27:18 +0000
1121+++ data/tribes/immovables/berry_bushes/desert_hackberry/init.lua 2019-04-24 11:21:34 +0000
1122@@ -7,6 +7,9 @@
1123 pickiness = 30, -- Lower means it is less picky, i.e. it can deal better.
1124 }
1125
1126+animations = {}
1127+add_animation(animations, "idle", dirname, "tiny/idle", { 10, 9 })
1128+
1129 tribes:new_immovable_type {
1130 msgctxt = "immovable",
1131 name = "berry_bush_desert_hackberry_tiny",
1132@@ -22,15 +25,12 @@
1133 "grow=berry_bush_desert_hackberry_small",
1134 },
1135 },
1136- animations = {
1137- idle = {
1138- pictures = path.list_files (dirname .. "tiny/idle_?.png"),
1139- hotspot = {10, 9},
1140- scale = 3,
1141- },
1142- },
1143+ animations = animations,
1144 }
1145
1146+animations = {}
1147+add_animation(animations, "idle", dirname, "small/idle", { 19, 21 })
1148+
1149 tribes:new_immovable_type {
1150 msgctxt = "immovable",
1151 name = "berry_bush_desert_hackberry_small",
1152@@ -46,15 +46,12 @@
1153 "grow=berry_bush_desert_hackberry_medium",
1154 },
1155 },
1156- animations = {
1157- idle = {
1158- pictures = path.list_files (dirname .. "small/idle_?.png"),
1159- hotspot = {19, 21},
1160- scale = 3,
1161- },
1162- },
1163+ animations = animations,
1164 }
1165
1166+animations = {}
1167+add_animation(animations, "idle", dirname, "medium/idle", { 21, 27 })
1168+
1169 tribes:new_immovable_type {
1170 msgctxt = "immovable",
1171 name = "berry_bush_desert_hackberry_medium",
1172@@ -70,15 +67,12 @@
1173 "grow=berry_bush_desert_hackberry_ripe",
1174 },
1175 },
1176- animations = {
1177- idle = {
1178- pictures = path.list_files (dirname .. "medium/idle_?.png"),
1179- hotspot = {21, 27},
1180- scale = 3,
1181- },
1182- },
1183+ animations = animations,
1184 }
1185
1186+animations = {}
1187+add_animation(animations, "idle", dirname, "ripe/idle", { 21, 27 })
1188+
1189 tribes:new_immovable_type {
1190 msgctxt = "immovable",
1191 name = "berry_bush_desert_hackberry_ripe",
1192@@ -96,11 +90,5 @@
1193 "remove=",
1194 }
1195 },
1196- animations = {
1197- idle = {
1198- pictures = path.list_files (dirname .. "ripe/idle_?.png"),
1199- hotspot = {21, 27},
1200- scale = 3,
1201- },
1202- },
1203+ animations = animations,
1204 }
1205
1206=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_0.png'
1207Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1208=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_1.png'
1209Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1210=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_2.png'
1211Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1212=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_3.png'
1213Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1214=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.png'
1215Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_0.png 1970-01-01 00:00:00 +0000 differ
1216=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1.png'
1217Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1.png 1970-01-01 00:00:00 +0000 differ
1218=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_0.png'
1219Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1220=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_1.png'
1221Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1222=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_2.png'
1223Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1224=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_3.png'
1225Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1226=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2.png'
1227Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2.png 1970-01-01 00:00:00 +0000 differ
1228=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_0.png'
1229Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1230=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_1.png'
1231Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1232=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_2.png'
1233Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1234=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_3.png'
1235Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1236=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_3.png'
1237Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_3.png 1970-01-01 00:00:00 +0000 differ
1238=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_0.png'
1239Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1240=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_1.png'
1241Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1242=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_2.png'
1243Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1244=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_3.png'
1245Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1246=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_0.png'
1247Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1248=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_1.png'
1249Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1250=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_2.png'
1251Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1252=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_3.png'
1253Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1254=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.png'
1255Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_0.png 1970-01-01 00:00:00 +0000 differ
1256=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1.png'
1257Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1.png 1970-01-01 00:00:00 +0000 differ
1258=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_0.png'
1259Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1260=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_1.png'
1261Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1262=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_2.png'
1263Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1264=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_3.png'
1265Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1266=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2.png'
1267Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2.png 1970-01-01 00:00:00 +0000 differ
1268=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_0.png'
1269Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1270=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_1.png'
1271Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1272=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_2.png'
1273Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1274=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_3.png'
1275Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1276=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_3.png'
1277Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_3.png 1970-01-01 00:00:00 +0000 differ
1278=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_0.png'
1279Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1280=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_1.png'
1281Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1282=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_2.png'
1283Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1284=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_3.png'
1285Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1286=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_0.png'
1287Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1288=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_1.png'
1289Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1290=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_2.png'
1291Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1292=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_3.png'
1293Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1294=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.png'
1295Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_0.png 1970-01-01 00:00:00 +0000 differ
1296=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1.png'
1297Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1.png 1970-01-01 00:00:00 +0000 differ
1298=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_0.png'
1299Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1300=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_1.png'
1301Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1302=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_2.png'
1303Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1304=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_3.png'
1305Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1306=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2.png'
1307Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2.png 1970-01-01 00:00:00 +0000 differ
1308=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_0.png'
1309Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1310=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_1.png'
1311Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1312=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_2.png'
1313Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1314=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_3.png'
1315Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1316=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_3.png'
1317Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_3.png 1970-01-01 00:00:00 +0000 differ
1318=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_0.png'
1319Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1320=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_1.png'
1321Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1322=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_2.png'
1323Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1324=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_3.png'
1325Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1326=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_0.png'
1327Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1328=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_1.png'
1329Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1330=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_2.png'
1331Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1332=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_3.png'
1333Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1334=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.png'
1335Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_0.png 1970-01-01 00:00:00 +0000 differ
1336=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1.png'
1337Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1.png 1970-01-01 00:00:00 +0000 differ
1338=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_0.png'
1339Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1340=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_1.png'
1341Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1342=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_2.png'
1343Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1344=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_3.png'
1345Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1346=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2.png'
1347Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2.png 1970-01-01 00:00:00 +0000 differ
1348=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_0.png'
1349Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1350=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_1.png'
1351Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1352=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_2.png'
1353Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1354=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_3.png'
1355Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1356=== removed file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_3.png'
1357Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_3.png 1970-01-01 00:00:00 +0000 differ
1358=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_0.png'
1359Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1360=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_1.png'
1361Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1362=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_2.png'
1363Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1364=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_3.png'
1365Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1366=== modified file 'data/tribes/immovables/berry_bushes/juniper/init.lua'
1367--- data/tribes/immovables/berry_bushes/juniper/init.lua 2018-11-03 11:27:18 +0000
1368+++ data/tribes/immovables/berry_bushes/juniper/init.lua 2019-04-24 11:21:34 +0000
1369@@ -7,6 +7,9 @@
1370 pickiness = 15,
1371 }
1372
1373+animations = {}
1374+add_animation(animations, "idle", dirname, "tiny/idle", { 3, 15 })
1375+
1376 tribes:new_immovable_type {
1377 msgctxt = "immovable",
1378 name = "berry_bush_juniper_tiny",
1379@@ -22,15 +25,12 @@
1380 "grow=berry_bush_juniper_small",
1381 },
1382 },
1383- animations = {
1384- idle = {
1385- pictures = path.list_files (dirname .. "tiny/idle_?.png"),
1386- hotspot = {3, 15},
1387- scale = 2,
1388- },
1389- },
1390+ animations = animations,
1391 }
1392
1393+animations = {}
1394+add_animation(animations, "idle", dirname, "small/idle", { 6, 30 })
1395+
1396 tribes:new_immovable_type {
1397 msgctxt = "immovable",
1398 name = "berry_bush_juniper_small",
1399@@ -46,15 +46,12 @@
1400 "grow=berry_bush_juniper_medium",
1401 },
1402 },
1403- animations = {
1404- idle = {
1405- pictures = path.list_files (dirname .. "small/idle_?.png"),
1406- hotspot = {6, 30},
1407- scale = 2,
1408- },
1409- },
1410+ animations = animations,
1411 }
1412
1413+animations = {}
1414+add_animation(animations, "idle", dirname, "medium/idle", { 10, 47 })
1415+
1416 tribes:new_immovable_type {
1417 msgctxt = "immovable",
1418 name = "berry_bush_juniper_medium",
1419@@ -70,15 +67,12 @@
1420 "grow=berry_bush_juniper_ripe",
1421 },
1422 },
1423- animations = {
1424- idle = {
1425- pictures = path.list_files (dirname .. "medium/idle_?.png"),
1426- hotspot = {10, 47},
1427- scale = 2,
1428- },
1429- },
1430+ animations = animations,
1431 }
1432
1433+animations = {}
1434+add_animation(animations, "idle", dirname, "ripe/idle", { 11, 49 })
1435+
1436 tribes:new_immovable_type {
1437 msgctxt = "immovable",
1438 name = "berry_bush_juniper_ripe",
1439@@ -96,11 +90,5 @@
1440 "remove=",
1441 }
1442 },
1443- animations = {
1444- idle = {
1445- pictures = path.list_files (dirname .. "ripe/idle_?.png"),
1446- hotspot = {11, 49},
1447- scale = 2,
1448- },
1449- },
1450+ animations = animations,
1451 }
1452
1453=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_0.png'
1454Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1455=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_1.png'
1456Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1457=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_2.png'
1458Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1459=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_3.png'
1460Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1461=== removed file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_0.png'
1462Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_0.png 1970-01-01 00:00:00 +0000 differ
1463=== removed file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_1.png'
1464Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_1.png 1970-01-01 00:00:00 +0000 differ
1465=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_1_0.png'
1466Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1467=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_1_1.png'
1468Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1469=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_1_2.png'
1470Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1471=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_1_3.png'
1472Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1473=== removed file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_2.png'
1474Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_2.png 1970-01-01 00:00:00 +0000 differ
1475=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_2_0.png'
1476Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1477=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_2_1.png'
1478Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1479=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_2_2.png'
1480Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1481=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_2_3.png'
1482Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1483=== removed file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_3.png'
1484Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_3.png 1970-01-01 00:00:00 +0000 differ
1485=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_4_0.png'
1486Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1487=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_4_1.png'
1488Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1489=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_4_2.png'
1490Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1491=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_4_3.png'
1492Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1493=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_0.png'
1494Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1495=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_1.png'
1496Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1497=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_2.png'
1498Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1499=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_3.png'
1500Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1501=== removed file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.png'
1502Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.png 1970-01-01 00:00:00 +0000 differ
1503=== removed file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_1.png'
1504Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_1.png 1970-01-01 00:00:00 +0000 differ
1505=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_0.png'
1506Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1507=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_1.png'
1508Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1509=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_2.png'
1510Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1511=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_3.png'
1512Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1513=== removed file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_2.png'
1514Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_2.png 1970-01-01 00:00:00 +0000 differ
1515=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_0.png'
1516Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1517=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_1.png'
1518Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1519=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_2.png'
1520Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1521=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_3.png'
1522Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1523=== removed file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_3.png'
1524Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_3.png 1970-01-01 00:00:00 +0000 differ
1525=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_0.png'
1526Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1527=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_1.png'
1528Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1529=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_2.png'
1530Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1531=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_3.png'
1532Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1533=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_0.png'
1534Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1535=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_1.png'
1536Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1537=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_2.png'
1538Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1539=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_3.png'
1540Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1541=== removed file 'data/tribes/immovables/berry_bushes/juniper/small/idle_0.png'
1542Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_0.png 1970-01-01 00:00:00 +0000 differ
1543=== removed file 'data/tribes/immovables/berry_bushes/juniper/small/idle_1.png'
1544Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_1.png 1970-01-01 00:00:00 +0000 differ
1545=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_1_0.png'
1546Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1547=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_1_1.png'
1548Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1549=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_1_2.png'
1550Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1551=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_1_3.png'
1552Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1553=== removed file 'data/tribes/immovables/berry_bushes/juniper/small/idle_2.png'
1554Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_2.png 1970-01-01 00:00:00 +0000 differ
1555=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_2_0.png'
1556Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1557=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_2_1.png'
1558Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1559=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_2_2.png'
1560Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1561=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_2_3.png'
1562Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1563=== removed file 'data/tribes/immovables/berry_bushes/juniper/small/idle_3.png'
1564Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_3.png 1970-01-01 00:00:00 +0000 differ
1565=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_4_0.png'
1566Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1567=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_4_1.png'
1568Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1569=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_4_2.png'
1570Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1571=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_4_3.png'
1572Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1573=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_0.png'
1574Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1575=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_1.png'
1576Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1577=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_2.png'
1578Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1579=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_3.png'
1580Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1581=== removed file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.png'
1582Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.png 1970-01-01 00:00:00 +0000 differ
1583=== removed file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_1.png'
1584Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_1.png 1970-01-01 00:00:00 +0000 differ
1585=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_0.png'
1586Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1587=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_1.png'
1588Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1589=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_2.png'
1590Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1591=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_3.png'
1592Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1593=== removed file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_2.png'
1594Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_2.png 1970-01-01 00:00:00 +0000 differ
1595=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_0.png'
1596Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1597=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_1.png'
1598Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1599=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_2.png'
1600Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1601=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_3.png'
1602Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1603=== removed file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_3.png'
1604Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_3.png 1970-01-01 00:00:00 +0000 differ
1605=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_0.png'
1606Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1607=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_1.png'
1608Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1609=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_2.png'
1610Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1611=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_3.png'
1612Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1613=== modified file 'data/tribes/immovables/berry_bushes/raspberry/init.lua'
1614--- data/tribes/immovables/berry_bushes/raspberry/init.lua 2018-11-03 11:27:18 +0000
1615+++ data/tribes/immovables/berry_bushes/raspberry/init.lua 2019-04-24 11:21:34 +0000
1616@@ -7,6 +7,9 @@
1617 pickiness = 10,
1618 }
1619
1620+animations = {}
1621+add_animation(animations, "idle", dirname, "tiny/idle", { 4, 7 })
1622+
1623 tribes:new_immovable_type {
1624 msgctxt = "immovable",
1625 name = "berry_bush_raspberry_tiny",
1626@@ -22,15 +25,12 @@
1627 "grow=berry_bush_raspberry_small",
1628 },
1629 },
1630- animations = {
1631- idle = {
1632- pictures = path.list_files (dirname .. "tiny/idle_?.png"),
1633- hotspot = {4, 7},
1634- scale = 3,
1635- },
1636- },
1637+ animations = animations,
1638 }
1639
1640+animations = {}
1641+add_animation(animations, "idle", dirname, "small/idle", { 16, 31 })
1642+
1643 tribes:new_immovable_type {
1644 msgctxt = "immovable",
1645 name = "berry_bush_raspberry_small",
1646@@ -46,15 +46,12 @@
1647 "grow=berry_bush_raspberry_medium",
1648 },
1649 },
1650- animations = {
1651- idle = {
1652- pictures = path.list_files (dirname .. "small/idle_?.png"),
1653- hotspot = {16, 31},
1654- scale = 3,
1655- },
1656- },
1657+ animations = animations,
1658 }
1659
1660+animations = {}
1661+add_animation(animations, "idle", dirname, "medium/idle", { 17, 34 })
1662+
1663 tribes:new_immovable_type {
1664 msgctxt = "immovable",
1665 name = "berry_bush_raspberry_medium",
1666@@ -70,15 +67,12 @@
1667 "grow=berry_bush_raspberry_ripe",
1668 },
1669 },
1670- animations = {
1671- idle = {
1672- pictures = path.list_files (dirname .. "medium/idle_?.png"),
1673- hotspot = {17, 34},
1674- scale = 3,
1675- },
1676- },
1677+ animations = animations,
1678 }
1679
1680+animations = {}
1681+add_animation(animations, "idle", dirname, "ripe/idle", { 17, 34 })
1682+
1683 tribes:new_immovable_type {
1684 msgctxt = "immovable",
1685 name = "berry_bush_raspberry_ripe",
1686@@ -96,11 +90,5 @@
1687 "remove=",
1688 }
1689 },
1690- animations = {
1691- idle = {
1692- pictures = path.list_files (dirname .. "ripe/idle_?.png"),
1693- hotspot = {17, 34},
1694- scale = 3,
1695- },
1696- },
1697+ animations = animations,
1698 }
1699
1700=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_0.png'
1701Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1702=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_1.png'
1703Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1704=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_2.png'
1705Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1706=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_3.png'
1707Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1708=== removed file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.png'
1709Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_0.png 1970-01-01 00:00:00 +0000 differ
1710=== removed file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_1.png'
1711Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_1.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_1.png 1970-01-01 00:00:00 +0000 differ
1712=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_0.png'
1713Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1714=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_1.png'
1715Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1716=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_2.png'
1717Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1718=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_3.png'
1719Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1720=== removed file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_2.png'
1721Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_2.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_2.png 1970-01-01 00:00:00 +0000 differ
1722=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_0.png'
1723Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1724=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_1.png'
1725Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1726=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_2.png'
1727Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1728=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_3.png'
1729Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1730=== removed file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_3.png'
1731Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_3.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_3.png 1970-01-01 00:00:00 +0000 differ
1732=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_0.png'
1733Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1734=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_1.png'
1735Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1736=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_2.png'
1737Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1738=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_3.png'
1739Binary files data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1740=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_0.png'
1741Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1742=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_1.png'
1743Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1744=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_2.png'
1745Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1746=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_3.png'
1747Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1748=== removed file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.png'
1749Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_0.png 1970-01-01 00:00:00 +0000 differ
1750=== removed file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1.png'
1751Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1.png 1970-01-01 00:00:00 +0000 differ
1752=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_0.png'
1753Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1754=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_1.png'
1755Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1756=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_2.png'
1757Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1758=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_3.png'
1759Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1760=== removed file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2.png'
1761Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2.png 1970-01-01 00:00:00 +0000 differ
1762=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_0.png'
1763Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1764=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_1.png'
1765Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1766=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_2.png'
1767Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1768=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_3.png'
1769Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1770=== removed file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_3.png'
1771Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_3.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_3.png 1970-01-01 00:00:00 +0000 differ
1772=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_0.png'
1773Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1774=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_1.png'
1775Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1776=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_2.png'
1777Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1778=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_3.png'
1779Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1780=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_0.png'
1781Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1782=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_1.png'
1783Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1784=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_2.png'
1785Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1786=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_3.png'
1787Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1788=== removed file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_0.png'
1789Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_0.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_0.png 1970-01-01 00:00:00 +0000 differ
1790=== removed file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_1.png'
1791Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_1.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_1.png 1970-01-01 00:00:00 +0000 differ
1792=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_1_0.png'
1793Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1794=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_1_1.png'
1795Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1796=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_1_2.png'
1797Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1798=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_1_3.png'
1799Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1800=== removed file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_2.png'
1801Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_2.png 1970-01-01 00:00:00 +0000 differ
1802=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_2_0.png'
1803Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1804=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_2_1.png'
1805Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1806=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_2_2.png'
1807Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1808=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_2_3.png'
1809Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1810=== removed file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_3.png'
1811Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_3.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_3.png 1970-01-01 00:00:00 +0000 differ
1812=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_4_0.png'
1813Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1814=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_4_1.png'
1815Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1816=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_4_2.png'
1817Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1818=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/idle_4_3.png'
1819Binary files data/tribes/immovables/berry_bushes/raspberry/small/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1820=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_0.png'
1821Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1822=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_1.png'
1823Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1824=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_2.png'
1825Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1826=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_3.png'
1827Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1828=== removed file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.png'
1829Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_0.png 1970-01-01 00:00:00 +0000 differ
1830=== removed file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1.png'
1831Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1.png 1970-01-01 00:00:00 +0000 differ
1832=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_0.png'
1833Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1834=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_1.png'
1835Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1836=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_2.png'
1837Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1838=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_3.png'
1839Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1840=== removed file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2.png'
1841Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2.png 1970-01-01 00:00:00 +0000 differ
1842=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_0.png'
1843Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1844=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_1.png'
1845Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1846=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_2.png'
1847Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1848=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_3.png'
1849Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1850=== removed file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_3.png'
1851Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_3.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_3.png 1970-01-01 00:00:00 +0000 differ
1852=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_0.png'
1853Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1854=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_1.png'
1855Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1856=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_2.png'
1857Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1858=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_3.png'
1859Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1860=== modified file 'data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua'
1861--- data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua 2018-11-03 11:27:18 +0000
1862+++ data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua 2019-04-24 11:21:34 +0000
1863@@ -7,6 +7,9 @@
1864 pickiness = 15, -- Lower means it is less picky, i.e. it can deal better.
1865 }
1866
1867+animations = {}
1868+add_animation(animations, "idle", dirname, "tiny/idle", { 9, 19 })
1869+
1870 tribes:new_immovable_type {
1871 msgctxt = "immovable",
1872 name = "berry_bush_sea_buckthorn_tiny",
1873@@ -22,15 +25,12 @@
1874 "grow=berry_bush_sea_buckthorn_small",
1875 },
1876 },
1877- animations = {
1878- idle = {
1879- pictures = path.list_files (dirname .. "tiny/idle_?.png"),
1880- hotspot = {9, 19},
1881- scale = 3,
1882- },
1883- },
1884+ animations = animations,
1885 }
1886
1887+animations = {}
1888+add_animation(animations, "idle", dirname, "small/idle", { 14, 32 })
1889+
1890 tribes:new_immovable_type {
1891 msgctxt = "immovable",
1892 name = "berry_bush_sea_buckthorn_small",
1893@@ -46,15 +46,12 @@
1894 "grow=berry_bush_sea_buckthorn_medium",
1895 },
1896 },
1897- animations = {
1898- idle = {
1899- pictures = path.list_files (dirname .. "small/idle_?.png"),
1900- hotspot = {14, 32},
1901- scale = 3,
1902- },
1903- },
1904+ animations = animations,
1905 }
1906
1907+animations = {}
1908+add_animation(animations, "idle", dirname, "medium/idle", { 17, 40 })
1909+
1910 tribes:new_immovable_type {
1911 msgctxt = "immovable",
1912 name = "berry_bush_sea_buckthorn_medium",
1913@@ -70,15 +67,12 @@
1914 "grow=berry_bush_sea_buckthorn_ripe",
1915 },
1916 },
1917- animations = {
1918- idle = {
1919- pictures = path.list_files (dirname .. "medium/idle_?.png"),
1920- hotspot = {17, 40},
1921- scale = 3,
1922- },
1923- },
1924+ animations = animations,
1925 }
1926
1927+animations = {}
1928+add_animation(animations, "idle", dirname, "ripe/idle", { 17, 40 })
1929+
1930 tribes:new_immovable_type {
1931 msgctxt = "immovable",
1932 name = "berry_bush_sea_buckthorn_ripe",
1933@@ -96,11 +90,5 @@
1934 "remove=",
1935 }
1936 },
1937- animations = {
1938- idle = {
1939- pictures = path.list_files (dirname .. "ripe/idle_?.png"),
1940- hotspot = {17, 40},
1941- scale = 3,
1942- },
1943- },
1944+ animations = animations,
1945 }
1946
1947=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_0.png'
1948Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1949=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_1.png'
1950Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1951=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_2.png'
1952Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1953=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_3.png'
1954Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1955=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.png'
1956Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_0.png 1970-01-01 00:00:00 +0000 differ
1957=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1.png'
1958Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1.png 1970-01-01 00:00:00 +0000 differ
1959=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_0.png'
1960Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
1961=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_1.png'
1962Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
1963=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_2.png'
1964Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
1965=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_3.png'
1966Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
1967=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2.png'
1968Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2.png 1970-01-01 00:00:00 +0000 differ
1969=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_0.png'
1970Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
1971=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_1.png'
1972Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
1973=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_2.png'
1974Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
1975=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_3.png'
1976Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
1977=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_3.png'
1978Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_3.png 1970-01-01 00:00:00 +0000 differ
1979=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_0.png'
1980Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
1981=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_1.png'
1982Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
1983=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_2.png'
1984Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
1985=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_3.png'
1986Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
1987=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_0.png'
1988Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
1989=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_1.png'
1990Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
1991=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_2.png'
1992Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
1993=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_3.png'
1994Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
1995=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.png'
1996Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_0.png 1970-01-01 00:00:00 +0000 differ
1997=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1.png'
1998Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1.png 1970-01-01 00:00:00 +0000 differ
1999=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_0.png'
2000Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
2001=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_1.png'
2002Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
2003=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_2.png'
2004Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
2005=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_3.png'
2006Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
2007=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2.png'
2008Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2.png 1970-01-01 00:00:00 +0000 differ
2009=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_0.png'
2010Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
2011=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_1.png'
2012Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
2013=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_2.png'
2014Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
2015=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_3.png'
2016Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
2017=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_3.png'
2018Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_3.png 1970-01-01 00:00:00 +0000 differ
2019=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_0.png'
2020Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
2021=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_1.png'
2022Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
2023=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_2.png'
2024Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
2025=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_3.png'
2026Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
2027=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_0.png'
2028Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
2029=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_1.png'
2030Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
2031=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_2.png'
2032Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
2033=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_3.png'
2034Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
2035=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.png'
2036Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_0.png 1970-01-01 00:00:00 +0000 differ
2037=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1.png'
2038Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1.png 1970-01-01 00:00:00 +0000 differ
2039=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_0.png'
2040Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
2041=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_1.png'
2042Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
2043=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_2.png'
2044Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
2045=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_3.png'
2046Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
2047=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2.png'
2048Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2.png 1970-01-01 00:00:00 +0000 differ
2049=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_0.png'
2050Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
2051=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_1.png'
2052Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
2053=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_2.png'
2054Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
2055=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_3.png'
2056Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
2057=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_3.png'
2058Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_3.png 1970-01-01 00:00:00 +0000 differ
2059=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_0.png'
2060Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
2061=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_1.png'
2062Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
2063=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_2.png'
2064Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
2065=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_3.png'
2066Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
2067=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_0.png'
2068Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
2069=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_1.png'
2070Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
2071=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_2.png'
2072Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
2073=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_3.png'
2074Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
2075=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.png'
2076Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_0.png 1970-01-01 00:00:00 +0000 differ
2077=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1.png'
2078Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1.png 1970-01-01 00:00:00 +0000 differ
2079=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_0.png'
2080Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
2081=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_1.png'
2082Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
2083=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_2.png'
2084Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
2085=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_3.png'
2086Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
2087=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2.png'
2088Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2.png 1970-01-01 00:00:00 +0000 differ
2089=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_0.png'
2090Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
2091=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_1.png'
2092Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
2093=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_2.png'
2094Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
2095=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_3.png'
2096Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
2097=== removed file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_3.png'
2098Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_3.png 1970-01-01 00:00:00 +0000 differ
2099=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_0.png'
2100Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
2101=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_1.png'
2102Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
2103=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_2.png'
2104Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
2105=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_3.png'
2106Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
2107=== modified file 'data/tribes/immovables/berry_bushes/strawberry/init.lua'
2108--- data/tribes/immovables/berry_bushes/strawberry/init.lua 2018-11-03 11:27:18 +0000
2109+++ data/tribes/immovables/berry_bushes/strawberry/init.lua 2019-04-24 11:21:34 +0000
2110@@ -7,6 +7,9 @@
2111 pickiness = 20, -- Lower means it is less picky, i.e. it can deal better.
2112 }
2113
2114+animations = {}
2115+add_animation(animations, "idle", dirname, "tiny/idle", { 4, 4 })
2116+
2117 tribes:new_immovable_type {
2118 msgctxt = "immovable",
2119 name = "berry_bush_strawberry_tiny",
2120@@ -22,15 +25,12 @@
2121 "grow=berry_bush_strawberry_small",
2122 },
2123 },
2124- animations = {
2125- idle = {
2126- pictures = path.list_files (dirname .. "tiny/idle_?.png"),
2127- hotspot = {4, 4},
2128- scale = 3,
2129- },
2130- },
2131+ animations = animations,
2132 }
2133
2134+animations = {}
2135+add_animation(animations, "idle", dirname, "small/idle", { 12, 9 })
2136+
2137 tribes:new_immovable_type {
2138 msgctxt = "immovable",
2139 name = "berry_bush_strawberry_small",
2140@@ -46,15 +46,12 @@
2141 "grow=berry_bush_strawberry_medium",
2142 },
2143 },
2144- animations = {
2145- idle = {
2146- pictures = path.list_files (dirname .. "small/idle_?.png"),
2147- hotspot = {12, 9},
2148- scale = 3,
2149- },
2150- },
2151+ animations = animations,
2152 }
2153
2154+animations = {}
2155+add_animation(animations, "idle", dirname, "medium/idle", { 21, 15 })
2156+
2157 tribes:new_immovable_type {
2158 msgctxt = "immovable",
2159 name = "berry_bush_strawberry_medium",
2160@@ -70,15 +67,12 @@
2161 "grow=berry_bush_strawberry_ripe",
2162 },
2163 },
2164- animations = {
2165- idle = {
2166- pictures = path.list_files (dirname .. "medium/idle_?.png"),
2167- hotspot = {21, 15},
2168- scale = 3,
2169- },
2170- },
2171+ animations = animations,
2172 }
2173
2174+animations = {}
2175+add_animation(animations, "idle", dirname, "ripe/idle", { 21, 15 })
2176+
2177 tribes:new_immovable_type {
2178 msgctxt = "immovable",
2179 name = "berry_bush_strawberry_ripe",
2180@@ -96,11 +90,5 @@
2181 "remove=",
2182 }
2183 },
2184- animations = {
2185- idle = {
2186- pictures = path.list_files (dirname .. "ripe/idle_?.png"),
2187- hotspot = {21, 15},
2188- scale = 3,
2189- },
2190- },
2191+ animations = animations,
2192 }
2193
2194=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_0.png'
2195Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
2196=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_1.png'
2197Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
2198=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_2.png'
2199Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
2200=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_3.png'
2201Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
2202=== removed file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.png'
2203Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_0.png 1970-01-01 00:00:00 +0000 differ
2204=== removed file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_1.png'
2205Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_1.png 1970-01-01 00:00:00 +0000 differ
2206=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_0.png'
2207Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
2208=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_1.png'
2209Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
2210=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_2.png'
2211Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
2212=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_3.png'
2213Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
2214=== removed file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_2.png'
2215Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_2.png 1970-01-01 00:00:00 +0000 differ
2216=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_0.png'
2217Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
2218=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_1.png'
2219Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
2220=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_2.png'
2221Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
2222=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_3.png'
2223Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
2224=== removed file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_3.png'
2225Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_3.png 1970-01-01 00:00:00 +0000 differ
2226=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_0.png'
2227Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
2228=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_1.png'
2229Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
2230=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_2.png'
2231Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
2232=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_3.png'
2233Binary files data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
2234=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_0.png'
2235Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
2236=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_1.png'
2237Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
2238=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_2.png'
2239Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
2240=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_3.png'
2241Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
2242=== removed file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.png'
2243Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_0.png 1970-01-01 00:00:00 +0000 differ
2244=== removed file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1.png'
2245Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1.png 1970-01-01 00:00:00 +0000 differ
2246=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_0.png'
2247Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
2248=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_1.png'
2249Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
2250=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_2.png'
2251Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
2252=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_3.png'
2253Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
2254=== removed file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2.png'
2255Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2.png 1970-01-01 00:00:00 +0000 differ
2256=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_0.png'
2257Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
2258=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_1.png'
2259Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
2260=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_2.png'
2261Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
2262=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_3.png'
2263Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
2264=== removed file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_3.png'
2265Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_3.png 1970-01-01 00:00:00 +0000 differ
2266=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_0.png'
2267Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
2268=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_1.png'
2269Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
2270=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_2.png'
2271Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
2272=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_3.png'
2273Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
2274=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_0.png'
2275Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
2276=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_1.png'
2277Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
2278=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_2.png'
2279Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
2280=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_3.png'
2281Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
2282=== removed file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_0.png'
2283Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_0.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_0.png 1970-01-01 00:00:00 +0000 differ
2284=== removed file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_1.png'
2285Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_1.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_1.png 1970-01-01 00:00:00 +0000 differ
2286=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_1_0.png'
2287Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
2288=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_1_1.png'
2289Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
2290=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_1_2.png'
2291Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
2292=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_1_3.png'
2293Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
2294=== removed file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_2.png'
2295Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_2.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_2.png 1970-01-01 00:00:00 +0000 differ
2296=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_2_0.png'
2297Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
2298=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_2_1.png'
2299Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
2300=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_2_2.png'
2301Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
2302=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_2_3.png'
2303Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
2304=== removed file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_3.png'
2305Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_3.png 2018-02-05 12:57:52 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_3.png 1970-01-01 00:00:00 +0000 differ
2306=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_4_0.png'
2307Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
2308=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_4_1.png'
2309Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
2310=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_4_2.png'
2311Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
2312=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/idle_4_3.png'
2313Binary files data/tribes/immovables/berry_bushes/strawberry/small/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
2314=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_0.png'
2315Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_0.png 2019-04-24 11:21:34 +0000 differ
2316=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_1.png'
2317Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_1.png 2019-04-24 11:21:34 +0000 differ
2318=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_2.png'
2319Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_2.png 2019-04-24 11:21:34 +0000 differ
2320=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_3.png'
2321Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.5_3.png 2019-04-24 11:21:34 +0000 differ
2322=== removed file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.png'
2323Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_0.png 1970-01-01 00:00:00 +0000 differ
2324=== removed file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1.png'
2325Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1.png 1970-01-01 00:00:00 +0000 differ
2326=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_0.png'
2327Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_0.png 2019-04-24 11:21:34 +0000 differ
2328=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_1.png'
2329Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_1.png 2019-04-24 11:21:34 +0000 differ
2330=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_2.png'
2331Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_2.png 2019-04-24 11:21:34 +0000 differ
2332=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_3.png'
2333Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_1_3.png 2019-04-24 11:21:34 +0000 differ
2334=== removed file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2.png'
2335Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2.png 1970-01-01 00:00:00 +0000 differ
2336=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_0.png'
2337Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_0.png 2019-04-24 11:21:34 +0000 differ
2338=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_1.png'
2339Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_1.png 2019-04-24 11:21:34 +0000 differ
2340=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_2.png'
2341Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_2.png 2019-04-24 11:21:34 +0000 differ
2342=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_3.png'
2343Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_2_3.png 2019-04-24 11:21:34 +0000 differ
2344=== removed file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_3.png'
2345Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_3.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_3.png 1970-01-01 00:00:00 +0000 differ
2346=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_0.png'
2347Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_0.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_0.png 2019-04-24 11:21:34 +0000 differ
2348=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_1.png'
2349Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_1.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_1.png 2019-04-24 11:21:34 +0000 differ
2350=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_2.png'
2351Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_2.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_2.png 2019-04-24 11:21:34 +0000 differ
2352=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_3.png'
2353Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_3.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/idle_4_3.png 2019-04-24 11:21:34 +0000 differ
2354=== modified file 'data/tribes/immovables/pond_dry/idle_00.png'
2355Binary files data/tribes/immovables/pond_dry/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/pond_dry/idle_00.png 2019-04-24 11:21:34 +0000 differ
2356=== modified file 'data/tribes/immovables/pond_dry/init.lua'
2357--- data/tribes/immovables/pond_dry/init.lua 2017-12-12 09:03:15 +0000
2358+++ data/tribes/immovables/pond_dry/init.lua 2019-04-24 11:21:34 +0000
2359@@ -22,7 +22,6 @@
2360 idle = {
2361 pictures = path.list_files (dirname .. "idle_??.png"),
2362 hotspot = { 8, 5 },
2363- scale = 2.5
2364 },
2365 }
2366 }
2367
2368=== modified file 'data/tribes/immovables/pond_growing/idle_00.png'
2369Binary files data/tribes/immovables/pond_growing/idle_00.png 2017-08-08 14:16:43 +0000 and data/tribes/immovables/pond_growing/idle_00.png 2019-04-24 11:21:34 +0000 differ
2370=== modified file 'data/tribes/immovables/pond_growing/init.lua'
2371--- data/tribes/immovables/pond_growing/init.lua 2018-02-17 15:41:29 +0000
2372+++ data/tribes/immovables/pond_growing/init.lua 2019-04-24 11:21:34 +0000
2373@@ -19,7 +19,6 @@
2374 idle = {
2375 pictures = path.list_files (dirname .. "idle_??.png"),
2376 hotspot = { 8, 5 },
2377- scale = 2.5
2378 },
2379 }
2380 }
2381
2382=== modified file 'data/tribes/immovables/pond_mature/idle_00.png'
2383Binary files data/tribes/immovables/pond_mature/idle_00.png 2019-03-30 06:46:25 +0000 and data/tribes/immovables/pond_mature/idle_00.png 2019-04-24 11:21:34 +0000 differ
2384=== modified file 'data/tribes/immovables/pond_mature/init.lua'
2385--- data/tribes/immovables/pond_mature/init.lua 2018-02-17 15:41:29 +0000
2386+++ data/tribes/immovables/pond_mature/init.lua 2019-04-24 11:21:34 +0000
2387@@ -22,7 +22,6 @@
2388 idle = {
2389 pictures = path.list_files (dirname .. "idle_??.png"),
2390 hotspot = { 8, 5 },
2391- scale = 2.5
2392 },
2393 }
2394 }
2395
2396=== modified file 'data/tribes/immovables/shipconstruction_frisians/init.lua'
2397--- data/tribes/immovables/shipconstruction_frisians/init.lua 2018-03-25 18:28:00 +0000
2398+++ data/tribes/immovables/shipconstruction_frisians/init.lua 2019-04-24 11:21:34 +0000
2399@@ -7,7 +7,6 @@
2400 descname = pgettext("immovable", "Ship Under Construction"),
2401 size = "small",
2402 helptext_script = dirname .. "helptexts.lua",
2403- representative_image = dirname .. "build_03.png",
2404 attributes = { "shipconstruction" },
2405 programs = {
2406 program = {
2407
2408=== modified file 'data/tribes/workers/barbarians/builder/init.lua'
2409--- data/tribes/workers/barbarians/builder/init.lua 2019-03-17 08:30:43 +0000
2410+++ data/tribes/workers/barbarians/builder/init.lua 2019-04-24 11:21:34 +0000
2411@@ -1,20 +1,11 @@
2412 dirname = path.dirname(__file__)
2413
2414-animations = {
2415- idle = {
2416- pictures = path.list_files(dirname .. "waiting_???.png"),
2417- hotspot = { 11, 22 },
2418- fps = 10
2419- },
2420- work = {
2421- pictures = path.list_files(dirname .. "work_??.png"),
2422- sound_effect = {
2423- path = "sound/hammering/hammering",
2424- priority = 64
2425- },
2426- hotspot = { 10, 22 },
2427- fps = 10
2428- }
2429+animations = {}
2430+add_animation(animations, "idle", dirname, "waiting", {11, 22}, 10)
2431+add_animation(animations, "work", dirname, "work", {10, 22}, 10)
2432+animations["work"]["sound_effect"] = {
2433+ path = "sound/hammering/hammering",
2434+ priority = 64
2435 }
2436 add_walking_animations(animations, "walk", dirname, "walk", {7, 22}, 10)
2437 add_walking_animations(animations, "walkload", dirname, "walk", {7, 22}, 10)
2438
2439=== modified file 'data/tribes/workers/barbarians/recruit/init.lua'
2440--- data/tribes/workers/barbarians/recruit/init.lua 2017-05-25 20:17:29 +0000
2441+++ data/tribes/workers/barbarians/recruit/init.lua 2019-04-24 11:21:34 +0000
2442@@ -1,12 +1,7 @@
2443 dirname = path.dirname(__file__)
2444
2445-animations = {
2446- idle = {
2447- pictures = path.list_files(dirname .. "idle_??.png"),
2448- hotspot = { 16, 30 },
2449- fps = 5
2450- }
2451-}
2452+animations = {}
2453+add_animation(animations, "idle", dirname, "idle", {16, 30}, 5)
2454 add_walking_animations(animations, "walk", dirname, "walk", {16, 30}, 10)
2455
2456
2457
2458=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_00.png'
2459Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_00.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_00.png 2019-04-24 11:21:34 +0000 differ
2460=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_00_pc.png'
2461Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_00_pc.png 2019-04-24 11:21:34 +0000 differ
2462=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_01.png'
2463Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_01.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_01.png 2019-04-24 11:21:34 +0000 differ
2464=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_01_pc.png'
2465Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_01_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_01_pc.png 2019-04-24 11:21:34 +0000 differ
2466=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_02.png'
2467Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_02.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_02.png 2019-04-24 11:21:34 +0000 differ
2468=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_02_pc.png'
2469Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_02_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_02_pc.png 2019-04-24 11:21:34 +0000 differ
2470=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_03.png'
2471Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_03.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_03.png 2019-04-24 11:21:34 +0000 differ
2472=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_03_pc.png'
2473Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_03_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_03_pc.png 2019-04-24 11:21:34 +0000 differ
2474=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_04.png'
2475Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_04.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_04.png 2019-04-24 11:21:34 +0000 differ
2476=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_04_pc.png'
2477Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_04_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_04_pc.png 2019-04-24 11:21:34 +0000 differ
2478=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_05.png'
2479Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_05.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_05.png 2019-04-24 11:21:34 +0000 differ
2480=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_05_pc.png'
2481Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_05_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_05_pc.png 2019-04-24 11:21:34 +0000 differ
2482=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_06.png'
2483Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_06.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_06.png 2019-04-24 11:21:34 +0000 differ
2484=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_06_pc.png'
2485Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_06_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_06_pc.png 2019-04-24 11:21:34 +0000 differ
2486=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_07.png'
2487Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_07.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_07.png 2019-04-24 11:21:34 +0000 differ
2488=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_07_pc.png'
2489Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_07_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_07_pc.png 2019-04-24 11:21:34 +0000 differ
2490=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_08.png'
2491Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_08.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_08.png 2019-04-24 11:21:34 +0000 differ
2492=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_08_pc.png'
2493Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_08_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_08_pc.png 2019-04-24 11:21:34 +0000 differ
2494=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_09.png'
2495Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_09.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_09.png 2019-04-24 11:21:34 +0000 differ
2496=== added file 'data/tribes/workers/barbarians/recruit/walk_e_0.5_09_pc.png'
2497Binary files data/tribes/workers/barbarians/recruit/walk_e_0.5_09_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_0.5_09_pc.png 2019-04-24 11:21:34 +0000 differ
2498=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_00.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_00.png'
2499=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_00_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_00_pc.png'
2500=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_01.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_01.png'
2501=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_01_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_01_pc.png'
2502=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_02.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_02.png'
2503=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_02_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_02_pc.png'
2504=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_03.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_03.png'
2505=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_03_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_03_pc.png'
2506=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_04.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_04.png'
2507=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_04_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_04_pc.png'
2508=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_05.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_05.png'
2509=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_05_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_05_pc.png'
2510=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_06.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_06.png'
2511=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_06_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_06_pc.png'
2512=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_07.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_07.png'
2513=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_07_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_07_pc.png'
2514=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_08.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_08.png'
2515=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_08_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_08_pc.png'
2516=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_09.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_09.png'
2517=== renamed file 'data/tribes/workers/barbarians/recruit/walk_e_09_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_e_1_09_pc.png'
2518=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_00.png'
2519Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_00.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_00.png 2019-04-24 11:21:34 +0000 differ
2520=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_00_pc.png'
2521Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_00_pc.png 2019-04-24 11:21:34 +0000 differ
2522=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_01.png'
2523Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_01.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_01.png 2019-04-24 11:21:34 +0000 differ
2524=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_01_pc.png'
2525Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_01_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_01_pc.png 2019-04-24 11:21:34 +0000 differ
2526=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_02.png'
2527Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_02.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_02.png 2019-04-24 11:21:34 +0000 differ
2528=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_02_pc.png'
2529Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_02_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_02_pc.png 2019-04-24 11:21:34 +0000 differ
2530=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_03.png'
2531Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_03.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_03.png 2019-04-24 11:21:34 +0000 differ
2532=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_03_pc.png'
2533Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_03_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_03_pc.png 2019-04-24 11:21:34 +0000 differ
2534=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_04.png'
2535Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_04.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_04.png 2019-04-24 11:21:34 +0000 differ
2536=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_04_pc.png'
2537Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_04_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_04_pc.png 2019-04-24 11:21:34 +0000 differ
2538=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_05.png'
2539Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_05.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_05.png 2019-04-24 11:21:34 +0000 differ
2540=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_05_pc.png'
2541Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_05_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_05_pc.png 2019-04-24 11:21:34 +0000 differ
2542=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_06.png'
2543Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_06.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_06.png 2019-04-24 11:21:34 +0000 differ
2544=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_06_pc.png'
2545Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_06_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_06_pc.png 2019-04-24 11:21:34 +0000 differ
2546=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_07.png'
2547Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_07.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_07.png 2019-04-24 11:21:34 +0000 differ
2548=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_07_pc.png'
2549Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_07_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_07_pc.png 2019-04-24 11:21:34 +0000 differ
2550=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_08.png'
2551Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_08.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_08.png 2019-04-24 11:21:34 +0000 differ
2552=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_08_pc.png'
2553Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_08_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_08_pc.png 2019-04-24 11:21:34 +0000 differ
2554=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_09.png'
2555Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_09.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_09.png 2019-04-24 11:21:34 +0000 differ
2556=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_0.5_09_pc.png'
2557Binary files data/tribes/workers/barbarians/recruit/walk_ne_0.5_09_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_0.5_09_pc.png 2019-04-24 11:21:34 +0000 differ
2558=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_00.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_00.png'
2559=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_00_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_00_pc.png'
2560=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_01.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_01.png'
2561=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_01_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_01_pc.png'
2562=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_02.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_02.png'
2563=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_02_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_02_pc.png'
2564=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_03.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_03.png'
2565=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_03_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_03_pc.png'
2566=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_04.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_04.png'
2567=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_04_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_04_pc.png'
2568=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_05.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_05.png'
2569=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_05_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_05_pc.png'
2570=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_06.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_06.png'
2571=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_06_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_06_pc.png'
2572=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_07.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_07.png'
2573=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_07_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_07_pc.png'
2574=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_08.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_08.png'
2575=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_08_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_08_pc.png'
2576=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_09.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_09.png'
2577=== renamed file 'data/tribes/workers/barbarians/recruit/walk_ne_09_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_ne_1_09_pc.png'
2578=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_00.png'
2579Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_00.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_00.png 2019-04-24 11:21:34 +0000 differ
2580=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_00_pc.png'
2581Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_00_pc.png 2019-04-24 11:21:34 +0000 differ
2582=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_01.png'
2583Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_01.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_01.png 2019-04-24 11:21:34 +0000 differ
2584=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_01_pc.png'
2585Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_01_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_01_pc.png 2019-04-24 11:21:34 +0000 differ
2586=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_02.png'
2587Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_02.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_02.png 2019-04-24 11:21:34 +0000 differ
2588=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_02_pc.png'
2589Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_02_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_02_pc.png 2019-04-24 11:21:34 +0000 differ
2590=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_03.png'
2591Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_03.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_03.png 2019-04-24 11:21:34 +0000 differ
2592=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_03_pc.png'
2593Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_03_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_03_pc.png 2019-04-24 11:21:34 +0000 differ
2594=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_04.png'
2595Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_04.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_04.png 2019-04-24 11:21:34 +0000 differ
2596=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_04_pc.png'
2597Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_04_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_04_pc.png 2019-04-24 11:21:34 +0000 differ
2598=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_05.png'
2599Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_05.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_05.png 2019-04-24 11:21:34 +0000 differ
2600=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_05_pc.png'
2601Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_05_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_05_pc.png 2019-04-24 11:21:34 +0000 differ
2602=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_06.png'
2603Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_06.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_06.png 2019-04-24 11:21:34 +0000 differ
2604=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_06_pc.png'
2605Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_06_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_06_pc.png 2019-04-24 11:21:34 +0000 differ
2606=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_07.png'
2607Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_07.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_07.png 2019-04-24 11:21:34 +0000 differ
2608=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_07_pc.png'
2609Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_07_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_07_pc.png 2019-04-24 11:21:34 +0000 differ
2610=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_08.png'
2611Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_08.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_08.png 2019-04-24 11:21:34 +0000 differ
2612=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_08_pc.png'
2613Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_08_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_08_pc.png 2019-04-24 11:21:34 +0000 differ
2614=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_09.png'
2615Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_09.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_09.png 2019-04-24 11:21:34 +0000 differ
2616=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_0.5_09_pc.png'
2617Binary files data/tribes/workers/barbarians/recruit/walk_nw_0.5_09_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_0.5_09_pc.png 2019-04-24 11:21:34 +0000 differ
2618=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_00.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_00.png'
2619=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_00_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_00_pc.png'
2620=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_01.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_01.png'
2621=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_01_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_01_pc.png'
2622=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_02.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_02.png'
2623=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_02_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_02_pc.png'
2624=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_03.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_03.png'
2625=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_03_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_03_pc.png'
2626=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_04.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_04.png'
2627=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_04_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_04_pc.png'
2628=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_05.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_05.png'
2629=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_05_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_05_pc.png'
2630=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_06.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_06.png'
2631=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_06_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_06_pc.png'
2632=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_07.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_07.png'
2633=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_07_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_07_pc.png'
2634=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_08.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_08.png'
2635=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_08_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_08_pc.png'
2636=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_09.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_09.png'
2637=== renamed file 'data/tribes/workers/barbarians/recruit/walk_nw_09_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_nw_1_09_pc.png'
2638=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_00.png'
2639Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_00.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_00.png 2019-04-24 11:21:34 +0000 differ
2640=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_00_pc.png'
2641Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_00_pc.png 2019-04-24 11:21:34 +0000 differ
2642=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_01.png'
2643Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_01.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_01.png 2019-04-24 11:21:34 +0000 differ
2644=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_01_pc.png'
2645Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_01_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_01_pc.png 2019-04-24 11:21:34 +0000 differ
2646=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_02.png'
2647Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_02.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_02.png 2019-04-24 11:21:34 +0000 differ
2648=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_02_pc.png'
2649Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_02_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_02_pc.png 2019-04-24 11:21:34 +0000 differ
2650=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_03.png'
2651Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_03.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_03.png 2019-04-24 11:21:34 +0000 differ
2652=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_03_pc.png'
2653Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_03_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_03_pc.png 2019-04-24 11:21:34 +0000 differ
2654=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_04.png'
2655Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_04.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_04.png 2019-04-24 11:21:34 +0000 differ
2656=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_04_pc.png'
2657Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_04_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_04_pc.png 2019-04-24 11:21:34 +0000 differ
2658=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_05.png'
2659Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_05.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_05.png 2019-04-24 11:21:34 +0000 differ
2660=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_05_pc.png'
2661Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_05_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_05_pc.png 2019-04-24 11:21:34 +0000 differ
2662=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_06.png'
2663Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_06.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_06.png 2019-04-24 11:21:34 +0000 differ
2664=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_06_pc.png'
2665Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_06_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_06_pc.png 2019-04-24 11:21:34 +0000 differ
2666=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_07.png'
2667Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_07.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_07.png 2019-04-24 11:21:34 +0000 differ
2668=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_07_pc.png'
2669Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_07_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_07_pc.png 2019-04-24 11:21:34 +0000 differ
2670=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_08.png'
2671Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_08.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_08.png 2019-04-24 11:21:34 +0000 differ
2672=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_08_pc.png'
2673Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_08_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_08_pc.png 2019-04-24 11:21:34 +0000 differ
2674=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_09.png'
2675Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_09.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_09.png 2019-04-24 11:21:34 +0000 differ
2676=== added file 'data/tribes/workers/barbarians/recruit/walk_se_0.5_09_pc.png'
2677Binary files data/tribes/workers/barbarians/recruit/walk_se_0.5_09_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_0.5_09_pc.png 2019-04-24 11:21:34 +0000 differ
2678=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_00.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_00.png'
2679=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_00_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_00_pc.png'
2680=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_01.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_01.png'
2681=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_01_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_01_pc.png'
2682=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_02.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_02.png'
2683=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_02_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_02_pc.png'
2684=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_03.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_03.png'
2685=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_03_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_03_pc.png'
2686=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_04.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_04.png'
2687=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_04_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_04_pc.png'
2688=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_05.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_05.png'
2689=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_05_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_05_pc.png'
2690=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_06.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_06.png'
2691=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_06_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_06_pc.png'
2692=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_07.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_07.png'
2693=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_07_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_07_pc.png'
2694=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_08.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_08.png'
2695=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_08_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_08_pc.png'
2696=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_09.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_09.png'
2697=== renamed file 'data/tribes/workers/barbarians/recruit/walk_se_09_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_se_1_09_pc.png'
2698=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_00.png'
2699Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_00.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_00.png 2019-04-24 11:21:34 +0000 differ
2700=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_00_pc.png'
2701Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_00_pc.png 2019-04-24 11:21:34 +0000 differ
2702=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_01.png'
2703Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_01.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_01.png 2019-04-24 11:21:34 +0000 differ
2704=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_01_pc.png'
2705Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_01_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_01_pc.png 2019-04-24 11:21:34 +0000 differ
2706=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_02.png'
2707Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_02.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_02.png 2019-04-24 11:21:34 +0000 differ
2708=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_02_pc.png'
2709Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_02_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_02_pc.png 2019-04-24 11:21:34 +0000 differ
2710=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_03.png'
2711Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_03.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_03.png 2019-04-24 11:21:34 +0000 differ
2712=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_03_pc.png'
2713Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_03_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_03_pc.png 2019-04-24 11:21:34 +0000 differ
2714=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_04.png'
2715Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_04.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_04.png 2019-04-24 11:21:34 +0000 differ
2716=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_04_pc.png'
2717Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_04_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_04_pc.png 2019-04-24 11:21:34 +0000 differ
2718=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_05.png'
2719Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_05.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_05.png 2019-04-24 11:21:34 +0000 differ
2720=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_05_pc.png'
2721Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_05_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_05_pc.png 2019-04-24 11:21:34 +0000 differ
2722=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_06.png'
2723Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_06.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_06.png 2019-04-24 11:21:34 +0000 differ
2724=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_06_pc.png'
2725Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_06_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_06_pc.png 2019-04-24 11:21:34 +0000 differ
2726=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_07.png'
2727Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_07.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_07.png 2019-04-24 11:21:34 +0000 differ
2728=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_07_pc.png'
2729Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_07_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_07_pc.png 2019-04-24 11:21:34 +0000 differ
2730=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_08.png'
2731Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_08.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_08.png 2019-04-24 11:21:34 +0000 differ
2732=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_08_pc.png'
2733Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_08_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_08_pc.png 2019-04-24 11:21:34 +0000 differ
2734=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_09.png'
2735Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_09.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_09.png 2019-04-24 11:21:34 +0000 differ
2736=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_0.5_09_pc.png'
2737Binary files data/tribes/workers/barbarians/recruit/walk_sw_0.5_09_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_0.5_09_pc.png 2019-04-24 11:21:34 +0000 differ
2738=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_00.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_00.png'
2739=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_00_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_00_pc.png'
2740=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_01.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_01.png'
2741=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_01_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_01_pc.png'
2742=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_02.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_02.png'
2743=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_02_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_02_pc.png'
2744=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_03.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_03.png'
2745=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_03_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_03_pc.png'
2746=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_04.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_04.png'
2747=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_04_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_04_pc.png'
2748=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_05.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_05.png'
2749=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_05_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_05_pc.png'
2750=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_06.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_06.png'
2751=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_06_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_06_pc.png'
2752=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_07.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_07.png'
2753=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_07_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_07_pc.png'
2754=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_08.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_08.png'
2755=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_08_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_08_pc.png'
2756=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_09.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_09.png'
2757=== renamed file 'data/tribes/workers/barbarians/recruit/walk_sw_09_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_sw_1_09_pc.png'
2758=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_00.png'
2759Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_00.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_00.png 2019-04-24 11:21:34 +0000 differ
2760=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_00_pc.png'
2761Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_00_pc.png 2019-04-24 11:21:34 +0000 differ
2762=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_01.png'
2763Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_01.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_01.png 2019-04-24 11:21:34 +0000 differ
2764=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_01_pc.png'
2765Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_01_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_01_pc.png 2019-04-24 11:21:34 +0000 differ
2766=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_02.png'
2767Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_02.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_02.png 2019-04-24 11:21:34 +0000 differ
2768=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_02_pc.png'
2769Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_02_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_02_pc.png 2019-04-24 11:21:34 +0000 differ
2770=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_03.png'
2771Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_03.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_03.png 2019-04-24 11:21:34 +0000 differ
2772=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_03_pc.png'
2773Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_03_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_03_pc.png 2019-04-24 11:21:34 +0000 differ
2774=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_04.png'
2775Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_04.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_04.png 2019-04-24 11:21:34 +0000 differ
2776=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_04_pc.png'
2777Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_04_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_04_pc.png 2019-04-24 11:21:34 +0000 differ
2778=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_05.png'
2779Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_05.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_05.png 2019-04-24 11:21:34 +0000 differ
2780=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_05_pc.png'
2781Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_05_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_05_pc.png 2019-04-24 11:21:34 +0000 differ
2782=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_06.png'
2783Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_06.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_06.png 2019-04-24 11:21:34 +0000 differ
2784=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_06_pc.png'
2785Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_06_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_06_pc.png 2019-04-24 11:21:34 +0000 differ
2786=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_07.png'
2787Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_07.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_07.png 2019-04-24 11:21:34 +0000 differ
2788=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_07_pc.png'
2789Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_07_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_07_pc.png 2019-04-24 11:21:34 +0000 differ
2790=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_08.png'
2791Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_08.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_08.png 2019-04-24 11:21:34 +0000 differ
2792=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_08_pc.png'
2793Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_08_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_08_pc.png 2019-04-24 11:21:34 +0000 differ
2794=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_09.png'
2795Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_09.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_09.png 2019-04-24 11:21:34 +0000 differ
2796=== added file 'data/tribes/workers/barbarians/recruit/walk_w_0.5_09_pc.png'
2797Binary files data/tribes/workers/barbarians/recruit/walk_w_0.5_09_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_0.5_09_pc.png 2019-04-24 11:21:34 +0000 differ
2798=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_00.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_00.png'
2799=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_00_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_00_pc.png'
2800=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_01.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_01.png'
2801=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_01_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_01_pc.png'
2802=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_02.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_02.png'
2803=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_02_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_02_pc.png'
2804=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_03.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_03.png'
2805=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_03_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_03_pc.png'
2806=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_04.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_04.png'
2807=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_04_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_04_pc.png'
2808=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_05.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_05.png'
2809=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_05_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_05_pc.png'
2810=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_06.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_06.png'
2811=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_06_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_06_pc.png'
2812=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_07.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_07.png'
2813=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_07_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_07_pc.png'
2814=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_08.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_08.png'
2815=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_08_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_08_pc.png'
2816=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_09.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_09.png'
2817=== renamed file 'data/tribes/workers/barbarians/recruit/walk_w_09_pc.png' => 'data/tribes/workers/barbarians/recruit/walk_w_1_09_pc.png'
2818=== modified file 'data/tribes/workers/barbarians/shipwright/init.lua'
2819--- data/tribes/workers/barbarians/shipwright/init.lua 2019-03-17 08:30:43 +0000
2820+++ data/tribes/workers/barbarians/shipwright/init.lua 2019-04-24 11:21:34 +0000
2821@@ -1,19 +1,11 @@
2822 dirname = path.dirname(__file__)
2823
2824-animations = {
2825- idle = {
2826- pictures = path.list_files(dirname .. "idle_??.png"),
2827- hotspot = { 11, 23 },
2828- },
2829- work = {
2830- pictures = path.list_files(dirname .. "work_??.png"),
2831- sound_effect = {
2832- path = "sound/hammering/hammering",
2833- priority = 64
2834- },
2835- hotspot = { 11, 26 },
2836- fps = 10
2837- }
2838+animations = {}
2839+add_animation(animations, "idle", dirname, "idle", {11, 23})
2840+add_animation(animations, "work", dirname, "work", {11, 26}, 10)
2841+animations["work"]["sound_effect"] = {
2842+ path = "sound/hammering/hammering",
2843+ priority = 64
2844 }
2845 add_walking_animations(animations, "walk", dirname, "walk", {9, 24}, 10)
2846 add_walking_animations(animations, "walkload", dirname, "walkload", {11, 22}, 10)
2847
2848=== modified file 'doc/sphinx/source/animations.rst'
2849--- doc/sphinx/source/animations.rst 2019-03-17 08:30:43 +0000
2850+++ doc/sphinx/source/animations.rst 2019-04-24 11:21:34 +0000
2851@@ -3,13 +3,24 @@
2852 Animations
2853 ==========
2854
2855-Animations are defined as Lua tables. All map objects have a mandatory ``idle`` animation. They can then have further animations, depending on what their specific capabilities are. Let's look at an example::
2856+This article covers how to get your animations into the Widelands engine.
2857+For information on how to create the animations' images with Blender, see
2858+`GraphicsDevelopment <https://wl.widelands.org/wiki/GraphicsDevelopment/>`_.
2859+
2860+Animations are defined as `Lua tables <http://lua-users.org/wiki/TablesTutorial>`_.
2861+All :ref:`map objects <animations_map_object_types>` have a mandatory ``idle`` animation.
2862+They can then have further animations, depending on what their specific capabilities are.
2863+
2864+We recommend that you use the :ref:`animations_convenience_functions` below for
2865+the Lua coding, but let's look at an example first to understand which options
2866+are available, and what your image files need to look like:
2867+
2868+.. code-block:: lua
2869
2870 animations = {
2871 idle = {
2872- pictures = path.list_files(path.dirname(__file__) .. "idle_??.png"),
2873+ files = path.list_files(path.dirname(__file__) .. "idle_??.png"),
2874 hotspot = { 5, 7 },
2875- scale = 2.5,
2876 fps = 4,
2877 sound_effect = {
2878 path = "sound/foo/bar",
2879@@ -24,8 +35,11 @@
2880 **idle**
2881 *Mandatory*. This is the name of the animation. The animation can then be referenced by this name e.g. if you want to trigger it in a production program.
2882
2883+**files**
2884+ *Mandatory*. A template for the image names. Our example will pick up any image from ``idle_00.png`` through ``idle_99.png`` in the specified directory path -- the current path in our example. These images can optionally have corresponding player color mask images called ``idle_00_pc.png`` through ``idle_99_pc.png``. Make sure to include leading 0's in the file names and to have consistent length -- we support 1, 2 and 3 digit numbers in an animation.
2885+
2886 **pictures**
2887- *Mandatory*. A template for the image names. Our example will pick up any image from ``idle_00.png`` through ``idle_99.png`` in the specified directory path – the current path in our example. These images can optionally have corresponding player color mask images called ``idle_00_pc.png`` through ``idle_99_pc.png``. Make sure to include leading 0's in the file names.
2888+ *DEPRECATED*. The same as ``files``.
2889
2890 **hotspot**
2891 *Mandatory*. Hotspots define a place on a graphic image through its *x* and *y* coordinates that can be used as a handle or reference point to provide control over positioning the image on the map. For example, hotspots help carriers stay on the road, and control the positioning of the wares they carry. Increase ``x`` to shift the animation to the left and ``y`` to shift it upwards.
2892@@ -33,10 +47,6 @@
2893 **fps**
2894 *Optional*. The frames per second for this animation if you want to deviate from the default fps. This will control the playback speed of the animation. Do not specify this value if you have only 1 animation frame.
2895
2896-**scale**
2897- **DEPRECATED**. If the animation should be blitted at any other scale than 1:1,
2898- specify the float value here. For example, if the animation images are 2.5 times the size of what should be blitted at default zoom, use ``scale = 2.5``.
2899-
2900 **sound_effect**
2901 *Optional*. Our example will look for the sound files ``bar_00.ogg`` through ``bar_99.ogg`` in the directory ``data/sound/foo`` and play them in sequence. The priority is optional with the default being ``1``, and its range is:
2902
2903@@ -45,14 +55,145 @@
2904 * **255:** Always play
2905
2906
2907+Mipmaps
2908+-------
2909+
2910+We support mipmaps for animations. They allow us to provide the same image in different
2911+resolutions for optimum rendering quality. Let's look at an example with a mipmap ``idle`` animation and a normal ``build`` animation:
2912+
2913+.. code-block:: lua
2914+
2915+ animations = {
2916+ idle = {
2917+ mipmap = {
2918+ {
2919+ scale = 0.5,
2920+ files = path.list_files(dirname .. "idle_0.5_??.png"),
2921+ },
2922+ {
2923+ scale = 1,
2924+ files = path.list_files(dirname .. "idle_1_??.png"),
2925+ },
2926+ {
2927+ scale = 2,
2928+ files = path.list_files(dirname .. "idle_2_??.png"),
2929+ },
2930+ {
2931+ scale = 4,
2932+ files = path.list_files(dirname .. "idle_4_??.png"),
2933+ }
2934+ },
2935+ hotspot = { 5, 7 },
2936+ fps = 4,
2937+ sound_effect = {
2938+ directory = "sound/foo",
2939+ name = "bar",
2940+ },
2941+ },
2942+ build = {
2943+ files = path.list_files(dirname .. "build_??.png"),
2944+ hotspot = { 5, 7 },
2945+ }
2946+ },
2947+
2948+The scale of ``1`` is mandatory, and other supported scales are ``0.5``, ``2``
2949+and ``4``.
2950+The base table should no longer contain the ``files`` entry
2951+when you're using a mipmap.
2952+Each mimap entry must define the ``files`` and the ``scale``.
2953+See also :ref:`animations_converting_formats`.
2954+
2955+
2956 Directional Animations
2957 ----------------------
2958
2959 For objects that move around the map, like carriers, ships or animals, there need to be 6 animations for the walking directions northeast ``"ne"``, east ``"e"``, southeast ``"se"``, southwest ``"sw"``, west ``"w"``, and northwest ``"nw"``. So, a "walk" animation would consist of 6 animations called ``"walk_ne"``, ``"walk_e"``, ``"walk_se"``, ``"walk_sw"``, ``"walk_w"``, and ``"walk_nw"``.
2960
2961-Each of these 6 animations will then be defined like the animation above, so we would end up with pictures called ``walk_ne_00.png``, ``walk_ne_01.png`` ... ``walk_nw_00.png``, ``walk_nw_01.png`` ..., and for player color: ``walk_ne_00_pc.png``, ``walk_ne_01_pc.png`` ... ``walk_nw_00_pc.png``, ``walk_nw_01_pc.png``, ...
2962-
2963-In order to cut down on the manual coding needed, we have a convenience function :any:`add_walking_animations` to define the animation tables for walking animations. The corresponding ``.lua`` script file is included centrally when the tribe or world loading is started, so you won't need to include it again.
2964+Each of these 6 animations will then be defined like the animation above, so we would end up with files called ``walk_ne_00.png``, ``walk_ne_01.png`` ... ``walk_nw_00.png``, ``walk_nw_01.png`` ..., and for player color: ``walk_ne_00_pc.png``, ``walk_ne_01_pc.png`` ... ``walk_nw_00_pc.png``, ``walk_nw_01_pc.png``, ...
2965+
2966+We also support mipmaps here -- name the files ``walk_ne_0.5_00.png``,
2967+``walk_ne_0.5_01.png`` etc. for scale `0.5`, ``walk_ne_1_00.png``,
2968+``walk_ne_1_01.png`` etc. for scale `1` and so on.
2969+
2970+
2971+
2972+.. _animations_convenience_functions:
2973+
2974+Convenience Functions
2975+---------------------
2976+
2977+In order to cut down on the manual coding needed, we provide the convenience functions
2978+:any:`add_animation` for static animations and :any:`add_walking_animations` for walking
2979+animations, both of which will also detect mipmaps automatically.
2980+The corresponding ``.lua`` script file is included centrally when the tribe or world
2981+loading is started, so you won't need to include it again. Example:
2982+
2983+.. code-block:: lua
2984+
2985+ dirname = path.dirname(__file__)
2986+
2987+ -- This table will contain the animations
2988+ animations = {}
2989+
2990+ -- Add an idle animation with hotspot = {16, 30} and fps = 5
2991+ add_animation(animations, "idle", dirname, "idle", {16, 30}, 5)
2992+
2993+ -- Add animations for the 6 directions with hotspot = {16, 30} and fps = 10
2994+ add_walking_animations(animations, "walk", dirname, "walk", {16, 30}, 10)
2995+
2996+ -- Add a "walkload" animation. The animation hasn't been created yet in this example, so we reuse the files for the "walk" animation.
2997+ add_walking_animations(animations, "walkload", dirname, "walk", {16, 30}, 10)
2998+
2999+
3000+ tribes:new_worker_type {
3001+ msgctxt = "fancytribe_worker",
3002+ name = "fancytribe_diligentworker",
3003+ ...
3004+
3005+ animations = animations, -- Include the animations table in your map object
3006+ ...
3007+ }
3008+
3009+The convenience functions don't support sound effects directly, so you'll have to
3010+add them manually, like this:
3011+
3012+.. code-block:: lua
3013+
3014+ animations = {}
3015+ add_animation(animations, "work", dirname, "work", {11, 26}, 10)
3016+ animations["work"]["sound_effect"] = {
3017+ name = "bar",
3018+ directory = "sound/foo"
3019+ }
3020+
3021+
3022+.. _animations_converting_formats:
3023+
3024+Converting Animation Formats
3025+----------------------------
3026+
3027+When converting a simple file animation to a mipmap animation, follow these steps:
3028+
3029+* Use `utils/rename_animation.py` to rename the previous animation, to make sure
3030+ that our version control system will not lose its history, e.g.::
3031+
3032+ utils/rename_animation.py data/tribes/workers/fancytribe/diligentworker/walk_ne data/tribes/workers/fancytribe/diligentworker/walk_ne_1
3033+ utils/rename_animation.py data/tribes/workers/fancytribe/diligentworker/walk_nw data/tribes/workers/fancytribe/diligentworker/walk_nw_1
3034+ ...
3035+
3036+* Export the new animations from Blender, preferably at all supported scales.
3037+ Only export the higher resolution scales if the textures have sufficient resolution.
3038+
3039+* Alternatively, you can use the Java tool MipmapMaker that is contained in the widelands-media repository.
3040+ MipmapMaker accepts high-resolution images as input files (they should be at least 4 times the in-game size)
3041+ and creates correctly named mipmap images for all supported scales for each animation, e.g.:
3042+
3043+ java MipmapMaker ~/widelands/data/tribes/workers/fancytribe/diligentworker walk_se 2 true true true 4.0
3044+
3045+ MipmapMaker is documented in ``widelands-media/graphics/tools/Graphics Tools (Java)/Readme``.
3046+
3047+
3048+.. _animations_map_object_types:
3049
3050 Map Object Types
3051 ----------------
3052@@ -82,28 +223,17 @@
3053
3054 Any animation other than the ``build`` and ``idle`` animations are referenced in the building's ``programs`` table via the ``animate`` command. For more information on building programs, see :ref:`productionsite_programs`.
3055
3056-For example, a mine could look like this::
3057+For example, the animations for a mine could look like this:
3058+
3059+.. code-block:: lua
3060
3061 dirname = path.dirname(__file__)
3062
3063- animations = {
3064- idle = {
3065- pictures = path.list_files(dirname .. "idle_??.png"),
3066- hotspot = { 21, 36 },
3067- },
3068- build = {
3069- pictures = path.list_files(dirname .. "build_??.png"),
3070- hotspot = { 21, 36 },
3071- },
3072- working = {
3073- pictures = path.list_files(dirname .. "working_??.png"),
3074- hotspot = { 21, 36 },
3075- },
3076- empty = {
3077- pictures = path.list_files(dirname .. "empty_??.png"),
3078- hotspot = { 21, 36 },
3079- },
3080- },
3081+ animations = {}
3082+ add_animation(animations, "idle", dirname, "idle", {21, 36})
3083+ add_animation(animations, "build", dirname, "build", {21, 36})
3084+ add_animation(animations, "working", dirname, "working", {21, 36})
3085+ add_animation(animations, "empty", dirname, "empty", {21, 36})
3086
3087
3088 Immovables
3089@@ -128,21 +258,15 @@
3090
3091 Any further animations like e.g. "plant", "harvest", or "breed" will be referenced in the :ref:`tribes_worker_programs`, under the ``animation`` command.
3092
3093-For example, a fisher could look like this::
3094+For example, a fisher's animations could look like this:
3095+
3096+.. code-block:: lua
3097
3098 dirname = path.dirname(__file__)
3099
3100- animations = {
3101- idle = {
3102- pictures = path.list_files(dirname .. "idle_??.png"),
3103- hotspot = { 9, 39 },
3104- },
3105- fishing = {
3106- pictures = path.list_files(dirname .. "fishing_??.png"),
3107- hotspot = { 9, 39 },
3108- fps = 10
3109- }
3110- }
3111+ animations = {}
3112+ add_animation(animations, "idle", dirname, "idle", {9, 39})
3113+ add_animation(animations, "fishing", dirname, "fishing", {9, 39}, 10)
3114 add_walking_animations(animations, "walk", dirname, "walk", {10, 38}, 10)
3115 add_walking_animations(animations, "walkload", dirname, "walk", {10, 38}, 10)
3116
3117@@ -150,29 +274,33 @@
3118 ^^^^^^^^
3119
3120 Soldiers have the same animations as workers, plus additional non-directional battle animations. There can be multiple animations for each action in battle to be selected at random.
3121-For example, attacking towards the west can be defined like this::
3122+For example, attacking towards the west can be defined like this:
3123+
3124+.. code-block:: lua
3125
3126 dirname = path.dirname(__file__)
3127
3128- animations = {
3129- ...
3130- atk_ok_w1 = {
3131- pictures = path.list_files(dirname .. "atk_ok_w1_??.png"),
3132- hotspot = { 36, 40 },
3133- fps = 20
3134- },
3135- atk_ok_w2 = {
3136- pictures = path.list_files(dirname .. "atk_ok_w2_??.png"),
3137- hotspot = { 36, 40 },
3138- fps = 20
3139- },
3140- ...
3141- },
3142-
3143- attack_success_w = {
3144- "atk_ok_w1",
3145- "atk_ok_w2"
3146- },
3147+ animations = {}
3148+ add_animation(animations, "idle", dirname, "idle", {16, 31}, 5)
3149+ add_walking_animations(animations, "walk", dirname, "walk", {16, 31}, 10)
3150+ ...
3151+
3152+ add_animation(animations, "atk_ok_w1", dirname, "atk_ok_w1", {36, 40}, 20) -- First attack animation
3153+ add_animation(animations, "atk_ok_w2", dirname, "atk_ok_w2", {36, 40}, 20) -- Second attack animation
3154+ ...
3155+
3156+ tribes:new_soldier_type {
3157+ msgctxt = "fancytribe_worker",
3158+ name = "fancytribe_soldier",
3159+ ...
3160+
3161+ -- Reference the attack animations in your map object
3162+ attack_success_w = {
3163+ "atk_ok_w1",
3164+ "atk_ok_w2"
3165+ },
3166+ ...
3167+ }
3168
3169 The battle animations are:
3170
3171
3172=== modified file 'src/graphic/animation.cc'
3173--- src/graphic/animation.cc 2019-04-24 06:01:37 +0000
3174+++ src/graphic/animation.cc 2019-04-24 11:21:34 +0000
3175@@ -23,8 +23,10 @@
3176 #include <cstdio>
3177 #include <limits>
3178 #include <memory>
3179+#include <set>
3180
3181 #include <boost/algorithm/string/replace.hpp>
3182+#include <boost/format.hpp>
3183
3184 #include "base/i18n.h"
3185 #include "base/log.h"
3186@@ -43,19 +45,40 @@
3187 #include "sound/sound_handler.h"
3188
3189 namespace {
3190+// The mipmap scales supported by the engine.
3191+// Ensure that this always matches supported_scales in data/scripting/mapobjects.lua.
3192+const std::set<float> kSupportedScales { 0.5, 1, 2, 4};
3193+
3194 /**
3195 * Implements the Animation interface for an animation that is unpacked on disk, that
3196 * is every frame and every pc color frame is an singular file on disk.
3197 */
3198 class NonPackedAnimation : public Animation {
3199 public:
3200+ struct MipMapEntry {
3201+ explicit MipMapEntry(float scale, const LuaTable& table);
3202+
3203+ // Whether this image set has player color masks provided
3204+ bool has_playercolor_masks;
3205+
3206+ // Image files on disk
3207+ std::vector<std::string> image_files;
3208+ // Player color mask files on disk
3209+ std::vector<std::string> playercolor_mask_image_files;
3210+
3211+ // Loaded images for each frame
3212+ std::vector<const Image*> frames;
3213+ // Loaded player color mask images for each frame
3214+ std::vector<const Image*> playercolor_mask_frames;
3215+ };
3216+
3217 ~NonPackedAnimation() override {
3218 }
3219 explicit NonPackedAnimation(const LuaTable& table);
3220
3221 // Implements Animation.
3222 float height() const override;
3223- Rectf source_rectangle(int percent_from_bottom) const override;
3224+ Rectf source_rectangle(int percent_from_bottom, float scale) const override;
3225 Rectf destination_rectangle(const Vector2f& position,
3226 const Rectf& source_rect,
3227 float scale) const override;
3228@@ -68,9 +91,11 @@
3229 const Rectf& source_rect,
3230 const Rectf& destination_rect,
3231 const RGBColor* clr,
3232- Surface* target) const override;
3233-
3234+ Surface* target, float scale) const override;
3235 private:
3236+
3237+ float find_best_scale(float scale) const;
3238+
3239 // TODO(unknown): The chosen semantics of animation sound effects is problematic:
3240 // What if the game runs very slowly or very quickly?
3241 void trigger_sound(uint32_t framenumber, const Widelands::Coords& coords) const override;
3242@@ -84,14 +109,15 @@
3243 uint32_t current_frame(uint32_t time) const;
3244
3245 uint32_t frametime_;
3246- Vector2i hotspot_ = Vector2i::zero();
3247- bool hasplrclrs_;
3248- std::vector<std::string> image_files_;
3249- std::vector<std::string> pc_mask_image_files_;
3250- float scale_;
3251-
3252- std::vector<const Image*> frames_;
3253- std::vector<const Image*> pcmasks_;
3254+ uint16_t nr_frames_;
3255+
3256+ Vector2i hotspot_;
3257+
3258+ struct MipMapCompare {
3259+ bool operator() (const float lhs, const float rhs) const
3260+ {return lhs > rhs;}
3261+ };
3262+ std::map<float, std::unique_ptr<MipMapEntry>, MipMapCompare> mipmaps_;
3263
3264 // ID of sound effect that will be played at frame 0.
3265 FxId sound_effect_;
3266@@ -99,15 +125,42 @@
3267 bool play_once_;
3268 };
3269
3270+NonPackedAnimation::MipMapEntry::MipMapEntry(float scale, const LuaTable& table) : has_playercolor_masks(false) {
3271+ if (scale <= 0.0f) {
3272+ throw wexception("Animation scales must be positive numbers. Found %.2f", static_cast<double>(scale));
3273+ }
3274+
3275+ // TODO(GunChleoc): We want to rename these from "pictures" to "files", because we'll have spritesheets etc. in the future, and this naming will be clearer.
3276+ // We don't want to convert them in bulk right now though - it will take care of itself as we convert to mipmaps.
3277+ image_files = (table.has_key("files") ? table.get_table("files") : table.get_table("pictures"))->array_entries<std::string>();
3278+
3279+ if (image_files.empty()) {
3280+ throw wexception("Animation without image files. For a scale of 1.0, the template should look similar to this:"
3281+ " 'directory/idle_1_??.png' for 'directory/idle_1_00.png' etc.");
3282+ }
3283+
3284+ for (std::string image_file : image_files) {
3285+ boost::replace_last(image_file, ".png", "_pc.png");
3286+ if (g_fs->file_exists(image_file)) {
3287+ has_playercolor_masks = true;
3288+ playercolor_mask_image_files.push_back(image_file);
3289+ } else if (has_playercolor_masks) {
3290+ throw wexception("Animation is missing player color file: %s", image_file.c_str());
3291+ }
3292+ }
3293+
3294+ assert(!image_files.empty());
3295+ assert(playercolor_mask_image_files.size() == image_files.size() || playercolor_mask_image_files.empty());
3296+}
3297+
3298 NonPackedAnimation::NonPackedAnimation(const LuaTable& table)
3299 : frametime_(FRAME_LENGTH),
3300 hotspot_(table.get_vector<std::string, int>("hotspot")),
3301- hasplrclrs_(false),
3302- scale_(1),
3303 sound_effect_(kNoSoundEffect),
3304 sound_priority_(kFxPriorityLowest),
3305 play_once_(false) {
3306 try {
3307+ // Sound
3308 if (table.has_key("sound_effect")) {
3309 std::unique_ptr<LuaTable> sound_effects = table.get_table("sound_effect");
3310 sound_effect_ =
3311@@ -124,98 +177,128 @@
3312 }
3313 }
3314
3315+ // Repetition
3316 if (table.has_key("play_once")) {
3317 play_once_ = table.get_bool("play_once");
3318 }
3319
3320- image_files_ = table.get_table("pictures")->array_entries<std::string>();
3321+ if (table.has_key("mipmap")) {
3322+ std::unique_ptr<LuaTable> mipmaps_table = table.get_table("mipmap");
3323+ for (const int key : mipmaps_table->keys<int>()) {
3324+ std::unique_ptr<LuaTable> current_scale_table = mipmaps_table->get_table(key);
3325+ const float current_scale = current_scale_table->get_double("scale");
3326+ if (kSupportedScales.count(current_scale) != 1) {
3327+ std::string supported_scales = "";
3328+ for (const float supported_scale : kSupportedScales) {
3329+ supported_scales = (boost::format("%s %.1f") % supported_scales % supported_scale).str();
3330+ }
3331+ throw wexception(
3332+ "Animation has unsupported scale '%.2f' in mipmap - supported scales are:%s", static_cast<double>(current_scale), supported_scales.c_str());
3333+ }
3334+ mipmaps_.insert(std::make_pair(current_scale, std::unique_ptr<MipMapEntry>(new MipMapEntry(current_scale, *current_scale_table))));
3335+ }
3336+ } else {
3337+ mipmaps_.insert(std::make_pair(1.0f, std::unique_ptr<MipMapEntry>(new MipMapEntry(1.0f, table))));
3338+ }
3339
3340- if (image_files_.empty()) {
3341- throw wexception("Animation without pictures. The template should look similar to this:"
3342- " 'directory/idle_??.png' for 'directory/idle_00.png' etc.");
3343- } else if (table.has_key("fps")) {
3344- if (image_files_.size() == 1) {
3345+ // Frames
3346+ nr_frames_ = mipmaps_.begin()->second->image_files.size();
3347+ if (table.has_key("fps")) {
3348+ if (nr_frames_ == 1) {
3349 throw wexception(
3350- "Animation with one picture %s must not have 'fps'", image_files_[0].c_str());
3351+ "Animation with one picture %s must not have 'fps'", mipmaps_.begin()->second->image_files[0].c_str());
3352 }
3353 frametime_ = 1000 / get_positive_int(table, "fps");
3354 }
3355
3356- for (std::string image_file : image_files_) {
3357- boost::replace_last(image_file, ".png", "_pc.png");
3358- if (g_fs->file_exists(image_file)) {
3359- hasplrclrs_ = true;
3360- pc_mask_image_files_.push_back(image_file);
3361- } else if (hasplrclrs_) {
3362- throw wexception("Animation is missing player color file: %s", image_file.c_str());
3363- }
3364- }
3365-
3366- if (table.has_key("scale")) {
3367- scale_ = table.get_double("scale");
3368- if (scale_ <= 0.0f) {
3369- throw wexception("Animation scale needs to be > 0.0f, but it is %f. The first image of "
3370- "this animation is %s",
3371- static_cast<double>(scale_), image_files_[0].c_str());
3372- }
3373- }
3374-
3375- assert(!image_files_.empty());
3376- assert(pc_mask_image_files_.size() == image_files_.size() || pc_mask_image_files_.empty());
3377- assert(scale_ > 0);
3378+ // Perform some checks to make sure that the data is complete and consistent
3379+ const bool should_have_playercolor = mipmaps_.begin()->second->has_playercolor_masks;
3380+ for (const auto& mipmap : mipmaps_) {
3381+ if (mipmap.second->image_files.size() != nr_frames_) {
3382+ throw wexception("Mismatched number of images for different scales in animation table: %" PRIuS " vs. %u at scale %.2f",
3383+ mipmap.second->image_files.size(),
3384+ nr_frames_,
3385+ static_cast<double>(mipmap.first));
3386+ }
3387+ if (mipmap.second->has_playercolor_masks != should_have_playercolor) {
3388+ throw wexception("Mismatched existence of player colors in animation table for scales %.2f and %.2f",
3389+ static_cast<double>(mipmaps_.begin()->first),
3390+ static_cast<double>(mipmap.first));
3391+ }
3392+ }
3393+ if (mipmaps_.count(1.0f) != 1) {
3394+ throw wexception("All animations must provide images for the neutral scale (1.0)");
3395+ }
3396 } catch (const LuaError& e) {
3397 throw wexception("Error in animation table: %s", e.what());
3398 }
3399 }
3400
3401+float NonPackedAnimation::find_best_scale(float scale) const {
3402+ assert(!mipmaps_.empty());
3403+ float result = mipmaps_.begin()->first;
3404+ for (const auto& mipmap : mipmaps_) {
3405+ // The map is reverse sorted, so we can break as soon as we are lower than the wanted scale
3406+ if (mipmap.first < scale) {
3407+ break;
3408+ }
3409+ result = mipmap.first;
3410+ }
3411+ return result;
3412+}
3413+
3414 void NonPackedAnimation::ensure_graphics_are_loaded() const {
3415- if (frames_.empty()) {
3416+ if (mipmaps_.begin()->second->frames.empty()) {
3417 const_cast<NonPackedAnimation*>(this)->load_graphics();
3418 }
3419 }
3420
3421 void NonPackedAnimation::load_graphics() {
3422- if (image_files_.empty())
3423- throw wexception("animation without pictures.");
3424-
3425- if (pc_mask_image_files_.size() && pc_mask_image_files_.size() != image_files_.size())
3426- throw wexception("animation has %" PRIuS " frames but playercolor mask has %" PRIuS " frames",
3427- image_files_.size(), pc_mask_image_files_.size());
3428-
3429- for (const std::string& filename : image_files_) {
3430- const Image* image = g_gr->images().get(filename);
3431- if (frames_.size() &&
3432- (frames_[0]->width() != image->width() || frames_[0]->height() != image->height())) {
3433- throw wexception("wrong size: (%u, %u), should be (%u, %u) like the first frame",
3434- image->width(), image->height(), frames_[0]->width(),
3435- frames_[0]->height());
3436- }
3437- frames_.push_back(image);
3438- }
3439-
3440- for (const std::string& filename : pc_mask_image_files_) {
3441- // TODO(unknown): Do not load playercolor mask as opengl texture or use it as
3442- // opengl texture.
3443- const Image* pc_image = g_gr->images().get(filename);
3444- if (frames_[0]->width() != pc_image->width() || frames_[0]->height() != pc_image->height()) {
3445- // TODO(unknown): see bug #1324642
3446- throw wexception("playercolor mask has wrong size: (%u, %u), should "
3447- "be (%u, %u) like the animation frame",
3448- pc_image->width(), pc_image->height(), frames_[0]->width(),
3449- frames_[0]->height());
3450- }
3451- pcmasks_.push_back(pc_image);
3452+ for (const auto& entry : mipmaps_) {
3453+ MipMapEntry* mipmap = entry.second.get();
3454+
3455+ if (mipmap->image_files.empty()) {
3456+ throw wexception("animation without image files at promised scale %.2f.", static_cast<double>(entry.first));
3457+ }
3458+ if (mipmap->playercolor_mask_image_files.size() && mipmap->playercolor_mask_image_files.size() != mipmap->image_files.size()) {
3459+ throw wexception("animation has %" PRIuS " frames but playercolor mask has %" PRIuS " frames for scale %.2f",
3460+ mipmap->image_files.size(), mipmap->playercolor_mask_image_files.size(), static_cast<double>(entry.first));
3461+ }
3462+
3463+ for (const std::string& filename : mipmap->image_files) {
3464+ const Image* image = g_gr->images().get(filename);
3465+ if (mipmap->frames.size() &&
3466+ (mipmap->frames[0]->width() != image->width() || mipmap->frames[0]->height() != image->height())) {
3467+ throw wexception("wrong size: (%u, %u), should be (%u, %u) like the first frame",
3468+ image->width(), image->height(), mipmap->frames[0]->width(),
3469+ mipmap->frames[0]->height());
3470+ }
3471+ mipmap->frames.push_back(image);
3472+ }
3473+
3474+ for (const std::string& filename : mipmap->playercolor_mask_image_files) {
3475+ // TODO(unknown): Do not load playercolor mask as opengl texture or use it as
3476+ // opengl texture.
3477+ const Image* pc_image = g_gr->images().get(filename);
3478+ if (mipmap->frames[0]->width() != pc_image->width() || mipmap->frames[0]->height() != pc_image->height()) {
3479+ // TODO(unknown): see bug #1324642
3480+ throw wexception("playercolor mask has wrong size: (%u, %u), should "
3481+ "be (%u, %u) like the animation frame",
3482+ pc_image->width(), pc_image->height(), mipmap->frames[0]->width(),
3483+ mipmap->frames[0]->height());
3484+ }
3485+ mipmap->playercolor_mask_frames.push_back(pc_image);
3486+ }
3487 }
3488 }
3489
3490 float NonPackedAnimation::height() const {
3491 ensure_graphics_are_loaded();
3492- return frames_[0]->height() / scale_;
3493+ return mipmaps_.at(1.0f)->frames.at(0)->height();
3494 }
3495
3496 uint16_t NonPackedAnimation::nr_frames() const {
3497- ensure_graphics_are_loaded();
3498- return frames_.size();
3499+ return nr_frames_;
3500 }
3501
3502 uint32_t NonPackedAnimation::frametime() const {
3503@@ -223,21 +306,24 @@
3504 }
3505
3506 const Image* NonPackedAnimation::representative_image(const RGBColor* clr) const {
3507- assert(!image_files_.empty());
3508- const Image* image = (hasplrclrs_ && clr) ? playercolor_image(*clr, image_files_[0]) :
3509- g_gr->images().get(image_files_[0]);
3510+ const MipMapEntry& mipmap = *mipmaps_.at(1.0f);
3511+ std::vector<std::string> images = mipmap.image_files;
3512+ assert(!images.empty());
3513+ const Image* image = (mipmap.has_playercolor_masks && clr) ? playercolor_image(*clr, images[0]) :
3514+ g_gr->images().get(images[0]);
3515
3516 const int w = image->width();
3517 const int h = image->height();
3518- Texture* rv = new Texture(w / scale_, h / scale_);
3519+
3520+ Texture* rv = new Texture(w, h);
3521 rv->blit(
3522- Rectf(0.f, 0.f, w / scale_, h / scale_), *image, Rectf(0.f, 0.f, w, h), 1., BlendMode::Copy);
3523+ Rectf(0.f, 0.f, w, h), *image, Rectf(0.f, 0.f, w, h), 1., BlendMode::Copy);
3524 return rv;
3525 }
3526
3527 // TODO(GunChleoc): This is only here for the font renderers.
3528 const std::string& NonPackedAnimation::representative_image_filename() const {
3529- return image_files_[0];
3530+ return mipmaps_.at(1.0f)->image_files[0];
3531 }
3532
3533 uint32_t NonPackedAnimation::current_frame(uint32_t time) const {
3534@@ -262,19 +348,22 @@
3535 }
3536 }
3537
3538-Rectf NonPackedAnimation::source_rectangle(const int percent_from_bottom) const {
3539+Rectf NonPackedAnimation::source_rectangle(const int percent_from_bottom, float scale) const {
3540 ensure_graphics_are_loaded();
3541- float h = percent_from_bottom * frames_[0]->height() / 100;
3542- return Rectf(0.f, frames_[0]->height() - h, frames_[0]->width(), h);
3543+ const Image* first_frame = mipmaps_.at(find_best_scale(scale))->frames.at(0);
3544+ const float h = percent_from_bottom * first_frame->height() / 100;
3545+ // Using floor for pixel perfect positioning
3546+ return Rectf(0.f, std::floor(first_frame->height() - h), first_frame->width(), h);
3547 }
3548
3549 Rectf NonPackedAnimation::destination_rectangle(const Vector2f& position,
3550 const Rectf& source_rect,
3551 const float scale) const {
3552 ensure_graphics_are_loaded();
3553- return Rectf(position.x - (hotspot_.x - source_rect.x / scale_) * scale,
3554- position.y - (hotspot_.y - source_rect.y / scale_) * scale,
3555- source_rect.w * scale / scale_, source_rect.h * scale / scale_);
3556+ const float best_scale = find_best_scale(scale);
3557+ return Rectf(position.x - (hotspot_.x - source_rect.x / best_scale) * scale,
3558+ position.y - (hotspot_.y - source_rect.y / best_scale) * scale,
3559+ source_rect.w * scale / best_scale, source_rect.h * scale / best_scale);
3560 }
3561
3562 void NonPackedAnimation::blit(uint32_t time,
3563@@ -282,16 +371,18 @@
3564 const Rectf& source_rect,
3565 const Rectf& destination_rect,
3566 const RGBColor* clr,
3567- Surface* target) const {
3568+ Surface* target, float scale) const {
3569 ensure_graphics_are_loaded();
3570 assert(target);
3571 const uint32_t idx = current_frame(time);
3572 assert(idx < nr_frames());
3573- if (!hasplrclrs_ || clr == nullptr) {
3574- target->blit(destination_rect, *frames_.at(idx), source_rect, 1., BlendMode::UseAlpha);
3575+
3576+ const MipMapEntry& mipmap = *mipmaps_.at(find_best_scale(scale));
3577+ if (!mipmap.has_playercolor_masks || clr == nullptr) {
3578+ target->blit(destination_rect, *mipmap.frames.at(idx), source_rect, 1., BlendMode::UseAlpha);
3579 } else {
3580 target->blit_blended(
3581- destination_rect, *frames_.at(idx), *pcmasks_.at(idx), source_rect, *clr);
3582+ destination_rect, *mipmap.frames.at(idx), *mipmap.playercolor_mask_frames.at(idx), source_rect, *clr);
3583 }
3584 trigger_sound(time, coords);
3585 }
3586
3587=== modified file 'src/graphic/animation.h'
3588--- src/graphic/animation.h 2019-04-24 06:01:37 +0000
3589+++ src/graphic/animation.h 2019-04-24 11:21:34 +0000
3590@@ -63,7 +63,7 @@
3591
3592 /// The size of the animation source images in pixels. Use 'percent_from_bottom' to crop the
3593 /// animation.
3594- virtual Rectf source_rectangle(int percent_from_bottom) const = 0;
3595+ virtual Rectf source_rectangle(int percent_from_bottom, float scale) const = 0;
3596
3597 /// Calculates the destination rectangle for blitting the animation in pixels.
3598 /// 'position' is where the top left corner of the animation will end up,
3599@@ -96,7 +96,7 @@
3600 const Rectf& source_rect,
3601 const Rectf& destination_rect,
3602 const RGBColor* clr,
3603- Surface* target) const = 0;
3604+ Surface* target, float scale) const = 0;
3605
3606 protected:
3607 /// Play the sound effect associated with this animation at the given time.
3608
3609=== modified file 'src/graphic/rendertarget.cc'
3610--- src/graphic/rendertarget.cc 2019-04-24 06:01:37 +0000
3611+++ src/graphic/rendertarget.cc 2019-04-24 11:21:34 +0000
3612@@ -296,10 +296,10 @@
3613 assert(percent_from_bottom <= 100);
3614 if (percent_from_bottom > 0) {
3615 // Scaling for zoom and animation image size, then fit screen edges.
3616- Rectf srcrc = animation.source_rectangle(percent_from_bottom);
3617+ Rectf srcrc = animation.source_rectangle(percent_from_bottom, scale);
3618 Rectf dstrc = animation.destination_rectangle(dst, srcrc, scale);
3619 if (to_surface_geometry(&dstrc, &srcrc)) {
3620- animation.blit(time, coords, srcrc, dstrc, player_color, surface_);
3621+ animation.blit(time, coords, srcrc, dstrc, player_color, surface_, scale);
3622 }
3623 }
3624 }
3625
3626=== modified file 'src/logic/map_objects/map_object.cc'
3627--- src/logic/map_objects/map_object.cc 2019-02-27 17:19:00 +0000
3628+++ src/logic/map_objects/map_object.cc 2019-04-24 11:21:34 +0000
3629@@ -255,11 +255,6 @@
3630 throw GameDataError("Map object %s has a menu icon, but it is empty", init_name.c_str());
3631 }
3632 }
3633- // TODO(GunChleoc): We can't scale down images in the font renderer yet, so we need an extra
3634- // representative image if the animation has high resolution.
3635- if (table.has_key("representative_image")) {
3636- representative_image_filename_ = table.get_string("representative_image");
3637- }
3638 check_representative_image();
3639 }
3640 MapObjectDescr::~MapObjectDescr() {

Subscribers

People subscribed via source and target branches

to status/vote changes: