Merge lp:~weedfreak/widelands/recycling_centre into lp:widelands

Proposed by R M on 2018-01-06
Status: Work in progress
Proposed branch: lp:~weedfreak/widelands/recycling_centre
Merge into: lp:widelands
Diff against target: 1410 lines (+824/-22)
28 files modified
data/tribes/atlanteans.lua (+9/-1)
data/tribes/barbarians.lua (+4/-1)
data/tribes/buildings/productionsites/atlanteans/armour_recycler/helptexts.lua (+27/-0)
data/tribes/buildings/productionsites/atlanteans/armour_recycler/init.lua (+74/-0)
data/tribes/buildings/productionsites/atlanteans/recycling_centre/helptexts.lua (+27/-0)
data/tribes/buildings/productionsites/atlanteans/recycling_centre/init.lua (+88/-0)
data/tribes/buildings/productionsites/barbarians/recycling_centre/helptexts.lua (+27/-0)
data/tribes/buildings/productionsites/barbarians/recycling_centre/init.lua (+91/-0)
data/tribes/buildings/productionsites/empire/armour_recycler/helptexts.lua (+27/-0)
data/tribes/buildings/productionsites/empire/armour_recycler/init.lua (+84/-0)
data/tribes/buildings/productionsites/empire/recycling_centre/helptexts.lua (+27/-0)
data/tribes/buildings/productionsites/empire/recycling_centre/init.lua (+93/-0)
data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua (+10/-4)
data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua (+6/-2)
data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua (+16/-7)
data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua (+15/-5)
data/tribes/empire.lua (+7/-1)
data/tribes/init.lua (+17/-1)
data/tribes/wares/old_armour/helptexts.lua (+14/-0)
data/tribes/wares/old_armour/init.lua (+21/-0)
data/tribes/wares/old_chain_armour/helptexts.lua (+14/-0)
data/tribes/wares/old_chain_armour/init.lua (+21/-0)
data/tribes/wares/scrap_metal_iron/helptexts.lua (+14/-0)
data/tribes/wares/scrap_metal_iron/init.lua (+21/-0)
data/tribes/wares/scrap_metal_mixed/helptexts.lua (+14/-0)
data/tribes/wares/scrap_metal_mixed/init.lua (+21/-0)
data/tribes/wares/tabard_old/helptexts.lua (+14/-0)
data/tribes/wares/tabard_old/init.lua (+21/-0)
To merge this branch: bzr merge lp:~weedfreak/widelands/recycling_centre
Reviewer Review Type Date Requested Status
Widelands Developers 2018-01-06 Pending
Review via email: mp+335794@code.launchpad.net

Description of the change

Test branch following discussion in https://wl.widelands.org/forum/topic/1597/.

Currently recycling is only about 25%$ efficient if you have enough coal, AI is limited to a small number of buildings.

If the principle of recycling is approved then more work is required on balance and AI.

To post a comment you must log in.
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3032. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/325760380.
Appveyor build 2840. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_weedfreak_widelands_recycling_centre-2840.

TiborB (tiborb95) wrote :

From AI's point of view:
We will probably need new ai hint like 'is_recycling_centre' and the bulding will be built based on number of trainingsites and productionsites and only one per type will be allowed.

Alternatively: AI can build the site if there is at least one ware for each input on stock. As indication, that scrap ware is being produced. Providing that scrap ware is not included in starting wares....

R M (weedfreak) wrote :

Currently I have fudged the AI using ai hint to limit number of sites,
weak and very weak can build more as it just wastes resources but they
could be set to zero. One of each type is all that is needed unless you
have more than three training sites upgrading weapons or armour, current
ai rarely gets close to one site in full production.

Scrap wares should not be included in starting wares but someone could
at some time add them as a scenario, which would break the preferred
option of only building if there are wares being produced.

On 06/01/18 21:39, TiborB wrote:
> >From AI's point of view:
> We will probably need new ai hint like 'is_recycling_centre' and the bulding will be built based on number of trainingsites and productionsites and only one per type will be allowed.
>
> Alternatively: AI can build the site if there is at least one ware for each input on stock. As indication, that scrap ware is being produced. Providing that scrap ware is not included in starting wares....
>
>

Klaus Halfmann (klaus-halfmann) wrote :

I played this now on a simple map playing barbarians.
The basic idea works fine and is not totally unrealistic.
Later in the game you "suddenly" have more metal (but then again lack the coal, well).

I'd suggest to have some variations perhaps:

e.g. Atlanters can enhance a smelting works to add recyling.
The imperials could have recycling as an enhancement of the metal works.

The icon for the scrap metal is already fine for me, we need some
more building pictures of course.

Gun: perhaps a nice idea for R21 while we start to freeze a R20?

Thanks for your nice work.

R M (weedfreak) wrote :

Thanks for the feedback. I had been thinking about upgrades for workers, your suggestions for building variety is great, it seemed odd to me they all worked the same way. I have some ideas to work on.

If this looks like it might be acceptable as an idea then I will work on some buildings to go with it, it did not seem useful to spend hours on graphics if the basic idea was rejected. I have some ideas about getting the AI players to use the buildings better.

GunChleoc (gunchleoc) wrote :

We are still a few months off freezing for Build20, since there are some UI changes & fixes that need to go in first.

I agree on not working on graphics until the idea is accepted, it would be a waste of your valuable time. I'll have to wait until I get home before I can do some test playing - I guess it would be good to have some multiplayer sessions to get a feel for how the feature really handles.

Klaus Halfmann (klaus-halfmann) wrote :

How is the status here now?

* I think the Frisians include a recylcling center of theire own by now?
* RM did you create some other Branches for this?
* As we started a Bugfixing on the road to R20 I think we shold move this to R21,
  even though I really like the Idea.

GunChleoc (gunchleoc) wrote :

Sorry I never got around to testing this.

I'm on two minds about it, because it would take away some uniqueness from the Frisians.

Still dreaming of a plug-and-play modding system...

Unmerged revisions

8523. By R M on 2018-01-06

Limit AI.

8522. By R M on 2017-12-28

merge trunk.

8521. By R M on 2017-12-22

tweaks to ballance.

8520. By R M on 2017-12-21

Merged with trunk.

8519. By R M on 2017-12-20

trying armour recycling seperate from weaopns

8518. By R M on 2017-12-17

tidy up

8517. By R M on 2017-12-16

removed barbarian from basic economy

8516. By R M on 2017-12-15

script name error

8515. By R M on 2017-12-14

empire armour

8514. By R M on 2017-12-13

empire armour

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/atlanteans.lua'
2--- data/tribes/atlanteans.lua 2017-11-23 09:13:06 +0000
3+++ data/tribes/atlanteans.lua 2018-01-06 10:56:35 +0000
4@@ -44,6 +44,8 @@
5 --
6 -- **ship**: The internal name of the tribe's ship.
7 --
8+-- **headquarters**: The internal name of the tribe's headquarters building. This unit needs to be defined in the ``buildings`` table too.
9+--
10 -- **port**: The internal name of the tribe's port building. This unit needs to be defined in the ``buildings`` table too.
11 tribes:new_tribe {
12 name = "atlanteans",
13@@ -106,7 +108,10 @@
14 "iron_ore",
15 "iron",
16 "gold_ore",
17- "gold"
18+ "gold",
19+ "scrap_metal_iron",
20+ "scrap_metal_mixed",
21+ "tabard_old",
22 },
23 {
24 -- Tools
25@@ -233,6 +238,7 @@
26 "atlanteans_fishbreeders_house",
27 "atlanteans_hunters_house",
28 "atlanteans_well",
29+ "atlanteans_armour_recycler",
30 "atlanteans_gold_spinning_mill",
31 "atlanteans_scouts_house",
32
33@@ -242,6 +248,7 @@
34 "atlanteans_mill",
35 "atlanteans_bakery",
36 "atlanteans_charcoal_kiln",
37+ "atlanteans_recycling_centre",
38 "atlanteans_smelting_works",
39 "atlanteans_toolsmithy",
40 "atlanteans_weaponsmithy",
41@@ -347,6 +354,7 @@
42 geologist = "atlanteans_geologist",
43 soldier = "atlanteans_soldier",
44 ship = "atlanteans_ship",
45+ headquarters = "atlanteans_headquarters",
46 port = "atlanteans_port",
47 barracks = "atlanteans_barracks",
48 ironore = "iron_ore",
49
50=== modified file 'data/tribes/barbarians.lua'
51--- data/tribes/barbarians.lua 2017-11-23 09:13:06 +0000
52+++ data/tribes/barbarians.lua 2018-01-06 10:56:35 +0000
53@@ -58,7 +58,9 @@
54 "iron_ore",
55 "iron",
56 "gold_ore",
57- "gold"
58+ "gold",
59+ "scrap_metal_iron",
60+ "scrap_metal_mixed",
61 },
62 {
63 -- Tools
64@@ -201,6 +203,7 @@
65 "barbarians_big_inn",
66 "barbarians_charcoal_kiln",
67 "barbarians_smelting_works",
68+ "barbarians_recycling_centre",
69 "barbarians_metal_workshop",
70 "barbarians_warmill",
71 "barbarians_ax_workshop",
72
73=== added directory 'data/tribes/buildings/productionsites/atlanteans/armour_recycler'
74=== added file 'data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_00.png'
75Binary files data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_00.png 2018-01-06 10:56:35 +0000 differ
76=== added file 'data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_00_pc.png'
77Binary files data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_00_pc.png 2018-01-06 10:56:35 +0000 differ
78=== added file 'data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_01.png'
79Binary files data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_01.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_01.png 2018-01-06 10:56:35 +0000 differ
80=== added file 'data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_01_pc.png'
81Binary files data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_01_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/armour_recycler/build_01_pc.png 2018-01-06 10:56:35 +0000 differ
82=== added file 'data/tribes/buildings/productionsites/atlanteans/armour_recycler/helptexts.lua'
83--- data/tribes/buildings/productionsites/atlanteans/armour_recycler/helptexts.lua 1970-01-01 00:00:00 +0000
84+++ data/tribes/buildings/productionsites/atlanteans/armour_recycler/helptexts.lua 2018-01-06 10:56:35 +0000
85@@ -0,0 +1,27 @@
86+-- This include can be removed when all help texts have been defined.
87+include "tribes/scripting/help/global_helptexts.lua"
88+
89+function building_helptext_lore()
90+ -- TRANSLATORS#: Lore helptext for a building
91+ return no_lore_text_yet()
92+end
93+
94+function building_helptext_lore_author()
95+ -- TRANSLATORS#: Lore author helptext for a building
96+ return no_lore_author_text_yet()
97+end
98+
99+function building_helptext_purpose()
100+ -- TRANSLATORS: Purpose helptext for a building
101+ return pgettext("building", "Recycles armour.")
102+end
103+
104+function building_helptext_note()
105+ -- TRANSLATORS#: Note helptext for a building
106+ return ""
107+end
108+
109+function building_helptext_performance()
110+ -- TRANSLATORS#: Performance helptext for a building
111+ return no_performance_text_yet()
112+end
113
114=== added file 'data/tribes/buildings/productionsites/atlanteans/armour_recycler/idle_00.png'
115Binary files data/tribes/buildings/productionsites/atlanteans/armour_recycler/idle_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/armour_recycler/idle_00.png 2018-01-06 10:56:35 +0000 differ
116=== added file 'data/tribes/buildings/productionsites/atlanteans/armour_recycler/idle_00_pc.png'
117Binary files data/tribes/buildings/productionsites/atlanteans/armour_recycler/idle_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/armour_recycler/idle_00_pc.png 2018-01-06 10:56:35 +0000 differ
118=== added file 'data/tribes/buildings/productionsites/atlanteans/armour_recycler/init.lua'
119--- data/tribes/buildings/productionsites/atlanteans/armour_recycler/init.lua 1970-01-01 00:00:00 +0000
120+++ data/tribes/buildings/productionsites/atlanteans/armour_recycler/init.lua 2018-01-06 10:56:35 +0000
121@@ -0,0 +1,74 @@
122+dirname = path.dirname(__file__)
123+
124+tribes:new_productionsite_type {
125+ msgctxt = "atlanteans_building",
126+ name = "atlanteans_armour_recycler",
127+ -- TRANSLATORS: This is a building name used in lists of buildings
128+ descname = pgettext("atlanteans_building", "Armour Recycler"),
129+ helptext_script = dirname .. "helptexts.lua",
130+ icon = dirname .. "menu.png",
131+ size = "small",
132+
133+ buildcost = {
134+ log = 3,
135+ granite = 1
136+ },
137+ return_on_dismantle = {
138+ log = 2
139+ },
140+
141+ animations = {
142+ idle = {
143+ pictures = path.list_files(dirname .. "idle_??.png"),
144+ hotspot = { 41, 44 },
145+ },
146+ working = {
147+ pictures = path.list_files(dirname .. "idle_??.png"), --TODO no animation yet
148+ hotspot = { 57, 72 },
149+ },
150+ build = {
151+ pictures = path.list_files(dirname .. "build_??.png"),
152+ hotspot = { 41, 44 },
153+ }
154+ },
155+
156+ aihints = {
157+ prohibited_till = 1500,
158+ very_weak_ai_limit = 3,
159+ weak_ai_limit = 2,
160+ normal_ai_limit = 1
161+ },
162+
163+ working_positions = {
164+ atlanteans_weaver = 1
165+ },
166+
167+ inputs = {
168+ { name = "tabard_old", amount = 3 }
169+ },
170+ outputs = {
171+ "spider_silk"
172+ },
173+
174+ programs = {
175+ work = {
176+ -- TRANSLATORS: Completed/Skipped/Did not start working because ...
177+ descname = pgettext("atlantians_building", "working"),
178+ actions = {
179+ "call=recycle_spidersilk",
180+ "return=skipped"
181+ }
182+ },
183+ recycle_spidersilk = {
184+ -- TRANSLATORS: Completed/Skipped/Did not start recycling spidersilk because ...
185+ descname = pgettext("atlanteans_building", "recycling spidersilk"),
186+ actions = {
187+ "return=skipped unless site has tabard_old",
188+ "sleep=40000",
189+ "consume=tabard_old:2",
190+ "animate=working 15000",
191+ "produce=spider_silk"
192+ }
193+ },
194+ },
195+}
196
197=== added file 'data/tribes/buildings/productionsites/atlanteans/armour_recycler/menu.png'
198Binary files data/tribes/buildings/productionsites/atlanteans/armour_recycler/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/armour_recycler/menu.png 2018-01-06 10:56:35 +0000 differ
199=== added directory 'data/tribes/buildings/productionsites/atlanteans/recycling_centre'
200=== added file 'data/tribes/buildings/productionsites/atlanteans/recycling_centre/helptexts.lua'
201--- data/tribes/buildings/productionsites/atlanteans/recycling_centre/helptexts.lua 1970-01-01 00:00:00 +0000
202+++ data/tribes/buildings/productionsites/atlanteans/recycling_centre/helptexts.lua 2018-01-06 10:56:35 +0000
203@@ -0,0 +1,27 @@
204+-- This include can be removed when all help texts have been defined.
205+include "tribes/scripting/help/global_helptexts.lua"
206+
207+function building_helptext_lore()
208+ -- #TRANSLATORS: Lore helptext for a building
209+ return no_lore_text_yet()
210+end
211+
212+function building_helptext_lore_author()
213+ -- #TRANSLATORS: Lore author helptext for a building
214+ return no_lore_author_text_yet()
215+end
216+
217+function building_helptext_purpose()
218+ -- #TRANSLATORS: Purpose helptext for a building
219+ return pgettext("atlantians_building", "Recycles old armour and weapon parts from training sites into iron, gold and spider silk.")
220+end
221+
222+function building_helptext_note()
223+ -- #TRANSLATORS: Note helptext for a building
224+ return ""
225+end
226+
227+function building_helptext_performance()
228+ -- #TRANSLATORS: Performance helptext for a building
229+ return no_performance_text_yet()
230+end
231
232=== added file 'data/tribes/buildings/productionsites/atlanteans/recycling_centre/idle_00.png'
233Binary files data/tribes/buildings/productionsites/atlanteans/recycling_centre/idle_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/recycling_centre/idle_00.png 2018-01-06 10:56:35 +0000 differ
234=== added file 'data/tribes/buildings/productionsites/atlanteans/recycling_centre/idle_00_pc.png'
235Binary files data/tribes/buildings/productionsites/atlanteans/recycling_centre/idle_00_pc.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/recycling_centre/idle_00_pc.png 2018-01-06 10:56:35 +0000 differ
236=== added file 'data/tribes/buildings/productionsites/atlanteans/recycling_centre/init.lua'
237--- data/tribes/buildings/productionsites/atlanteans/recycling_centre/init.lua 1970-01-01 00:00:00 +0000
238+++ data/tribes/buildings/productionsites/atlanteans/recycling_centre/init.lua 2018-01-06 10:56:35 +0000
239@@ -0,0 +1,88 @@
240+dirname = path.dirname(__file__)
241+
242+tribes:new_productionsite_type {
243+ msgctxt = "atlanteans_building",
244+ name = "atlanteans_recycling_centre",
245+ -- TRANSLATORS: This is a building name used in lists of buildings
246+ descname = pgettext("atlanteans_building", "Recycling Centre"),
247+ helptext_script = dirname .. "helptexts.lua",
248+ icon = dirname .. "menu.png",
249+ size = "medium",
250+
251+ buildcost = {
252+ granite = 4,
253+ log = 1,
254+ planks = 1,
255+ spidercloth = 1
256+ },
257+ return_on_dismantle = {
258+ granite = 3,
259+ },
260+
261+ animations = {
262+ idle = {
263+ pictures = path.list_files(dirname .. "idle_??.png"),
264+ hotspot = { 57, 72 },
265+ },
266+ working = {
267+ pictures = path.list_files(dirname .. "idle_??.png"), --TODO no animation yet
268+ hotspot = { 57, 72 },
269+ }
270+ },
271+
272+ aihints = {
273+ prohibited_till = 1200,
274+ very_weak_ai_limit = 4,
275+ weak_ai_limit = 3,
276+ normal_ai_limit = 2
277+ },
278+
279+ working_positions = {
280+ atlanteans_smelter = 1
281+ },
282+
283+ inputs = {
284+ { name = "coal", amount = 8 },
285+ { name = "scrap_metal_iron", amount = 6 },
286+ { name = "scrap_metal_mixed", amount = 6 },
287+ },
288+ outputs = {
289+ "iron",
290+ "gold",
291+ },
292+
293+ programs = {
294+ work = {
295+ -- TRANSLATORS: Completed/Skipped/Did not start working because ...
296+ descname = pgettext("atlantians_building", "working"),
297+ actions = {
298+ "call=smelt_iron",
299+ "call=smelt_mixed",
300+ "call=smelt_iron",
301+ "return=skipped"
302+ }
303+ },
304+ smelt_iron = {
305+ -- TRANSLATORS: Completed/Skipped/Did not start recycling iron because ...
306+ descname = pgettext("atlanteans_building", "recycling iron"),
307+ actions = {
308+ "return=skipped unless economy needs iron",
309+ "sleep=40000",
310+ "consume=scrap_metal_iron:2 coal",
311+ "animate=working 40000",
312+ "produce=iron"
313+ }
314+ },
315+ smelt_mixed = {
316+ -- TRANSLATORS: Completed/Skipped/Did not start recycling iron and gold because ...
317+ descname = pgettext("atlanteans_building", "recycling iron and gold"),
318+ actions = {
319+ "return=skipped unless economy needs iron or economy needs gold",
320+ "sleep=40000",
321+ "consume=scrap_metal_mixed:2 coal",
322+ "animate=working 40000",
323+ "produce=iron gold"
324+ }
325+ },
326+ }
327+}
328
329=== added file 'data/tribes/buildings/productionsites/atlanteans/recycling_centre/menu.png'
330Binary files data/tribes/buildings/productionsites/atlanteans/recycling_centre/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/recycling_centre/menu.png 2018-01-06 10:56:35 +0000 differ
331=== added directory 'data/tribes/buildings/productionsites/barbarians/recycling_centre'
332=== added file 'data/tribes/buildings/productionsites/barbarians/recycling_centre/helptexts.lua'
333--- data/tribes/buildings/productionsites/barbarians/recycling_centre/helptexts.lua 1970-01-01 00:00:00 +0000
334+++ data/tribes/buildings/productionsites/barbarians/recycling_centre/helptexts.lua 2018-01-06 10:56:35 +0000
335@@ -0,0 +1,27 @@
336+-- This include can be removed when all help texts have been defined.
337+include "tribes/scripting/help/global_helptexts.lua"
338+
339+function building_helptext_lore()
340+ -- TRANSLATORS#: Lore helptext for a building
341+ return no_lore_text_yet()
342+end
343+
344+function building_helptext_lore_author()
345+ -- TRANSLATORS#: Lore author helptext for a building
346+ return no_lore_author_text_yet()
347+end
348+
349+function building_helptext_purpose()
350+ -- TRANSLATORS: Purpose helptext for a building
351+ return pgettext("building", "Smelts iron ore into iron and gold ore into gold.")
352+end
353+
354+function building_helptext_note()
355+ -- TRANSLATORS#: Note helptext for a building
356+ return ""
357+end
358+
359+function building_helptext_performance()
360+ -- TRANSLATORS#: Performance helptext for a building
361+ return no_performance_text_yet()
362+end
363
364=== added file 'data/tribes/buildings/productionsites/barbarians/recycling_centre/idle_00.png'
365Binary files data/tribes/buildings/productionsites/barbarians/recycling_centre/idle_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/recycling_centre/idle_00.png 2018-01-06 10:56:35 +0000 differ
366=== added file 'data/tribes/buildings/productionsites/barbarians/recycling_centre/init.lua'
367--- data/tribes/buildings/productionsites/barbarians/recycling_centre/init.lua 1970-01-01 00:00:00 +0000
368+++ data/tribes/buildings/productionsites/barbarians/recycling_centre/init.lua 2018-01-06 10:56:35 +0000
369@@ -0,0 +1,91 @@
370+dirname = path.dirname(__file__)
371+
372+tribes:new_productionsite_type {
373+ msgctxt = "barbarians_building",
374+ name = "barbarians_recycling_centre",
375+ -- TRANSLATORS: This is a building name used in lists of buildings
376+ descname = pgettext("barbarians_building", "Recycling Centre"),
377+ helptext_script = dirname .. "helptexts.lua",
378+ icon = dirname .. "menu.png",
379+ size = "medium",
380+
381+ buildcost = {
382+ log = 3,
383+ blackwood = 1,
384+ granite = 1,
385+ grout = 1,
386+ thatch_reed = 2
387+ },
388+ return_on_dismantle = {
389+ log = 1,
390+ blackwood = 1,
391+ granite = 1
392+ },
393+
394+ animations = {
395+ idle = {
396+ pictures = path.list_files(dirname .. "idle_??.png"),
397+ hotspot = { 44, 58 },
398+ },
399+ working = {
400+ pictures = path.list_files(dirname .. "idle_??.png"), -- TODO(GunChleoc): No animation yet.
401+ hotspot = { 44, 58 },
402+ },
403+ },
404+
405+ aihints = {
406+ prohibited_till = 1500,
407+ very_weak_ai_limit = 4,
408+ weak_ai_limit = 3,
409+ normal_ai_limit = 2
410+ },
411+
412+ working_positions = {
413+ barbarians_smelter = 1
414+ },
415+
416+ inputs = {
417+ { name = "coal", amount = 8 },
418+ { name = "scrap_metal_iron", amount = 6 },
419+ { name = "scrap_metal_mixed", amount = 6 },
420+ },
421+ outputs = {
422+ "iron",
423+ "gold"
424+ },
425+
426+ programs = {
427+ work = {
428+ -- TRANSLATORS: Completed/Skipped/Did not start working because ...
429+ descname = _"working",
430+ actions = {
431+ "call=smelt_iron",
432+ "call=smelt_mixed",
433+ "call=smelt_iron",
434+ "return=skipped"
435+ }
436+ },
437+ smelt_iron = {
438+ -- TRANSLATORS: Completed/Skipped/Did not start recycling iron because ...
439+ descname = _"recycling iron",
440+ actions = {
441+ "return=skipped unless economy needs iron",
442+ "sleep=14000",
443+ "consume=coal scrap_metal_iron:2",
444+ "animate=working 18000",
445+ "produce=iron"
446+ }
447+ },
448+ smelt_mixed = {
449+ -- TRANSLATORS: Completed/Skipped/Did not start recycling iron and gold because ...
450+ descname = _"recycling gold",
451+ actions = {
452+ "return=skipped unless economy needs gold",
453+ "sleep=14000",
454+ "consume=coal scrap_metal_mixed:2",
455+ "animate=working 24000",
456+ "produce=gold iron"
457+ }
458+ },
459+ },
460+}
461
462=== added file 'data/tribes/buildings/productionsites/barbarians/recycling_centre/menu.png'
463Binary files data/tribes/buildings/productionsites/barbarians/recycling_centre/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/recycling_centre/menu.png 2018-01-06 10:56:35 +0000 differ
464=== added directory 'data/tribes/buildings/productionsites/empire/armour_recycler'
465=== added file 'data/tribes/buildings/productionsites/empire/armour_recycler/helptexts.lua'
466--- data/tribes/buildings/productionsites/empire/armour_recycler/helptexts.lua 1970-01-01 00:00:00 +0000
467+++ data/tribes/buildings/productionsites/empire/armour_recycler/helptexts.lua 2018-01-06 10:56:35 +0000
468@@ -0,0 +1,27 @@
469+-- This include can be removed when all help texts have been defined.
470+include "tribes/scripting/help/global_helptexts.lua"
471+
472+function building_helptext_lore()
473+ -- TRANSLATORS#: Lore helptext for a building
474+ return no_lore_text_yet()
475+end
476+
477+function building_helptext_lore_author()
478+ -- TRANSLATORS#: Lore author helptext for a building
479+ return no_lore_author_text_yet()
480+end
481+
482+function building_helptext_purpose()
483+ -- TRANSLATORS: Purpose helptext for a building
484+ return pgettext("building", "Recycles used armour from training sites.")
485+end
486+
487+function building_helptext_note()
488+ -- TRANSLATORS: Note helptext for a building
489+ return pgettext("building", "Recyling armour discarded by soldiers in training can increase the efficiency of making new armour and weapons.")
490+end
491+
492+function building_helptext_performance()
493+ -- TRANSLATORS#: Performance helptext for a building
494+ return ""
495+end
496
497=== added file 'data/tribes/buildings/productionsites/empire/armour_recycler/idle_00.png'
498Binary files data/tribes/buildings/productionsites/empire/armour_recycler/idle_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/armour_recycler/idle_00.png 2018-01-06 10:56:35 +0000 differ
499=== added file 'data/tribes/buildings/productionsites/empire/armour_recycler/init.lua'
500--- data/tribes/buildings/productionsites/empire/armour_recycler/init.lua 1970-01-01 00:00:00 +0000
501+++ data/tribes/buildings/productionsites/empire/armour_recycler/init.lua 2018-01-06 10:56:35 +0000
502@@ -0,0 +1,84 @@
503+dirname = path.dirname(__file__)
504+
505+tribes:new_productionsite_type {
506+ msgctxt = "empire_building",
507+ name = "empire_armour_recycler",
508+ -- TRANSLATORS: This is a building name used in lists of buildings
509+ descname = pgettext("empire_building", "Armour Recycler"),
510+ helptext_script = dirname .. "helptexts.lua",
511+ icon = dirname .. "menu.png",
512+ size = "small",
513+
514+ buildcost = {
515+ log = 2,
516+ planks = 2
517+ },
518+ return_on_dismantle = {
519+ planks = 1,
520+ log = 1
521+ },
522+
523+ animations = {
524+ idle = {
525+ pictures = path.list_files(dirname .. "idle_??.png"),
526+ hotspot = { 37, 58 }
527+ },
528+ working = {
529+ pictures = path.list_files(dirname .. "idle_??.png"),--No animation yet
530+ hotspot = { 37, 58 }
531+ },
532+ },
533+
534+ aihints = {
535+ prohibited_till = 1500,
536+ very_weak_ai_limit = 3,
537+ weak_ai_limit = 2,
538+ normal_ai_limit = 1
539+ },
540+
541+ working_positions = {
542+ empire_weaver = 1
543+ },
544+
545+ inputs = {
546+ { name = "old_armour", amount = 2 },
547+ { name = "old_chain_armour", amount = 2 },
548+ },
549+ outputs = {
550+ "wool",
551+ "scrap_metal_iron"
552+ },
553+ programs = {
554+ work = {
555+ -- TRANSLATORS: Completed/Skipped/Did not start working because ...
556+ descname = _"working",
557+ actions = {
558+ "call=recycle_armour",
559+ "call=recycle_chain_armour",
560+ "return=skipped"
561+ }
562+ },
563+ recycle_armour = {
564+ -- TRANSLATORS: Completed/Skipped/Did not start recycling armour because ...
565+ descname = _"recycling armour",
566+ actions = {
567+ "return=skipped unless economy needs wool",
568+ "sleep=14000",
569+ "consume=old_armour:2",
570+ "animate=working 18000",
571+ "produce=wool"
572+ }
573+ },
574+ recycle_chain_armour = {
575+ -- TRANSLATORS: Completed/Skipped/Did not start recycling chain armour because ...
576+ descname = _"recycling chain armour",
577+ actions = {
578+ "return=skipped unless economy needs iron",
579+ "sleep=14000",
580+ "consume=old_chain_armour:2",
581+ "animate=working 18000",
582+ "produce=wool scrap_metal_iron"
583+ }
584+ },
585+ },
586+}
587
588=== added file 'data/tribes/buildings/productionsites/empire/armour_recycler/menu.png'
589Binary files data/tribes/buildings/productionsites/empire/armour_recycler/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/armour_recycler/menu.png 2018-01-06 10:56:35 +0000 differ
590=== added directory 'data/tribes/buildings/productionsites/empire/recycling_centre'
591=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/build_00.png'
592Binary files data/tribes/buildings/productionsites/empire/recycling_centre/build_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/build_00.png 2018-01-06 10:56:35 +0000 differ
593=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/build_01.png'
594Binary files data/tribes/buildings/productionsites/empire/recycling_centre/build_01.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/build_01.png 2018-01-06 10:56:35 +0000 differ
595=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/build_02.png'
596Binary files data/tribes/buildings/productionsites/empire/recycling_centre/build_02.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/build_02.png 2018-01-06 10:56:35 +0000 differ
597=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/build_03.png'
598Binary files data/tribes/buildings/productionsites/empire/recycling_centre/build_03.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/build_03.png 2018-01-06 10:56:35 +0000 differ
599=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/helptexts.lua'
600--- data/tribes/buildings/productionsites/empire/recycling_centre/helptexts.lua 1970-01-01 00:00:00 +0000
601+++ data/tribes/buildings/productionsites/empire/recycling_centre/helptexts.lua 2018-01-06 10:56:35 +0000
602@@ -0,0 +1,27 @@
603+-- This include can be removed when all help texts have been defined.
604+include "tribes/scripting/help/global_helptexts.lua"
605+
606+function building_helptext_lore()
607+ -- TRANSLATORS#: Lore helptext for a building
608+ return no_lore_text_yet()
609+end
610+
611+function building_helptext_lore_author()
612+ -- TRANSLATORS#: Lore author helptext for a building
613+ return no_lore_author_text_yet()
614+end
615+
616+function building_helptext_purpose()
617+ -- TRANSLATORS: Purpose helptext for a building
618+ return pgettext("building", "Smelts iron ore into iron and gold ore into gold.")
619+end
620+
621+function building_helptext_note()
622+ -- TRANSLATORS#: Note helptext for a building
623+ return ""
624+end
625+
626+function building_helptext_performance()
627+ -- TRANSLATORS#: Performance helptext for a building
628+ return no_performance_text_yet()
629+end
630
631=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/idle_00.png'
632Binary files data/tribes/buildings/productionsites/empire/recycling_centre/idle_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/idle_00.png 2018-01-06 10:56:35 +0000 differ
633=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/init.lua'
634--- data/tribes/buildings/productionsites/empire/recycling_centre/init.lua 1970-01-01 00:00:00 +0000
635+++ data/tribes/buildings/productionsites/empire/recycling_centre/init.lua 2018-01-06 10:56:35 +0000
636@@ -0,0 +1,93 @@
637+dirname = path.dirname(__file__)
638+
639+tribes:new_productionsite_type {
640+ msgctxt = "empire_building",
641+ name = "empire_recycling_centre",
642+ -- TRANSLATORS: This is a building name used in lists of buildings
643+ descname = pgettext("empire_building", "Recycling Centre"),
644+ helptext_script = dirname .. "helptexts.lua",
645+ icon = dirname .. "menu.png",
646+ size = "medium",
647+
648+ buildcost = {
649+ log = 1,
650+ granite = 4,
651+ marble = 2
652+ },
653+ return_on_dismantle = {
654+ granite = 3,
655+ marble = 1
656+ },
657+
658+ animations = {
659+ idle = {
660+ pictures = path.list_files(dirname .. "idle_??.png"),
661+ hotspot = { 39, 53 },
662+ },
663+ build = {
664+ pictures = path.list_files(dirname .. "build_??.png"),
665+ hotspot = { 39, 53 },
666+ },
667+ working = {
668+ pictures = path.list_files(dirname .. "working_??.png"),
669+ hotspot = { 39, 53 },
670+ fps = 5
671+ },
672+ },
673+
674+ aihints = {
675+ prohibited_till = 1200,
676+ very_weak_ai_limit = 4,
677+ weak_ai_limit = 3,
678+ normal_ai_limit = 2
679+ },
680+
681+ working_positions = {
682+ empire_smelter = 1
683+ },
684+
685+ inputs = {
686+ { name = "coal", amount = 6 },
687+ { name = "scrap_metal_iron", amount = 4 },
688+ { name = "scrap_metal_mixed", amount = 4 }
689+ },
690+ outputs = {
691+ "iron",
692+ "gold",
693+ },
694+
695+ programs = {
696+ work = {
697+ -- TRANSLATORS: Completed/Skipped/Did not start working because ...
698+ descname = _"working",
699+ actions = {
700+ "call=smelt_iron",
701+ "call=smelt_mixed",
702+ "call=smelt_iron",
703+ "return=skipped"
704+ }
705+ },
706+ smelt_iron = {
707+ -- TRANSLATORS: Completed/Skipped/Did not start recycling iron because ...
708+ descname = _"recycling iron",
709+ actions = {
710+ "return=skipped unless economy needs iron",
711+ "sleep=14000",
712+ "consume=scrap_metal_iron:2 coal",
713+ "animate=working 18000",
714+ "produce=iron"
715+ }
716+ },
717+ smelt_mixed = {
718+ -- TRANSLATORS: Completed/Skipped/Did not start recycling iron and gold because ...
719+ descname = _"recycling gold",
720+ actions = {
721+ "return=skipped unless economy needs gold",
722+ "sleep=14000",
723+ "consume=coal scrap_metal_mixed:2",
724+ "animate=working 24000",
725+ "produce=gold iron"
726+ }
727+ },
728+ },
729+}
730
731=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/menu.png'
732Binary files data/tribes/buildings/productionsites/empire/recycling_centre/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/menu.png 2018-01-06 10:56:35 +0000 differ
733=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_00.png'
734Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_00.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_00.png 2018-01-06 10:56:35 +0000 differ
735=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_01.png'
736Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_01.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_01.png 2018-01-06 10:56:35 +0000 differ
737=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_02.png'
738Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_02.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_02.png 2018-01-06 10:56:35 +0000 differ
739=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_03.png'
740Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_03.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_03.png 2018-01-06 10:56:35 +0000 differ
741=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_04.png'
742Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_04.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_04.png 2018-01-06 10:56:35 +0000 differ
743=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_05.png'
744Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_05.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_05.png 2018-01-06 10:56:35 +0000 differ
745=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_06.png'
746Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_06.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_06.png 2018-01-06 10:56:35 +0000 differ
747=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_07.png'
748Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_07.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_07.png 2018-01-06 10:56:35 +0000 differ
749=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_08.png'
750Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_08.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_08.png 2018-01-06 10:56:35 +0000 differ
751=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_09.png'
752Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_09.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_09.png 2018-01-06 10:56:35 +0000 differ
753=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_10.png'
754Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_10.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_10.png 2018-01-06 10:56:35 +0000 differ
755=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_11.png'
756Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_11.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_11.png 2018-01-06 10:56:35 +0000 differ
757=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_12.png'
758Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_12.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_12.png 2018-01-06 10:56:35 +0000 differ
759=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_13.png'
760Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_13.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_13.png 2018-01-06 10:56:35 +0000 differ
761=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_14.png'
762Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_14.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_14.png 2018-01-06 10:56:35 +0000 differ
763=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_15.png'
764Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_15.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_15.png 2018-01-06 10:56:35 +0000 differ
765=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_16.png'
766Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_16.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_16.png 2018-01-06 10:56:35 +0000 differ
767=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_17.png'
768Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_17.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_17.png 2018-01-06 10:56:35 +0000 differ
769=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_18.png'
770Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_18.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_18.png 2018-01-06 10:56:35 +0000 differ
771=== added file 'data/tribes/buildings/productionsites/empire/recycling_centre/working_19.png'
772Binary files data/tribes/buildings/productionsites/empire/recycling_centre/working_19.png 1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/recycling_centre/working_19.png 2018-01-06 10:56:35 +0000 differ
773=== modified file 'data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua'
774--- data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua 2017-04-06 20:06:06 +0000
775+++ data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua 2018-01-06 10:56:35 +0000
776@@ -132,6 +132,8 @@
777 },
778 outputs = {
779 "atlanteans_soldier",
780+ "scrap_metal_mixed",
781+ "scrap_metal_iron",
782 },
783
784 ["soldier attack"] = {
785@@ -166,7 +168,8 @@
786 "sleep=30000",
787 "check_soldier=soldier attack 0",
788 "consume=atlanteans_bread smoked_fish,smoked_meat trident_long",
789- "train=soldier attack 0 1"
790+ "train=soldier attack 0 1",
791+ "produce=scrap_metal_iron"
792 }
793 },
794 upgrade_soldier_attack_1 = {
795@@ -177,7 +180,8 @@
796 "sleep=30000",
797 "check_soldier=soldier attack 1",
798 "consume=atlanteans_bread smoked_fish,smoked_meat trident_steel",
799- "train=soldier attack 1 2"
800+ "train=soldier attack 1 2",
801+ "produce=scrap_metal_iron"
802 }
803 },
804 upgrade_soldier_attack_2 = {
805@@ -188,7 +192,8 @@
806 "sleep=30000",
807 "check_soldier=soldier attack 2",
808 "consume=atlanteans_bread smoked_fish,smoked_meat trident_double",
809- "train=soldier attack 2 3"
810+ "train=soldier attack 2 3",
811+ "produce=scrap_metal_iron"
812 }
813 },
814 upgrade_soldier_attack_3 = {
815@@ -199,7 +204,8 @@
816 "sleep=30000",
817 "check_soldier=soldier attack 3",
818 "consume=atlanteans_bread smoked_fish,smoked_meat trident_heavy_double",
819- "train=soldier attack 3 4"
820+ "train=soldier attack 3 4",
821+ "produce=scrap_metal_mixed"
822 }
823 },
824 },
825
826=== modified file 'data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua'
827--- data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua 2017-09-03 07:59:51 +0000
828+++ data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua 2018-01-06 10:56:35 +0000
829@@ -53,6 +53,8 @@
830 },
831 outputs = {
832 "atlanteans_soldier",
833+ "scrap_metal_iron",
834+ "tabard_old",
835 },
836
837 ["soldier defense"] = {
838@@ -114,7 +116,8 @@
839 "sleep=30000",
840 "check_soldier=soldier defense 1", -- Because the soldier can be expelled by the player
841 "consume=atlanteans_bread smoked_fish,smoked_meat shield_advanced",
842- "train=soldier defense 1 2"
843+ "train=soldier defense 1 2",
844+ "produce=scrap_metal_iron"
845 }
846 },
847 upgrade_soldier_health_0 = {
848@@ -125,7 +128,8 @@
849 "sleep=30000",
850 "check_soldier=soldier health 0", -- Because the soldier can be expelled by the player
851 "consume=smoked_fish,smoked_meat:2 tabard_golden",
852- "train=soldier health 0 1"
853+ "train=soldier health 0 1",
854+ "produce=tabard_old"
855 }
856 },
857 upgrade_soldier_evade_0 = {
858
859=== modified file 'data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua'
860--- data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2017-04-06 20:06:06 +0000
861+++ data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2018-01-06 10:56:35 +0000
862@@ -64,6 +64,8 @@
863 },
864 outputs = {
865 "barbarians_soldier",
866+ "scrap_metal_iron",
867+ "scrap_metal_mixed",
868 },
869
870 ["soldier attack"] = {
871@@ -112,7 +114,8 @@
872 "sleep=30000",
873 "check_soldier=soldier attack 0", -- Because the soldier can be expelled by the player
874 "consume=ax_sharp fish,meat barbarians_bread",
875- "train=soldier attack 0 1"
876+ "train=soldier attack 0 1",
877+ "produce=scrap_metal_iron"
878 }
879 },
880 upgrade_soldier_attack_1 = {
881@@ -123,7 +126,8 @@
882 "sleep=30000",
883 "check_soldier=soldier attack 1",
884 "consume=ax_broad fish,meat barbarians_bread",
885- "train=soldier attack 1 2"
886+ "train=soldier attack 1 2",
887+ "produce=scrap_metal_iron"
888 }
889 },
890 upgrade_soldier_attack_2 = {
891@@ -134,7 +138,8 @@
892 "sleep=30000",
893 "check_soldier=soldier attack 2",
894 "consume=ax_bronze fish,meat barbarians_bread",
895- "train=soldier attack 2 3"
896+ "train=soldier attack 2 3",
897+ "produce=scrap_metal_iron"
898 }
899 },
900 upgrade_soldier_attack_3 = {
901@@ -145,7 +150,8 @@
902 "sleep=30000",
903 "check_soldier=soldier attack 3",
904 "consume=ax_battle fish,meat:2 barbarians_bread",
905- "train=soldier attack 3 4"
906+ "train=soldier attack 3 4",
907+ "produce=scrap_metal_iron"
908 }
909 },
910 upgrade_soldier_attack_4 = {
911@@ -156,7 +162,8 @@
912 "sleep=30000",
913 "check_soldier=soldier attack 4",
914 "consume=ax_warriors fish,meat barbarians_bread:2",
915- "train=soldier attack 4 5"
916+ "train=soldier attack 4 5",
917+ "produce=scrap_metal_mixed"
918 }
919 },
920 upgrade_soldier_health_0 = {
921@@ -178,7 +185,8 @@
922 "sleep=30000",
923 "check_soldier=soldier health 1",
924 "consume=helmet_mask fish,meat barbarians_bread",
925- "train=soldier health 1 2"
926+ "train=soldier health 1 2",
927+ "produce=scrap_metal_iron"
928 }
929 },
930 upgrade_soldier_health_2 = {
931@@ -189,7 +197,8 @@
932 "sleep=30000",
933 "check_soldier=soldier health 2",
934 "consume=helmet_warhelm fish,meat:2 barbarians_bread",
935- "train=soldier health 2 3"
936+ "train=soldier health 2 3",
937+ "produce=scrap_metal_iron"
938 }
939 },
940 },
941
942=== modified file 'data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua'
943--- data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua 2017-04-06 20:06:06 +0000
944+++ data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua 2018-01-06 10:56:35 +0000
945@@ -58,6 +58,10 @@
946 },
947 outputs = {
948 "empire_soldier",
949+ "scrap_metal_iron",
950+ "scrap_metal_mixed",
951+ "old_chain_armour",
952+ "old_armour"
953 },
954
955 ["soldier attack"] = {
956@@ -117,7 +121,9 @@
957 "sleep=30000",
958 "check_soldier=soldier attack 1",
959 "consume=spear_advanced empire_bread fish,meat",
960- "train=soldier attack 1 2"
961+ "train=soldier attack 1 2",
962+ "produce=scrap_metal_iron"
963+
964 }
965 },
966 upgrade_soldier_attack_2 = {
967@@ -128,7 +134,8 @@
968 "sleep=30000",
969 "check_soldier=soldier attack 2",
970 "consume=spear_heavy empire_bread fish,meat:2",
971- "train=soldier attack 2 3"
972+ "train=soldier attack 2 3",
973+ "produce=scrap_metal_iron"
974 }
975 },
976 upgrade_soldier_attack_3 = {
977@@ -139,7 +146,8 @@
978 "sleep=30000",
979 "check_soldier=soldier attack 3",
980 "consume=spear_war empire_bread:2 fish,meat",
981- "train=soldier attack 3 4"
982+ "train=soldier attack 3 4",
983+ "produce=scrap_metal_mixed"
984 }
985 },
986 upgrade_soldier_health_0 = {
987@@ -172,7 +180,8 @@
988 "sleep=30000",
989 "check_soldier=soldier health 2",
990 "consume=armor_chain empire_bread:2 fish,meat:2",
991- "train=soldier health 2 3"
992+ "train=soldier health 2 3",
993+ "produce=old_armour"
994 }
995 },
996 upgrade_soldier_health_3 = {
997@@ -183,7 +192,8 @@
998 "sleep=30000",
999 "check_soldier=soldier health 3",
1000 "consume=armor_gilded empire_bread:2 fish,meat:2",
1001- "train=soldier health 3 4"
1002+ "train=soldier health 3 4",
1003+ "produce=old_chain_armour"
1004 }
1005 },
1006 },
1007
1008=== modified file 'data/tribes/empire.lua'
1009--- data/tribes/empire.lua 2017-11-25 23:32:30 +0000
1010+++ data/tribes/empire.lua 2018-01-06 10:56:35 +0000
1011@@ -63,7 +63,11 @@
1012 "iron_ore",
1013 "iron",
1014 "gold_ore",
1015- "gold"
1016+ "gold",
1017+ "scrap_metal_iron",
1018+ "scrap_metal_mixed",
1019+ "old_armour",
1020+ "old_chain_armour",
1021 },
1022 {
1023 -- Tools
1024@@ -191,6 +195,7 @@
1025 "empire_fishers_house",
1026 "empire_hunters_house",
1027 "empire_well",
1028+ "empire_armour_recycler",
1029 "empire_scouts_house",
1030
1031 -- Medium
1032@@ -204,6 +209,7 @@
1033 "empire_tavern",
1034 "empire_inn",
1035 "empire_charcoal_kiln",
1036+ "empire_recycling_centre",
1037 "empire_smelting_works",
1038 "empire_toolsmithy",
1039 "empire_armorsmithy",
1040
1041=== modified file 'data/tribes/init.lua'
1042--- data/tribes/init.lua 2017-12-13 07:47:36 +0000
1043+++ data/tribes/init.lua 2018-01-06 10:56:35 +0000
1044@@ -35,6 +35,9 @@
1045 -- ===================================
1046
1047 print_loading_message("┃ Wares", function()
1048+
1049+ include "tribes/wares/scrap_metal_iron/init.lua"
1050+ include "tribes/wares/scrap_metal_mixed/init.lua"
1051 include "tribes/wares/armor/init.lua"
1052 include "tribes/wares/armor_chain/init.lua"
1053 include "tribes/wares/armor_gilded/init.lua"
1054@@ -89,6 +92,8 @@
1055 include "tribes/wares/meal/init.lua"
1056 include "tribes/wares/meat/init.lua"
1057 include "tribes/wares/milking_tongs/init.lua"
1058+ include "tribes/wares/old_armour/init.lua"
1059+ include "tribes/wares/old_chain_armour/init.lua"
1060 include "tribes/wares/pick/init.lua"
1061 include "tribes/wares/planks/init.lua"
1062 include "tribes/wares/quartz/init.lua"
1063@@ -109,6 +114,7 @@
1064 include "tribes/wares/spidercloth/init.lua"
1065 include "tribes/wares/spider_silk/init.lua"
1066 include "tribes/wares/tabard/init.lua"
1067+ include "tribes/wares/tabard_old/init.lua"
1068 include "tribes/wares/tabard_golden/init.lua"
1069 include "tribes/wares/thatch_reed/init.lua"
1070 include "tribes/wares/trident_double/init.lua"
1071@@ -120,6 +126,7 @@
1072 include "tribes/wares/wheat/init.lua"
1073 include "tribes/wares/wine/init.lua"
1074 include "tribes/wares/wool/init.lua"
1075+
1076 end)
1077
1078 -- ===================================
1079@@ -269,6 +276,7 @@
1080 include "tribes/workers/empire/vintner/init.lua"
1081 include "tribes/workers/empire/weaponsmith/init.lua"
1082 include "tribes/workers/empire/weaver/init.lua"
1083+
1084 end)
1085
1086 -- ===================================
1087@@ -308,6 +316,7 @@
1088 include "tribes/buildings/productionsites/atlanteans/fishers_house/init.lua"
1089 include "tribes/buildings/productionsites/atlanteans/fishbreeders_house/init.lua"
1090 include "tribes/buildings/productionsites/atlanteans/hunters_house/init.lua"
1091+ include "tribes/buildings/productionsites/atlanteans/armour_recycler/init.lua"
1092 include "tribes/buildings/productionsites/atlanteans/well/init.lua"
1093 include "tribes/buildings/productionsites/atlanteans/gold_spinning_mill/init.lua"
1094 include "tribes/buildings/productionsites/atlanteans/scouts_house/init.lua"
1095@@ -318,6 +327,7 @@
1096 include "tribes/buildings/productionsites/atlanteans/bakery/init.lua"
1097 include "tribes/buildings/productionsites/atlanteans/charcoal_kiln/init.lua"
1098 include "tribes/buildings/productionsites/atlanteans/smelting_works/init.lua"
1099+ include "tribes/buildings/productionsites/atlanteans/recycling_centre/init.lua"
1100 include "tribes/buildings/productionsites/atlanteans/shipyard/init.lua"
1101 include "tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua"
1102 include "tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua"
1103@@ -357,6 +367,7 @@
1104 include "tribes/buildings/productionsites/barbarians/tavern/init.lua"
1105 include "tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua"
1106 include "tribes/buildings/productionsites/barbarians/smelting_works/init.lua"
1107+ include "tribes/buildings/productionsites/barbarians/recycling_centre/init.lua"
1108 include "tribes/buildings/productionsites/barbarians/shipyard/init.lua"
1109 include "tribes/buildings/productionsites/barbarians/warmill/init.lua"
1110 include "tribes/buildings/productionsites/barbarians/ax_workshop/init.lua"
1111@@ -385,6 +396,7 @@
1112 include "tribes/buildings/productionsites/empire/foresters_house/init.lua"
1113 include "tribes/buildings/productionsites/empire/fishers_house/init.lua"
1114 include "tribes/buildings/productionsites/empire/hunters_house/init.lua"
1115+ include "tribes/buildings/productionsites/empire/armour_recycler/init.lua"
1116 include "tribes/buildings/productionsites/empire/well/init.lua"
1117 include "tribes/buildings/productionsites/empire/scouts_house/init.lua"
1118 -- Empire medium
1119@@ -399,6 +411,7 @@
1120 include "tribes/buildings/productionsites/empire/tavern/init.lua"
1121 include "tribes/buildings/productionsites/empire/charcoal_kiln/init.lua"
1122 include "tribes/buildings/productionsites/empire/smelting_works/init.lua"
1123+ include "tribes/buildings/productionsites/empire/recycling_centre/init.lua"
1124 include "tribes/buildings/productionsites/empire/shipyard/init.lua"
1125 include "tribes/buildings/productionsites/empire/toolsmithy/init.lua"
1126 include "tribes/buildings/productionsites/empire/armorsmithy/init.lua"
1127@@ -420,6 +433,7 @@
1128 include "tribes/buildings/productionsites/empire/marblemine/init.lua"
1129 include "tribes/buildings/productionsites/empire/goldmine_deep/init.lua"
1130 include "tribes/buildings/productionsites/empire/goldmine/init.lua"
1131+
1132 end)
1133
1134 -- ===================================
1135@@ -434,6 +448,7 @@
1136 include "tribes/buildings/trainingsites/empire/colosseum/init.lua"
1137 include "tribes/buildings/trainingsites/empire/arena/init.lua"
1138 include "tribes/buildings/trainingsites/empire/trainingcamp/init.lua"
1139+
1140 end)
1141
1142 -- ===================================
1143@@ -461,6 +476,7 @@
1144 include "tribes/buildings/militarysites/empire/tower/init.lua"
1145 include "tribes/buildings/militarysites/empire/castle/init.lua"
1146 include "tribes/buildings/militarysites/empire/fortress/init.lua"
1147+
1148 end)
1149
1150 -- ===================================
1151@@ -471,7 +487,7 @@
1152 include "tribes/buildings/partially_finished/constructionsite/init.lua"
1153 include "tribes/buildings/partially_finished/dismantlesite/init.lua"
1154 end)
1155-
1156+
1157 -- ===================================
1158 -- Tribes
1159 -- ===================================
1160
1161=== added directory 'data/tribes/wares/old_armour'
1162=== added file 'data/tribes/wares/old_armour/helptexts.lua'
1163--- data/tribes/wares/old_armour/helptexts.lua 1970-01-01 00:00:00 +0000
1164+++ data/tribes/wares/old_armour/helptexts.lua 2018-01-06 10:56:35 +0000
1165@@ -0,0 +1,14 @@
1166+function ware_helptext(tribe)
1167+ local helptext = {
1168+ -- TRANSLATORS: Helptext for a ware: Old Armour
1169+ empire = pgettext("empire_ware", "Basic armour of Empire soldiers. It was produced in the armour smithy and upgraded in the training camp while training soldiers from health level 2 to level 3..")
1170+ }
1171+ local result = ""
1172+ if tribe then
1173+ result = helptext[tribe]
1174+ else
1175+ result = helptext["default"]
1176+ end
1177+ if (result == nil) then result = "" end
1178+ return result
1179+end
1180
1181=== added file 'data/tribes/wares/old_armour/idle.png'
1182Binary files data/tribes/wares/old_armour/idle.png 1970-01-01 00:00:00 +0000 and data/tribes/wares/old_armour/idle.png 2018-01-06 10:56:35 +0000 differ
1183=== added file 'data/tribes/wares/old_armour/init.lua'
1184--- data/tribes/wares/old_armour/init.lua 1970-01-01 00:00:00 +0000
1185+++ data/tribes/wares/old_armour/init.lua 2018-01-06 10:56:35 +0000
1186@@ -0,0 +1,21 @@
1187+dirname = path.dirname(__file__)
1188+
1189+tribes:new_ware_type {
1190+ msgctxt = "ware",
1191+ name = "old_armour",
1192+ -- TRANSLATORS: This is a ware name used in lists of wares
1193+ descname = pgettext("ware", "Old Armour"),
1194+ helptext_script = dirname .. "helptexts.lua",
1195+ icon = dirname .. "menu.png",
1196+ default_target_quantity = {},
1197+ preciousness = {
1198+ empire = 0
1199+ },
1200+
1201+ animations = {
1202+ idle = {
1203+ pictures = path.list_files(dirname .. "idle.png"),
1204+ hotspot = { 5, 10 },
1205+ },
1206+ }
1207+}
1208
1209=== added file 'data/tribes/wares/old_armour/menu.png'
1210Binary files data/tribes/wares/old_armour/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/wares/old_armour/menu.png 2018-01-06 10:56:35 +0000 differ
1211=== added directory 'data/tribes/wares/old_chain_armour'
1212=== added file 'data/tribes/wares/old_chain_armour/helptexts.lua'
1213--- data/tribes/wares/old_chain_armour/helptexts.lua 1970-01-01 00:00:00 +0000
1214+++ data/tribes/wares/old_chain_armour/helptexts.lua 2018-01-06 10:56:35 +0000
1215@@ -0,0 +1,14 @@
1216+function ware_helptext(tribe)
1217+ local helptext = {
1218+ -- TRANSLATORS: Helptext for a ware: Old Chain Armour
1219+ empire = pgettext("empire_ware", "Chain armour is the medium armour for Empire soldiers. Old Chain Armour is produced in a training camp when training soldiers from health level 3 to level 4.")
1220+ }
1221+ local result = ""
1222+ if tribe then
1223+ result = helptext[tribe]
1224+ else
1225+ result = helptext["default"]
1226+ end
1227+ if (result == nil) then result = "" end
1228+ return result
1229+end
1230
1231=== added file 'data/tribes/wares/old_chain_armour/idle.png'
1232Binary files data/tribes/wares/old_chain_armour/idle.png 1970-01-01 00:00:00 +0000 and data/tribes/wares/old_chain_armour/idle.png 2018-01-06 10:56:35 +0000 differ
1233=== added file 'data/tribes/wares/old_chain_armour/init.lua'
1234--- data/tribes/wares/old_chain_armour/init.lua 1970-01-01 00:00:00 +0000
1235+++ data/tribes/wares/old_chain_armour/init.lua 2018-01-06 10:56:35 +0000
1236@@ -0,0 +1,21 @@
1237+dirname = path.dirname(__file__)
1238+
1239+tribes:new_ware_type {
1240+ msgctxt = "ware",
1241+ name = "old_chain_armour",
1242+ -- TRANSLATORS: This is a ware name used in lists of wares
1243+ descname = pgettext("ware", "Old Chain Armour"),
1244+ helptext_script = dirname .. "helptexts.lua",
1245+ icon = dirname .. "menu.png",
1246+ default_target_quantity = {},
1247+ preciousness = {
1248+ empire = 0
1249+ },
1250+
1251+ animations = {
1252+ idle = {
1253+ pictures = path.list_files(dirname .. "idle.png"),
1254+ hotspot = { 5, 10 },
1255+ },
1256+ }
1257+}
1258
1259=== added file 'data/tribes/wares/old_chain_armour/menu.png'
1260Binary files data/tribes/wares/old_chain_armour/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/wares/old_chain_armour/menu.png 2018-01-06 10:56:35 +0000 differ
1261=== added directory 'data/tribes/wares/scrap_metal_iron'
1262=== added file 'data/tribes/wares/scrap_metal_iron/helptexts.lua'
1263--- data/tribes/wares/scrap_metal_iron/helptexts.lua 1970-01-01 00:00:00 +0000
1264+++ data/tribes/wares/scrap_metal_iron/helptexts.lua 2018-01-06 10:56:35 +0000
1265@@ -0,0 +1,14 @@
1266+function ware_helptext(tribe)
1267+ local helptext = {
1268+ -- TRANSLATORS: Helptext for a ware: Scrap metal (iron)
1269+ frisians = pgettext("frisians_ware", "Discarded weapon and armour can be recycled in a recycling centre to produce new tools, weapon and armour.")
1270+ }
1271+ local result = ""
1272+ if tribe then
1273+ result = helptext[tribe]
1274+ else
1275+ result = helptext["default"]
1276+ end
1277+ if (result == nil) then result = "" end
1278+ return result
1279+end
1280
1281=== added file 'data/tribes/wares/scrap_metal_iron/idle.png'
1282Binary files data/tribes/wares/scrap_metal_iron/idle.png 1970-01-01 00:00:00 +0000 and data/tribes/wares/scrap_metal_iron/idle.png 2018-01-06 10:56:35 +0000 differ
1283=== added file 'data/tribes/wares/scrap_metal_iron/init.lua'
1284--- data/tribes/wares/scrap_metal_iron/init.lua 1970-01-01 00:00:00 +0000
1285+++ data/tribes/wares/scrap_metal_iron/init.lua 2018-01-06 10:56:35 +0000
1286@@ -0,0 +1,21 @@
1287+dirname = path.dirname(__file__)
1288+
1289+tribes:new_ware_type {
1290+ msgctxt = "ware",
1291+ name = "scrap_metal_iron",
1292+ -- TRANSLATORS: This is a ware name used in lists of wares
1293+ descname = pgettext("ware", "Scrap Metal (Iron)"),
1294+ helptext_script = dirname .. "helptexts.lua",
1295+ icon = dirname .. "menu.png",
1296+ default_target_quantity = {},
1297+ preciousness = {
1298+ frisians = 0
1299+ },
1300+
1301+ animations = {
1302+ idle = {
1303+ pictures = path.list_files(dirname .. "idle.png"),
1304+ hotspot = { 7, 9 },
1305+ },
1306+ }
1307+}
1308
1309=== added file 'data/tribes/wares/scrap_metal_iron/menu.png'
1310Binary files data/tribes/wares/scrap_metal_iron/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/wares/scrap_metal_iron/menu.png 2018-01-06 10:56:35 +0000 differ
1311=== added directory 'data/tribes/wares/scrap_metal_mixed'
1312=== added file 'data/tribes/wares/scrap_metal_mixed/helptexts.lua'
1313--- data/tribes/wares/scrap_metal_mixed/helptexts.lua 1970-01-01 00:00:00 +0000
1314+++ data/tribes/wares/scrap_metal_mixed/helptexts.lua 2018-01-06 10:56:35 +0000
1315@@ -0,0 +1,14 @@
1316+function ware_helptext(tribe)
1317+ local helptext = {
1318+ -- TRANSLATORS: Helptext for a ware: Scrap metal (mixed)
1319+ frisians = pgettext("frisians_ware", "Discarded weapon and armour can be recycled in a recycling centre to produce new tools, weapon and armour.")
1320+ }
1321+ local result = ""
1322+ if tribe then
1323+ result = helptext[tribe]
1324+ else
1325+ result = helptext["default"]
1326+ end
1327+ if (result == nil) then result = "" end
1328+ return result
1329+end
1330
1331=== added file 'data/tribes/wares/scrap_metal_mixed/idle.png'
1332Binary files data/tribes/wares/scrap_metal_mixed/idle.png 1970-01-01 00:00:00 +0000 and data/tribes/wares/scrap_metal_mixed/idle.png 2018-01-06 10:56:35 +0000 differ
1333=== added file 'data/tribes/wares/scrap_metal_mixed/init.lua'
1334--- data/tribes/wares/scrap_metal_mixed/init.lua 1970-01-01 00:00:00 +0000
1335+++ data/tribes/wares/scrap_metal_mixed/init.lua 2018-01-06 10:56:35 +0000
1336@@ -0,0 +1,21 @@
1337+dirname = path.dirname(__file__)
1338+
1339+tribes:new_ware_type {
1340+ msgctxt = "ware",
1341+ name = "scrap_metal_mixed",
1342+ -- TRANSLATORS: This is a ware name used in lists of wares
1343+ descname = pgettext("ware", "Scrap Metal (Mixed)"),
1344+ helptext_script = dirname .. "helptexts.lua",
1345+ icon = dirname .. "menu.png",
1346+ default_target_quantity = {},
1347+ preciousness = {
1348+ frisians = 1
1349+ },
1350+
1351+ animations = {
1352+ idle = {
1353+ pictures = path.list_files(dirname .. "idle.png"),
1354+ hotspot = { 7, 9 },
1355+ },
1356+ }
1357+}
1358
1359=== added file 'data/tribes/wares/scrap_metal_mixed/menu.png'
1360Binary files data/tribes/wares/scrap_metal_mixed/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/wares/scrap_metal_mixed/menu.png 2018-01-06 10:56:35 +0000 differ
1361=== added directory 'data/tribes/wares/tabard_old'
1362=== added file 'data/tribes/wares/tabard_old/helptexts.lua'
1363--- data/tribes/wares/tabard_old/helptexts.lua 1970-01-01 00:00:00 +0000
1364+++ data/tribes/wares/tabard_old/helptexts.lua 2018-01-06 10:56:35 +0000
1365@@ -0,0 +1,14 @@
1366+function ware_helptext(tribe)
1367+ local helptext = {
1368+ -- TRANSLATORS: Helptext for a ware: Tabard
1369+ atlanteans = pgettext("atlanteans_ware", "A tabard and a light trident are the basic equipment for young soldiers. Tabards are produced in the weaving mill.")
1370+ }
1371+ local result = ""
1372+ if tribe then
1373+ result = helptext[tribe]
1374+ else
1375+ result = helptext["default"]
1376+ end
1377+ if (result == nil) then result = "" end
1378+ return result
1379+end
1380
1381=== added file 'data/tribes/wares/tabard_old/idle.png'
1382Binary files data/tribes/wares/tabard_old/idle.png 1970-01-01 00:00:00 +0000 and data/tribes/wares/tabard_old/idle.png 2018-01-06 10:56:35 +0000 differ
1383=== added file 'data/tribes/wares/tabard_old/init.lua'
1384--- data/tribes/wares/tabard_old/init.lua 1970-01-01 00:00:00 +0000
1385+++ data/tribes/wares/tabard_old/init.lua 2018-01-06 10:56:35 +0000
1386@@ -0,0 +1,21 @@
1387+dirname = path.dirname(__file__)
1388+
1389+tribes:new_ware_type {
1390+ msgctxt = "ware",
1391+ name = "tabard_old",
1392+ -- TRANSLATORS: This is a ware name used in lists of wares
1393+ descname = pgettext("ware", "Tabard used"),
1394+ helptext_script = dirname .. "helptexts.lua",
1395+ icon = dirname .. "menu.png",
1396+ default_target_quantity = {},
1397+ preciousness = {
1398+ atlanteans = 0
1399+ },
1400+
1401+ animations = {
1402+ idle = {
1403+ pictures = path.list_files(dirname .. "idle.png"),
1404+ hotspot = { 5, 10 },
1405+ },
1406+ }
1407+}
1408
1409=== added file 'data/tribes/wares/tabard_old/menu.png'
1410Binary files data/tribes/wares/tabard_old/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/wares/tabard_old/menu.png 2018-01-06 10:56:35 +0000 differ

Subscribers

People subscribed via source and target branches

to status/vote changes: