00:16:43 03kate-02 07* 0.27-a0-817-gf37df41: Fix tag_upgrade compilation 10(24 seconds ago, 1 file, 2+ 0-) 13https://github.com/crawl/crawl/commit/f37df414998b 00:18:01 <10P​leasingFungus> hm, vaguely wonder if we should just remove the blink icon now 00:18:24 <10P​leasingFungus> oh, probably it’s shared 00:18:25 <10P​leasingFungus> nvm 00:18:30 <05k​ate> i think evoke blink uses the same one, yeah 00:18:38 <10P​leasingFungus> lazy devs!!! 00:18:58 <05k​ate> there's definitely some inconsistency in which tiles stuff gets marked with TAG_MAJOR_VERSION and which just gets removed though 00:19:54 <10P​leasingFungus> rip 00:31:52 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-817-gf37df41499 (34) 00:33:30 04Build failed for 08master @ f37df414 06https://github.com/crawl/crawl/actions/runs/696622657 00:41:42 <05k​ate> oh nice, learnt a whole new way to break the build 00:41:54 <05k​ate> i didn't know that test existed 00:43:00 <05k​ate> also i guess it should already be broken for things like slow metabolism removal 00:49:54 <05k​ate> "-- TODO: better way to do this in lua so that it doesn't duplicate code" 00:50:26 <05k​ate> truly shocked to find that this is no longer accurate to the code it's supposed to be duplicating 01:10:09 03ebering02 07* 0.27-a0-818-g41e92d2: Restore the gnoll net equip rate 10(4 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/41e92d2c5544 01:16:56 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-818-g41e92d2c55 (34) 01:18:39 03kate-02 07* 0.27-a0-819-g058290f: Remove some obsolete mutation tests 10(10 minutes ago, 1 file, 2+ 16-) 13https://github.com/crawl/crawl/commit/058290f16d33 01:26:38 04Build failed for 08master @ 41e92d2c 06https://github.com/crawl/crawl/actions/runs/696721207 01:31:47 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-819-g058290f16d (34) 01:34:44 Unstable branch on crawl.develz.org updated to: 0.27-a0-819-g058290f16d (34) 01:56:11 Windows builds of master branch on crawl.develz.org updated to: 0.27-a0-819-g058290f16d 02:47:07 Unstable branch on cbro.berotato.org updated to: 0.27-a0-819-g058290f16d (34) 02:53:57 Monster database of master branch on crawl.develz.org updated to: 0.27-a0-819-g058290f16d 02:54:27 <13d​ue> @kate i remember giving up on the vaults rewrite in lua engine because of no continue statement 03:31:12 Fork (bcrawl) on crawl.kelbi.org updated to: 0.23-a0-4116-g4a9585b5cb 04:32:04 03ebering02 07* 0.27-a0-820-g1df3e3e: Bring back big slow Ogre hits 10(63 minutes ago, 1 file, 4+ 4-) 13https://github.com/crawl/crawl/commit/1df3e3e19a5e 04:32:04 03ebering02 07* 0.27-a0-821-g6f01079: Speed up scorpions 10(61 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/6f010793942d 04:32:04 03ebering02 07* 0.27-a0-822-g61718b2: Slow down Sif book gifts 10(49 minutes ago, 1 file, 2+ 1-) 13https://github.com/crawl/crawl/commit/61718b20ed5a 04:32:04 03ebering02 07* 0.27-a0-823-g0efe349: Swap Blade Hands and Hydra Form 10(29 minutes ago, 2 files, 5+ 5-) 13https://github.com/crawl/crawl/commit/0efe349d9943 04:33:07 <12e​bering> the last one of those might be a bit controversial 06:02:11 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-823-g0efe349d99 (34) 08:28:31 -!- amalloy is now known as amalloy_ 08:31:43 New branch created: pull/1856 (1 commit) 13https://github.com/crawl/crawl/pull/1856 08:31:43 03Aliscans02 07https://github.com/crawl/crawl/pull/1856 * 0.27-a0-824-ged2969c: Make acid walls "melt" icy monsters instead of burning them. 10(23 minutes ago, 1 file, 4+ 5-) 13https://github.com/crawl/crawl/commit/ed2969c85dfd 08:43:24 Branch pull/1856 updated to be equal with master: 13https://github.com/crawl/crawl/pull/1856 08:49:13 New branch created: pull/1857 (1 commit) 13https://github.com/crawl/crawl/pull/1857 08:49:13 03Aliscans02 07https://github.com/crawl/crawl/pull/1857 * 0.27-a0-824-ga3849dc: Make acid walls "melt" icy monsters instead of burning them. 10(8 minutes ago, 1 file, 4+ 7-) 13https://github.com/crawl/crawl/commit/a3849dc9ab3b 10:02:05 <10P​leasingFungus> @ebering i’m not sure you had to restore ogre damage 10:02:16 <10P​leasingFungus> remember their weapon damage also got buffed 10:02:28 <10P​leasingFungus> by effectively 3 base damage 10:03:50 <10P​leasingFungus> doing something about hydra form is good; not sure whether this is it but it’s worth a shot! 10:52:20 <12e​bering> Hm oops. Easy to tweak further, if the slowgre proves too lethal 10:56:22 <12e​bering> Anyway for my next project I will ruin the mailmap please send me your preferred avatars 10:56:26 <12e​bering> https://twitter.com/ryancdotorg/status/1375484757916672000?s=21 10:59:05 <10P​leasingFungus> !! 10:59:17 <10P​leasingFungus> my preferred avatar on is on the left 10:59:30 <10P​leasingFungus> <- 11:42:44 <05k​ate> i like the hydra form change too yeah, i was meaning to suggest the same thing except with just removing blade hands since it's pretty boring 11:43:04 <05k​ate> but swapping the levels seems good too 11:48:44 <10P​leasingFungus> imo blade hands is thematically pretty great 11:48:56 <10P​leasingFungus> so i’d be sad to lose it from that angle 11:50:30 <06a​dvil> yeah, not sure you're going to get widespread agreement with "boring" there 🙂 11:54:34 <05k​ate> that's fair yeah, i agree it's thematically cool, just not as mechanically interesting as the other forms with bigger downsides 12:00:06 <10P​leasingFungus> we now almost have a hint of ‘higher level forms meld fewer things 12:00:25 <10P​leasingFungus> bh 8form nmut at top 12:00:31 <10P​leasingFungus> dform the only exception 12:07:11 hail storm hits death channel ally on dying 13https://crawl.develz.org/mantis/view.php?id=12547 by sterra 12:08:11 <06a​dvil> haha it took me a while to come to agree with that simply because I forgot necromutation entirely 12:17:23 <10P​leasingFungus> it’s a pretty weak pattern 13:28:54 Unstable branch on crawl.akrasiac.org updated to: 0.27-a0-823-g0efe349 (34) 14:45:40 <08n​icolae> make some new forms to enhance the pattern 15:52:52 FR: double confirmation on hitting allies with Oka 16:01:39 <05k​ate> %git 62faa89a7e 16:01:39 <04C​erebot> RojjaCebolla {ebering} * 0.26-a0-200-g62faa89: Prevent draconians from getting armour troves (10 months ago, 1 file, 3+ 3-) https://github.com/crawl/crawl/commit/62faa89a7ed0 16:01:58 <05k​ate> this doesn't do the thing that it claims to do, and it also doesn't do the thing that i thought it was trying to do just from looking at the code 16:02:58 <05k​ate> if it did work i'm not sure that preventing armour troves on Dr is needed, it gives them a bunch of good stuff for all their aux slots, often acquirement-level? 16:04:16 <05k​ate> currently what it actually does is prevent <05k​ate> oh it does the other thing too but not consistently? very confusing 16:07:24 <10P​leasingFungus> nice 16:07:29 <05k​ate> i also think it's fine to ask dracs for enchanted dragon scales as a toll since that's mainly a toll of ?ea (plus kill a dragon somewhere maybe) 16:07:48 <10P​leasingFungus> depends how much ea dracs need 16:08:42 <05k​ate> less than a human in heavy armour i guess, but probably not less than eg a spriggan 16:08:59 <10P​leasingFungus> goal, possibly for 0.28: make attacks that would cause penance be prevented instead, as with tso’s stab conduct 16:09:09 <10P​leasingFungus> re yermak’s request 16:09:32 <10P​leasingFungus> this is sort of hard and maybe interacts weirdly w beams and explosions 16:09:38 <10P​leasingFungus> i just hate prompts 16:10:03 <10P​leasingFungus> and also there are weird issues w invisible enemies causing penance rn 16:10:53 <10P​leasingFungus> alternatively could remove more conducts 16:11:33 <05k​ate> to some extent it might be better to just get rid of those conducts yeah, or replace them with no-stabbing since that does work better 16:13:31 <05k​ate> no-stabbing would fit thematically for oka at least 16:20:55 03kate-02 07* 0.27-a0-824-gca8104f: Revert "Prevent draconians from getting armour troves" 10(16 minutes ago, 1 file, 3+ 3-) 13https://github.com/crawl/crawl/commit/ca8104f8d5cd 16:32:15 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-824-gca8104f8d5 (34) 16:34:03 Hello, I feel very close to my first pull request using the git command line. I have cloned the https:// version of crawl locally, set crawl/crawl.git as remote, edited my local overflow.des file, and made a commit with its message. But when I try "git push" I get, "remote: Permission to crawl/crawl.git denied to mainiacjoe" What ought I be doing differently as a non-dev? 16:36:36 <03w​heals> you need to make a fork of the crawl repo 16:36:42 The usual approach is to clone it on github, giving you a version on github you can push to 16:36:55 04Build failed for 08master @ ca8104f8 06https://github.com/crawl/crawl/actions/runs/699134635 16:37:55 <03w​heals> once you do that, you can use git remote set-url to switch the place you're pushing, from crawl/crawl (which only devs can push to) to your own fork 16:39:06 I do have a fork on github. Is that what I ought to set as remote? When I go there on github it says its a few thousand commits behind. I know how to refresh my local clone ("git pull") but not how to refresh my fork on github.com 16:39:06 https://github.com/mainiacjoe/crawl 16:39:29 yeah set it as a remote, then push to it, can use --force if no one is tracking/using your repo 16:39:55 github has some tutorials for this very common use case of wanting to send a PR upstream 16:40:56 I'm confident I'm the only one using my fork. 16:41:36 I apologize Pinkbeast, I have been doing my best and this process has been very frustrating for me. There is a big jargon gap to overcome. 16:41:47 <03w​heals> since it only has commits behind (meaning no merge conflicts), you should be able to simply push to that fork and it will match crawl/crawl (except for the new commit you made) 16:42:16 Don't apologise; no criticism meant. I don't mean "why have you not read the tutorials", I mean "they exist and that's where I'd start if I wanted to send vanilla a PR" 16:42:39 ... it's where I started last time but of course it's all escaped my head 16:42:54 <03w​heals> git has a very high learning curve 16:43:24 Quite, but I know you can cargo-cult your way through this particular problem 16:46:21 That is quite the word-picture. I spent a summer in Papua New Guinea and cargo cults are big there, though I was inland enough that they weren't pervasive 16:47:42 So I need to set my remote to my fork. I'll work on that presently 16:48:12 That you can probably do just by editing crawl/.git/config 16:51:57 I didn't know about that file. I did remove crawl/crawl as my upstream and replace it with mainiacjoe/crawl. But git push and git status are still calling crawl/crawl as master 16:54:10 I opened .git/config. remote "origin" is still set to crawl/crawl, so I suspect I need to change that to mainiacjoe/crawl 16:55:23 The other things with my username in it in that file are [branch "mainiacjoe"], [remote "mainiacjoe"] and [remote "upstream"] 17:03:13 I did it! My fork on github is now one commit ahead, one commit behind master. 17:06:15 That's all I can do at the moment. I'll look into this more tonight 17:06:33 oh damn I was typing some advice :-( 17:18:24 there's always !tell 17:33:51 <10P​leasingFungus> i still vaguely want to ban allies on oka entirely (‘lone warrior’), but think we’d need some compensatory buff and haven’t thought of a good one 17:37:28 -!- spicycebolla is now known as {[ama_rougelike] 17:37:28 -!- {[ama_rougelike] is now known as [droptable_rouge 17:38:03 -!- [droptable_rouge is now known as spicycebolla 17:39:32 do you have a plan for demonspawn that leak demonlets? 17:40:21 <05k​ate> steal legion commander's duel from dota as a capstone ability 17:40:50 <10P​leasingFungus> spicycebolla: their demonlets get suppressed 17:41:03 <05k​ate> (target a thing and then you fight until one of you dies and nobody else can affect the duelists) 17:41:08 <10P​leasingFungus> oh 17:41:19 <10P​leasingFungus> i’ve wanted to have that on a crawl god for ages 17:41:38 <10P​leasingFungus> i had a design for a no backtracking god with a similar effect 17:42:00 Give duel to Cerebov. 17:42:02 <05k​ate> in dota the winner also gets permanent bonus damage for each duel they win but probably that bit isn't necessary 17:43:20 <10P​leasingFungus> probably 17:43:20 <05k​ate> but yeah, not sure how good it'd actually be but it seems like a fun concept 17:43:20 -!- spicycebolla is now known as spicy_rougelike 17:43:22 <10P​leasingFungus> i want to be cast into a temp branch arena with spectators 17:43:31 <10P​leasingFungus> imps behind glass 17:43:57 -!- spicy_rougelike is now known as spicycebolla 17:46:00 doesn't luring already achieve 1v1 arenas :P 17:46:21 <03w​heals> new portal branch: the Kill Hole 17:47:36 also it should only work on uniques - or sapients? it's totally uncool to like, pull a turtle or a quokka or a jazz jackrabbit into a duel :P 17:49:43 <10P​leasingFungus> counterpoint: fighting lions 18:00:52 <06a​dvil> huh, console builds out of the box on M1 18:00:57 <06a​dvil> I guess the issues I've seen have been about sdl 18:01:17 <06a​dvil> wonder what the odds are seeds are stable 😅 18:03:33 <06a​dvil> ah rip libpng doesn't work 18:08:12 03kate-02 07* 0.27-a0-825-gdbc16e4: Fix randart flight property not granting flight (MarcB) 10(49 seconds ago, 1 file, 3+ 0-) 13https://github.com/crawl/crawl/commit/dbc16e4eb9d7 18:16:59 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-825-gdbc16e4eb9 (34) 18:23:33 Unstable branch on underhound.eu updated to: 0.27-a0-824-gca8104f8d5 (34) 19:02:45 03advil02 07* 0.27-a0-826-g08ebd16: libpng contrib: Force-disable neon optimizations on ARM (12407) 10(85 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/08ebd167ff82 19:16:51 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-826-g08ebd167ff (34) 19:35:52 03advil02 07* 0.27-a0-827-gbb90f61: sdl2 contrib: fix the build for ARM macs (12407) 10(2 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/bb90f61fe479 19:46:51 Unstable branch on crawl.kelbi.org updated to: 0.27-a0-827-gbb90f61fe4 (34) 19:49:37 Hello again. I've successfully created a commit on my fork of the changes to overflow.des. 19:49:54 I did find tutorials on how to create a pull request for upstream 19:50:28 The problem is, I have three commits, the one I want and two others from trying to figure this out 19:50:48 When I make the pull request, it compares to master and wants to send all three 19:51:10 I think I need to revert on my fork the two I don't want. 19:51:57 But I'm having a hard time doing it, and one of them is the draconian trove change that I somehow duplicated and am now co-author of on my fork. 19:54:25 "git revert " fails saying I have unmerged files 19:54:55 revert isn't really what you want; it makes a new commit that reverts a previous commit 19:55:51 tbh what I'd do in that situation is probably make a new branch, use `git cherry-pick` to get just the commit you want, and reset the branch you're working on (or maybe it's master) 19:56:15 are a branch and a fork the same thing? 19:58:07 What you are suggesting seems to be 1) make a clean copy of master 2) cherry-pick the one commit I want into the new copy from the bad copy 3) replace the bad copy with the good copy 19:58:31 no, a fork is a repository that is derived from another one, a branch is a change path within a repository 19:59:02 ok 19:59:04 yes, pretty much 19:59:56 though hm I'm not sure I can 100% tell you what commands to do from your exact state 19:59:56 are you working on master? 19:59:56 the branch (the "good copy") will it reside on github on locally on my machine? 20:00:48 I don't know whether I'm working on master 20:00:59 what does `git status` look like? 20:03:25 branches by default are only local, but can be pushed to github; they can also be deleted 20:04:03 It's scrolly. I'm on branch upstream. My brianch is behind master by one commit. I am currentyl cherry-picking commit Unmerged paths both modified .../overflow.des Changed not sgtaged for commit ...contrib/libpng (new commits) 20:05:46 I made a branch on github called overflows but it grabbed all three commits, the good and the two bad 20:06:03 huh 20:06:24 locally, git pull fails because of the unmerged file 20:06:59 here are relevant bit of .git/config 20:07:10 [remote "origin"] url = https://github.com/mainiacjoe/crawl fetch = +refs/heads/*:refs/remotes/origin/* 20:07:16 [branch "master"] remote = origin merge = refs/heads/master 20:07:27 [branch "mainiacjoe"] remote = origin merge = refs/heads/mainiacjoe 20:07:38 [remote "mainiacjoe"] url = https://github.com/mainiacjoe/crawl.git fetch = +refs/heads/*:refs/remotes/mainiacjoe/* 20:07:49 [remote "upstream"] url = https://github.com/crawl/crawl.git fetch = +refs/heads/*:refs/remotes/upstream/* [branch "upstream"] 20:07:58 [branch "upstream"] remote = upstream merge = refs/heads/master 20:08:56 I'm not sure where branch upstream comes from 20:09:10 I think upstream should my crawl/crawl and origin mainiacjoe/crawl 20:09:29 yes, I don't think it's usually structured as a branch though? 20:09:29 but brranch vs. remote confuses me 20:09:45 juse delete that item from config? 20:09:47 so I would abort the cherry-pick, and then use `git checkout -- ` to reset everything that is currently marked as a change 20:09:58 to be clear, you add filenames after the -- 20:10:30 so git checkout -- /overflow.des? 20:11:37 yes, that looks to me like it should have changes already committed 20:11:37 the libpng thing too 20:11:37 if you get back to the github repository state I can probably help better 20:13:05 Okay. And since the change is only a couple dozen lines I've saved from elsewhere, nuking my local and may even my github fork is an option 20:13:53 is there a command to abort the cherry-pick or is that simply describing the sort of action I need to do? 20:14:41 usually during a cherry-pick it should give you a way to abort somewhere in the output of `git status` 20:15:22 yep, I found it, thank you 20:15:29 Is it possible to disable ctrl-[ in game somehow? It aborts the game. 20:20:42 MainiacJoe heh did you reset the repo altogether? I was looking at it on github but now it's gone 20:21:06 yep. TBH I'm close to tears on this and just want to start over 20:21:30 sorry :-/ 20:21:56 just made a new fork. 20:22:11 one general piece of advice if you are starting over is to work on changes in a branch, and keep master synced with upstream 20:23:17 master is my fork, and upstream is crawl/crawl? 20:23:17 master is the name of the "main" branch of any given repository 20:23:31 so my fork is a repository, and crawl/crawl.git is a separate repository? 20:23:38 yes, that's right 20:24:33 so mainiacjoe's master is the part of my fork's repo that I want to keep updated with crawl/crawl's master 20:24:53 and when I make a branch, it also resides in my fork's repo? 20:24:56 yeah, usually if your aim is to contribute that's what you'd do 20:24:59 yes 20:25:23 do I make the branch locally from CLI or on github.com? 20:25:27 the easiest way to make a PR is from a branch off of master; to make a branch and switch to it you can do something like `git checkout -b overflow_testing` (which will branch from your current repository state) 20:25:29 locally 20:26:00 OK. why do I see 300 something branches listed on my fork's github page? 20:26:06 `git checkout master` before that command if you want to ensure you branch from master 20:26:15 it inherits the branch names from upstream by default 20:26:25 the repository has been around so long that there are a *lot* 20:26:59 some of them are for misc work, we also use branches with names like `stone_soup-0.26` for stable versions 20:27:15 ok. So my tasks seems to be: 1) figure out what "checkout" does. 2) make a branch locally 3) make my edits in that branch 20:27:56 Once I pass that hurdle, then I need to figure out how to push from the branch to my fork's master, then make a pull request from my fork to crawl/crawl 20:29:08 what you uwould do is push the local branch to a branch of the same name on github, rather than push to master 20:29:08 So make an "overflows" branch locally, and make an "overflows" branch on github 20:29:08 if you are on a new branch, and you type `git push`, it actually just gives you the command you need to make the branch on githhub 20:29:12 ok 20:29:33 thank you for your help. I'm going to get some dinner and see what progress I can make. 20:30:35 no problem, git is a pain to learn 20:32:02 I really appreciate your patience. And I'm really looking forward to contributing! 20:32:26 hm someone should update https://github.com/crawl/crawl/blob/master/crawl-ref/docs/develop/git/quickstart.txt, it has some useful info but also a lot of old stuff and no-longer-very-helpful comparisons to svn 20:33:37 It is very confusing TBH, and I'm no slouch coding wise. 20:33:43 TTYL 21:02:31 -!- The topic of ##crawl-dev is: Crawl Development | Logs: http://s-z.org/crawl-dev/ | People with +v have commit access. | Please keep general Crawl-related chat to ##crawl. | Dev wiki: http://crawl.develz.org/wiki | Long stuff to a pastebin service, please. 21:02:46 -!- The topic of ##crawl is: Play Dungeon Crawl Stone Soup online now! Type ??servers for instructions. | http://crawl.develz.org | FooTV: http://termcast.develz.org - ??footv for instructions | See also ##crawl-offtopic 21:22:09 By golly, I think I did it! Made a branch on my local and on github, pushed from that branch locally to that branch online, and then made a pull request. Happy dance!!! 21:24:28 New branch created: pull/1858 (1 commit) 13https://github.com/crawl/crawl/pull/1858 21:24:28 03MainiacJoe02 07https://github.com/crawl/crawl/pull/1858 * 0.27-a0-828-g343bd83: Add three unaligned overflow vaults Simple headers without Lua. Two vaults place two altars, one vault places one altar. 10(7 minutes ago, 1 file, 60+ 0-) 13https://github.com/crawl/crawl/commit/343bd833085d 22:09:51 -!- amalloy_ is now known as amalloy