widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #04885
[Merge] lp:~widelands-dev/widelands/missing_worker_animations into lp:widelands
kaputtnik has proposed merging lp:~widelands-dev/widelands/missing_worker_animations into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1529363 in widelands: "empire fisher: fishing animation does not work"
https://bugs.launchpad.net/widelands/+bug/1529363
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/missing_worker_animations/+merge/281365
Correction to empire fisher animation and renaming of some other animations to have more consistence on the names.
--
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/missing_worker_animations into lp:widelands.
=== modified file 'tribes/workers/atlanteans/forester/init.lua'
--- tribes/workers/atlanteans/forester/init.lua 2015-11-05 12:53:49 +0000
+++ tribes/workers/atlanteans/forester/init.lua 2015-12-26 19:43:23 +0000
@@ -12,7 +12,7 @@
hotspot = { 5, 23 },
fps = 5
},
- crop = {
+ planting = {
template = "plant_??",
directory = dirname,
hotspot = { 17, 21 },
@@ -48,7 +48,7 @@
"findspace size:any radius:5 avoid:field",
"walk coords",
"animation dig 2000", -- Play a planting animation
- "animation crop 1000", -- Play a planting animation
+ "animation planting 1000", -- Play a planting animation
"plant attrib:tree_sapling",
"animation water 2000",
"return"
=== modified file 'tribes/workers/barbarians/ranger/init.lua'
--- tribes/workers/barbarians/ranger/init.lua 2015-11-05 12:53:49 +0000
+++ tribes/workers/barbarians/ranger/init.lua 2015-12-26 19:43:23 +0000
@@ -12,7 +12,7 @@
hotspot = { 12, 24 },
fps = 5
},
- crop = {
+ planting = {
template = "plant_??",
directory = dirname,
hotspot = { 18, 24 },
@@ -48,7 +48,7 @@
"findspace size:any radius:5 avoid:field",
"walk coords",
"animation dig 2000",
- "animation crop 1000",
+ "animation planting 1000",
"plant attrib:tree_sapling",
"animation water 2000",
"return"
=== modified file 'tribes/workers/empire/fisher/init.lua'
--- tribes/workers/empire/fisher/init.lua 2015-11-05 12:53:49 +0000
+++ tribes/workers/empire/fisher/init.lua 2015-12-26 19:43:23 +0000
@@ -7,9 +7,10 @@
hotspot = { 7, 38 },
},
fishing = {
- template = "idle_??",
+ template = "fishing_??",
directory = dirname,
hotspot = { 9, 39 },
+ fps = 10,
}
}
add_worker_animations(animations, "walk", dirname, "walk", {10, 38}, 20)
=== modified file 'tribes/workers/empire/forester/init.lua'
--- tribes/workers/empire/forester/init.lua 2015-11-05 12:53:49 +0000
+++ tribes/workers/empire/forester/init.lua 2015-12-26 19:43:23 +0000
@@ -12,7 +12,7 @@
hotspot = { 5, 22 },
fps = 5
},
- crop = {
+ planting = {
template = "plant_??",
directory = dirname,
hotspot = { 18, 23 },
@@ -48,7 +48,7 @@
"findspace size:any radius:5 avoid:field",
"walk coords",
"animation dig 2000",
- "animation crop 1000",
+ "animation planting 1000",
"plant attrib:tree_sapling",
"animation water 2000",
"return"
=== modified file 'tribes/workers/empire/vinefarmer/init.lua'
--- tribes/workers/empire/vinefarmer/init.lua 2015-11-05 12:53:49 +0000
+++ tribes/workers/empire/vinefarmer/init.lua 2015-12-26 19:43:23 +0000
@@ -12,13 +12,13 @@
hotspot = { 8, 24 },
fps = 10
},
- plant = {
+ planting = {
template = "plant_??",
directory = dirname,
hotspot = { 15, 23 },
fps = 10
},
- gather = {
+ gathering = {
template = "gather_??",
directory = dirname,
hotspot = { 9, 22 },
@@ -50,15 +50,15 @@
"walk coords",
"animation dig 2000",
"plant tribe:grapevine_tiny",
- "animation plant 3000",
+ "animation planting 3000",
"return"
},
harvestvine = {
"findobject attrib:ripe_grapes radius:1",
"walk object",
- "animation gather 10000",
+ "animation gathering 10000",
"object harvest",
- "animation gather 2000",
+ "animation gathering 2000",
"createware grape",
"return"
}
Follow ups