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

Proposed by Toni Förster
Status: Merged
Merged at revision: 8811
Proposed branch: lp:~widelands-dev/widelands/big_inn_missing_animation
Merge into: lp:widelands
Diff against target: 30 lines (+3/-3)
1 file modified
data/tribes/buildings/productionsites/barbarians/big_inn/init.lua (+3/-3)
To merge this branch: bzr merge lp:~widelands-dev/widelands/big_inn_missing_animation
Reviewer Review Type Date Requested Status
hessenfarmer Approve
Review via email: mp+354466@code.launchpad.net

Commit message

added missing working animation for barbarians big_inn

To post a comment you must log in.
Revision history for this message
hessenfarmer (stephan-lutz) wrote :

Very good catch

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

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3906. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426087649.
Appveyor build 3704. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_big_inn_missing_animation-3704.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
2--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2017-11-18 17:57:00 +0000
3+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2018-09-07 10:44:23 +0000
4@@ -74,7 +74,7 @@
5 "sleep=23000",
6 "consume=barbarians_bread,fish,meat",
7 "playsound=sound/barbarians/taverns tavern 100",
8- "sleep=10000",
9+ "animate=working 10000",
10 "produce=ration"
11 }
12 },
13@@ -87,7 +87,7 @@
14 "sleep=5000",
15 "consume=barbarians_bread fish,meat beer",
16 "playsound=sound/barbarians/taverns biginn 100",
17- "sleep=32000",
18+ "animate=working 32000",
19 "produce=snack"
20 }
21 },
22@@ -100,7 +100,7 @@
23 "sleep=5000",
24 "consume=barbarians_bread fish,meat beer_strong",
25 "playsound=sound/barbarians/taverns biginn 100",
26- "sleep=35000",
27+ "animate=working 35000",
28 "produce=meal"
29 }
30 },

Subscribers

People subscribed via source and target branches

to status/vote changes: