Times are UTC Toggle Colours
00:45:02 *** OwenS has quit IRC 05:52:50 <planetmaker> http://paste.openttd.org/225682 <-- should that work that way, Yexo ? 05:53:07 <Yexo> yes 05:53:20 <Yexo> and I'm going to break ogfxplus again 05:53:24 <planetmaker> or rather: it doesn't seem for me... hm, then I need to check again 05:53:33 <planetmaker> Don't worry about breaking it ;-) 05:53:49 <Yexo> sprite_count being implied by a grf block is a good idea 05:53:50 <planetmaker> I consider it mostly a test grf for that purpose. 05:54:03 <planetmaker> Playing around needs some goal. Or makes it more satisfying 05:57:39 <planetmaker> @base 16 10 1B 05:57:39 <Webster> planetmaker: 27 06:03:33 <Yexo> planetmaker: that livery override works fine here 06:03:36 <Webster> Latest update from devactivity: Redmine - Revision 3526: Refactor: Move method to Query model <http://dev.openttdcoop.org:81/projects/redmine/repository/revisions/3526> 06:04:29 <Yexo> you can also enable the "cargo_type: PASS;" lines now if you pull the latest nml 06:08:12 <planetmaker> Nice :-) Though I actually prefer to work with classes instead of cargos directly whenever possible 06:10:18 <Yexo> of course, but since that's not always possible 06:10:29 <Yexo> the option has to be there to use cargos directly 06:10:55 <planetmaker> yes, I know 06:11:56 <Yexo> "non_refittable_cargo_classes: CC_ALL ^ CC_PASSENGERS;" <- that lines disables ecs tourists 06:11:56 <Yexo> is that intended? 06:12:36 <planetmaker> it does? Tourists are of passenger class, I thought? 06:14:26 <planetmaker> I want to say "all but passenger class" 06:14:26 <Yexo> yes, but a vehicle is only refittable if at least one cargoclass of the cargo is in refittable_cargo_classes and no cargoclasses of that cargo are in non_refittable_cargo_classes 06:14:27 <Yexo> you've now limited it to cargos that have only CC_PASSENGERS but no other class 06:15:21 <Yexo> tourists have both CC_PASSENGERS and CC_EXPRESS 06:15:37 <Yexo> refittable_cargo_classes: CC_PASSENGERS; <- keep that, and set non_refittable_cargo_classes to 0 06:15:45 <planetmaker> hm, maybe I just should drop ... ^ yeah 06:15:50 <Yexo> that'll make the wagon refittable to all vehicles that are in the passenger-class 06:17:11 <planetmaker> better choice indeed 06:20:34 <Webster> Latest update from devactivity: NFO Meta Language - Revision 122: Feature: the sprite-count sprite is now written when the nml fi... <http://dev.openttdcoop.org:81/projects/nml/repository/revisions/122> || NFO Meta Language - Revision 120: Feature: store the cargo labels globally so they can be used as... <http://dev.openttdcoop.org:81/projects/nml/repository/revisions/120> || NFO Meta Language - Revision 121: Change: validate cargolabels, make sure they'er exactly 4 bytes... <http://dev.openttdcoop.org:81/projects/nml/repository/revisions/121> || NFO Meta Language - Revision 119: Add: bitmask function, every argument is a bit number, returns ... <http://dev.openttdcoop.org:81/projects/nml/repository/revisions/119> || NFO Meta Language - Revision 118: Codechange: move reduce_expr to expression.py <http://dev.openttdcoop.org:81/projects/nml/repository/revisions/118> || NFO Meta Language - Revision 117: Fix: empty real sprites still have a '*' <http://dev.openttdcoop.org:81/projects/nml/repository/revisions/117> 06:36:09 <Yexo> http://paste.openttd.org/225683 <- ok, doesn't make sense, but it works 06:38:20 <planetmaker> nice! 06:38:46 <planetmaker> still I don't see the livery override in the game. Though the generated nfo seems to be fine as far as I see... strange 06:38:58 <planetmaker> probably something really stupid :S 06:39:34 <Yexo> have you installed the new grf file? 06:39:43 <Yexo> maybe openttd still finds the old one somewhere? 06:40:47 <planetmaker> aaarg 06:40:49 <planetmaker> worse. 06:41:02 <planetmaker> The newgrf wasn't activated. 06:41:06 <Yexo> lol 06:48:34 <planetmaker> hm, I like livery override feature :-) 06:52:39 <Webster> Latest update from devactivity: NFO Meta Language - Revision 123: Feature: graphic-blocks now support cargoids as well <http://dev.openttdcoop.org:81/projects/nml/repository/revisions/123> 07:06:25 <andythenorth> mmm.....'cargoids' 07:08:41 <Webster> Latest update from devactivity: OpenGFX+ - Revision 6: Change: Make the livery override for the passenger wagon for the TurboTrai... <http://dev.openttdcoop.org:81/projects/ogfxplus/repository/revisions/6> 07:14:03 <Yexo> http://devs.openttd.org/~yexo/add_item_names.diff <- patch for ogfxplus to support the latest nml change 07:24:38 <Webster> Latest update from devactivity: NFO Meta Language - Revision 124: Feature: add optional name to item-blocks <http://dev.openttdcoop.org:81/projects/nml/repository/revisions/124> 07:51:47 *** ODM has joined #openttdcoop.devzone 07:56:12 <Webster> Latest update from devactivity: OpenGFX+ - Revision 7: Change: Name items (patch by Yexo) <http://dev.openttdcoop.org:81/projects/ogfxplus/repository/revisions/7> 07:57:02 <planetmaker> thx Yexo. Applied 08:08:52 <Ammler> planetmaker: lang doesn't belong to source? 08:09:10 <planetmaker> I think it does. 08:10:13 <Yexo> Ammler: the lang/ directory contains all strings used in the nml file 08:12:18 <Ammler> Yexo: just wondering, why it isn't in the "source" directory 08:12:44 <Ammler> seems also like you need to preprocess it... 08:12:57 <Ammler> (-r1) 08:14:31 <planetmaker> Ammler, yes, the Name string would need to be added by the makefile 08:14:31 <planetmaker> or by a separate addition token 08:16:41 <Ammler> stxt -> sed :-) 08:17:11 <Ammler> or nml could support something like that... 08:18:15 <Yexo> what should it support for that? 08:18:28 <Yexo> nml has no knowledge about revision numbers etc. 08:19:02 <Rubidium> has shinkansen :) 'defines'? 08:19:09 <Yexo> no 08:20:10 <Rubidium> too bad, then one could've just passed something like -DVERSION="12345" to it 08:20:44 <Yexo> even if it had defines those probably wouldn't be supported in the language files 08:21:42 <Ammler> also if you name items, you might also be able to define ids in a separate step? 08:24:56 <Ammler> it isn't possible to split nml in multiple files? 08:25:38 <Yexo> not yet 08:25:38 <Yexo> not sure if that should be supported 08:26:00 <Yexo> erm, not sure if that should be supported in nml or if you should just use gpp for that 08:32:13 <Yexo> hmm, a few #include / #ifdef / #endif / #define should be pretty easy to code 08:44:11 <Webster> Latest update from devactivity: NFO Meta Language - Revision 125: Fix: if you give an item-block the same name as an already exis... <http://dev.openttdcoop.org:81/projects/nml/repository/revisions/125> 09:09:31 <planetmaker> Yexo, concerning version I think about the lines of adding a (new) string tag. And a separate function which gives this tag a meaning / a string value 09:09:40 <planetmaker> Does that sound like a reasonable approach? 09:10:10 <planetmaker> so one could have something like in default.txt: STR_NAME: My Fancy Newgrf {VERSION} 09:13:00 <planetmaker> and have a function which takes care to translate {VERSION} into nightly-rXX or 0.3.1 09:13:14 <planetmaker> like moving the version thing from the makefile to nml 09:14:03 <planetmaker> {version} would have to return rev000 or alike, if no repo is found. Similar to the findversion.sh from OpenTTD 09:16:32 <Ammler> shouldn't you generate a file like rev.nml? 09:18:43 <planetmaker> hm, not sure. 09:19:04 <planetmaker> I don't quite see how that works as the version has to be available as string 09:21:51 <Ammler> rev.nml has "VERSION=r34" or whatever the syntax of python/nml is 09:22:13 <Ammler> quite similar to openttd 09:24:50 <planetmaker> hm, that way, defining a global variable. Even better idea, yes 09:25:42 <planetmaker> it just needs a default value which can get overwritten. 09:30:54 <Ammler> well, it needs support for include, that's all imo :-) 10:24:13 <planetmaker> yes... that's definitely needed :-) 10:45:48 <Ammler> the less you need cpp, the better :-) 10:46:31 <Ammler> !screen 10:50:33 *** KenjiE20 has joined #openttdcoop.devzone 11:03:27 <Webster> Latest update from devactivity: OpenGFX+ - Revision 8: Change: Livery override for TurboTrain mail wagon <http://dev.openttdcoop.org:81/projects/ogfxplus/repository/revisions/8> 11:05:04 <planetmaker> Yexo, I'm thinking of something along these lines in order to access the repo version: http://paste.openttd.org/225684 11:05:58 <planetmaker> If that kind of approach is acceptable, I'd add handling of both, tags and the absense of a repository 11:18:43 <Webster> Latest update from devactivity: NFO Meta Language - Feature #902 (New): Versioning of newgrfs <http://dev.openttdcoop.org:81/issues/902> || OpenGFX+ - ogfxplus-nightly.tar <http://dev.openttdcoop.org:81/attachments/download/668/ogfxplus-nightly.tar> 11:34:36 <Webster> Latest update from devactivity: NFO Meta Language - Feature #902: Versioning of newgrfs <http://dev.openttdcoop.org:81/issues/902#change-2442> 13:10:19 *** Seberoth has joined #openttdcoop.devzone 13:37:26 <Yexo> planetmaker: the {VERSION} tag is fine, but I'd rather not have the "nightly" string hardcoded in there 13:37:44 <Yexo> maybe get_version() could read the complete version string from some file? (which could then be written by the makefile) 13:37:55 <Yexo> that way it'll also work for release versions 13:42:46 <Ammler> I wouldn't hardcode nothing 13:43:01 <Ammler> just alow substitutes 13:43:18 <Ammler> anything* allow* 13:45:49 <Yexo> alternative: read (yeat another input file) extra_string_tags (need a good name), which has a syntax like "VERSION: nightly-r3\nOTHER_TAG: something" 13:46:20 <Yexo> after reading that file both {FERSION} and {OTHER_TAG} are valid tags to be used in language files (just string-replaces 14:16:39 *** ODM has quit IRC 14:17:26 *** Doorslammer has joined #openttdcoop.devzone 14:17:45 *** ODM has joined #openttdcoop.devzone 14:39:15 <planetmaker> Yexo, fine, I'll make a version file which is read. Sounds nice to me. 14:39:38 <planetmaker> That then can be used by the makefile, too in order to be used in other places (like readme generation) 14:39:54 <Yexo> will you only need it for the version or for other defines too? otherwise a define file might be better 14:40:26 <planetmaker> hm... might be useful to transfer other things possibly, too. 14:41:31 <planetmaker> but I don't know anything right now which would be needed 14:41:46 <Yexo> file textcodes.txt with format "ID:text"? where {ID} in language files will be replaced by text 14:46:19 <planetmaker> well, possibly. 14:47:06 <Yexo> let's do just a version file for now, it's easier and if we need more later we'll implement it then 14:48:45 <Ammler> well, then you can as good sed the lang file 14:50:03 <planetmaker> Ok, for now the version will be sufficient. Or we'd make it more complicated than necessary. If you like I'll implement that today or tomorrow 14:50:06 <Ammler> imo, a bit overkill to implement a special case for just one substitute 14:50:28 <planetmaker> Ammler, not really :-) It's something which is bound to change for every commit ;-) 14:50:51 <Ammler> yes, but you can simply sed the lang file for exmple, like you do now 14:52:02 <planetmaker> well... But that needs writing sed scripts and I'm not too happy about the current sed way of doing that. 15:16:37 *** OwenS has joined #openttdcoop.devzone 16:05:08 *** Doorslammer has quit IRC 16:50:41 *** frosch123 has joined #openttdcoop.devzone 19:09:42 *** GT has joined #openttdcoop.devzone 20:53:22 <Webster> Latest update from devactivity: FISH - Revision 335: Add: various source files for hovercraft <http://dev.openttdcoop.org:81/projects/fish/repository/revisions/335> || 32bpp-ez-patches - Revision 35: svn 19648:-Cleanup: removal of more unneeded changes <http://dev.openttdcoop.org:81/projects/32bpp-ez-patches/repository/revisions/35> 20:58:55 *** frosch123 has quit IRC 21:08:10 *** Yexo has quit IRC 21:08:27 *** Yexo has joined #openttdcoop.devzone 21:31:28 *** Seberoth has quit IRC 21:52:02 *** ODM has quit IRC 21:56:46 *** Yexo has quit IRC 21:56:59 *** Yexo has joined #openttdcoop.devzone 22:19:50 *** Seberoth has joined #openttdcoop.devzone 22:26:28 *** GT has quit IRC 22:42:02 *** Seberoth_ has joined #openttdcoop.devzone 22:49:22 *** Seberoth has quit IRC 23:13:17 *** Seberoth_ has quit IRC 23:30:47 *** KenjiE20 has quit IRC