00:00:00 umm 00:00:03 -!- omarax has quit [Remote host closed the connection] 00:00:07 lm? 00:00:12 hmm 00:00:19 !lg * kmap=ossuary_due_cavern won 00:00:20 No games for * (kmap=ossuary_due_cavern won). 00:00:24 !lm * kmap=ossuary_due_cavern won 00:00:24 No milestones for * (kmap=ossuary_due_cavern won). 00:00:28 bleh 00:01:41 Rast: no 00:02:32 !lm * kmap=ossuary_due_cavern 00:02:33 3626. [2016-12-30 10:18:36] Sangchobo the Conjurer (L6 DECj) entered an Ossuary on turn 2869. (D:4) 00:02:38 !lg . kmap=~ossuary 00:02:39 7. rast the Sneak (L4 FeAr), slain by a human zombie in Ossuary (ossuary_minmay_scorpions) on 2016-12-10 19:19:51, with 95 points after 1004 turns and 0:08:51. 00:03:03 I guess you could extrapolate that 2700 players got it and either left early or exited it without dying 00:03:07 unless there's some weird stuff here 00:03:14 Brannock, I think that query finds milestones in game where the player eventually died there 00:03:28 yeah, but we know 911 players died there 00:03:48 !lm * kmap=ossuary_due_cavern -2 00:03:49 3625/3626. [2016-12-30 10:16:44] Sangchobo the Conjurer (L4 DECj) killed Grinder on turn 2055. (D:3) 00:03:49 !lm * kmap=ossuary_due_cavern -3 00:03:50 3624/3626. [2016-12-30 10:15:14] Sangchobo the Conjurer (L4 DECj) killed Robin on turn 1376. (D:2) 00:03:51 !lm * kmap=ossuary_due_cavern -4 00:03:52 3623/3626. [2016-12-30 10:12:38] Sangchobo the Conjurer (L1 DECj) began the quest for the Orb on turn 0. (D:1) 00:04:22 !lg . kmap=~ossuary s=kmap 00:04:23 7 games for Rast (kmap=~ossuary): 2x ossuary_tomb_1, ossuary_tomb_3, ossuary_minmay_scorpions, ossuary_minmay_four_chambers, ossuary_zaba_flooded, enter_ossuary_3 00:05:04 !lg . kmap=~ossuary s=kmap ?:N>99 00:05:04 No games for Rast (kmap=~ossuary). 00:05:08 !lg * kmap=~ossuary s=kmap ?:N>99 00:05:09 17127 games for * (kmap=~ossuary): 3434x ossuary_zaba_flooded, 2909x ossuary_tomb_3, 1689x ossuary_tomb_1, 1135x ossuary_minmay_tomb_2a, 911x ossuary_due_cavern, 797x ossuary_tomb_2, 715x ossuary_minmay_chase, 650x ossuary_minmay_scorpions, 646x ossuary_due_mausoleum, 622x ossuary_the_hunt_dpeg, 537x ossuary_crypta, 485x ossuary_boxes_badplayer, 442x ossuary_minmay_four_chambers, 406x minmay_ossua... 00:05:42 so, 5th deadliest. though we have no idea how often they get places 00:06:05 !lg * cv>=0.18 kmap=~ossuary s=kmap ?:N>99 00:06:06 4029 games for * (cv>=0.18 kmap=~ossuary): 825x ossuary_tomb_3, 716x ossuary_zaba_flooded, 446x ossuary_tomb_1, 288x ossuary_minmay_tomb_2a, 233x ossuary_due_cavern, 206x ossuary_kennysheep_city_of_the_dead, 192x ossuary_minmay_scorpions, 188x ossuary_tomb_2, 187x ossuary_due_mausoleum, 182x ossuary_minmay_chase, 151x ossuary_boxes_badplayer, 149x ossuary_the_hunt_dpeg, 135x ossuary_crypta, 131x o... 00:06:13 !lg * kmap=~ossuary s=kmap ?:N>99 recent 00:06:13 Broken query near '' 00:07:03 anyway -- my complaint isnt just how deadly it can be, but how spoily it is 00:08:42 -!- travis-ci has joined ##crawl-dev 00:08:43 The build passed. (dpegs_dynamic_monsters - 74f087c #7492 : Corin Buchanan-Howland): https://travis-ci.org/crawl/crawl/builds/187995850 00:08:43 -!- travis-ci has left ##crawl-dev 00:08:58 -!- Menche has quit [Quit: Leaving] 00:11:02 -!- Jarlyk2 has quit [Quit: Page closed] 00:13:40 -!- Napkin has quit [Remote host closed the connection] 00:13:49 -!- Napkin has joined ##crawl-dev 00:15:52 !tell lasty so 3% of monsters will go nuts within the first 5 turns after they spot you? Or did I misread it? 00:15:52 Rast: OK, I'll let lasty know. 00:26:52 -!- mizu_no_oto has quit [Quit: Computer has gone to sleep.] 00:33:47 -!- laularukyrumo has quit [Quit: Page closed] 00:37:11 !tell Lasty that implementation is surprisingly simple given dpeg's outline, good job 00:37:12 Brannock: OK, I'll let lasty know. 00:39:14 -!- sooheon has quit [Ping timeout: 245 seconds] 00:42:56 -!- Shard1697_ has quit [Read error: Connection reset by peer] 00:47:24 -!- amalloy_ is now known as amalloy 00:47:56 O 00:48:02 I'm sorry, Pleasingfungus, I won't do it again 00:48:07 Unless you request 00:49:09 do what again? 00:49:21 lol 00:49:28 He asked 00:49:31 i did not 00:49:32 Right, PF? 00:49:33 share secret cookie recipies 00:49:33 at any point 00:49:36 No, brannock just did 00:49:44 ?? 00:50:14 i'm not actually offended or something, i just think that one unsolicited porn PM is enough for the year. 00:50:21 oh boy 00:50:28 enough internet, you know? sometimes you need a break. 00:50:31 yup 00:50:59 might actually go out somewhere. though probably not. nowhere to go, no one to go with... all my friends scattered here and there... truly the life of the crawl dev is a lonely one. 00:51:04 I mean, it only had boobs, and it was a cartoon 00:51:09 it had labia, dude. 00:51:18 No, she was wearing underwear 00:51:23 But I don't blame you not looking that close 00:51:26 i suppose - yes. 00:51:40 see, this is what i mean by 'enough internet'. 00:51:51 I want to know more 00:51:51 minmay: You have 1 message. Use !messages to read it. 00:51:54 My gf ditched me on new years 00:51:55 !messages 00:51:55 (1/1) Rast said (57m 30s ago): what is the worst ossuary and why is it ossuary_due_cavern ? 00:52:12 It's not really anything, he's overreacting, I'll msg it to you 00:52:32 Dracunos: sorry! 00:52:35 re gf 00:52:39 i'm going to get back to work, in any case. 00:52:41 given the context which I've just found out you should probably re-examine your motivations for doing so 00:52:41 -!- Pleasingfungus has quit [Quit: ChatZilla 0.9.93 [Firefox 50.1.0/20161208153507]] 00:52:49 It's a new year, after all 00:52:58 New leaf, sheaf, eta l 00:53:47 -!- purge has quit [Quit: Page closed] 01:00:04 -!- omarax has quit [Remote host closed the connection] 01:12:39 oh happy new year crawl devs. may your frogs be forever fruitful 01:15:52 Unstable branch on crawl.develz.org updated to: 0.20-a0-428-g059cf21 (34) 01:16:06 -!- ZiBuDo has joined ##crawl-dev 01:35:27 -!- MaxFrost has quit [Quit: Going offline, see ya! (www.adiirc.com)] 01:43:14 -!- bonghitz has quit [Remote host closed the connection] 01:45:31 -!- coledot has quit [Quit: coledot] 01:49:40 -!- valrus has quit [Ping timeout: 265 seconds] 01:57:33 Windows builds of master branch on crawl.develz.org updated to: 0.20-a0-428-g059cf21 02:00:04 -!- omarax has quit [Remote host closed the connection] 02:02:19 -!- ZiBuDo has quit [Ping timeout: 252 seconds] 02:09:28 -!- saty has quit [Ping timeout: 256 seconds] 02:10:13 Jalan (L27 GrFE) ERROR in 'rltiles/tiledef-player.cc' at line 2804: ASSERT failed: idx of 0 out of range TILE_MAIN_MAX (1275) .. TILEP_PLAYER_MAX (4067) (D:14) 02:25:52 -!- simmarine has quit [Read error: Connection reset by peer] 02:40:25 -!- Kalir has quit [Quit: I'M OUT SON. PEACE, LOVE, EXPLOSIONS.] 02:48:16 -!- Marvin is now known as Guest52878 02:52:48 Monster database of master branch on crawl.develz.org updated to: 0.20-a0-428-g059cf21 02:55:55 -!- destroythecore has quit [Ping timeout: 245 seconds] 03:00:04 -!- omarax has quit [Remote host closed the connection] 03:13:31 Unstable branch on crawl.beRotato.org updated to: 0.20-a0-428-g059cf21 (34) 03:16:32 -!- amalloy is now known as amalloy_ 03:18:39 -!- Zeor has quit [Ping timeout: 268 seconds] 03:30:01 -!- us17 has quit [Read error: Connection reset by peer] 03:30:31 -!- us17_ is now known as us17 03:33:50 -!- Zeor1 has quit [Quit: Leaving.] 03:36:26 -!- saty has quit [Ping timeout: 260 seconds] 03:43:21 -!- Guest52878 has quit [Remote host closed the connection] 03:49:03 -!- Marvin is now known as Guest31304 03:53:14 -!- Guest31304 has quit [Ping timeout: 260 seconds] 03:57:10 -!- Bcadren has quit [Quit: Life without danger is a waste of oxygen] 03:59:22 -!- CanOfWorms has quit [Ping timeout: 260 seconds] 04:00:04 -!- omarax has quit [Remote host closed the connection] 04:02:22 -!- amalloy_ is now known as amalloy 04:31:44 -!- bannakaffalatta has quit [Read error: Connection reset by peer] 04:38:27 -!- saty has quit [Ping timeout: 264 seconds] 04:50:37 -!- Ququman has joined ##crawl-dev 04:56:51 -!- valrus has quit [Ping timeout: 252 seconds] 05:00:05 -!- omarax has quit [Remote host closed the connection] 05:06:10 -!- mong has quit [Quit: Leaving] 05:12:24 I don't think pleasingfungus is ever coming back 05:12:28 And it's all my fault... 05:12:43 He said it all the time but this time he finally meant it.. he's retired.. 05:14:07 -!- Marvin is now known as Guest53978 05:18:54 -!- Guest53978 has quit [Ping timeout: 268 seconds] 05:28:18 -!- amalloy is now known as amalloy_ 05:31:11 -!- Tux[Qyou] has joined ##crawl-dev 05:38:27 -!- sooheon has quit [Ping timeout: 264 seconds] 05:39:57 -!- bonghitz has quit [Remote host closed the connection] 05:55:27 -!- ProzacElf has quit [Ping timeout: 260 seconds] 05:57:12 -!- TuxQmoob has quit [Changing host] 05:59:46 -!- Tuxedo[Qyou] has joined ##crawl-dev 06:00:01 -!- omarax has quit [Remote host closed the connection] 06:00:03 -!- TuxQmob has quit [Ping timeout: 256 seconds] 06:00:36 -!- bonghitz has quit [Ping timeout: 264 seconds] 06:00:58 -!- Tux[Qyou] has quit [Ping timeout: 252 seconds] 06:14:56 -!- Marvin is now known as Guest32693 06:19:10 -!- Guest32693 has quit [Ping timeout: 246 seconds] 06:28:14 -!- bration has quit [Quit: Page closed] 06:28:45 Wand of digging can dig all wall types 13https://crawl.develz.org/mantis/view.php?id=10869 by PurpleRed 06:33:17 -!- GauHelldragon has quit [Ping timeout: 258 seconds] 06:44:20 -!- rephenryclay has joined ##crawl-dev 06:55:53 I'm playing Trunk on CBRO and wand of digging will tunnel through stone and metal. I know digging and disintegration are currently being merged/renovated so it will get fixed eventually. Just wanted to see if anyone was aware yet. :D 07:00:02 -!- omarax has quit [Remote host closed the connection] 07:15:44 -!- Marvin is now known as Guest47435 07:20:17 -!- Guest47435 has quit [Ping timeout: 265 seconds] 07:23:35 -!- ontoclasm has quit [Quit: Leaving.] 07:24:36 -!- Marvin is now known as Guest42166 07:28:16 -!- bonghitz_ has quit [Remote host closed the connection] 07:37:00 -!- grisha5 has quit [Quit: Page closed] 07:37:40 -!- graymark has quit [Client Quit] 08:00:01 -!- omarax has quit [Remote host closed the connection] 08:00:15 -!- MarvinPA has joined ##crawl-dev 08:01:02 -!- Patashu has quit [Ping timeout: 268 seconds] 08:01:45 -!- Blazinghand has quit [Read error: Connection reset by peer] 08:07:07 -!- grisha5 has quit [Quit: Page closed] 08:16:57 -!- MarvinPA has quit [Ping timeout: 264 seconds] 08:25:13 -!- saty has quit [Ping timeout: 258 seconds] 08:28:17 -!- MarvinPA has joined ##crawl-dev 08:34:52 03MarvinPA02 {GitHub} 07* 0.20-a0-429-g054b1fe: Fix everything being diggable (10869) 10(9 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/054b1feec083 08:36:26 heh 08:38:15 -!- mizu_no_oto has quit [Ping timeout: 258 seconds] 08:41:33 -!- rephenryclay has quit [Quit: Page closed] 08:56:10 -!- wheals__ is now known as wheals 08:56:11 nice 08:56:12 wheals: You have 1 message. Use !messages to read it. 08:56:14 !messages 08:56:15 (1/1) Pleasingfungus said (2d 19h 22m 10s ago): https://twitter.com/relativelybear/status/593843729078726658 I bet wheals has a t-shirt with that 08:56:59 not... yet 09:00:01 -!- omarax has quit [Remote host closed the connection] 09:07:44 -!- Kellhus has quit [Ping timeout: 260 seconds] 09:08:12 -!- bh has quit [Ping timeout: 260 seconds] 09:10:08 Unstable branch on crawl.jorgrun.rocks updated to: 0.20-a0-429-g054b1fe (34) 09:17:45 -!- mibert has joined ##crawl-dev 09:22:38 -!- saty has quit [Ping timeout: 252 seconds] 09:32:15 -!- Lasty has joined ##crawl-dev 09:33:25 -!- grisha5 has quit [Quit: Page closed] 09:33:40 -!- Guest42166 has quit [Remote host closed the connection] 09:35:53 !tell Brannock Thanks, and happy new year! I'm not sure how key it is to dpeg's proposal to have multiple upgrade levels; I didn't implement them simply because the messaging around it gets awkward. (angry, very angry, . . . super angry? Amazingly angry?) 09:35:53 Lasty: OK, I'll let brannock know. 09:39:39 * geekosaur borrows words from bejeweled >.> 09:40:15 m-m-m-m-monster kill! 09:44:18 03Lasty02 07[dpegs_dynamic_monsters] * 0.20-a0-429-g42602f2: Decrease odds of bezotting a monster (rast) 10(2 minutes ago, 1 file, 2+ 2-) 13https://github.com/crawl/crawl/commit/42602f2dca9d 09:44:18 03Lasty02 07[dpegs_dynamic_monsters] * 0.20-a0-430-gb54fec0: Remove energy randomization 10(11 seconds ago, 1 file, 1+ 7-) 13https://github.com/crawl/crawl/commit/b54fec0c83ee 10:00:01 -!- omarax has quit [Remote host closed the connection] 10:34:53 -!- Marvin is now known as Guest31137 10:37:41 rip energy randomization 10:37:44 maybe 10:39:12 -!- Guest31137 has quit [Ping timeout: 260 seconds] 10:42:23 -!- flappity has quit [Read error: Connection reset by peer] 10:46:37 -!- mibert has quit [Ping timeout: 265 seconds] 10:53:24 -!- adelrune has joined ##crawl-dev 11:00:01 -!- omarax has quit [Remote host closed the connection] 11:20:32 -!- simmarine has joined ##crawl-dev 11:35:38 -!- Marvin is now known as Guest42790 11:39:58 -!- Guest42790 has quit [Ping timeout: 268 seconds] 11:43:43 -!- gressup has quit [Read error: Connection reset by peer] 11:44:54 -!- sooheon has quit [Ping timeout: 252 seconds] 11:57:59 -!- GauHelldragon has quit [Ping timeout: 258 seconds] 12:00:01 -!- omarax has quit [Remote host closed the connection] 12:05:33 Unstable branch on crawl.akrasiac.org updated to: 0.20-a0-429-g054b1fe (34) 12:17:30 -!- mibert has joined ##crawl-dev 12:20:59 -!- mibert has quit [Client Quit] 12:24:54 -!- Uhlv has quit [Ping timeout: 260 seconds] 12:34:00 -!- valrus has quit [Ping timeout: 260 seconds] 12:36:26 -!- Marvin is now known as Guest10647 12:40:49 -!- Guest10647 has quit [Ping timeout: 264 seconds] 12:41:48 -!- ZiBuDo has joined ##crawl-dev 12:49:09 -!- Pacra_ has joined ##crawl-dev 12:53:38 -!- Floodkiller has joined ##crawl-dev 12:57:08 -!- ZiBuDo has quit [Ping timeout: 252 seconds] 13:00:09 -!- omarax has quit [Remote host closed the connection] 13:00:28 -!- saty has quit [Ping timeout: 258 seconds] 13:03:33 -!- flappity has quit [Ping timeout: 258 seconds] 13:08:47 -!- laj1 has quit [Ping timeout: 245 seconds] 13:11:43 -!- johlstei has joined ##crawl-dev 13:21:37 -!- Lasty has quit [Quit: Leaving.] 13:26:42 -!- Mandevil has quit [Ping timeout: 245 seconds] 13:51:39 -!- ProzacElf has joined ##crawl-dev 14:00:02 -!- omarax has quit [Remote host closed the connection] 14:05:49 -!- Uhlv has quit [Ping timeout: 260 seconds] 14:14:55 -!- purge has joined ##crawl-dev 14:19:44 -!- amalloy_ is now known as amalloy 14:21:11 -!- Kellhus has quit [Quit: Page closed] 14:25:52 -!- coledot has joined ##crawl-dev 14:30:05 -!- zxc has quit [Read error: Connection reset by peer] 14:32:38 -!- Kalir has quit [Changing host] 14:39:01 -!- valrus has quit [Ping timeout: 264 seconds] 14:49:13 -!- mizu_no_oto has quit [Ping timeout: 264 seconds] 14:51:23 I can't seem to find Oka's abilities under godabil, are they located elsewhere? 14:52:48 <|amethyst> Floodkiller: they're directly inside _do_ability in ability.cc 14:52:56 -!- Lasty has joined ##crawl-dev 14:53:13 <|amethyst> Floodkiller: though that just messages and increments the relevant durations 14:55:00 <|amethyst> Floodkiller: the actual effects of those durations happen in player::skill() in player.cc (Heroism) and player::attack_delay() in player-act.cc (Finesse) 14:55:22 okay, thanks 14:57:11 ah, that's why heroism and crosstraining were going over max while ash wasn't 14:57:30 because player::skill uses a hard 27 instead of MAX_SKILL_LEVEL 15:00:02 -!- omarax has quit [Remote host closed the connection] 15:04:29 -!- bgiannan has joined ##crawl-dev 15:08:11 -!- Kalir has quit [Quit: I'M OUT SON. PEACE, LOVE, EXPLOSIONS.] 15:10:17 -!- Angani has quit [Client Quit] 15:10:27 -!- bgiannan1 has joined ##crawl-dev 15:13:06 -!- bgiannan has quit [Ping timeout: 258 seconds] 15:20:05 -!- Idolo has quit [] 15:20:54 -!- bgiannan has joined ##crawl-dev 15:23:47 -!- bgiannan1 has quit [Ping timeout: 245 seconds] 15:26:19 -!- Pleasingfungus has joined ##crawl-dev 15:26:34 -!- bonghitz has quit [Remote host closed the connection] 15:27:48 -!- Zeor has quit [Ping timeout: 248 seconds] 15:28:55 03PleasingFungus02 07* 0.20-a0-430-gbd41281: Fix some hardcoded 27s (Floodkiller) 10(25 seconds ago, 1 file, 3+ 3-) 13https://github.com/crawl/crawl/commit/bd41281c08dd 15:29:17 removing 27s...the horror 15:29:52 I see, moving them to cpp 15:30:15 ? 15:30:55 moving them to a macro 15:31:10 technically, not a macro either :P 15:31:19 but i get you 15:31:27 oh really? 15:31:32 static const int 15:31:48 ah, indeed! 15:32:12 interesting, wasn't really aware that we had all-caps things like that that weren't macros 15:32:19 -!- bgiannan1 has joined ##crawl-dev 15:32:21 we use them for some constants as wel 15:33:06 heh, not sure about which we have 15:33:14 const int AGILITY_BONUS = 5; 15:33:14 #define TORNADO_RADIUS 5 15:35:19 s/which/why; maybe there's a good reason for one vs the other 15:35:39 <|amethyst> I don't think there much reason to use macros for that 15:35:39 -!- bgiannan has quit [Ping timeout: 265 seconds] 15:39:32 -!- ontoclasm has joined ##crawl-dev 15:42:00 -!- Marvin is now known as Guest73100 15:44:39 -!- kogasa has quit [Quit: Leaving] 16:00:02 -!- omarax has quit [Remote host closed the connection] 16:02:03 alright, species is now functioning as intended, time to give it some test runs 16:02:21 seems like a real DOG of a concept 16:02:23 to me 16:02:26 ha ha ha ha do you get the joke. 16:02:37 I know it's a ruff draft, but please be kind 16:02:48 all right. i'll throw you a bone, just this once 16:05:28 -!- Kalir has quit [Changing host] 16:09:16 Unstable branch on crawl.jorgrun.rocks updated to: 0.20-a0-430-gbd41281 (34) 16:10:13 -!- minmay has quit [Ping timeout: 264 seconds] 16:11:04 -!- Blazinghand has joined ##crawl-dev 16:11:18 -!- minqmay has quit [Ping timeout: 268 seconds] 16:17:14 -!- coledot has quit [Quit: coledot] 16:20:31 -!- Pleasingfungus has quit [Ping timeout: 245 seconds] 16:27:34 -!- Tuxedo[Qyou] has quit [Read error: Connection reset by peer] 16:31:41 -!- bonghitz has quit [Ping timeout: 246 seconds] 16:32:28 -!- Pleasingfungus has joined ##crawl-dev 16:33:12 -!- destroythecore has quit [Remote host closed the connection] 16:35:58 dogs? are we going to just implement animal farm? 16:36:02 complete with a an in-game portal to 1984 16:36:16 actually maybe there were no dogs in animal farm, it's been a while since I read it 16:36:45 there are, apparently, nine dogs 16:40:36 the dogs were the metaphor for the secret police 16:41:28 what are your dogs a metaphor for. 16:42:10 -!- Uhlv has quit [Ping timeout: 260 seconds] 16:43:35 -!- destroythecore has quit [Ping timeout: 246 seconds] 16:44:53 a plateau 16:46:21 is there a reason why offline crawl only has 5 rest a single turn (it does so whether num lock is on or off)? 16:47:18 are you using numpad 5 or number row 5. have you tried using the other one. 16:47:32 numpad 5 16:47:45 I'll try the other shortly, but it will be very dumb if that is how it works :( 16:48:11 it is :( 16:48:23 haha 16:48:34 i can't say i've ever tried to use numpad 5 to rest, myself 16:48:57 That Being Said, it does seem to be mapped by default to rest 16:49:05 judging by cmd-keys.h 16:49:09 so it sounds like something somewhere is busted 16:52:19 <|amethyst> Floodkiller: console or tiles? 16:52:26 tiles 16:54:08 -!- Guest73100 has quit [Remote host closed the connection] 16:55:49 <|amethyst> Hm, looks intentional: {CK_CLEAR, CMD_WAIT} 16:56:06 -!- Pleasingfungus has quit [Quit: ChatZilla 0.9.93 [Firefox 50.1.0/20161208153507]] 16:58:04 <|amethyst> it rests with shift or ctrl 16:58:35 <|amethyst> the key help (??) claims that it does both :( 16:59:39 <|amethyst> well, I guess it states that it rests, but implies in the diagram that it does the same thing as . 16:59:49 <|amethyst> also, it claims Del waits a turn, but it does not 16:59:57 -!- minmay has joined ##crawl-dev 16:59:57 -!- minmay has left ##crawl-dev 16:59:57 -!- minmay has joined ##crawl-dev 17:00:01 -!- omarax has quit [Remote host closed the connection] 17:01:30 -!- CanOfWorms has joined ##crawl-dev 17:01:43 got a very good quote from 4ch: 17:01:43 CanOfWorms: You have 1 message. Use !messages to read it. 17:01:44 "Shatter has relatively good affinity and enhancer staff, but OoFs are flying." 17:01:46 !messages 17:01:46 (1/1) gammafunk said (1h 33m 37s ago): You're a bit new, so heads up that your approach to resolving conflict in GDD threads isn't going to work 17:02:07 deng 17:03:51 -!- hurdos has quit [Quit: Leaving.] 17:03:53 -!- Daekdroom has quit [Ping timeout: 246 seconds] 17:09:28 -!- ontoclasm has quit [Quit: Leaving.] 17:10:10 -!- puissantveil has quit [Ping timeout: 260 seconds] 17:10:51 -!- adelrune has quit [Quit: Leaving] 17:11:42 -!- debo has quit [Ping timeout: 245 seconds] 17:16:49 -!- MarvinPA has quit [Read error: Connection reset by peer] 17:20:28 -!- WalrusKing has quit [Read error: Connection reset by peer] 17:21:45 -!- MarvinPA has joined ##crawl-dev 17:22:53 -!- Kranix has quit [Quit: Konversation terminated!] 17:23:43 speaking from years of experience, it rarely works when orange names call out people 17:24:18 usually gives the OP (or likely someone else) all the justification they think they need for a Personal Grudge 17:24:21 (tm) 17:25:32 -!- Bammboo has quit [Remote host closed the connection] 17:26:20 <|amethyst> !lm * recent zig.exit~~27 s=god 17:26:21 1811 milestones for * (recent zig.exit~~27): 729x Vehumet, 444x Makhleb, 186x Gozag, 97x Qazlal, 82x Cheibriados, 59x Sif Muna, 46x The Shining One, 42x Uskayaw, 32x Zin, 17x Pakellas, 15x Ru, 15x Ashenzari, 10x Dithmenos, 9x Hepliaklqana, 7x, 4x Trog, 4x Okawaru, 3x Xom, 3x Nemelex Xobeh, 2x Wudzu, 2x Lugonu, Beogh, Elyvilon, Kikubaaqudgha 17:26:51 recent isn't good enough for wandless zig queries, it goes all the way back to 0.18 17:27:09 !lm * v=0.20.0-a0 zig.exit~~27 s=god 17:27:10 200 milestones for * (v=0.20.0-a0 zig.exit~~27): 111x Vehumet, 34x Makhleb, 19x Qazlal, 13x Cheibriados, 10x Gozag, 3x The Shining One, 3x Zin, Nemelex Xobeh, Trog, Hepliaklqana, Uskayaw, , Ashenzari, Sif Muna 17:29:44 gammafunk: I'll keep that bit of info in mind in the future 17:30:10 yeah it's nbd, no one has complained or anything, just letting you know who these things often play out 17:30:14 *how 17:30:16 -!- Crushmydreams has quit [] 17:30:40 I mean, it will be great when there's that first anti-canofworms rant on 4chan, I guess 17:30:53 there's been one before 17:31:03 about tiles being terrible? 17:31:12 yes 17:31:32 maybe you can work on being the subject of a copypasta next 17:31:41 maybe... 17:31:50 I have not even achieved that illustrious milestone, to my knowledge... 17:31:57 if we're ever removing digging I will lead the charge 17:32:14 start writing the commit message now 17:32:18 you want it to be quotable 17:32:57 -!- bonghitz has quit [Ping timeout: 245 seconds] 17:33:17 dont listen to gammafunk your gdd posts are easily the 2nd best after mine 17:33:26 "Digging....yes, the opening up of a space...of a wall....yet what is wall, in the end?" 17:33:49 I think I should mix up the attributes a bit to differentiate from human a bit 17:34:09 maybe 7/7/10? 17:34:10 I'm pretty sure minmay has claimed that at least three different people are his favorite tavern posters 17:34:18 oh floodkiller: doing the math it seems like +5 apt and 12 max skill will make the race hit max skills fairly often 17:34:24 <|amethyst> Floodkiller: you also need to fix the plural :P 17:34:34 if my math is right it's roughly equivalent to getting 4 Hu skills to 20 17:36:09 CanOfWorms: I might lower it to +4 apt, but the main gimmick is that they should train fast, hit the ceiling fast, so aptitudes should remain high and flat across the board imo 17:36:26 |amethyst: any recommendations? I used Cynii because I was tired 17:36:52 <|amethyst> "Cynos" maybe? 17:36:53 yeah, it's just pretty fast 17:37:08 -!- Patashu has joined ##crawl-dev 17:37:27 +4 should still be fine then if +5 is considered too fast 17:37:28 <|amethyst> if you wanted to go Greek, it would be Kyon / Kynes 17:37:48 A CyBe will likely max all usable skills (fighting/one weapon/one ranged/armour/dodging/shield/evo) by like, a rune or something 17:37:58 er, add stealth to that too 17:39:25 yeah the amount of skill points to max all those skills out is roughly like 20.5 skill at 0 apt 17:40:24 what would the skill points look like at +4? I'm thinking a CyBe should probably max out somewhere before their third rune, but first rune does seem a bit soon 17:41:32 that's about 21.5 skill at 0 apt:v 17:41:33 |amethyst: I might go with 'Cynos', I like how Cy rolls off the tounge for combo names compared to Ky 17:41:40 -!- Patashu has quit [Ping timeout: 248 seconds] 17:42:13 but then we'll never be able to add cyborgs 17:42:15 at +2 it's ~24.8ish at 0 apt 17:44:29 I think +2 is probably a reasonable apt, it's not like there's any flat +2 apt species and maxing every skill is roughly getting 3 0 apt skills to 27 17:45:13 if it goes down to +2, I probably would want to give them +10% HP to compensate 17:45:33 they currently end at 197 at 0% HP 17:45:39 03MarvinPA02 07* 0.20-a0-431-g8301ae9: Show a message indicating remaining stones when casting Sandblast 10(3 minutes ago, 1 file, 6+ 1-) 13https://github.com/crawl/crawl/commit/8301ae94a5d5 17:45:44 -!- Marvin is now known as Guest57138 17:46:24 maybe give them a rank of robust / +mp % at some XL? 17:47:41 the aptitude difference isn't really noticeable until you actually hit the 12 skill cap since that's where the HP deficit is going to kick in 17:48:39 -!- bgiannan1 has quit [Ping timeout: 252 seconds] 17:48:44 -!- ontoclasm has joined ##crawl-dev 17:49:55 !makewords Cy 17:50:03 CyAE CyAK CyAM CyAr CyAs CyBe CyCK CyCj CyEE CyEn CyFE CyFi CyGl CyHu CyIE CyMo CyNe CySk CySu CyTm CyVM CyWn CyWr CyWz 17:50:18 CyC (j) 17:50:22 03MarvinPA02 07* 0.20-a0-432-g25cc1b4: Make Sandblast respect the !D inscription 10(2 minutes ago, 1 file, 3+ 1-) 13https://github.com/crawl/crawl/commit/25cc1b48226d 17:50:34 dang 17:50:37 I do also want them to capture the idea of very quickly transitioning to anything they find, so I'll see how quickly I transition into a spell school when I find a book this game 17:50:41 if the species started with Ty 17:50:44 we'd have 17:50:46 TyVM 17:51:00 I'm not sure how well +2 handles that 17:51:02 we'd remove poison magic TyVM 17:52:29 cyborgs??? 17:52:39 tyborgs. 17:52:53 that's not a word!! 17:53:36 okay, weapon skill is almost maxed by D:4, that is definitely too fast 17:53:45 nice! 17:53:57 praise ogres... 17:54:04 or merfolk, I guess 17:54:47 I'll drop it to +3 for now and recompile to test again 17:55:48 Floodkiller: what's this 17:56:36 -!- osune has quit [Ping timeout: 248 seconds] 17:56:41 -!- mizu_no_oto has quit [Quit: Computer has gone to sleep.] 17:57:04 ontoclasm: Cyno, a species with a very high flat aptitude, but with a max skill cap of 12 instead of 27 17:57:12 hm 17:58:06 odd, but okay 17:59:58 -!- debo has joined ##crawl-dev 18:00:02 -!- omarax has quit [Remote host closed the connection] 18:00:09 La are still waiting ~~ 18:01:01 they probably don't build anymore 18:01:06 tragically 18:01:33 hmm 18:01:35 I wonder 18:01:46 12 invocations might be too low to use some god poewrs 18:02:19 anh, i think you can -use- them all 18:02:20 intentional, like how they also most likely won't be able to use some of the higher level spells 18:02:21 not reliably, sure 18:02:28 -!- Patashu has joined ##crawl-dev 18:02:48 like enter the abyss at 12 invo is... i dunno, probaly like a 20-30% chance? 18:02:59 and yeah, 12 should work for mostly everything at an unreliable rate 18:03:15 maybe not grand finale for usk? 18:03:34 dunno about step from time, that's maybe the most invo-hungry thing 18:03:45 nah that's just 12 invo 18:03:47 to get like 10% 18:03:51 maybe sub 10%? 18:04:14 Unstable branch on underhound.eu updated to: 0.20-a0-432-g25cc1b4 (34) 18:05:15 14 might be a better max for this 18:05:41 14 is mindelay for several weapons i think 18:05:45 it will allow L6 and make L7 iffy and L8 very hard 18:05:46 like... demon blades? 18:06:01 ??demon blade 18:06:01 demon blade[1/2]: (long blades; -1 acc / 12 dam / 1.3 base delay / 0.6 min delay). A terrible weapon, forged in the fires of Hell. Can be {bless}ed into a {eudemon blade}. 18:06:02 I think I gave it 12 because the original OP gave it 12 to match Lorekeeper 3 18:06:05 ??lajatang 18:06:05 lajatang[1/2]: (staves; -3 acc / 16 dam / 1.4 base delay / 0.7 min delay; two handed). A very rare and extremely effective imported weapon, featuring a pole with half-moon blades at both ends. Lajatangs chop hydra heads. 18:06:11 but I can change it to 14 if that makes more sense 18:06:12 -!- debo has quit [Ping timeout: 248 seconds] 18:06:13 wow, a species designed 18:06:16 about tournament banners 18:06:20 now I've truly heard it all 18:06:24 yep 18:06:26 that's it! close up shop everyone! 18:06:30 crawl is done! 18:06:39 we'll just lower the banner to 11 18:06:47 beginning the skill cap arms race... 18:07:02 what's the lowest ever recorded 18:07:14 !lg * won min=skill 18:07:15 51616. tripitaka the Sky Mage (L27 HEAE of Sif Muna), escaped with the Orb and 4 runes on 2007-02-07 18:30:25, with 1566579 points after 132851 turns and 20:05:56. 18:07:16 well there's an xl9 win 18:07:16 just ban cy like fo is banned for shafting 18:07:25 !lg * won min=skill -log 18:07:28 51616. tripitaka, XL27 HEAE, T:132851: http://crawl.akrasiac.org/rawdata/tripitaka/morgue-tripitaka-20070207-1330.txt 18:07:29 also note that the banner does allow you to go all the way to 12.9 18:07:46 oh, i'm searching the wrong field 18:07:55 !lg * won x=min(skill) 18:07:56 51616 games for * (won): min(sk)=Air Magic 18:07:58 is it like... maxskill or soemthing? 18:08:00 yeah it's 18:08:05 there's another field for the level of the skill 18:08:12 i don't remember what it's called 18:08:16 sklev 18:08:17 ??lg 18:08:17 listgame[1/5]: !lg command displays info about past games. The manual is available here: https://github.com/crawl/sequell/blob/master/docs/listgame.md 18:08:25 !lg * won min=sklev x=skill,sklev 18:08:27 51616. [sk=Spellcasting;sklev=7] dis the Magician (L25 TrWz of Cheibriados), escaped with the Orb and 3 runes on 2015-10-30 12:10:30, with 1640881 points after 68686 turns and 5:24:41. 18:08:49 !lg * won min=sklev x=skill,sklev log 18:08:50 51616. dis, XL25 TrWz, T:68686: http://lazy-life.ddo.jp:8080/morgue/dis/morgue-dis-20151030-121030.txt 18:08:55 wow, lld 18:08:59 deng 18:09:07 haha 18:09:14 I guess that was possible because of tr's apts... 18:09:15 Unstable branch on crawl.jorgrun.rocks updated to: 0.20-a0-432-g25cc1b4 (34) 18:09:17 this person planned this well 18:09:21 all those 7.9s 18:09:41 amn and really close on some enabled skills 18:09:55 *man 18:10:10 feels like one orb guardian kill away from failure 18:10:21 -!- Guest57138 has quit [Read error: Connection reset by peer] 18:10:31 !lg * won min=sklev x=skill,sklev -ttyrec 18:10:37 51616. dis, XL25 TrWz, T:68686: http://lazy-life.ddo.jp/mirror/ttyrecs/dis/ 2015-10-29.08:32:51.ttyrec.bz2 2015-10-29.09:00:55.ttyrec.bz2 2015-10-30.00:52:40.ttyrec.bz2 2015-10-30.01:09:45.ttyrec.bz2 2015-10-30.01:29:00.ttyrec.bz2 2015-10-30.02:23:43.ttyrec.bz2 2015-10-30.02:27:40.ttyrec.bz2 2015-10-30.05:13:35.ttyrec.bz2 2015-10-30.06:21:35.ttyrec.bz2 2015-10-30.07:49:53.ttyrec.bz2 2015-10-30.08:... 18:10:48 oh, guess I should pm that query 18:11:56 CanOfWorms has some ttyrec watching to do 18:12:08 ...but can he decipher the glyphs?! 18:13:16 but he has 8.8 slings!!!! 18:13:21 (after crosstraining) 18:13:38 thankfully it doesn't count 18:13:47 this person knew what they were doing! 18:13:54 68258 | D:12 | Killed Faurixat the pandemonium lord 18:13:56 heh 18:14:33 notable, to Cy 18:14:41 this guy had statue form castable at 12% 18:14:49 cheistats 18:14:54 yep 18:15:09 also I can't view this ttyrec in my players because of the SHIFT-JIS... 18:15:19 horribly warping the view 18:15:50 wonder if tv can handle the raw power of 7.9 skill 18:16:13 are you using jettyplay? 18:16:18 yeah 18:16:25 hrm 18:16:31 hmm, looks like tv can'nt handle it either 18:16:36 ttyrec appears corrupted 18:16:48 that's a shame 18:19:52 yeah, I'll just change it to 14 because I like how it is half (rounded up) of 27, and I'll change it back if it turns out to be too easy 18:22:02 13.5! 18:23:02 it's on an int currently, so I would have to check to see if that breaks any comparisons first and I'm too lazy for that at the moment 18:23:30 -!- mizu_no_oto has quit [Quit: Computer has gone to sleep.] 18:29:09 I can't tell if this complaint about removal of wands of slowing is legitimate or taking the piss 18:31:05 I would hope taking the piss, because wands of slowing were only used if I had nothing better to do 18:31:55 -!- osune` has quit [Remote host closed the connection] 18:32:03 yeah, slowing wands were really bad if you had absolutely nothing else to use 18:32:11 *except if 18:32:39 it's basically a lesser wand of haste in 1v1s 18:32:40 :v 18:32:53 except haste doesn't check MR 18:33:03 hence the "lesser" 18:33:18 you usually get one before lair so it's like getting a discount wand of hasting for it :v 18:33:52 but yeah, not a terribly exciting wand effect 18:35:00 -!- Patashu has quit [Ping timeout: 248 seconds] 18:35:12 -!- bonghitz has quit [Ping timeout: 260 seconds] 18:35:48 -!- coledot has joined ##crawl-dev 18:38:36 -!- Ququman has quit [Read error: Connection reset by peer] 18:44:56 yeah people underused slow 18:48:33 -!- Pacra_ has quit [Ping timeout: 268 seconds] 18:51:23 -!- mizu_no_oto has quit [Quit: Computer has gone to sleep.] 18:57:11 -!- Harudoku has quit [Ping timeout: 268 seconds] 19:00:01 -!- omarax has quit [Remote host closed the connection] 19:04:20 -!- Doesnty has joined ##crawl-dev 19:07:46 it's hard to test how badly the skill cap affects the species in the lategame if I keep dying to adders :\ 19:09:17 -!- Kalir has quit [Quit: I'M OUT SON. PEACE, LOVE, EXPLOSIONS.] 19:14:31 play in wizmode. let the cheating flow through you 19:14:57 *explore mode 19:15:43 hrm 19:15:50 CanOfWorms: I guess lightning rods don't have a tile 19:16:03 can't we use one of the old rod tiles? 19:16:10 -!- gehennas has quit [Ping timeout: 260 seconds] 19:16:13 but I imagine an old rod tile could be repurposed, yeah 19:17:02 Sigmund the Dreaded comes into view. He is wielding a scythe of distortion. 19:17:06 yep, time to just cheat instead 19:17:07 niiiiiice 19:20:16 i didn't end up just moving a rod tile over since previously rods all had little icon overlays, and i assume misc items don't work that way 19:21:19 the overlays are separate from the item itself, though so it should be fine to just use a tile 19:21:38 I should rerun objstat with all these changes 19:21:39 rod06 actually looks pretty good for a lightning rod, maybe recoloured 19:21:48 that or 08 19:21:48 but maybe I should wait another week 19:21:52 !source rod06.png 19:21:53 https://github.com/crawl/crawl/blob/master/crawl-ref/source/rltiles/item/rod/rod06.png 19:21:55 !source rod08.png 19:21:56 https://github.com/crawl/crawl/blob/master/crawl-ref/source/rltiles/item/rod/rod08.png 19:22:12 oh, another thing that maybe could use tiles is fancy sparkly zigfig variations, since console has those now (but it's very much just silliness so v. low importance) 19:22:16 rod08 is cute 19:23:11 yeah, would be cool; current tile is very notable already, at least 19:23:11 in console that's more helpful 19:23:34 that meaning the ETC color 19:24:24 speaking of ETC colour, a thought that popped into my mind 19:24:52 is it possible to dynamically define an ETC colour? 19:25:14 how do you mean dynamically 19:25:17 I'm thinking about mutant beasts, since they conveniently have two facets that are colour coded 19:25:27 ETC_DISJUNCTION is based on player's location 19:25:47 instead of generating 30 ETC constants for ETC colour, figure out the ETC colour for a mutant beast based on its base tpye 19:26:12 sounds vaguely like it would be possible 19:26:59 although maybe there's not support for things other than location-based colours 19:29:00 -!- Barfbag has quit [Ping timeout: 260 seconds] 19:30:06 -!- Gorgo has quit [Quit: Page closed] 19:31:49 -!- Kellhus has quit [Quit: Page closed] 19:37:02 <|amethyst> yeah, you'd have to do something like look up the monster at a specified position 19:37:07 man, that reminds me i tried a while ago to refactor things to use an actual Colour class instead of just passing ints around 19:37:09 <|amethyst> and be careful not to leak information 19:38:56 it'd still be a good change, but it was apparently hard for reasons i don't remember, or i'd have finished :P 19:39:36 -!- Kalir has quit [Changing host] 19:43:47 Unintended coding interaction between death channel and AOE spells 13https://crawl.develz.org/mantis/view.php?id=10870 by Quatzecoatl 19:47:29 -!- puissantveil has quit [Quit: Page closed] 19:47:43 yeah there's a lot of passing around color as ints, probably 19:48:24 last time I had to deal with that extensively, it was an adventure 19:51:01 was that for the mooooon? 19:52:23 -!- Pleasingfungus has joined ##crawl-dev 19:52:58 -!- Zeor1 has quit [Ping timeout: 245 seconds] 19:54:18 wand of scattershot, eh? 19:56:11 no, it was for mon-info color and vault-defined color and player color settings stuff 20:00:02 -!- omarax has quit [Remote host closed the connection] 20:11:20 -!- dondy has quit [Ping timeout: 258 seconds] 20:17:46 just so I don't accidentally spam the crawl git while merging trunk into the species branch, head is where I'm pulling from and base is what I'm pushing to, correct? 20:18:10 er, what command are you thinking of running? 20:18:45 I was using the GUI on github, but if you have a better method I'll use that instead 20:19:20 head is not where you pull from, HEAD is what you currently have checked out 20:19:57 if you're using the gui on github, I image it's having you use a fork repo from your account 20:20:36 yes 20:20:39 not sure if it will have you use master in this repo or a branch 20:21:09 it will let you do either but you should use a branch 20:21:11 but in either case the official crawl repo will be the remote you pull from for changes to crawl you want to incorporate 20:21:14 yeah 20:21:25 because if you use master, you can't do anything else with it until the PR is closed or merged 20:21:40 and for pulling from us (official crawl repo), you pull from the master branch 20:21:42 it's already set up in a branch on my own fork 20:21:47 that's good 20:22:41 not sure what you meant by "spam the crawl git" 20:23:02 if you're making a PR, then yeah once that's open all those changes will come into the irc channel 20:23:23 I think if it's a merge commit, it will only be the merge commit itself though? 20:23:30 last time I attempted to update my fork's master to current, I accidentally pushed my fork's master to crawl instead 20:23:43 you can't push your fork's master to crawl 20:23:48 you don't have commit access 20:24:01 what you can do is make changes in your branch that will show up in this channel *if* there's an open pull request 20:24:02 I know, but I still sent the irc bots into a tiff until I deleted it 20:24:11 right, but that's not pushing your fork's master to crawl 20:24:32 that's simply updating your branch, and the PR is tracking your branch, and shows the changes in irc 20:24:44 important to understand that this is what's happening 20:25:00 if you like, don't make a PR 20:25:10 until you're sure the branch is somewhere remotely close to being accepted 20:25:38 but otherwise when that PR is open, the irc message will just happen, and that's the way it's supposed to work 20:25:41 -!- puissantveil has quit [Client Quit] 20:25:47 <|amethyst> well 20:25:56 <|amethyst> if you do something like rebase master on top of your branch 20:26:09 <|amethyst> that would create a lot of spam 20:26:12 yes 20:26:14 <|amethyst> and is not the way it's supposed to work 20:26:24 I mean, true, but that's the way PRs work 20:26:30 <|amethyst> I think Floodkiller is trying to avoid doing that 20:26:47 if he does a merge, won't it also create spam? if it only shows the merge, that's better 20:27:09 <|amethyst> chei doesn't show branch commits that are already in master 20:27:12 |amethyst: however I was trying to clarify to Floodkiller that he's not pushing anything to crawl 20:28:07 yeah, that's good, so Floodkiller can just not use rebase and only do merges, which will minimize spam 20:28:18 maybe I'm wording this weirdly, so OI want to do this on Floodkiller/Cyno fork to update it to match crawl/master 20:28:23 https://github.com/crawl/crawl/commit/76ffe66682dd48b1b6287808f680533c1bc78eb7 20:28:53 what is the command I'm looking for if using the github GUI may create more spam than intended (or any spam at all)? 20:29:21 yeah, I'm not super sure how the github website GUI has you do a merge 20:29:52 but that's what you want to do for your branch, have it merge master from crawl/crawl (the official repo) with a merge commit 20:30:09 |amethyst can correct me if there's some specific thing that needs to be done 20:30:22 <|amethyst> I don't know anything about the web UI 20:30:24 if you switched to use e.g. msys2 or otherwise use the command line 20:30:28 it would be easier for us to help you 20:30:37 Floodkiller: are you on windows? can you use msys2? 20:30:44 using msys2, yes 20:30:46 that would be better long-term for a branch like this 20:30:51 Floodkiller: ok, so you can just use the command line 20:31:06 you will want to clone your fork repo 20:31:12 check out your branch 20:31:22 and then add the official repo as a remote 20:31:40 git clone 20:31:56 where url is the url to your fork repo and desdir is which subdir you would like it to go to 20:32:08 -!- Patashu has joined ##crawl-dev 20:32:11 got the clone and checkout already performed 20:32:13 and for the url you need the right git url 20:32:19 how do I add the remote? 20:32:53 git remote add upstream https://github.com/crawl/crawl.git 20:32:59 the remote will be called upstream 20:33:06 you can also use origin or any other name you like 20:33:21 then to get the changes from this remote 20:33:33 git fetch upstream (or git fetch origin, depending on the name you used) 20:33:57 this will give you all the refs from our repo, but not change anything in your repo 20:34:02 from there you can do a merge 20:34:08 git merge upstream/master 20:34:15 (or git merge origin/master) 20:34:45 so / will always refer to that specific branch on that specific remote 20:34:57 and you update that remote with git fetch 20:35:19 then you push any commits (mergers or any other) with git push 20:35:31 which should push to your fork repo by default (and to the same branch you have checked out) 20:35:48 s/mergers/merges/ 20:36:35 alright, I've got a conflict which I expected, what's the command to resolve that? 20:37:02 git status shows you the files with conflicts 20:37:29 you have to edit the file and then use git add to stage the changes, then git commit to finish the merge commit 20:37:39 there's a command to help look at conflicts, I forget what 20:37:43 I usually directly edit them 20:37:50 -!- Zeor has quit [Ping timeout: 256 seconds] 20:39:58 <|amethyst> git mergetool 20:40:33 I should try using that 20:41:34 <|amethyst> it depends on having a third-party merge resolution program, but you probably have at least vimdiff 20:42:19 yeah, I do 20:43:05 alright, thanks for the help 20:51:03 -!- flappity has quit [Read error: Connection reset by peer] 20:54:25 -!- mizu_no_oto has quit [Quit: Computer has gone to sleep.] 20:56:01 -!- flappity has quit [Client Quit] 20:57:53 -!- MarvinPA has quit [Quit: Leaving] 21:00:02 -!- omarax has quit [Remote host closed the connection] 21:06:23 -!- Blazinghand has quit [Quit: This computer has gone to sleep] 21:07:00 -!- CanOfWorms has quit [Quit: ChatZilla 0.9.92 [Firefox 3.6.28/20120306064154]] 21:19:50 -!- puissantveil has quit [Ping timeout: 260 seconds] 21:32:04 -!- lupus83 has quit [Ping timeout: 248 seconds] 21:34:25 -!- puissantveil_ has quit [Ping timeout: 260 seconds] 21:41:25 at work I use Beyond Compare as my mergetool 21:41:30 it's pretty nifty 21:41:52 but yea, vimdiff 4 lyf on terminal-only (like cbro) 21:42:26 I'm not sure how successful I'd be doing a manual conflict resolution without a mergetool 21:43:15 johnstein: you just search for the conflict lines 21:43:28 and choose the lines you want 21:45:01 isn't there HEAD garbage in there or something> 21:45:02 ? 21:45:07 or is that part of the editing? 21:47:33 <|amethyst> yeah, generally you end up deleting one side or the other of the ======= 21:48:54 <|amethyst> and the <<<<<<< and >>>>>>> lines of course 21:51:04 yeah the lines just are indicators of the conflict 21:53:40 -!- frd has quit [Quit: leaving] 21:56:05 -!- dondy1 is now known as dondy 22:00:02 -!- omarax has quit [Remote host closed the connection] 22:04:06 -!- Boatshow has quit [Quit: Leaving] 22:16:29 -!- WalkerBoh has joined ##crawl-dev 22:18:36 -!- tksquared has quit [Ping timeout: 258 seconds] 22:31:43 -!- Jarlyk2 has quit [Quit: Page closed] 22:32:01 -!- tksquared has quit [Ping timeout: 258 seconds] 22:41:59 -!- tksquared has quit [Ping timeout: 258 seconds] 22:43:21 -!- hellmonk has joined ##crawl-dev 22:51:32 -!- rossi has quit [Ping timeout: 268 seconds] 22:52:21 -!- bonghitz has quit [Remote host closed the connection] 22:52:25 -!- Lasty has quit [Quit: Leaving.] 22:54:41 -!- flappity_ has quit [Ping timeout: 260 seconds] 23:00:02 -!- omarax has quit [Remote host closed the connection] 23:09:55 -!- grisha5 has quit [Quit: Page closed] 23:13:58 -!- WalkerBoh has quit [Remote host closed the connection] 23:22:44 -!- saty has quit [Ping timeout: 256 seconds] 23:26:55 -!- Sose has quit [Ping timeout: 265 seconds] 23:27:11 !gamesby * frog 23:27:12 * (frog) has played 228 games, between 2016-12-28 23:36:09 and 2017-01-02 03:34:40, won 2 (0.9%), high score 2298501, total score 5666788, total turns 1062192, play-time/day 9:58:26, total time 2d+11:50:40. 23:27:15 !lg * won 23:27:16 51624. grandjackal the Rhythm of Life and Death (L27 DsFi of Uskayaw), escaped with the Orb and 3 runes on 2017-01-02 03:51:22, with 1913828 points after 57835 turns and 2:32:40. 23:27:17 oops 23:27:19 !lg * won frog 23:27:20 2. ParticlePhysics the Hoplite (L27 FrFi of Hepliaklqana), escaped with the Orb and 3 runes on 2016-12-31 02:33:45, with 1736326 points after 74751 turns and 6:20:35. 23:27:27 mm, frog of hep 23:27:31 hop on, froggo 23:27:38 now all i need is to design my own background and FungusCrawl will be complete 23:27:46 uh 23:27:54 only dude who won is a particle physicist 23:27:59 FrPF^Hep, dead of Salt 23:28:00 other one is dynast 23:28:02 imagine 23:28:06 so back to the drawing board 23:28:18 are you saying that player deaths are bad 23:28:26 would that be Slug race? 23:28:36 if frog ends up being shitty enough I'll have to eat my words about not merging it 23:28:38 player deaths are good 23:28:59 we'd have to *allow* you to merge it 23:29:12 you'd have to join our dev membership league 23:29:15 v. exclusive 23:29:23 PF background is... Fungus Knight 23:29:31 jokes on you, I have over 300 russian hackers stealing your code as we speak 23:29:32 not Beetle Knight? 23:29:53 by 300 russian hackers you probably just mean jacquesderrida 23:29:58 he's not a hacker btw 23:30:01 fr: a fungoid race so that I can play fungoid chaos knight 23:30:10 what's the significance 23:30:14 o 23:30:16 i get it 23:30:28 heh 23:30:28 !makewords Fu 23:30:34 FuAE FuAK FuAM FuAr FuAs FuBe FuCK FuCj FuEE FuEn FuFE FuFi FuGl FuHu FuIE FuMo FuNe FuSk FuSu FuTm FuVM FuWn FuWr FuWz 23:30:36 FuRry 23:30:53 fuak 23:31:05 oh right you can just take it outright 23:31:08 w/chaos knight 23:31:21 also see the Co species 23:31:51 -!- Pleasingfungus has quit [Quit: ChatZilla 0.9.93 [Firefox 50.1.0/20161208153507]] 23:33:36 -!- Sose_ is now known as Sose 23:33:46 -!- laj1 has quit [Ping timeout: 258 seconds] 23:48:19 hey should abyssal knights be able to start with monsters visible when they get into the dungeon proper 23:48:55 'cause they can and looking at this entry vault a friend just pulled it could be very silly 23:50:01 is there any interest in adding a message log (ctrl+p) dump-to-file command? it could be helpful for debugging, using $EDITOR to search for a specific message, and what not 23:50:44 -!- debo has joined ##crawl-dev 23:53:03 -!- Tickenest has quit [Quit: Page closed] 23:53:15 -!- gehennas has quit [Ping timeout: 260 seconds] 23:57:12 i’m willing to code it up myself; i know C & have submitted PRs to crawl in the past