00:00:54 03dolorous02 07* 0.34-a0-870-g19b71b184a: Sort Gozag-menu-related includes. 10(6 minutes ago, 3 files, 6+ 4-) 13https://github.com/crawl/crawl/commit/19b71b184aff 00:07:33 <03i​mplojin> just fyi re the gozag potpet menu stuff, there's discussion happening in the roguelikes discord right now about possibly reverting this 00:07:40 <03i​mplojin> may want to hold off on cleaning it up nicely 00:11:55 <03i​mplojin> a summary is that players feel that allowing the gozag potion petition menu to be closed mid-choice, whether to save the choice for later, or to re-roll the choice with a cost, would substantially change the use of the ability in a negative way, and that the old menu code here likely resulted in better gameplay, barring some refactoring to allow this menu to stay open 00:14:44 03dolorous02 07* 0.34-a0-871-g4aeee8c786: Remove now-unused Gozag non-menu shop functions. 10(6 minutes ago, 1 file, 1+ 43-) 13https://github.com/crawl/crawl/commit/4aeee8c786d6 00:35:01 Stable (0.33) branch on cbro.berotato.org updated to: 0.33.1-5-g432fff1de5 00:37:13 03dolorous02 07* 0.34-a0-872-g0d94558edf: Clear Gozag potion petitions/shops when escaped. 10(10 minutes ago, 2 files, 18+ 4-) 13https://github.com/crawl/crawl/commit/0d94558edf84 00:38:23 <03i​mplojin> erm 00:38:54 <03i​mplojin> @dolorous_84348 that might be the worst choice from a gameplay perspective here, as now players will be incentivized to close and open the window until they get a potion set they want 00:39:01 <06d​olorous_84348> I should have kept the chat open. 00:39:22 <06d​olorous_84348> I can revert it, at least. 00:39:22 <03i​mplojin> sorry, i should've pinged you 00:40:26 <03i​mplojin> extensive discussion in the rl discord around this one and i was initially agreeing with tianmaster about the old menu being super weird but the negative gameplay effects seem fairly convincing 00:42:34 <06d​olorous_84348> So how much should I revert for now? 00:42:41 <03i​mplojin> pfffffff 00:46:11 <03i​mplojin> all of it? bleh. the issue is that the ideal behavior here seems to be forcing the menu window to remain open through HUPs so players need to make a choice on-the-spot rather than saving it or rerolling it. and if we do this with the new menu style, the menu window will be blocking most of the gameplay viewport, so the old style message pane menu was actually better behavior here it would be better to be able to temporarily clear the 00:46:11 menu from the hud while still forcing the player to pick something before continuing with the game, but that seems ... impossible without major refactoring of the menu code 00:47:59 <06d​olorous_84348> Unfortunate, and I was trying to figure out unsuccessfully how to differentiate between escaping out of a menu versus hanging up out of it. The added mouse support and similar things from the menu seemed good to me, but if the underlying problems are that bad, I'll go ahead. 00:48:17 <03i​mplojin> i agree about all of the menu ui being better with tianmaster's patch. 00:48:23 <03i​mplojin> like, i really would prefer to keep it 00:51:40 <03i​mplojin> but the issue is just how it impacts player incentives to save good potion petitions for later, or to reroll them in less dangerous situations 00:52:32 <06d​olorous_84348> Maybe if there was a way to add an additional Reroll option to the end of it? But yes. 00:53:34 <06d​olorous_84348> Since tianmaster at least has one other contribution, I guess leave his name in the credits? 00:56:55 <03i​mplojin> yeah for sure 00:58:04 <06d​olorous_84348> Okay. The reversion is in one big commit, so if anyone wants to try and fix its issues at some point, it's just a matter of un-reverting the reversion. Sorry for the mess. 00:58:56 -!- indigaz28 is now known as indigaz2 00:59:08 03dolorous02 07* 0.34-a0-873-g42e6ae0925: Revert "Add menu functionality for Gozag's potion petitions and merchant calls." 10(8 minutes ago, 4 files, 74+ 321-) 13https://github.com/crawl/crawl/commit/42e6ae09259c 01:00:44 <03i​mplojin> really don't apologize imo, it's great that we have folks doing PR reviews, even if some of it needs to be changed after the fact once in a while 01:00:58 <06d​olorous_84348> I'll keep that in mind. Thanks. 02:16:50 03Implojin02 07* 0.34-a0-874-g21e52a9974: Add a species title (Darby) 10(3 minutes ago, 1 file, 2+ 0-) 13https://github.com/crawl/crawl/commit/21e52a9974b6 04:28:05 03tianmaster02 {GitHub} 07* 0.34-a0-875-g1c848183b9: Fix merfolk fish-tail clipping in Quill form (#4804) 10(66 seconds ago, 1 file, 7+ 0-) 13https://github.com/crawl/crawl/commit/1c848183b980 04:40:52 03WizardIke02 07* 0.34-a0-876-g5eed0d1197: Make invis indicators accurate 10(3 months ago, 9 files, 45+ 140-) 13https://github.com/crawl/crawl/commit/5eed0d1197ab 05:08:14 Stable (0.33) branch on crawl.akrasiac.org updated to: 0.33.1-5-g432fff1 05:43:21 Unstable branch on crawl.akrasiac.org updated to: 0.34-a0-876-g5eed0d1 (34) 06:56:49 03dolorous02 07* 0.34-a0-877-g4192e25726: Add weapon brand comment. 10(5 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/4192e257265d 08:42:18 03person5060502 {GitHub} 07https://github.com/crawl/crawl/pull/4792 * 0.33-a0-1148-g4a6fbf92b4: Remove End-of-Line whitespace from backgrounds.txt 10(10 seconds ago, 1 file, 7+ 7-) 13https://github.com/crawl/crawl/commit/4a6fbf92b456 09:10:03 03person5060502 {GitHub} 07https://github.com/crawl/crawl/pull/4792 * 0.33-a0-1149-g9a72993c76: Remove EoL whitespace from cards.txt 10(18 seconds ago, 1 file, 8+ 8-) 13https://github.com/crawl/crawl/commit/9a72993c768c 09:13:14 03person5060502 {GitHub} 07https://github.com/crawl/crawl/pull/4792 * 0.33-a0-1150-g364ac5dd75: Remove EoL whitespace from features.txt 10(57 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/364ac5dd758f 09:35:55 Hey does anybody know this? Xom's hostile summons are surprisingly weak sometimes. Are the monsters summoned with lower HD or something? Not that I'm complaining... 09:40:55 03person5060502 {GitHub} 07https://github.com/crawl/crawl/pull/4792 * 0.33-a0-1151-g44610c7e0d: Remove EoL whitespace from items.txt 10(23 seconds ago, 1 file, 3+ 3-) 13https://github.com/crawl/crawl/commit/44610c7e0df4 09:44:06 03person5060502 {GitHub} 07https://github.com/crawl/crawl/pull/4792 * 0.33-a0-1152-ge6c2419fef: Remove whitespace from monsters.txt 10(21 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/e6c2419fef1c 09:46:14 03person5060502 {GitHub} 07https://github.com/crawl/crawl/pull/4792 * 0.33-a0-1153-g4758cd5e81: Remove EoL whitespace from mutations.txt 10(49 seconds ago, 1 file, 5+ 5-) 13https://github.com/crawl/crawl/commit/4758cd5e814a 09:47:19 03person5060502 {GitHub} 07https://github.com/crawl/crawl/pull/4792 * 0.33-a0-1154-g33f96c97b9: Remove EoL whitespace from passives.txt 10(37 seconds ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/33f96c97b9ee 09:48:23 03person5060502 {GitHub} 07https://github.com/crawl/crawl/pull/4792 * 0.33-a0-1155-g336a0bfd83: Remove EoL whitespace in skills.txt 10(4 seconds ago, 1 file, 2+ 2-) 13https://github.com/crawl/crawl/commit/336a0bfd83a4 09:50:32 03person5060502 {GitHub} 07https://github.com/crawl/crawl/pull/4792 * 0.33-a0-1156-g6cff268370: Remove EoL whitespace from species.txt 10(63 seconds ago, 1 file, 2+ 2-) 13https://github.com/crawl/crawl/commit/6cff268370b8 09:51:36 03dolorous02 07* 0.34-a0-878-g521a7a493f: Fix missing punctuation in Wildshape desc. 10(2 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/521a7a493f13 09:51:37 03person5060502 {GitHub} 07https://github.com/crawl/crawl/pull/4792 * 0.33-a0-1157-gafc3111344: Remove EoL whitespace from unrand.txt 10(30 seconds ago, 1 file, 8+ 8-) 13https://github.com/crawl/crawl/commit/afc311134493 10:40:36 New branch created: pull/4820 (3 commits) 13https://github.com/crawl/crawl/pull/4820 10:40:37 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-879-g319c74c2f9: Move weapon brand descriptions to the database. 10(5 hours ago, 4 files, 121+ 89-) 13https://github.com/crawl/crawl/commit/319c74c2f9d0 10:40:37 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-880-g9503971e4d: Move armour brand descriptions to the database. 10(3 hours ago, 2 files, 215+ 135-) 13https://github.com/crawl/crawl/commit/9503971e4d9d 10:40:37 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-881-gae955db0b1: Move missile brand descriptions to the database. 10(2 hours ago, 2 files, 53+ 65-) 13https://github.com/crawl/crawl/commit/ae955db0b103 10:58:17 <06d​olorous_84348> I wasn't sure whether to call it brands.txt or egos.txt given that the code isn't consistent on that front. 11:00:16 <06d​olorous_84348> Also, amulet brands/egos are described both in the database and in the code, the latter more briefly. Ideally, they'd only be using the database. 15:00:42 -!- Amorphia is now known as theWeaver 15:16:48 <04d​racoomega> The latter is for the fake artprop of them, if they're a randart, right? 15:21:54 <04d​racoomega> (I'd probably lean towards egos.txt if I had to pick one) 15:22:09 <04d​racoomega> It feels that is used more generally for the overall category (even though jewellry stuff isn't technically that, either) 15:23:06 <04d​racoomega> There are at least a couple uses of the in-code text for brands that is dynamic, though 15:23:25 <04d​racoomega> (Like, flaming brand mentioning hydras if they are also on an edged weapon) 15:40:35 Unstable branch on underhound.eu updated to: 0.34-a0-878-g521a7a493f (34) 15:46:52 -!- perryprog_ is now known as perryprog 15:56:12 <06d​olorous_84348> Regarding fake artprops, I think so; I'll have to double-check. I can rename it to egos.txt easily enough. Regarding dynamic text, I've done what I can. The flaming brand's mentioning hydras is done unconditionally instead of conditionally in the text for now because there seems to be no Lua binding to get what vorpal type a weapon has; also, there seems to be no Lua binding for useless_skill(), so the explicit mention of Pain 15:56:12 brand's not working at all for people who sacrificed their ability to train Necromancy is currently not in the text (it's definitely implied by Pain's being tied to Necromancy at least). If someone knows how to add Lua bindings for those things, it would be helpful; I have no idea how to do it. 16:58:50 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-879-ga3aa0eb0d3: Move weapon ego descriptions to the database. 10(11 hours ago, 4 files, 122+ 90-) 13https://github.com/crawl/crawl/commit/a3aa0eb0d3dd 16:58:50 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-880-gbad2ad7b82: Move armour ego descriptions to the database. 10(9 hours ago, 2 files, 215+ 135-) 13https://github.com/crawl/crawl/commit/bad2ad7b821c 16:58:50 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-881-g7aa564056f: Move missile ego descriptions to the database. 10(8 hours ago, 2 files, 53+ 65-) 13https://github.com/crawl/crawl/commit/7aa564056fed 17:01:22 <06d​olorous_84348> And now it's using egos.txt. 17:31:49 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-879-gb3549eaa8f: Move weapon ego descriptions to the database. 10(12 hours ago, 4 files, 126+ 90-) 13https://github.com/crawl/crawl/commit/b3549eaa8f5b 17:31:49 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-880-g98cf026c56: Move armour ego descriptions to the database. 10(10 hours ago, 2 files, 215+ 135-) 13https://github.com/crawl/crawl/commit/98cf026c564a 17:31:49 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-881-g6a99cdc9b7: Move missile ego descriptions to the database. 10(9 hours ago, 2 files, 53+ 65-) 13https://github.com/crawl/crawl/commit/6a99cdc9b7cf 17:35:01 <06d​olorous_84348> And the explicit mention of Pain brand 's not working with sacrificed Necromancy is back. Even without a binding for is_useless_skill(), there's still a way to check for the "no necromancy" mutation, which covers it for now. (If a species is added that can't intrinsically train Necromancy, that will cause a problem, but there currently isn't one.) 18:15:28 03Implojin02 07* 0.34-a0-879-g9aa3bd820c: Add a clua bind for you.is_useless_skill (dolorous) 10(3 minutes ago, 1 file, 14+ 0-) 13https://github.com/crawl/crawl/commit/9aa3bd820ca0 18:17:15 <03i​mplojin> i don't know how you'd check vorpal type in these description compositions because they're just passing strings around and they have no item_def context 18:18:54 <03i​mplojin> you could munge it on the c++ side i guess but that kinda defeats the purpose of moving this stuff to begin with 18:34:38 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-879-g2e40fc6519: Move weapon ego descriptions to the database. 10(13 hours ago, 4 files, 149+ 87-) 13https://github.com/crawl/crawl/commit/2e40fc65198d 18:34:38 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-880-gc42400c140: Move armour ego descriptions to the database. 10(11 hours ago, 2 files, 215+ 135-) 13https://github.com/crawl/crawl/commit/c42400c140fd 18:34:38 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-881-gf68ddbaefa: Move missile ego descriptions to the database. 10(10 hours ago, 2 files, 53+ 65-) 13https://github.com/crawl/crawl/commit/f68ddbaefa00 18:39:59 <06d​olorous_84348> Thank you for the binding! As for vorpal (and ranged) weapons, I've accomplished it by adding entry overrides for such weapons, so they can still go in the database. It'll make it a bit more complex to handle in the help lookup system, but one problem at a time. 18:49:31 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-880-g8f337aed16: Move weapon ego descriptions to the database. 10(13 hours ago, 4 files, 149+ 87-) 13https://github.com/crawl/crawl/commit/8f337aed1665 18:49:31 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-881-ga1cca56e40: Move armour ego descriptions to the database. 10(11 hours ago, 2 files, 215+ 135-) 13https://github.com/crawl/crawl/commit/a1cca56e40c6 18:49:31 03dolorous02 07https://github.com/crawl/crawl/pull/4820 * 0.34-a0-882-g6153890f2a: Move missile ego descriptions to the database. 10(10 hours ago, 2 files, 53+ 65-) 13https://github.com/crawl/crawl/commit/6153890f2a09 18:55:53 <06d​olorous_84348> And now it's using the binding. Also, even without its being hooked up to the help lookup system, this should make ego descriptions translatable now. 19:28:10 <06m​umra> Died to bane of multiplicity after getting it from a trove 🙁 had 0.1 left until it was paid off 😂 19:29:48 <06m​umra> Some good stuff in the trove tho, liked the system 22:35:44 Unstable branch on crawl.develz.org updated to: 0.34-a0-879-g9aa3bd820c (34) 22:59:01 Windows builds of master branch on crawl.develz.org updated to: 0.34-a0-879-g9aa3bd820c 23:35:29 Unstable branch on cbro.berotato.org updated to: 0.34-a0-879-g9aa3bd820c (34) 23:55:49 Monster database of master branch on crawl.develz.org updated to: 0.34-a0-879-g9aa3bd820c