Times are UTC Toggle Colours
00:02:08 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Revision 536: Change: Add definitions for default ground sprites <http://dev.openttdcoop.org/projects/firs/repository/revisions/536> || FIRS Industry Replacement Set - Revision 537: Change: Apply definiton of default ground sprites, ... <http://dev.openttdcoop.org/projects/firs/repository/revisions/537> 00:06:59 *** KenjiE20|LT has joined #openttdcoop.devzone 00:08:30 *** KenjiE20 has quit IRC 01:56:14 *** Frankr has quit IRC 02:47:40 *** KenjiE20|LT has quit IRC 02:53:16 *** welshdragon has quit IRC 03:18:45 *** PeterT has quit IRC 08:01:23 *** ODM has joined #openttdcoop.devzone 11:25:39 *** welshdragon has joined #openttdcoop.devzone 11:47:35 *** welshdragon has quit IRC 12:02:26 *** KenjiE20 has joined #openttdcoop.devzone 13:24:38 <Webster> Latest update from devactivity: OpenGFX 32bpp - Support #716 (New): Just another 32bpp project? <http://dev.openttdcoop.org/issues/716> 13:40:41 <Webster> Latest update from devactivity: OpenGFX 32bpp - Support #716 (Feedback): Just another 32bpp project? <http://dev.openttdcoop.org/issues/716#change-1902" target="_blank">http://dev.openttdcoop.org/issues/716#change-1902> || OpenGFX - Code Review #717 (New): Source files <http://dev.openttdcoop.org/issues/717> || OpenGFX 32bpp - Support #716 (Feedback): Just another 32bpp project? <http://dev.openttdcoop.org/issues/716> 13:56:43 <Webster> Latest update from devactivity: OpenGFX - Support #678: Rewrite wiki.openttd.org/OpenGFX" target="_blank">wiki.openttd.org/OpenGFX <http://dev.openttdcoop.org/issues/678#change-1904> || OpenGFX - Support #678: Rewrite wiki.openttd.org/OpenGFX" target="_blank">wiki.openttd.org/OpenGFX <http://dev.openttdcoop.org/issues/678#change-1903> 14:12:45 <Webster> Latest update from devactivity: OpenGFX - Code Review #717: Source files <http://dev.openttdcoop.org/issues/717#change-1905> 14:28:48 <Webster> Latest update from devactivity: OpenGFX - Code Review #717: Source files <http://dev.openttdcoop.org/issues/717#change-1906> 14:43:18 *** welshdragon has joined #openttdcoop.devzone 15:01:44 *** welshdragon has quit IRC 15:11:08 *** PeterT has joined #openttdcoop.devzone 15:16:57 <Webster> Latest update from devactivity: OpenGFX - Code Review #717: Source files <http://dev.openttdcoop.org/issues/717#change-1908> || OpenGFX - Code Review #717: Source files <http://dev.openttdcoop.org/issues/717#change-1907> 15:24:50 *** FooBar_ has joined #openttdcoop.devzone 15:26:08 <FooBar_> Any more OpenGFX source discussing required? Now I'm here... :P 15:26:49 <planetmaker> :-) Hey FooBar_ :-) 15:27:04 <planetmaker> but... my answer to your question would be 'no' ;-) 15:28:59 <FooBar_> ok, good :P 15:29:09 <FooBar_> and a hello to you too 15:30:15 <FooBar_> Then we're done I guess. Productive meeting, this :P 15:33:23 <planetmaker> hehe. I wish all were that productive 16:30:28 *** welshdragon has joined #openttdcoop.devzone 16:44:34 <Ammler> Hello FooBar_, still nice to read you here from time to time :-P 16:44:56 <FooBar_> Hi Ammler! 16:45:38 <FooBar_> Well, I've been really busy the past half year or so; things are slowly starting to become less busy, so expect me more often here in the future :P 16:46:26 <FooBar_> Once I'm able to pick up coding for FIRS again, I'll be on here every time I work on it, like back in the old days 16:46:45 <Ammler> hehe 16:47:00 <Ammler> just ask, if you like to reactivate the bouncer 16:47:23 <Ammler> the alternative for pre repo releases could also be removing those from our repo 16:47:35 <FooBar_> Not required at this time yet. I'll sure ask if I want it back :P 16:48:16 <Ammler> but I guess, if someone seriously ask for such old sources, it should be fine with rev1 of our repo 16:48:37 <FooBar_> @pre-repro: yes, that's an option; we don't need those old releases anyhow 16:48:57 <Ammler> aren't they on tt-forums anyway? 16:49:08 <FooBar_> Yes, and on my computer somewhere I think 16:49:22 <Ammler> planetmaker:? 16:49:24 <FooBar_> I wonder if those were GPL already... 16:49:34 <Ammler> ah, he :-) 16:50:04 <Ammler> planetmaker: I don't think, Zephyris would upload his 300MB filebyfile ;-) 16:50:30 <Ammler> so it would rather be a ssh/ftp account 16:50:39 <Ammler> specially for him 16:51:11 <FooBar_> dammit, they are... I kinda failed to keep track of the exact source used for those releases... If someone asks, I'll provide a decode... :P 16:51:25 <Ammler> ah indeed 16:51:44 <Ammler> as you made the grfs with decoded newgrfs 16:52:09 <Ammler> so we are full legal in that matter :-) 16:53:26 <Ammler> and a link to the dev thread should also work ;-) 16:54:26 <Ammler> FooBar_: what do you think about the OpenGFX wiki page? 16:54:37 <FooBar_> Not much, really... 16:54:54 <Ammler> IMO, it lost the state of a "Readme" 16:55:17 <Ammler> it should be more something like the OpenGFX Portal 16:55:21 <FooBar_> We should probably remove all development information and only stick on one page that explains what OpenGFX is, how it came into existance, where to get it, stuff like that 16:56:03 *** welshdragon has quit IRC 16:56:40 <FooBar_> Keeping the "progress" bit on some kind of "OpenGFX history page" would be nice though 17:13:58 <planetmaker> hey :-) 17:14:12 <planetmaker> well, I maintained always the changelog.txt 17:14:22 <planetmaker> so it has all important changes from version to version 17:14:57 <planetmaker> btw, I'd welcome, if *someone* would kinda help OpenGFX also to its next version :-) 17:15:08 <planetmaker> There are a few things which already could be done ;-) 17:15:23 <planetmaker> but I'm currently kinda busy :-P 17:21:01 <planetmaker> Ammler: I don't mind Zephyris having a dedicated account for the upload purposes. For sure not 17:21:19 <planetmaker> but I rather thought about current ease of a path there 17:21:35 <planetmaker> and as I understood him: not all 300MB is source. Just parts of it. 17:21:46 <planetmaker> I guess most of it is working copy or alike ;-) 17:24:43 <FooBar_> At moments that I have some spare time I'm more than willing to help OpenGFX to the next level. Most likely more coordinating a bit and implementing some updates rather than actual drawing of stuff, but that's a start I guess... 17:27:34 <planetmaker> FooBar_: I'm also rather talking of getting some existing stuff into OpenGFX. Seeing that the bug / feature list gets shorter :-) 17:27:47 <planetmaker> btw: http://pastebin.ca/1756269 <-- FooBar_ Ammler 17:28:02 <planetmaker> could you verify that it looks the same for you? I'm kinda puzzled by the output 17:28:38 <planetmaker> I use r537 of FIRS 17:29:47 <FooBar_> I currently don't have my development environment available... Can't help you with that at the moment... 17:29:56 <planetmaker> ah, ok :S 17:31:12 <FooBar_> Installed Win7 recently and haven't gotten around setting it up again, as I didn't have the time to use it anyhow... ;) 17:31:22 <planetmaker> hehe 17:33:33 <FooBar_> To me it looks a lot different than the last time I checked. But then Andy has been changing all kinds of stuff, so I have no clue whatsoever if it's wrong or right... 17:35:02 <planetmaker> well, that paste has not much to do with FIRS. At least not yet. But I wonder why I get lines double etc. 17:35:12 <planetmaker> e.g. I'd like a bash sanity check ;-) 17:35:16 <planetmaker> of that line 17:37:22 <planetmaker> hm... nvm. Something's fishy 17:37:36 <planetmaker> if I only knew what. 17:38:54 <andythenorth> planetmaker: I can look at that in a couple of hours if that helps 17:39:20 <planetmaker> well. I just thought I might as well try via ssh on another computer. Results are very similar 17:39:27 <planetmaker> But that's not satisfactorily 17:39:37 <planetmaker> Now I'm rather interested: what's going wrong ;-) 17:39:50 <planetmaker> (that's got to become part of FIRS' dependency check) 17:40:07 <planetmaker> as that's kinda breaking more and more ;-) 17:43:15 *** welshdragon has joined #openttdcoop.devzone 17:49:28 <Ammler> planetmaker: what if you first uniq, then sort? 17:49:59 <Ammler> ah, no 17:50:04 <Ammler> but try sort -u 17:51:17 <planetmaker> it's shorter to write, but functionally the same 17:52:25 <Ammler> well, somthing seems wrong as you still have doubles 17:52:45 <planetmaker> yes. That's why I'm asking. Also the last line is odd 17:53:11 <Ammler> I am currently also not connected to my dev env ;-) 17:53:28 <Ammler> hmm, I could try on the server... 17:56:33 <Ammler> yes, there is no "#include" on that line 17:57:04 <Ammler> hmm, maybe it belongs to the line above and has only the mac delimter? 17:59:49 <Ammler> grep "#include \"" sprites/nfo/*.pnfo <-- the same as your for stuff 18:00:27 <planetmaker> same also, if you escape the # 18:03:22 <Ammler> you could mark the start: "^#include \"" 18:03:28 *** Hyronymus has joined #openttdcoop.devzone 18:03:53 <Ammler> anyway, very strange 18:04:21 <planetmaker> it's an improvement. The bogus line is gone. Uniq still fails, though 18:05:05 <planetmaker> indeed, maybe I should check line delimiters 18:05:34 <planetmaker> but having three different ones, though possible, seems unlikely, given that both, andy and myself use mac 18:06:09 <Ammler> i_fruitplantation.pnfo is broken 18:06:21 <planetmaker> hm? 18:06:28 <Ammler> try to read that file 18:06:50 <planetmaker> what about that? 18:07:22 <planetmaker> looks pretty normal here 18:07:29 <Ammler> might have missing \n 18:07:36 <Ammler> a plain \r file? 18:07:53 <Ammler> you are the mac user :-P 18:08:11 <planetmaker> mac uses unix style for a few years by now 18:08:19 <Ammler> ok 18:08:27 <Ammler> anyway that file is broken 18:08:40 <Ammler> run cat <thatfile> 18:09:01 <planetmaker> hm, true 18:09:42 <Ammler> I don't have line breaks here, do you? 18:09:48 <Ammler> maybe just resave it then 18:10:13 <Ammler> (as said, I am on the server) 18:11:44 <planetmaker> hm... re-saving it doesn't help 18:15:17 <Ammler> I would use kate 18:20:25 *** welshdragon has quit IRC 18:20:57 *** welshdragon has joined #openttdcoop.devzone 18:27:34 <Webster> Latest update from devactivity: FIRS Industry Replacement Set - Revision 538: Change: Funny line ending of i_fruitplantation.pnfo <http://dev.openttdcoop.org/projects/firs/repository/revisions/538> || Redmine - Revision 3174: Adds a log message when an API call raises an InvalidAuthenticityToken e... <http://dev.openttdcoop.org/projects/redmine/repository/revisions/3174> || Redmine - Revision 3173: Move ids in XML views. <http://dev.openttdcoop.org/projects/redmine/repository/revisions/3173> 18:38:49 *** welshdragon has quit IRC 18:39:36 <Ammler> funny? 18:40:02 <Ammler> :-) 18:40:05 <planetmaker> :-P well. Annoying doesn't sound so nice ;-) 18:41:32 <Ammler> what was it? 18:41:49 <planetmaker> Don't really know... ^M 18:41:58 <planetmaker> whatever that is ;-) 18:42:02 <Ammler> that is \r 18:42:12 <planetmaker> yeah, then it was only that 18:42:16 <planetmaker> stupid 18:42:26 *** welshdragon has joined #openttdcoop.devzone 18:42:28 <Ammler> you see that sometime if you open windows \n\r with linux 18:42:33 <Ammler> s 18:42:43 <planetmaker> yes. That's where I know it from ;-) 18:42:50 <Ammler> or is it \r\n 18:42:53 <planetmaker> vi is especially nice with that 18:43:49 <Ammler> maybe andy opened that file with a special old mac tool 18:44:58 <planetmaker> dunno. I have the feeling it's not the only file. Changing that actually didn't change anything of my original problem ;-) 18:47:04 <Ammler> ah, I see, your for... isn't the same as my grep... 18:47:30 <planetmaker> hm? 18:48:05 <Ammler> if you grep multiple files, it outputs the filename too 18:48:14 <planetmaker> ah 18:48:37 <Ammler> what are you looking for? 18:48:44 <Ammler> a list with all includes? 18:48:47 <planetmaker> the aim is to get a uniq list of files included. yes 18:49:02 <planetmaker> trying to get a makefile.dep working 18:49:18 *** welshdragon has quit IRC 18:49:27 <Ammler> hmm, didn't you do that already for pcxes? 18:49:38 *** welshdragon has joined #openttdcoop.devzone 18:50:08 <planetmaker> well. yes. BUT: I assume that all (p)nfo files are mentioned in the central file, firs.pnfo 18:50:36 <planetmaker> that is less and less true. Thus both, pcx and (p)nfo dependencies will pass unrecognized more and more 18:50:48 <planetmaker> so I'm looking for something more robust 18:51:56 <Ammler> doesn't .dep work, if you have listed a file twice? 18:52:59 <Ammler> did I say? 18:53:11 <Ammler> I don't like templates outside of sprites :-) 18:54:50 <Ammler> it is like in openttd files include something from extra ;-) 18:55:00 <Ammler> in src 18:55:22 <Ammler> sprites is like src IMO 18:55:33 <planetmaker> yes. you said that with the templates and I agree :-) 18:55:49 <planetmaker> And my new templates are added in sprites :-) 18:55:51 <Ammler> I thought it was in 2cc 18:55:59 <planetmaker> well. Andy copied it ;-) 18:56:48 <planetmaker> a .dep should work, if something is listed twice, though 18:56:53 <planetmaker> but I wouldn't call that nice ;-) 18:57:24 <Ammler> true 18:57:41 <Ammler> but you said, you want something robust, not nice ;-) 18:58:02 <Ammler> anyway, it should uniq those, don't see why not 18:58:34 <planetmaker> ^^ the cause of me being puzzled ;-) 18:58:41 <Ammler> maybe also the wellknown "how is it called" 18:58:54 <Ammler> Rubidium: fixed a lot in opengfx 19:01:48 <planetmaker> eh? white space? 19:05:52 <Ammler> yes, something like that, but there is a "expert word" for it 19:10:43 <planetmaker> hm... ok :-) 19:14:42 <Ammler> Hirundo is also specialist of 19:14:58 <Ammler> why can't I remember :'-( 19:18:38 <andythenorth> hi hi 19:18:46 <andythenorth> planetmaker: anything I can help with? 19:19:38 <planetmaker> well. Not sure. I guess when you try http://pastebin.ca/1756269 you get the same, right? 19:20:10 <planetmaker> bash command in first line there, to be executed in your firs repo 19:22:18 <andythenorth> planetmaker: so I don't get identical output to you... 19:24:02 <andythenorth> http://pastebin.ca/1756427 19:31:26 <planetmaker> looks quite identical to me. 19:32:03 <planetmaker> hm... well. Dunno. I guess I'll leave that for now. Another day, another go ;-) 19:48:18 <Ammler> andythenorth: you pulled? 20:02:04 <andythenorth> planetmaker: interested in coding today, or busy? 20:02:58 <planetmaker> I guess I pass for today. But you may tell me nonetheless. First the washing machine and dishes, though ;-) 20:03:51 <andythenorth> just planning my time. I either (a) work on industry production code (b) work on economies with you (c) hope Irwe sends more snow sprites 20:03:56 <andythenorth> I currently vote (a) 20:04:28 <planetmaker> :-) 20:06:04 <planetmaker> economies... sounds like fun though :-) 20:10:02 <andythenorth> economies - it would be really nice soon to have the economy parameter determining which industries are built 20:12:17 <planetmaker> ok... let's do it. Round about 22h I'm done with what I want do and I have time 20:17:42 <andythenorth> ok 20:18:36 <planetmaker> speaking CET ;-) 20:20:43 <PeterT> Hirundo? 20:20:48 <PeterT> When are patches made? 20:20:52 <PeterT> for is2? 20:21:04 <PeterT> updated trunk ones, I mean 20:22:12 <Hirundo> When there's something to update 20:22:27 <PeterT> the trunk version? 20:23:17 <Hirundo> IS2 has not been merged with trunk since the latest version, so as far as the repo is aware there aren't any updates 20:25:52 <Hirundo> I will pick it up again in the not-too-near-nor-distant future, but I'm not a robot who does such things on command 20:27:37 <PeterT> :-( 20:44:29 <planetmaker> [21:25] <Hirundo> (...) but I'm not a robot who does such things on command <-- I'm quite happy to have subjects in this channel who pass the turing test easily and obviously ;-) 20:45:16 <SmatZ> hehe 20:52:15 <Ammler> PeterT: what trunk feature do you miss in is2? 20:52:54 <PeterT> A major crash fix 20:53:15 <PeterT> Also, I'd like to keep my CargoDist + IS2 build up-to-date 20:53:24 <PeterT> @Ammler 20:54:11 <Ammler> well, crash fixes are a reson for update, maybe you can backport that fix? 20:54:40 <Ammler> every trunk commit is like a patch :-) 20:55:40 <Ammler> PeterT: which patch do you use as "base"? 20:55:45 <PeterT> CargoDist 20:55:51 <PeterT> the Git checkout of CargoDist 20:56:08 <Ammler> oh, you work with git? RESPECT :-) 20:56:24 <PeterT> Lol 20:56:31 <PeterT> git sucks 20:57:05 <Ammler> he, I know :-P 20:57:13 <Ammler> (too well) 20:57:49 <Ammler> but it looks like git is going to become the next "standard" vcs after subversion. 21:00:02 <PeterT> because of how well it handles branches 21:00:47 <planetmaker> andythenorth: around? 21:02:23 <andythenorth> hi hi 21:02:43 <planetmaker> :-) 21:02:57 <planetmaker> well... let's talk economy 21:03:32 <andythenorth> ok, so set the parameter, get (i) cargo payment rates (ii) a certain range of industries 21:03:34 <planetmaker> first question IMO: should they be de-coupled from the payment schemes or should they be linked 21:03:38 <andythenorth> linked 21:03:56 <planetmaker> ok, I agree. Good that you see it that way, too :-) 21:04:02 <andythenorth> reduces complexity 21:04:05 <planetmaker> indeed 21:04:14 <planetmaker> especially front-end :-) 21:04:18 <andythenorth> bug reports are n instead of n*p or something 21:04:29 <andythenorth> (for number of possible combinations) 21:04:29 <Ammler> PeterT: well, git has afaik no major function, which hg lacks, the rason might more be, that kernel.org uses it. 21:04:51 <andythenorth> planetmaker: question 2: 21:04:52 <andythenorth> ? 21:05:18 <planetmaker> hm, question two goes already to the details :-) 21:05:53 <planetmaker> we have the payment, which is fine. Now we need to extend that parameter to the industries, I guess 21:05:57 <andythenorth> how to implement? Lots of action 7 jumping to labels 7? 21:06:06 <andythenorth> and some kind of simple text config file 21:06:27 <planetmaker> yes... should be. 21:06:37 <andythenorth> my typing is bad today :| 21:07:03 <planetmaker> how should we define the config, maybe let's start there. 21:07:24 <planetmaker> Though I started with awk for the cargo schemes I'm not convinced anymore. 21:07:29 <planetmaker> What's your view? 21:08:10 <planetmaker> just add lines like #define MINING_<INDUSTRYNAME> 21:08:22 <planetmaker> if the industry is available in MINING and leave it be, if not? 21:08:30 <planetmaker> then we can use simple #ifdef to include? 21:08:49 <planetmaker> hm... 21:09:06 <planetmaker> would make templating easy 21:10:21 <planetmaker> so the config part would just to supply a list of industries in the form of defines 21:10:32 <planetmaker> the templates then deal with that, depending whether it's defined or not 21:11:05 <planetmaker> but... then we wouldn't have different acceptance 21:11:10 <planetmaker> do we want that? 21:11:11 <andythenorth> might be that the defines are economy numbers 21:11:24 <andythenorth> which are written into the action 7s 21:11:41 <planetmaker> yes, kinda in the template: 21:11:49 <andythenorth> hmm 21:11:58 <andythenorth> how much does redundant code matter in a newgrf? 21:11:59 <planetmaker> #ifdef SCHEME_THIS_INDUSTRY 21:12:23 <planetmaker> it increases size 21:12:31 <planetmaker> and compile time 21:12:52 <andythenorth> the most brutal route is to repeat all of the action 0s 21:12:59 <planetmaker> yes 21:13:08 <planetmaker> well, I'd do that by action7, yes 21:13:09 <andythenorth> but firs.nfo is already 650kb 21:13:16 <andythenorth> KB 21:13:33 <planetmaker> but only include the code, if the defined for the scheme 21:13:44 <andythenorth> ok, so some saving 21:13:48 <planetmaker> that's what the scheme list gives us 21:13:55 <andythenorth> it's probably the easiest to template 21:14:09 <planetmaker> at least I see a path there. 21:14:27 <andythenorth> (I may have missed the first part of your solution btw, we have two internet connections, both dropped at 21.07 and came back at 21.09) 21:14:50 <andythenorth> so we could try the brutal route...if file size is an issue, rethink? 21:15:06 <planetmaker> [22:08] <planetmaker> just add lines like #define MINING_<INDUSTRYNAME> 21:15:08 <planetmaker> [22:08] <planetmaker> if the industry is available in MINING and leave it be, if not? 21:15:10 <planetmaker> [22:08] <planetmaker> then we can use simple #ifdef to include? 21:15:35 <andythenorth> ok 21:16:08 <planetmaker> I guess we can try that. 21:16:14 <planetmaker> 2ccTrainSet is bigger 21:16:30 <planetmaker> though "my grf is bigger than yours" should not really be a criterion ;-) 21:16:59 <andythenorth> firs.grf is currently only 380KB, so encoding clearly has some large compression factor 21:17:07 <andythenorth> download size is always a concern... 21:17:19 <Ammler> but but 21:17:28 <planetmaker> well. yes. But alas. Less than the fun-factor IMO 21:17:39 <Ammler> planetmaker: how do you know on compile time, which sheme a player choses? 21:17:42 <planetmaker> and we have sufficient band width 21:17:50 <planetmaker> Ammler: I don't 21:17:59 <planetmaker> But I know on compile time which scheme uses which industries 21:18:12 <planetmaker> thus the action7 chain only includes it for the schemes it takes part in. 21:18:36 <andythenorth> and we skip all of the action 7s except for the one matching param n 21:18:40 <planetmaker> for each scheme it participates in: action0. Or rather skip, if not 21:18:45 <andythenorth> or param 0 = n to be strict 21:19:11 <Ammler> what about a bit switch and then define the industry bits in a sheme template? 21:19:30 <Ammler> would you have a bit per industry? 21:19:42 <andythenorth> sounds good. what does it mean? :) 21:20:01 <planetmaker> andythenorth: sure. we skip everything which is not configured to become active. Using action7s to do so 21:20:14 <planetmaker> but... do we need more than one action0? 21:20:18 <planetmaker> I don't think, or? 21:20:30 <planetmaker> hm... yes, we do. 21:20:35 <planetmaker> we do that already ;-) 21:20:36 <andythenorth> no, you could drop a lot of action 7s above the action 0 21:20:53 <andythenorth> but the 'many action 0s' route is brutal and simple 21:21:37 <planetmaker> yes. indeed. But efficient 21:21:47 <planetmaker> Ok. Plan: 21:22:08 <planetmaker> We keep the scheme dependent action0 for cargos as is 21:22:26 <planetmaker> for industries we make a number of action7 prior to the industry's action0. 21:22:34 <planetmaker> We skip it, if it is not wanted by the scheme 21:23:11 <planetmaker> then it's either "industry present" or "industry not present" 21:23:42 <andythenorth> the action 7 block will need two labels, one for skipping the industry, the other for skipping the remaining action 7s when an industry matches the economy 21:24:15 <planetmaker> as an advanced step we could re-use #define MINING_<INDUSTRYNAME> as a template name which to use, if it needs specific actions for that scheme 21:24:43 <andythenorth> yes. There will be some scheme-specific variations 21:25:14 <planetmaker> definitely? 21:25:40 <andythenorth> definitely....maybe. But probably can be handled by an action 7 for specific economies, modifying a limited number of properties. 21:25:48 <andythenorth> Unless I need to modify production code. Hmm 21:26:05 <planetmaker> hm... graphics, real sprites most likely 21:26:36 <andythenorth> input / output cargos are the planned variations currently 21:26:38 <planetmaker> greenhouse vs. fruit plantation e.g. 21:27:04 <planetmaker> same industry :-) But could be two. 21:27:09 <andythenorth> graphics can be handled by a large varaction 2 block I would guess 21:27:18 <planetmaker> true 21:27:41 <andythenorth> same with production code if necessary - just branch according to param value 21:27:57 <andythenorth> so that's all fine. Where are the defines...defined? 21:28:29 <planetmaker> hm... yes. Variations are all present, independent by the scheme chosen. The scheme just sets a parameter 21:28:41 <planetmaker> or some parameters. 21:29:25 <planetmaker> the #define SCHEME_MINING_DREDGINGSITE should most probably go in its own (new) file 21:29:33 <planetmaker> like industry_schemes.pnfo 21:29:35 <planetmaker> or alike 21:29:55 <planetmaker> analoguous to cargo_schemes.list 21:30:08 <planetmaker> (but not a list) 21:30:29 <planetmaker> hm... 21:30:42 <andythenorth> so long as it's easy to check and edit... 21:30:53 <Hirundo> PeterT: does merging trunk with IS cause any problems beyond the usual saveload and include conflicts? 21:30:56 <planetmaker> just a list of defines, one after another 21:31:06 <andythenorth> I could hang it off the website cms quite easily, but that's 21:31:11 <andythenorth> potentially brittle 21:31:21 <PeterT> Hirundo: I don't know, I haven't tried 21:31:34 <planetmaker> but then the cargo variation code goes into the industry itself. 21:32:03 <planetmaker> not too bad, I guess 21:33:24 <planetmaker> we should indicate the use of a different production / acceptance scheme than default indicate by setting special, separate defines, I think 21:33:59 <planetmaker> like #define SCHEME_PROD_FISHINGHARBOUR 1 21:34:08 <planetmaker> and then query that - again - by #ifdef 21:34:13 <planetmaker> if not set, the default is used 21:34:47 <planetmaker> the default production template 21:35:03 <planetmaker> otherwise a special one. maybe the name defined instead of 1 21:35:13 <planetmaker> yes :-) 21:35:19 <planetmaker> if nothing is defined: use default 21:35:29 <planetmaker> if defined: use the template of the name for the production code 21:36:06 <planetmaker> #define SCHEME_PROD_FISHINGHARBOUR i_fishingharbour/prod_fishingindustry.pnfo 21:36:20 <planetmaker> if not it uses i_fishingharbour/prod_default.pnfo 21:36:54 <planetmaker> I talk too much :-P 21:40:06 * andythenorth disconnected :| 21:40:19 <Hirundo> 14 speeches to self, is that a record? 21:40:31 * Hirundo searches #jonty stats 21:40:35 <Ammler> andythenorth: but the bouncer replayed? 21:40:42 <andythenorth> Ammler: NO 21:40:44 <andythenorth> oops 21:40:45 <andythenorth> no 21:41:02 <Ammler> hmm, then that needs to be configured 21:41:23 <Ammler> https://openttdcoop.org:54322 21:41:25 <andythenorth> and I need a new internet connection 21:41:42 <andythenorth> next I should have a new internet connection 21:41:47 <andythenorth> if all goes as planned 21:42:02 <PeterT> stalking me on other channels, eh andythenorth? 21:42:58 <andythenorth> planetmaker: did you see the python dict output from the FIRS website before I got disconnected? 21:43:37 <planetmaker> andythenorth: no :-( 21:44:05 <andythenorth> oh poop 21:44:05 <andythenorth> http://tt-foundry.com/sets/FIRS/schema/scripts/economies_cargos_industries_houses 21:44:44 <planetmaker> uhm, ok 21:44:49 <andythenorth> easy to read, no? :P 21:44:54 <planetmaker> you want to python-ify that straight away? 21:45:10 <planetmaker> well, yes and no. Several lines would be nicer ;-) 21:45:23 <andythenorth> I just thought you should know it exists :) 21:45:37 <andythenorth> I have to keep the website in sync with whatever the code says, as it's the main documentation 21:45:57 <planetmaker> That's nice. But I don't feel like starting a totally new concept right now. 21:46:22 <planetmaker> Though I'd like to see it implemented, that's more time consuming than I want to dedicate myself right now 21:46:58 <andythenorth> Once you have a format for the industry list, I might make the website generate that list (for my own purposes, not proposing connecting the makefile to it!) 21:47:00 <planetmaker> (as I have virtually NO experience with programming python) 21:47:12 <planetmaker> hehe :-) 21:47:55 * andythenorth tries something 21:48:25 <planetmaker> http://paste.openttd.org/220981 <-- like that I propose the definition 21:48:47 <planetmaker> don't mind wrong industry names, though ;-) 21:49:42 <andythenorth> yup, give me two more minutes (this is for my own interest) :) 21:49:45 <planetmaker> BUT: something like that as primary industry definition list would certainly rock 21:57:00 <andythenorth> planetmaker: http://tt-foundry.com/sets/FIRS/schema/test_defines_industries 21:57:07 <andythenorth> it's only a proof-of-concept 21:57:41 <planetmaker> hm, you need the scheme name in the defines 21:57:54 <planetmaker> like in the paste I posted 21:58:20 <andythenorth> well...yes :P 21:58:24 * andythenorth 2 mins 21:58:33 <planetmaker> and: no spaces in defines 21:59:20 <andythenorth> yes, and all caps :) 21:59:21 <andythenorth> http://tt-foundry.com/sets/FIRS/schema/test_defines_industries 21:59:41 <andythenorth> and the actual industry names might not match up between the website and the code 21:59:56 <andythenorth> I can make them caps in a minute 22:00:53 <Ammler> andythenorth: enabled Buffer for your account 22:01:01 <andythenorth> thanks Ammler 22:01:24 <Ammler> you could do that self on the given address 22:01:42 <planetmaker> andythenorth: remove the " please, too 22:01:51 <planetmaker> only letters 22:01:56 <planetmaker> and _ 22:02:03 <planetmaker> and non-leading figures 22:02:23 <planetmaker> and no space ;-) 22:02:28 <planetmaker> but yes 22:02:38 <andythenorth> ok, so I need to stop hacking a page template and write a script for this - but you get the idea? 22:03:01 <planetmaker> yes. That's what I proposed :-P 22:03:41 <andythenorth> doing it right is about 20 mins work probably 22:04:02 <planetmaker> :-) 22:04:20 <planetmaker> And then changing all the industries. And making the template... I'm somewhat on the latter right now 22:05:00 <planetmaker> is it sufficient to only skip the action0? I think yes...? 22:07:57 <Ammler> so you include python already? 22:10:58 <planetmaker> not me :-) 22:11:53 <planetmaker> hm... what does that evaluate to: 22:12:09 <planetmaker> #define VAR2 VAR1 22:12:16 <planetmaker> if VAR1 is not defined? 22:12:33 <planetmaker> what will #ifdef VAR2 do? 22:18:18 <andythenorth> planetmaker: http://tt-foundry.com/sets/FIRS/schema/scripts/output_industry_defines_per_economy 22:18:31 <andythenorth> needs some small work, but close? 22:19:30 <planetmaker> looks fine to me 22:20:35 <andythenorth> SCHEME_FARMING_CARPENTERS_SHOP for example is actually the Furniture Factory 22:20:55 <planetmaker> well.... :-) 22:21:01 <andythenorth> it's a bit of history with name changes, but ids didn't. I can get around it easily by extending the cms 22:21:39 <andythenorth> but these defines are fairly arbitrary anyway, right? 22:21:51 <planetmaker> well. yes. 22:22:14 <planetmaker> but it makes sense to have them the same as the industry file is called 22:22:32 <planetmaker> uhm... move and modify words till the sentence makes sense ;-) 22:23:40 *** PeterT_ has joined #openttdcoop.devzone 22:23:53 <andythenorth> I can fix it, but probably not tonight in code. But easy with find and replace locally....for now. 22:24:48 <andythenorth> I think it's time for bed 22:27:11 *** PeterT_ has quit IRC 22:27:40 *** PeterT_ has joined #openttdcoop.devzone 22:29:10 <planetmaker> indeed. Thinking gets sluggish and my jaw cracks. 22:29:25 <planetmaker> good night :-) 22:30:29 *** PeterT_ has quit IRC 22:30:30 <andythenorth> I'll fix that list output tomorrow. good night ;) 22:30:51 <FooBar_> good night! 22:36:27 *** Hyronymus has quit IRC 22:41:46 *** ODM has quit IRC 23:10:33 *** FooBar_ has quit IRC