Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-08-03 Thread Hans Joachim Desserud
Pushed to trunk. I've updated https://wl.widelands.org/wiki/TranslationDictionaryTemplate/ and https://wl.widelands.org/wiki/Terminology%20Correspondence%20Table/ -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is subscribed to branch l

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-08-03 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/furnace into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-08-03 Thread GunChleoc
Review: Approve LGTM -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/furnace. ___ Mailing list: https://launchpad.net/~widelands-dev Post t

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-08-03 Thread Hans Joachim Desserud
>the # operator means length in lua. Aha, so that's what it does. > Ie. rv["well"] is the same as rv.well Hm, like Javascript then. Think that should be all then. -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is subscribed to branch

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-08-03 Thread SirVer
tl;dr: yes, your assumption is correct. longer: local rv = plr:get_buildings{"well", "burners_house"} returns a lua table of tables (see https://wl.widelands.org/docs/wl/autogen_wl_game/#wl.game.Player.get_buildings). It will therefore return { "well": { b1,b2}, "burners_house": { b1}} and so o

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-08-02 Thread GunChleoc
I think a way to test this would be to play the 2nd Empire campaign until you hit the objective "obj_better_material_2". Then don't build any coal mines but charcoal kilns only and see if you can complete the objectve by that. If you can, everything's fine. -- https://code.launchpad.net/~widela

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-08-02 Thread Hans Joachim Desserud
I'm not that familiar with lua, so I would like someone to doublecheck my assumptions. I see that the code calls local rv = plr:get_buildings{"well", "burners_house"} The way I've interpreted this is that it gives me a map which contains building names as the keys and the amount of those buildi

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-08-02 Thread SirVer
Sorry. I missed the question in the code and now that I found it, I do not understand what you mean by it. Can you elaborate a bit more? -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-08-02 Thread Hans Joachim Desserud
I'd like a reply to the TODO comment/question. Other than that, Gun Chleoc has approved to the changes a couple of comments up. -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/furna

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-08-02 Thread SirVer
What is this waiting on? -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/furnace. ___ Mailing list: https://launchpad.net/~widelands-dev Pos

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-30 Thread Hans Joachim Desserud
Unsurprisingly, nothing in scripting. I checked tribes when changing the names/moving directories. -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/furnace. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-27 Thread GunChleoc
grep the tribes and scripting as well, just to make sure. Otherwise, +1 from me once your todo comment has been resolved. -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/furnace.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-27 Thread Hans Joachim Desserud
>Have you grepped for burner/Burner to make sure that you've caught them all? Replaced the use of burner in maps and campaigns now. Any other places I need to check? -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is subscribed to branc

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-26 Thread GunChleoc
Review: Needs Fixing I had a look at the diff without testing and added some comments for small string fixes. Have you grepped for burner/Burner to make sure that you've caught them all? I can't answer your todo question right now, since I'm not familiar with scenario code. Diff comments: >

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-26 Thread Hans Joachim Desserud
Review: Resubmit Let's try again. Renamed charcoal burner/burner's house to Charcoal Kiln, and burner (the worker) to Charcoal Burner. Remaining: I have a TODO comment with a question, and the translation table on the wiki needs to be updated once/when this lands. -- https://code.launchpad.ne

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-26 Thread GunChleoc
Let's go with it. Sorry about the confusion + extra work -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/furnace into lp:widelands. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-26 Thread _aD
Review: Approve Agreed -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/furnace into lp:widelands. ___ Mailing list: ht

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-26 Thread Hans Joachim Desserud
> Let's use "Charcoal Burner" for the worker and "Charcoal Kiln" for the > building then - with the capital letters like that. English Speakers Like > Their Title Case :P The more I think about this, the more I realize I should have made a bug report. Are we all agreed upon this suggestion? (Stil

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-25 Thread GunChleoc
Let's use "Charcoal Burner" for the worker and "Charcoal Kiln" for the building then - with the capital letters like that. English Speakers Like Their Title Case :P -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is requested to review

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-24 Thread wl-zocker
"Charcoal burner" is fine for me. "Charcoal kiln" is more likely to be confusing, but we will get used to it. -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/furna

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-24 Thread GunChleoc
Thanks! I think it might be beneficial to rename the worker from "Burner" to "Charcoal Burner", if it doesn't confuse old players. -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is requested to review the proposed merge of lp:~wideland

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-24 Thread _aD
I am sure there is a correct term, but if someone used it I probably wouldn't recognise it! The Oxford English Dictionary states that one of the definitions of "burner" is "a person...that burns". On one of the sites linked about charcoal burning, there is the sentence: "Chris Wall-Palmer lives

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-24 Thread GunChleoc
Shall we go with "Charcoal Kiln" for all 3 buildings then? @ _aD: Is there a special name for the worker as well? At the moment, we're simply using "Burner". -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is requested to review the pro

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-24 Thread _aD
Review: Needs Fixing "Kiln" is the correct term, so "Charcoal Kiln" would be the most appropriate phrase. "Collier" is the term for a coal miner and "Colliery" is a coal mine. I believe both of these words are primarily used in Britain. A furnace is where one would burn charcoal to cook / smel

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-24 Thread GunChleoc
> Barbarians do not build houses. I understand that there is movement to unify > names, but please also keep the in mind that the three tribes should be > different and should have their own individuality. We should have a "Charcoal Burner's Hut" then for consistency. -- https://code.launchpad.n

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-23 Thread SirVer
Barbarians do not build houses. I understand that there is movement to unify names, but please also keep the in mind that the three tribes should be different and should have their own individuality. aD, I added you as a reviewer since your a native speaker. Can you add anything to the discussi

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-23 Thread wl-zocker
None of the proposed options really convinces me. I do not like "kiln" because we already have a "lime kiln". As it stands, I prefer renaming all three to "Charcoal Burner's House". -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is req

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-23 Thread Hans Joachim Desserud
> Some maps talk about not containing much coal and advise to build charcoal > burners in their description. I do not know if such maps are shipped with > Widelands though. The plateau was the only map I found which mentioned "burner" in any way. >The translation table in our wiki. While I did

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-23 Thread GunChleoc
To unify the, we could all call them "Charcoal Burner's House". I did some digging online and there doesn't seem to be an easy English term for the German "Köhlerei" at all. You can have a pit or a stack, but what you see in-game is a house: What about "kiln"? http://www.charcoalburners.co.uk/c

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-23 Thread wl-zocker
Are you sure that "furnace" is the right term? From what I see, it seems to describe what we call smelting works (that is at least what a quick look in http://en.wikipedia.org/wiki/Charcoal reveals). Furthermore, "charcoal furnace" (with quotation mark) has only 36,100 hit on Google, while "char

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-22 Thread Hans Joachim Desserud
The proposal to merge lp:~widelands-dev/widelands/furnace into lp:widelands has been updated. Description changed to: As discussed on IRC earlier today, unify the charcoal burner/burner's house and rename it to Charcoal Furnace. Updated: - tribes: images, names and conf - campaigns: references

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands

2014-07-22 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/furnace into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 As discussed on IRC earlier today, unify t