00:57:24 03Implojin02 07* 0.32-a0-1994-g4b24945042: Remove a 2010 sprint piety cost hack 10(14 minutes ago, 1 file, 1+ 15-) 13https://github.com/crawl/crawl/commit/4b249450426e 02:04:07 <02M​onkooky> lines 602 to 639 of shout.cc are in brackets that I can't for the life of me figure out the purpose of 02:04:40 <02M​onkooky> can anyone explain what's goin on there? 02:22:46 <02M​onkooky> ok I figured it out this is a fallthrough if you try to attack previous target while previous target doesn't exist 02:56:06 <02M​onkooky> no actually it was because C gets upset about declaring variables in switch statements, i forgor aout this 03:21:49 New branch created: pull/3954 (29 commits) 13https://github.com/crawl/crawl/pull/3954 03:22:05 03Monkooky02 07https://github.com/crawl/crawl/pull/3954 * 0.30-a0-188-gb982cc2e58: Add indicator for rampage (Local tiles) 10(1 year, 7 months ago, 9 files, 72+ 52-) 13https://github.com/crawl/crawl/commit/b982cc2e58a7 03:22:05 03Monkooky02 07https://github.com/crawl/crawl/pull/3954 * 0.30-a0-189-g259de46378: Revert "Add indicator for rampage (Local tiles)" 10(1 year, 6 months ago, 9 files, 52+ 72-) 13https://github.com/crawl/crawl/commit/259de4637851 03:22:05 03Monkooky02 07https://github.com/crawl/crawl/pull/3954 * 0.30-a0-725-gb5aaa7d305: Merge branch 'master' of https://github.com/Monkooky/crawl 10(1 year, 6 months ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/b5aaa7d305f2 03:22:05 03Monkooky02 07https://github.com/crawl/crawl/pull/3954 * 0.30-a0-926-g9e59eae262: Merge branch 'master' of https://github.com/Monkooky/crawl 10(1 year, 1 month ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/9e59eae262aa 03:22:05 03Monkooky02 07https://github.com/crawl/crawl/pull/3954 * 0.31-a0-234-g316450b57e: Merge branch 'master' of https://github.com/crawl/crawl 10(1 year, 1 month ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/316450b57e9b 03:22:05 03Monkooky02 07https://github.com/crawl/crawl/pull/3954 * 0.31-a0-642-g73a2aa7848: Merge branch 'master' of https://github.com/crawl/crawl 10(12 months ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/73a2aa7848d6 03:22:05 03Monkooky02 07https://github.com/crawl/crawl/pull/3954 * 0.31-a0-723-g52fad65156: Merge remote-tracking branch 'upstream/master' 10(11 months ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/52fad6515621 03:22:05 03Monkooky02 07https://github.com/crawl/crawl/pull/3954 * 0.31-a0-843-gf62d5d0059: Merge remote-tracking branch 'upstream/master' 10(10 months ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/f62d5d005935 03:22:05 03Monkooky02 07https://github.com/crawl/crawl/pull/3954 * 0.31-a0-977-g14c3af0080: Merge remote-tracking branch 'upstream/master' 10(9 months ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/14c3af008018 03:22:05 03Monkooky02 07https://github.com/crawl/crawl/pull/3954 * 0.31-a0-1337-g363372f58a: Merge branch 'master' of https://github.com/crawl/crawl 10(8 months ago, 0 files, 0+ 0-) 13https://github.com/crawl/crawl/commit/363372f58aa4 03:22:05 ... and 19 more commits 03:22:22 <02M​onkooky> how do I make my pull requests not involve 29 nothing commits 03:22:28 <02M​onkooky> this is horribly obnoxious 03:28:31 03Implojin02 07* 0.32-a0-1995-ge91ea31d48: Remove an obsolete fake lang line 10(3 minutes ago, 1 file, 0+ 1-) 13https://github.com/crawl/crawl/commit/e91ea31d485a 03:31:52 Experimental (bcrawl) branch on underhound.eu updated to: 0.23-a0-5208-geafff8c3b6 03:39:53 <03i​mplojin> @Monkooky not sure exactly what you're doing to result in this, but it may help to keep your master branch identical to upstream/master and rebase to that instead of doing merge commits 03:41:09 <02M​onkooky> hm time for some reading 03:44:37 <02M​onkooky> no, the issue here is that my master branch has gotten polluted with times I forgot to move to a branch before making changes 03:44:58 <02M​onkooky> I'm not intentionally merging onto master at any point 03:45:06 <03i​mplojin> that should be an easy fix, just git reset --hard HEAD~# where # is how many commits you're trying to get rid of 03:45:42 <03i​mplojin> (note this will reset your master branch into whatever state it was that many commits ago) 03:46:20 <02M​onkooky> apparently git reset --hard upstream/master should be all local changes to master 03:48:58 <02M​onkooky> git rebase probably is what I want to be doing when updating old branches though, thanks for that 05:07:45 Unstable branch on crawl.akrasiac.org updated to: 0.32-a0-1995-ge91ea31 (34) 05:27:08 New branch created: pull/3955 (1 commit) 13https://github.com/crawl/crawl/pull/3955 05:27:08 03Monkooky02 07https://github.com/crawl/crawl/pull/3955 * 0.32-a0-1996-gc0960165f1: Remove undocumented 'wait here' command 10(77 seconds ago, 1 file, 2+ 3-) 13https://github.com/crawl/crawl/commit/c0960165f1f3 07:22:33 03Monkooky02 {dolorous} 07* 0.32-a0-1996-gad2143bade: Update Charlatan's Orb 10(4 days ago, 3 files, 9+ 6-) 13https://github.com/crawl/crawl/commit/ad2143bade5e 07:22:33 03dolorous02 07* 0.32-a0-1997-g33c259952e: Update changelog for Charlatan's Orb changes. 10(15 minutes ago, 1 file, 2+ 2-) 13https://github.com/crawl/crawl/commit/33c259952e01 07:22:33 03Monkooky02 {dolorous} 07* 0.32-a0-1998-g132a33245d: Remove undocumented 'wait here' command 10(2 hours ago, 1 file, 2+ 3-) 13https://github.com/crawl/crawl/commit/132a33245de5 07:28:59 03dolorous02 07* 0.32-a0-1999-g48756ab783: Revert "Replace eyebrow references with hair references." 10(2 minutes ago, 1 file, 2+ 2-) 13https://github.com/crawl/crawl/commit/48756ab78363 07:54:28 <12g​e0ff> > an orb which boosts power based on Evocations this changelog entry should probably be "an orb which boosts your other skills by 20% of your base Evocations" or something similar, since this "power" comes from the previous version of the unrand 08:08:36 <06d​olorous_84348> I wasn't certain how to rephrase it, but good idea. 08:10:42 03dolorous02 07* 0.32-a0-2000-g33269283d3: Improve Charlatan's Orb changelog entry (ge0FF). 10(2 minutes ago, 1 file, 3+ 2-) 13https://github.com/crawl/crawl/commit/33269283d33f 09:47:50 -!- khadgar3 is now known as khadgar 10:01:53 03dolorous02 07* 0.32-a0-2001-g579b58d1eb: Put back an eye reference in a Pan lord desc. 10(2 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/579b58d1eb2c 10:12:35 03dolorous02 07* 0.32-a0-2002-gd9b9d3c9f4: Rename the Xom number key. 10(2 minutes ago, 1 file, 5+ 5-) 13https://github.com/crawl/crawl/commit/d9b9d3c9f479 10:25:27 03dolorous02 07* 0.32-a0-2003-gfaebb8589b: Document BiA Sprint change. 10(2 minutes ago, 1 file, 1+ 0-) 13https://github.com/crawl/crawl/commit/faebb8589b57 12:14:37 03dolorous02 07* 0.32-a0-2004-gf563a0e96e: Remove obsolete comment. 10(10 minutes ago, 1 file, 0+ 2-) 13https://github.com/crawl/crawl/commit/f563a0e96e9b 12:14:37 03dolorous02 07* 0.32-a0-2005-gf9ad053adf: Don't refer to undead krakens as dead (Aliscans). 10(9 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/f9ad053adf42 14:14:22 03DracoOmega02 07* 0.32-a0-2006-gc3173615b2: Fix off-by-one error in Dismiss Apostle descriptions (Mattlistener) 10(45 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/c3173615b286 14:39:24 -!- Guest26 is now known as angelslayer 15:38:16 Unstable branch on underhound.eu updated to: 0.32-a0-2006-gc3173615b2 (34) 17:37:38 03regret-index02 07* 0.32-a0-2007-g8b305a4296: More adjustments to Xom and tension 10(4 minutes ago, 3 files, 330+ 145-) 13https://github.com/crawl/crawl/commit/8b305a42965c 21:46:46 03regret-index02 07* 0.32-a0-2008-g0ccf3f1864: Summon only two, not three illusions from Xom wrath + Oka (particleface) 10(54 seconds ago, 1 file, 2+ 2-) 13https://github.com/crawl/crawl/commit/0ccf3f1864c1 22:07:04 03dolorous02 07* 0.32-a0-2009-g0c025799d4: Add another mythical creature to artefacts. 10(4 minutes ago, 1 file, 2+ 0-) 13https://github.com/crawl/crawl/commit/0c025799d4b3 22:35:27 Unstable branch on crawl.develz.org updated to: 0.32-a0-2009-g0c025799d4 (34) 22:58:39 Windows builds of master branch on crawl.develz.org updated to: 0.32-a0-2009-g0c025799d4 23:04:31 <09h​jklyubn> @dolorous_84348 Judging by the in-game description of foul flame brand, below is performance you intended for the brand, right? flaming: average +25% freezing: average +25% holy wrath: average +75% foul flame vs undead/demon: average +25% foul flame vs other things: average +50% foul flame vs holy: average +75% However, when testing by wiz mode fsim, foul flame's damage is only half of this. (I don't know if this is just fsim bug or 23:04:32 not.) 23:04:32 <09h​jklyubn> https://cdn.discordapp.com/attachments/747522859361894521/1269898815037771888/2.PNG?ex=66b1bcef&is=66b06b6f&hm=59afed89cf281d978a507e534f81a02a425b91a9a6cb63495e637000f687822c& 23:14:22 03regret-index02 07* 0.32-a0-2010-gf8a32a3a8c: Use a min and not a max 10(63 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/f8a32a3a8c80 23:18:45 Unstable branch on cbro.berotato.org updated to: 0.32-a0-2009-g0c025799d4 (34) 23:47:22 Unstable branch on cbro.berotato.org updated to: 0.32-a0-2010-gf8a32a3a8c (34) 23:55:38 Monster database of master branch on crawl.develz.org updated to: 0.32-a0-2010-gf8a32a3a8c 23:59:16 <06d​olorous_84348> Yes, that's intended. And the code in attack.cc, starting at line 1235, sets that up; resistance 0 (other things) means 1/2 (50%) extra damage, resistance 1 (undead/demons) means 1/4 (25%) extra damage, resistance 2 (nothing currently) means 1/6 (16.7%) extra damage, and resistance 3 (nothing currently) means no extra damage due to immunity.