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
=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2017-11-18 17:57:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2018-09-07 10:44:23 +0000
@@ -74,7 +74,7 @@
74 "sleep=23000",74 "sleep=23000",
75 "consume=barbarians_bread,fish,meat",75 "consume=barbarians_bread,fish,meat",
76 "playsound=sound/barbarians/taverns tavern 100",76 "playsound=sound/barbarians/taverns tavern 100",
77 "sleep=10000",77 "animate=working 10000",
78 "produce=ration"78 "produce=ration"
79 }79 }
80 },80 },
@@ -87,7 +87,7 @@
87 "sleep=5000",87 "sleep=5000",
88 "consume=barbarians_bread fish,meat beer",88 "consume=barbarians_bread fish,meat beer",
89 "playsound=sound/barbarians/taverns biginn 100",89 "playsound=sound/barbarians/taverns biginn 100",
90 "sleep=32000",90 "animate=working 32000",
91 "produce=snack"91 "produce=snack"
92 }92 }
93 },93 },
@@ -100,7 +100,7 @@
100 "sleep=5000",100 "sleep=5000",
101 "consume=barbarians_bread fish,meat beer_strong",101 "consume=barbarians_bread fish,meat beer_strong",
102 "playsound=sound/barbarians/taverns biginn 100",102 "playsound=sound/barbarians/taverns biginn 100",
103 "sleep=35000",103 "animate=working 35000",
104 "produce=meal"104 "produce=meal"
105 }105 }
106 },106 },

Subscribers

People subscribed via source and target branches

to status/vote changes: