01:47:19 Numpad * doesn't work for shift-f command. 13https://crawl.develz.org/mantis/view.php?id=12641 by Yermak 01:54:20 -!- bgiannan1 is now known as bgiannan 02:19:24 Unstable branch on cbro.berotato.org updated to: 0.28-a0-313-gbc0475efdd (34) 03:29:03 Inconsistency: gargoyles can cast Wereblood but not Sublimation of Blood. 13https://crawl.develz.org/mantis/view.php?id=12642 by Yermak 06:22:26 Experimental (bcrawl) branch on underhound.eu updated to: 0.23-a0-4305-g797f4774c3 07:02:49 Yred doesn't animate dead when the corpse is in deep water 13https://crawl.develz.org/mantis/view.php?id=12643 by quik 07:18:20 -!- tiobot is now known as Guest8466 09:28:03 PleasingFungus, I heard you like lore theorizing. Thank whoever wrote this: http://crawl.chaosforge.org/Evil#Ambiguity_in_the_Crawl_notion_of_.27Evil.27 10:00:56 <10P​leasingFungus> haha 10:01:10 <10P​leasingFungus> that one is very old but funny, yep 10:01:19 <10P​leasingFungus> a classic 10:03:28 PleasingFungus, is there a way to spawn random creatures within a genus? I feel like the ratskin cloak being only able to generate one/two species of rats is kinda boring, and I know there's at least others... 10:04:05 <10P​leasingFungus> there aren’t others 10:04:32 Oh 10:04:34 Nevermind then 10:04:48 <10P​leasingFungus> rat, river rat, hell rat is all you get 10:05:05 Oh, I can add in plain rat then. 10:09:11 Just take all the "microbat" names and s/b/r/; 10:10:15 Good call 10:10:31 <10P​leasingFungus> please don’t add plain rats; they don’t do anything by the time someone’s likely to find the cloak 10:11:36 Oops, let me undo that 10:14:58 Fixed 10:15:59 <12e​bering> thinking about making all --Fi start with a buckler for 2 reasons: 1) delay nerf makes the kite shield maybe not good without training and 2) in the long run the kite shield is very good and be kept until the endgame reasonably 10:16:08 New branch created: pull/2102 (1 commit) 13https://github.com/crawl/crawl/pull/2102 10:16:08 03Perry Fraser02 07https://github.com/crawl/crawl/pull/2102 * 0.28-a0-314-g699ecf60d2: Don't allow ratskin cloak to spawn evil rats if you're good and unmark it as evil 10(5 minutes ago, 2 files, 5+ 2-) 13https://github.com/crawl/crawl/commit/699ecf60d234 10:16:57 <10P​leasingFungus> ebering: presumably not for large races :p 10:17:03 <10P​leasingFungus> sounds good otherwise 10:18:28 is this inspired by how new wanderer allocates equipment? 10:21:16 <12e​bering> no, just part of the "putting the back back in background" kick we're on 10:22:32 ah cool 10:23:06 it's a good kick! 10:34:30 that seems like a good change, the kite shield has always been in a slightly odd place but it's gotten even odder recently I think 10:37:18 PleasingFungus, you don't want Ignis to appear for any C glyphs, correct? 10:37:39 If so I think that's just this. 10:37:39 !source dungeon.cc:5753 10:37:39 https://github.com/crawl/crawl/blob/master/crawl-ref/source/dungeon.cc#L5753 10:38:27 -!- bgiannan2 is now known as bgiannan 10:38:46 <10P​leasingFungus> hm 10:38:54 <10P​leasingFungus> feels deduplicatable 10:39:07 <10P​leasingFungus> maybe? 10:39:31 Maybe, but that function is really only called when it spots a C glyph 10:39:44 <10P​leasingFungus> not what i meant 10:40:34 <10P​leasingFungus> should use temple_god_list() 10:40:47 oh, sorry. I need more coffee! 10:41:21 <10P​leasingFungus> no worries 10:42:00 Oh yup, I see what you mean. Looks like that'd... do exactly what it does now, so that works out quite nicely 10:42:35 <10P​leasingFungus> something like return *random_iterator(temple_god_list()) should work 10:59:14 Okay, this might be my C++ inexperience showing, but why the heck does "god = *random_iterator(temple_god_list());" not compile while auto template_god_list = temple_god_list(); god = *random_iterator(temple_god_list());" does? 10:59:14 The compilation error says that the candidate function (random_iterator) [with C = std::__1::vector] not viable: expects an l-value for 1st argument 11:03:36 <10P​leasingFungus> interesting 11:03:44 <10P​leasingFungus> there are people here who can answer that question, but they aren't me 11:04:28 Glad to know I'm not crazy for never having seen an error like that before. :P 11:05:08 If you pastebin a before/after and the error I'll ask some of the wizards I know 11:05:31 Sure 11:07:59 Pinkbeast, https://gist.github.com/perryprog/396594f0b3dee902ee67a1faa63bc5a2 11:08:54 Oops, I typo'd that—fixing 11:11:10 Updated gist with the code that actually compiles, I copy-pasted the wrong bit 11:11:48 Aha, this is less mysterious now, I think. 11:15:49 03Perry Fraser02 {PleasingFungus} 07* 0.28-a0-314-gdf715e3894: Fix dancing weapon death messages 10(5 days ago, 1 file, 11+ 20-) 13https://github.com/crawl/crawl/commit/df715e3894bd 11:19:05 PleasingFungus, yeah I didn't notice my commit messages were over 50 chars... I used to have my editor yell at me if it was, but I think it broke. I tend to be a bit overly verbose for them. 11:20:32 <10P​leasingFungus> being concise takes practice! 11:20:39 <10P​leasingFungus> it's much easier to be prolix than to be succinct 11:22:56 simcity (L27 OpCj) Crash caused by signal #6: Aborted (D:15) 11:25:49 <10P​leasingFungus> vaguely considering removing SIZE_BIG 11:32:24 perryprog: I think what is going on is that "auto random_iterator(C &container)" is call-by-reference, but there has to be something to take a reference _to_. temple_god_list() doesn't return a reference, but the variable temple_gods can serve as the thing to take the reference to. 11:36:19 perryprog: "Try: god = *random_iterator(temple_god_list)" 11:45:01 Unstable branch on crawl.kelbi.org updated to: 0.28-a0-314-gdf715e3894 (34) 11:45:42 I think in c++11 it's a bit weirder than that; random_iterator takes its argument by lvalue reference (it probably could be modified to not do that); the return of temple_god_list is a temporary object, aka an rvalue, and you can't implicitly "promote" an rvalue to a (non-const) lvalue 11:46:07 assigning an rvalue to a variable leads to an lvalue 11:46:32 I'm not sure I even understand why that's different to what I said :-( 11:47:41 One of the wizards has replied referencing https://en.cppreference.com/w/cpp/language/value_category and saying something which I also can't distinguish from either version above 11:47:52 it's not so much that it's a reference that is the problem, but that it's an rvalue reference 11:49:01 advil: Ah, I think the difference then is that I know 0 about rvalue references except what I've just read right now and so I think of "reference" as the same as "lvalue reference" 11:49:03 it actually looks like crawl compiles fine if random_iterator explicitly takes an argument of type `C &&container`, which is the syntax for an rvalue; though I believe there may be some magic applied to rvalue types in template deduction 11:49:33 sorry, that's the syntax for an rvalue *reference* 11:49:45 "i thiiiink this all goes back to C being unable to take the address of things which didn't have a name" 12:14:49 -!- spicyCebolla is now known as spicycat 12:15:07 -!- spicycat is now known as spicycebolla 12:25:25 the distinction is still pretty murky to me also despite my attempts at an explanation 12:26:37 the tldr as I understand it is that if an object has an rvalue constructor / assignment operator (which stdlib containers do), then you can have functions return regular objects of the relevant type without worrying about it much 12:26:56 and safely assume that no extraneous copies will be made 12:28:15 <10P​leasingFungus> there was a brief moment in this comment when i thought i understood 12:28:17 <10P​leasingFungus> sadly, i was wrong 12:38:17 Pinkbeast I guess I should also add that if "reference" == `&` to you then I think that is at least right for explicit type signatures, though implicit lvalue to rvalue conversion works 12:50:41 Ah, I was right—for some reason my warnings for git commit messages got disabled. 13:02:42 New branch created: pull/2103 (1 commit) 13https://github.com/crawl/crawl/pull/2103 13:02:42 03Perry Fraser02 07https://github.com/crawl/crawl/pull/2103 * 0.28-a0-314-g43056ddca6: Have C-glyph altars use temple_god_list() 10(4 minutes ago, 1 file, 3+ 6-) 13https://github.com/crawl/crawl/commit/43056ddca659 13:07:11 Unstable branch on crawl.akrasiac.org updated to: 0.28-a0-314-gdf715e3 (34) 13:42:38 <12e​bering> @gammafunk deleting the boring beast tiles instead of moving them into unused 13:42:38 <12e​bering> now I cant recolour the porcuipine tile to be a crystal echidna easily! 13:45:55 <09g​ammafunk> well you can find the commit that removed said tiles pretty easilly if you git log on rltiles with a grep 13:46:10 <09g​ammafunk> but I think the idea with removal was to put those tiles in the rtiles repo 13:46:40 <12e​bering> yeah it was not so difficult to find them 14:07:21 <09h​ellmonk> Just use a very small Knuckles sprite 14:12:02 sceptre of asmodeus always says "You don't feel so good about this..." ... which is flavorful I guess, but probably misleading 14:12:13 seems removable? 14:23:37 <05k​ate> i think it's to indicate that they'll turn hostile eventually 14:24:15 oh, hm 14:24:57 maybe something like " It is friendly, for now..." instead 14:25:49 <05k​ate> could reword it to be more explicit yeah, it does say they'll only be temporarily friendly in the description too 14:26:20 even knowing that about the sceptre I was still guessing that this was something to do with its evilness 14:28:35 Could be something like "a foreboding feeling falls over you" to imply Bad Stuff will happen, but after a delay 14:28:41 But even that feels vague 14:37:04 Is there a way to force Ru mutations, or choice thereof, in the debug menu that I'm missing? 14:41:41 Eh nevermind, I'll hard code in something 14:50:41 03PleasingFungus02 07* 0.28-a0-315-g98b9f98406: Fix monster cactus giant display 10(25 seconds ago, 4 files, 16+ 3-) 13https://github.com/crawl/crawl/commit/98b9f98406f0 14:50:59 I usually just reroll god gifts with `&-` until I get what I'm looking for 14:51:09 for ru 14:52:56 hm, if the staff of dispater had a % hp cost instead of an absolute one, what would it be 14:53:06 maybe 15% to match ABIL_DAMNATION? 14:54:21 03PleasingFungus02 07* 0.28-a0-316-gd86dc11844: Bump SCG to L6 (ardl) 10(54 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/d86dc11844df 14:54:34 although that's substantially steeper at high hp, I wonder if it really needs the MP cost too 14:58:58 <10P​leasingFungus> advil: what did ogres ever do to you?! 15:14:32 <12e​bering> @PleasingFungus ty for the github review! 15:16:44 <10P​leasingFungus> np! 15:19:02 <12e​bering> clan ABCDEF has done some pretty thorough playtests which is really nice of them 15:19:18 <12e​bering> seems like the numbers are in the right place (big) but not so big to be complete murder 15:19:26 <12e​bering> after some tweaks, that is 15:22:11 huh, staff of olgreb's evoc-based fail rate is very odd 15:22:39 success is x_chance_in_y(you.skill(SK_EVOCATIONS, 100) + 100, 600) 15:22:56 which maxes out at evoc skill 5? 15:23:41 that seems extremely token 15:23:45 <12e​bering> lol 15:23:52 <10P​leasingFungus> i appreciate and respect our players 15:24:07 <10P​leasingFungus> we have some dedicated and helpful testers 15:24:10 <10P​leasingFungus> that’s nice! 15:24:18 I suppose this is why I didn't even realize until now that olgreb *had* a fail rate 15:30:39 <09h​ellmonk> Olgreb's toxic game mechanic 15:35:26 the context seems to be that it had a two-tier evoc check when it could also cast venom bolt, where the skill required for venom bolt was much higher 15:40:13 Unstable branch on crawl.kelbi.org updated to: 0.28-a0-316-gd86dc11844 (34) 15:40:37 PleasingFungus, do you want the love sacrifice to also prevent rats spawning, or do you want that to actually spawn but hate the player as part of Ru's flavour? 15:42:27 <10P​leasingFungus> no strong opinion 15:43:00 03ebering02 07[hot-hells] * 0.28-a0-317-g2cdd048f3a: refactor: abstract corrosion to a method 10(3 weeks ago, 7 files, 19+ 7-) 13https://github.com/crawl/crawl/commit/2cdd048f3a1f 15:43:00 03ebering02 07[hot-hells] * 0.28-a0-318-g2819e4aa1a: feat: persistent hell effects: rust dis 10(3 weeks ago, 5 files, 13+ 3-) 13https://github.com/crawl/crawl/commit/2819e4aa1a47 15:43:00 03ebering02 07[hot-hells] * 0.28-a0-319-gceeb2121f7: feat: persistent hell effects: freeze cocytus solid 10(3 weeks ago, 5 files, 19+ 3-) 13https://github.com/crawl/crawl/commit/ceeb2121f746 15:43:00 03ebering02 07[hot-hells] * 0.28-a0-320-g48dee2ad1a: feat: persistent hell effects: fill gehenna with acrid smoke 10(3 weeks ago, 5 files, 9+ 4-) 13https://github.com/crawl/crawl/commit/48dee2ad1a40 15:43:00 03ebering02 07[hot-hells] * 0.28-a0-321-gb3f54eca4d: feat: persistent hell effects: rot tartarus (Lici) 10(3 weeks ago, 5 files, 18+ 5-) 13https://github.com/crawl/crawl/commit/b3f54eca4da5 15:43:00 03ebering02 07[hot-hells] * 0.28-a0-322-ge16064cd97: feat: shift timed hell effects to do more strategic damage 10(3 weeks ago, 1 file, 13+ 126-) 13https://github.com/crawl/crawl/commit/e16064cd97da 15:43:00 03ebering02 07[hot-hells] * 0.28-a0-323-g6306e4f60f: refactor: move padded_bounds to a layout library 10(3 weeks ago, 4 files, 21+ 30-) 13https://github.com/crawl/crawl/commit/6306e4f60f6b 15:43:00 03ebering02 07[hot-hells] * 0.28-a0-324-g5e8eadf6e3: fix: resolve a todo in zonify mapping 10(2 weeks ago, 1 file, 10+ 6-) 13https://github.com/crawl/crawl/commit/5e8eadf6e318 15:43:00 03ebering02 07[hot-hells] * 0.28-a0-325-gacd2472e51: feat: separate builder_bounds and max_bounds 10(2 weeks ago, 4 files, 28+ 5-) 13https://github.com/crawl/crawl/commit/acd2472e51e2 15:43:00 03ebering02 07[hot-hells] * 0.28-a0-326-g25322fe2b5: feat: shrink Hell subbranches on floors 1-6 10(2 weeks ago, 15 files, 85+ 68-) 13https://github.com/crawl/crawl/commit/25322fe2b5e8 15:43:00 ... and 36 more commits 15:43:03 Branch pull/2064 updated to be equal with hot-hells: 13https://github.com/crawl/crawl/pull/2064 15:44:08 I'll go with flavor—my thinking is that while Oka doesn't allow allies as a matter of honor, the sacrifice love jawn wouldn't cause Ru to prevent you from doing anything—they just change how your allies felt about you. Hopefully that makes sense. 15:44:39 <12e​bering> in general, clarity is a better goal than flavor 15:44:45 hmm 15:44:59 True. It would make the cloak inconsistent. 15:46:19 you better live in philly 15:46:29 or i'm gonna have to revoke jawn from your lexicawn 15:47:13 Yup, just north of philly 15:55:40 Er, serious request, what's a "jawn"? 15:57:54 It's like... any person, place, thing, item, concept, idea, manifestation that is being implicitly referred to. 15:57:59 It's a very good word. 15:58:06 Like "wossname"? 15:58:34 More like "thing" but better. 16:00:27 03Perry Fraser02 {PleasingFungus} 07* 0.28-a0-317-g21599a725c: Have C-glyph altars use temple_god_list() 10(3 hours ago, 1 file, 3+ 6-) 13https://github.com/crawl/crawl/commit/21599a725ce4 16:05:34 03Perry Fraser02 07https://github.com/crawl/crawl/pull/2102 * 0.28-a0-315-gef679e06b6: Stop rat cloak spawns if they would be forbidden 10(4 minutes ago, 2 files, 15+ 12-) 13https://github.com/crawl/crawl/commit/ef679e06b6f2 16:12:24 yeah it basically translates to noun but sounds better 16:12:43 from NY slang "joint", calling everything a joint, even if it's a handbag or a friend 16:29:22 Unstable branch on crawl.kelbi.org updated to: 0.28-a0-317-g21599a725c (34) 17:24:31 <09g​ammafunk> think you're going to keep the Will/2 Tar effect? Didn't seem like there were any obvious alternatives, but I haven't thought much about it either. Agree that control of what hexes are present in the branch and how frequent they are makes it not too scary. 17:29:56 <12e​bering> yeah, could add another hexer of some kind 17:31:00 <12e​bering> thinking about landing it in its current state then iterating on tar a bit in trunk 17:31:27 <12e​bering> with the vestibule and the vaultsmithing being follow up work as well 17:31:41 <09g​ammafunk> not unreasonable, it's somewhat difficult to test in exp branch since you need enough people to be patient enough to 15 rune 17:31:42 <08n​icolae> i was gonna ask about the vaultsmithing 17:32:04 <09g​ammafunk> anything high priority in particular? 17:32:10 <09g​ammafunk> I should check the PR, it's probably in there 17:32:30 <12e​bering> the vaults desires aren't broken out by sub-type 17:32:55 <12e​bering> but I think small decor 17:33:50 03ebering02 07[hot-hells] * 0.28-a0-363-gb13ec2d8ca: feat: don't place shafts in hell 10(2 hours ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/b13ec2d8caaa 17:33:53 Branch pull/2064 updated to be equal with hot-hells: 13https://github.com/crawl/crawl/pull/2064 17:33:54 <12e​bering> also vaults to take advantage of this commit 17:34:00 <12e​bering> offering shafts as "loot" 17:34:12 <08n​icolae> i have a lot of small ones but a lot of them have monsters 17:34:20 <12e​bering> also good 17:34:30 <08n​icolae> oh that's an interesting idea, i think i missed that commit 17:34:37 <12e​bering> well I just made it 17:34:47 <08n​icolae> oh it was two hours ago 17:34:49 <08n​icolae> yep 17:35:22 <12e​bering> just pushed it, rather 17:35:53 <08n​icolae> lootshafts... 17:36:15 <09g​ammafunk> yeah, can't put loot items save in the end maps 17:36:19 <09g​ammafunk> which all that have already 17:43:43 <08n​icolae> oh yeah, no loot items for me, but it does make it kind of difficult to make vaults, a lot of my vaults have a stairs in them just because otherwise it's hard to make a reason why a player would bother going through your vault 17:43:54 <12e​bering> yeah good 17:44:10 <12e​bering> "guarded stairs" is a good kind of vault for hells 17:44:53 <08n​icolae> i have a bunch of those and also some ambushes 17:45:45 <08n​icolae> also @gammafunk did you have any thoughts re: the desolation vaults i posted a while ago 17:59:28 03ebering02 07[hot-hells] * 0.28-a0-318-g79cbbdc86d: refactor: abstract corrosion to a method 10(3 weeks ago, 7 files, 19+ 7-) 13https://github.com/crawl/crawl/commit/79cbbdc86d29 17:59:28 03ebering02 07[hot-hells] * 0.28-a0-319-g49807740c2: feat: persistent hell effects: rust dis 10(3 weeks ago, 5 files, 13+ 3-) 13https://github.com/crawl/crawl/commit/49807740c26e 17:59:28 03ebering02 07[hot-hells] * 0.28-a0-320-g3d7a220799: feat: persistent hell effects: freeze cocytus solid 10(3 weeks ago, 5 files, 19+ 3-) 13https://github.com/crawl/crawl/commit/3d7a2207991f 17:59:28 03ebering02 07[hot-hells] * 0.28-a0-321-g6f13a9c4bf: feat: persistent hell effects: fill gehenna with acrid smoke 10(3 weeks ago, 5 files, 9+ 4-) 13https://github.com/crawl/crawl/commit/6f13a9c4bfd0 17:59:28 03ebering02 07[hot-hells] * 0.28-a0-322-ge744962671: feat: persistent hell effects: rot tartarus (Lici) 10(3 weeks ago, 5 files, 18+ 5-) 13https://github.com/crawl/crawl/commit/e744962671f9 17:59:28 03ebering02 07[hot-hells] * 0.28-a0-323-g43d0ba7266: feat: shift timed hell effects to do more strategic damage 10(3 weeks ago, 1 file, 13+ 126-) 13https://github.com/crawl/crawl/commit/43d0ba72665d 17:59:28 03ebering02 07[hot-hells] * 0.28-a0-324-gbc17ff6ebb: refactor: move padded_bounds to a layout library 10(3 weeks ago, 4 files, 21+ 30-) 13https://github.com/crawl/crawl/commit/bc17ff6ebb89 17:59:28 03ebering02 07[hot-hells] * 0.28-a0-325-g20ce1ca697: fix: resolve a todo in zonify mapping 10(3 weeks ago, 1 file, 10+ 6-) 13https://github.com/crawl/crawl/commit/20ce1ca697b8 17:59:28 03ebering02 07[hot-hells] * 0.28-a0-326-g9424aacb20: feat: separate builder_bounds and max_bounds 10(3 weeks ago, 4 files, 28+ 5-) 13https://github.com/crawl/crawl/commit/9424aacb2052 17:59:28 03ebering02 07[hot-hells] * 0.28-a0-327-g903cbe717e: feat: shrink Hell subbranches on floors 1-6 10(3 weeks ago, 15 files, 85+ 68-) 13https://github.com/crawl/crawl/commit/903cbe717e59 17:59:28 ... and 37 more commits 17:59:30 Branch pull/2064 updated to be equal with hot-hells: 13https://github.com/crawl/crawl/pull/2064 18:00:28 Branch master updated to be equal with hot-hells: 13https://github.com/crawl/crawl/tree/master 18:04:00 <12e​bering> I think we have enough tilesneeds that we should create a tracking issue for programmer art in the version that needs looking at or something 18:04:49 <09g​ammafunk> sorry haven't looked, will have more time later this week hopefully. You can certainly just merge them if you feel there's nothing too insane about them though. Otherwise I can assign the PR to myself so I remember to look over. 18:08:34 <10P​leasingFungus> good idea! 18:09:10 <08n​icolae> gammafunk saying i should decide for myself if my vaults are too insane... he's been replaced by some kind of pod person... 18:11:14 <08n​icolae> i guess my main question is re: this: https://github.com/crawl/crawl/blob/8c54c74d1a20711e33175f6b45c845cb522d88c4/crawl-ref/source/dat/des/portals/desolation.des#L1005 i included a wand of digging with just enough charges to get you inside, since i figured it would be too mean to cut a player off from a third of the level's loot just because floorgod had not smiled on them. but maybe that's okay 18:11:18 <09h​ellmonk> Adding an impostor vent vault that places a shaft and 20 glowing shapeshifters 18:14:23 <12e​bering> tag it no_pickup so it doesn't wander off, otherwise seems good to me 18:14:39 <12e​bering> (ru worshippers who sac'd artifice lose out on the loot rip them) 18:14:47 <08n​icolae> they knew what they were getting into 18:15:31 <12e​bering> but uh, don't put them undner the plants 18:15:33 <12e​bering> thats rude 18:16:02 <08n​icolae> pfffft, worked for link in the zelda games 18:16:20 <12e​bering> ??zelda rule 18:16:21 <04C​erebot> I don't have a page labeled zelda_rule in my learndb. 18:16:26 <12e​bering> well ill be 18:17:39 <08n​icolae> no zelda rule, that means it's okay 18:18:23 <08n​icolae> i get it's a little rude but it's like leaving a spare key on the front porch, you gotta at least put it under the mat or something 18:18:24 <09h​ellmonk> add a faces of evil encompass pls 18:19:32 <12e​bering> in this case theres a long running bug that makes noticing items under plants in nconsole hard so its a screw for visually impaired players 18:19:40 <12e​bering> so gonna go with "really no" 18:19:50 <08n​icolae> ah, that'll do it 18:20:59 <08n​icolae> question: what if i left out the digging wand entirely and if you don't have digging by then, rip 18:22:18 <12e​bering> for 1/3rd of the loot also no, it's a portal 18:22:25 03advil02 07* 0.28-a0-365-g3858e25e18: refactor: Convert Sceptre of Asmodeus evoke to an ability 10(4 hours ago, 4 files, 52+ 55-) 13https://github.com/crawl/crawl/commit/3858e25e18d0 18:22:25 03advil02 07* 0.28-a0-366-gb9327a18ab: refactor: convert staff of dispater evoke to an ability 10(3 hours ago, 4 files, 38+ 55-) 13https://github.com/crawl/crawl/commit/b9327a18abd1 18:22:25 03advil02 07* 0.28-a0-367-g31e2066950: refactor: converk staff of olgreb evoke to an ability 10(65 minutes ago, 5 files, 32+ 51-) 13https://github.com/crawl/crawl/commit/31e2066950ac 18:22:25 03advil02 07* 0.28-a0-368-g28a71e5310: fix: add ability descriptions for dispater/asmodeus 10(54 minutes ago, 1 file, 19+ 1-) 13https://github.com/crawl/crawl/commit/28a71e531065 18:22:25 03advil02 07* 0.28-a0-369-ge74157ce7a: refactor: remove CMD_EVOKE_WIELDED 10(10 minutes ago, 12 files, 27+ 333-) 13https://github.com/crawl/crawl/commit/e74157ce7a5c 18:22:28 <08n​icolae> that's what i figured 18:22:56 excited to see what that breaks 18:23:53 Unstable branch on underhound.eu updated to: 0.28-a0-317-g21599a725c (34) 18:33:37 <08n​icolae> this mf said converk 18:34:36 <08n​icolae> oh nice, hot-hells is in trunk 18:38:00 oops 18:39:34 I am dev, I converk things 18:40:35 03nicolae02 07[nicolae-saltation-0821] * 0.28-a0-131-g07b9868fe7: Change a miniruin subvault for better wand placement 10(42 seconds ago, 1 file, 7+ 7-) 13https://github.com/crawl/crawl/commit/07b9868fe703 18:40:37 Branch pull/2061 updated to be equal with nicolae-saltation-0821: 13https://github.com/crawl/crawl/pull/2061 18:52:34 Oh wow, exciting 18:53:26 03nicolae02 07* 0.28-a0-370-g3674f0abaf: Fix some subvault misconceptions in Desolation 10(3 weeks ago, 1 file, 0+ 55-) 13https://github.com/crawl/crawl/commit/3674f0abafbe 18:53:26 03nicolae02 07* 0.28-a0-371-g963f628cec: Rearrange the order of subvaults in Desolation 10(3 weeks ago, 1 file, 295+ 333-) 13https://github.com/crawl/crawl/commit/963f628cec57 18:53:26 03nicolae02 07* 0.28-a0-372-g4e71d33c19: Change the statue tiles used in Desolation 10(3 weeks ago, 1 file, 24+ 23-) 13https://github.com/crawl/crawl/commit/4e71d33c1976 18:53:26 03nicolae02 07* 0.28-a0-373-gc8992b3357: New entry vaults for Desolation 10(3 weeks ago, 1 file, 66+ 0-) 13https://github.com/crawl/crawl/commit/c8992b335737 18:53:26 03nicolae02 07* 0.28-a0-374-g8f02261bec: Add a handful of Desolation mini-ruin subvaults 10(3 weeks ago, 1 file, 129+ 5-) 13https://github.com/crawl/crawl/commit/8f02261bec69 18:53:26 03nicolae02 07* 0.28-a0-375-g5d38da674a: Two new encompass vaults for Desolation 10(3 weeks ago, 1 file, 147+ 0-) 13https://github.com/crawl/crawl/commit/5d38da674ab6 18:53:26 03nicolae02 07* 0.28-a0-376-gb29a9eb848: checkin the whites 10(3 weeks ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/b29a9eb8481a 18:53:26 03nicolae02 07* 0.28-a0-377-g46f4d3c346: Change a miniruin subvault for better wand placement 10(14 minutes ago, 1 file, 7+ 7-) 13https://github.com/crawl/crawl/commit/46f4d3c3461b 18:53:45 <08n​icolae> ah, balls, i forgot to rebase them into one 18:53:49 <08n​icolae> WELP, 18:54:24 <08n​icolae> do i need to undo that so it doesn't fuck up the commit history 19:03:45 <09g​ammafunk> well if you're ready to merge, one of us can rebase it for you 19:03:52 <09g​ammafunk> also you can force-push a squash/rebase 19:03:56 <09g​ammafunk> not sure if you know how to do those 19:05:54 <09g​ammafunk> rebase is when you take a set of commits and reapply them onto another commit (in this case current trunk), often while simultaneous editing them in some way (e.g. "squashing" a fix commit into a commit before it) 19:06:06 gammafunk, it's on master. 19:06:19 <08n​icolae> it is on master 19:06:31 <09g​ammafunk> do you know how to do rebases? 19:06:36 <08n​icolae> i clicked "rebase and merge", maybe i should have done "squash and merge" 19:06:53 <09g​ammafunk> yeah, that might have done, I've not used the github web tool for that 19:07:02 <09g​ammafunk> the squash tool might have worked well for you there 19:07:16 <09g​ammafunk> but as far as the commit history goes, don't worry about it 19:07:19 <08n​icolae> yeah, i tried doing a local rebase but it messed up for some reason, so i thought if i did the "rebase and merge" through the web gui it would do the same thing 19:07:26 <08n​icolae> it did: not do that 19:07:26 <09g​ammafunk> ah, yeah 19:07:41 <09g​ammafunk> indeed, it only does the traditional rebase, doesn't let you edit 19:07:50 <09g​ammafunk> I think squash might even put all the commits into one 19:07:56 <09g​ammafunk> it may not let you pick and choose 19:08:04 <09g​ammafunk> the github UI, I mean 19:08:15 <08n​icolae> i could Squash and Merge, or Rebase and Merge, but not both apparently 19:08:35 <09g​ammafunk> I think squash is usually used in the context of "all of them" so yeah probably that wouldn't have helped either 19:09:41 <09g​ammafunk> I'll have to try that one time and see, rebase -i does refer to individual commit squashes as well 19:10:11 <09g​ammafunk> @nicolae but no, to answer your question, if you leave in a commit that's a fixup, you don't have to do anything weird, that's just in the history now, and that's fine 19:10:43 <09g​ammafunk> we very very strongly avoid trying to force push trunk because it could break server rebuilds (and for other good reasons as well) 19:10:49 <08n​icolae> what is force push 19:10:54 <08n​icolae> besides that thing darth vader does 19:11:22 <09g​ammafunk> if you rebase, you're rewriting commit history 19:11:47 <09g​ammafunk> so if you tried to squash that commit in trunk, say, you'd have to force push to apply that rebase to trunk 19:12:05 <09g​ammafunk> it's fine to force push branches within reason (depends on how you're collaborating, it can be a pain for your branch collaborators) 19:12:24 <09g​ammafunk> but if you force push trunk, anyone working with trunk has to do some type of reset 19:12:41 <09g​ammafunk> this is true also if you force push a branch, those collaborators have to reset now 19:12:50 <09g​ammafunk> the difference is a lot of people/servers consuming trunk 19:13:04 <08n​icolae> i will push a commit to apologize 19:13:08 <08n​icolae> ||not really|| 19:13:08 <09g​ammafunk> excellent! 19:16:26 <08n​icolae> also, what is the lua version of a MARKER: statement, is it just marker("M = lua:fog_machine { fog machine bullshit goes here}") or is it something more esoteric due to the lua hook 19:17:59 Basically if you don't know why you should force push, don't :P 19:18:27 <09g​ammafunk> better to read and understand what a force push actually is 19:18:40 <09g​ammafunk> @nicolae lua_marker('N', props_marker{the_gamble_peril=1}) 19:18:46 <09g​ammafunk> so you want actual lua here 19:19:01 <09g​ammafunk> the first argument is a string with the marker name 19:19:07 <09g​ammafunk> the second argument is your marker lua 19:20:18 <09g​ammafunk> so don't put that lua in a string, it's just an argument you're passing 19:20:30 <09g​ammafunk> and the function you want is called lua_marker(), not marker() 19:51:16 Unstable branch on crawl.kelbi.org updated to: 0.28-a0-364-gb16ebcc8e8 (34) 21:19:04 03hellmonk02 07[greaterwanderer] * 0.28-a0-251-g22d1424562: fix: fixup Djwn and a few minor wn errors 10(2 minutes ago, 1 file, 22+ 13-) 13https://github.com/crawl/crawl/commit/22d1424562a9 21:19:04 03hellmonk02 07[greaterwanderer] * 0.28-a0-252-g78d344788f: checkwhite 10(69 seconds ago, 1 file, 7+ 7-) 13https://github.com/crawl/crawl/commit/78d344788fbd 21:19:07 Branch pull/2100 updated to be equal with greaterwanderer: 13https://github.com/crawl/crawl/pull/2100 21:23:54 Unstable branch on crawl.kelbi.org updated to: 0.28-a0-377-g46f4d3c346 (34) 21:38:02 04Build failed for 08greaterwanderer @ 78d34478 06https://github.com/crawl/crawl/actions/runs/1188382347 21:38:51 !kw vlong>=0.28-a0-364-gb16ebcc8e8 21:38:51 Expression: vlong>=0.28-a0-364-gb16ebcc8e8 => vlongnum>=2800001000364 21:39:09 !kw newhell vlong>=0.28-a0-364-gb16ebcc8e8 21:39:10 Defined keyword: newhell => vlong>=0.28-a0-364-gb16ebcc8e8 21:40:45 <09h​ellmonk> fixed the dj thing in the wn branch, should be fine to test 21:40:55 <09h​ellmonk> just need to unbrace at some point 21:47:02 <09g​ammafunk> k 22:00:43 03PleasingFungus02 07[well_done] * 0.28-a0-317-ga319f34e58: New spell: Scorch (L2 Fire) 10(2 days ago, 10 files, 143+ 4-) 13https://github.com/crawl/crawl/commit/a319f34e5890 22:00:43 03PleasingFungus02 07[well_done] * 0.28-a0-318-gb43a314259: Add Scorch to FE and CA 10(2 days ago, 1 file, 4+ 3-) 13https://github.com/crawl/crawl/commit/b43a314259ab 22:00:45 Branch pull/2098 updated to be equal with well_done: 13https://github.com/crawl/crawl/pull/2098 22:02:16 <09g​ammafunk> merge imminent?! 😱 22:03:56 <10P​leasingFungus> nope 22:03:58 <10P​leasingFungus> still waiting on ebering 22:04:03 <10P​leasingFungus> just rebasing so i can base flame wave on it 22:05:03 03hellmonk02 07[dexterswizlab] * 0.28-a0-338-gcdb9b377f6: fixes for wizlab_alistair 10(66 seconds ago, 1 file, 32+ 30-) 13https://github.com/crawl/crawl/commit/cdb9b377f6f5 22:05:05 Branch pull/2072 updated to be equal with dexterswizlab: 13https://github.com/crawl/crawl/pull/2072 22:30:32 New branch created: pull/2104 (1 commit) 13https://github.com/crawl/crawl/pull/2104 22:30:32 03mainiacjoe02 {GitHub} 07https://github.com/crawl/crawl/pull/2104 * 0.28-a0-378-gad18001e56: Add one vault to simple.des 10(26 minutes ago, 1 file, 27+ 0-) 13https://github.com/crawl/crawl/commit/ad18001e5615 22:46:50 03hellmonk02 07* 0.28-a0-378-g84fbe2c6ea: fix: don't spawn an oklob vault as often 10(2 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/84fbe2c6ea8c 23:04:05 03gammafunk02 07* 0.28-a0-379-gf8c7cfddd9: feat: Despoiler loot and monsters in a Lair ending 10(4 hours ago, 1 file, 13+ 12-) 13https://github.com/crawl/crawl/commit/f8c7cfddd967 23:15:59 Unstable branch on crawl.kelbi.org updated to: 0.28-a0-378-g84fbe2c6ea (34) 23:41:15 Unstable branch on crawl.kelbi.org updated to: 0.28-a0-379-gf8c7cfddd9 (34)