Merge lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands

Proposed by GunChleoc on 2018-07-24
Status: Merged
Merged at revision: 8823
Proposed branch: lp:~widelands-dev/widelands/mines-worldsavior
Merge into: lp:widelands
Diff against target: 2981 lines (+958/-490)
70 files modified
data/campaigns/emp04.wmf/scripting/tribes/farm2.lua (+1/-1)
data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua (+6/-6)
data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua (+34/-10)
data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua (+70/-34)
data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua (+22/-10)
data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua (+24/-8)
data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua (+2/-4)
data/tribes/buildings/productionsites/atlanteans/smokery/init.lua (+2/-6)
data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua (+19/-31)
data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua (+15/-15)
data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua (+8/-11)
data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua (+9/-9)
data/tribes/buildings/productionsites/barbarians/big_inn/init.lua (+7/-6)
data/tribes/buildings/productionsites/barbarians/coalmine/init.lua (+20/-3)
data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua (+23/-7)
data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua (+24/-7)
data/tribes/buildings/productionsites/barbarians/goldmine/init.lua (+2/-1)
data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua (+23/-7)
data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua (+23/-7)
data/tribes/buildings/productionsites/barbarians/granitemine/init.lua (+21/-4)
data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua (+9/-9)
data/tribes/buildings/productionsites/barbarians/inn/init.lua (+1/-2)
data/tribes/buildings/productionsites/barbarians/ironmine/init.lua (+2/-1)
data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua (+21/-5)
data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua (+22/-8)
data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua (+2/-4)
data/tribes/buildings/productionsites/barbarians/tavern/init.lua (+4/-2)
data/tribes/buildings/productionsites/barbarians/warmill/init.lua (+18/-18)
data/tribes/buildings/productionsites/empire/armorsmithy/init.lua (+13/-12)
data/tribes/buildings/productionsites/empire/coalmine/init.lua (+22/-7)
data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua (+24/-7)
data/tribes/buildings/productionsites/empire/goldmine/init.lua (+19/-5)
data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua (+20/-5)
data/tribes/buildings/productionsites/empire/inn/init.lua (+5/-6)
data/tribes/buildings/productionsites/empire/ironmine/init.lua (+20/-5)
data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua (+23/-7)
data/tribes/buildings/productionsites/empire/marblemine/init.lua (+48/-18)
data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua (+31/-7)
data/tribes/buildings/productionsites/empire/smelting_works/init.lua (+2/-4)
data/tribes/buildings/productionsites/empire/tavern/init.lua (+3/-2)
data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua (+15/-15)
data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua (+9/-9)
data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua (+10/-9)
data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua (+12/-12)
data/tribes/buildings/productionsites/frisians/coalmine/init.lua (+20/-3)
data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua (+26/-13)
data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua (+6/-3)
data/tribes/buildings/productionsites/frisians/furnace/init.lua (+2/-4)
data/tribes/buildings/productionsites/frisians/goldmine/init.lua (+2/-1)
data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua (+24/-7)
data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua (+3/-3)
data/tribes/buildings/productionsites/frisians/ironmine/init.lua (+2/-1)
data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua (+26/-7)
data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua (+3/-3)
data/tribes/buildings/productionsites/frisians/recycling_center/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/rockmine/init.lua (+19/-5)
data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua (+26/-10)
data/tribes/buildings/productionsites/frisians/sewing_room/init.lua (+2/-1)
data/tribes/buildings/productionsites/frisians/smokery/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua (+6/-4)
data/tribes/buildings/productionsites/frisians/tavern/init.lua (+8/-4)
data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua (+1/-0)
data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua (+1/-0)
data/tribes/buildings/trainingsites/empire/arena/init.lua (+1/-1)
data/tribes/buildings/trainingsites/empire/colosseum/init.lua (+1/-0)
data/tribes/buildings/trainingsites/frisians/training_arena/init.lua (+1/-0)
data/tribes/scripting/help/ware_help.lua (+55/-44)
data/txts/developers.json (+1/-0)
src/logic/map_objects/tribes/production_program.cc (+4/-3)
src/logic/map_objects/tribes/worker.cc (+4/-3)
To merge this branch: bzr merge lp:~widelands-dev/widelands/mines-worldsavior
Reviewer Review Type Date Requested Status
GunChleoc Approve on 2018-09-11
Toni Förster Approve on 2018-09-03
hessenfarmer Resubmit on 2018-08-07
Benedikt Straub review 2018-07-24 Approve on 2018-07-26
Review via email: mp+350716@code.launchpad.net

Commit message

Diverse balancing tweaks for productionsites
- Honey Bread Bakery now only ignores economy requirements when producing
  Honeybread and the workers need experience. Same goes for Mead Brewery.
- All Smelting Works, Furnaces, Smokeries, Recycling Center, Altantean and
  Frisian Toolsmithies, Taverns, Inns and Drinking Halls no longer waste time
  if a ware is missing and they ave to skip a program.
- Tweaked programs for Weapon/Armor producing buildings
- Imperial Armor Smithy produces 1 more Helm per run to balance the amount of
  armor types for training.
- Changed the order of programs in the Atlantean Toolsmithy
- Improved efficiency for Frisian Deep Mines to align with the efficiency of
  the corresponding Barbarian mines
- Gave the Barbarian Deep Gold Mine the same stats as the Deep Iron Mine

To post a comment you must log in.
Benedikt Straub (nordfriese) wrote :

Reviewed the code, added a lot of small comments for code style. Feel free to ignore.
Also found a typo in the frisian deep gold mine and a possible bug in the design of all mines, please fix.

Is it really intended that the frisian deep gold and iron mines produce gold and iron directly now, rather than ores???

review: Needs Fixing (review)
hessenfarmer (stephan-lutz) wrote :

Agree to most of Nordfrieses Comments

stats are looking much better now in the Excel. will upload them to the bug ASAP

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3718. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/407539420.
Appveyor build 3518. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3518.

Benedikt Straub (nordfriese) wrote :

Found another issue: For the buildings where the penalty for missing wares has been removed, the program order is now:
  "return=skipped unless economy needs <ware>",
  "consume=<wares>",
  "animate=working <time>",
  "sleep=<time>",
  "produce=<wares>"
The last two lines should be switched here for all those buildings. It´ll look strange if the building works, then nothing happens, much later after some sleeptime a ware is produced.

hessenfarmer (stephan-lutz) wrote :

I agree to Nordfrieses last comment.
Just ignore my commet about worker experience didn't see that it is the upgraded building.

We should document the new philosophy of the mines preferably in the RST section:
- now one ressource on the map delivers exactly one ware
- the probability is now calculated over the complete work cycle and implemented in the first mine command
- all working animations are put at the beginning of the command cycle.

I will try to playtest These values with the AI as this Change might have an Impact on AI due to different stats if depleted.

Thanks to WorldSavior for the changes

hessenfarmer (stephan-lutz) wrote :

found an error which prevented playtesting
will fix the errors and upload within an hour so please do not upload anything until then.

8769. By hessenfarmer on 2018-07-24

fixes initial comments on lp

8770. By hessenfarmer on 2018-07-24

small syntax fix

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3721. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/407778348.
Appveyor build 3521. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3521.

8771. By hessenfarmer on 2018-07-25

adjusted frisian weapon production to balance with changes of other tribes
added trainingsites_max_percent ai_hint to the fastest trainingsite of each tribe due to calculations for the balancing

hessenfarmer (stephan-lutz) wrote :

Ok yesterday I fixed all diff comments from Nordfriese and me. (Hope I caught all of them)
Did a testrun of 4 Ai (one of each tribe) on Full moon map. No anomalies showed up in the first 3 hours. Although no mine got depleted so I couldn't get the stats of a depleted mine. Ai was working ok.
Did some updates to my excel calculations about the needed Buildings to supply the soldier production. I uploaded the excel file to the frisians balancing bug. The calculations showed that we needed to adjust frisian weapon production times a lot. I entered values of comparable weapons of the other tribes. And added them to lua.

Furthermore I discovered that we should set the trainingsite percentage of at least one trainingsite for each tribe due to their different full cycle time (e.g. for barbarians the trainingcamp does need 240 seconds for a whole cycle while the arena does need only 60 which means the arena could supply 4 camps with fully trained soldiers) so I fixed this on the fly.
From my side the branch could be ready now pending further review of my late changes.

review: Resubmit
Benedikt Straub (nordfriese) wrote :

Found no more errors, changes look sensible. Didn´t test.

review: Approve (review)
hessenfarmer (stephan-lutz) wrote :

After discussing this in the Forum the marble mine probability settings need to be changed back to 20%.
found another issue in the code of the mine program
in lines following
https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/logic/map_objects/tribes/production_program.cc#L1164

a penalty for depleting fields is defined. this leads to a failed production program without taking into account the chance when depleted. see line
https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/logic/map_objects/tribes/production_program.cc#L1214

so the situation where 2 mined resources could be thrown away (3rd mining step failing seem to be much more frequent than I thought. This effect will be worse the bigger the radius is (worst for Atlanteans) So we need to consider this in the programs probably or we need to change the mining code

review: Needs Fixing
GunChleoc (gunchleoc) wrote :

> We should document the new philosophy of the mines preferably in the RST section:
> - now one ressource on the map delivers exactly one ware
> - the probability is now calculated over the complete work cycle and implemented in the first mine command
> - all working animations are put at the beginning of the command cycle.

Good idea - make sure that it gets phrased as a string recommendation rather than a guarantee, since there is no implementation enforcing it. also a little howto on how to calculate the probability?

hessenfarmer (stephan-lutz) wrote :

I have some proposals to fix the issues discovered.
see my latest post in
https://wl.widelands.org/forum/topic/4232/?page=8#post-25429

in short the mine programs should look like

   programs = {
      work = {
         -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
         descname = _"mining coal",
         actions = {
            "sleep=40000",
            "return=skipped unless economy needs coal",
            "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
            "animate=working 60000",
            "call=mine_produce",
            "call=mine_produce",
            "call=mine_produce",
            "call=mine_produce",
            "call=mine_produce",
            "call=mine_produce",
            "call=mine_produce",

         }
      },
      mine_produce = {
         -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
         descname = _"mining and producing",
         actions = {
            "sleep=1000",
            "mine=coal 4 100 5 2",
            "produce=coal",
      },
   },

Additionally the penalty for totally depleted fields should be removed in
https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/logic/map_objects/tribes/production_program.cc#L1214
last but not least statistics have to be fixed and the production return_string should be defined at the end of the complete "work programm" at least for the mines.

8772. By hessenfarmer on 2018-08-01

adopted all multi ware producing mines to new logic
kept all timings from WorldSavior

8773. By hessenfarmer on 2018-08-01

removed mining chance penalty for depleted fields or fields with wrong ressource

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3746. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/411028029.
Appveyor build 3546. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3546.

8774. By hessenfarmer on 2018-08-01

did the same fix for the worker program just in case this program is used

8775. By hessenfarmer on 2018-08-02

added return=skipped to the calling programs to get better statistics

8776. By hessenfarmer on 2018-08-02

merged trunk at rev 8773

8777. By hessenfarmer on 2018-08-04

fixed trailing whitespaces

8778. By hessenfarmer on 2018-08-04

fixed declaration order of programs

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3757. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/412175411.
Appveyor build 3557. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3557.

hessenfarmer (stephan-lutz) wrote :

Ok did some playtesting. Programs work fine. mine statistics seem to be much better now (e.g. around 5% when depleted). Atlanteans mines deplete faster now while still having some problems finding the last bit.
Should be ok now.

review: Resubmit
8779. By kaputtnik on 2018-08-10

merged trunk

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3764. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/414390985.
Appveyor build 3563. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3563.

8780. By Toni Förster on 2018-08-12

merge lp:~stonerl/widelands/big_inn_missing_animation_fixed

8781. By GunChleoc on 2018-08-15

Use working animations for the barbarians wood hardener.

They where in place but idle animation were used instead.

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3808. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/416273240.
Appveyor build 3607. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3607.

GunChleoc (gunchleoc) wrote :

Is this ready for merging?

hessenfarmer (stephan-lutz) wrote :

In principle Yes. Needs some reviews however and I can't do this for my own stuff.

Toni Förster (stonerl) wrote :

The atlantian's crystalmine has the sleep between the conditional "return=skipped" and "consume" while all other mines(for all tribes) have it before the return=skipped. Which one is correct? Also I remember that this penalty was removed e.g. for the taverns. Why is it still in place for all the mines except this one?

hessenfarmer (stephan-lutz) wrote :

I agree that is somewhat not very streamlined. The difference for the crystalline is that it produces different outputs while normal mindshare producing only one. So the current design doesn't do that much harm but we should keep this consistent.
I from my perspective a beginning sleep of 5 seconds for all mines except crystal and marble mine would be ok. Rest of the sleep time should be moved before the call commands.

8782. By Toni Förster on 2018-08-21

streamlined sleep times for mines

8783. By Toni Förster on 2018-08-21

merged trunk

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3828. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/418892074.
Appveyor build 3627. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3627.

8784. By Toni Förster on 2018-08-22

merged trunk

Toni Förster (stonerl) wrote :

One question regarding the shipyards. It takes 16 steps to complete a ship. But 20 to reach 100% productivity. That somehow doesn't feel right; having built an entire ship but only 80% productivity.

What about moving the animation to the work program and remove the return from there to have statistics calculated. Instead move the sleep to the ship program.

It's like in the real world: preparing parts in the workshop, packinge them move to the dock, assemble them.

One step in building a ship would then gain 10% in productivity.

hessenfarmer (stephan-lutz) wrote :

I think we should discuss this in the forum. I see the point but I believe your proposed solution would result in unreliable stats in the case that not enough construction material is delivered to the shipyard.
Furthermore I think we should not have this in this branch cause it got already much bigger than its title suggests. I really would like if somebody could review the changes and approve this one. Still hope for Worldsaviors opinion over the forum (he has no Launchpad account).

GunChleoc (gunchleoc) wrote :

Agreed. This branch should only get tweaks to changes that are already in it. @Toni, would you like to review hessenfarmer's work?

Toni Förster (stonerl) wrote :

I already had a look at some of the changes made here. From my side it looks okay so far. Any particular I have to look at?

Toni Förster (stonerl) wrote :

LGTM

review: Approve
8785. By GunChleoc on 2018-09-05

Merged trunk.

8786. By GunChleoc on 2018-09-05

Fix descnames

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3897. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/424658912.
Appveyor build 3695. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3695.

GunChleoc (gunchleoc) wrote :

The wares cannot be fixed without a bug overhaul of the production program code, and it's too late in the release cycle to do that now. The only alternative would be some really really ugly hacks, which I don't want to do.

The problem is that the consumed wares are not in the same programs as the produced wares.

I propose that we split off all the changes that don't create this problem into a new branch and merge that one.

review: Needs Fixing
hessenfarmer (stephan-lutz) wrote :

The changes creating the problem are the heart of this change, cause they fix a lot of weird behaviour in the mines as well as adjusting timings for better balance.

Therefore I would vote for having the branch as it is and just adding a note to the encyclopedia window and to the release notes that the values for all mined products aren't correct. Perhaps we can make the homepage show the correct values otherwise we need to find another way to inform the players about this.

For me it seems better to have consistent mines with a lot less issues and have an issue with the encyclopedia instead.

GunChleoc (gunchleoc) wrote :

I'll see about programming a filter into the help's Lua script.

8787. By GunChleoc on 2018-09-08

Repace wares consumed/produced string for mines with "Calculation needed" in the encyclopedia.

GunChleoc (gunchleoc) wrote :

It will now show "Calculation needed" if the building is a mine, and the produced and consumed wares as usual for all other buildings.

review: Resubmit
hessenfarmer (stephan-lutz) wrote :

Should be ok for the moment being.
I was thinking of a solution to count the call's for a production program to have the correct amount. and display the consume information of the calling program.
But at the moment I am still struggling how to asses the production programs tables in lua.

Any hints would be welcome but this can easily be done in a follow on branch.

GunChleoc (gunchleoc) wrote :

If it could be done easily, I would have already done it. I actually started coding for it and then reverted my changes, because it became pretty hacky and complicated very fast.

We need a proper tree structure for production programs - it's a good idea to have one anyway, since that will also get rid of the problem that you had with the program names regarding in which order they are loaded by the engine. Replacing the "call" program with nested tables is the way to go.

@bunnybot merge

8788. By hessenfarmer on 2018-09-08

fixed the encyclopedia for the mines

hessenfarmer (stephan-lutz) wrote :

I found a solution to have the correct values in the encyclopedia. Maybe it is not very elegant but it is at least working until we have the redesign. See if you want to have it.

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3918. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426311064.
Appveyor build 3716. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3716.

bunnybot (widelandsofficial) wrote :
Download full text (5.1 KiB)

Error merging this proposal:

Output:
stdout:

stderr:
 M data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua
 M data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
 M data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua
 M data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua
 M data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua
 M data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua
 M data/tribes/buildings/productionsites/atlanteans/smokery/init.lua
 M data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua
 M data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua
 M data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua
 M data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua
 M data/tribes/buildings/productionsites/barbarians/big_inn/init.lua
 M data/tribes/buildings/productionsites/barbarians/coalmine/init.lua
 M data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua
 M data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua
 M data/tribes/buildings/productionsites/barbarians/goldmine/init.lua
 M data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua
 M data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua
 M data/tribes/buildings/productionsites/barbarians/granitemine/init.lua
 M data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua
 M data/tribes/buildings/productionsites/barbarians/inn/init.lua
 M data/tribes/buildings/productionsites/barbarians/ironmine/init.lua
 M data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua
 M data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua
 M data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua
 M data/tribes/buildings/productionsites/barbarians/tavern/init.lua
 M data/tribes/buildings/productionsites/barbarians/warmill/init.lua
 M data/tribes/buildings/productionsites/empire/armorsmithy/init.lua
 M data/tribes/buildings/productionsites/empire/coalmine/init.lua
 M data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua
 M data/tribes/buildings/productionsites/empire/goldmine/init.lua
 M data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua
 M data/tribes/buildings/productionsites/empire/inn/init.lua
 M data/tribes/buildings/productionsites/empire/ironmine/init.lua
 M data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua
 M data/tribes/buildings/productionsites/empire/marblemine/init.lua
 M data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua
 M data/tribes/buildings/productionsites/empire/smelting_works/init.lua
 M data/tribes/buildings/productionsites/empire/tavern/init.lua
 M data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua
 M data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua
 M data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua
 M data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua
 M data/tribes/buildings/productio...

Read more...

8789. By Toni Förster on 2018-09-10

merge trunk and resolve conflicts

8790. By Toni Förster on 2018-09-10

added missing return=no_stats after trunk merge

Toni Förster (stonerl) wrote :

I do have one question regarding the empire.

The armorsmithy produces 2 armor_helmet with the changes made in this branch, instead of one. The question I have is: why does the trainingcamp need helmets? The soldiers are already equipped with one.

The barbarians for example don't have a helmet when they start as a soldier they just need an ax and when they level up the receive new improved gear.

Why not go the same route with the empire?

Option 1:

Normal soldiers receive only a wooden spear but no helmet.
When they level up they receive their helmets.

Option 2:

Normal soldiers receive a wooden spear and helmet, but the trainingcamp doesn't need one.

I just noticed this while merging trunk and fixing merge conflicts.

hessenfarmer (stephan-lutz) wrote :

I don't know why this is the case. and yes this is really illogical, ut I know that changing this would affect balancing directly as the empire would need one item less to build fully trained soldiers.
The idea behind the balance of tribes is to some extent based on equal costs.
Nevertheless I will search the forum for a reason / thread. I am open to change this in build 21 while keeping the balance. But this needs proper evaluation.
So feel free to start / continue a forum discussion and open a bug to not forget the issue.

bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3929. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/426668190.
Appveyor build 3727. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3727.

GunChleoc (gunchleoc) wrote :

Code with the dummy program LGTM. Can you please add a TODO comment to the wares help in order to document that it's a hack and waiting for an engine redesign on the production programs?

Not tested yet.

8791. By GunChleoc on 2018-09-11

Added TODO comment.

8792. By GunChleoc on 2018-09-11

Merged trunk.

GunChleoc (gunchleoc) wrote :

Tested now and TODO comment added

@bunnybot merge

review: Approve
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3939. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/427302588.
Appveyor build 3737. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3737.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/farm2.lua'
2--- data/campaigns/emp04.wmf/scripting/tribes/farm2.lua 2018-08-22 06:48:57 +0000
3+++ data/campaigns/emp04.wmf/scripting/tribes/farm2.lua 2018-09-11 16:57:31 +0000
4@@ -46,7 +46,7 @@
5 actions = {
6 "call=plant",
7 "call=harvest",
8- "return=skipped"
9+ "return=no_stats"
10 }
11 },
12 plant = {
13
14=== modified file 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
15--- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2018-09-06 08:21:35 +0000
16+++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2018-09-11 16:57:31 +0000
17@@ -151,11 +151,11 @@
18 -- TRANSLATORS: Completed/Skipped/Did not start forging a steel shield because ...
19 descname = _"forging a steel shield",
20 actions = {
21- -- time total: 90
22+ -- time total: 67 + 3.6
23 "return=skipped unless economy needs shield_steel",
24- "sleep=45000", -- +13 enlarge
25 "consume=iron:2 coal:2",
26- "animate=working 45000", -- +10 enlarge
27+ "sleep=32000",
28+ "animate=working 35000",
29 "produce=shield_steel"
30 }
31 },
32@@ -163,11 +163,11 @@
33 -- TRANSLATORS: Completed/Skipped/Did not start forging an advanced shield because ...
34 descname = _"forging an advanced shield",
35 actions = {
36- -- time total: 110
37+ -- time total: 77 + 3.6
38 "return=skipped unless economy needs shield_advanced",
39 "consume=iron:2 coal:2 gold",
40- "sleep=50000", -- +18 enlarge
41- "animate=working 60000", -- +15 enlarge
42+ "sleep=32000",
43+ "animate=working 45000",
44 "produce=shield_advanced"
45 }
46 },
47
48=== modified file 'data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua'
49--- data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2017-09-03 07:59:51 +0000
50+++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2018-09-11 16:57:31 +0000
51@@ -57,21 +57,45 @@
52 -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
53 descname = _"mining coal",
54 actions = {
55- "sleep=45000",
56+ -- time total: 105 + 7 x 3.6
57+ "sleep=5000",
58 "return=skipped unless economy needs coal",
59 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
60- "animate=working 20000",
61- "mine=coal 4 100 5 2",
62- "produce=coal:2",
63- "animate=working 20000",
64- "mine=coal 4 100 5 2",
65- "produce=coal:2",
66- "animate=working 20000",
67- "mine=coal 4 100 5 2",
68- "produce=coal:3"
69+ "sleep=30000",
70+ -- after having the food the miners are working 7 times
71+ -- each cycle lasts 10 seconds for mining and producing coal
72+ -- and 3.6 seconds to deliver the coal to the flag
73+ -- calling the subroutine "mine_produce" has the effect
74+ -- that even when depleted the mine has 7 working cycles
75+ -- as no call cycle is skipped due to a failed mine command
76+ "call=mine_produce",
77+ "call=mine_produce",
78+ "call=mine_produce",
79+ "call=mine_produce",
80+ "call=mine_produce",
81+ "call=mine_produce",
82+ "call=mine_produce",
83+ "return=no_stats"
84+ },
85+ },
86+ mine_produce = {
87+ descname = _"mining coal",
88+ actions = {
89+ "animate=working 10000",
90+ "mine=coal 4 100 5 2",
91+ "produce=coal",
92+ }
93+ },
94+ encyclopedia = {
95+ -- just a dummy program to fix encyclopedia
96+ descname = "encyclopedia",
97+ actions = {
98+ "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
99+ "produce=coal:7",
100 }
101 },
102 },
103+
104 out_of_resource_notification = {
105 -- Translators: Short for "Out of ..." for a resource
106 title = _"No Coal",
107
108=== modified file 'data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua'
109--- data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua 2018-09-06 08:21:35 +0000
110+++ data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua 2018-09-11 16:57:31 +0000
111@@ -71,20 +71,15 @@
112 descname = _"mining granite",
113 actions = {
114 "return=skipped unless economy needs granite",
115- "sleep=45000",
116+ "sleep=40000",
117 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
118- "animate=working 20000",
119- "mine=stones 4 100 5 2",
120- "produce=granite:2",
121- "animate=working 20000",
122- "mine=stones 4 100 5 2",
123- "produce=granite:2",
124- "animate=working 20000",
125- "mine=stones 4 100 5 2",
126- "produce=granite",
127- "animate=working 20000",
128- "mine=stones 4 100 5 2",
129- "produce=quartz"
130+ "call=a_mine_produce_granite",
131+ "call=a_mine_produce_granite",
132+ "call=a_mine_produce_granite",
133+ "call=a_mine_produce_quartz",
134+ "call=a_mine_produce_granite",
135+ "call=a_mine_produce_granite",
136+ "return=no_stats"
137 }
138 },
139 mine_quartz = {
140@@ -92,17 +87,15 @@
141 descname = _"mining quartz",
142 actions = {
143 "return=skipped unless economy needs quartz",
144- "sleep=45000",
145+ "sleep=30000",
146 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
147- "animate=working 20000",
148- "mine=stones 4 100 5 2",
149- "produce=granite quartz",
150- "animate=working 20000",
151- "mine=stones 4 100 5 2",
152- "produce=granite:2",
153- "animate=working 20000",
154- "mine=stones 4 100 5 2",
155- "produce=quartz:2"
156+ "call=a_mine_produce_quartz",
157+ "call=a_mine_produce_granite",
158+ "call=a_mine_produce_granite",
159+ "call=a_mine_produce_granite",
160+ "call=a_mine_produce_quartz",
161+ "call=a_mine_produce_quartz",
162+ "return=no_stats"
163 }
164 },
165 mine_diamond = {
166@@ -110,17 +103,60 @@
167 descname = _"mining diamonds",
168 actions = {
169 "return=skipped unless economy needs diamond",
170- "sleep=45000",
171- "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
172- "animate=working 20000",
173- "mine=stones 4 100 5 2",
174- "produce=diamond",
175- "animate=working 20000",
176- "mine=stones 4 100 5 2",
177- "produce=diamond",
178- "animate=working 20000",
179- "mine=stones 4 100 5 2",
180- "produce=granite"
181+ "sleep=40000",
182+ "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
183+ "call=a_mine_produce_diamond",
184+ "call=a_mine_produce_granite",
185+ "call=a_mine_produce_diamond",
186+ "return=no_stats"
187+ }
188+ },
189+ a_mine_produce_granite = {
190+ descname = _"mining granite",
191+ actions = {
192+ "animate=working 15000",
193+ "mine=stones 4 100 5 2",
194+ "produce=granite",
195+ }
196+ },
197+ a_mine_produce_quartz = {
198+ descname = _"mining quartz",
199+ actions = {
200+ "animate=working 10000",
201+ "mine=stones 4 100 5 2",
202+ "produce=quartz",
203+ }
204+ },
205+ a_mine_produce_diamond = {
206+ descname = _"mining diamonds",
207+ actions = {
208+ "animate=working 25000",
209+ "mine=stones 4 100 5 2",
210+ "produce=diamond",
211+ }
212+ },
213+ encyclopedia_granite = {
214+ -- just a dummy program to fix encyclopedia
215+ descname = "encyclopedia",
216+ actions = {
217+ "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
218+ "produce=granite:5 quartz",
219+ }
220+ },
221+ encyclopedia_quartz = {
222+ -- just a dummy program to fix encyclopedia
223+ descname = "encyclopedia",
224+ actions = {
225+ "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
226+ "produce=quartz:3 granite:3",
227+ }
228+ },
229+ encyclopedia_diamond = {
230+ -- just a dummy program to fix encyclopedia
231+ descname = "encyclopedia",
232+ actions = {
233+ "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
234+ "produce=diamond:2 granite",
235 }
236 },
237 },
238
239=== modified file 'data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua'
240--- data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua 2016-09-03 14:59:10 +0000
241+++ data/tribes/buildings/productionsites/atlanteans/goldmine/init.lua 2018-09-11 16:57:31 +0000
242@@ -57,18 +57,30 @@
243 -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
244 descname = _"mining gold",
245 actions = {
246- "sleep=45000",
247+ "sleep=5000",
248 "return=skipped unless economy needs gold_ore",
249 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
250- "animate=working 20000",
251- "mine=gold 4 100 5 2",
252- "produce=gold_ore",
253- "animate=working 20000",
254- "mine=gold 4 100 5 2",
255- "produce=gold_ore",
256- "animate=working 20000",
257- "mine=gold 4 100 5 2",
258- "produce=gold_ore"
259+ "sleep=34000",
260+ "call=mine_produce",
261+ "call=mine_produce",
262+ "call=mine_produce",
263+ "return=no_stats"
264+ }
265+ },
266+ mine_produce = {
267+ descname = _"mining gold",
268+ actions = {
269+ "animate=working 22000",
270+ "mine=gold 4 100 5 2",
271+ "produce=gold_ore",
272+ }
273+ },
274+ encyclopedia = {
275+ -- just a dummy program to fix encyclopedia
276+ descname = "encyclopedia",
277+ actions = {
278+ "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
279+ "produce=gold_ore:3",
280 }
281 },
282 },
283
284=== modified file 'data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua'
285--- data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua 2018-03-04 14:11:19 +0000
286+++ data/tribes/buildings/productionsites/atlanteans/ironmine/init.lua 2018-09-11 16:57:31 +0000
287@@ -57,21 +57,37 @@
288 -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
289 descname = _"mining iron",
290 actions = {
291- "sleep=45000",
292+ -- time total: 105 + 5 x 3.6
293+ "sleep=5000",
294 "return=skipped unless economy needs iron_ore",
295 "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
296- "animate=working 20000",
297- "mine=iron 4 100 5 2",
298- "produce=iron_ore:2",
299- "animate=working 20000",
300+ "sleep=30000",
301+ "call=mine_produce",
302+ "call=mine_produce",
303+ "call=mine_produce",
304+ "call=mine_produce",
305+ "call=mine_produce",
306+ "return=no_stats"
307+ },
308+ },
309+ mine_produce = {
310+ descname = _"mining iron",
311+ actions = {
312+ "animate=working 14000",
313 "mine=iron 4 100 5 2",
314 "produce=iron_ore",
315- "animate=working 20000",
316- "mine=iron 4 100 5 2",
317- "produce=iron_ore:2"
318+ }
319+ },
320+ encyclopedia = {
321+ -- just a dummy program to fix encyclopedia
322+ descname = "encyclopedia",
323+ actions = {
324+ "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
325+ "produce=iron_ore:5",
326 }
327 },
328 },
329+
330 out_of_resource_notification = {
331 -- Translators: Short for "Out of ..." for a resource
332 title = _"No Iron",
333
334=== modified file 'data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua'
335--- data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua 2018-09-06 08:21:35 +0000
336+++ data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua 2018-09-11 16:57:31 +0000
337@@ -66,9 +66,8 @@
338 descname = _"smelting iron",
339 actions = {
340 "return=skipped unless economy needs iron",
341- "sleep=5000", -- penalty for unavailable iron_ore (2x)
342 "consume=iron_ore coal",
343- "sleep=20000",
344+ "sleep=25000",
345 "playsound=sound/metal fizzle 150",
346 "animate=working 35000",
347 "playsound=sound/metal ironping 80",
348@@ -80,9 +79,8 @@
349 descname = _"smelting gold",
350 actions = {
351 "return=skipped unless economy needs gold",
352- "sleep=10000", -- penalty for unavailable gold_ore
353 "consume=gold_ore coal",
354- "sleep=15000",
355+ "sleep=25000",
356 "playsound=sound/metal fizzle 150",
357 "animate=working 35000",
358 "playsound=sound/metal goldping 80",
359
360=== modified file 'data/tribes/buildings/productionsites/atlanteans/smokery/init.lua'
361--- data/tribes/buildings/productionsites/atlanteans/smokery/init.lua 2018-09-06 08:21:35 +0000
362+++ data/tribes/buildings/productionsites/atlanteans/smokery/init.lua 2018-09-11 16:57:31 +0000
363@@ -68,12 +68,10 @@
364 descname = _"smoking meat",
365 actions = {
366 -- time total: 60
367- "return=skipped when site has fish and economy needs smoked_fish and not economy needs smoked_meat",
368 "return=skipped unless economy needs smoked_meat",
369- "sleep=10000",
370 "consume=meat:2 log",
371 "animate=working 30000",
372- "sleep=20000",
373+ "sleep=30000",
374 "produce=smoked_meat:2"
375 }
376 },
377@@ -82,12 +80,10 @@
378 descname = _"smoking fish",
379 actions = {
380 -- time total: 60
381- "return=skipped when site has meat and economy needs smoked_meat and not economy needs smoked_fish",
382 "return=skipped unless economy needs smoked_fish",
383- "sleep=10000",
384 "consume=fish:2 log",
385 "animate=working 30000",
386- "sleep=20000",
387+ "sleep=30000",
388 "produce=smoked_fish:2"
389 }
390 },
391
392=== modified file 'data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua'
393--- data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua 2018-09-06 08:21:35 +0000
394+++ data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua 2018-09-11 16:57:31 +0000
395@@ -64,18 +64,18 @@
396 -- TRANSLATORS: Completed/Skipped/Did not start working because ...
397 descname = _"working",
398 actions = {
399- "call=produce_bread_paddle",
400- "call=produce_buckets",
401 "call=produce_fire_tongs",
402- "call=produce_fishing_net",
403- "call=produce_hammer",
404- "call=produce_hook_pole",
405 "call=produce_hunting_bow",
406- "call=produce_milking_tongs",
407 "call=produce_pick",
408+ "call=produce_hammer",
409 "call=produce_saw",
410+ "call=produce_shovel",
411 "call=produce_scythe",
412- "call=produce_shovel",
413+ "call=produce_bread_paddle",
414+ "call=produce_hook_pole",
415+ "call=produce_buckets",
416+ "call=produce_milking_tongs",
417+ "call=produce_fishing_net",
418 "return=no_stats"
419 }
420 },
421@@ -84,9 +84,8 @@
422 descname = _"making a bread paddle",
423 actions = {
424 "return=skipped unless economy needs bread_paddle",
425- "sleep=5000",
426 "consume=iron log",
427- "sleep=27000",
428+ "sleep=32000",
429 "playsound=sound/smiths toolsmith 192",
430 "animate=working 35000",
431 "produce=bread_paddle"
432@@ -97,9 +96,8 @@
433 descname = _"making a pair of buckets",
434 actions = {
435 "return=skipped unless economy needs buckets",
436- "sleep=5000",
437 "consume=iron log",
438- "sleep=27000",
439+ "sleep=32000",
440 "playsound=sound/smiths toolsmith 192",
441 "animate=working 35000",
442 "produce=buckets"
443@@ -110,9 +108,8 @@
444 descname = _"making fire tongs",
445 actions = {
446 "return=skipped unless economy needs fire_tongs",
447- "sleep=5000",
448 "consume=iron log",
449- "sleep=27000",
450+ "sleep=32000",
451 "playsound=sound/smiths toolsmith 192",
452 "animate=working 35000",
453 "produce=fire_tongs"
454@@ -123,9 +120,8 @@
455 descname = _"making a fishing net",
456 actions = {
457 "return=skipped unless economy needs fishing_net",
458- "sleep=5000",
459 "consume=spidercloth:2",
460- "sleep=27000",
461+ "sleep=32000",
462 "playsound=sound/smiths toolsmith 192",
463 "animate=working 35000",
464 "produce=fishing_net"
465@@ -136,9 +132,8 @@
466 descname = _"making a hammer",
467 actions = {
468 "return=skipped unless economy needs hammer",
469- "sleep=5000",
470 "consume=iron log",
471- "sleep=27000",
472+ "sleep=32000",
473 "playsound=sound/smiths toolsmith 192",
474 "animate=working 35000",
475 "produce=hammer"
476@@ -149,9 +144,8 @@
477 descname = _"making a hook pole",
478 actions = {
479 "return=skipped unless economy needs hook_pole",
480- "sleep=5000",
481 "consume=iron log",
482- "sleep=27000",
483+ "sleep=32000",
484 "playsound=sound/smiths toolsmith 192",
485 "animate=working 35000",
486 "produce=hook_pole"
487@@ -162,9 +156,8 @@
488 descname = _"making a hunting bow",
489 actions = {
490 "return=skipped unless economy needs hunting_bow",
491- "sleep=5000",
492 "consume=log spidercloth",
493- "sleep=27000",
494+ "sleep=32000",
495 "playsound=sound/smiths toolsmith 192",
496 "animate=working 35000",
497 "produce=hunting_bow"
498@@ -175,9 +168,8 @@
499 descname = _"making milking tongs",
500 actions = {
501 "return=skipped unless economy needs milking_tongs",
502- "sleep=5000",
503 "consume=iron log",
504- "sleep=27000",
505+ "sleep=32000",
506 "playsound=sound/smiths toolsmith 192",
507 "animate=working 35000",
508 "produce=milking_tongs"
509@@ -188,9 +180,8 @@
510 descname = _"making a pick",
511 actions = {
512 "return=skipped unless economy needs pick",
513- "sleep=5000",
514 "consume=iron log",
515- "sleep=27000",
516+ "sleep=32000",
517 "playsound=sound/smiths toolsmith 192",
518 "animate=working 35000",
519 "produce=pick"
520@@ -201,9 +192,8 @@
521 descname = _"making a saw",
522 actions = {
523 "return=skipped unless economy needs saw",
524- "sleep=5000",
525 "consume=iron log",
526- "sleep=27000",
527+ "sleep=32000",
528 "playsound=sound/smiths toolsmith 192",
529 "animate=working 35000",
530 "produce=saw"
531@@ -214,9 +204,8 @@
532 descname = _"making a scythe",
533 actions = {
534 "return=skipped unless economy needs scythe",
535- "sleep=5000",
536 "consume=iron log",
537- "sleep=27000",
538+ "sleep=32000",
539 "playsound=sound/smiths toolsmith 192",
540 "animate=working 35000",
541 "produce=scythe"
542@@ -227,9 +216,8 @@
543 descname = _"making a shovel",
544 actions = {
545 "return=skipped unless economy needs shovel",
546- "sleep=5000",
547 "consume=iron log",
548- "sleep=27000",
549+ "sleep=32000",
550 "playsound=sound/smiths toolsmith 192",
551 "animate=working 35000",
552 "produce=shovel"
553
554=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua'
555--- data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2018-09-06 08:21:35 +0000
556+++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2018-09-11 16:57:31 +0000
557@@ -72,12 +72,12 @@
558 -- TRANSLATORS: Completed/Skipped/Did not start forging a light trident because ...
559 descname = _"forging a light trident",
560 actions = {
561- -- time total: 64
562+ -- time total: 50 + 3.6
563 "return=skipped unless economy needs trident_light",
564- "sleep=27000", -- +7 enlarge
565 "consume=iron planks",
566+ "sleep=20000",
567 "playsound=sound/smiths smith 192",
568- "animate=working 28000", -- +7 enlarge
569+ "animate=working 21000",
570 "playsound=sound/smiths sharpening 120",
571 "sleep=9000",
572 "produce=trident_light"
573@@ -87,12 +87,12 @@
574 -- TRANSLATORS: Completed/Skipped/Did not start forging a long trident because ...
575 descname = _"forging a long trident",
576 actions = {
577- -- time total: 102
578+ -- time total: 77 + 3.6
579 "return=skipped unless economy needs trident_long",
580 "consume=iron coal planks",
581- "sleep=47000", -- +15 enlarge
582+ "sleep=32000",
583 "playsound=sound/smiths smith 192",
584- "animate=working 46000", -- +10 enlarge
585+ "animate=working 36000",
586 "playsound=sound/smiths sharpening 120",
587 "sleep=9000",
588 "produce=trident_long"
589@@ -102,12 +102,12 @@
590 -- TRANSLATORS: Completed/Skipped/Did not start forging a steel trident because ...
591 descname = _"forging a steel trident",
592 actions = {
593- -- time total: 110
594+ -- time total: 77 + 3.6
595 "return=skipped unless economy needs trident_steel",
596 "consume=iron:2 coal planks",
597- "sleep=50000", -- +18 enlarge
598+ "sleep=32000",
599 "playsound=sound/smiths smith 192",
600- "animate=working 51000", -- +15 enlarge
601+ "animate=working 36000",
602 "playsound=sound/smiths sharpening 120",
603 "sleep=9000",
604 "produce=trident_steel"
605@@ -117,12 +117,12 @@
606 -- TRANSLATORS: Completed/Skipped/Did not start forging a double trident because ...
607 descname = _"forging a double trident",
608 actions = {
609- -- time total: 115
610+ -- time total: 77 + 3.6
611 "return=skipped unless economy needs trident_double",
612 "consume=iron coal:2 planks gold",
613- "sleep=55000", -- +23 enlarge
614+ "sleep=32000",
615 "playsound=sound/smiths smith 192",
616- "animate=working 51000", -- +15 enlarge
617+ "animate=working 36000",
618 "playsound=sound/smiths sharpening 120",
619 "sleep=9000",
620 "produce=trident_double"
621@@ -132,12 +132,12 @@
622 -- TRANSLATORS: Completed/Skipped/Did not start forging a heavy double trident because ...
623 descname = _"forging a heavy double trident",
624 actions = {
625- -- time total: 120
626+ -- time total: 77 + 3.6
627 "return=skipped unless economy needs trident_heavy_double",
628 "consume=iron:2 coal:2 planks gold",
629- "sleep=55000", -- +23 enlarge
630+ "sleep=32000",
631 "playsound=sound/smiths smith 192",
632- "animate=working 56000", -- +20 enlarge
633+ "animate=working 36000",
634 "playsound=sound/smiths sharpening 120",
635 "sleep=9000",
636 "produce=trident_heavy_double"
637
638=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua'
639--- data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua 2018-09-06 08:21:35 +0000
640+++ data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua 2018-09-11 16:57:31 +0000
641@@ -67,13 +67,12 @@
642 -- TRANSLATORS: Completed/Skipped/Did not start weaving spidercloth because ...
643 descname = _"weaving spidercloth",
644 actions = {
645- -- total time 47 sec
646+ -- time total: 40 + 3.6
647 "return=skipped unless economy needs spidercloth",
648- "sleep=10000",
649 "consume=spider_silk",
650+ "sleep=20000",
651 "playsound=sound/mill weaving 120",
652 "animate=working 20000",
653- "sleep=17000",
654 "produce=spidercloth"
655 }
656 },
657@@ -81,13 +80,12 @@
658 -- TRANSLATORS: Completed/Skipped/Did not start tailoring a tabard because ...
659 descname = _"tailoring a tabard",
660 actions = {
661- -- total time 55 sec
662+ -- time total: 40 + 3.6
663 "return=skipped unless economy needs tabard",
664- "sleep=10000",
665 "consume=spider_silk",
666+ "sleep=20000",
667 "playsound=sound/mill weaving 120",
668- "animate=working 26000",
669- "sleep=19000",
670+ "animate=working 20000",
671 "produce=tabard"
672 }
673 },
674@@ -95,13 +93,12 @@
675 -- TRANSLATORS: Completed/Skipped/Did not start tailoring a golden tabard because ...
676 descname = _"tailoring a golden tabard",
677 actions = {
678- -- total time 60 sec
679+ -- time total: 40 + 3.6
680 "return=skipped unless economy needs tabard_golden",
681 "consume=spider_silk gold_thread",
682- "sleep=15000",
683+ "sleep=20000",
684 "playsound=sound/mill weaving 120",
685- "animate=working 30000",
686- "sleep=15000",
687+ "animate=working 20000",
688 "produce=tabard_golden"
689 }
690 },
691
692=== modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua'
693--- data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2018-09-06 08:21:35 +0000
694+++ data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2018-09-11 16:57:31 +0000
695@@ -76,12 +76,12 @@
696 -- TRANSLATORS: Completed/Skipped/Did not start forging an ax because ...
697 descname = _"forging an ax",
698 actions = {
699- -- time total: 73
700+ -- time total: 57 + 3.6
701 "return=skipped unless economy needs ax",
702- "sleep=36000", -- +10 enlarge
703 "consume=coal iron",
704+ "sleep=26000",
705 "playsound=sound/smiths smith 192",
706- "animate=working 28000", -- +6 enlarge
707+ "animate=working 22000",
708 "playsound=sound/smiths sharpening 120",
709 "sleep=9000",
710 "produce=ax"
711@@ -91,12 +91,12 @@
712 -- TRANSLATORS: Completed/Skipped/Did not start forging a sharp ax because ...
713 descname = _"forging a sharp ax",
714 actions = {
715- -- time total: 76
716+ -- time total: 57 + 3.6
717 "return=skipped unless economy needs ax_sharp",
718 "consume=coal iron:2",
719- "sleep=37000", -- +11 enlarge
720+ "sleep=26000",
721 "playsound=sound/smiths smith 192",
722- "animate=working 30000", -- +8 enlarge
723+ "animate=working 22000",
724 "playsound=sound/smiths sharpening 120",
725 "sleep=9000",
726 "produce=ax_sharp"
727@@ -106,12 +106,12 @@
728 -- TRANSLATORS: Completed/Skipped/Did not start forging a broad ax because ...
729 descname = _"forging a broad ax",
730 actions = {
731- -- time total: 79
732+ -- time total: 57 + 3.6
733 "return=skipped unless economy needs ax_broad",
734 "consume=coal:2 iron:2",
735- "sleep=38000", -- +12 enlarge
736+ "sleep=26000",
737 "playsound=sound/smiths smith 192",
738- "animate=working 32000", -- +10 enlarge
739+ "animate=working 22000",
740 "playsound=sound/smiths sharpening 120",
741 "sleep=9000",
742 "produce=ax_broad"
743
744=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
745--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2018-09-09 10:17:40 +0000
746+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2018-09-11 16:57:31 +0000
747@@ -71,10 +71,11 @@
748 actions = {
749 -- time total: 33
750 "return=skipped unless economy needs ration",
751- "sleep=23000",
752+ "sleep=5000",
753 "consume=barbarians_bread,fish,meat",
754 "playsound=sound/barbarians/taverns tavern 100",
755- "animate=working 10000",
756+ "animate=working 18000",
757+ "sleep=10000",
758 "produce=ration"
759 }
760 },
761@@ -84,10 +85,10 @@
762 actions = {
763 -- time total: 37
764 "return=skipped unless economy needs snack",
765- "sleep=5000",
766 "consume=barbarians_bread fish,meat beer",
767 "playsound=sound/barbarians/taverns biginn 100",
768- "animate=working 32000",
769+ "animate=working 27000",
770+ "sleep=10000",
771 "produce=snack"
772 }
773 },
774@@ -97,10 +98,10 @@
775 actions = {
776 -- time total: 40
777 "return=skipped unless economy needs meal",
778- "sleep=5000",
779 "consume=barbarians_bread fish,meat beer_strong",
780 "playsound=sound/barbarians/taverns biginn 100",
781- "animate=working 35000",
782+ "animate=working 30000",
783+ "sleep=10000",
784 "produce=meal"
785 }
786 },
787
788=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine/init.lua'
789--- data/tribes/buildings/productionsites/barbarians/coalmine/init.lua 2017-09-03 07:59:51 +0000
790+++ data/tribes/buildings/productionsites/barbarians/coalmine/init.lua 2018-09-11 16:57:31 +0000
791@@ -60,12 +60,29 @@
792 -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
793 descname = _"mining coal",
794 actions = {
795- "sleep=45000",
796+ "sleep=5000",
797 "return=skipped unless economy needs coal",
798 "consume=ration",
799- "animate=working 20000",
800+ "sleep=40000",
801+ "call=mine_produce",
802+ "call=mine_produce",
803+ "return=no_stats"
804+ }
805+ },
806+ mine_produce = {
807+ descname = _"mining coal",
808+ actions = {
809+ "animate=working 10000",
810 "mine=coal 2 33 5 17",
811- "produce=coal:2"
812+ "produce=coal",
813+ }
814+ },
815+ encyclopedia = {
816+ -- just a dummy program to fix encyclopedia
817+ descname = "encyclopedia",
818+ actions = {
819+ "consume=ration",
820+ "produce=coal:2",
821 }
822 },
823 },
824
825=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua'
826--- data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua 2016-09-03 14:59:10 +0000
827+++ data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua 2018-09-11 16:57:31 +0000
828@@ -60,15 +60,31 @@
829 -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
830 descname = _"mining coal",
831 actions = {
832- "sleep=42000",
833+ "sleep=5000",
834 "return=skipped unless economy needs coal",
835 "consume=snack",
836- "animate=working 18000",
837- "mine=coal 2 66 5 17",
838- "produce=coal:2",
839- "animate=working 18000",
840- "mine=coal 2 66 5 17",
841- "produce=coal:2"
842+ "sleep=35000",
843+ "call=mine_produce",
844+ "call=mine_produce",
845+ "call=mine_produce",
846+ "call=mine_produce",
847+ "return=no_stats"
848+ }
849+ },
850+ mine_produce = {
851+ descname = _"mining coal",
852+ actions = {
853+ "animate=working 9500",
854+ "mine=coal 2 66 5 17",
855+ "produce=coal",
856+ }
857+ },
858+ encyclopedia = {
859+ -- just a dummy program to fix encyclopedia
860+ descname = "encyclopedia",
861+ actions = {
862+ "consume=snack",
863+ "produce=coal:4",
864 }
865 },
866 },
867
868=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua'
869--- data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua 2016-09-03 14:59:10 +0000
870+++ data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua 2018-09-11 16:57:31 +0000
871@@ -59,15 +59,32 @@
872 -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
873 descname = _"mining coal",
874 actions = {
875- "sleep=40000",
876+ "sleep=5000",
877 "return=skipped unless economy needs coal",
878 "consume=meal",
879- "animate=working 16000",
880- "mine=coal 2 100 10 2",
881- "produce=coal:2",
882- "animate=working 16000",
883- "mine=coal 2 100 10 2",
884- "produce=coal:3"
885+ "sleep=32000",
886+ "call=mine_produce",
887+ "call=mine_produce",
888+ "call=mine_produce",
889+ "call=mine_produce",
890+ "call=mine_produce",
891+ "return=no_stats"
892+ }
893+ },
894+ mine_produce = {
895+ descname = _"mining coal",
896+ actions = {
897+ "animate=working 7000",
898+ "mine=coal 2 100 10 2",
899+ "produce=coal",
900+ }
901+ },
902+ encyclopedia = {
903+ -- just a dummy program to fix encyclopedia
904+ descname = "encyclopedia",
905+ actions = {
906+ "consume=meal",
907+ "produce=coal:5",
908 }
909 },
910 },
911
912=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine/init.lua'
913--- data/tribes/buildings/productionsites/barbarians/goldmine/init.lua 2016-09-03 14:59:10 +0000
914+++ data/tribes/buildings/productionsites/barbarians/goldmine/init.lua 2018-09-11 16:57:31 +0000
915@@ -60,9 +60,10 @@
916 -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
917 descname = _"mining gold",
918 actions = {
919- "sleep=45000",
920+ "sleep=5000",
921 "return=skipped unless economy needs gold_ore",
922 "consume=ration",
923+ "sleep=40000",
924 "animate=working 20000",
925 "mine=gold 2 33 5 17",
926 "produce=gold_ore"
927
928=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua'
929--- data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua 2016-09-03 14:59:10 +0000
930+++ data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua 2018-09-11 16:57:31 +0000
931@@ -60,15 +60,31 @@
932 -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
933 descname = _"mining gold",
934 actions = {
935- "sleep=42000",
936+ "sleep=5000",
937 "return=skipped unless economy needs gold_ore",
938 "consume=snack",
939- "animate=working 18000",
940- "mine=gold 2 66 5 17",
941- "produce=gold_ore:2",
942- "animate=working 18000",
943- "mine=gold 2 66 5 17",
944- "produce=gold_ore:2"
945+ "sleep=35000",
946+ "call=mine_produce",
947+ "call=mine_produce",
948+ "call=mine_produce",
949+ "call=mine_produce",
950+ "return=no_stats"
951+ }
952+ },
953+ mine_produce = {
954+ descname = _"mining gold",
955+ actions = {
956+ "animate=working 9500",
957+ "mine=gold 2 66 5 17",
958+ "produce=gold_ore",
959+ }
960+ },
961+ encyclopedia = {
962+ -- just a dummy program to fix encyclopedia
963+ descname = "encyclopedia",
964+ actions = {
965+ "consume=snack",
966+ "produce=gold_ore:4",
967 }
968 },
969 },
970
971=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua'
972--- data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua 2016-09-03 14:59:10 +0000
973+++ data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua 2018-09-11 16:57:31 +0000
974@@ -59,15 +59,31 @@
975 -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
976 descname = _"mining gold",
977 actions = {
978- "sleep=40000",
979+ "sleep=5000",
980 "return=skipped unless economy needs gold_ore",
981 "consume=meal",
982- "animate=working 16000",
983- "mine=gold 2 100 10 2",
984- "produce=gold_ore:2",
985- "animate=working 18000",
986- "mine=gold 2 100 10 2",
987- "produce=gold_ore:2"
988+ "sleep=33000",
989+ "call=mine_produce",
990+ "call=mine_produce",
991+ "call=mine_produce",
992+ "call=mine_produce",
993+ "return=no_stats"
994+ }
995+ },
996+ mine_produce = {
997+ descname = _"mining gold",
998+ actions = {
999+ "animate=working 9000",
1000+ "mine=gold 2 100 10 2",
1001+ "produce=gold_ore",
1002+ }
1003+ },
1004+ encyclopedia = {
1005+ -- just a dummy program to fix encyclopedia
1006+ descname = "encyclopedia",
1007+ actions = {
1008+ "consume=meal",
1009+ "produce=gold_ore:4",
1010 }
1011 },
1012 },
1013
1014=== modified file 'data/tribes/buildings/productionsites/barbarians/granitemine/init.lua'
1015--- data/tribes/buildings/productionsites/barbarians/granitemine/init.lua 2017-09-03 07:59:51 +0000
1016+++ data/tribes/buildings/productionsites/barbarians/granitemine/init.lua 2018-09-11 16:57:31 +0000
1017@@ -58,12 +58,29 @@
1018 -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
1019 descname = _"mining granite",
1020 actions = {
1021- "sleep=20000",
1022+ "sleep=5000",
1023 "return=skipped unless economy needs granite",
1024 "consume=ration",
1025- "animate=working 20000",
1026- "mine=stones 2 100 5 17",
1027- "produce=granite:2"
1028+ "sleep=15000",
1029+ "call=mine_produce",
1030+ "call=mine_produce",
1031+ "return=no_stats"
1032+ }
1033+ },
1034+ mine_produce = {
1035+ descname = _"mining granite",
1036+ actions = {
1037+ "animate=working 10000",
1038+ "mine=stones 2 100 5 2",
1039+ "produce=granite",
1040+ }
1041+ },
1042+ encyclopedia = {
1043+ -- just a dummy program to fix encyclopedia
1044+ descname = "encyclopedia",
1045+ actions = {
1046+ "consume=ration",
1047+ "produce=granite:2",
1048 }
1049 },
1050 },
1051
1052=== modified file 'data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua'
1053--- data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua 2018-09-06 08:21:35 +0000
1054+++ data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua 2018-09-11 16:57:31 +0000
1055@@ -77,11 +77,11 @@
1056 -- TRANSLATORS: Completed/Skipped/Did not start forging a helmet because ...
1057 descname = _"forging a helmet",
1058 actions = {
1059- -- time total: 80
1060+ -- time total: 67 + 3.6
1061 "return=skipped unless economy needs helmet",
1062- "sleep=40000", -- +8 enlarge
1063 "consume=coal iron",
1064- "animate=working 40000", -- +5 enlarge
1065+ "sleep=32000",
1066+ "animate=working 35000",
1067 "produce=helmet"
1068 }
1069 },
1070@@ -89,11 +89,11 @@
1071 -- TRANSLATORS: Completed/Skipped/Did not start forging a mask because ...
1072 descname = _"forging a mask",
1073 actions = {
1074- -- time total: 90
1075+ -- time total: 77 + 3.6
1076 "return=skipped unless economy needs helmet_mask",
1077 "consume=coal iron:2",
1078- "sleep=40000", -- +8 enlarge
1079- "animate=working 50000", -- +5 enlarge
1080+ "sleep=32000",
1081+ "animate=working 45000",
1082 "produce=helmet_mask"
1083 }
1084 },
1085@@ -101,11 +101,11 @@
1086 -- TRANSLATORS: Completed/Skipped/Did not start forging a warhelm because ...
1087 descname = _"forging a warhelm",
1088 actions = {
1089- -- time total: 100
1090+ -- time total: 87 + 3.6
1091 "return=skipped unless economy needs helmet_warhelm",
1092 "consume=coal gold iron:2",
1093- "sleep=40000", -- +8 enlarge
1094- "animate=working 60000", -- +5 enlarge
1095+ "sleep=32000",
1096+ "animate=working 55000",
1097 "produce=helmet_warhelm"
1098 }
1099 },
1100
1101=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
1102--- data/tribes/buildings/productionsites/barbarians/inn/init.lua 2018-09-06 08:21:35 +0000
1103+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua 2018-09-11 16:57:31 +0000
1104@@ -82,10 +82,9 @@
1105 actions = {
1106 -- time total: 37
1107 "return=skipped unless economy needs snack",
1108- "sleep=5000",
1109 "consume=barbarians_bread fish,meat beer",
1110 "playsound=sound/barbarians/taverns inn 100",
1111- "animate=working 22000",
1112+ "animate=working 27000",
1113 "sleep=10000",
1114 "produce=snack"
1115 }
1116
1117=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine/init.lua'
1118--- data/tribes/buildings/productionsites/barbarians/ironmine/init.lua 2017-09-03 07:59:51 +0000
1119+++ data/tribes/buildings/productionsites/barbarians/ironmine/init.lua 2018-09-11 16:57:31 +0000
1120@@ -60,9 +60,10 @@
1121 -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
1122 descname = _"mining iron",
1123 actions = {
1124- "sleep=45000",
1125+ "sleep=5000",
1126 "return=skipped unless economy needs iron_ore",
1127 "consume=ration",
1128+ "sleep=40000",
1129 "animate=working 20000",
1130 "mine=iron 2 33 5 17",
1131 "produce=iron_ore"
1132
1133=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua'
1134--- data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua 2016-09-03 14:59:10 +0000
1135+++ data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua 2018-09-11 16:57:31 +0000
1136@@ -60,15 +60,31 @@
1137 -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
1138 descname = _"mining iron",
1139 actions = {
1140- "sleep=43000",
1141+ "sleep=5000",
1142 "return=skipped unless economy needs iron_ore",
1143 "consume=snack",
1144- "animate=working 18000",
1145+ "sleep=35000",
1146+ "call=mine_produce",
1147+ "call=mine_produce",
1148+ "call=mine_produce",
1149+ "call=mine_produce",
1150+ "return=no_stats"
1151+ }
1152+ },
1153+ mine_produce = {
1154+ descname = _"mining iron",
1155+ actions = {
1156+ "animate=working 9500",
1157 "mine=iron 2 66 5 17",
1158 "produce=iron_ore",
1159- "animate=working 18000",
1160- "mine=iron 2 66 5 17",
1161- "produce=iron_ore:1"
1162+ }
1163+ },
1164+ encyclopedia = {
1165+ -- just a dummy program to fix encyclopedia
1166+ descname = "encyclopedia",
1167+ actions = {
1168+ "consume=snack",
1169+ "produce=iron_ore:4",
1170 }
1171 },
1172 },
1173
1174=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua'
1175--- data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua 2016-09-03 14:59:10 +0000
1176+++ data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua 2018-09-11 16:57:31 +0000
1177@@ -59,18 +59,32 @@
1178 -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
1179 descname = _"mining iron",
1180 actions = {
1181- "sleep=40000",
1182+ "sleep=5000",
1183 "return=skipped unless economy needs iron_ore",
1184 "consume=meal",
1185- "animate=working 16000",
1186+ "sleep=33000",
1187+ "call=mine_produce",
1188+ "call=mine_produce",
1189+ "call=mine_produce",
1190+ "call=mine_produce",
1191+ "call=mine_produce",
1192+ "return=no_stats"
1193+ }
1194+ },
1195+ mine_produce = {
1196+ descname = _"mining iron",
1197+ actions = {
1198+ "animate=working 10000",
1199 "mine=iron 2 100 10 2",
1200 "produce=iron_ore",
1201- "animate=working 16000",
1202- "mine=iron 2 100 10 2",
1203- "produce=iron_ore:2",
1204- "animate=working 16000",
1205- "mine=iron 2 100 10 2",
1206- "produce=iron_ore:2"
1207+ }
1208+ },
1209+ encyclopedia = {
1210+ -- just a dummy program to fix encyclopedia
1211+ descname = "encyclopedia",
1212+ actions = {
1213+ "consume=meal",
1214+ "produce=iron_ore:5",
1215 }
1216 },
1217 },
1218
1219=== modified file 'data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua'
1220--- data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2018-09-06 08:21:35 +0000
1221+++ data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2018-09-11 16:57:31 +0000
1222@@ -70,9 +70,8 @@
1223 descname = _"smelting iron",
1224 actions = {
1225 "return=skipped unless economy needs iron",
1226- "sleep=5000", -- penalty for unavailable iron_ore (2x)
1227 "consume=coal iron_ore",
1228- "sleep=27000",
1229+ "sleep=32000",
1230 "playsound=sound/metal furnace 192",
1231 "animate=working 35000",
1232 "playsound=sound/metal ironping 80",
1233@@ -84,9 +83,8 @@
1234 descname = _"smelting gold",
1235 actions = {
1236 "return=skipped unless economy needs gold",
1237- "sleep=10000", -- penalty for unavailable gold_ore
1238 "consume=coal gold_ore",
1239- "sleep=22000",
1240+ "sleep=32000",
1241 "playsound=sound/metal furnace 192",
1242 "animate=working 35000",
1243 "playsound=sound/metal goldping 80",
1244
1245=== modified file 'data/tribes/buildings/productionsites/barbarians/tavern/init.lua'
1246--- data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2017-11-18 17:57:00 +0000
1247+++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2018-09-11 16:57:31 +0000
1248@@ -60,11 +60,13 @@
1249 -- TRANSLATORS: Completed/Skipped/Did not start preparing a ration because ...
1250 descname = _"preparing a ration",
1251 actions = {
1252- "sleep=14000",
1253+ -- time total: 33
1254 "return=skipped unless economy needs ration",
1255+ "sleep=5000",
1256 "consume=barbarians_bread,fish,meat",
1257 "playsound=sound/barbarians/taverns tavern 100",
1258- "animate=working 19000",
1259+ "animate=working 18000",
1260+ "sleep=10000",
1261 "produce=ration"
1262 },
1263 },
1264
1265=== modified file 'data/tribes/buildings/productionsites/barbarians/warmill/init.lua'
1266--- data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2018-09-06 08:21:35 +0000
1267+++ data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2018-09-11 16:57:31 +0000
1268@@ -83,12 +83,12 @@
1269 -- TRANSLATORS: Completed/Skipped/Did not start forging an ax because ...
1270 descname = _"forging an ax",
1271 actions = {
1272- -- time total: 73
1273+ -- time total: 57 + 3.6
1274 "return=skipped unless economy needs ax",
1275- "sleep=36000", -- +10 enlarge
1276 "consume=coal iron",
1277+ "sleep=26000",
1278 "playsound=sound/smiths smith 192",
1279- "animate=working 28000", -- +6 enlarge
1280+ "animate=working 22000",
1281 "playsound=sound/smiths sharpening 120",
1282 "sleep=9000",
1283 "produce=ax"
1284@@ -98,12 +98,12 @@
1285 -- TRANSLATORS: Completed/Skipped/Did not start forging a sharp ax because ...
1286 descname = _"forging a sharp ax",
1287 actions = {
1288- -- time total: 76
1289+ -- time total: 57 + 3.6
1290 "return=skipped unless economy needs ax_sharp",
1291 "consume=coal iron:2",
1292- "sleep=37000", -- +11 enlarge
1293+ "sleep=26000",
1294 "playsound=sound/smiths smith 192",
1295- "animate=working 30000", -- +8 enlarge
1296+ "animate=working 22000",
1297 "playsound=sound/smiths sharpening 120",
1298 "sleep=9000",
1299 "produce=ax_sharp"
1300@@ -113,12 +113,12 @@
1301 -- TRANSLATORS: Completed/Skipped/Did not start forging a broad ax because ...
1302 descname = _"forging a broad ax",
1303 actions = {
1304- -- time total: 79
1305+ -- time total: 57 + 3.6
1306 "return=skipped unless economy needs ax_broad",
1307 "consume=coal:2 iron:2",
1308- "sleep=38000", -- +12 enlarge
1309+ "sleep=26000",
1310 "playsound=sound/smiths smith 192",
1311- "animate=working 32000", -- +10 enlarge
1312+ "animate=working 22000",
1313 "playsound=sound/smiths sharpening 120",
1314 "sleep=9000",
1315 "produce=ax_broad"
1316@@ -128,12 +128,12 @@
1317 -- TRANSLATORS: Completed/Skipped/Did not start forging a bronze ax because ...
1318 descname = _"forging a bronze ax",
1319 actions = {
1320- -- time total: 82
1321+ -- time total: 57 + 3.6
1322 "return=skipped unless economy needs ax_bronze",
1323 "consume=coal:2 iron:2",
1324- "sleep=39000", -- +13 enlarge
1325+ "sleep=26000",
1326 "playsound=sound/smiths smith 192",
1327- "animate=working 34000", -- +12 enlarge
1328+ "animate=working 22000",
1329 "playsound=sound/smiths sharpening 120",
1330 "sleep=9000",
1331 "produce=ax_bronze"
1332@@ -143,12 +143,12 @@
1333 -- TRANSLATORS: Completed/Skipped/Did not start forging a battle ax because ...
1334 descname = _"forging a battle ax",
1335 actions = {
1336- -- time total: 87
1337+ -- time total: 57 + 3.6
1338 "return=skipped unless economy needs ax_battle",
1339 "consume=coal gold iron:2",
1340- "sleep=41000", -- +15 enlarge
1341+ "sleep=26000",
1342 "playsound=sound/smiths smith 192",
1343- "animate=working 37000", -- +15 enlarge
1344+ "animate=working 22000",
1345 "playsound=sound/smiths sharpening 120",
1346 "sleep=9000",
1347 "produce=ax_battle"
1348@@ -158,12 +158,12 @@
1349 -- TRANSLATORS: Completed/Skipped/Did not start forging a warrior’s ax because ...
1350 descname = _"forging a warrior’s ax",
1351 actions = {
1352- -- time total: 92
1353+ -- time total: 57 + 3.6
1354 "return=skipped unless economy needs ax_warriors",
1355 "consume=coal:2 gold:2 iron:2",
1356- "sleep=43000", -- +17 enlarge
1357+ "sleep=26000",
1358 "playsound=sound/smiths smith 192",
1359- "animate=working 40000", -- +18 enlarge
1360+ "animate=working 22000",
1361 "playsound=sound/smiths sharpening 120",
1362 "sleep=9000",
1363 "produce=ax_warriors"
1364
1365=== modified file 'data/tribes/buildings/productionsites/empire/armorsmithy/init.lua'
1366--- data/tribes/buildings/productionsites/empire/armorsmithy/init.lua 2018-09-06 08:21:35 +0000
1367+++ data/tribes/buildings/productionsites/empire/armorsmithy/init.lua 2018-09-11 16:57:31 +0000
1368@@ -71,6 +71,7 @@
1369 "call=produce_armor",
1370 "call=produce_armor_chain",
1371 "call=produce_armor_gilded",
1372+ "call=produce_armor_helmet",
1373 "return=no_stats"
1374 }
1375 },
1376@@ -78,11 +79,11 @@
1377 -- TRANSLATORS: Completed/Skipped/Did not start forging a helmet because ...
1378 descname = _"forging a helmet",
1379 actions = {
1380- -- time total: 80
1381+ -- time total: 67 + 3.6
1382 "return=skipped unless economy needs armor_helmet",
1383- "sleep=40000", -- +8 enlarge
1384 "consume=iron coal",
1385- "animate=working 40000", -- +5 enlarge
1386+ "sleep=47000",
1387+ "animate=working 20000",
1388 "produce=armor_helmet"
1389 }
1390 },
1391@@ -90,11 +91,11 @@
1392 -- TRANSLATORS: Completed/Skipped/Did not start forging a suit of armor because ...
1393 descname = _"forging a suit of armor",
1394 actions = {
1395- -- time total: 90
1396+ -- time total: 77 + 3.6
1397 "return=skipped unless economy needs armor",
1398 "consume=iron coal cloth",
1399- "sleep=40000", -- +8 enlarge
1400- "animate=working 50000", -- +5 enlarge
1401+ "sleep=32000",
1402+ "animate=working 45000",
1403 "produce=armor"
1404 }
1405 },
1406@@ -102,11 +103,11 @@
1407 -- TRANSLATORS: Completed/Skipped/Did not start forging a suit of chain armor because ...
1408 descname = _"forging a suit of chain armor",
1409 actions = {
1410- -- time total: 108
1411+ -- time total: 77 + 3.6
1412 "return=skipped unless economy needs armor_chain",
1413 "consume=iron:2 coal cloth",
1414- "sleep=47000", -- +15 enlarge
1415- "animate=working 61000", -- +16 enlarge
1416+ "sleep=32000",
1417+ "animate=working 45000",
1418 "produce=armor_chain"
1419 }
1420 },
1421@@ -114,11 +115,11 @@
1422 -- TRANSLATORS: Completed/Skipped/Did not start forging a suit of gilded armor because ...
1423 descname = _"forging a suit of gilded armor",
1424 actions = {
1425- -- time total: 115
1426+ -- time total: 77 + 3.6
1427 "return=skipped unless economy needs armor_gilded",
1428 "consume=iron:2 coal:2 cloth gold",
1429- "sleep=51000", -- +19 enlarge
1430- "animate=working 64000", -- +19 enlarge
1431+ "sleep=32000",
1432+ "animate=working 45000",
1433 "produce=armor_gilded"
1434 }
1435 },
1436
1437=== modified file 'data/tribes/buildings/productionsites/empire/coalmine/init.lua'
1438--- data/tribes/buildings/productionsites/empire/coalmine/init.lua 2017-09-03 07:59:51 +0000
1439+++ data/tribes/buildings/productionsites/empire/coalmine/init.lua 2018-09-11 16:57:31 +0000
1440@@ -58,15 +58,30 @@
1441 -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
1442 descname = _"mining coal",
1443 actions = {
1444- "sleep=45000",
1445+ "sleep=5000",
1446 "return=skipped unless economy needs coal",
1447 "consume=beer ration",
1448- "animate=working 20000",
1449- "mine=coal 2 50 5 17",
1450- "produce=coal:2",
1451- "animate=working 20000",
1452- "mine=coal 2 50 5 17",
1453- "produce=coal"
1454+ "sleep=38000",
1455+ "call=mine_produce",
1456+ "call=mine_produce",
1457+ "call=mine_produce",
1458+ "return=no_stats"
1459+ }
1460+ },
1461+ mine_produce = {
1462+ descname = _"mining coal",
1463+ actions = {
1464+ "animate=working 14000",
1465+ "mine=coal 2 50 5 17",
1466+ "produce=coal",
1467+ }
1468+ },
1469+ encyclopedia = {
1470+ -- just a dummy program to fix encyclopedia
1471+ descname = "encyclopedia",
1472+ actions = {
1473+ "consume=beer ration",
1474+ "produce=coal:3",
1475 }
1476 },
1477 },
1478
1479=== modified file 'data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua'
1480--- data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua 2016-09-03 14:59:10 +0000
1481+++ data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua 2018-09-11 16:57:31 +0000
1482@@ -56,15 +56,32 @@
1483 -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
1484 descname = _"mining coal",
1485 actions = {
1486- "sleep=42000",
1487+ "sleep=5000",
1488 "return=skipped unless economy needs coal",
1489 "consume=beer meal",
1490- "animate=working 18000",
1491- "mine=coal 2 100 5 2",
1492- "produce=coal:2",
1493- "animate=working 18000",
1494- "mine=coal 2 100 5 2",
1495- "produce=coal:3"
1496+ "sleep=33000",
1497+ "call=mine_produce",
1498+ "call=mine_produce",
1499+ "call=mine_produce",
1500+ "call=mine_produce",
1501+ "call=mine_produce",
1502+ "return=no_stats"
1503+ }
1504+ },
1505+ mine_produce = {
1506+ descname = _"mining coal",
1507+ actions = {
1508+ "animate=working 8000",
1509+ "mine=coal 2 100 5 2",
1510+ "produce=coal",
1511+ }
1512+ },
1513+ encyclopedia = {
1514+ -- just a dummy program to fix encyclopedia
1515+ descname = "encyclopedia",
1516+ actions = {
1517+ "consume=beer meal",
1518+ "produce=coal:5",
1519 }
1520 },
1521 },
1522
1523=== modified file 'data/tribes/buildings/productionsites/empire/goldmine/init.lua'
1524--- data/tribes/buildings/productionsites/empire/goldmine/init.lua 2016-09-03 14:59:10 +0000
1525+++ data/tribes/buildings/productionsites/empire/goldmine/init.lua 2018-09-11 16:57:31 +0000
1526@@ -58,15 +58,29 @@
1527 -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
1528 descname = _"mining gold",
1529 actions = {
1530- "sleep=45000",
1531+ "sleep=5000",
1532 "return=skipped unless economy needs gold_ore",
1533 "consume=ration wine",
1534- "animate=working 20000",
1535+ "sleep=38000",
1536+ "call=mine_produce",
1537+ "call=mine_produce",
1538+ "return=no_stats"
1539+ }
1540+ },
1541+ mine_produce = {
1542+ descname = _"mining gold",
1543+ actions = {
1544+ "animate=working 21000",
1545 "mine=gold 2 50 5 17",
1546 "produce=gold_ore",
1547- "animate=working 20000",
1548- "mine=gold 2 50 5 17",
1549- "produce=gold_ore"
1550+ }
1551+ },
1552+ encyclopedia = {
1553+ -- just a dummy program to fix encyclopedia
1554+ descname = "encyclopedia",
1555+ actions = {
1556+ "consume=ration wine",
1557+ "produce=gold_ore:2",
1558 }
1559 },
1560 },
1561
1562=== modified file 'data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua'
1563--- data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua 2016-09-03 14:59:10 +0000
1564+++ data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua 2018-09-11 16:57:31 +0000
1565@@ -56,15 +56,30 @@
1566 -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
1567 descname = _"mining gold",
1568 actions = {
1569- "sleep=43000",
1570+ "sleep=5000",
1571 "return=skipped unless economy needs gold_ore",
1572 "consume=meal wine",
1573- "animate=working 18000",
1574+ "sleep=35000",
1575+ "call=mine_produce",
1576+ "call=mine_produce",
1577+ "call=mine_produce",
1578+ "return=no_stats"
1579+ }
1580+ },
1581+ mine_produce = {
1582+ descname = _"mining gold",
1583+ actions = {
1584+ "animate=working 13000",
1585 "mine=gold 2 100 5 2",
1586 "produce=gold_ore",
1587- "animate=working 18000",
1588- "mine=gold 2 100 5 2",
1589- "produce=gold_ore:2"
1590+ }
1591+ },
1592+ encyclopedia = {
1593+ -- just a dummy program to fix encyclopedia
1594+ descname = "encyclopedia",
1595+ actions = {
1596+ "consume=meal wine",
1597+ "produce=gold_ore:3",
1598 }
1599 },
1600 },
1601
1602=== modified file 'data/tribes/buildings/productionsites/empire/inn/init.lua'
1603--- data/tribes/buildings/productionsites/empire/inn/init.lua 2018-09-06 08:21:35 +0000
1604+++ data/tribes/buildings/productionsites/empire/inn/init.lua 2018-09-11 16:57:31 +0000
1605@@ -64,11 +64,11 @@
1606 actions = {
1607 -- time total: 33
1608 "return=skipped unless economy needs ration",
1609- "sleep=10000",
1610+ "sleep=5000",
1611 "consume=empire_bread,fish,meat",
1612 "playsound=sound/empire/taverns ration 100",
1613- "animate=working 19000",
1614- "sleep=4000",
1615+ "animate=working 18000",
1616+ "sleep=10000",
1617 "produce=ration"
1618 }
1619 },
1620@@ -78,11 +78,10 @@
1621 actions = {
1622 -- time total: 40
1623 "return=skipped unless economy needs meal",
1624- "sleep=10000",
1625 "consume=empire_bread fish,meat",
1626 "playsound=sound/empire/taverns meal 100",
1627- "animate=working 25000",
1628- "sleep=5000",
1629+ "animate=working 30000",
1630+ "sleep=10000",
1631 "produce=meal"
1632 }
1633 },
1634
1635=== modified file 'data/tribes/buildings/productionsites/empire/ironmine/init.lua'
1636--- data/tribes/buildings/productionsites/empire/ironmine/init.lua 2017-09-03 07:59:51 +0000
1637+++ data/tribes/buildings/productionsites/empire/ironmine/init.lua 2018-09-11 16:57:31 +0000
1638@@ -58,15 +58,30 @@
1639 -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
1640 descname = _"mining iron",
1641 actions = {
1642- "sleep=45000",
1643+ "sleep=5000",
1644 "return=skipped unless economy needs iron_ore",
1645 "consume=ration beer",
1646- "animate=working 20000",
1647+ "sleep=38000",
1648+ "call=mine_produce",
1649+ "call=mine_produce",
1650+ "call=mine_produce",
1651+ "return=no_stats"
1652+ }
1653+ },
1654+ mine_produce = {
1655+ descname = _"mining iron",
1656+ actions = {
1657+ "animate=working 14000",
1658 "mine=iron 2 50 5 17",
1659 "produce=iron_ore",
1660- "animate=working 20000",
1661- "mine=iron 2 50 5 17",
1662- "produce=iron_ore:2"
1663+ }
1664+ },
1665+ encyclopedia = {
1666+ -- just a dummy program to fix encyclopedia
1667+ descname = "encyclopedia",
1668+ actions = {
1669+ "consume=ration beer",
1670+ "produce=iron_ore:3",
1671 }
1672 },
1673 },
1674
1675=== modified file 'data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua'
1676--- data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua 2017-09-03 07:59:51 +0000
1677+++ data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua 2018-09-11 16:57:31 +0000
1678@@ -56,15 +56,31 @@
1679 -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
1680 descname = _"mining iron",
1681 actions = {
1682- "sleep=43000",
1683+ "sleep=5000",
1684 "return=skipped unless economy needs iron_ore",
1685 "consume=meal beer",
1686- "animate=working 18000",
1687- "mine=iron 2 100 5 2",
1688- "produce=iron_ore:2",
1689- "animate=working 18000",
1690- "mine=iron 2 100 5 2",
1691- "produce=iron_ore:2"
1692+ "sleep=34000",
1693+ "call=mine_produce",
1694+ "call=mine_produce",
1695+ "call=mine_produce",
1696+ "call=mine_produce",
1697+ "return=no_stats"
1698+ }
1699+ },
1700+ mine_produce = {
1701+ descname = _"mining iron",
1702+ actions = {
1703+ "animate=working 10000",
1704+ "mine=iron 2 100 5 2",
1705+ "produce=iron_ore",
1706+ }
1707+ },
1708+ encyclopedia = {
1709+ -- just a dummy program to fix encyclopedia
1710+ descname = "encyclopedia",
1711+ actions = {
1712+ "consume=meal beer",
1713+ "produce=iron_ore:4",
1714 }
1715 },
1716 },
1717
1718=== modified file 'data/tribes/buildings/productionsites/empire/marblemine/init.lua'
1719--- data/tribes/buildings/productionsites/empire/marblemine/init.lua 2018-09-06 08:21:35 +0000
1720+++ data/tribes/buildings/productionsites/empire/marblemine/init.lua 2018-09-11 16:57:31 +0000
1721@@ -60,8 +60,22 @@
1722 -- TRANSLATORS: Completed/Skipped/Did not start working because ...
1723 descname = _"working",
1724 actions = {
1725+ "call=mine_granite",
1726 "call=mine_marble",
1727- "call=mine_granite",
1728+ "return=no_stats"
1729+ }
1730+ },
1731+ mine_granite = {
1732+ -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
1733+ descname = _"mining granite",
1734+ actions = {
1735+ "sleep=18000",
1736+ "return=skipped unless economy needs marble or economy needs granite",
1737+ "consume=ration wine",
1738+ "call=a_mine_produce_granite",
1739+ "call=a_mine_produce_granite",
1740+ "call=a_mine_produce_marble",
1741+ "call=a_mine_produce_granite",
1742 "return=no_stats"
1743 }
1744 },
1745@@ -69,30 +83,46 @@
1746 -- TRANSLATORS: Completed/Skipped/Did not start mining marble because ...
1747 descname = _"mining marble",
1748 actions = {
1749- "sleep=20000",
1750+ "sleep=18000",
1751 "return=skipped unless economy needs marble or economy needs granite",
1752 "consume=wine ration",
1753- "animate=working 20000",
1754- "mine=stones 2 50 5 17",
1755- "produce=marble:2",
1756- "animate=working 20000",
1757- "mine=stones 2 50 5 17",
1758- "produce=marble granite"
1759+ "call=a_mine_produce_marble",
1760+ "call=a_mine_produce_marble",
1761+ "call=a_mine_produce_granite",
1762+ "call=a_mine_produce_marble",
1763+ "return=no_stats"
1764 }
1765 },
1766- mine_granite = {
1767- -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
1768+ a_mine_produce_granite = {
1769 descname = _"mining granite",
1770 actions = {
1771- "sleep=20000",
1772- "return=skipped unless economy needs marble or economy needs granite",
1773+ "animate=working 10500",
1774+ "mine=stones 2 50 5 17",
1775+ "produce=granite",
1776+ }
1777+ },
1778+ a_mine_produce_marble = {
1779+ descname = _"mining marble",
1780+ actions = {
1781+ "animate=working 10500",
1782+ "mine=stones 2 50 5 17",
1783+ "produce=marble",
1784+ }
1785+ },
1786+ encyclopedia_granite = {
1787+ -- just a dummy program to fix encyclopedia
1788+ descname = "encyclopedia",
1789+ actions = {
1790 "consume=ration wine",
1791- "animate=working 20000",
1792- "mine=stones 2 50 5 17",
1793- "produce=granite marble",
1794- "animate=working 20000",
1795- "mine=stones 2 50 5 17",
1796- "produce=granite:2"
1797+ "produce=granite:3 marble",
1798+ }
1799+ },
1800+ encyclopedia_marble = {
1801+ -- just a dummy program to fix encyclopedia
1802+ descname = "encyclopedia",
1803+ actions = {
1804+ "consume=wine ration",
1805+ "produce=marble:3 granite",
1806 }
1807 },
1808 },
1809
1810=== modified file 'data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua'
1811--- data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua 2016-09-03 14:59:10 +0000
1812+++ data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua 2018-09-11 16:57:31 +0000
1813@@ -57,15 +57,39 @@
1814 -- TRANSLATORS: Completed/Skipped/Did not start mining marble because ...
1815 descname = _"mining marble",
1816 actions = {
1817- "sleep=43000",
1818+ "sleep=40000",
1819 "return=skipped unless economy needs marble or economy needs granite",
1820 "consume=meal wine",
1821- "animate=working 18000",
1822- "mine=stones 2 100 5 2",
1823- "produce=marble:2",
1824- "animate=working 18000",
1825- "mine=stones 2 100 5 2",
1826- "produce=marble granite:2"
1827+ "call=mine_produce_marble",
1828+ "call=mine_produce_granite",
1829+ "call=mine_produce_marble",
1830+ "call=mine_produce_granite",
1831+ "call=mine_produce_marble",
1832+ "return=no_stats"
1833+ }
1834+ },
1835+ mine_produce_granite = {
1836+ descname = _"mining marble",
1837+ actions = {
1838+ "animate=working 7800",
1839+ "mine=stones 2 100 5 2",
1840+ "produce=granite",
1841+ }
1842+ },
1843+ mine_produce_marble = {
1844+ descname = _"mining marble",
1845+ actions = {
1846+ "animate=working 7800",
1847+ "mine=stones 2 100 5 2",
1848+ "produce=marble",
1849+ }
1850+ },
1851+ encyclopedia = {
1852+ -- just a dummy program to fix encyclopedia
1853+ descname = "encyclopedia",
1854+ actions = {
1855+ "consume=meal wine",
1856+ "produce=marble:3 granite:2",
1857 }
1858 },
1859 },
1860
1861=== modified file 'data/tribes/buildings/productionsites/empire/smelting_works/init.lua'
1862--- data/tribes/buildings/productionsites/empire/smelting_works/init.lua 2018-09-06 08:21:35 +0000
1863+++ data/tribes/buildings/productionsites/empire/smelting_works/init.lua 2018-09-11 16:57:31 +0000
1864@@ -71,9 +71,8 @@
1865 descname = _"smelting iron",
1866 actions = {
1867 "return=skipped unless economy needs iron",
1868- "sleep=5000", -- penalty for unavailable iron_ore (2x)
1869 "consume=iron_ore coal",
1870- "sleep=20000",
1871+ "sleep=25000",
1872 "playsound=sound/metal fizzle 150",
1873 "animate=working 35000",
1874 "playsound=sound/metal ironping 80",
1875@@ -85,9 +84,8 @@
1876 descname = _"smelting gold",
1877 actions = {
1878 "return=skipped unless economy needs gold",
1879- "sleep=10000", -- penalty for unavailable gold_ore
1880 "consume=gold_ore coal",
1881- "sleep=15000",
1882+ "sleep=25000",
1883 "playsound=sound/metal fizzle 150",
1884 "animate=working 35000",
1885 "playsound=sound/metal goldping 80",
1886
1887=== modified file 'data/tribes/buildings/productionsites/empire/tavern/init.lua'
1888--- data/tribes/buildings/productionsites/empire/tavern/init.lua 2017-11-18 17:57:00 +0000
1889+++ data/tribes/buildings/productionsites/empire/tavern/init.lua 2018-09-11 16:57:31 +0000
1890@@ -56,11 +56,12 @@
1891 descname = _"preparing a ration",
1892 actions = {
1893 -- time total: 33
1894- "sleep=14000",
1895 "return=skipped unless economy needs ration",
1896+ "sleep=5000",
1897 "consume=empire_bread,fish,meat",
1898 "playsound=sound/empire/taverns ration 100",
1899- "animate=working 19000",
1900+ "animate=working 18000",
1901+ "sleep=10000",
1902 "produce=ration"
1903 }
1904 },
1905
1906=== modified file 'data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua'
1907--- data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua 2018-09-06 08:21:35 +0000
1908+++ data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua 2018-09-11 16:57:31 +0000
1909@@ -77,12 +77,12 @@
1910 -- TRANSLATORS: Completed/Skipped/Did not start forging a wooden spear because ...
1911 descname = _"forging a wooden spear",
1912 actions = {
1913- -- time total: 64
1914+ -- time total: 50 + 3.6
1915 "return=skipped unless economy needs spear_wooden",
1916- "sleep=27000", -- +7 enlarge
1917 "consume=planks",
1918+ "sleep=20000",
1919 "playsound=sound/smiths smith 192",
1920- "animate=working 28000", -- +7 enlarge
1921+ "animate=working 21000",
1922 "playsound=sound/smiths sharpening 120",
1923 "sleep=9000",
1924 "produce=spear_wooden"
1925@@ -92,12 +92,12 @@
1926 -- TRANSLATORS: Completed/Skipped/Did not start forging a spear because ...
1927 descname = _"forging a spear",
1928 actions = {
1929- -- time total: 102
1930+ -- time total: 77 + 3.6
1931 "return=skipped unless economy needs spear",
1932 "consume=coal iron planks",
1933- "sleep=47000", -- +15 enlarge
1934+ "sleep=32000",
1935 "playsound=sound/smiths smith 192",
1936- "animate=working 46000", -- +10 enlarge
1937+ "animate=working 36000",
1938 "playsound=sound/smiths sharpening 120",
1939 "sleep=9000",
1940 "produce=spear"
1941@@ -107,12 +107,12 @@
1942 -- TRANSLATORS: Completed/Skipped/Did not start forging an advanced spear because ...
1943 descname = _"forging an advanced spear",
1944 actions = {
1945- -- time total: 110
1946+ -- time total: 77 + 3.6
1947 "return=skipped unless economy needs spear_advanced",
1948 "consume=coal iron:2 planks",
1949- "sleep=50000", -- +18 enlarge
1950+ "sleep=32000",
1951 "playsound=sound/smiths smith 192",
1952- "animate=working 51000", -- +15 enlarge
1953+ "animate=working 36000",
1954 "playsound=sound/smiths sharpening 120",
1955 "sleep=9000",
1956 "produce=spear_advanced"
1957@@ -122,12 +122,12 @@
1958 -- TRANSLATORS: Completed/Skipped/Did not start forging a heavy spear because ...
1959 descname = _"forging a heavy spear",
1960 actions = {
1961- -- time total: 115
1962+ -- time total: 77 + 3.6
1963 "return=skipped unless economy needs spear_heavy",
1964 "consume=coal:2 gold iron planks",
1965- "sleep=55000", -- +23 enlarge
1966+ "sleep=32000",
1967 "playsound=sound/smiths smith 192",
1968- "animate=working 51000", -- +15 enlarge
1969+ "animate=working 36000",
1970 "playsound=sound/smiths sharpening 120",
1971 "sleep=9000",
1972 "produce=spear_heavy"
1973@@ -137,12 +137,12 @@
1974 -- TRANSLATORS: Completed/Skipped/Did not start forging a war spear because ...
1975 descname = _"forging a war spear",
1976 actions = {
1977- -- time total: 120
1978+ -- time total: 77 + 3.6
1979 "return=skipped unless economy needs spear_war",
1980 "consume=coal:2 gold iron:2 planks",
1981- "sleep=55000", -- +23 enlarge
1982+ "sleep=32000",
1983 "playsound=sound/smiths smith 192",
1984- "animate=working 56000", -- +20 enlarge
1985+ "animate=working 36000",
1986 "playsound=sound/smiths sharpening 120",
1987 "sleep=9000",
1988 "produce=spear_war"
1989
1990=== modified file 'data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua'
1991--- data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua 2018-09-06 08:21:35 +0000
1992+++ data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua 2018-09-11 16:57:31 +0000
1993@@ -74,12 +74,12 @@
1994 -- TRANSLATORS: Completed/Skipped/Did not start forging a broadsword because ...
1995 descname = _"forging a broadsword",
1996 actions = {
1997- -- time total: 82
1998+ -- time total: 57 + 3.6
1999 "return=skipped unless economy needs sword_broad",
2000- "sleep=39000",
2001 "consume=coal iron:2 gold",
2002+ "sleep=24000",
2003 "playsound=sound/smiths smith 192",
2004- "animate=working 34000",
2005+ "animate=working 24000",
2006 "playsound=sound/smiths sharpening 120",
2007 "sleep=9000",
2008 "produce=sword_broad"
2009@@ -89,12 +89,12 @@
2010 -- TRANSLATORS: Completed/Skipped/Did not start forging a double-edged sword because ...
2011 descname = _"forging a double-edged sword",
2012 actions = {
2013- -- time total: 87
2014+ -- time total: 57 + 3.6
2015 "return=skipped unless economy needs sword_double",
2016 "consume=coal:2 iron:2 gold",
2017- "sleep=41000",
2018+ "sleep=24000",
2019 "playsound=sound/smiths smith 192",
2020- "animate=working 37000",
2021+ "animate=working 24000",
2022 "playsound=sound/smiths sharpening 120",
2023 "sleep=9000",
2024 "produce=sword_double"
2025@@ -104,11 +104,11 @@
2026 -- TRANSLATORS: Completed/Skipped/Did not start forging a golden helmet because ...
2027 descname = _"forging a golden helmet",
2028 actions = {
2029- -- time total: 115
2030+ -- time total: 67 + 3.6
2031 "return=skipped unless economy needs helmet_golden",
2032 "consume=coal:2 iron:2 gold",
2033- "sleep=51000",
2034- "animate=working 64000",
2035+ "sleep=30000",
2036+ "animate=working 37000",
2037 "produce=helmet_golden"
2038 },
2039 },
2040
2041=== modified file 'data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua'
2042--- data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua 2018-09-06 08:21:35 +0000
2043+++ data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua 2018-09-11 16:57:31 +0000
2044@@ -73,12 +73,12 @@
2045 -- TRANSLATORS: Completed/Skipped/Did not start forging a short sword because ...
2046 descname = _"forging a short sword",
2047 actions = {
2048- -- time total: 76
2049+ -- time total: 57 + 3.6
2050 "return=skipped unless economy needs sword_short",
2051- "sleep=37000",
2052 "consume=coal iron",
2053+ "sleep=24000",
2054 "playsound=sound/smiths smith 192",
2055- "animate=working 30000",
2056+ "animate=working 24000",
2057 "playsound=sound/smiths sharpening 120",
2058 "sleep=9000",
2059 "produce=sword_short"
2060@@ -88,12 +88,12 @@
2061 -- TRANSLATORS: Completed/Skipped/Did not start forging a long sword because ...
2062 descname = _"forging a long sword",
2063 actions = {
2064- -- time total: 79
2065+ -- time total: 57 + 3.6
2066 "return=skipped unless economy needs sword_long",
2067 "consume=coal iron:2",
2068- "sleep=38000",
2069+ "sleep=24000",
2070 "playsound=sound/smiths smith 192",
2071- "animate=working 32000",
2072+ "animate=working 24000",
2073 "playsound=sound/smiths sharpening 120",
2074 "sleep=9000",
2075 "produce=sword_long"
2076@@ -103,11 +103,12 @@
2077 -- TRANSLATORS: Completed/Skipped/Did not start forging a helmet because ...
2078 descname = _"forging a helmet",
2079 actions = {
2080- -- time total: 100
2081+ -- time total: 67 + 3.6
2082 "return=skipped unless economy needs helmet",
2083 "consume=coal iron:2",
2084- "sleep=50000",
2085- "animate=working 50000",
2086+ "sleep=30000",
2087+ "playsound=sound/smiths smith 192",
2088+ "animate=working 37000",
2089 "produce=helmet"
2090 },
2091 },
2092
2093=== modified file 'data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua'
2094--- data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua 2018-09-06 08:21:35 +0000
2095+++ data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua 2018-09-11 16:57:31 +0000
2096@@ -94,8 +94,8 @@
2097 descname = _"forging a felling ax",
2098 actions = {
2099 "return=skipped unless economy needs felling_ax",
2100+ "consume=log iron",
2101 "sleep=32000",
2102- "consume=log iron",
2103 "animate=working 35000",
2104 "produce=felling_ax"
2105 },
2106@@ -105,8 +105,8 @@
2107 descname = _"forging a pick",
2108 actions = {
2109 "return=skipped unless economy needs pick",
2110+ "consume=log iron",
2111 "sleep=32000",
2112- "consume=log iron",
2113 "animate=working 35000",
2114 "produce=pick"
2115 },
2116@@ -116,8 +116,8 @@
2117 descname = _"making a scythe",
2118 actions = {
2119 "return=skipped unless economy needs scythe",
2120+ "consume=log iron",
2121 "sleep=32000",
2122- "consume=log iron",
2123 "animate=working 35000",
2124 "produce=scythe"
2125 },
2126@@ -127,8 +127,8 @@
2127 descname = _"making a shovel",
2128 actions = {
2129 "return=skipped unless economy needs shovel",
2130+ "consume=log iron",
2131 "sleep=32000",
2132- "consume=log iron",
2133 "animate=working 35000",
2134 "produce=shovel"
2135 },
2136@@ -138,8 +138,8 @@
2137 descname = _"making a basket",
2138 actions = {
2139 "return=skipped unless economy needs basket",
2140- "sleep=32000",
2141 "consume=thatch_reed log",
2142+ "sleep=32000",
2143 "animate=working 35000",
2144 "produce=basket"
2145 },
2146@@ -149,8 +149,8 @@
2147 descname = _"making a hunting spear",
2148 actions = {
2149 "return=skipped unless economy needs hunting_spear",
2150+ "consume=log iron",
2151 "sleep=32000",
2152- "consume=log iron",
2153 "animate=working 35000",
2154 "produce=hunting_spear"
2155 },
2156@@ -160,8 +160,8 @@
2157 descname = _"making a fishing net",
2158 actions = {
2159 "return=skipped unless economy needs fishing_net",
2160- "sleep=32000",
2161 "consume=thatch_reed:2",
2162+ "sleep=32000",
2163 "animate=working 35000",
2164 "produce=fishing_net"
2165 },
2166@@ -171,8 +171,8 @@
2167 descname = _"making a bread paddle",
2168 actions = {
2169 "return=skipped unless economy needs bread_paddle",
2170+ "consume=log iron",
2171 "sleep=32000",
2172- "consume=log iron",
2173 "animate=working 35000",
2174 "produce=bread_paddle"
2175 },
2176@@ -182,8 +182,8 @@
2177 descname = _"making kitchen tools",
2178 actions = {
2179 "return=skipped unless economy needs kitchen_tools",
2180+ "consume=log iron",
2181 "sleep=32000",
2182- "consume=log iron",
2183 "animate=working 35000",
2184 "produce=kitchen_tools"
2185 },
2186@@ -193,8 +193,8 @@
2187 descname = _"making a hammer",
2188 actions = {
2189 "return=skipped unless economy needs hammer",
2190+ "consume=log iron",
2191 "sleep=32000",
2192- "consume=log iron",
2193 "animate=working 35000",
2194 "produce=hammer"
2195 },
2196@@ -204,8 +204,8 @@
2197 descname = _"making fire tongs",
2198 actions = {
2199 "return=skipped unless economy needs fire_tongs",
2200+ "consume=iron",
2201 "sleep=32000",
2202- "consume=iron",
2203 "animate=working 35000",
2204 "produce=fire_tongs"
2205 },
2206@@ -215,8 +215,8 @@
2207 descname = _"making needles",
2208 actions = {
2209 "return=skipped unless economy needs needles",
2210+ "consume=iron",
2211 "sleep=32000",
2212- "consume=iron",
2213 "animate=working 35000",
2214 "produce=needles:2"
2215 },
2216
2217=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine/init.lua'
2218--- data/tribes/buildings/productionsites/frisians/coalmine/init.lua 2018-07-19 09:40:06 +0000
2219+++ data/tribes/buildings/productionsites/frisians/coalmine/init.lua 2018-09-11 16:57:31 +0000
2220@@ -64,12 +64,29 @@
2221 -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
2222 descname = _"mining coal",
2223 actions = {
2224- "sleep=45000",
2225+ "sleep=5000",
2226 "return=skipped unless economy needs coal",
2227 "consume=ration",
2228- "animate=working 40000",
2229+ "sleep=40000",
2230+ "call=mine_produce",
2231+ "call=mine_produce",
2232+ "return=no_stats"
2233+ }
2234+ },
2235+ mine_produce = {
2236+ descname = _"mining coal",
2237+ actions = {
2238+ "animate=working 15000",
2239 "mine=coal 3 50 5 20",
2240- "produce=coal:2"
2241+ "produce=coal",
2242+ }
2243+ },
2244+ encyclopedia = {
2245+ -- just a dummy program to fix encyclopedia
2246+ descname = "encyclopedia",
2247+ actions = {
2248+ "consume=ration",
2249+ "produce=coal:2",
2250 }
2251 },
2252 },
2253
2254=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua'
2255--- data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua 2018-07-19 09:40:06 +0000
2256+++ data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua 2018-09-11 16:57:31 +0000
2257@@ -63,21 +63,34 @@
2258 -- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
2259 descname = _"mining coal",
2260 actions = {
2261- "sleep=40000",
2262+ "sleep=5000",
2263 "return=skipped unless economy needs coal",
2264 "consume=meal",
2265- "animate=working 9000",
2266- "mine=coal 3 100 10 5",
2267- "produce=coal",
2268- "animate=working 9000",
2269- "mine=coal 3 100 10 5",
2270- "produce=coal",
2271- "animate=working 9000",
2272- "mine=coal 3 100 10 5",
2273- "produce=coal",
2274- "animate=working 9000",
2275- "mine=coal 3 100 10 5",
2276- "produce=coal"
2277+ "sleep=34900",
2278+ "call=mine_produce",
2279+ "call=mine_produce",
2280+ "call=mine_produce",
2281+ "call=mine_produce",
2282+ "call=mine_produce",
2283+ "call=mine_produce",
2284+ "call=mine_produce",
2285+ "return=no_stats"
2286+ }
2287+ },
2288+ mine_produce = {
2289+ descname = _"mining coal",
2290+ actions = {
2291+ "animate=working 8700",
2292+ "mine=coal 3 100 10 5",
2293+ "produce=coal",
2294+ }
2295+ },
2296+ encyclopedia = {
2297+ -- just a dummy program to fix encyclopedia
2298+ descname = "encyclopedia",
2299+ actions = {
2300+ "consume=meal",
2301+ "produce=coal:7",
2302 }
2303 },
2304 },
2305
2306=== modified file 'data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua'
2307--- data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua 2018-09-06 08:21:35 +0000
2308+++ data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua 2018-09-11 16:57:31 +0000
2309@@ -72,10 +72,12 @@
2310 -- TRANSLATORS: Completed/Skipped/Did not start preparing a ration because ...
2311 descname = _"preparing a ration",
2312 actions = {
2313+ -- time total: 33
2314 "return=skipped unless economy needs ration",
2315- "sleep=14000",
2316+ "sleep=5000",
2317 "consume=fruit,smoked_fish,smoked_meat",
2318- "animate=working 19000",
2319+ "animate=working 18000",
2320+ "sleep=10000",
2321 "produce=ration"
2322 }
2323 },
2324@@ -83,10 +85,11 @@
2325 -- TRANSLATORS: Completed/Skipped/Did not start preparing a meal because ...
2326 descname = _"preparing a meal",
2327 actions = {
2328+ --time total: 40
2329 "return=skipped unless economy needs meal",
2330- "sleep=10000",
2331 "consume=beer honey_bread smoked_fish,smoked_meat",
2332 "animate=working 30000",
2333+ "sleep=10000",
2334 "produce=meal"
2335 }
2336 },
2337
2338=== modified file 'data/tribes/buildings/productionsites/frisians/furnace/init.lua'
2339--- data/tribes/buildings/productionsites/frisians/furnace/init.lua 2018-09-06 08:21:35 +0000
2340+++ data/tribes/buildings/productionsites/frisians/furnace/init.lua 2018-09-11 16:57:31 +0000
2341@@ -80,9 +80,8 @@
2342 descname = _"smelting iron",
2343 actions = {
2344 "return=skipped unless economy needs iron",
2345- "sleep=5000",
2346 "consume=coal iron_ore",
2347- "sleep=22000",
2348+ "sleep=27000",
2349 "animate=working_iron 35000",
2350 "produce=iron"
2351 },
2352@@ -92,9 +91,8 @@
2353 descname = _"smelting gold",
2354 actions = {
2355 "return=skipped unless economy needs gold",
2356- "sleep=10000",
2357 "consume=coal gold_ore",
2358- "sleep=17000",
2359+ "sleep=27000",
2360 "animate=working_gold 35000",
2361 "produce=gold"
2362 },
2363
2364=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine/init.lua'
2365--- data/tribes/buildings/productionsites/frisians/goldmine/init.lua 2018-07-19 09:40:06 +0000
2366+++ data/tribes/buildings/productionsites/frisians/goldmine/init.lua 2018-09-11 16:57:31 +0000
2367@@ -65,9 +65,10 @@
2368 -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
2369 descname = _"mining gold",
2370 actions = {
2371- "sleep=45000",
2372+ "sleep=5000",
2373 "return=skipped unless economy needs gold_ore",
2374 "consume=ration",
2375+ "sleep=40000",
2376 "animate=working 20000",
2377 "mine=gold 3 50 5 20", --name radius % chance_empty gain_exp_on_empty
2378 "produce=gold_ore"
2379
2380=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua'
2381--- data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua 2018-07-19 09:40:06 +0000
2382+++ data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua 2018-09-11 16:57:31 +0000
2383@@ -63,15 +63,32 @@
2384 -- TRANSLATORS: Completed/Skipped/Did not start mining gold because ...
2385 descname = _"mining gold",
2386 actions = {
2387- "sleep=40000",
2388+ "sleep=5000",
2389 "return=skipped unless economy needs gold_ore",
2390 "consume=meal",
2391- "animate=working 18000",
2392- "mine=gold 3 100 10 5",
2393- "produce=gold_ore:2",
2394- "animate=working 18000",
2395- "mine=gold 3 100 10 5",
2396- "produce=gold_ore:2"
2397+ "sleep=34800",
2398+ "call=mine_produce",
2399+ "call=mine_produce",
2400+ "call=mine_produce",
2401+ "call=mine_produce",
2402+ "call=mine_produce",
2403+ "return=no_stats"
2404+ }
2405+ },
2406+ mine_produce = {
2407+ descname = _"mining gold",
2408+ actions = {
2409+ "animate=working 12200",
2410+ "mine=gold 3 100 10 5",
2411+ "produce=gold_ore",
2412+ }
2413+ },
2414+ encyclopedia = {
2415+ -- just a dummy program to fix encyclopedia
2416+ descname = "encyclopedia",
2417+ actions = {
2418+ "consume=meal",
2419+ "produce=gold_ore:5",
2420 }
2421 },
2422 },
2423
2424=== modified file 'data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua'
2425--- data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua 2018-09-06 08:21:35 +0000
2426+++ data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua 2018-09-11 16:57:31 +0000
2427@@ -72,8 +72,8 @@
2428 descname = _"baking honey bread",
2429 actions = {
2430 "return=skipped unless economy needs honey_bread or workers need experience",
2431+ "consume=barley water honey",
2432 "sleep=35000",
2433- "consume=barley water honey",
2434 "animate=working 35000",
2435 "produce=honey_bread"
2436 }
2437@@ -82,9 +82,9 @@
2438 -- TRANSLATORS: Completed/Skipped/Did not start baking bread because ...
2439 descname = _"baking bread",
2440 actions = {
2441- "return=skipped unless economy needs bread_frisians or workers need experience",
2442+ "return=skipped unless economy needs bread_frisians",
2443+ "consume=barley water",
2444 "sleep=20000",
2445- "consume=barley water",
2446 "animate=working 20000",
2447 "produce=bread_frisians"
2448 }
2449
2450=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine/init.lua'
2451--- data/tribes/buildings/productionsites/frisians/ironmine/init.lua 2018-07-19 09:40:06 +0000
2452+++ data/tribes/buildings/productionsites/frisians/ironmine/init.lua 2018-09-11 16:57:31 +0000
2453@@ -65,9 +65,10 @@
2454 -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
2455 descname = _"mining iron",
2456 actions = {
2457- "sleep=45000",
2458+ "sleep=5000",
2459 "return=skipped unless economy needs iron_ore",
2460 "consume=ration",
2461+ "sleep=40000",
2462 "animate=working 20000",
2463 "mine=iron 3 50 5 20",
2464 "produce=iron_ore"
2465
2466=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua'
2467--- data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua 2018-07-19 09:40:06 +0000
2468+++ data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua 2018-09-11 16:57:31 +0000
2469@@ -63,15 +63,34 @@
2470 -- TRANSLATORS: Completed/Skipped/Did not start mining iron because ...
2471 descname = _"mining iron",
2472 actions = {
2473- "sleep=40000",
2474+ "sleep=5000",
2475 "return=skipped unless economy needs iron_ore",
2476 "consume=meal",
2477- "animate=working 18000",
2478- "mine=iron 3 100 10 5",
2479- "produce=iron_ore:2",
2480- "animate=working 18000",
2481- "mine=iron 3 100 10 5",
2482- "produce=iron_ore:2"
2483+ "sleep=57100",
2484+ "call=mine_produce",
2485+ "call=mine_produce",
2486+ "call=mine_produce",
2487+ "call=mine_produce",
2488+ "call=mine_produce",
2489+ "call=mine_produce",
2490+ "call=mine_produce",
2491+ "return=no_stats"
2492+ }
2493+ },
2494+ mine_produce = {
2495+ descname = _"mining iron",
2496+ actions = {
2497+ "animate=working 8700",
2498+ "mine=iron 3 100 10 5",
2499+ "produce=iron_ore",
2500+ }
2501+ },
2502+ encyclopedia = {
2503+ -- just a dummy program to fix encyclopedia
2504+ descname = "encyclopedia",
2505+ actions = {
2506+ "consume=meal",
2507+ "produce=iron_ore:7",
2508 }
2509 },
2510 },
2511
2512=== modified file 'data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua'
2513--- data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua 2018-09-06 08:21:35 +0000
2514+++ data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua 2018-09-11 16:57:31 +0000
2515@@ -70,8 +70,8 @@
2516 descname = _"brewing mead",
2517 actions = {
2518 "return=skipped unless economy needs mead or workers need experience",
2519+ "consume=barley water honey",
2520 "sleep=35000",
2521- "consume=barley water honey",
2522 "animate=working 35000",
2523 "produce=mead"
2524 }
2525@@ -80,9 +80,9 @@
2526 -- TRANSLATORS: Completed/Skipped/Did not start brewing beer because ...
2527 descname = _"brewing beer",
2528 actions = {
2529- "return=skipped unless economy needs beer or workers need experience",
2530+ "return=skipped unless economy needs beer",
2531+ "consume=barley water",
2532 "sleep=30000",
2533- "consume=barley water",
2534 "animate=working 30000",
2535 "produce=beer"
2536 }
2537
2538=== modified file 'data/tribes/buildings/productionsites/frisians/recycling_center/init.lua'
2539--- data/tribes/buildings/productionsites/frisians/recycling_center/init.lua 2018-09-06 08:21:35 +0000
2540+++ data/tribes/buildings/productionsites/frisians/recycling_center/init.lua 2018-09-11 16:57:31 +0000
2541@@ -96,9 +96,9 @@
2542 descname = pgettext("frisians_building", "recycling iron"),
2543 actions = {
2544 "return=skipped unless economy needs iron",
2545- "sleep=40000",
2546 "consume=scrap_iron:2 coal",
2547 "animate=working_metal 40000",
2548+ "sleep=40000",
2549 "produce=iron:2"
2550 }
2551 },
2552@@ -107,9 +107,9 @@
2553 descname = pgettext("frisians_building", "recycling iron and gold"),
2554 actions = {
2555 "return=skipped unless economy needs iron or economy needs gold",
2556- "sleep=40000",
2557 "consume=scrap_metal_mixed:2 coal",
2558 "animate=working_metal 40000",
2559+ "sleep=40000",
2560 "produce=iron gold"
2561 }
2562 },
2563
2564=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine/init.lua'
2565--- data/tribes/buildings/productionsites/frisians/rockmine/init.lua 2018-07-19 09:40:06 +0000
2566+++ data/tribes/buildings/productionsites/frisians/rockmine/init.lua 2018-09-11 16:57:31 +0000
2567@@ -65,15 +65,29 @@
2568 -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
2569 descname = _"mining granite",
2570 actions = {
2571- "sleep=45000",
2572+ "sleep=5000",
2573 "return=skipped unless economy needs granite",
2574 "consume=ration",
2575- "animate=working 20000",
2576+ "sleep=38000",
2577+ "call=mine_produce",
2578+ "call=mine_produce",
2579+ "return=no_stats"
2580+ }
2581+ },
2582+ mine_produce = {
2583+ descname = _"mining granite",
2584+ actions = {
2585+ "animate=working 21000",
2586 "mine=stones 3 50 5 20",
2587 "produce=granite",
2588- "animate=working 20000",
2589- "mine=stones 3 50 5 20",
2590- "produce=granite"
2591+ }
2592+ },
2593+ encyclopedia = {
2594+ -- just a dummy program to fix encyclopedia
2595+ descname = "encyclopedia",
2596+ actions = {
2597+ "consume=ration",
2598+ "produce=granite:2",
2599 }
2600 },
2601 },
2602
2603=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua'
2604--- data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua 2018-07-19 09:40:06 +0000
2605+++ data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua 2018-09-11 16:57:31 +0000
2606@@ -63,18 +63,34 @@
2607 -- TRANSLATORS: Completed/Skipped/Did not start mining granite because ...
2608 descname = _"mining granite",
2609 actions = {
2610- "sleep=40000",
2611+ "sleep=5000",
2612 "return=skipped unless economy needs granite",
2613 "consume=meal",
2614- "animate=working 12000",
2615- "mine=stones 3 100 10 5",
2616- "produce=granite",
2617- "animate=working 12000",
2618- "mine=stones 3 100 10 5",
2619- "produce=granite",
2620- "animate=working 12000",
2621- "mine=stones 3 100 10 5",
2622- "produce=granite"
2623+ "sleep=34900",
2624+ "call=mine_produce",
2625+ "call=mine_produce",
2626+ "call=mine_produce",
2627+ "call=mine_produce",
2628+ "call=mine_produce",
2629+ "call=mine_produce",
2630+ "call=mine_produce",
2631+ "return=no_stats"
2632+ }
2633+ },
2634+ mine_produce = {
2635+ descname = _"mining granite",
2636+ actions = {
2637+ "animate=working 8700",
2638+ "mine=stones 3 100 10 5",
2639+ "produce=granite",
2640+ }
2641+ },
2642+ encyclopedia = {
2643+ -- just a dummy program to fix encyclopedia
2644+ descname = "encyclopedia",
2645+ actions = {
2646+ "consume=meal",
2647+ "produce=granite:7",
2648 }
2649 },
2650 },
2651
2652=== modified file 'data/tribes/buildings/productionsites/frisians/sewing_room/init.lua'
2653--- data/tribes/buildings/productionsites/frisians/sewing_room/init.lua 2018-07-09 09:25:35 +0000
2654+++ data/tribes/buildings/productionsites/frisians/sewing_room/init.lua 2018-09-11 16:57:31 +0000
2655@@ -58,10 +58,11 @@
2656 -- TRANSLATORS: Completed/Skipped/Did not start sewing fur garment because ...
2657 descname = _"sewing fur garment",
2658 actions = {
2659+ -- time total: 40 + 3.6
2660 "sleep=20000",
2661 "return=skipped unless economy needs fur_garment or workers need experience",
2662 "consume=fur:2",
2663- "animate=working 25000",
2664+ "animate=working 20000",
2665 "produce=fur_garment"
2666 },
2667 },
2668
2669=== modified file 'data/tribes/buildings/productionsites/frisians/smokery/init.lua'
2670--- data/tribes/buildings/productionsites/frisians/smokery/init.lua 2018-09-06 08:21:35 +0000
2671+++ data/tribes/buildings/productionsites/frisians/smokery/init.lua 2018-09-11 16:57:31 +0000
2672@@ -73,8 +73,8 @@
2673 descname = _"smoking fish",
2674 actions = {
2675 "return=skipped unless economy needs smoked_fish",
2676- "sleep=16000",
2677 "consume=fish:2 log",
2678+ "sleep=16000",
2679 "animate=working 30000",
2680 "produce=smoked_fish:2"
2681 },
2682@@ -85,8 +85,8 @@
2683 actions = {
2684 "return=skipped when site has fish:2 and economy needs smoked_fish",
2685 "return=skipped unless economy needs smoked_meat",
2686- "sleep=16000",
2687 "consume=meat:2 log",
2688+ "sleep=16000",
2689 "animate=working 30000",
2690 "produce=smoked_meat:2"
2691 },
2692
2693=== modified file 'data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua'
2694--- data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua 2018-09-06 08:21:35 +0000
2695+++ data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua 2018-09-11 16:57:31 +0000
2696@@ -70,10 +70,11 @@
2697 -- TRANSLATORS: Completed/Skipped/Did not start sewing studded fur garment because ...
2698 descname = _"sewing studded fur garment",
2699 actions = {
2700+ -- time total: 50 + 3.6
2701 "return=skipped unless economy needs fur_garment_studded",
2702- "sleep=45000",
2703+ "sleep=25000",
2704 "consume=fur_garment iron",
2705- "animate=working 45000",
2706+ "animate=working 25000",
2707 "produce=fur_garment_studded"
2708 },
2709 },
2710@@ -81,10 +82,11 @@
2711 -- TRANSLATORS: Completed/Skipped/Did not start sewing golden fur garment because ...
2712 descname = _"sewing golden fur garment",
2713 actions = {
2714+ -- time total: 50 + 3.6
2715 "return=skipped unless economy needs fur_garment_golden",
2716- "sleep=47000",
2717+ "sleep=25000",
2718 "consume=fur_garment iron gold",
2719- "animate=working 61000",
2720+ "animate=working 25000",
2721 "produce=fur_garment_golden"
2722 },
2723 },
2724
2725=== modified file 'data/tribes/buildings/productionsites/frisians/tavern/init.lua'
2726--- data/tribes/buildings/productionsites/frisians/tavern/init.lua 2018-09-06 08:21:35 +0000
2727+++ data/tribes/buildings/productionsites/frisians/tavern/init.lua 2018-09-11 16:57:31 +0000
2728@@ -73,11 +73,13 @@
2729 -- TRANSLATORS: Completed/Skipped/Did not start preparing only one ration because ... (can produce more efficient when supply is good)
2730 descname = _"preparing only one ration",
2731 actions = {
2732+ -- time total: 49.5
2733 "return=skipped unless economy needs ration",
2734 "return=skipped when site has fruit,bread_frisians and site has smoked_fish,smoked_meat",
2735- "sleep=21000",
2736+ "sleep=5000",
2737 "consume=fruit,bread_frisians,smoked_fish,smoked_meat",
2738- "animate=working 28500",
2739+ "animate=working 34500",
2740+ "sleep=10000",
2741 "produce=ration"
2742 },
2743 },
2744@@ -85,10 +87,12 @@
2745 -- TRANSLATORS: Completed/Skipped/Did not start preparing rations because ...
2746 descname = _"preparing rations",
2747 actions = {
2748+ -- time total: 66
2749 "return=skipped unless economy needs ration",
2750+ "sleep=5000",
2751 "consume=fruit,bread_frisians smoked_fish,smoked_meat",
2752- "sleep=28000",
2753- "animate=working 38000",
2754+ "animate=working 51000",
2755+ "sleep=10000",
2756 "produce=ration:2"
2757 },
2758 },
2759
2760=== modified file 'data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua'
2761--- data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua 2017-11-18 21:23:09 +0000
2762+++ data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua 2018-09-11 16:57:31 +0000
2763@@ -112,6 +112,7 @@
2764 },
2765
2766 aihints = {
2767+ trainingsites_max_percent = 40,
2768 prohibited_till = 1500,
2769 very_weak_ai_limit = 0,
2770 weak_ai_limit = 1
2771
2772=== modified file 'data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua'
2773--- data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua 2017-11-18 21:23:09 +0000
2774+++ data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua 2018-09-11 16:57:31 +0000
2775@@ -46,6 +46,7 @@
2776 },
2777
2778 aihints = {
2779+ trainingsites_max_percent = 25,
2780 prohibited_till = 900,
2781 very_weak_ai_limit = 1,
2782 weak_ai_limit = 2
2783
2784=== modified file 'data/tribes/buildings/trainingsites/empire/arena/init.lua'
2785--- data/tribes/buildings/trainingsites/empire/arena/init.lua 2017-11-18 21:23:09 +0000
2786+++ data/tribes/buildings/trainingsites/empire/arena/init.lua 2018-09-11 16:57:31 +0000
2787@@ -37,7 +37,7 @@
2788 },
2789
2790 aihints = {
2791- trainingsites_max_percent = 20,
2792+ trainingsites_max_percent = 10,
2793 prohibited_till = 900,
2794 very_weak_ai_limit = 1,
2795 weak_ai_limit = 2
2796
2797=== modified file 'data/tribes/buildings/trainingsites/empire/colosseum/init.lua'
2798--- data/tribes/buildings/trainingsites/empire/colosseum/init.lua 2017-11-18 21:23:09 +0000
2799+++ data/tribes/buildings/trainingsites/empire/colosseum/init.lua 2018-09-11 16:57:31 +0000
2800@@ -33,6 +33,7 @@
2801 },
2802
2803 aihints = {
2804+ trainingsites_max_percent = 25,
2805 prohibited_till = 1200,
2806 very_weak_ai_limit = 1,
2807 weak_ai_limit = 2
2808
2809=== modified file 'data/tribes/buildings/trainingsites/frisians/training_arena/init.lua'
2810--- data/tribes/buildings/trainingsites/frisians/training_arena/init.lua 2018-07-18 14:33:41 +0000
2811+++ data/tribes/buildings/trainingsites/frisians/training_arena/init.lua 2018-09-11 16:57:31 +0000
2812@@ -42,6 +42,7 @@
2813 },
2814
2815 aihints = {
2816+ trainingsites_max_percent = 40,
2817 prohibited_till = 1500,
2818 very_weak_ai_limit = 0,
2819 weak_ai_limit = 1
2820
2821=== modified file 'data/tribes/scripting/help/ware_help.lua'
2822--- data/tribes/scripting/help/ware_help.lua 2018-01-10 16:21:50 +0000
2823+++ data/tribes/scripting/help/ware_help.lua 2018-09-11 16:57:31 +0000
2824@@ -53,52 +53,63 @@
2825 -- TRANSLATORS: Ware Encyclopedia: A building producing a ware
2826 result = result .. h2(_"Producer")
2827 result = result .. dependencies({building, ware_description}, building.descname)
2828-
2829- -- Find out which programs in the building produce this ware
2830 local producing_programs = {}
2831- for j, program_name in ipairs(building.production_programs) do
2832- for ware, amount in pairs(building:produced_wares(program_name)) do
2833- if (ware_description.name == ware) then
2834- table.insert(producing_programs, program_name)
2835- end
2836- end
2837- end
2838-
2839- -- Now collect all wares produced by the filtered programs
2840- local produced_wares_strings = {}
2841- local produced_wares_counters = {}
2842- for j, program_name in ipairs(producing_programs) do
2843- local produced_wares_amount = {}
2844- produced_wares_counters[program_name] = 0
2845- for ware, amount in pairs(building:produced_wares(program_name)) do
2846- if (produced_wares_amount[ware] == nil) then
2847- produced_wares_amount[ware] = 0
2848- end
2849- produced_wares_amount[ware] = produced_wares_amount[ware] + amount
2850- produced_wares_counters[program_name] = produced_wares_counters[program_name] + amount
2851- end
2852- local produced_wares_string = ""
2853- for ware, amount in pairs(produced_wares_amount) do
2854- local ware_descr = wl.Game():get_ware_description(ware)
2855- produced_wares_string = produced_wares_string
2856- .. help_ware_amount_line(ware_descr, amount)
2857- end
2858- produced_wares_strings[program_name] = produced_wares_string
2859- end
2860-
2861- -- Now collect the consumed wares for each filtered program and print the program info
2862- for j, program_name in ipairs(producing_programs) do
2863- result = result .. help_consumed_wares_workers(tribe, building, program_name)
2864- if (produced_wares_counters[program_name] > 0) then
2865- result = result
2866- -- TRANSLATORS: Ware Encyclopedia: Wares produced by a productionsite
2867- .. h3(ngettext("Ware produced:", "Wares produced:", produced_wares_counters[program_name]))
2868- .. produced_wares_strings[program_name]
2869- end
2870- end
2871-
2872+ if (building.is_mine) then
2873+ -- Find out which programs in the building produce this ware for the mines we skip the real production and take a dummy "encyclopedia" program
2874+ -- TODO(GunChleoc): Reimplement production programs as a proper tree, so that we can get rid of this hack and of the special case for mines.
2875+ for j, program_name in ipairs(building.production_programs) do
2876+ for ware, amount in pairs(building:produced_wares(program_name)) do
2877+ local consumes = building:consumed_wares_workers(program_name)
2878+ if (ware_description.name == ware and #consumes > 0) then
2879+ table.insert(producing_programs, program_name)
2880+ end
2881+ end
2882+ end
2883+ else
2884+ -- Find out which programs in the building produce this ware
2885+ for j, program_name in ipairs(building.production_programs) do
2886+ for ware, amount in pairs(building:produced_wares(program_name)) do
2887+ if (ware_description.name == ware) then
2888+ table.insert(producing_programs, program_name)
2889+ end
2890+ end
2891+ end
2892+ end
2893+
2894+ -- Now collect all wares produced by the filtered programs
2895+ local produced_wares_strings = {}
2896+ local produced_wares_counters = {}
2897+ for j, program_name in ipairs(producing_programs) do
2898+ local produced_wares_amount = {}
2899+ produced_wares_counters[program_name] = 0
2900+ for ware, amount in pairs(building:produced_wares(program_name)) do
2901+ if (produced_wares_amount[ware] == nil) then
2902+ produced_wares_amount[ware] = 0
2903+ end
2904+ produced_wares_amount[ware] = produced_wares_amount[ware] + amount
2905+ produced_wares_counters[program_name] = produced_wares_counters[program_name] + amount
2906+ end
2907+ local produced_wares_string = ""
2908+ for ware, amount in pairs(produced_wares_amount) do
2909+ local ware_descr = wl.Game():get_ware_description(ware)
2910+ produced_wares_string = produced_wares_string
2911+ .. help_ware_amount_line(ware_descr, amount)
2912+ end
2913+ produced_wares_strings[program_name] = produced_wares_string
2914+ end
2915+
2916+ -- Now collect the consumed wares for each filtered program and print the program info
2917+ for j, program_name in ipairs(producing_programs) do
2918+ result = result .. help_consumed_wares_workers(tribe, building, program_name)
2919+ if (produced_wares_counters[program_name] > 0) then
2920+ result = result
2921+ -- TRANSLATORS: Ware Encyclopedia: Wares produced by a productionsite
2922+ .. h3(ngettext("Ware produced:", "Wares produced:", produced_wares_counters[program_name]))
2923+ .. produced_wares_strings[program_name]
2924+ end
2925+ end
2926+ end
2927 end
2928- end
2929 return result
2930 end
2931
2932
2933=== modified file 'data/txts/developers.json'
2934--- data/txts/developers.json 2018-09-03 08:00:41 +0000
2935+++ data/txts/developers.json 2018-09-11 16:57:31 +0000
2936@@ -390,6 +390,7 @@
2937 "members":[
2938 "Matt Howe (mdhowe)",
2939 "Samuel Tilly (eldamar)",
2940+ "WorldSavior",
2941 "and many, many more (thank you for everything you've done)"
2942 ]
2943 }
2944
2945=== modified file 'src/logic/map_objects/tribes/production_program.cc'
2946--- src/logic/map_objects/tribes/production_program.cc 2018-09-09 10:17:40 +0000
2947+++ src/logic/map_objects/tribes/production_program.cc 2018-09-11 16:57:31 +0000
2948@@ -1163,10 +1163,11 @@
2949 totalstart += start_amount;
2950 totalchance += 8 * amount;
2951
2952- // Add penalty for fields that are running out
2953+ // Add penalty for fields that are running out
2954+ // Except for totally depleted fields or wrong ressource fields
2955+ // if we already know there is no ressource (left) we won't mine there
2956 if (amount == 0)
2957- // we already know it's completely empty, so punish is less
2958- totalchance += 1;
2959+ totalchance += 0;
2960 else if (amount <= 2)
2961 totalchance += 6;
2962 else if (amount <= 4)
2963
2964=== modified file 'src/logic/map_objects/tribes/worker.cc'
2965--- src/logic/map_objects/tribes/worker.cc 2018-09-10 05:59:47 +0000
2966+++ src/logic/map_objects/tribes/worker.cc 2018-09-11 16:57:31 +0000
2967@@ -137,10 +137,11 @@
2968 totalres += amount;
2969 totalchance += 8 * amount;
2970
2971- // Add penalty for fields that are running out
2972+ // Add penalty for fields that are running out
2973+ // Except for totally depleted fields or wrong ressource fields
2974+ // if we already know there is no ressource (left) we won't mine there
2975 if (amount == 0)
2976- // we already know it's completely empty, so punish is less
2977- totalchance += 1;
2978+ totalchance += 0;
2979 else if (amount <= 2)
2980 totalchance += 6;
2981 else if (amount <= 4)