00:14:25 Unstable branch on cbro.berotato.org updated to: 0.33-a0-1035-g6494ea8a0c (34) 00:45:25 Monster database of master branch on crawl.develz.org updated to: 0.33-a0-1024-g4ee2c7fec9 01:07:56 <04dracoomega> I have decided to use a slightly more fine-grained approach to mutation categories for forms (via flags) so that a bunch of existing logic for physiology_mutation_conflict() can also be folded into it in a unified way. (For instance, at present, it is impossible to get Thin Skeletal Structure on characters with no bones, but you still keep it even in forms that have no bones - even though whether or not a form has bones is something 01:07:56 that was already obligatorily defined for ages.) And as I go through and clean up / convert some of this code over, I notice that demonspawn are ineligible to randomly mutate iridescent scales even if their 'scales' facet is something that isn't scales, but the reverse isn't true. ie: If they are scheduled to mutate, say, Icy Blue Scales, they can still mutate Sturdy Frame randomly, but if they are scheduled to mutate Sturdy Frame, they can't 01:07:57 randomly mutate Iridescent Scales. Is this logic necessary? (ie: can it just be 'only one actual scales scales mutation'?) 01:45:34 <04dracoomega> Sigh... naga can mutate a stinger on their tail, but never actually use it 01:46:02 <04dracoomega> (Since it enhances the tail slap aux they are specifically barred from performing) 03:18:19 -!- wvc8 is now known as wvc 04:33:04 Experimental (bcrawl) branch on underhound.eu updated to: 0.23-a0-5261-gd9800d219b 07:29:13 <08nicolae> they should be allowed to do tail slaps 07:36:57 03dolorous02 07* 0.33-a0-1036-gc616208095: Add another Donald line. 10(2 minutes ago, 1 file, 2+ 0-) 13https://github.com/crawl/crawl/commit/c6162080958f 12:28:26 <09hellmonk> gonna merge some stuff today 12:32:50 <12ge0ff> the monster XP code? 12:37:35 <09hellmonk> shopping stuff first 12:37:48 <09hellmonk> xp stuff needs some work for sprints iirc 12:39:12 <09hellmonk> going to merge some other prs as well 12:40:49 <12ge0ff> 62 inventory slots confirmed :kobold: 12:41:24 <09hellmonk> I thought somebody had a strong objection to that 12:43:11 <12ge0ff> more like an alternative idea, the one about "consumable" inventory(ies) 12:43:37 <09hellmonk> well either way, not touching that one without clear agreement from the other devs 12:44:18 <09hellmonk> if there are other prs that are controversial and don't have a comment pls tell me so I don't accidentally merge stuff and have to revert it later 13:05:21 <09hellmonk> hope this doesn't break anything 13:05:31 <09hellmonk> (I did test it briefly) 13:06:16 03Aliscans02 {GitHub} 07* 0.33-a0-1037-geff102fec0: Stop antique shops from overcharging. (#4222) 10(64 seconds ago, 1 file, 21+ 18-) 13https://github.com/crawl/crawl/commit/eff102fec055 13:14:53 <09hellmonk> anyone know anything about this esperanto translation pr? 14:10:40 <09hellmonk> @nicolae posted some comments on the lair decor pr 14:13:51 <08nicolae> i feel like the fact that plants wither makes it less annoying to have to cut through them 14:15:00 <08nicolae> anyway i will look at them again later 14:15:41 <09hellmonk> it's much less bad than it was in old versions, but it seemed like you could have to do it 4-5 times in a row to navigate some of the vaults 14:16:16 <09hellmonk> maybe it's not an issue, but I'm personally not a huge fan of it 14:17:51 03Hellmonk02 {GitHub} 07* 0.33-a0-1038-g2af1c82aae: Adjust evoker placement (#4270) 10(21 seconds ago, 1 file, 3+ 1-) 13https://github.com/crawl/crawl/commit/2af1c82aae26 15:00:13 03hellmonk02 07[shoppricing] * 0.33-a0-652-g816bcfe3b3: pull back slightly 10(3 minutes ago, 3 files, 14+ 14-) 13https://github.com/crawl/crawl/commit/816bcfe3b3cd 15:00:14 Branch pull/4269 updated to be equal with shoppricing: 13https://github.com/crawl/crawl/pull/4269 15:00:20 <09hellmonk> plan on merging the shop pricing changes tonight unless there are objections 15:02:50 <02Monkooky> hey so is there a way to grab a backup for someone who's not especially technically literate 15:03:33 <02Monkooky> someone's having some extremely wack behaviour going on, but I think they don't know how to ssh 15:08:56 <02Monkooky> Also a web interface for making save backups would be fantastic, the current method is frankly way too obnoxious 15:15:52 <08nicolae> what kinda changes are they 15:32:43 <09hellmonk> try to make weapon and armour prices more reflective of their usefulness, increase consumable pricing later in the game to make shop decisions more interesting 15:32:49 <09hellmonk> is it intended that attacking with arc blade near allies gives a separate prompt for every ally that could be hit 15:33:41 <06mumra> definitely doesn't sound intended or necessary 15:45:30 <06mumra> @cgettys Ohhhh, I got a build to work 16:02:03 dolemite99 (L20 MDFi) ASSERT(you.duration[DUR_BEOGH_SEEKING_VENGEANCE]) in 'god-companions.cc' at line 965 failed. (Depths:2) 16:04:27 dolemite99 (L20 MDFi) ERROR in 'god-companions.cc' at line 868: apostle something not found (Depths:2) 16:14:32 <06mumra> Sounds like the same apostle error that keeps popping up? 16:23:48 <09hellmonk> found a cool bug 16:24:15 <09hellmonk> manifold assault with devastator allows attacks when allies would be hit as long as the player isn't also adjacent 16:24:22 <06mumra> I've now got a wasm build of crawl. SDL is crashing in the browser with "not enough resources to create thread". But I can see in inspector that all art is getting loaded! Progress 16:24:24 <06mumra> https://cdn.discordapp.com/attachments/747522859361894521/1346261961955872820/image.png?ex=67c78ba8&is=67c63a28&hm=e59f09714254712f0cd415e844fe23278f7dd359ae19b6e40fff1b0ba3ed7d4a& 16:24:37 <09hellmonk> (I will fix this in a minute, going to merge the manifold assault with warning pr first) 16:30:53 <09gammafunk> no, console is currently the only way to make a save backup 16:38:58 Unstable branch on underhound.eu updated to: 0.33-a0-1038-g2af1c82aae (34) 16:40:03 <09hellmonk> (tbh I think we should prompt instead of exclude targets but that is possibly too annoying for stuff like devastator) 16:40:38 03WizardIke02 {GitHub} 07* 0.33-a0-1039-g935a399613: Allow manifold assault to be cast when it would warn (#3877) 10(68 seconds ago, 4 files, 93+ 38-) 13https://github.com/crawl/crawl/commit/935a39961321 16:50:32 03hellmonk02 07* 0.33-a0-1040-g20fab2804b: Fix manifold with devastator. 10(3 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/20fab2804b4d 18:14:48 03Hellmonk02 {GitHub} 07https://github.com/crawl/crawl/pull/4275 * 0.33-a0-1042-gd42b04b903: Merge branch 'master' into allow_manifold_with_arc_blade 10(65 seconds ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/d42b04b90382 18:21:19 03Hellmonk02 {GitHub} 07https://github.com/crawl/crawl/pull/4275 * 0.33-a0-1043-g6bb2c67e12: remove unused variable 10(9 seconds ago, 1 file, 0+ 1-) 13https://github.com/crawl/crawl/commit/6bb2c67e1221 18:23:31 03Hellmonk02 {GitHub} 07https://github.com/crawl/crawl/pull/4275 * 0.33-a0-1044-gec3810d4d5: fix fight.cc 10(12 seconds ago, 1 file, 2+ 2-) 13https://github.com/crawl/crawl/commit/ec3810d4d5e4 18:27:54 03Hellmonk02 {GitHub} 07https://github.com/crawl/crawl/pull/4275 * 0.33-a0-1045-ge4ef5e5320: properly make a function static 10(33 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/e4ef5e5320d9 18:55:55 <09hellmonk> would anyone like to weigh in on https://github.com/crawl/crawl/pull/3751 18:57:12 <09hellmonk> feels like this is either an easy merge or should be closed as won't do (w/ reason) 19:31:57 03WizardIke02 {GitHub} 07* 0.33-a0-1041-g49552807fa: Allow manifold assault with the Arc Blade (#4275) 10(68 seconds ago, 6 files, 51+ 27-) 13https://github.com/crawl/crawl/commit/49552807fa6d 19:31:59 <06pleasingfungus> feel like this comes up every year or two 19:32:01 <06pleasingfungus> re dgmo 19:32:25 <06pleasingfungus> my take last time it came up was that the iconic/defining part of mo is the extra piety, and mo without that is kind of goofy 19:32:46 <06pleasingfungus> https://discord.com/channels/735056636644687913/747522859361894521/1224741610747723787 ah, 11 months ago 19:32:48 <08nicolae> make a background that you can Only play as a demigod and it's the same starting kit as a monk but it's called something else 19:33:19 <08nicolae> "isn't that unnecessarily complicated" uh look over there 19:33:41 <06pleasingfungus> https://discord.com/channels/205277826788622337/205316046230388737/1131625993224851577 other server had a longer discussion a bit back 19:35:57 <06pleasingfungus> don't feel strongly about this but also not particularly exciteda bout it 19:46:02 03Hellmonk02 {GitHub} 07[shoppricing] * 0.33-a0-1047-gbffe90e6d2: Merge branch 'master' into shoppricing 10(10 seconds ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/bffe90e6d2e0 19:46:03 Branch pull/4269 updated to be equal with shoppricing: 13https://github.com/crawl/crawl/pull/4269 20:03:01 <09gammafunk> that's.... 20:03:06 <09gammafunk> quite a few commits, hellmonk 20:14:15 <02Monkooky> I was mostly wondering if a dev or admin could do the save backing up on someone else's saves 20:14:31 <02Monkooky> but they figured it out, so it's all good this time 20:26:29 <09hellmonk> merging gone wrong (gone sexual) 20:26:58 <09hellmonk> remind me: is this actually a problem or can I just squash it 20:57:41 New branch created: mrfortune (1 commit) 13https://github.com/crawl/crawl/tree/mrfortune 20:57:41 03hellmonk02 07[mrfortune] * 0.33-a0-1041-ge57ed13335: Rework robe of misfortune (again). 10(7 minutes ago, 3 files, 14+ 3-) 13https://github.com/crawl/crawl/commit/e57ed133350d 20:58:47 New branch created: pull/4347 (1 commit) 13https://github.com/crawl/crawl/pull/4347 20:58:47 Branch pull/4347 updated to be equal with mrfortune: 13https://github.com/crawl/crawl/pull/4347 21:05:20 03NormalPerson702 {GitHub} 07* 0.33-a0-1042-g0c0bac5df6: Prevent attacks of opportunity on dead felids (#4292) (#4319) 10(22 seconds ago, 1 file, 4+ 0-) 13https://github.com/crawl/crawl/commit/0c0bac5df6e4 21:07:33 03radio-gra02 {GitHub} 07* 0.33-a0-1043-g0f3e296413: Clarify options_guide.txt regarding player-defined dump sections (#4212) 10(40 seconds ago, 1 file, 16+ 2-) 13https://github.com/crawl/crawl/commit/0f3e296413eb 21:10:23 O.o quite the commit stream 21:10:49 Very cool @mumra, what was wrong? 21:16:35 <09hellmonk> unfortunately I don't know much about the build side so I don't think I can close any of your prs with confidence 21:18:40 No worries, I get it 21:18:49 A few of them I think might be safe enough, one minute... 21:19:10 should be safe, it doesn't break CI even if it fails and it's making it less broken than it is now 21:19:30 (and it's just a follow up to my prior PR that added this script in the first place) 21:19:58 doesn' 21:20:11 t have anything to do with the build as such, but I'm not sure anyone feels confident in it :D 21:20:35 And just adds some basic tests of the item logic 21:20:53 But I hear you 21:22:47 03Aliscans02 {GitHub} 07* 0.33-a0-1044-g908c38d9fd: Make auto-training train spell skills more readily for djinn. (#3930) 10(35 seconds ago, 3 files, 8+ 5-) 13https://github.com/crawl/crawl/commit/908c38d9fd36 21:23:46 Here's someone else's PR I think could be merged without too much controversy, it's a single line: 21:36:52 03tianmaster02 {GitHub} 07* 0.33-a0-1045-gf0a98eff6c: Fix: display correct monster tile in water 10(50 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/f0a98eff6c90 21:42:49 <09hellmonk> will do more later this week 21:43:40 I'd thumbs up emote, but I'm not part of the Discord party :D 21:44:36 There's also this one - I think the last iteration is still bugged, but I'm pretty sure the version I have in the comment is solid 21:45:44 Anyway, happy to go thru my PRs line by line via code review comments if it's helpful, just leave me comments and I'll reply to them :) If not no worries though, I know it's not like you're getting paid to review :D 21:46:02 I'll see if I can shake any new bugs out of master here in a bit :D 21:46:25 Thanks for merging more fun stuff for me to try to break / die horribly too 23:17:31 <06mumra> building sdl2 separately with emcmake / emmake and linking that in 23:18:30 <06mumra> and then making sure i wasn't linking sdl2 in twice was what seemed to do it 23:18:38 <04dracoomega> Hmm... that apostle crash looks like it may have to do with a friendly Rakshasa (instead of phantom mirror, which is fixed). Might be part of the wierdness about their cloning that tries to hide which is the original and which isn't (does that actually work on friendlies??) 23:20:41 <04dracoomega> Also: I am fairly ambivalent about the demigod monk thing, for what it's worth. It's a bit weird to allow them when the central gimmick doesn't work at all, but they do technically have a unique loadout, even without this. I guess like "I wouldn't object, but wasn't enthusiastic enough to do it myself" is sort of where I stand? 23:34:31 <06pleasingfungus> @hellmonk probably fixed it 23:35:32 03hellmonk02 {PleasingFungus} 07[shoppricing] * 0.33-a0-621-g421ece1b59: fix descent portal messages (again) 10(4 months ago, 1 file, 10+ 7-) 13https://github.com/crawl/crawl/commit/421ece1b5916 23:35:32 03hellmonk02 {PleasingFungus} 07[shoppricing] * 0.33-a0-622-gfc23b8a95b: Add extreme couponing 10(3 months ago, 17 files, 84+ 69-) 13https://github.com/crawl/crawl/commit/fc23b8a95b74 23:35:32 03hellmonk02 {PleasingFungus} 07[shoppricing] * 0.33-a0-623-gf1ac0e77eb: checkwhite 10(3 months ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/f1ac0e77eb55 23:35:32 03hellmonk02 {PleasingFungus} 07[shoppricing] * 0.33-a0-624-g6363244718: add vouchers to $ and typo fix 10(3 months ago, 2 files, 6+ 1-) 13https://github.com/crawl/crawl/commit/6363244718f6 23:35:32 03Aliscans02 {PleasingFungus} 07[shoppricing] * 0.33-a0-625-g7a68607386: Use article_a() instead of "a article" in a few places. 10(9 weeks ago, 9 files, 19+ 17-) 13https://github.com/crawl/crawl/commit/7a6860738697 23:35:32 03Aliscans02 {PleasingFungus} 07[shoppricing] * 0.33-a0-626-ge27af5cf57: Stop mortars from colliding with "a floor" and then being "destroyed!". 10(9 weeks ago, 1 file, 12+ 9-) 13https://github.com/crawl/crawl/commit/e27af5cf57dd 23:35:32 03Aliscans02 {PleasingFungus} 07[shoppricing] * 0.33-a0-627-g46926fb845: Update the default message_colour for two portal messages. 10(9 weeks ago, 1 file, 2+ 1-) 13https://github.com/crawl/crawl/commit/46926fb8456d 23:35:32 03Implojin02 {PleasingFungus} 07[shoppricing] * 0.33-a0-628-g51e5087311: Fix Uskayaw linepass confusion targets (klement) 10(9 weeks ago, 1 file, 1+ 0-) 13https://github.com/crawl/crawl/commit/51e5087311ee 23:35:32 03Aliscans02 {PleasingFungus} 07[shoppricing] * 0.33-a0-629-ga6e181c279: Fix the way the scroller works when a menu grows. 10(9 weeks ago, 1 file, 1+ 0-) 13https://github.com/crawl/crawl/commit/a6e181c2797b 23:35:32 03regret-index02 {PleasingFungus} 07[shoppricing] * 0.33-a0-630-g9c7ac81621: Update docs/develop/spells.txt for 0.33 10(9 weeks ago, 1 file, 63+ 19-) 13https://github.com/crawl/crawl/commit/9c7ac816214c 23:35:32 ... and 21 more commits 23:35:33 Branch pull/4269 updated to be equal with shoppricing: 13https://github.com/crawl/crawl/pull/4269 23:39:12 THat's a heck of a push :D 23:40:29 <04dracoomega> I still see 31 commits on that branch, which doesn't exactly seem squashed properly ^^; 23:41:37 <04dracoomega> (But honestly, it may be paranoia, but when merging any non-trivial PR, I usually check the branch out locally so I can verify whatever squashing/rebasing onto master looks right to me before pushing to master) 23:41:53 <04dracoomega> Since you can't undo it afterward if it isn't 23:42:15 I mean, my opinion doesn't matter since I'm not on the cor eteam 23:42:25 But if it were me, I would ban pushing to master entirely 23:42:34 force PRs for everything 23:43:38 Doesn't reduce what you can do in general, though yes if you merge something you revert instead of force pushing master, but when's the last time you force pushed master 23:44:14 And technically speaking, if you have a git repo which has the prior state, you can definitely undo 23:44:14 (even if yo don't there are ways 23:45:23 I mean, I get it 23:45:37 not having to wait for policies or click 3 more buttons to push master is nice and all 23:45:43 but would keep me up at night to work that way :D 23:48:19 How many times have you pushed to master, and then "oh whoops formatting/weird build flavor/whatever"? how much stress would waiting for green checkmark on PR save before merging your own PR? 23:48:23 You get my point 23:48:38 Or maybe you don't, but that's cool, whatever floats your guys' boats 23:48:46 It's just like, my opinion, maaaaaaaaaaaaaaaaaaaaaaaan