widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #09515
[Merge] lp:~widelands-dev/widelands/bug-1512076-scoped-timer-for-lua into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1512076-scoped-timer-for-lua into lp:widelands.
Commit message:
Display loading times on the console while loading the tribes. Refactored Lua functions for directional animations.
- Added a new function "system_time" to lua globals that returns the current system time in milliseconds.
- Created new Lua script mapobjects.lua with a function that prints a loading message with elapsed time.
- Unified the add_worker_animation and add_walking_animation Lua functions.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1512076 in widelands: "Post one_tribe cleanup"
https://bugs.launchpad.net/widelands/+bug/1512076
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1512076-scoped-timer-for-lua/+merge/315651
Simply exposing our scoped_timer function to Lua was a bit complicated, so I created an extra function.
Printing partial lines in Lua would require exposing some more OS functions to the interface, and I decided that it's not important enough to have more code for that.
--
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1512076-scoped-timer-for-lua into lp:widelands.
=== added file 'data/scripting/mapobjects.lua'
--- data/scripting/mapobjects.lua 1970-01-01 00:00:00 +0000
+++ data/scripting/mapobjects.lua 2017-01-26 09:16:09 +0000
@@ -0,0 +1,52 @@
+-- RST
+-- mapobjects.lua
+-- --------------
+--
+-- This script contains some convenience functions for loading the tribes
+-- and world.
+--
+
+local current_time = system_time()
+-- RST
+-- .. function:: print_loading_message(itemname)
+--
+-- Prints a loading message containing the time difference between the last time
+-- that this function was called and the current system time.
+-- The time is initialized when this script is included for the first time.
+--
+-- :arg itemname: The name of the item that was being loaded
+function print_loading_message(itemname)
+ print("Loading ".. itemname .. " took " .. (system_time() - current_time) .. "ms")
+ current_time = system_time()
+end
+
+
+-- RST
+-- .. function:: add_walking_animations(table, animationname, dirname, basename, hotspot, fps)
+--
+-- Adds 6 walk or sail animations - one for each walking direction - to 'table'.
+--
+-- :arg table: A table that the animation data is added to. It may already contain some animations.
+-- :arg animationname: The name of the animation to be added, e.g. ``walkload``.
+-- :arg dirname: The name of the directory where the animation image files are located.
+-- :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``
+-- :arg hotspot: The hotspot coordinates for blitting, e.g. ``{ 2, 20 }``.
+-- :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.
+function add_walking_animations(table, animationname, dirname, basename, hotspot, fps)
+ if (fps ~= nil) then
+ for idx, dir in ipairs{ "ne", "e", "se", "sw", "w", "nw" } do
+ table[animationname .. "_" .. dir] = {
+ pictures = path.list_files(dirname .. basename .. "_" .. dir .. "_??.png"),
+ hotspot = hotspot,
+ fps = fps,
+ }
+ end
+ else
+ for idx, dir in ipairs{ "ne", "e", "se", "sw", "w", "nw" } do
+ table[animationname .. "_" .. dir] = {
+ pictures = path.list_files(dirname .. basename .. "_" .. dir .. "_??.png"),
+ hotspot = hotspot,
+ }
+ end
+ end
+end
=== modified file 'data/tribes/init.lua'
--- data/tribes/init.lua 2016-11-12 06:50:18 +0000
+++ data/tribes/init.lua 2017-01-26 09:16:09 +0000
@@ -16,56 +16,23 @@
tribes = wl.Tribes()
-
--- RST
--- .. function:: add_worker_animations(table, animationname, dirname, basename, hotspot, fps)
---
--- Adds 6 walk or sail animations - one for each walking direction - to 'table'.
---
--- :arg table: A table that the animation data is added to. It may already contain some animations.
--- :arg animationname: The name of the animation to be added, e.g. ``walkload``.
--- :arg dirname: The name of the directory where the animation image files are located.
--- :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``
--- :arg hotspot: The hotspot coordinates for blitting, e.g. ``{ 2, 20 }``.
--- :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.
-function add_worker_animations(table, animationname, dirname, basename, hotspot, fps)
- if (fps ~= nil) then
- for idx, dir in ipairs{ "ne", "e", "se", "sw", "w", "nw" } do
- table[animationname .. "_" .. dir] = {
- pictures = path.list_files(dirname .. basename .. "_" .. dir .. "_??.png"),
- hotspot = hotspot,
- fps = fps,
- }
- end
- else
- for idx, dir in ipairs{ "ne", "e", "se", "sw", "w", "nw" } do
- table[animationname .. "_" .. dir] = {
- pictures = path.list_files(dirname .. basename .. "_" .. dir .. "_??.png"),
- hotspot = hotspot,
- }
- end
- end
-end
-
+print("Loading Tribes...")
+include "scripting/mapobjects.lua"
-- ===================================
-- Ships
-- ===================================
--- TODO(sirver): Adding timing informations here would be really useful, also
--- for world/. This needs some sort of wrapping for the ScopedTimer class.
-
-print("Loading Ships")
include "tribes/ships/atlanteans/init.lua"
include "tribes/ships/barbarians/init.lua"
include "tribes/ships/empire/init.lua"
+print_loading_message("ships")
-- ===================================
-- Wares
-- ===================================
-print("Loading Wares")
include "tribes/wares/armor/init.lua"
include "tribes/wares/armor_chain/init.lua"
include "tribes/wares/armor_gilded/init.lua"
@@ -152,12 +119,12 @@
include "tribes/wares/wine/init.lua"
include "tribes/wares/wool/init.lua"
+print_loading_message("wares")
-- ===================================
-- Immovables
-- ===================================
-print("Loading Immovables")
include "tribes/immovables/ashes/init.lua"
include "tribes/immovables/blackrootfield_harvested/init.lua"
include "tribes/immovables/blackrootfield_medium/init.lua"
@@ -197,13 +164,12 @@
include "tribes/immovables/shipconstruction_barbarians/init.lua"
include "tribes/immovables/shipconstruction_empire/init.lua"
+print_loading_message("immovables")
-- ===================================
-- Workers, Carriers & Soldiers
-- ===================================
-
-print("Loading Workers")
include "tribes/workers/atlanteans/carrier/init.lua"
include "tribes/workers/atlanteans/armorsmith/init.lua"
include "tribes/workers/atlanteans/baker/init.lua"
@@ -302,12 +268,12 @@
include "tribes/workers/empire/weaponsmith/init.lua"
include "tribes/workers/empire/weaver/init.lua"
+print_loading_message("workers")
-- ===================================
-- Warehouses
-- ===================================
-print("Loading Warehouses")
include "tribes/buildings/warehouses/atlanteans/headquarters/init.lua"
include "tribes/buildings/warehouses/atlanteans/port/init.lua"
include "tribes/buildings/warehouses/atlanteans/warehouse/init.lua"
@@ -320,12 +286,12 @@
include "tribes/buildings/warehouses/empire/port/init.lua"
include "tribes/buildings/warehouses/empire/warehouse/init.lua"
+print_loading_message("warehouses")
-- ===================================
-- Productionsites
-- ===================================
-print("Loading Productionsites")
-- Atlanteans small
include "tribes/buildings/productionsites/atlanteans/quarry/init.lua"
include "tribes/buildings/productionsites/atlanteans/woodcutters_house/init.lua"
@@ -446,12 +412,12 @@
include "tribes/buildings/productionsites/empire/goldmine_deep/init.lua"
include "tribes/buildings/productionsites/empire/goldmine/init.lua"
+print_loading_message("productionsites")
-- ===================================
-- Trainingsites
-- ===================================
-print("Loading Trainingsites")
include "tribes/buildings/trainingsites/atlanteans/dungeon/init.lua"
include "tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua"
include "tribes/buildings/trainingsites/barbarians/battlearena/init.lua"
@@ -460,12 +426,12 @@
include "tribes/buildings/trainingsites/empire/arena/init.lua"
include "tribes/buildings/trainingsites/empire/trainingcamp/init.lua"
+print_loading_message("trainingsites")
-- ===================================
-- Militarysites
-- ===================================
-print("Loading Militarysites")
include "tribes/buildings/militarysites/atlanteans/guardhouse/init.lua"
include "tribes/buildings/militarysites/atlanteans/guardhall/init.lua"
include "tribes/buildings/militarysites/atlanteans/tower_small/init.lua"
@@ -487,24 +453,22 @@
include "tribes/buildings/militarysites/empire/castle/init.lua"
include "tribes/buildings/militarysites/empire/fortress/init.lua"
+print_loading_message("militarysites")
-- ===================================
-- Partially Finished Buildings
-- ===================================
-print("Loading Partially Finished Buildings")
include "tribes/buildings/partially_finished/constructionsite/init.lua"
include "tribes/buildings/partially_finished/dismantlesite/init.lua"
+print_loading_message("partially finished buildings")
-- ===================================
-- Tribes
-- ===================================
-print("Loading Atlanteans")
include "tribes/atlanteans.lua"
-print("Loading Barbarians")
include "tribes/barbarians.lua"
-print("Loading Empire")
include "tribes/empire.lua"
-print("Finished loading tribes")
+print_loading_message("tribe infos")
=== modified file 'data/tribes/ships/atlanteans/init.lua'
--- data/tribes/ships/atlanteans/init.lua 2016-10-18 09:06:47 +0000
+++ data/tribes/ships/atlanteans/init.lua 2017-01-26 09:16:09 +0000
@@ -24,7 +24,7 @@
fps = 7
}
}
-add_worker_animations(animations, "sail", dirname, "sail", {89, 86}, 10)
+add_walking_animations(animations, "sail", dirname, "sail", {89, 86}, 10)
-- RST
=== modified file 'data/tribes/ships/barbarians/init.lua'
--- data/tribes/ships/barbarians/init.lua 2015-11-03 18:18:27 +0000
+++ data/tribes/ships/barbarians/init.lua 2017-01-26 09:16:09 +0000
@@ -7,7 +7,7 @@
fps = 10
}
}
-add_worker_animations(animations, "sail", dirname, "sail", {115, 76}, 10)
+add_walking_animations(animations, "sail", dirname, "sail", {115, 76}, 10)
tribes:new_ship_type {
=== modified file 'data/tribes/ships/empire/init.lua'
--- data/tribes/ships/empire/init.lua 2015-11-03 18:18:27 +0000
+++ data/tribes/ships/empire/init.lua 2017-01-26 09:16:09 +0000
@@ -7,7 +7,7 @@
fps = 10
}
}
-add_worker_animations(animations, "sail", dirname, "sail", {115, 100}, 10)
+add_walking_animations(animations, "sail", dirname, "sail", {115, 100}, 10)
tribes:new_ship_type {
=== modified file 'data/tribes/workers/atlanteans/armorsmith/init.lua'
--- data/tribes/workers/atlanteans/armorsmith/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/armorsmith/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 10, 21 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/baker/init.lua'
--- data/tribes/workers/atlanteans/baker/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/baker/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 5, 23 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {7, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {9, 25}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {7, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {9, 25}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/blackroot_farmer/init.lua'
--- data/tribes/workers/atlanteans/blackroot_farmer/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/blackroot_farmer/init.lua 2017-01-26 09:16:09 +0000
@@ -21,8 +21,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {13, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {13, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {13, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {13, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/builder/init.lua'
--- data/tribes/workers/atlanteans/builder/init.lua 2016-01-28 05:24:34 +0000
+++ data/tribes/workers/atlanteans/builder/init.lua 2017-01-26 09:16:09 +0000
@@ -16,8 +16,8 @@
fps=10,
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {8, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {8, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/carrier/init.lua'
--- data/tribes/workers/atlanteans/carrier/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/carrier/init.lua 2017-01-26 09:16:09 +0000
@@ -7,8 +7,8 @@
fps=10,
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 25}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 25}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 25}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 25}, 10)
tribes:new_carrier_type {
=== modified file 'data/tribes/workers/atlanteans/charcoal_burner/init.lua'
--- data/tribes/workers/atlanteans/charcoal_burner/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/charcoal_burner/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 4, 22 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/farmer/init.lua'
--- data/tribes/workers/atlanteans/farmer/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/atlanteans/farmer/init.lua 2017-01-26 09:16:09 +0000
@@ -21,8 +21,8 @@
fps = 5
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {18, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {18, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {18, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {18, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/fishbreeder/init.lua'
--- data/tribes/workers/atlanteans/fishbreeder/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/fishbreeder/init.lua 2017-01-26 09:16:09 +0000
@@ -11,7 +11,7 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {11, 23}, 20)
+add_walking_animations(animations, "walk", dirname, "walk", {11, 23}, 20)
tribes:new_worker_type {
msgctxt = "atlanteans_worker",
=== modified file 'data/tribes/workers/atlanteans/fisher/init.lua'
--- data/tribes/workers/atlanteans/fisher/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/atlanteans/fisher/init.lua 2017-01-26 09:16:09 +0000
@@ -11,8 +11,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 21}, 20)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 20}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 21}, 20)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 20}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/forester/init.lua'
--- data/tribes/workers/atlanteans/forester/init.lua 2015-12-30 12:00:32 +0000
+++ data/tribes/workers/atlanteans/forester/init.lua 2017-01-26 09:16:09 +0000
@@ -21,8 +21,8 @@
fps = 5
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {10, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {10, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {10, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {10, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/geologist/init.lua'
--- data/tribes/workers/atlanteans/geologist/init.lua 2016-02-09 12:52:42 +0000
+++ data/tribes/workers/atlanteans/geologist/init.lua 2017-01-26 09:16:09 +0000
@@ -12,8 +12,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {11, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {11, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {11, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {11, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/horse/init.lua'
--- data/tribes/workers/atlanteans/horse/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/horse/init.lua 2017-01-26 09:16:09 +0000
@@ -7,8 +7,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {19, 33}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {19, 33}, 10) -- TODO(GunChleoc): Make animation
+add_walking_animations(animations, "walk", dirname, "walk", {19, 33}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {19, 33}, 10) -- TODO(GunChleoc): Make animation
tribes:new_carrier_type {
=== modified file 'data/tribes/workers/atlanteans/horsebreeder/init.lua'
--- data/tribes/workers/atlanteans/horsebreeder/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/horsebreeder/init.lua 2017-01-26 09:16:09 +0000
@@ -6,7 +6,7 @@
hotspot = { 8, 23 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {35, 28}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {35, 28}, 10)
tribes:new_worker_type {
msgctxt = "atlanteans_worker",
=== modified file 'data/tribes/workers/atlanteans/hunter/init.lua'
--- data/tribes/workers/atlanteans/hunter/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/hunter/init.lua 2017-01-26 09:16:09 +0000
@@ -7,8 +7,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {14, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {13, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {14, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {13, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/miller/init.lua'
--- data/tribes/workers/atlanteans/miller/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/miller/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 4, 22 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/miner/init.lua'
--- data/tribes/workers/atlanteans/miner/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/miner/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 3, 23 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {10, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {10, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {10, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {10, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/sawyer/init.lua'
--- data/tribes/workers/atlanteans/sawyer/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/sawyer/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 5, 31 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {16, 31}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {16, 31}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {16, 31}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {16, 31}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/scout/init.lua'
--- data/tribes/workers/atlanteans/scout/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/scout/init.lua 2017-01-26 09:16:09 +0000
@@ -6,7 +6,7 @@
hotspot = { 4, 22 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 25}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 25}, 10)
tribes:new_worker_type {
msgctxt = "atlanteans_worker",
=== modified file 'data/tribes/workers/atlanteans/shipwright/init.lua'
--- data/tribes/workers/atlanteans/shipwright/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/atlanteans/shipwright/init.lua 2017-01-26 09:16:09 +0000
@@ -11,8 +11,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {12, 28}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {12, 28}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {12, 28}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {12, 28}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/smelter/init.lua'
--- data/tribes/workers/atlanteans/smelter/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/smelter/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 10, 22 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {12, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {12, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {12, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {12, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/smoker/init.lua'
--- data/tribes/workers/atlanteans/smoker/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/smoker/init.lua 2017-01-26 09:16:09 +0000
@@ -6,7 +6,7 @@
hotspot = { 17, 22 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {20, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {20, 22}, 10)
tribes:new_worker_type {
msgctxt = "atlanteans_worker",
=== modified file 'data/tribes/workers/atlanteans/soldier/init.lua'
--- data/tribes/workers/atlanteans/soldier/init.lua 2017-01-06 09:38:46 +0000
+++ data/tribes/workers/atlanteans/soldier/init.lua 2017-01-26 09:16:09 +0000
@@ -57,7 +57,7 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {20, 34}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {20, 34}, 10)
tribes:new_soldier_type {
=== modified file 'data/tribes/workers/atlanteans/spiderbreeder/init.lua'
--- data/tribes/workers/atlanteans/spiderbreeder/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/spiderbreeder/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 8, 22 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {10, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {10, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {10, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {10, 22}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/stonecutter/init.lua'
--- data/tribes/workers/atlanteans/stonecutter/init.lua 2016-12-11 09:29:28 +0000
+++ data/tribes/workers/atlanteans/stonecutter/init.lua 2017-01-26 09:16:09 +0000
@@ -11,8 +11,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {10, 21}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {10, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {10, 21}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {10, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/toolsmith/init.lua'
--- data/tribes/workers/atlanteans/toolsmith/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/toolsmith/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 10, 21 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/trainer/init.lua'
--- data/tribes/workers/atlanteans/trainer/init.lua 2016-09-27 06:33:32 +0000
+++ data/tribes/workers/atlanteans/trainer/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 11, 21 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {14, 21}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {14, 21}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {14, 21}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {14, 21}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/weaponsmith/init.lua'
--- data/tribes/workers/atlanteans/weaponsmith/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/weaponsmith/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 10, 21 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/weaver/init.lua'
--- data/tribes/workers/atlanteans/weaver/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/weaver/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 2, 22 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {6, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {9, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {6, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {9, 22}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/atlanteans/woodcutter/init.lua'
--- data/tribes/workers/atlanteans/woodcutter/init.lua 2016-12-11 09:29:28 +0000
+++ data/tribes/workers/atlanteans/woodcutter/init.lua 2017-01-26 09:16:09 +0000
@@ -11,8 +11,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {16, 31}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {13, 29}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {16, 31}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {13, 29}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/baker/init.lua'
--- data/tribes/workers/barbarians/baker/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/baker/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 5, 23 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {7, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {9, 25}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {7, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {9, 25}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/blacksmith/init.lua'
--- data/tribes/workers/barbarians/blacksmith/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/blacksmith/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 6, 28 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {11, 24}, 15)
-add_worker_animations(animations, "walkload", dirname, "walk", {11, 24}, 15)
+add_walking_animations(animations, "walk", dirname, "walk", {11, 24}, 15)
+add_walking_animations(animations, "walkload", dirname, "walk", {11, 24}, 15)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/blacksmith_master/init.lua'
--- data/tribes/workers/barbarians/blacksmith_master/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/blacksmith_master/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 3, 22 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {6, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {9, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {6, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {9, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/brewer/init.lua'
--- data/tribes/workers/barbarians/brewer/init.lua 2016-01-24 13:41:46 +0000
+++ data/tribes/workers/barbarians/brewer/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 7, 22 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {12, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {11, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {12, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {11, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/brewer_master/init.lua'
--- data/tribes/workers/barbarians/brewer_master/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/brewer_master/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 8, 26 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {15, 26}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {11, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {15, 26}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {11, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/builder/init.lua'
--- data/tribes/workers/barbarians/builder/init.lua 2016-01-28 05:24:34 +0000
+++ data/tribes/workers/barbarians/builder/init.lua 2017-01-26 09:16:09 +0000
@@ -16,8 +16,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {7, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {7, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {7, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {7, 22}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/carrier/init.lua'
--- data/tribes/workers/barbarians/carrier/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/carrier/init.lua 2017-01-26 09:16:09 +0000
@@ -7,8 +7,8 @@
fps = 5
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 19}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {7, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 19}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {7, 22}, 10)
tribes:new_carrier_type {
=== modified file 'data/tribes/workers/barbarians/cattlebreeder/init.lua'
--- data/tribes/workers/barbarians/cattlebreeder/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/cattlebreeder/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 3, 21 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {42, 30}, 20)
-add_worker_animations(animations, "walkload", dirname, "walk", {42, 30}, 20)
+add_walking_animations(animations, "walk", dirname, "walk", {42, 30}, 20)
+add_walking_animations(animations, "walkload", dirname, "walk", {42, 30}, 20)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/charcoal_burner/init.lua'
--- data/tribes/workers/barbarians/charcoal_burner/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/charcoal_burner/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 6, 22 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {9, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {9, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/farmer/init.lua'
--- data/tribes/workers/barbarians/farmer/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/barbarians/farmer/init.lua 2017-01-26 09:16:09 +0000
@@ -21,8 +21,8 @@
fps = 5
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {18, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {16, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {18, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {16, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/fisher/init.lua'
--- data/tribes/workers/barbarians/fisher/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/barbarians/fisher/init.lua 2017-01-26 09:16:09 +0000
@@ -11,8 +11,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {10, 38}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {10, 38}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {10, 38}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {10, 38}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/gamekeeper/init.lua'
--- data/tribes/workers/barbarians/gamekeeper/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/gamekeeper/init.lua 2017-01-26 09:16:09 +0000
@@ -16,8 +16,8 @@
fps = 5
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {15, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {15, 22})
+add_walking_animations(animations, "walk", dirname, "walk", {15, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {15, 22})
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/gardener/init.lua'
--- data/tribes/workers/barbarians/gardener/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/gardener/init.lua 2017-01-26 09:16:09 +0000
@@ -16,8 +16,8 @@
fps = 5
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {7, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {7, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/geologist/init.lua'
--- data/tribes/workers/barbarians/geologist/init.lua 2016-02-09 12:52:42 +0000
+++ data/tribes/workers/barbarians/geologist/init.lua 2017-01-26 09:16:09 +0000
@@ -12,8 +12,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 21}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {9, 21}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 21}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {9, 21}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/helmsmith/init.lua'
--- data/tribes/workers/barbarians/helmsmith/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/helmsmith/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 4, 21 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 21}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {7, 21}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 21}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {7, 21}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/hunter/init.lua'
--- data/tribes/workers/barbarians/hunter/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/hunter/init.lua 2017-01-26 09:16:09 +0000
@@ -7,8 +7,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {6, 26}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {6, 26}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {6, 26}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {6, 26}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/innkeeper/init.lua'
--- data/tribes/workers/barbarians/innkeeper/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/innkeeper/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 9, 24 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {10, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {10, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {10, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {10, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/lime_burner/init.lua'
--- data/tribes/workers/barbarians/lime_burner/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/lime_burner/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 4, 23 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {7, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 27}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {7, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 27}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/lumberjack/init.lua'
--- data/tribes/workers/barbarians/lumberjack/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/barbarians/lumberjack/init.lua 2017-01-26 09:16:09 +0000
@@ -12,8 +12,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {10, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {10, 21}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {10, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {10, 21}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/miner/init.lua'
--- data/tribes/workers/barbarians/miner/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/miner/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 3, 24 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 25}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {6, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 25}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {6, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/miner_chief/init.lua'
--- data/tribes/workers/barbarians/miner_chief/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/miner_chief/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 3, 24 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 25}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {6, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 25}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {6, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/miner_master/init.lua'
--- data/tribes/workers/barbarians/miner_master/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/miner_master/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 2, 24 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 25}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {6, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 25}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {6, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/ox/init.lua'
--- data/tribes/workers/barbarians/ox/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/ox/init.lua 2017-01-26 09:16:09 +0000
@@ -8,8 +8,8 @@
}
}
-- TODO(GunChleoc): Make real oxen animations
-add_worker_animations(animations, "walk", dirname, "walk", {21, 31}, 20)
-add_worker_animations(animations, "walkload", dirname, "walk", {21, 31}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {21, 31}, 20)
+add_walking_animations(animations, "walkload", dirname, "walk", {21, 31}, 10)
tribes:new_carrier_type {
=== modified file 'data/tribes/workers/barbarians/ranger/init.lua'
--- data/tribes/workers/barbarians/ranger/init.lua 2015-12-30 12:00:32 +0000
+++ data/tribes/workers/barbarians/ranger/init.lua 2017-01-26 09:16:09 +0000
@@ -21,8 +21,8 @@
fps = 5
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {11, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {11, 23})
+add_walking_animations(animations, "walk", dirname, "walk", {11, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {11, 23})
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/scout/init.lua'
--- data/tribes/workers/barbarians/scout/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/scout/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 4, 23 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 25}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {9, 25}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 25}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {9, 25}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/shipwright/init.lua'
--- data/tribes/workers/barbarians/shipwright/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/barbarians/shipwright/init.lua 2017-01-26 09:16:09 +0000
@@ -15,8 +15,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {11, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {11, 22}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/smelter/init.lua'
--- data/tribes/workers/barbarians/smelter/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/smelter/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 7, 21 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {18, 25}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 27}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {18, 25}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 27}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/soldier/init.lua'
--- data/tribes/workers/barbarians/soldier/init.lua 2017-01-06 09:38:46 +0000
+++ data/tribes/workers/barbarians/soldier/init.lua 2017-01-26 09:16:09 +0000
@@ -57,7 +57,7 @@
fps = 20
},
}
-add_worker_animations(animations, "walk", dirname, "walk", {16, 31}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {16, 31}, 10)
tribes:new_soldier_type {
=== modified file 'data/tribes/workers/barbarians/stonemason/init.lua'
--- data/tribes/workers/barbarians/stonemason/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/barbarians/stonemason/init.lua 2017-01-26 09:16:09 +0000
@@ -12,8 +12,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {7, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {7, 22}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/barbarians/trainer/init.lua'
--- data/tribes/workers/barbarians/trainer/init.lua 2016-09-27 06:33:32 +0000
+++ data/tribes/workers/barbarians/trainer/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 4, 23 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {8, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {8, 23}, 10)
tribes:new_worker_type {
msgctxt = "barbarians_worker",
=== modified file 'data/tribes/workers/barbarians/weaver/init.lua'
--- data/tribes/workers/barbarians/weaver/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/weaver/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 5, 22 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {7, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {11, 28}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {7, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {11, 28}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/armorsmith/init.lua'
--- data/tribes/workers/empire/armorsmith/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/armorsmith/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 8, 24 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/baker/init.lua'
--- data/tribes/workers/empire/baker/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/baker/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 5, 26 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {14, 27}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {14, 27}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {14, 27}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {14, 27}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/brewer/init.lua'
--- data/tribes/workers/empire/brewer/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/brewer/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 8, 24 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {14, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {10, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {14, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {10, 22}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/builder/init.lua'
--- data/tribes/workers/empire/builder/init.lua 2016-01-28 05:24:34 +0000
+++ data/tribes/workers/empire/builder/init.lua 2017-01-26 09:16:09 +0000
@@ -16,8 +16,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {11, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {11, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {11, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {11, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/carpenter/init.lua'
--- data/tribes/workers/empire/carpenter/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/carpenter/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 7, 29 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {11, 30}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {11, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {11, 30}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {11, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/carrier/init.lua'
--- data/tribes/workers/empire/carrier/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/carrier/init.lua 2017-01-26 09:16:09 +0000
@@ -7,8 +7,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {7, 20}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {7, 20}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 22}, 10)
tribes:new_carrier_type {
=== modified file 'data/tribes/workers/empire/charcoal_burner/init.lua'
--- data/tribes/workers/empire/charcoal_burner/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/charcoal_burner/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 11, 23 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {21, 28}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {17, 27}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {21, 28}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {17, 27}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/donkey/init.lua'
--- data/tribes/workers/empire/donkey/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/donkey/init.lua 2017-01-26 09:16:09 +0000
@@ -7,8 +7,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {14, 25}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {14, 25}, 10) -- TODO(GunChleoc): Make animation
+add_walking_animations(animations, "walk", dirname, "walk", {14, 25}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {14, 25}, 10) -- TODO(GunChleoc): Make animation
tribes:new_carrier_type {
=== modified file 'data/tribes/workers/empire/donkeybreeder/init.lua'
--- data/tribes/workers/empire/donkeybreeder/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/donkeybreeder/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 19, 23 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {28, 26}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {28, 26}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {28, 26}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {28, 26}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/farmer/init.lua'
--- data/tribes/workers/empire/farmer/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/empire/farmer/init.lua 2017-01-26 09:16:09 +0000
@@ -21,8 +21,8 @@
fps = 5
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {18, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {18, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {18, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {18, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/fisher/init.lua'
--- data/tribes/workers/empire/fisher/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/empire/fisher/init.lua 2017-01-26 09:16:09 +0000
@@ -11,8 +11,8 @@
fps = 10,
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {10, 38}, 20)
-add_worker_animations(animations, "walkload", dirname, "walk", {10, 38}, 20)
+add_walking_animations(animations, "walk", dirname, "walk", {10, 38}, 20)
+add_walking_animations(animations, "walkload", dirname, "walk", {10, 38}, 20)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/forester/init.lua'
--- data/tribes/workers/empire/forester/init.lua 2015-12-30 12:00:32 +0000
+++ data/tribes/workers/empire/forester/init.lua 2017-01-26 09:16:09 +0000
@@ -21,8 +21,8 @@
fps = 5
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {10, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {10, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {10, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {10, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/geologist/init.lua'
--- data/tribes/workers/empire/geologist/init.lua 2016-02-09 12:52:42 +0000
+++ data/tribes/workers/empire/geologist/init.lua 2017-01-26 09:16:09 +0000
@@ -12,8 +12,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 21}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {9, 21}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 21}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {9, 21}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/hunter/init.lua'
--- data/tribes/workers/empire/hunter/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/hunter/init.lua 2017-01-26 09:16:09 +0000
@@ -7,8 +7,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 32}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {9, 32}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 32}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {9, 32}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/innkeeper/init.lua'
--- data/tribes/workers/empire/innkeeper/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/innkeeper/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 4, 26 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {6, 26}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {6, 26}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {6, 26}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {6, 26}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/lumberjack/init.lua'
--- data/tribes/workers/empire/lumberjack/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/empire/lumberjack/init.lua 2017-01-26 09:16:09 +0000
@@ -12,8 +12,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {9, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {9, 22}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/miller/init.lua'
--- data/tribes/workers/empire/miller/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/miller/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 5, 23 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/miner/init.lua'
--- data/tribes/workers/empire/miner/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/miner/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 3, 23 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {7, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {7, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/miner_master/init.lua'
--- data/tribes/workers/empire/miner_master/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/miner_master/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 7, 22 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {11, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {10, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {11, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {10, 22}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/pigbreeder/init.lua'
--- data/tribes/workers/empire/pigbreeder/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/pigbreeder/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 16, 29 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {27, 29}, 20)
-add_worker_animations(animations, "walkload", dirname, "walk", {27, 29}, 20)
+add_walking_animations(animations, "walk", dirname, "walk", {27, 29}, 20)
+add_walking_animations(animations, "walkload", dirname, "walk", {27, 29}, 20)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/scout/init.lua'
--- data/tribes/workers/empire/scout/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/scout/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 4, 22 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {9, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {9, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/shepherd/init.lua'
--- data/tribes/workers/empire/shepherd/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/shepherd/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 16, 29 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {26, 30}, 20)
-add_worker_animations(animations, "walkload", dirname, "walk", {26, 30}, 20)
+add_walking_animations(animations, "walk", dirname, "walk", {26, 30}, 20)
+add_walking_animations(animations, "walkload", dirname, "walk", {26, 30}, 20)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/shipwright/init.lua'
--- data/tribes/workers/empire/shipwright/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/empire/shipwright/init.lua 2017-01-26 09:16:09 +0000
@@ -15,8 +15,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {11, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {9, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {11, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {9, 22}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/smelter/init.lua'
--- data/tribes/workers/empire/smelter/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/smelter/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 4, 23 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {18, 25}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 22}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {18, 25}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 22}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/soldier/init.lua'
--- data/tribes/workers/empire/soldier/init.lua 2017-01-06 09:38:46 +0000
+++ data/tribes/workers/empire/soldier/init.lua 2017-01-26 09:16:09 +0000
@@ -57,7 +57,7 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {10, 36}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {10, 36}, 10)
tribes:new_soldier_type {
=== modified file 'data/tribes/workers/empire/stonemason/init.lua'
--- data/tribes/workers/empire/stonemason/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/empire/stonemason/init.lua 2017-01-26 09:16:09 +0000
@@ -12,8 +12,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 22}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 25}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 22}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 25}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/toolsmith/init.lua'
--- data/tribes/workers/empire/toolsmith/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/toolsmith/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 8, 24 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/trainer/init.lua'
--- data/tribes/workers/empire/trainer/init.lua 2016-09-27 06:33:32 +0000
+++ data/tribes/workers/empire/trainer/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 6, 23 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {9, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {9, 23}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {9, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {9, 23}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/vinefarmer/init.lua'
--- data/tribes/workers/empire/vinefarmer/init.lua 2015-12-30 12:00:32 +0000
+++ data/tribes/workers/empire/vinefarmer/init.lua 2017-01-26 09:16:09 +0000
@@ -21,8 +21,8 @@
fps = 10
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 23}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/vintner/init.lua'
--- data/tribes/workers/empire/vintner/init.lua 2016-04-24 10:58:08 +0000
+++ data/tribes/workers/empire/vintner/init.lua 2017-01-26 09:16:09 +0000
@@ -7,8 +7,8 @@
hotspot = { 12, 24 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {12, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walk", {12, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {12, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walk", {12, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/weaponsmith/init.lua'
--- data/tribes/workers/empire/weaponsmith/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/weaponsmith/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 8, 24 }
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {8, 24}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {8, 24}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {8, 24}, 10)
tribes:new_worker_type {
=== modified file 'data/tribes/workers/empire/weaver/init.lua'
--- data/tribes/workers/empire/weaver/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/weaver/init.lua 2017-01-26 09:16:09 +0000
@@ -6,8 +6,8 @@
hotspot = { 4, 24 },
}
}
-add_worker_animations(animations, "walk", dirname, "walk", {6, 26}, 10)
-add_worker_animations(animations, "walkload", dirname, "walkload", {6, 26}, 10)
+add_walking_animations(animations, "walk", dirname, "walk", {6, 26}, 10)
+add_walking_animations(animations, "walkload", dirname, "walkload", {6, 26}, 10)
tribes:new_worker_type {
=== modified file 'data/world/critters/badger/init.lua'
--- data/world/critters/badger/init.lua 2016-10-04 08:27:43 +0000
+++ data/world/critters/badger/init.lua 2017-01-26 09:16:09 +0000
@@ -7,7 +7,11 @@
fps = 20,
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {13, 15}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "badger_walk", {13, 15}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "badger",
=== modified file 'data/world/critters/brownbear/init.lua'
--- data/world/critters/brownbear/init.lua 2016-10-04 17:32:19 +0000
+++ data/world/critters/brownbear/init.lua 2017-01-26 09:16:09 +0000
@@ -7,7 +7,11 @@
fps = 20
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {24, 24}, 4)
+=======
+add_walking_animations(animations, "walk", dirname, "brownbear_walk", {24, 24}, 4)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "brownbear",
=== modified file 'data/world/critters/bunny/init.lua'
--- data/world/critters/bunny/init.lua 2016-10-04 17:32:19 +0000
+++ data/world/critters/bunny/init.lua 2017-01-26 09:16:09 +0000
@@ -6,7 +6,11 @@
hotspot = { 4, 9 },
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {5, 9}, 4)
+=======
+add_walking_animations(animations, "walk", dirname, "bunny_walk", {5, 9}, 4)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "bunny",
=== modified file 'data/world/critters/chamois/init.lua'
--- data/world/critters/chamois/init.lua 2016-10-04 17:32:19 +0000
+++ data/world/critters/chamois/init.lua 2017-01-26 09:16:09 +0000
@@ -7,7 +7,11 @@
fps = 20,
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {11, 20}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "chamois_walk", {11, 20}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "chamois",
=== modified file 'data/world/critters/deer/init.lua'
--- data/world/critters/deer/init.lua 2016-10-04 17:32:19 +0000
+++ data/world/critters/deer/init.lua 2017-01-26 09:16:09 +0000
@@ -7,7 +7,11 @@
fps = 20,
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {15, 25}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "deer_walk", {15, 25}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "deer",
=== modified file 'data/world/critters/duck/init.lua'
--- data/world/critters/duck/init.lua 2016-10-04 08:27:43 +0000
+++ data/world/critters/duck/init.lua 2017-01-26 09:16:09 +0000
@@ -11,7 +11,11 @@
fps = 4,
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {5, 10})
+=======
+add_walking_animations(animations, "walk", dirname, "duck_walk", {5, 10})
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "duck",
=== modified file 'data/world/critters/elk/init.lua'
--- data/world/critters/elk/init.lua 2016-10-04 17:32:19 +0000
+++ data/world/critters/elk/init.lua 2017-01-26 09:16:09 +0000
@@ -12,7 +12,11 @@
},
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {21, 34}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "elk_walk", {21, 34}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "elk",
=== modified file 'data/world/critters/fox/init.lua'
--- data/world/critters/fox/init.lua 2016-10-04 09:23:58 +0000
+++ data/world/critters/fox/init.lua 2017-01-26 09:16:09 +0000
@@ -12,7 +12,11 @@
fps = 10,
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {11, 14}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "fox_walk", {11, 14}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "fox",
=== modified file 'data/world/critters/lynx/init.lua'
--- data/world/critters/lynx/init.lua 2016-10-04 17:32:19 +0000
+++ data/world/critters/lynx/init.lua 2017-01-26 09:16:09 +0000
@@ -7,7 +7,11 @@
fps = 20,
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {11, 21}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "lynx_walk", {11, 21}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "lynx",
=== modified file 'data/world/critters/marten/init.lua'
--- data/world/critters/marten/init.lua 2016-10-04 17:32:19 +0000
+++ data/world/critters/marten/init.lua 2017-01-26 09:16:09 +0000
@@ -7,7 +7,11 @@
fps = 20,
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {15, 14}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "marten_walk", {15, 14}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "marten",
=== modified file 'data/world/critters/reindeer/init.lua'
--- data/world/critters/reindeer/init.lua 2016-10-04 17:32:19 +0000
+++ data/world/critters/reindeer/init.lua 2017-01-26 09:16:09 +0000
@@ -7,7 +7,11 @@
fps = 20,
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {25, 30}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "reindeer_walk", {25, 30}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "reindeer",
=== modified file 'data/world/critters/sheep/init.lua'
--- data/world/critters/sheep/init.lua 2016-10-05 06:18:32 +0000
+++ data/world/critters/sheep/init.lua 2017-01-26 09:16:09 +0000
@@ -11,7 +11,11 @@
fps = 20,
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {15, 25}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "sheep_walk", {15, 25}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "sheep",
=== modified file 'data/world/critters/stag/init.lua'
--- data/world/critters/stag/init.lua 2016-10-04 08:27:43 +0000
+++ data/world/critters/stag/init.lua 2017-01-26 09:16:09 +0000
@@ -12,7 +12,11 @@
fps = 20,
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {25, 30}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "stag_walk", {25, 30}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "stag",
=== modified file 'data/world/critters/wildboar/init.lua'
--- data/world/critters/wildboar/init.lua 2016-10-05 08:03:01 +0000
+++ data/world/critters/wildboar/init.lua 2017-01-26 09:16:09 +0000
@@ -11,7 +11,11 @@
},
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {20, 22}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "wildboar_walk", {20, 22}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "wildboar",
=== modified file 'data/world/critters/wisent/init.lua'
--- data/world/critters/wisent/init.lua 2016-10-05 11:10:22 +0000
+++ data/world/critters/wisent/init.lua 2017-01-26 09:16:09 +0000
@@ -7,7 +7,11 @@
fps = 20,
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {24, 32}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "wisent_walk", {24, 32}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "wisent",
=== modified file 'data/world/critters/wolf/init.lua'
--- data/world/critters/wolf/init.lua 2016-10-05 11:10:22 +0000
+++ data/world/critters/wolf/init.lua 2017-01-26 09:16:09 +0000
@@ -12,7 +12,11 @@
},
},
}
+<<<<<<< TREE
add_walking_animations(animations, dirname, "walk", {19, 19}, 20)
+=======
+add_walking_animations(animations, "walk", dirname, "wolf_walk", {19, 19}, 20)
+>>>>>>> MERGE-SOURCE
world:new_critter_type{
name = "wolf",
=== modified file 'data/world/init.lua'
--- data/world/init.lua 2016-12-17 10:27:07 +0000
+++ data/world/init.lua 2017-01-26 09:16:09 +0000
@@ -2,8 +2,14 @@
set_textdomain("world")
+print("Loading World...")
+include "scripting/mapobjects.lua"
+
include "world/resources/init.lua"
+print_loading_message("resources")
+
include "world/terrains/init.lua"
+print_loading_message("terrains")
world:new_editor_immovable_category{
@@ -228,18 +234,7 @@
include "world/immovables/trees/umbrella_green/init.lua"
include "world/immovables/trees/umbrella_red/init.lua"
--- Adds 6 animations for each walking direction into 'table'. The pictures are
--- searched for in 'dirname'. All files should look like this
--- 'basename'_(e|ne|se|sw|w|nw)_\d+.png. 'hotspot' is the hotspot for blitting.
-function add_walking_animations(table, dirname, basename, hotspot, fps)
- for idx, dir in ipairs{ "ne", "e", "se", "sw", "w", "nw" } do
- table["walk_" .. dir] = {
- pictures = path.list_files(dirname .. basename .. "_" .. dir .. "_??.png"),
- hotspot = hotspot,
- fps = fps,
- }
- end
-end
+print_loading_message("immovables")
-- Herbivores
include "world/critters/bunny/init.lua"
@@ -258,7 +253,12 @@
include "world/critters/lynx/init.lua"
include "world/critters/fox/init.lua"
include "world/critters/wolf/init.lua"
+<<<<<<< TREE
include "world/critters/brownbear/init.lua"
-- Aquatic animals
include "world/critters/duck/init.lua"
+=======
+
+print_loading_message("critters")
+>>>>>>> MERGE-SOURCE
=== modified file 'src/scripting/lua_globals.cc'
--- src/scripting/lua_globals.cc 2017-01-25 18:55:59 +0000
+++ src/scripting/lua_globals.cc 2017-01-26 09:16:09 +0000
@@ -19,6 +19,7 @@
#include "scripting/lua_globals.h"
+#include <chrono>
#include <exception>
#include <memory>
@@ -249,6 +250,18 @@
}
/* RST
+.. function:: system_time()
+
+ Returns the current system clock in milliseconds.
+*/
+static int L_system_time(lua_State* L) {
+ using namespace std::chrono;
+ milliseconds ms = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
+ lua_pushinteger(L, ms.count());
+ return 1;
+}
+
+/* RST
.. function:: get_build_id()
returns the version string of this widelands executable. Something like
@@ -265,6 +278,7 @@
{"ngettext", &L_ngettext},
{"pgettext", &L_pgettext},
{"set_textdomain", &L_set_textdomain},
+ {"system_time", &L_system_time},
{nullptr, nullptr}};
void luaopen_globals(lua_State* L) {
=== modified file 'src/scripting/persistence.cc'
--- src/scripting/persistence.cc 2017-01-25 18:55:59 +0000
+++ src/scripting/persistence.cc 2017-01-26 09:16:09 +0000
@@ -150,7 +150,7 @@
// Those are the globals that will be regenerated (not by the persistence engine),
// e.g. C-functions or automatically populated fields. Changing the ordering here will
-// break safe game compatibility.
+// break save game compatibility.
static const char* kPersistentGlobals[] = {"_VERSION",
"assert",
"collectgarbage",
@@ -199,6 +199,7 @@
"include",
"path",
"pgettext",
+ "system_time",
nullptr};
/**
Follow ups
