00:00:03 -!- omarax has quit [Remote host closed the connection] 00:00:08 if (foe == nullptr) { return or something w/e } 00:00:17 -!- qguv has quit [Quit: bye] 00:00:35 calling methods of null objects is... either undefined or a crash 00:01:02 Brannock: monsters/actors pointers to null means that there's no monster/actor there, this can happen for any function taking an argument of monster * or actor * 00:01:11 Should that be fixed for the thorn hunter code as well then? 00:01:13 possibly! 00:01:16 i'd need to see the function 00:01:23 oh 00:01:25 no it does check 00:01:28 if (foe && ....) 00:01:31 on the line after 00:01:35 nullptr is falsy 00:01:43 specifically it's literally the value zero 00:02:50 so if foe is nullptr, that condition will be false 00:04:57 -!- ezyan has quit [Ping timeout: 250 seconds] 00:06:49 PleasingFungus: after you said no a hundred times we invited Kramin 00:06:49 amalloy: You have 1 message. Use !messages to read it. 00:07:01 lol 00:07:04 -!- lobf has quit [Ping timeout: 258 seconds] 00:07:32 that was the message that persuaded me to join - i wasn't clear whether that was settled 00:07:32 does this line of code work the way I think it should? 00:07:37 message = "The dream sheep ruffle%s and sparkling dust floats away.", n == 1 ? "s its wool" : "their wool"; 00:07:45 I'm thinking.. probably not 00:07:52 PleasingFungus: it's signed in blood now 00:08:21 you want that to be inside a make_stringf 00:08:23 amalloy: !!! 00:08:26 Thank you 00:08:32 but he might welcome the opportunity to leave, and help fill out other teams who can't find a third; you can talk to him about it if you are keen to take over 00:09:48 I'm going to talk so much smack about the dieselrobin dev team in my streams that week 00:09:59 -!- lobf has joined ##crawl-dev 00:09:59 have some bot commands that spit out really good insult memes 00:10:04 i don't feel strongly. 00:10:11 kramin is, notionally, in this channel. 00:11:06 indeed 00:11:33 I mean if you really want to have a dev only team, I might be able to find another team 00:11:45 -!- magistern has quit [Quit: magistern] 00:11:47 i'm not gonna kick you off if you got nowhere to go 00:11:51 that'd be messed up. 00:12:04 I'll see what chequers is doing 00:12:22 if I can join an team of cpo players then you can go on amalloy's 00:12:33 ok. absolutely no pressure. 00:13:50 yup 00:18:29 PleasingFungus, what's your opinion: should dream sheep sleep power be adjusted based on herd size for MR check, or should only the *effect* be increased if the base power (equal if there's 3 or 9 dream sheep) passes MR? 00:19:19 whats a dream sheep 00:19:24 new creature I'm attempting to code 00:19:36 think starcursed masses, but their shrieks don't damage you, and they sleep you instead of paralyze you 00:19:40 sounds cruel and unusual 00:20:19 -!- grisha5 has quit [Quit: Page closed] 00:21:41 Natasha Message 13https://crawl.develz.org/mantis/view.php?id=10598 by grisha5 00:25:14 does it need to involve mr at all? 00:25:29 -!- valrus has quit [Quit: My iMac has gone to sleep. ZZZzzz…] 00:26:10 hmm. they're magical creatures, so maybe. the dream dust is an enchantment effect. I think this is reaching into a flavor justification though 00:26:27 sleep is usually a mr-resisted effect, but so's para. 00:26:31 yeah, checking MR or not is more a gameplay concern than a flavor one 00:26:48 most characters won't have high MR by lair. would it be clear to players that wearing a ring of magic resistance does not help against dream sheep? 00:26:48 currently it's just basalisks who check your mr in lair? is this a lair creature? 00:26:53 yes, mid to late lair 00:27:44 I think being able to prevent small numbers with mr sounds nice 00:28:01 so power scaling with number of sheep? 00:28:21 I like that way 00:29:07 as of right now, effect scales. 1-2 sheep no sleep, 3-5 sheep, 1-power sleep, 6+ sheep, 2-power sleep. 00:29:09 numbers pending 00:30:18 Unstable branch on CRAWL.XTAHUA.COM updated to: 0.19-a0-1091-g463c9de (34) 00:30:35 I suppose if it does become a problem (and if it's implemented in the first place!) I can always go back and add in a MR check 00:30:44 probably more important right now to finish pushing commits and start testing 00:31:44 MR exists for a reason, right? better to have these things check mr by default and not checking mr is a special case if you find a good reason why it shouldn't? 00:31:56 harder to balance mr 00:32:15 i don't think it's a clear-cut case one way or the other 00:35:11 -!- nikheizen has joined ##crawl-dev 00:36:20 I wish we just referred to this guy by his real name instead of calling him mister all the time 00:36:39 it's hard to resist! 00:39:03 get more MR! 00:40:48 -!- Zeor has quit [Quit: Leaving.] 00:45:32 -!- ProzacElf has joined ##crawl-dev 00:48:43 hm 00:48:52 gammafunk: can you look at 10589? it seems odd 00:49:02 !bug 10589 00:49:02 https://crawl.develz.org/mantis/view.php?id=10589 00:49:03 i know brannock compiled without issues, though i guess he wasn't under cygwin... 00:49:16 oh, i see, this is very cygwin specific 00:49:39 I am compiling right now with msys2, in fact! 00:49:40 wow, that patch 00:50:00 hrm, yeah this seems to imply that cygwin has changed recently 00:50:17 maybe so that we no longer need that workaround 00:50:26 there was a discussion yesterday about the amount of 'thrash' in cygwin 00:50:46 well that was actually talking about msys2, not cygwin 00:51:04 Ah, right, I remember now 00:51:05 but it was talking about what "we" recommended for compiling crawl on windows 00:51:16 which has indeed changed a bit over time 00:51:37 I can try this with a recent cygwin, I'm not familiar which how cygwin releases 00:52:09 !tell |amethyst 10589 seems to imply that maybe the cygwin std:to_string workaround is not needed in recent Cygwin? 00:52:10 gammafunk: OK, I'll let |amethyst know. 00:53:17 -!- Pacra has quit [Read error: Connection reset by peer] 00:53:27 -!- Pacra has joined ##crawl-dev 00:59:55 -!- debo_ has joined ##crawl-dev 01:00:03 -!- omarax has quit [Remote host closed the connection] 01:00:19 -!- debo_ is now known as Guest67699 01:04:37 -!- Guest67699 has quit [Ping timeout: 258 seconds] 01:12:33 -!- squidcat has quit [Ping timeout: 250 seconds] 01:13:33 Hmm, that's a compile error I don't understand. It threw loads of warnings at me over 'actor *foe = mons->get_foe();', saying that all subsequent instances of that in mon-abil.cc "crossed initialization of 'actor* foe'". Apparently my addition to dream sheep is a shadowed declaration. 01:17:35 sounds like 'foe' is already defined in that scope 01:17:36 give me a diff 01:19:50 Unstable branch on crawl.develz.org updated to: 0.19-a0-1091-g463c9de (34) 01:21:42 I've made a few commits to my branch editing mon-abil.cc; git diff only returns the diff for my latest commit. How do I get a diff between the master version of the file and my version of mon-abil.cc? 01:22:45 git diff origin/master is one way 01:22:48 Oh, hang on, it's probably doable through github web interface 01:22:56 possibly git diff origin/master mon-abil.cc 01:23:10 !add removed distortion daggers 01:23:12 03Kramin ⛐ 0.19-a0-732-g0347705: Add removed distortion daggers 10(in the future, 26 files, 245+ 618-) 13http://s-z.org/neil/git/commit.png?p=crawl.git;a=commitdiff;h=0347705 01:23:42 Brannock: yeah git diff 01:23:56 or just git diff to see differences for all paths 01:25:04 https://github.com/crawl/crawl/compare/master...isloat:dream-sheep#diff-a4dfa7884fb2bb04f338151d99b5636d This should work as well 01:25:05 I am become dev, destroyer of souls 01:25:18 !remove added distortion daggers 01:25:19 03gammafunk ⛐ 0.19-a0-733-gdc2e9a1: Remove added distortion daggers 10(in the future, 36 files, 651+ 568-) 13http://s-z.org/neil/git/commit.png?p=crawl.git;a=commitdiff;h=dc2e9a1 01:25:26 dev priveleges revoked 01:25:39 _will_dream_sheep_sleep 01:25:40 *privileges 01:25:47 this is a tongue-twister if i've ever seen one. 01:26:10 Haha 01:26:21 what would a sleep sheep sleep if a sheep could sleep sheep? 01:26:25 looking at lines 1243-1255, i don't understand what you're doing 01:26:28 you get the monster's foe 01:26:42 and then check to see if the foe can be put to sleep 01:27:01 but you're also checking "beem.target" for sanctuary and for the actual parameter passed to dream_sheep_sleep? 01:27:06 instead of foe 01:27:17 what is beem? do you know? 01:27:27 beem? 01:27:29 similar code to case MONS_STARCURSED_MASS above 01:27:32 gamma's bot 01:27:40 Oh, huhs. 01:27:43 *hush 01:27:57 !source mon-abil.cc 01:27:57 https://github.com/crawl/crawl/blob/master/crawl-ref/source/mon-abil.cc 01:28:20 If the sheep isn't confused, and the target is in a valid position (ie, not in a sanctuary), and the target is vulnerable to sleep, and it passes a coinflip, call the function that triggers the sleep ability 01:28:44 ahh, beem.target is set to foe.pos() earlier 01:28:50 in mon-act 01:29:01 anyway, there's no reason to call actor_at ther 01:29:03 *there 01:29:07 it's very roundabout and backwards 01:29:19 just use foe, since that's either going to be the same thing, or there's a bug 01:29:30 -!- dtsund has quit [Remote host closed the connection] 01:29:36 anyway that's not the compiler error, so let me scroll up. 01:29:53 what line is the error on? 01:30:00 what line in mon-abil.cc 01:30:01 PleasingFungus: looks like my tavern legacy is going to be "the guy who made a fake nude mod" 01:30:01 1244 01:30:11 oh dear 01:30:13 i see it 01:30:34 you need to put a set of opening braces after "case MONS_DREAM_SHEEP: ", and close them after the break; 01:30:36 { } 01:30:41 Oh wow 01:30:47 like with thorn hunter 01:30:58 though ironically i think thorn hunter doesn't have to 01:31:02 starcursed mass doesn't have them either 01:31:05 yes 01:31:23 after or before the break? 01:31:24 that is because it doesn't need 01:31:28 thorn hunter puts it before the break 01:31:30 doesn't matter 01:31:40 i should probably explain what you're doing here 01:32:05 it's a good idea to brace everything if you are a beginner; |amethyst will fix it later anyhow :) 01:32:11 indeed 01:32:29 would be nice if util/unbrace worked on windows 01:32:31 maybe it does 01:32:33 who knows 01:33:33 basically: you can't declare variables inside a switch/case statement unless they're inside braces. that's the short version. the long version goes into the technical details of how switch/case works 01:33:53 you'll notice that the starcursed mass case doesn't declare any variables 01:34:16 And thorn hunter variables are all nested inside its if clauses 01:34:43 yeah 01:34:47 also the thing i said just now is a lie 01:34:57 XOM chuckles. 01:35:04 you can actually declare a variable without braces, but it can't be the first line after the case statement 01:35:54 I changed actor_at(beem.target). Should is_sanctuary(beem_target) also be changed to is_sanctuary(foe)? And what's the problem with beem.target for being roundabout? 01:36:13 it would have to be foe->pos() 01:36:26 it just seems silly to end up doing this dance 01:36:57 actor_at(beem.target) is the same as actor_at(mon->foe->pos()), which, of course, is mon->foe 01:37:04 it's not a big deal 01:37:52 just bothered me, possibly because i'm tired 01:37:54 -!- Pacra has quit [Ping timeout: 250 seconds] 01:39:52 the n > 5 message is very verbose 01:40:42 -!- omnirizon has quit [Ping timeout: 265 seconds] 01:43:31 Removed second sentence from that 01:45:59 -!- Poncheis has quit [Client Quit] 01:46:28 ??ontocrawl 01:46:29 ontocrawl[1/1]: 1/2 level area; ~2x cost of skills over 10, ~4x cost over 20; 1/2 item gen in every branch but D, zero item gen in extended, don't gen "popcorn" monsters anywhere ever 01:47:11 i don't remember why i put the skill cost thing in there 01:47:28 the ash buff 01:47:57 mmm 01:48:47 ontoclasm, are there any unique corpse tiles, or are all corpse tiles just squashed versions of regular montiles? 01:48:47 oka buff, clearly 01:49:06 aside from skelefication 01:49:32 Brannock: the latter 01:49:37 corpse tiles are autogenerated 01:52:54 -!- packet_loss has joined ##crawl-dev 01:53:24 -!- magistern has quit [Quit: magistern] 01:54:49 -!- nikheizen has quit [Quit: leaving] 01:56:01 Windows builds of master branch on crawl.develz.org updated to: 0.19-a0-1091-g463c9de 01:56:20 -!- PleasingFungus has quit [Quit: ChatZilla 0.9.92 [Firefox 47.0/20160604131506]] 01:57:29 -!- packet_loss has quit [Ping timeout: 252 seconds] 02:00:04 -!- omarax has quit [Remote host closed the connection] 02:00:05 -!- zxc has joined ##crawl-dev 02:03:15 -!- aditya has joined ##crawl-dev 02:06:43 -!- squidcat has quit [Ping timeout: 250 seconds] 02:07:39 -!- destroythecore has quit [Read error: Connection reset by peer] 02:08:49 ontoclasm grows pet monsters himself, tends them lovingly, then kills them when they come of age, so he can take a picture to make accurate corpse tiles 02:10:43 I think I've attempted to compile my branch like a dozen times and discovered a missing enum declaration each time. 02:10:55 I'm glad I decided to start writing monster_creation checklist yesterday. 02:14:25 -!- bonghitz has quit [Remote host closed the connection] 02:21:33 -!- simmarine has quit [Read error: Connection reset by peer] 02:26:59 -!- Zekka_ has quit [Read error: Connection reset by peer] 02:27:03 gammafunk: actually the "blood" is just ketchup 02:27:13 no monsters were harmed in the making of crawl tiles 02:35:18 IT COMPILES! 02:35:20 IT WORKS! 02:35:22 MY CREATION LIVES! 02:40:37 compiles = perfect code 02:40:48 several bugs already :o 02:41:00 at least it doesn't crash the game or break the compile 02:41:13 and the sleepcursed_mass effect actually works 02:41:23 funny that the most complicated part of them works properly 02:44:35 Man. This is so basic but so cool to actually see something I wrote (read: stolen and edited code) working 02:46:01 just wait til you see the tvs of players dying to dream sheep 02:46:10 maximum euphoria 02:46:23 can't wait until it's merged 02:46:28 -!- aditya has quit [Ping timeout: 276 seconds] 02:46:33 ...then I can r e m o v e it 02:46:44 ??gammafunk 02:46:44 gammafunk[1/5]: Crawl dev. See {gammafunkrc} and http://twitch.tv/gammafunk 02:46:55 yeah right caustic shrikes are still in 02:47:03 that entry is full of lies, don't believe it 02:47:13 ??gammafunk[2 02:47:13 gammafunk[2/5]: Expose you.attack_delay and autopickup menu options in lua 02:47:23 I honestly don't expect dream sheep to last very long 02:47:35 but ever since PleasingFungus mentioned sheepcursed masses a couple years ago the idea has stuck in my head 02:47:43 so I wanted to actually go and implement them 02:48:33 leave a door open for deep dream sheep 02:48:45 coma sheep? 02:48:53 dream sheep for Lair, checks MR. coma sheep for Depths, ignores MR? 02:49:19 -!- aditya has joined ##crawl-dev 02:49:33 initial testing shows that either I need to adjust cast rate way down or to add in a MR check 02:50:57 -!- MaxFrost has quit [Quit: Going offline, see ya! (www.adiirc.com)] 02:53:56 Monster database of master branch on crawl.develz.org updated to: 0.19-a0-1091-g463c9de 02:59:38 -!- Patashu has quit [Ping timeout: 252 seconds] 03:00:04 -!- omarax has quit [Remote host closed the connection] 03:04:20 -!- Kalir has quit [Quit: I'M OUT SON. PEACE, LOVE, EXPLOSIONS.] 03:18:53 -!- aditya has quit [Ping timeout: 252 seconds] 03:19:56 -!- Dracunos has quit [Ping timeout: 258 seconds] 03:20:17 -!- bonghitz has quit [Ping timeout: 264 seconds] 03:24:03 Unstable branch on crawl.beRotato.org updated to: 0.19-a0-1091-g463c9de (34) 03:28:44 -!- kdrnic has quit [Quit: Leaving] 03:29:52 what do dream sheep do exactly 03:35:03 -!- mibe has quit [Quit: Page closed] 03:37:59 if there's a lot of them, they try to put you to sleep 03:40:19 that effect may actually be too nasty for lair, I'm finding out 03:40:47 but it's late, so I'm going to go count sheep in bed until I fall asleep 03:42:35 -!- lobf has quit [Ping timeout: 240 seconds] 03:43:36 -!- vede has quit [Quit: Lost terminal] 03:44:41 -!- aditya has joined ##crawl-dev 03:46:10 -!- lobf has joined ##crawl-dev 03:52:47 -!- VoxSomniator has quit [Quit: Leaving] 03:53:42 -!- packet_loss has joined ##crawl-dev 03:57:52 -!- Ququman has joined ##crawl-dev 03:57:56 -!- PElf has joined ##crawl-dev 03:58:05 -!- packet_loss has quit [Ping timeout: 240 seconds] 03:58:51 -!- ProzacElf has quit [Ping timeout: 244 seconds] 04:00:03 -!- omarax has quit [Remote host closed the connection] 04:10:15 -!- GauHelldragon has quit [Ping timeout: 250 seconds] 04:19:21 -!- hellmonk has quit [Quit: Page closed] 04:24:50 -!- sysice has quit [Quit: Page closed] 04:26:45 -!- cait has quit [Ping timeout: 244 seconds] 04:54:49 -!- ontoclasm has quit [Quit: Leaving.] 05:00:04 -!- omarax has quit [Remote host closed the connection] 05:22:26 -!- MaBunny is now known as OtakuSenpai 05:22:35 -!- lobf has quit [Quit: lobf] 05:42:32 -!- Bcadren has quit [Ping timeout: 258 seconds] 05:44:45 -!- PElf has quit [Quit: HydraIRC -> http://www.hydrairc.com <- \o/] 05:48:35 -!- } has quit [Ping timeout: 240 seconds] 05:54:53 -!- packet_loss has joined ##crawl-dev 05:59:11 -!- packet_loss has quit [Ping timeout: 244 seconds] 06:00:02 -!- omarax has quit [Remote host closed the connection] 06:04:05 -!- ac13 has quit [Read error: Connection reset by peer] 06:22:05 -!- Patashu has joined ##crawl-dev 06:26:17 -!- valrus has quit [Quit: My iMac has gone to sleep. ZZZzzz…] 06:26:30 -!- Shard1697 has joined ##crawl-dev 06:33:50 -!- edsrzf has quit [Ping timeout: 250 seconds] 06:38:15 -!- vede has quit [Ping timeout: 264 seconds] 06:41:58 -!- Tux[Qyou] has joined ##crawl-dev 06:43:50 -!- vede has quit [Ping timeout: 258 seconds] 06:44:15 .suspensetv 06:44:21 fuck 06:44:24 -!- doll has left ##crawl-dev 06:44:51 -!- aditya has quit [Ping timeout: 264 seconds] 06:46:03 suspensetv requested for FooTV (telnet://termcast.develz.org or http://termcast.develz.org ). 06:48:21 -!- jefus- has joined ##crawl-dev 06:48:40 !tell pleasingfungus the messaging for 'spell books have been filtered' in x-v is a bit confusing when the monster's filtered list is only one spellbook long 06:48:41 chequers: OK, I'll let pleasingfungus know. 06:52:24 -!- jeefus has quit [Ping timeout: 260 seconds] 07:00:02 -!- omarax has quit [Remote host closed the connection] 07:16:33 -!- sgun_ has quit [Ping timeout: 250 seconds] 07:20:34 -!- Kenran has quit [Quit: leaving] 07:27:37 -!- panicbit has quit [Ping timeout: 260 seconds] 07:47:25 -!- Zxpr2jk has quit [Ping timeout: 250 seconds] 07:51:03 -!- Zekka has quit [Ping timeout: 240 seconds] 07:55:27 -!- packet_loss has joined ##crawl-dev 07:58:06 -!- } has joined ##crawl-dev 07:58:34 -!- doll has quit [Quit: Lost terminal] 07:59:22 <}> :( The makefile in the master branch checks if "lua51" is present but 0.17 only checks for "lua-5.1" and "lua5.1" 07:59:54 * } throws lua51 at Makefile 08:00:02 -!- omarax has quit [Remote host closed the connection] 08:00:27 -!- packet_loss has quit [Ping timeout: 264 seconds] 08:00:52 -!- wheals has joined ##crawl-dev 08:02:53 <}> so I was thinking, wouldnt it be great if you could pass LUA_PACKAGE as an environment variable to the makefile so you can set it yourself in all versions 08:03:08 <}> because right now the makefile doesnt check if LUA_PACKAGE is set before trying to set it 08:04:54 <}> In other words if you have some weird system where pkg-config can only find "lua-5-1" instead of "lua5.1" or "lua-5.1" there's no way to pass that to make right now without editing the makefile 08:05:36 <}> !source Makefile:629 08:05:37 https://github.com/crawl/crawl/blob/master/crawl-ref/source/Makefile#L629 08:05:51 <}> you would have to add ifndef LUA_PACKAGE there, so if you already set it, it skips that part 08:06:57 <}> unless im missing some crucial part here 08:13:55 -!- syllogism has joined ##crawl-dev 08:15:01 -!- mattitk has quit [Ping timeout: 258 seconds] 08:17:35 <|amethyst> probably you could wrap that whole ifndef BUILD_LUA inside ifndef LUA_PACKAGE 08:17:35 |amethyst: You have 1 message. Use !messages to read it. 08:17:49 -!- simmarine has joined ##crawl-dev 08:17:50 <}> |amethyst, yes thats what I meant 08:17:58 <}> by adding ifndef LUA_PACKAGE 08:18:18 <}> i think its great for the weirder systems like mine where pkg-config can trip 08:18:49 <}> especially considering it does trip if I do a git checkout 0.17.0 or older versions 08:19:05 <|amethyst> not much we can do about that 08:19:18 <|amethyst> since 0.17.0 would still have the older makefile 08:19:33 <}> yes but for future versions it would solve the problem for people so they dont need to edit makefile 08:19:35 <|amethyst> could release an 0.17.3 08:19:41 <}> it's just future proofing and making everything more robust 08:20:18 <}> and considering all you need to do is add 2 lines that seems like a good deal 08:20:43 <|amethyst> yes, I'm wondering why you haven't submitted a PR yet :) 08:20:53 <|amethyst> but I can do it 08:20:57 <}> on mantis? 08:21:06 <}> I guess its simple enough that you wouldnt want to bother with a request 08:21:09 <|amethyst> on github, or a bug report and patch on mantis 08:21:18 <}> but sure I can do it 08:21:25 <|amethyst> don't worry about it now, I'm on it 08:21:28 <}> yay 08:21:45 -!- sgun__ has quit [Quit: Leaving] 08:21:47 <|amethyst> but applying a PR from github is even easier than changing two lines of code ourselves :) 08:21:55 <}> ok I'll keep that in mind for next time 08:21:59 -!- OtakuSenpai has quit [Ping timeout: 250 seconds] 08:24:40 -!- mattitk has quit [Ping timeout: 258 seconds] 08:33:12 <|amethyst> !tell gammafunk looks like it, but how to identify whether that's needed? 08:33:12 |amethyst: OK, I'll let gammafunk know. 08:33:33 <|amethyst> !tell gammafunk I guess we can add something to util/configure 08:33:33 |amethyst: OK, I'll let gammafunk know. 08:35:43 <|amethyst> cool, the hyperrogue 9.0 release notes contain a shout out to amalloy 08:38:28 -!- Tiltorax has quit [Quit: Page closed] 08:40:19 -!- Bammboo has quit [Quit: AndroIRC - Android IRC Client ( http://www.androirc.com )] 08:43:47 -!- amalloy is now known as amalloy_ 08:50:02 03|amethyst02 07* 0.19-a0-1092-g52934d3: Allow specifying the Lua package name (bsdbeard) 10(21 minutes ago, 1 file, 24+ 20-) 13https://github.com/crawl/crawl/commit/52934d3359ce 09:00:02 -!- omarax has quit [Remote host closed the connection] 09:08:56 Unstable branch on crawl.jorgrun.rocks updated to: 0.19-a0-1092-g52934d3 (34) 09:19:56 -!- Jafet has quit [Quit: Jafet] 09:20:55 -!- mamgar has quit [Client Quit] 09:27:25 -!- bitcoinbastard has quit [Ping timeout: 244 seconds] 09:28:36 -!- miserium has joined ##crawl-dev 09:38:27 -!- magistern has quit [Quit: magistern] 09:44:55 -!- bonghitz has quit [Remote host closed the connection] 09:48:08 -!- Kalir has quit [Changing host] 09:48:41 -!- magistern has quit [Quit: magistern] 09:49:13 hey gang - just a heads up, a commit yesterday has now caused the nightly android build to fail. I'm getting ready to head out the door but figured I'd post the relevant part of the build that failed: http://pastebin.com/DsMvNczd 09:49:56 I'll leave my IRC open but I'll be afk; I'll check in when I get home later 09:50:15 -!- Doesnty has quit [Ping timeout: 276 seconds] 09:54:28 03|amethyst02 07* 0.19-a0-1093-g289af91: Add missing CRs in crawl.vcxproj. 10(34 seconds ago, 1 file, 3+ 3-) 13https://github.com/crawl/crawl/commit/289af9175aec 09:54:28 03|amethyst02 07* 0.19-a0-1094-gb519beb: Add nearby-danger.cc to MSVC and Android builds (miserium) 10(17 seconds ago, 2 files, 2+ 0-) 13https://github.com/crawl/crawl/commit/b519bebee1ae 09:54:34 -!- Patashu has quit [Ping timeout: 240 seconds] 09:54:35 <|amethyst> miserium: fixed, thanks 09:56:19 -!- packet_loss has joined ##crawl-dev 10:00:02 -!- omarax has quit [Remote host closed the connection] 10:01:18 -!- packet_loss has quit [Ping timeout: 276 seconds] 10:08:53 Unstable branch on crawl.jorgrun.rocks updated to: 0.19-a0-1094-gb519beb (34) 10:09:10 -!- doll has quit [Quit: Lost terminal] 10:12:26 -!- Nomi has quit [Read error: Connection reset by peer] 10:30:18 -!- cait has quit [Quit: ChatZilla 0.9.92 [Firefox 49.0/20160802125918]] 10:39:11 -!- Patashu has joined ##crawl-dev 10:45:04 -!- Patashu has quit [Ping timeout: 240 seconds] 10:49:04 -!- Shard1697_ has joined ##crawl-dev 10:49:24 -!- Shard1697 has quit [Ping timeout: 276 seconds] 10:49:52 -!- bonghitz has quit [Ping timeout: 240 seconds] 10:56:25 -!- JoeMaro has quit [Read error: Connection reset by peer] 10:57:51 -!- Klaymen has quit [Quit: ChatZilla 0.9.92 [Firefox 48.0/20160726073904]] 11:00:02 -!- omarax has quit [Remote host closed the connection] 11:02:13 -!- debo_ has joined ##crawl-dev 11:02:36 -!- debo_ is now known as Guest4177 11:05:03 -!- debo has quit [Ping timeout: 244 seconds] 11:10:32 -!- valrus_ has quit [Ping timeout: 265 seconds] 11:14:27 -!- JoeMaro has quit [Read error: Connection reset by peer] 11:18:26 -!- Kellhus has quit [Quit: Page closed] 11:20:15 -!- magistern has quit [Read error: Connection reset by peer] 11:20:24 -!- wheals has quit [Ping timeout: 244 seconds] 11:28:24 -!- Shard1697_ has quit [Ping timeout: 276 seconds] 11:28:42 -!- } has quit [] 11:31:20 -!- magistern has quit [Quit: magistern] 11:42:28 -!- magistern has quit [Ping timeout: 258 seconds] 11:43:41 -!- _dhm has quit [Ping timeout: 250 seconds] 11:56:18 -!- wheals has joined ##crawl-dev 11:57:17 -!- packet_loss has joined ##crawl-dev 12:00:02 -!- omarax has quit [Remote host closed the connection] 12:00:16 -!- johlstei_ has joined ##crawl-dev 12:02:16 -!- packet_loss has quit [Ping timeout: 264 seconds] 12:02:24 -!- mattitk has quit [Ping timeout: 258 seconds] 12:03:19 -!- johlstei has quit [Ping timeout: 260 seconds] 12:05:30 -!- valrus_ has quit [Ping timeout: 244 seconds] 12:10:31 -!- JoeMaro has quit [Read error: Connection reset by peer] 12:11:52 -!- magistern has quit [Ping timeout: 264 seconds] 12:12:39 -!- Shard1697 has joined ##crawl-dev 12:13:05 -!- _dhm has quit [Ping timeout: 258 seconds] 12:14:59 -!- PleasingFungus has joined ##crawl-dev 12:16:15 when your shadow mimicks your spell, does whether it does "shadow shard" or "shadow bolt" affect its damage? 12:17:35 <|amethyst> it does not 12:18:03 |amethyst: sry for the build messiness 12:18:04 PleasingFungus: You have 1 message. Use !messages to read it. 12:18:07 <|amethyst> the only differences are beam.name and beam.pierce 12:18:10 <|amethyst> no worries 12:18:13 -!- Zekka has quit [Read error: Connection reset by peer] 12:18:24 ok, juuust checking 12:18:37 man, i respect the h*ck out of this cyc guy's spell naming style 12:18:43 Olgreb's Toxic Overdrive (Poison/Charms 5) 12:19:04 tell me that doesn't sound like a spell you want to cast 12:21:22 -!- sjl has quit [Ping timeout: 244 seconds] 12:26:01 -!- ontoclasm has joined ##crawl-dev 12:26:30 -!- JoeMaro has quit [Read error: Connection reset by peer] 12:31:29 -!- destroythecore has quit [Read error: Connection reset by peer] 12:32:27 -!- rossi has quit [Ping timeout: 250 seconds] 12:34:45 -!- MarvinPA has joined ##crawl-dev 12:38:33 -!- Tux[Qyou] has quit [Ping timeout: 250 seconds] 12:39:23 -!- cait has quit [Ping timeout: 250 seconds] 12:44:08 03PleasingFungus02 07* 0.19-a0-1095-g342353f: Rewrite fixup_stone_stairs 10(20 hours ago, 1 file, 230+ 170-) 13https://github.com/crawl/crawl/commit/342353f40036 12:47:11 -!- JoeMaro has quit [Quit: Leaving] 12:49:47 -!- magistern has quit [Quit: magistern] 12:54:28 Can someone explain to me what the point of the special tag for the InventoryTile class is, especially with regards to MemoriseRegion? 12:54:42 For spells it is set to the book id I guess, but I don't see that used anywhere in the interface 12:54:56 !source InventoryTile 12:54:56 1/2. https://github.com/crawl/crawl/blob/master/crawl-ref/source/tilereg-grid.cc#L12 12:56:19 looks unused. try removing it and see what breaks 12:57:35 Cool 13:00:03 -!- omarax has quit [Remote host closed the connection] 13:07:22 -!- _dhm has quit [Ping timeout: 252 seconds] 13:08:51 Unstable branch on crawl.jorgrun.rocks updated to: 0.19-a0-1095-g342353f (34) 13:11:46 -!- Zxpr1jk has quit [Quit: Leaving] 13:13:09 -!- lobf has joined ##crawl-dev 13:17:06 -!- Shard1697 has quit [Ping timeout: 258 seconds] 13:19:27 -!- magistern has quit [Quit: magistern] 13:26:13 Unstable branch on crawl.akrasiac.org updated to: 0.19-a0-1095-g342353f (34) 13:29:54 -!- jefus has joined ##crawl-dev 13:30:37 03PleasingFungus02 07* 0.19-a0-1096-g8280678: Let Ash ID rods again (Arrhythmia) 10(61 seconds ago, 1 file, 5+ 5-) 13https://github.com/crawl/crawl/commit/82806789e809 13:30:49 -!- bonghitz has quit [Remote host closed the connection] 13:32:52 -!- jefus- has quit [Ping timeout: 264 seconds] 13:33:12 -!- } has quit [Ping timeout: 276 seconds] 13:34:30 -!- Dracunos has quit [Ping timeout: 276 seconds] 13:35:09 -!- } has quit [Client Quit] 13:35:27 -!- kdrnic has joined ##crawl-dev 13:35:55 -!- Dracunos7 has quit [Ping timeout: 244 seconds] 13:38:12 -!- Vektorweg1 has quit [Ping timeout: 240 seconds] 13:39:18 -!- Vektorweg1 has joined ##crawl-dev 13:41:19 -!- cait has quit [Ping timeout: 260 seconds] 13:44:04 -!- ontoclasm has quit [Quit: Leaving.] 13:47:59 -!- amalloy_ is now known as amalloy 13:49:17 -!- MarvinPA has quit [Read error: Connection reset by peer] 13:54:46 !messages 13:54:47 No messages for TZer0. 13:58:06 -!- packet_loss has joined ##crawl-dev 14:00:00 -!- elliptic has joined ##crawl-dev 14:00:03 -!- omarax has quit [Remote host closed the connection] 14:01:02 !seen lasty 14:01:02 I last saw Lasty at Thu Aug 4 11:36:33 2016 UTC (3d 6h 24m 21s ago) quitting, saying 'Ping timeout: 240 seconds'. 14:01:02 <|amethyst> xormask: looks like it's used in tilereg-inv.cc m_buf.add_main_tile(item.special, x, y, 0, 0); 14:01:19 <|amethyst> xormask: and it's set by desc.special = tileidx_known_brand(item); or desc.special = tileidx_corpse_brand(item); 14:01:29 |amethyst yeah I saw that, but I don't think it is used for spells 14:01:35 in MemoriseRegion 14:01:43 <|amethyst> xormask: yeah 14:02:24 <|amethyst> it's used only for weapons, armour, missiles, rods, and corpses 14:02:35 -!- packet_loss has quit [Ping timeout: 250 seconds] 14:03:13 <|amethyst> Hm 14:03:18 |amethyst not setting the special tag for books lets you simplify a lot of things, because the spell to book relationship doesn't need to be passed out in the relationship 14:03:54 It sort of seems like InventoryTile shouldn't be used for MemoriseRegion, but whatever 14:05:24 -!- cait has quit [Ping timeout: 244 seconds] 14:05:27 sorry the above message should have been *doesn't need to be passed out in the api 14:06:26 -!- lobf has quit [Quit: lobf] 14:06:36 Also is there some standard for unordered_set vs set? 14:08:55 Unstable branch on crawl.jorgrun.rocks updated to: 0.19-a0-1096-g8280678 (34) 14:09:31 presumably depends on whether a consistent iteration order is important 14:09:50 <|amethyst> we only use unordered_set in a few places currently, because we only started using C++11 relatively recently 14:10:12 Ok I just wanted to be sure there wasn't some internal coding style thing and not just for function 14:12:07 coding style... 14:12:27 D: 14:15:55 interesting and bad. hiding a file in Windows Explorer prevents msys2 from opening it. 14:16:09 All I wanted was to not have to repeatedly scroll past .d and .o files 14:17:00 -!- Pacra has joined ##crawl-dev 14:17:59 Use linux! 14:18:09 I eventually probably will 14:20:48 use os2/warp 14:22:30 I got my branch to successfully compile last night. immediately discovered several bugs during testing 14:23:32 1. screen flash/force-more only pops about half to 3/4 of the time when sleeped. 2. Summon Dream Sheep isn't actually working. (in process of fixing this.) 3. not a bug, but sleep is *nasty* and I'm in the process of nerfing how often they can use it and will probably have to add a MR check. 14:24:39 What will Summon Dream Sheep do Brannock? Sounds funny 14:24:59 dream sheep will summon more dream sheep as an emergency spell 14:25:13 when there are more than a certain number of dream sheep they will attempt to put the player to sleep 14:28:28 -!- eki has quit [Quit: leaving] 14:29:02 Dammit I still can't get Summon Dream Sheep to show up on xv and this probably means they won't actually cast it either. Not sure what I did wrong 14:29:47 Brannock: do you know how to make a patch? 14:29:49 gammafunk: You have 3 messages. Use !messages to read them. 14:29:55 Not yet I do not 14:30:06 Looks like force-more/screen flash doesn't work if you fall asleep but wake up before your next turn would have happened 14:30:09 for the last time Sequell, I do not need male enhancement pills! 14:30:23 Also, interesting: riposte works even if you're asleep. 14:31:02 git format-patch --stdout origin/master > master.patch 14:31:39 sleep disables surprisingly few things 14:31:50 Thank you. What's the purpose/function for making a patch vs. a pull request or commit? 14:31:51 you can dodge while asleep (hence riposte) 14:32:08 i tried to fix this once, but failed 14:32:17 Brannock: patch is a text file you can pastebin/share 14:32:30 certainly you could put your work into a PR as well 14:33:49 I also like to just look at a patch file of all commits I'm about to push to sanity check and spellcheck the messages/contents 14:34:19 but people have different routines they do 14:34:47 Thank you, I'll note that down for when this is ready to be PR'd 14:35:01 well, I mentioned that so you can share your code 14:35:08 in terms of debugging that problem 14:35:16 https://github.com/crawl/crawl/compare/master...isloat:dream-sheep#diff-d1c34e9aaccf962b6ce36db68889a68d This is the current diff of my branch. I'm stumped as to why Summon Dream Sheep isn't working or showing up on xv. I've compared it against a couple of other monster spells and I'm pretty sure I got everything... 14:35:26 But I clearly haven't 14:35:49 Lemme make a text patch file for easier reading, since Github is a bit spread out 14:36:15 oh, this one's easy 14:36:29 hm, nvm 14:36:41 gammafunk, do you prefer gist or pastebin? 14:36:53 or mantis? 14:36:57 no, this github diff is fine 14:37:05 it has a diff for all changes 14:37:16 ya 14:37:39 such a spooky tile... 14:37:47 i'd probably add some dprfs to find out where, exactly, the cast is failing 14:38:00 like, does it get into setup_mons_cast? does it get into mons_cast? 14:38:11 does it get into case spell_summon_dream_sheep in mons cast? 14:38:25 Oh, hang on, I haven't synced a couple commits from this morning 14:38:26 turning off the emergency flag might make testing simpler 14:38:45 It isn't showing up in xv at all, so somewhere it isn't even being read as a spell at all 14:39:02 Or maybe I didn't attribute it to dream sheep properly? 14:39:11 oh 14:39:13 yeah you didn't 14:39:17 + 3, 10, MST_NO_SPELLS, CE_CLEAN, S_BLEAT, 14:39:30 needs to be MST_DREAM_SHEEP 14:39:50 That'd do it. I copied the sheep code and forgot to go back and look at it again 14:40:54 What about the screen flash/force-more when sleeped? After a bunch of testing last night and today I'm guessing that there's no force-more if you wake up before you would have acted. 14:44:07 -!- simmarine has quit [Read error: Connection reset by peer] 14:45:24 ? 14:47:13 -!- Dracunos-m has quit [Ping timeout: 250 seconds] 14:47:39 when you are sleeped, normally the screen flashes a color and there is a force-more to inform you that you are asleep. (aizul is the most common way players will encounter this.) with dream sheep, this occasionally does not happen. I realized that since they're all acting at the same time, there is a high likelihood that you will be attacked and awakened before your next turn would have happened. in this case, you do not get the 14:47:39 screen flash or force-more. 14:48:35 neat 14:48:39 sounds like a pre-existing bug 14:50:18 I'll mantis it today, then 14:51:03 I think that's everything I need to fix then, thank you PleasingFungus and gammafunk 14:51:07 Now to balance this thing 14:51:11 How do I check average XL of players who are at, say, Lair:6? 14:51:39 !lm * recentish lair:6 x=avg(xl) 14:52:01 90348 milestones for * (recentish lair:6): avg(xl)=15.44 14:52:22 I wonder if that works with MR. 14:52:23 !lm * recentish lair:6 x=avg(xl) urune=0 14:52:25 65470 milestones for * (recentish lair:6 urune=0): avg(xl)=13.8 14:52:27 !lm * recentish lair:6 x=avg(MR) 14:52:28 Cannot call avg(mr) (want (Type[ETD;seconds],Type[I])) 14:52:30 Nope! 14:52:36 !lm * recentish lair:6 urune>1 14:52:38 12975. [2016-08-07 18:34:22] jeffwins the Unseen (L27 OpFi of Dithmenos) killed Murray on turn 83361. (Lair:6) 14:52:43 lmao 14:52:47 Poor Murray 14:52:55 !lm * recentish lair:6 urune>1 -tv 14:52:56 12975. jeffwins, XL27 OpFi, T:83361 (milestone) requested for FooTV: telnet://termcast.develz.org or http://termcast.develz.org. 14:52:57 !lm * recentish lair:4 x=avg(xl) 14:53:06 -!- miserium has left ##crawl-dev 14:53:07 noo, cwz 14:53:22 anyway i'd use that urune=0 filter probably, otherwise you're gonna get skewed by weird shenangains 14:53:22 87795 milestones for * (recentish lair:4): avg(xl)=14.35 14:53:29 !lm * recentish lair:4 x=avg(xl) urune=0 14:53:30 68437 milestones for * (recentish lair:4 urune=0): avg(xl)=13.32 14:53:47 !lm * recentish lair:4 urune>0 14:53:48 19358. [2016-08-07 18:26:05] herpmino the Severer (L18 FoFi of Okawaru) left the Snake Pit on turn 14645. (Snake:1) 14:53:52 ahh 14:53:54 hm 14:54:02 Probably best to skew it a bit downwards anyway 14:54:04 well, it's all approximations 14:54:08 Especially since sleep is such a nasty effect 14:54:11 Level 10-13 14:54:34 !lg * recentish lair:4 14:54:35 6062. LordBacon the Fighter (L12 DsCK of Xom), mangled by a death yak on Lair:4 on 2016-08-07 18:24:21, with 20932 points after 14238 turns and 0:51:44. 14:54:39 !lg * recentish lair:4 x=avg(xl) 14:54:40 6062 games for * (recentish lair:4): avg(xl)=12.32 14:54:50 gonna skew a bit downward, since underleveled people are more likely to die 14:54:59 Since sleep is so strong, I don't think there's much need to make dream sheep that much tougher than regular sheep. They're very dangerous when accompanied by other monsters. 14:55:09 I'll adjust their monster stats back downwards. 14:55:13 is sleep really that bad 14:55:39 -!- _dhm has quit [Ping timeout: 250 seconds] 14:55:54 you're sleeping for between 3 to 8-10 turns, being hit when asleep is 2.5x damage (I think), and it basically means any awake monsters on screen are effectively teleported near you 14:55:57 urgh enums don't work as unordered_set keys, how annoying 14:56:11 Part of the problem right now is that dream sheep can sleep you repeatedly, which I'm also going to change 14:56:51 xormask: why not? 14:57:10 Also no MR check (yet), which means your only recourse is to quickly separate them under the threshold for sleep, or to kill as many as you can asap 14:57:23 PleasingFungus, defect in the c++11 standard apparently 14:57:31 baffling 14:57:41 Also spell_type is an enum :) 14:57:59 what is with the TAG_MAJOR_VERSION thing in the spell_type list 14:58:19 save compat 14:58:19 lots of #if TAG_MAJOR_VERSION == 34 14:58:42 So you can build a version for old saves? 14:58:54 so that the current version works for old saves 14:59:18 we build with TAG_MAJOR_VERSION set to 34 14:59:31 whenever we decide to break save compat, we'll increment to 35 and delete all the code in the ==34 ifdefs 14:59:36 Gotcha 15:00:03 -!- omarax has quit [Remote host closed the connection] 15:00:14 wizmode needs a way to alter player's MR values 15:00:18 <|amethyst> for more information, read docs/develop/save_compatibility.txt, expectially the section "Scheduling compatibility code for removal" 15:00:55 would be tricky to support 15:00:57 @ Brannock 15:01:00 that must rack up a ridiculous number of millimarvins 15:01:12 <|amethyst> s/expect/espec/ 15:01:27 you'd need, like, some wizmode-specific attribute that modifies MR? 15:01:29 atm it's either wait for Aizul to defeat my MR at high XL, or repeatedly refuse to die at low XL 15:01:37 to test sleep bug 15:01:54 <|amethyst> Brannock: you can read vulnerability to help 15:01:58 Ooh, good idea 15:02:11 can also mess around with fighting/armour skill at low xl 15:02:13 &S 15:02:17 maybe &A 15:04:46 <|amethyst> if you need to do more MR tweaking, you can make a randart with MR--- or whatever 15:05:06 Successfully reproduced the sleep bug with Aizul and jackals 15:05:18 It's titchy to reproduce though, a lot of things have to go right 15:05:30 -!- Vektorweg1 has quit [Quit: Leaving.] 15:05:46 edit mon-data to increase aizul's speed to 100 or w/e 15:05:59 then surround yourself with aizuls 15:06:00 <|amethyst> take an item you're not currently wearing, &+ to make it a randart, &tcL-3 then put it on 15:06:10 Wouldn't that require a re-compile? re: editing mon-data 15:06:10 -!- Vektorweg1 has joined ##crawl-dev 15:06:19 It takes me several minutes to compile because Windows is bad 15:06:31 <|amethyst> it should only have to recompile one file then relink 15:06:45 This is not my experience 15:06:53 It recompiles everything 15:07:14 <|amethyst> if you compile with the same options, and there aren't problems with your timestamps anyway 15:07:37 <|amethyst> most headers will require more extensive recompilation 15:07:46 <|amethyst> but mon-data.h is only used in mon-util.cc 15:07:54 Wait, if I close msys2, then reopen, will it have to recompile everything if I make again? 15:08:07 <|amethyst> it shouldn't have to, if you haven't changed anything 15:08:09 Hmm 15:08:23 <|amethyst> unless your compilation flags are changing each time 15:08:32 <|amethyst> or your system's timestamps are way wrong 15:10:46 <|amethyst> !learn s millimarvin[1] 16.798 net lines of code removed (as of 2016-08-07) 15:10:46 millimarvin[1/1]: 16.798 net lines of code removed (as of 2016-08-07) 15:11:24 <|amethyst> also congrats to PleasingFungus, author of the month for every month in 2016 so far 15:11:30 Okay, mantis bug submitted 15:11:34 <|amethyst> http://s-z.org/crawl-stats/authors.html 15:11:34 Back to balancing dream sheep 15:12:23 -!- ProzacElf has joined ##crawl-dev 15:12:45 When the player wakes up before they would have acted again, they do not get a warning/force-more for falling asleep. 13https://crawl.develz.org/mantis/view.php?id=10599 by Brannock 15:13:22 maybe we should just start making some radical, questionable design changes to get people excited about development again 15:13:25 idk 15:13:45 <|amethyst> PleasingFungus: like removing food? :) 15:13:50 the obvious thought 15:13:57 or add mega-food 15:13:59 delete races that are differentiated only by aptitude, imo 15:14:00 remove lightli 15:14:11 <|amethyst> PleasingFungus: turn everyone into ghouls 15:14:17 <|amethyst> PleasingFungus: heal by eating your enemies 15:14:21 what a ghoulish thought 15:14:25 fr: ghoulash thoughts 15:14:34 er, goulash 15:14:36 could make ghouls better than other species at it 15:14:38 i guess we'd be removing those, anyway. 15:15:07 crazy idea 15:15:11 give Mu +1 to every apt 15:15:22 that's too crazy even for me. 15:15:42 Have any ideas been floated to make extended more appealing? 15:15:56 there's the whole pan-hell roulette thing 15:15:57 ??panhell roulette 15:15:58 I don't have a page labeled panhell_roulette in my learndb. 15:15:59 rip 15:16:01 yes 15:16:01 the general opinion on ##crawl seems to be "takes too long, not interesting enough" 15:16:04 although I have no idea how much work was done on that 15:16:06 <|amethyst> +4 galoshes of goulash (running, rC+) 15:16:08 What's that? 15:16:09 very common opinion 15:16:11 Lightli: non 15:16:12 *none 15:16:19 r-i has been petitioning for someone to help work on it 15:16:44 and a lot of people hate the idea of there only being 11 runes in a game 15:16:45 xormask: make only pan or hell appear in a given game (like lair branches alternating); add a new purgatory branch so hell has five runes 15:16:48 roulette seems controverisal, cf that one tavern thread 15:16:54 oh, i haven't seen it 15:16:59 Lightli, it'd be 10. In this proposal, demonic rune would become something else or be removed 15:17:04 Brannock: incorrect 15:17:08 demonic would remain 15:17:12 a new one for hell would be added 15:17:16 as basically a holypan counterpart 15:17:30 <|amethyst> I think before we reduce the number of runes, we should try removing non-rune levels 15:17:52 that was part of the plan 15:17:52 make hells only 4 levels each 15:18:06 i had a big argument with r-i about that 15:18:06 -!- parabolic has joined ##crawl-dev 15:18:07 What about something to change the zot:5 if you have all the runes? 15:18:09 maybe an exaggeration 15:18:23 It just seems like a let down currently after doing extended 15:18:25 but my feeling is that, essentially, the big mechanical differentiator of hells is the hell effects 15:18:50 i don't think hell effects work that well at present - they're not really tuned at all 15:19:02 random miscast effects, garbage spawns! 15:19:21 so my feeling is that they should be tuned to be more exciting 15:19:39 yeah 15:19:43 more exciting, or more dangerous? 15:19:57 -!- Vektorweg1 has quit [Quit: Leaving.] 15:19:59 since i don't think any non-$ level of the hells is going to be very interesting until you fix hell effects, no matter how many levels of them you cut 15:20:02 I remember the complaints about hell sometimes just hitting you with unfathomably bad amounts of contam 15:20:20 someone might have changed that. i forget. i know there was recent talk about it 15:20:37 -!- Vektorweg1 has joined ##crawl-dev 15:21:41 -!- elliptic has quit [Ping timeout: 244 seconds] 15:21:46 hm, apparently not 15:22:36 i really don't like re-using miscasts effects for other things. it feels like an admission that you don't know what you're doing and are just going to slap Random Shit on the wall 15:23:05 miscast effects are cool and they don't get seen frequently enough imo 15:23:08 You guys should turn everyone into Deep dwarves, no more hp regen, then give everyone hp regen for killing 15:23:22 most players delay casting dangerous spells or bypass the chances of seeing a serious miscast 15:23:31 <|amethyst> Dungeon Crawl: Makhleb Soup 15:23:31 via sif / !brill / whatever 15:24:05 i don't think it makes sense to try to make a set of effects that are reasonable for miscasts AND mummy curses AND hell effects AND spellbinder triggers AND 15:24:15 like, massive contam is fine as a miscast effect 15:24:18 but it's an awful hell effect 15:25:20 <|amethyst> they should at least share an enum or a data structure though 15:25:55 <|amethyst> then xom effects can use the same 15:26:17 <|amethyst> struct random_shit_that_happens_to_you { ... }; 15:28:24 i'm not sure what unifying characteristics they have 15:28:45 i'd be fine with individual effects being broken up into more functions and exposed via headers 15:28:48 <|amethyst> a target and maybe a power level 15:29:06 that's not something they share with xom effects. 15:29:16 <|amethyst> true 15:29:17 -!- ontoclasm has joined ##crawl-dev 15:29:37 i mean, this is sounding like a request for an effects.cc 15:29:41 -!- valrus_ has quit [Ping timeout: 250 seconds] 15:29:45 <|amethyst> I guess "function" is probably the right abstraction there 15:32:28 https://github.com/isloat/crawl/pull/1 Does anyone mind giving some initial feedback before I submit a PR? (Or, well, I suppose that's what a PR is for) 15:32:37 for monster-creation-checklist 15:32:49 does enum stuff 15:33:02 very detailed and precise. 15:33:41 <|amethyst> "enum-h.txt" ? 15:33:59 <|amethyst> /source/enum.h 15:34:13 <|amethyst> - Defines the monster type enumeration. 15:35:10 <|amethyst> Also, I realise that this is in fact correct, but I am amused by: "A short description of what it looks like and what it does" --- looks meta :) 15:35:25 <|amethyst> maybe "what the monster looks like and what it does" 15:37:33 Okay, made these changes, thanks 15:41:08 -!- zxc has quit [Read error: Connection reset by peer] 15:46:00 miscast effects are used when you miscast spells, so the more times you use them for other purposes because they're cool, the harder they are to make coherent 15:46:12 -!- } has quit [Disconnected by services] 15:46:15 -!- }_ is now known as } 15:46:46 if the individual effects are cool, then use some of those effects, but if we start baking miscast effects into lots of places, they're going to be harder and harder to balance 15:47:24 exactly. 15:47:34 though i'm not sure there's any strong trend toward using them in more places 15:47:40 i feel like that's been sort of stable for a while? 15:47:55 yeah, I was commenting on the sentiment Brannock expressed above 15:48:02 fair 15:48:12 -!- Kalir has quit [Ping timeout: 244 seconds] 15:48:13 I understand 15:49:49 you could gloss "enumeration". 'defines monster type enumeration (an ID for the monster) 15:50:20 also, 'in the add monsters here block' comment is wrong. you very specifically need to add it at the end of that block, right before num_monsters 15:50:27 that one is important to clarify, since people mess it up a lot! 15:50:50 -!- aditya has joined ##crawl-dev 15:50:54 Become pretty today! 15:50:54 -!- Alcopop has quit [Ping timeout: 250 seconds] 15:51:19 Brannock: if you want the tile to actually be used you need to edit tilepick.cc as well 15:51:28 nope 15:51:31 that's out of date, friend 15:51:34 whaaaat 15:51:38 8) 15:51:42 look at mon-data.h sometime 15:51:57 whaaaaaaaat 15:52:11 daaang 15:52:19 -!- } has quit [Ping timeout: 276 seconds] 15:52:40 Add a corpse entry so the tile can be squashed. - i would say "so the game will generate a squashed & bloody version of the monster's tile for corpses". also note that this is only relevant to monsters that are their own species - if you added, say, orcish warg riders, they wouldn't need a new corpse entry 15:53:04 also, if your monster uses weapons and/or shields, you may want to add an entry to tilemcache.cc to set offsets 15:53:20 offsets of the weapon/shield sprites from the sprite 15:53:32 so they look like they're holding things properly 15:53:45 ontoclasm: i tried to do the same for weapon/shield offsets, but people talked me out of it 15:53:46 what's next, derived undead tiles that work without 200 lines of nested if statements??? 15:53:52 well 15:53:55 actually 15:54:17 that sort of exists 15:54:22 it's still fragile and messy but it exists! 15:55:03 !source _mon_to_zombie_tile 15:55:03 1/1. https://github.com/crawl/crawl/blob/master/crawl-ref/source/tilepick.cc#L1162 15:55:10 not good but less bad than it was 15:55:45 also busier than it was before, since there are a bunch of new zombie tiles these days 15:56:34 -!- lobf has joined ##crawl-dev 15:56:39 i wonder if it'd be worth making a note in that monster dev guide about zombie tiles 15:59:00 -!- packet_loss has joined ##crawl-dev 15:59:10 -!- Kenran has quit [Quit: leaving] 16:00:03 -!- omarax has quit [Remote host closed the connection] 16:02:04 -!- _dhm has quit [Ping timeout: 240 seconds] 16:02:32 -!- LexAckson_ has joined ##crawl-dev 16:03:19 I feel docs in general for "how do I go about modifying X" are great in that we get asked those questions but don't have things documented 16:03:26 but then again they probably become out of date quickly 16:03:29 -!- packet_loss has quit [Ping timeout: 250 seconds] 16:03:59 by documented I mean in a text/guide format, since the code might be documented just fine 16:05:47 -!- Kalir has quit [Changing host] 16:09:09 still worth trying 16:09:26 then all we have to do is say "oh, this line is out of date, you actually need to do y", rather than the whole process 16:12:33 -!- valrus has quit [Read error: No route to host] 16:14:21 -!- PleasingFungus has quit [Quit: ChatZilla 0.9.92 [Firefox 47.0/20160604131506]] 16:20:00 -!- lobf has quit [Quit: lobf] 16:24:53 -!- Bcadren has quit [Ping timeout: 244 seconds] 16:30:33 -!- Dracunos has quit [Ping timeout: 250 seconds] 16:35:23 -!- cait has quit [Quit: ChatZilla 0.9.92 [Firefox 49.0/20160802125918]] 16:40:13 -!- Ladykiller69 has quit [Ping timeout: 244 seconds] 16:45:01 -!- LexAckson_ has quit [Ping timeout: 265 seconds] 16:47:24 implemented these changes 16:47:37 about to submit PR. any further changes can be done on github or commented on there, or etc 16:50:03 New branch created: pull/319 (1 commit) 13https://github.com/crawl/crawl/pull/319 16:50:03 03Brannock02 07https://github.com/crawl/crawl/pull/319 * 0.19-a0-1078-g3628b3c: Monster creation checklist. 10(2 minutes ago, 1 file, 114+ 0-) 13https://github.com/crawl/crawl/commit/3628b3c7985d 16:51:03 -!- elan has quit [Quit: Page closed] 16:52:40 -!- edsrzf has joined ##crawl-dev 16:53:59 -!- ontoclasm has quit [Quit: Leaving.] 16:55:11 03Brannock02 {GitHub} 07https://github.com/crawl/crawl/pull/319 * 0.19-a0-1079-g92ab1a5: Clarify (PleasingFungus) 10(3 minutes ago, 1 file, 4+ 2-) 13https://github.com/crawl/crawl/commit/92ab1a514b79 16:56:17 |amethyst, relating to an earlier conversation, if I switch between branches on my machine and back, will that also require a full recompile? 16:56:35 Brannock: remember that your commit messages will be read relative to trunk, so people won't know what Clarify refers to 16:56:59 so something like Clarify monster creation checklist etc 16:57:00 That commit should be squashed in the merge 16:57:04 My bad 16:57:13 in that case, you can just force push 16:57:20 to your branch, now that you have git command line 16:57:29 the PR automatically is updated based on what's in the branch 16:57:35 Ahh 16:58:26 https://github.com/crawl/crawl/pull/319/commits/92ab1a514b79a2dd671fcb157a4ac25e9c95208e web interface seems to compare directly against the old version 16:58:56 Is the intended behavior: You can memorize spells from books on the floor with M but if you use r, you can't memorise from that screen 16:59:16 Brannock: I'm not sure what you're pointing out wrt that diff 16:59:34 Brannock, yes, switching branches changes the source files in version control but leaves the compiled artifacts behind --- these will be for the wrong branch and crawl Makefile will (or should) force a rebuild 17:00:00 if I compile for one branch, switch to another branch, then switch back to the original branch, it will force a rebuild? 17:00:02 re: switching branches, you can use ccache to make recompilation faster, but that's not available in msys2 I think 17:00:02 -!- omarax has quit [Remote host closed the connection] 17:00:21 switching branches will change source files, so make will recompile those, yes 17:00:26 gammafunk, I must have gotten confused. I read your explanation as my commit title being unclear because other people won't be able to see what the commit changed. 17:00:59 although it's better to do a `make clean` or `git clean -f -X` or sth 17:01:00 Brannock: oh, no, the commit message is supposed to give a one-line summary of what the commit does 17:01:08 -!- magistern has quit [Quit: magistern] 17:01:15 -!- lobf has joined ##crawl-dev 17:01:41 so Clarify isn't going to be clear to people reading only that; we do see single-word commit message lines for thinks like "unbrace" and "checkwhite" 17:02:11 gotcha 17:02:14 just think in terms of viewing lists of commits, does this commit message line give a reasonable summary of what the commit does? 17:04:01 -!- JimmahDean has quit [] 17:08:18 -!- aditya has quit [Ping timeout: 244 seconds] 17:10:27 -!- aditya has joined ##crawl-dev 17:10:37 -!- kdrnic has quit [Quit: Leaving] 17:16:39 -!- Patashu has joined ##crawl-dev 17:26:54 -!- Kalir has quit [Quit: I'M OUT SON. PEACE, LOVE, EXPLOSIONS.] 17:27:49 !source random2avg 17:27:49 1/2. https://github.com/crawl/crawl/blob/master/crawl-ref/source/random.cc#L416 17:28:27 -!- kdrnic has joined ##crawl-dev 17:30:27 <|amethyst> !source random2avg 2 17:30:27 2/2. https://github.com/crawl/crawl/blob/master/crawl-ref/source/random.cc#L230 17:30:32 <|amethyst> probably the one you're looking fo 17:30:34 <|amethyst> r 17:30:45 it is, thank you 17:33:33 -!- valrus_ has quit [Ping timeout: 258 seconds] 17:35:05 If I'm using a variable strictly for internal purposes, is there any reason to not declare it a const? 17:35:18 e.g., I declare a const string to make_stringf, then immediately convert it in the next line using c_str() 17:35:23 can I just use string without making it a const? 17:37:23 -!- Shard1697 has joined ##crawl-dev 17:38:18 -!- lobf has quit [Quit: lobf] 17:38:50 -!- lobf has joined ##crawl-dev 17:51:36 -!- Patashu has quit [Ping timeout: 240 seconds] 17:51:53 -!- GauHelldragon has quit [Quit: Leaving] 17:54:34 -!- bitcoinbastard has quit [Ping timeout: 240 seconds] 17:59:55 -!- packet_loss has joined ##crawl-dev 18:00:04 -!- omarax has quit [Remote host closed the connection] 18:01:52 -!- staplegun has quit [Ping timeout: 265 seconds] 18:04:26 -!- packet_loss has quit [Ping timeout: 244 seconds] 18:07:09 Unstable branch on underhound.eu updated to: 0.19-a0-1096-g8280678 (34) 18:16:41 -!- Guest4177 is now known as debo 18:17:35 -!- ProzacElf has quit [Ping timeout: 252 seconds] 18:31:21 -!- syllogism has quit [Quit: Leaving] 18:33:10 -!- ontoclasm has joined ##crawl-dev 18:35:18 -!- home has quit [Remote host closed the connection] 18:43:38 -!- lobf has quit [Quit: lobf] 18:50:27 -!- magistern has quit [Quit: magistern] 18:50:46 Can someone explain to me how to add info to the save file in a "correct" way? I have implemented most of my spell library except saving / restoring, and obviously I want to do it in a way that doesn't break save compat 18:51:02 -!- kogasa is now known as Doesnty 19:00:03 -!- omarax has quit [Remote host closed the connection] 19:01:11 I got dream sheep to a point where they're torpor-snail-level nasty when combined with other monsters, but only moderately dangerous on their own. I wonder if I should bump their HD, because at HD 5 they're kind of disporportionately dangerous to the actual monster list display (which has them going white/grey very early) 19:01:22 Still need to fix their cooldowns on sleep and to add a clarity check. 19:01:44 -!- lobf has joined ##crawl-dev 19:05:34 nvm I realized that saves don't need to be readable by older version so it is much simpler than I thought 19:10:13 !source clarity 19:10:14 1/3. https://github.com/crawl/crawl/blob/master/crawl-ref/source/actor.cc#L258 19:10:18 what does bool calc_unid mean here? 19:11:04 Brannock: you see that's passed down to scan_artefacts, so that's a good function to look up 19:11:09 !source scan_artefacts 19:11:09 1/2. https://github.com/crawl/crawl/blob/master/crawl-ref/source/mon-util.cc#L562 19:12:15 from that you can see it's asking for the value based on player knowledge or not, according to that flag 19:12:45 by "from that you can see" I mean you can search for uses of that variable, since said function doesn't have documentation, unfortunately 19:12:52 that variable isn't used in that function.. but looking at other functions it looks like it checks unidentified gear to see if it has any of the properties the call is looking for. 19:12:59 -!- fufumann has quit [Quit: Leaving] 19:13:16 I'm trying to get player::clarity() from player.cc, but there's also a actor::clarity() in actor.cc 19:13:27 if I call clarity() without passing variables to it, will that work? And which version will it get? 19:14:05 !source scan_artefacts 2 19:14:05 2/2. https://github.com/crawl/crawl/blob/master/crawl-ref/source/player.cc#L3754 19:14:15 Brannock: there are multiple methods 19:14:33 namely it's a virtual method in actor, so you have to look up the right one 19:15:29 for the clarity method, actor is a base class of player and monster 19:15:49 I think you.clarity() should work, but the monster ability also has the capability to target non-players (I probably should remove this, although I suppose it could target player's allies) 19:15:56 so if you call that on the player instance, you get the player method, if called on a monster instance you get the monster version 19:16:18 so foe->clarity()? 19:16:32 for actor itself, the method is virtual, and it can't be called on an actor instance 19:16:54 I understand (on a surface level I think) 19:17:11 -!- cait has quit [Ping timeout: 250 seconds] 19:17:17 foe is probably the one you want to use, but I don't know your code specifically 19:17:32 if this is something operating when you know the foe is the player, then using you is fine 19:18:22 yeah, usually you code monster abilities to be able to target anything 19:19:03 there are cases when it shouldn't work versus anything but the player, though, usually for gameplay reasons (e.g. friendly torpor snails don't slow hostiles) 19:19:15 I brought that up because while looking for similar abilities I noticed that merfolk avatar mesmerize could only target players 19:19:26 Can torpor snail slow player allies? 19:19:33 see above 19:19:40 er 19:19:41 yes 19:19:43 they slow everything 19:19:49 sorry, you're asking about friendlies 19:20:02 but friendly torper snails don't slow hostile monsters 19:20:32 another example is that friendly convokers don't convoke anything vs hostiles 19:20:39 I see 19:21:38 -!- sanka has quit [Quit: Page closed] 19:21:56 hostile monster fear works versus your allies, but hostile monster mesmerize doesn't, so yeah there are exceptions like that 19:22:22 in the case of fear, the effect on your allies is like scroll of fear, rather than like the effect on the player 19:23:15 -!- elliptic has joined ##crawl-dev 19:25:44 -!- parabolic has quit [Ping timeout: 244 seconds] 19:27:09 -!- Konstantin has quit [Ping timeout: 250 seconds] 19:27:24 -!- debo_ has joined ##crawl-dev 19:27:47 -!- debo_ is now known as Guest96288 19:28:33 -!- cait has quit [Ping timeout: 258 seconds] 19:28:41 -!- Ququman has quit [Read error: Connection reset by peer] 19:29:52 -!- debo has quit [Ping timeout: 244 seconds] 19:30:04 -!- } has quit [Ping timeout: 240 seconds] 19:35:35 Hmm, when I compile, I get warnings about having no advpng / pngcrush. Is this because I created new tiles? 19:35:42 It builds successfully otherwise 19:36:25 -!- PleasingFungus has joined ##crawl-dev 19:36:52 -!- lobf has quit [Quit: lobf] 19:39:17 !source mon_enchant 19:39:17 1/2. https://github.com/crawl/crawl/blob/master/crawl-ref/source/mon-ench.cc#L2172 19:39:37 I'm sending a duration of 20 to that value but the enchant most definitely does not last for 20 turns 19:39:57 unless I should be sending 200 if I want 20? 19:42:56 dur is probably in aut, not turns. i'd have to check 19:42:58 would be good to document 19:43:08 it's aut 19:43:09 you should find out and then write a doxygen comment for it. 19:43:14 multiple by BASELINE_DELAY 19:43:32 see, eg, all of the other calls to mon_enchant 19:43:40 Hi could people take a look at https://github.com/crawl/crawl/pull/320 ? I'd love some feedback :O 19:43:41 what is a doxygen comment? 19:44:01 https://www.stack.nl/~dimitri/doxygen/manual/docblocks.html 19:44:04 you can see some around 19:44:18 New branch created: pull/320 (2 commits) 13https://github.com/crawl/crawl/pull/320 19:44:18 03Brennan Shacklett02 07https://github.com/crawl/crawl/pull/320 * 0.19-a0-1089-gab0dadf: Clean up spell memorization code 10(4 hours ago, 5 files, 28+ 60-) 13https://github.com/crawl/crawl/commit/ab0dadf1b15b 19:44:18 03Brennan Shacklett02 07https://github.com/crawl/crawl/pull/320 * 0.19-a0-1090-g2175b4c: Add basic spell library support 10(21 minutes ago, 13 files, 127+ 10-) 13https://github.com/crawl/crawl/commit/2175b4c83c1b 19:44:20 thank you 19:44:26 !source acquire.cc 19:44:26 https://github.com/crawl/crawl/blob/master/crawl-ref/source/acquire.cc 19:44:29 has a bunch of doxygen comments 19:44:36 ideally every function should have one 19:44:45 oh, yeah 19:44:48 at least a little one-line /// comment 19:44:55 I can do that. should I do this separately from my dream sheep branch? 19:44:57 oops apparently I preempted Chei 19:45:10 it takes some time to go through, don't worry 19:45:22 at a glance, it looks more complicated than it needs to be 19:45:29 like, why does copying take time? 19:45:42 I talked about that in the pull message 19:45:51 If it's a bad idea it's easy enough to remove 19:45:57 oh 19:46:06 i see 19:46:53 i mean, to preface, idk that i'm sold on the library idea at all 19:46:59 but, if it should exist, it should be simple 19:47:21 I mean I just put that up there so people could see what it might look like 19:47:22 it should just automatically copy all the spells when you find the book 19:47:34 and i don't think that the problem you describe (people being able to copy from books) is a problem that justifies the added complexity of copying taking time, or even a problem at all really 19:47:39 minmay: yes 19:47:50 When you first read or pickup the book? 19:47:57 when you identify it 19:48:00 ^ 19:48:05 which can be by picking it up, or now by reading it from the ground 19:48:15 right that's what I meant 19:48:44 (also the way you need to press 'r' to identify books on the ground for free now is really dumb) 19:49:14 i know! i know it is! 19:49:16 PleasingFungus mentioned auto id'ing books when you walk over them 19:49:28 but it seems like that would require a check every time you move? 19:49:29 probably 19:49:36 the trick would be finding the right move function 19:49:47 so it works even when e.g. you get trampled onto stuff or other weird corner cases 19:50:16 you could also not require visiting a book's tile in order to identify it 19:50:20 The elephant tramples you! You are suffused with arcane knowledge. 19:50:34 ^ yeah that seems quite weird to me, personally 19:50:38 though that makes the interface for randart spellbooks even worse 19:51:13 Brannock: elephants are known for their wisdom 19:51:15 minmay, what do you mean? 19:51:28 press o -> find randart spellbook -> have to xv it to see what spells you found 19:51:46 hope an orc didn't die on top of it 19:52:19 I think you should have to at least r the spellbook to get it copied personally 19:52:21 orcs are insanely rude. that's why beogh is evil 19:52:24 xormask: why? 19:52:56 PleasingFungus, because if you run over a spellbook without noticing it, and then hit M later, you'll be like, wait where did all these spells come from? 19:53:01 I'll note that all these spellbook identification problems would completely go away if you make spellbooks have only 1 spell each, so instead of finding book of flames, you find a scroll of flame tongue or whatever 19:53:23 ...so you'd rather the player miss the spells entirely? 19:53:34 I mean that's what happens now? 19:53:41 xormask: could add a force more 19:53:53 or could be like, ok, sometimes players don't notice where spells came from 19:54:02 that doesn't sound like a huge problem 19:54:24 All right, I guess it still bothers me from a logical level, which is fine. 19:54:45 -!- Kellhus has quit [Quit: Page closed] 19:54:54 logical level 19:54:55 crawl 19:55:00 >.> 19:55:05 (i know, i know, that's why I said it's fine) 19:55:49 I mean what if you read a spellbook and all spells get copied to your library and the spellbook disappears 19:55:58 (like it was a scroll) 19:56:15 sounds good to me, why include the reading step though 19:56:54 you don't have to press an extra key to add gold pieces to your gold number 19:56:56 minmay, well if you changed all books to scrolls say, would you just have it be they walk over the scroll and it goes in your library? 19:57:12 i 19:57:14 I mean books could be autopickup I guess, and when you pickup the book 19:57:19 it goes poof 19:57:25 'd think it'd be like gold, where you have to "pick it up" but it goes away instead of into your inventory 19:57:26 yes 19:57:33 makes sense 19:57:36 Ok 19:57:53 books are already autopickup right? 19:57:54 let's use a random synonym instead of 'scroll', like 'parchment' 19:58:05 PleasingFungus: agreed 19:58:21 i'm prepared with literally dozens of other synonyms. the bikeshedding can begin at any time 19:59:00 also that reminds me, make picking up items instant or get rid of monster invis please 19:59:31 because the interaction between autopickup and monster invis is pretty awful 19:59:42 Crash when r-clicking on "unseen terrain" beyond the edge of Shoals map 13https://crawl.develz.org/mantis/view.php?id=10600 by Thelo 19:59:42 (probably both should be done anyway) 19:59:50 good 20:00:02 Pleasingfungus, ok I'll change this to be an on pickup trigger? and then maybe later we could work on the whole books to scrolls thing? 20:00:03 -!- omarax has quit [Remote host closed the connection] 20:00:19 i'm not sure i understand the rationale of books to scrolls 20:00:36 something about disliking the obtuseness of randbook naming? 20:00:40 I just thought it was something the people (minmay) wanted 20:00:46 -!- packet_loss has joined ##crawl-dev 20:01:00 I was just saying that it seems like this change could still work with books, it wasn't dependent on scrolls 20:01:00 -!- magistern has quit [Quit: magistern] 20:01:23 PleasingFungus: you mean my suggestion to make each book contain one spell? 20:01:50 I like the scroll idea. Fits better with weapons. Finding a scroll of Freezing Cloud or Iron Shot should be as exciting as finding an eveningstar 20:01:51 PleasingFungus: that is just so that you never have to examine a book, the spell is in the name of the item 20:02:35 if you goldify books in this particular way, then that suggestion is not really important 20:02:45 Brannock: i don't understand at all 20:03:01 are you saying that, say, finding a book of clouds isn't exciting? 20:03:11 minmay: gotcha, that's basically what i thought 20:03:28 wasn't sure if there was something else 20:03:29 It is, but it's a little diluted? I don't have a defined enough opinion on this to elaborate further, sorry 20:03:53 My only issue with the "goldify" idea is I think it could be confusing to new players 20:04:30 IE should the message say, You picked up the Book of Power! You copied spells blah, blah, and blah to your library! -- force more? 20:04:50 gold and runes confuse new players too, it's probably better to get them used to goldification 20:05:04 -!- packet_loss has quit [Ping timeout: 240 seconds] 20:05:05 they'll need to be prepared once food is goldified, before it's removed 20:05:50 Do you think the message I said above is too verbose? 20:05:58 that reminds me. the "unique titles" thing is pretty weird and confuses new players 20:06:02 (also I think food should be made important, rahter than removed) 20:06:11 (cause right now it just doesn't matter) 20:06:16 you should remove it and instead make uniques always say a certain voice line when they first notice you 20:06:28 -!- aditya has quit [Ping timeout: 276 seconds] 20:06:31 so as soon as sigmund notices you he says "I am the Angel of Death!" 20:06:38 what if he's silenced. 20:06:43 bet you didn't think of that 20:06:44 -!- MarvinPA has joined ##crawl-dev 20:06:49 he says "I am the Angel of Death!" but you dont hear it 20:07:06 heh 20:07:11 if a sigmund falls in the forest... 20:07:12 how does it confuse new players? 20:07:13 PleasingFungus, I have to go right now, but I'll push a change that "goldify's" books later today 20:07:16 wow 20:07:22 if I can figure out pickup triggers :) 20:07:40 what's your plan for trog 20:07:42 I can't figure out how to remove a clarity mutation using wizmode. 20:07:52 goldify trog too 20:07:55 troggify 20:07:58 just don't allow troggers to pick up books? 20:08:12 warning and penance or outright ban, i guess 20:08:18 Brannock: &] i think 20:08:23 I just ended up creating !cmut 20:08:34 then go through a million prompts and then type clarity and then -1 20:08:43 ah, -1 would do it 20:08:49 i should really push my simplify wiz-mut branch 20:09:47 I think having dream sheep sleep you every 10 turns (+/- ~3) is good. If ignoring MR is too strong I can put in a MR check and reduce sleep ability cooldown. 20:10:01 Going to do a final check of my code then submit for review 20:10:39 do dream sheep of electric androids 20:12:17 excellent question. 20:12:48 PleasingFungus, um Trog could not goldify spellbooks 20:12:57 that wasn't a question 20:13:37 xormask: sounds weird to me 20:14:01 what happens when you abandon trog? do all the books you're carrying get instantly goldified? 20:14:46 -!- Zekka has quit [Read error: Connection reset by peer] 20:15:22 -!- amalloy is now known as amalloy_ 20:18:39 all the books you're carrying get instantly burned 20:18:49 hope you have fire resistance 20:19:58 deng 20:20:29 looking at mon-pick-data, it seems strange that titans are as rare as juggernauts and caustic shrikes in Depths 20:22:55 How does HD interact with base values for MR, HP, and damage? I originally had dream sheep HD the same as regular sheep, but that made them show up as white/grey when they were still very dangerous to players. I adjusted HD up to slightly higher than yaks, but I'm not sure if that makes them hit harder/resist magic better than the values I've laid out in mon-data.h 20:22:59 -!- _dhm has quit [Ping timeout: 252 seconds] 20:23:29 these days it doesn't* 20:24:02 ??hd 20:24:02 hd[1/5]: Hit Dice; essentially a monster's experience level. Affects a monster's: magic resistance, spell power, experience value, accuracy, forms it can polymorph into, and susceptibility to some spells such as mephitic cloud and confusing touch. 20:24:05 this probably could be updated then 20:24:06 also also the color is based on xp, not hd, iirc? but you should probably still have it be higher than regular sheep 20:24:09 oh, sure 20:24:23 !learn e hd[1 s/magic resistance, // 20:24:24 hd[1/5]: Hit Dice; essentially a monster's experience level. Affects a monster's: spell power, experience value, accuracy, forms it can polymorph into, and susceptibility to some spells such as mephitic cloud and confusing touch. 20:24:30 how is XP determined? 20:24:33 ??hd[ 20:24:33 I don't have a page labeled hd[ in my learndb. 20:24:34 ??hd[2 20:24:35 hd[2/5]: Monster melee to hit is 18+HD*(1.5 or 2.5). The former for non-fighters, the latter for fighters. Beam to hit is 12*HD. 20:24:42 Brannock: please don't ask that question 20:24:45 :x 20:25:20 i'm honestly not sure there's anyone on the dev team who could give a really good answer to that, other than 'look at the code' 20:25:20 maybe the late, lamented dracoomega 20:25:42 -!- nikheizen has joined ##crawl-dev 20:30:47 Alrighty. About to make my final commits and complete my weekend project of implementing dream sheep (pending code review / rejection / balance changes / Xom's capriciousness) 20:37:06 !rng xom accept balance change review reject xom 20:37:06 The RNG chooses: xom. 20:37:11 sorry, that's the result 20:37:35 xom twice, but that's ok 20:38:17 dang, what are the odds? 20:38:31 My friend who is playing right now just told me about coming across the Xom sheep vault. 20:38:39 Should dream sheep be flammable as well? 20:38:43 inflammable? 20:40:06 i would change the current sheep behavior (the sticky flame thing) to be based on genus 20:40:12 so, yes, both flammable and inflammable 20:40:17 possibly it is already? 20:40:33 ah, no 20:40:42 two lines in mon-ench.cc 20:42:46 hrm, this breaks autopickup 20:42:59 -!- sysice has quit [Quit: Page closed] 20:45:01 @??deep elf knight name:dream_elf n_rpl 20:45:01 dream elf (10e) | Spd: 10 | HD: 11 | HP: 39-59 | AC/EV: 2/16 | Dam: 21 | 10weapons, 10items, 10doors, fighter, spellcaster | Res: 06magic(80) | XP: 806 | Sp: stone arrow (3d18), mystic blast (3d16), haste / throw icicle (3d20), haste, invisibility | Sz: Medium | Int: human. 20:47:46 -!- lobf has joined ##crawl-dev 20:47:48 Dream sheep can now be set on fire! 20:48:07 hm... minmay, talking about dreams and elves? 20:48:11 seems out of character 20:48:33 I'm... done??? *closes 40 tabs* 20:48:44 Time for one final compile then a pull request. 20:51:10 the master of cpp 20:51:40 cpp? 20:51:59 -!- JackDupp has quit [Quit: Leaving] 20:52:53 -!- Bcadren has quit [Ping timeout: 244 seconds] 20:52:56 PleasingFungus: apply_chunked_AC comment is badly wrong 20:52:57 .cpp 20:53:05 chequers: that's not my fault, probably 20:53:17 +// AC 20 stops 22% of damage, AC 40 -- 39%, AC 80 -- 63%. <--- it's 38%!!!! 20:53:17 i'm pretty sure i just moved it from one place to the other 20:53:21 lol 20:53:41 oh wait, my calculations are wrong 20:53:51 :) 20:55:09 I like how I'm looking at my early commits for this branch and I can see that I absolutely no idea what I was doing and barely understood the code. For instance, I thought what was actually the timeout duration was the number of sheep it would summon 20:55:19 I'm sure there'll be more like this 20:56:21 sounds right 20:58:07 -!- MarvinPA has quit [Quit: Leaving] 20:59:35 -!- Ladykiller70 has quit [Ping timeout: 244 seconds] 21:00:00 -!- Cimanyd has quit [Quit: Page closed] 21:00:03 -!- omarax has quit [Remote host closed the connection] 21:02:45 -!- Daekdroom has quit [Quit: Leaving] 21:05:33 -!- elliptic has quit [Ping timeout: 240 seconds] 21:09:34 what exactly triggers emergency spells? Anything else aside from being low on health? 21:11:51 !source mon-cast.cc:3276 21:11:51 https://github.com/crawl/crawl/blob/master/crawl-ref/source/mon-cast.cc#L3276 21:11:54 ^ 21:12:09 ty 21:12:21 How do you guys find these so easily? 21:12:29 Is it just knowledge of the codebase? Or some other search tool? 21:12:45 mpa linked to it yesterday 21:12:48 when we were talking about kraken 21:18:03 03PleasingFungus02 07* 0.19-a0-1097-g38e3b35: Auto-ID spellbooks you step on 10(29 seconds ago, 3 files, 21+ 0-) 13https://github.com/crawl/crawl/commit/38e3b354e79f 21:18:28 strong QOL change, imo 21:18:46 it turned out to be relatively easy, though there are probably issues i'm overlooking 21:18:48 w/e 21:19:49 -!- Lightli has quit [Ping timeout: 250 seconds] 21:23:44 What's the command for searching git commits? I want to see who implemented hell hogs and spark wasps 21:24:03 -!- Dracunos7 has quit [Ping timeout: 244 seconds] 21:24:49 git log --grep "[Ss]park [Ww]asp" 21:25:01 hell hogs are very old, spark wasps are more recent and were made by Grunt 21:25:13 !gitgrep 1 [Ss]park [Ww]asp 21:25:13 %git HEAD^{/[Ss]park [Ww]asp} 21:25:13 07regret-index02 * 0.19-a0-175-g9e8d917: Abyssal rune vault difficulty standardizing / upgrading / consolidating 10(3 months ago, 1 file, 447+ 562-) 13https://github.com/crawl/crawl/commit/9e8d9176b1bb 21:25:22 could do that instead, but it could take a while 21:26:23 you can also use git log -S to search for commits where the actual diff includes certain strings, e.g. "git log -S HELL_HOG" 21:26:35 hell hogs seem to date back to before stone soup 21:26:43 so you'd need to look in crawl-ancient 21:26:54 wow, Id idn't realize they were that old 21:27:07 Though I guess when I played back then I never made it to the part of the game where I'd run into them 21:27:30 they seem to date to linley's dungeon crawl 3.3 21:27:44 circa march 1999 21:27:50 seventeen years! 21:27:56 *toot* 21:28:14 -!- lobf has quit [Quit: lobf] 21:28:37 sacred swine are much more recent, iirc 21:28:44 I was curious because only three (soon four?) monsters use "unwary" in their descriptions, and I thought that "unwary adventurers" was a more commonly-used phrase in Crawl than that 21:28:49 heh 21:29:14 what's the third? 21:29:21 torpor snails 21:29:47 haha 21:29:58 is that the bit about the ever-gnashing radulae 21:30:10 Yes, it is 21:30:27 good, good, good. 21:31:14 Well, this has been a very enjoyable weekend 21:31:26 Cool to go from struggling to edit text to implementing a complete, complex monster 21:32:28 Thanks for all the help and question-answering, PleasingFungus, gammafunk, |amethyst, and geekosaur 21:32:48 respectively 21:33:28 New branch created: pull/321 (34 commits) 13https://github.com/crawl/crawl/pull/321 21:33:29 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1078-g440aa45: Dream sheep tile and corpse. 10(2 days ago, 2 files, 1+ 0-) 13https://github.com/crawl/crawl/commit/440aa45c1586 21:33:29 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1079-gc1a2940: Dream sheep description and quote. 10(2 days ago, 2 files, 12+ 0-) 13https://github.com/crawl/crawl/commit/c1a2940976af 21:33:29 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1080-ge7d5947: Dream sheep enum and data entries. 10(2 days ago, 4 files, 18+ 0-) 13https://github.com/crawl/crawl/commit/e7d5947b4570 21:33:29 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1081-gc2d23d7: Fix save compatibility. 10(26 hours ago, 1 file, 4+ 0-) 13https://github.com/crawl/crawl/commit/c2d23d776761 21:33:29 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1082-g9e61460: Adjust spawn rate and band sizes. 10(26 hours ago, 2 files, 5+ 4-) 13https://github.com/crawl/crawl/commit/9e614602eb75 21:33:29 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1083-g93c0b36: Implement Summon Dream Sheep. 10(25 hours ago, 4 files, 28+ 0-) 13https://github.com/crawl/crawl/commit/93c0b365fb53 21:33:29 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1084-g77dfaa5: Summon fewer sheep. 10(25 hours ago, 1 file, 4+ 2-) 13https://github.com/crawl/crawl/commit/77dfaa534895 21:33:29 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1085-gebb53ef: Implement Dream Dust. 10(21 hours ago, 5 files, 112+ 1-) 13https://github.com/crawl/crawl/commit/ebb53eff0d7b 21:33:29 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1086-g6a7c0c5: Add a missing underscore. 10(21 hours ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/6a7c0c5d1f5f 21:33:29 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1087-g3ae998f: More code cleanup. 10(20 hours ago, 1 file, 8+ 8-) 13https://github.com/crawl/crawl/commit/3ae998f88dda 21:33:29 ... and 24 more commits 21:34:59 i dreamt last night of dream sheep. specifically I dreamt about what it would be like for dream sheep to have 200 casting frequency on their sleep spell 21:35:11 lol 21:35:21 it would mean they don't move when they're in LoS, which might be sort of cool 21:35:30 imo it's time for brannock to learn about rebase 21:35:44 I thought he did! He talked about squashing commits 21:36:01 and yet here you are, unsquashed 21:36:32 Well maybe he meant he's making commits to implement a Squashing skill, very important for the harvest season 21:37:22 i'd support it 21:39:26 DCSS finally follows in Elona's footsteps and implements the famed Farmer background 21:39:43 grunt implemented that, iirc 21:39:51 years ago 21:39:56 grunt or lasty. i think it was grunt 21:40:21 -!- magistern has quit [Quit: magistern] 21:45:49 ??farmer 21:45:49 farming[1/1]: "Farming" or "Farmer" is added to the titles of games lasting longer than 200,000 turns by Sequell. 21:46:03 scythe, fedhas, something else 21:46:29 deck of wonders 21:48:59 I'm home and wow 21:49:02 that's a lot of commits 21:49:04 Oops 21:49:29 How do I fix this? 21:49:50 squash them into probably one commit with git rebase -i origin/master 21:50:01 force push to your github branch 21:50:23 I can't rebase to origin/master because I accidentally left commits in there from another pull request 21:50:29 the demigod stat messaging one 21:50:31 sorry? 21:50:45 commits in where 21:50:49 my fork of /crawl 21:51:04 well, where do these unwanted commits exist? 21:51:06 -!- Wye has quit [Quit: Leaving] 21:51:12 in your branch? 21:51:22 in the master of my fork, not in my dream-sheep branch 21:51:37 which was branched off from before I made the Dg commits 21:51:48 just hard reset your master to trunk's master 21:51:58 sounds like you just have a bad master branch that you need to recreate 21:52:06 How do I hard reset to trunk master? 21:52:31 add the official repo as a remote 21:52:39 check out your master 21:53:00 then e.g. git reset --hard crawl/master 21:53:05 assuming you name the remote crawl 21:53:48 `git remote add upstream git://github.com/crawl/crawl` or something 21:53:53 then `git fetch --all` 21:54:03 -!- Dracunos-m has quit [Ping timeout: 250 seconds] 21:54:06 then `git checkout master && git reset --hard upstream/master` 21:54:10 yeah, upstream is probably a better name 21:54:21 but crawl is the name of our github org, so 21:54:29 -!- squidcat has quit [Ping timeout: 250 seconds] 21:54:32 decisions decisions 21:54:41 call the remote 'fartheads' 21:54:45 we won't even know! 21:55:29 it warns me that my branch and origin/master have diverged (these are the Dg commits I mentioned earlier) 21:55:37 after chequer's 3rd command above 21:55:55 you don't want to mess with origin/master though 21:56:05 origin is your github fork repo, right? 21:56:14 maybe? 21:56:25 it's isloat/crawl and it's listed as 'master' as the default branch 21:56:54 idea: remove felids in some commit nobody will look at like "Code cleanup", and see how long it takes for anyone to actually notice 21:57:03 isloat is your fork, yeah 21:57:14 er 21:57:22 isloat/crawl is the fork 21:57:33 so yeah that's your fork of the repo, that's what 'origin' is 21:57:41 you're adding a new remote, which is our github repo 21:57:59 I thought I did that with chequers's first command 21:58:02 yes 21:58:13 so after you've done that 21:58:18 git fetch upstream 21:58:38 once upstream is fetched, you check out your repo's master with `git checkout master` 21:58:54 then you do a hard reset to upstream/master 21:59:18 at that point your repo's master will have the same commits as our master 21:59:42 Okay, done 21:59:45 Now to squash? 21:59:53 yeah now you can checkout your branch 22:00:00 squash! rebase! push! 22:00:04 -!- omarax has quit [Remote host closed the connection] 22:00:07 er 22:00:24 actually what you should maybe do is force push that master to your isloat/crawl repo's master as well 22:00:32 you probably don't want to leave that weird master as-is 22:00:44 since I'm sure you'll end up getting confused by that in the future 22:01:02 Yeah, I just want a hard reset on this since now I know to branch properly before doing changes 22:01:17 once that's done, git rebase -i origin/master will work from the branch 22:01:20 and you can squash commits 22:01:38 -!- packet_loss has joined ##crawl-dev 22:02:06 remember to triple check which branch you ard on before running 'git reset --hard ...' 22:03:49 -!- PleasingFungus has quit [Remote host closed the connection] 22:04:14 03PleasingFungus02 {Brannock} 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1080-g283d21f: Update the spell schools guide 10(2 days ago, 1 file, 40+ 34-) 13https://github.com/crawl/crawl/commit/283d21f03ccf 22:04:14 03PleasingFungus02 {Brannock} 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1081-g90a4266: Spell school guideline tweaks (Brannock) 10(2 days ago, 1 file, 7+ 3-) 13https://github.com/crawl/crawl/commit/90a426631331 22:04:14 03gammafunk02 {Brannock} 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1082-g427ff9b: Rename the crawl manual reST file and remove the doku wiki sync step 10(2 days ago, 5 files, 3002+ 3011-) 13https://github.com/crawl/crawl/commit/427ff9bbf5ab 22:04:14 03|amethyst02 {Brannock} 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1083-gaae6cf7: Pointerise _choose_band outparameters. 10(2 days ago, 1 file, 10+ 8-) 13https://github.com/crawl/crawl/commit/aae6cf757b3e 22:04:14 03PleasingFungus02 {Brannock} 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1084-g4eae0e7: Mostly gut misc.cc 10(2 days ago, 42 files, 787+ 743-) 13https://github.com/crawl/crawl/commit/4eae0e79b799 22:04:14 03PleasingFungus02 {Brannock} 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1085-g1386029: Further gutting of misc.cc 10(2 days ago, 10 files, 247+ 258-) 13https://github.com/crawl/crawl/commit/1386029de01b 22:04:14 03PleasingFungus02 {Brannock} 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1086-gb266b9b: Remove Tome of Destruction text (unused) 10(2 days ago, 1 file, 0+ 59-) 13https://github.com/crawl/crawl/commit/b266b9b64f3d 22:04:14 03PleasingFungus02 {Brannock} 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1087-g588e432: Don't let turtles act after withdrawing (10597) 10(2 days ago, 1 file, 1+ 0-) 13https://github.com/crawl/crawl/commit/588e432c6039 22:04:14 03|amethyst02 {Brannock} 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1088-g5f3bd3c: Fix non-webtiles compilation (MarvinPA) 10(2 days ago, 1 file, 1+ 0-) 13https://github.com/crawl/crawl/commit/5f3bd3c9cb4e 22:04:14 03MarvinPA02 {Brannock} 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1089-g24760e1: Don't flavour entropy weavers as being formicids 10(2 days ago, 2 files, 2+ 2-) 13https://github.com/crawl/crawl/commit/24760e17f24d 22:04:14 ... and 10 more commits 22:04:54 <|amethyst> hrm 22:05:26 <|amethyst> looks like that rebased in the wrong direction 22:05:29 I think that's my fault 22:05:57 -!- packet_loss has quit [Ping timeout: 250 seconds] 22:07:59 Yeah this is because of that Dg PR I mentioned earlier 22:08:55 Unstable branch on crawl.jorgrun.rocks updated to: 0.19-a0-1097-g38e3b35 (34) 22:09:28 -!- VoxSomniator has quit [Ping timeout: 264 seconds] 22:10:04 did you rebase it relative to something that wasn't updated? 22:10:17 or maybe you had those commits in your branch 22:10:25 I'm honestly not sure at this point 22:10:36 did you squash the relevant commits you want into one commit? 22:10:41 No, not yet 22:10:46 er 22:10:50 I was trying to fix the issues with my master 22:10:56 oh 22:11:06 hrm, but why did your branch get updated? 22:11:23 you shouldn't mess with the branch in your isloat repo until you've cleaned it all up 22:11:34 maybe fixing master just triggers that on github's side, though 22:11:42 It's because of this: https://github.com/crawl/crawl/pull/318 22:11:43 in which case it's probably ignorable 22:11:53 <|amethyst> the pull request was "isloat wants to merge 22 commits into crawl:master from isloat:master" 22:11:53 ah, it's a different PR? 22:12:06 yeah ok, that's ignorable 22:12:08 <|amethyst> so updating isloat:master probably updated the PR automatically 22:12:09 The commits from that are on my master branch, before I realized I needed to branch off when I want to make changes 22:12:13 gotcha 22:12:15 so you're fine 22:12:37 you're fine assuming you properly fixed your master, what happens in that PR is nbd 22:12:49 https://github.com/isloat/crawl/commits/master It doesn't look like it was fixed, it still contains the PR commits 22:12:57 From Aug 6th, a bit down 22:14:04 well, you must not have properly updated your local repo's master 22:16:47 yeah, the differences between isloat/crawl/master and origin/master do begin with that Dg commit 22:16:51 when I add it as a remote 22:17:48 Okay, so how should I get a new, clean version of origin/master? I'll likely lose the Dg commit but I've already backed up player-stats.cc and can resubmit it if it gets wiped 22:18:09 <|amethyst> first, let's save your dg branch 22:18:28 <|amethyst> git checkout -b demigod-messages to make a branch for that 22:18:36 <|amethyst> then git checkout master to switch back to master 22:19:14 Okay, done 22:19:46 <|amethyst> then do git remote add upstream https://github.com/crawl/crawl.git 22:20:02 fatal: remote upstream already exists 22:20:10 I did that eariler via chequers I think 22:20:23 <|amethyst> what does git remote -v say? 22:21:09 Lists three addresses, twice each, with (fetch) and (push) for each address. https://github.com/crawl/crawl.git, https://github.com/isloat/crawl.git, and git://github.com/crawl/crawl 22:21:16 prefixed with crawl, origin, and upstream, respectively 22:21:23 <|amethyst> okay 22:21:49 <|amethyst> do git fetch upstream to make sure that's up to date 22:22:23 Updated 22:23:27 <|amethyst> just to verify, right now git describe says 0.19-a0-1099-g9dcb9d8 ? 22:23:39 Nomi (L22 FeCK) (Depths:3) 22:23:51 0.19-a0-1120-gc326e3a 22:24:12 <|amethyst> hm 22:24:31 <|amethyst> that's even more commits than what got pushed 22:24:46 from web interface: This branch is 22 commits ahead, 20 commits behind crawl:master. 22:24:53 I think commits are getting duplicated 22:25:05 from the web interface? 22:25:08 https://github.com/isloat/crawl 22:25:17 you realize that that repo 22:25:21 is not the same as your local repo 22:25:40 he's asking about your local one 22:25:48 0.19-a0-1099-g9dcb9d8 22:25:49 There we go 22:25:59 I attempted a merge earlier and fucked it up, undid that 22:26:17 <|amethyst> okay, so this is the version that has all the upstream commits on top of your two commits 22:26:27 Correct 22:26:36 <|amethyst> git rebase upstream/master 22:27:01 That brought me back to my Dg commits and undid all commits after that one 22:27:06 <|amethyst> that will rebase your current branch (your master) on top of upstream master 22:27:10 <|amethyst> what does git describe say 22:27:15 <|amethyst> gde 22:27:16 <|amethyst> err 22:27:30 <|amethyst> s/gde// 22:27:36 0.19-a0-1099-ga63c3ec 22:27:49 <|amethyst> what about git describe HEAD^^ 22:27:58 0.19-a0-1097-g38e3b35 22:28:05 <|amethyst> okay, you're good 22:28:12 <|amethyst> git push --force 22:28:36 doesn't he want those commits not in his master? 22:28:36 <|amethyst> %git 22:28:36 07PleasingFungus02 * 0.19-a0-1097-g38e3b35: Auto-ID spellbooks you step on 10(71 minutes ago, 3 files, 21+ 0-) 13https://github.com/crawl/crawl/commit/38e3b354e79f 22:28:40 <|amethyst> oh 22:28:42 <|amethyst> well 22:28:55 <|amethyst> yeah, but you'll need to redo PR 318 22:28:58 he'd like them to be in a branch, yeah 22:29:05 We already set up the branch earlier 22:29:06 I can redo it easily 22:29:09 It's just a single file change 22:29:39 <|amethyst> do the git checkout -b again 22:29:40 I want to reset fully my master to origin/master, then to squash dream-sheep into a single commit 22:29:51 03Brannock02 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1098-gf06a865: Stronger messaging for Dg attribute boost. 10(2 days ago, 1 file, 6+ 3-) 13https://github.com/crawl/crawl/commit/f06a865c938e 22:29:51 03Brannock02 07https://github.com/crawl/crawl/pull/318 * 0.19-a0-1099-ga63c3ec: Fix Android compilation (|amethyst) 10(2 days ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/a63c3ecdc026 22:29:53 <|amethyst> err 22:30:08 <|amethyst> let's see 22:30:12 That would be after I did git push --force I suspect 22:30:19 <|amethyst> yeah 22:30:22 <|amethyst> so now 22:30:22 Brannock: well keep in mind the terminology here, origin/master is your isloat/crawl/master, which has unwanted stuff in it, so you actually don't want to reset to that 22:30:29 you want to reset it to upstream/master 22:30:31 I'm getting tripped up on the terminology, sorry 22:30:39 I thought 'origin' meant the trunk I'm forking from 22:30:48 Clearly I'm mistaken 22:30:50 yeah just remember that origin == your fork on github, upstream == our repo 22:30:51 <|amethyst> No, 'origin' is where you pull from 22:31:02 <|amethyst> so let's see, we're halfway there 22:31:17 <|amethyst> now delete that branch you made a minute ago, so we can recreate it with the new correct contents 22:31:50 <|amethyst> git branch -D demigod-messages 22:31:56 Deleted 22:32:01 <|amethyst> then git checkout -b demigod-messages again 22:32:24 New branch checked out 22:32:29 <|amethyst> then git push origin demigod-messages to put that branch on your github 22:32:43 Done 22:32:59 <|amethyst> okay, good, we'll come back to that in a minute 22:33:08 <|amethyst> git checkout master 22:33:16 Up-to-date 22:33:36 <|amethyst> git reset --hard upstream/master 22:33:50 Alright! Master is fixed 22:33:54 <|amethyst> should put you on 0.19-a0-1097-g38e3b35 22:34:02 0.19-a0-1097-g38e3b35 22:34:06 master is fixed in your local repo, but you should also fix it in origin 22:34:12 Syncing... 22:34:27 Okay hang on 22:34:28 you fix it with a force push 22:34:53 Okay, I fucked up with the sync, undid that with reset --hard 22:35:00 How do I force push? 22:35:00 <|amethyst> git push --force 22:35:23 <|amethyst> or git push --force origin master if you want to be more specific about it 22:35:30 <|amethyst> okay 22:35:34 <|amethyst> looks like your repo is good now 22:35:38 Thank you very much 22:35:42 yeah remember that 'syncin' (which I assume to mean git pull) is a fetch and merge, not what you wanted in this case 22:35:47 *syncing 22:35:48 <|amethyst> Brannock: one more thing 22:35:54 <|amethyst> Brannock: need to update pr 318 22:36:10 <|amethyst> Brannock: to point to your demigod-messages branch instead of your master branch 22:36:22 <|amethyst> oh, it closed automatically 22:36:29 <|amethyst> so refile it I guess 22:36:32 PR 318 has closed 22:36:32 Okay 22:36:39 How should I squash PR 320? 22:36:45 s/320/321 22:37:05 <|amethyst> you want to squash it all into one commit? 22:37:20 it seemed best, unless there's a commit that really should be separate 22:37:28 PF said rebase, gammafunk said squash.. I'm not exactly sure what the difference is 22:37:28 but I didn't look at them all 22:37:49 rebase is a general term for modifying commit history, squashing is one form of modification 22:37:57 I see 22:38:00 the one where you take a bunch of commits and make them into one 22:38:01 <|amethyst> Brannock: 'squash' means to merge two commits together; 'rebase' is a tool that lets you re-arrange commits, including squashing 22:38:17 <|amethyst> first git checkout dream-sheep 22:38:20 I don't think any commit needs to be preserved, so I'd like to squash all 34 commits into one 22:38:58 Okay, the branch's ready 22:39:18 <|amethyst> git rebase -i master 22:39:32 <|amethyst> that should bring up an editor window with a list of your commits in this branch 22:39:48 It did, in Sublime Text 22:40:16 <|amethyst> there should be a bunch of 'pick' lines, from 'Dream sheep tile and corpse' up to 'Fix Polyphemus's band spawning' 22:40:24 Yes 22:40:47 <|amethyst> you'll want to change the words "pick" while leaving everything else, especially the commit numbers 22:40:52 <|amethyst> change the first one to reword 22:41:00 <|amethyst> and all the subsequent ones to fixup 22:41:13 oh, you don't use squash there? 22:41:18 <|amethyst> so it will look like reword abcdef01 blah blah 22:41:27 <|amethyst> fixup 12345678 blah blah 22:41:28 <|amethyst> etc 22:41:28 I need to look up what fixup does 22:41:32 Reworded my first comment and set all subsequent ones to fixup. 22:41:37 no 22:41:38 <|amethyst> gammafunk: 'fixup' throws away the commit messages 22:41:47 s/ent/it 22:41:50 Brannock: you can't edit the comments from there 22:41:56 Oh 22:42:09 changing pick to reword will let you do that though 22:42:11 <|amethyst> if it's marked as 'reword', it will ask you to edit that later 22:42:15 on subsequent steps, yeah 22:42:34 -!- Chase has quit [Ping timeout: 244 seconds] 22:42:35 |amethyst: that's very handy, wish I knew that 22:42:38 <|amethyst> you might want to verify that you still have 34 lines 22:42:38 re fixup 22:42:51 <|amethyst> gammafunk: it says right there in the rebase -i comment :) 22:42:52 *wish I knew that earlier, since I presumably know it now 22:42:57 I can't read though!!! 22:43:18 I fixed up the text in the editor window, now what? 22:43:25 I still have 34 lines of commits, yes 22:43:27 Save it? 22:43:40 save and close it, yeah, it will move the process forward 22:43:42 <|amethyst> Brannock: so after you've verified that you have all 34 commits listed, the first as 'reword' and the rest as 'fixup', save and exit 22:43:54 Done 22:44:11 <|amethyst> Brannock: then it will pop up another editor window for you to edit the commit message on that first commit (which will actually contain all of your commits) 22:44:24 I did not get the second editor window 22:44:47 hrm, do you have to exit sublime or something? 22:44:49 <|amethyst> hm 22:45:01 Exited ST. No dic 22:45:01 e 22:45:15 Should I re-rebase? 22:45:15 <|amethyst> no 22:45:18 maybe git status 22:45:27 <|amethyst> in the terminal where you did the rebase, are you back at the prompt? 22:45:35 <|amethyst> or is it sitting there waiting for something? 22:45:42 It's back at prompt 22:45:47 <|amethyst> hm 22:45:55 you probably made a booboo on that editor page 22:45:56 <|amethyst> git status 22:45:58 I'm using Github Desktop, there may be an undesired interaction there 22:46:01 It's open along with git shell 22:46:16 yeah, try git status 22:46:24 <|amethyst> and also git describe to show what commit you're on 22:46:30 does it say you're in process of rebase? 22:46:59 Your branch and 'origin/dream-sheep' have diverged, 22:46:59 and have 54 and 34 different commits each, respectively. 22:46:59 (use "git pull" to merge the remote branch into yours) 22:46:59 Untracked files: 22:46:59 (use "git add ..." to include in what will be committed) 22:46:59 zsjsbt3z.gpf.txt 22:47:02 Sorry for the long paste. 22:47:19 <|amethyst> hm 22:47:43 <|amethyst> what does git describe say? 22:47:53 0.19-a0-1131-g972f331 22:48:04 <|amethyst> hm 22:48:11 <|amethyst> yeah, try the rebase again 22:48:30 It's back to all 'pick' 22:48:44 Filename is different now than the one above 22:49:02 So, 'reword' and 'fixup' agani? 22:49:03 <|amethyst> change it back to 'reword' then 'fixup', being careful not to remove any of the commit numbers, then save and exit 22:49:13 Done, saved exited 22:49:21 <|amethyst> did it do anything back at the terminal? 22:49:38 Terminal was already back at prompt before I began to change antyhing. Still at prompt 22:49:42 <|amethyst> oh 22:49:52 <|amethyst> there's something messed up with the editor setting then 22:49:57 $ git rebase -i master 22:49:57 Successfully rebased and updated refs/heads/dream-sheep. 22:50:03 That's what happened immeidately after I entered that command 22:50:03 <|amethyst> I'm guessing the sublime launch script exits immediately 22:50:07 <|amethyst> rather than waiting around 22:50:40 <|amethyst> oh 22:51:21 <|amethyst> what does git config core.editor say? 22:51:23 <|amethyst> err 22:51:29 <|amethyst> git config --global core.editor 22:51:41 It doesn't say anything, just goes to next prompt 22:51:53 with --global 22:52:00 s/with/using 22:52:02 <|amethyst> hm, do you happen to know how you configured git to use sublime? 22:52:07 As far as I know 22:52:07 I did not 22:52:17 Sublime Text is set as a default on my OS I believe (Win10) 22:52:36 <|amethyst> from the command line, can you run sublime -n -w 22:52:51 <|amethyst> if it works, that should pop up a new sublime window 22:52:59 'sublime' is not recognized as an internal or external command 22:53:03 <|amethyst> hm 22:54:32 <|amethyst> which version of sublime? 22:54:44 <|amethyst> and where is it installed? 22:55:31 Sublime Text 3, in C:\Program Files 22:55:41 <|amethyst> something like: git config --global core.editor "'C:/Program Files/Sublime Text 3/subl.exe' -w" 22:55:47 <|amethyst> note the two levels of quotes 22:56:12 <|amethyst> -w is sublime's command-line option for "wait for the file to be closed" 22:56:15 -!- Yermak has joined ##crawl-dev 22:56:55 <|amethyst> once you've done that, try the rebase yet again... this time it shouldn't drop you back to the prompt until after you save and close the file 22:57:46 That worked 22:57:52 COMMIT_EDITMSG is open now 22:58:36 Okay, sav and close that one too once I'm done updating? 22:59:47 From my current game: Vanquished Creatures (others) 2155 eldritch tentacle segments (WizLab) 22:59:54 This looks wrong 23:00:04 -!- omarax has quit [Remote host closed the connection] 23:00:08 <|amethyst> Brannock: yes 23:00:23 It looks like every tentacle move makes some dead tentacle segments 23:00:30 <|amethyst> Brannock: then it should pop up another window to edit the commit message 23:00:46 <|amethyst> Brannock: I'd recommend using the message you wrote on the pull request 23:00:50 Done 23:00:55 Rebase successful 23:01:02 <|amethyst> now git describe 23:01:11 0.19-a0-1098-g3330d3e 23:01:26 <|amethyst> and git describe HEAD^ shows 0.19-a0-1097-g38e3b35 ? 23:01:36 Indeed 23:01:59 <|amethyst> you're good: git push --force to update your github (which will automatically update the PR) 23:02:24 It works :) 23:02:26 Thank you VERY much 23:02:37 <|amethyst> yay 23:03:39 <|amethyst> for future reference: to update your master branch both locally and on github do: git fetch upstream master:master; git push origin master 23:03:48 Carefully noted 23:04:00 You're welcome, just remember to make the check for the $100 customer service fee payable to DEV TEAM 23:04:18 <|amethyst> the first fetches official master ('upstream') into your local repo's master; the second pushes your local master to your github ('origin') 23:04:43 oh, didn't know about that fetch syntax 23:04:50 I've had to switch to master to do that 23:05:26 -!- Franz__ has quit [Quit: Verlassend] 23:05:43 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1098-g3330d3e: Implement dream sheep. 10(2 days ago, 23 files, 212+ 5-) 13https://github.com/crawl/crawl/commit/3330d3edcaa6 23:06:01 Another way is to simply switch to your master, then do `git pull upstream master` 23:06:19 but it will make more sense as you use the commands more 23:06:36 <|amethyst> personally I avoid ever having master checked out 23:06:47 oh, how do you manage that? 23:06:53 like if you want to compile master 23:07:03 just make a branch for compilation? 23:07:20 <|amethyst> yeah, I do all my work in a branch 'nfm-fixes' 23:07:38 <|amethyst> which is usually in sync with master, unless I'm working on something 23:07:43 that's probably a smart thing to do 23:07:58 <|amethyst> it does make pushing a bit of a pain 23:08:06 <|amethyst> because I have to write git push origin nfm-fixes:master 23:08:36 <|amethyst> I'm sure there's some trick I can do with tracking to make that the default behaviour 23:09:04 <|amethyst> but really I just type ctrl-r push so no big deal :) 23:09:04 yeah I didn't know about that : syntax for push and fetch, good to know 23:09:23 <|amethyst> : 23:09:33 <|amethyst> local and remote are the other way around for fetch 23:10:53 <|amethyst> Brannock: btw, you still need to refile your demigod-messaging PR 23:10:54 Doing that right now 23:11:50 oh 23:11:53 re your commit message 23:12:14 use a 72-78(?) line length limit 23:12:30 I forget what the max should be, I personally use 72 23:12:34 <|amethyst> at most 76, but 72 is preferable 23:12:54 Damn 23:12:58 if you're writing the commit in vim, it should auto-newline for you 23:13:02 I submitted right before I read that 23:13:04 this allows the commit message to display in width of 80 23:13:10 no prob, you can rebase! 23:13:12 and force push 23:13:17 <|amethyst> if you do >76 then the four spaces added by 'git show' and 'git log' will make it wrap even if it didn't wrap before 23:13:25 the way that works is, your PR is updated to whatever's in the branch 23:13:32 gammafunk, which commit message? sheep or demigod? 23:13:39 I'm looking at the sheep one 23:13:42 okay, fixing that one now 23:13:47 but ofc applies to the dg one if that is similar 23:13:57 <|amethyst> two ways to edit a commit message. 23:14:10 <|amethyst> First one you've seen: git rebase -i and mark it as 'reword' 23:14:30 <|amethyst> second way only works if it's the top commit: git commit --amend 23:14:39 yeah, I should have recommended that second one 23:15:10 amending a commit is a really handy thing in general, basically a single-commit rebase 23:15:20 fixed, and thanks for the additional info on commands 23:15:26 my git tips file is growing... 23:15:41 can monsters have clarity? 23:15:42 <|amethyst> gammafunk: though I annoy myself sometimes when I do --amend and didn't mean to 23:15:57 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1098-g931cb8f: Implement dream sheep. 10(2 days ago, 23 files, 212+ 5-) 13https://github.com/crawl/crawl/commit/931cb8f9811b 23:15:58 New branch created: pull/322 (1 commit) 13https://github.com/crawl/crawl/pull/322 23:15:58 03Brannock02 07https://github.com/crawl/crawl/pull/322 * 0.19-a0-1098-g3db6595: Stronger messaging for Dg attribute boost. 10(2 days ago, 1 file, 6+ 3-) 13https://github.com/crawl/crawl/commit/3db65958e125 23:16:00 heh, yeah, I've done that, also wrt using -a or not 23:16:01 <|amethyst> chequers: yes 23:16:23 <|amethyst> gammafunk: I basically never use -a 23:16:39 <|amethyst> gammafunk: I always git add -u then do a git diff --cached to review before committing 23:16:52 hrm, I've not used -u with add 23:16:55 <|amethyst> unless it's trivial, in which case I skip the review 23:17:01 <|amethyst> add -u is the same as commit -a 23:17:13 ^ ditto, although I am starting to use `git add -p ...` a lot 23:17:23 -!- Alcopop has quit [Quit: Page closed] 23:17:50 yeah, so I'm reading, I guess you just get the prompt for each change? 23:18:18 oh, I guess the difference is that it's not finally commited, like you're saying 23:18:21 you can review first 23:18:28 <|amethyst> yeah 23:18:29 gammafunk, re: 72 characters, coding_conventions.txt recommends 80. I've seen various recommendations between 72, 76, 78, and 80 23:18:31 <|amethyst> also 23:18:39 my commits this weekend have all aimed for 80 23:18:40 Brannock: that's coding conventions, not commit message conventions 23:18:46 <|amethyst> I run checkwhite and unbrace after add -u but before commit 23:18:49 I didn't realize it wasn't universal 23:18:51 for coding it is 80, yeah 23:19:08 yeah git commit messages are showin in terminal with some extra spacing, so it's a shorter limit 23:19:12 Ah, I see 23:19:32 <|amethyst> so I can choose whether to put the whitespace fixes into the same commit or a different one 23:19:46 <|amethyst> also, +1 for git add -p 23:19:52 <|amethyst> best commit splitting tool 23:20:08 yeah, add -p is great; also using the little edit feature for manual splitting 23:20:12 -!- Zxpr1jk has quit [Read error: Connection reset by peer] 23:20:15 a little weird at first, but very handy 23:20:38 gammafunk, I accidentally submitted the new commit message at 80, my sublime ruler is preset to 80 and I wasn't thinking clearly. in a while I'll update to 72 23:21:08 nbd, feel free to update the banch as much as you need, the PR will be autoupdated with the latest commit 23:21:17 someone will have to review it before merge anyhow 23:21:28 in terms of gameplay issues, even aside from coding 23:21:41 Brannock: good thing to check out if you have some spare time: https://git-scm.com/doc 23:21:53 oh that's good stuff 23:21:55 pinned to read tomorrow 23:21:55 next monster: steel wool sheep 23:21:55 its kinda like the man page but easier to read 23:22:00 PleasingFungus, I feel like the simplest thing to do is to change spellbooks to be like scrolls, you pick them up and then r them to add them to your library. And Trog worshippers just couldn't r them 23:22:12 chequers, someone earlier today suggested coma sheep 23:22:20 <|amethyst> If you're planning on changing that PR one more time, I'm going to cancel the travis-ci builds 23:22:21 I did, but I was joking 23:22:27 PleasingFungus, after that was implemented the next step would be to "goldify them"? 23:22:32 |amethyst, yes, please 23:23:04 PleasingFungus, since goldifying also means you need to change starting classes to not have starting books but instead have them in your library etc etc. 23:23:18 gold sheep?? 23:23:32 expensive 23:24:24 just walk over the sheep and they get added to your gold... 23:24:52 so you're re-adding player trample?! 23:24:52 <|amethyst> http://thumbnail.image.rakuten.co.jp/@0_mall/nihonmaterialjewelry/cabinet/03415198/03852110/imgrc0063636824.jpg 23:25:10 <|amethyst> http://cdn.jmbullion.com/wp-content/uploads/2014/10/british-gold-sheep-obverse-new.jpg 23:25:16 so dream sheep are pretty cool, are they going to replace a lair monster or just add a new one? 23:25:29 sounds like Brannock has a new enemy to add after the dream sheep 23:25:43 a new one, late lair 23:25:49 there was light discussion of scrapping sheep entirely 23:25:50 common sheep 23:26:15 Segments generated by tentacle movement are counted as "dead" 13https://crawl.develz.org/mantis/view.php?id=10601 by Yermak 23:26:24 Brannock, I meant after you finish dream sheep you should add gold sheep 23:26:45 I was replying to chequers, though I'm not against trying to implement more creatures :) 23:26:45 <|amethyst> re 10601... that's been that way pretty much forever 23:27:03 <|amethyst> not that it isn't a bug... but I rememeber seeing that back in 0.8 23:27:09 -!- Nomi has quit [Read error: Connection reset by peer] 23:27:15 <|amethyst> s/meber/mber/ 23:28:27 im pretty sure you meant rememeber 23:29:04 I'd +1 removing sheep. they're like green rats in smaller bands 23:29:10 <|amethyst> the meme bear is ever hungry 23:29:17 between jackals and yaks, sheep don't really have a place 23:29:37 <|amethyst> sheep could have a place earlier in the dungeon than they now appear 23:29:38 <|amethyst> but yeah 23:29:39 @??polar bear col:chaos hd:30 name:meme_bear n_rpl 23:29:40 bad monster colour "chaos" in "polar bear col:chaos hd:30 name:meme_bear n_rpl" 23:29:49 oops 23:29:50 and howler monkeys too are a new pack monster 23:29:51 <|amethyst> the only problem I see with removing sheep is cyclops flavour 23:30:00 <|amethyst> oh 23:30:03 <|amethyst> xom vault 23:30:08 I made dream sheep flammable 23:30:11 shoals cyclops come with a bunch of random monsters now 23:30:30 <|amethyst> I was going to say, rename Yak to Sheep and rename Death Yak to Yak 23:30:40 <|amethyst> or just rename Yak to Sheep 23:30:56 <|amethyst> sheep are funnier than yaks anyway 23:31:03 Yak, Dream Sheep, Buffalo? 23:31:26 <|amethyst> though they are extremely comedic ruminants the both of them 23:31:32 it's funny that they're called DEATH YAKS though 23:31:45 yaks... of death!!!!! 23:31:56 <|amethyst> Brannock: Buffalo buffalo buffalo Rochester death yaks buffalo buffalo buffalo. 23:32:08 sheep, dream sheep and death sheep 23:32:22 s/Lair of the Beasts/Lair of the Sheeps/ 23:32:47 -!- MaxFrost has quit [Quit: Going offline, see ya! (www.adiirc.com)] 23:33:06 FR: Shepherd unique 23:33:17 -!- wheals has quit [Ping timeout: 250 seconds] 23:33:17 there's already that food vault 23:33:24 <|amethyst> hm 23:33:37 oh man, Joseph. He already has a qstaff 23:33:42 <|amethyst> I just realised there's something vitally important missing from Brannock's dream sheep commit 23:34:03 What's that? 23:34:29 <|amethyst> Brannock: Nowhere do I see a message "Wake up, sheeple!" 23:34:32 Haha 23:34:38 <|amethyst> https://xkcd.com/1013/ 23:35:38 !source pop_entry 23:35:39 1/1. https://github.com/crawl/crawl/blob/master/crawl-ref/source/mon-pick.h#L11 23:35:42 wake up, sheeple would be a good unique taunt 23:36:04 hm, where is the structure in mon-pick-data.h defined 23:36:07 !source pop_d 23:36:07 1/1. https://github.com/crawl/crawl/blob/master/crawl-ref/source/mon-pick-data.h#L1 23:36:14 <|amethyst> minmay: I guess Donald could say that to minotaurs? 23:38:39 where's the code that makes orc wizards/priests spawn on d:3 but not before? 23:39:08 is it not in mon-pick-data? 23:39:22 oh are you asking about OODs preventing wizards? 23:39:45 i'm not sure how mon-pick-data works, but I was wondering also if there's special-case code somewhere for early-d 23:40:12 oh... minr & maxr of mon-pick-data is the level number 23:40:27 { 4, 12, 136, SEMI, MONS_ORC_PRIEST }, means d4 to d12 23:40:30 yes 23:40:39 OODs can occasionally reach deeper so they might spawn earlie rthan D4 23:41:07 you'll also see that branches have a maxr that's deeper than the branch can actually go 23:41:37 only confusion is... orc priests spawn on d:3 a lot?? 23:41:37 /s/that branches/that monster entries for branches/ 23:41:37 -!- rossi has quit [Ping timeout: 276 seconds] 23:41:40 !lg * killer~~orc_priest d:3 23:41:43 113664. mima the Skirmisher (L4 MiBe of The Shining One), blasted by an orc priest (nerve-wracking pain) on D:3 on 2016-08-08 03:24:29, with 120 points after 3842 turns and 0:54:42. 23:44:43 okay |amethyst I fixed up the commit message for dream-sheep, you can restart the travis builds now 23:44:47 thanks again for all your help tonight! 23:46:42 03Brannock02 07https://github.com/crawl/crawl/pull/321 * 0.19-a0-1098-gbb9ed69: Implement dream sheep. 10(2 days ago, 23 files, 212+ 5-) 13https://github.com/crawl/crawl/commit/bb9ed694e3be 23:47:02 -!- twelwe has joined ##crawl-dev 23:47:04 yes.... made it 23:49:27 -!- destroythecore has quit [Read error: Connection reset by peer] 23:50:34 -!- eb has quit [] 23:53:48 -!- botbrad has quit [Quit: Page closed]