00:01:06 <Sizzell> Unstable branch on crawl.s-z.org updated to: 0.13-a0-434-g848cc07 (34)
00:01:24 -!- DrPraetor|2 has quit [Ping timeout: 264 seconds]
00:03:29 -!- Boyo has quit [Quit: Page closed]
00:04:04 -!- CKyle has quit [Quit: CKyle]
00:04:05 -!- mnoqy has joined ##crawl-dev
00:05:47 <Gretell> Pre-release branch on crawl.develz.org updated to: 0.12-b1-124-g810c99c (34)
00:09:01 -!- WalkerBoh has quit [Remote host closed the connection]
00:11:41 -!- Cryp71c has joined ##crawl-dev
00:13:07 <Gretell> Unstable branch on crawl.develz.org updated to: 0.13-a0-434-g848cc07 (34)
00:14:06 -!- dtsund has quit [Ping timeout: 276 seconds]
00:17:03 -!- nubcakes has quit [Quit: Page closed]
00:18:40 -!- CampinSam has quit [Quit: WeeChat 0.3.8]
00:24:21 -!- morik has quit [Quit: Leaving]
00:24:42 -!- dtsund has joined ##crawl-dev
00:27:52 -!- Cryp71c has quit [Quit: Leaving]
00:39:30 -!- eb has quit []
00:41:23 -!- MakMorn has quit [Ping timeout: 245 seconds]
00:44:45 -!- dtsund has left ##crawl-dev
00:45:27 <Gretell> Windows builds of master branch on crawl.develz.org updated to: 0.13-a0-434-g848cc07
00:45:38 -!- Melum has quit [Quit: Was eaten by a grue.]
00:47:39 -!- dtsund has joined ##crawl-dev
00:50:22 -!- dupo has quit []
00:51:18 -!- strider has quit [Ping timeout: 245 seconds]
01:00:47 -!- bonghitz has quit [Remote host closed the connection]
01:00:53 -!- MakMorn has joined ##crawl-dev
01:04:43 -!- ussdefiant has quit [Ping timeout: 264 seconds]
01:05:02 -!- syraine has quit [Ping timeout: 245 seconds]
01:15:22 -!- GuraKKa has quit [Read error: Connection reset by peer]
01:16:33 -!- Kalir has quit [Changing host]
01:25:33 -!- Nareusm has quit [Ping timeout: 245 seconds]
01:39:57 -!- remyroy has quit [Read error: Connection reset by peer]
01:41:17 -!- InternetKraken has quit [Ping timeout: 245 seconds]
01:43:03 -!- MakMorn has quit [Ping timeout: 245 seconds]
01:45:46 -!- kait has quit [Read error: Connection reset by peer]
01:46:16 -!- soundlust|2 has quit [Ping timeout: 245 seconds]
01:49:32 -!- minqmay has quit [Quit: Leaving]
01:52:49 -!- Kalir has quit [Quit: CADENZA-CLASS CLOCKWORK KNIGHT--OPERATION TERMINATED]
02:00:56 -!- elliptic has quit [Quit: Leaving]
02:01:11 -!- elliptic has joined ##crawl-dev
02:14:00 -!- Svendre has quit [Ping timeout: 264 seconds]
02:15:37 -!- Sabaki has quit [Quit: KVIrc 4.0.4 Insomnia http://www.kvirc.net/]
02:15:53 -!- arkive has quit [Ping timeout: 245 seconds]
02:16:36 -!- SkaryMonk has quit [Read error: Connection reset by peer]
02:22:25 -!- Stendarr has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/]
02:22:43 -!- Taynav has quit [Ping timeout: 264 seconds]
02:27:31 -!- Vizer has quit [Ping timeout: 264 seconds]
02:36:37 -!- DrPraetor|2 has quit [Read error: Connection reset by peer]
02:40:50 -!- Pthingg has quit [Quit: Leaving]
02:41:57 -!- SkaryMonk has joined ##crawl-dev
02:44:38 -!- syraine has quit [Ping timeout: 245 seconds]
03:02:07 -!- Vizer has joined ##crawl-dev
03:07:01 -!- simmarine has quit [Quit: Leaving]
03:11:15 -!- Blade- has quit [Quit: Page closed]
03:13:53 -!- scummos^ has quit [Remote host closed the connection]
03:17:17 -!- bonghitz has quit [Remote host closed the connection]
03:19:49 -!- PepeRC2 has quit [Read error: Connection reset by peer]
03:22:14 -!- SkaryMonk1 has joined ##crawl-dev
03:23:08 -!- SkaryMonk has quit [Ping timeout: 256 seconds]
03:24:07 -!- dtsund has left ##crawl-dev
03:27:27 -!- dtsund has joined ##crawl-dev
03:27:59 -!- Aryth has quit [Ping timeout: 260 seconds]
03:28:27 -!- freefall has quit [Ping timeout: 276 seconds]
03:28:59 -!- mikee_ has quit [Quit:  HydraIRC -> http://www.hydrairc.com <- Go on, try it!]
03:45:08 -!- Staplegun has quit [Ping timeout: 245 seconds]
03:49:07 -!- MakMorn has joined ##crawl-dev
04:06:49 -!- Vizer has quit [Quit: bye]
04:15:36 -!- nonethousand has quit [Read error: Connection reset by peer]
04:22:57 -!- gowby has quit [Ping timeout: 245 seconds]
04:28:30 -!- Vizer has joined ##crawl-dev
04:34:39 -!- MarvinPA has joined ##crawl-dev
04:50:34 -!- Maestro has quit [Quit: Page closed]
04:54:11 -!- winedarksea has joined ##crawl-dev
04:57:20 -!- Spectrina has quit [Read error: Connection reset by peer]
05:03:42 -!- Krenium has quit [Ping timeout: 256 seconds]
05:04:00 -!- dtsund has quit [Ping timeout: 276 seconds]
05:15:23 -!- Svendre has quit [Ping timeout: 252 seconds]
05:15:24 -!- caracal has quit [Read error: Connection reset by peer]
05:16:29 -!- ktgrey has quit []
05:20:13 -!- SkaryMonk has joined ##crawl-dev
05:21:45 -!- SkaryMonk1 has quit [Ping timeout: 252 seconds]
05:24:39 -!- DrPraetor has joined ##crawl-dev
05:24:46 -!- barbs has joined ##crawl-dev
05:24:50 -!- barbs has left ##crawl-dev
05:35:58 -!- Zermako has quit []
05:37:10 -!- DrPraetor has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/]
05:40:11 -!- Vizer has quit [Quit: bye]
05:44:25 -!- nooodl has joined ##crawl-dev
05:44:36 -!- winedarksea has quit [Quit: Page closed]
05:49:30 -!- Taco_Princess has quit [Ping timeout: 252 seconds]
05:51:52 -!- nooodl has quit [Quit: Leaving]
05:53:57 -!- NekoRex has quit [Ping timeout: 248 seconds]
05:56:35 -!- Blazinghand_ has quit [Ping timeout: 252 seconds]
06:02:36 -!- mumra_ has joined ##crawl-dev
06:05:45 -!- MarvinPA_ has joined ##crawl-dev
06:05:52 -!- GuraKKa has quit [Read error: Connection reset by peer]
06:10:02 -!- Twinge has quit [Read error: Connection reset by peer]
06:10:18 -!- MarvinPA has quit [Ping timeout: 276 seconds]
06:10:18 -!- MarvinPA_ is now known as MarvinPA
06:11:02 -!- Twinge has joined ##crawl-dev
06:11:29 -!- bmfx has quit [Ping timeout: 252 seconds]
06:13:06 -!- mnoqy has quit [Quit: hello]
06:22:12 -!- NekoRex has quit [Ping timeout: 256 seconds]
06:28:25 -!- Cryp71c has joined ##crawl-dev
06:28:34 <Cryp71c> Morning
06:39:47 <mumra_> hi
06:43:42 -!- mumra has quit [Quit: Yaaic - Yet another Android IRC client - http://www.yaaic.org]
06:43:59 -!- mumra_ is now known as mumra
06:59:50 -!- caracal has quit [Remote host closed the connection]
07:00:09 <Cryp71c> mumra, you're good with git, aren't you?
07:00:37 <mumra> i wouldn't describe myself as an expert
07:00:52 <mumra> is this about that weird merge commit?
07:00:58 <Cryp71c> yeah
07:12:19 -!- Cryp71c__ has joined ##crawl-dev
07:13:05 -!- Cryp71c has quit [Ping timeout: 252 seconds]
07:13:43 -!- Nakatomy has quit [Ping timeout: 264 seconds]
07:17:29 -!- Cryp71c__ is now known as Cryp71c
07:19:27 -!- magistern has quit [Quit: This computer has gone to sleep]
07:21:14 -!- SkaryMonk1 has joined ##crawl-dev
07:22:33 -!- eith has joined ##crawl-dev
07:22:59 -!- SkaryMonk has quit [Ping timeout: 252 seconds]
07:24:11 -!- Cryp71c has quit [Ping timeout: 255 seconds]
07:24:33 -!- caracal has quit [Remote host closed the connection]
07:34:56 -!- ldf has quit [Read error: Connection reset by peer]
07:35:46 -!- absolutego has quit [Quit: leaving]
07:36:02 <mumra> Cryp71c_: still there? i don't know enough about git to fix that commit now it's happened. but it shouldn't be so complicated to get new commits and rebase you changes on top of them
07:37:11 -!- Fear has quit [Read error: Connection reset by peer]
07:37:39 <mumra> although what i discovered is it's a problem rebasing a branch once you've already pushed stuff up to the repository
07:37:53 <galehar> Cryp71c_: to refresh master without having to switch to it: git fetch origin master:master
07:39:14 <galehar> maybe in this case it's better to rebase --onto master rather than rebase then merge
07:45:05 -!- magistern has quit [Quit: Leaving]
07:49:38 -!- scummos has quit [Quit: Konversation terminated!]
07:51:06 -!- edlothiol has joined ##crawl-dev
07:52:28 -!- LexAckson has joined ##crawl-dev
08:07:18 -!- Cryp71c has joined ##crawl-dev
08:08:05 -!- MaxFrost has quit [Ping timeout: 252 seconds]
08:16:46 -!- Chozo has quit [Read error: Connection reset by peer]
08:21:29 -!- jdpage has quit [Read error: Connection reset by peer]
08:22:54 -!- Nightbeer has quit [Read error: Connection reset by peer]
08:24:48 -!- scummos^ has quit [Ping timeout: 264 seconds]
08:26:25 -!- rossi has quit [Ping timeout: 248 seconds]
08:26:53 <Cryp71c> ??git
08:26:53 <Henzell> git[1/2]: Readonly: git clone git://gitorious.org/crawl/crawl.git  Read/Write: git@gitorious.org:crawl/crawl.git  Web interface: http://git.develz.org/?p=crawl.git or http://gitorious.org/crawl/crawl
08:27:44 -!- dagonfive has quit [Read error: Connection reset by peer]
08:27:55 -!- Aryth has quit [Read error: No route to host]
08:28:03 -!- mizu_no_oto has quit [Quit: Computer has gone to sleep.]
08:32:27 -!- alefury has joined ##crawl-dev
08:36:51 -!- jeanjacques has joined ##crawl-dev
08:48:09 -!- eb has quit [Client Quit]
08:51:27 -!- eith has quit [Ping timeout: 256 seconds]
08:52:19 -!- ckyle has joined ##crawl-dev
08:54:22 -!- Cryp71c__ has joined ##crawl-dev
08:54:47 -!- Cryp71c has quit [Disconnected by services]
08:54:48 -!- Cryp71c__ is now known as Cryp71c
08:55:54 -!- Cryp71c_ has quit [Ping timeout: 264 seconds]
08:56:30 -!- Cryp71c_ has joined ##crawl-dev
08:58:29 -!- st_ has joined ##crawl-dev
09:02:29 -!- remyroy has quit [Read error: Connection reset by peer]
09:03:38 -!- galehar has quit [Ping timeout: 246 seconds]
09:08:03 -!- santiago_ has quit [Quit: No Ping reply in 180 seconds.]
09:08:16 -!- DracoOmega has quit [Read error: Connection reset by peer]
09:08:53 -!- Love is now known as Guest63551
09:09:17 -!- Guest63551 is now known as LoveFlavored
09:12:18 -!- mizu_no_oto has quit [Quit: Computer has gone to sleep.]
09:13:57 <Cheibriados> 03Cryp71c 07[ds_trade_offs] * 0.13-a0-445-g433c870: Remove duplicate enum for RUNED_HANDS 10(2 hours ago, 1 file, 0+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=433c8706aa80
09:13:57 <Cheibriados> 03Cryp71c 07[ds_trade_offs] * 0.13-a0-446-g7d0eca2: Setup structure for alt effects of MUT_RUNED_HANDS 10(54 minutes ago, 7 files, 65+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=7d0eca2d6140
09:16:17 -!- syraine has quit [Ping timeout: 245 seconds]
09:19:10 -!- Cryp71c has quit [Quit: Leaving]
09:19:24 -!- Cryp71c has joined ##crawl-dev
09:20:26 -!- Cryp71c_ has quit [Quit: Leaving]
09:20:28 -!- Cryp71c has quit [Client Quit]
09:20:33 -!- ckyle has quit [Quit: ckyle]
09:20:45 -!- Cryp71c has joined ##crawl-dev
09:21:32 -!- SkaryMonk has joined ##crawl-dev
09:21:54 -!- SkaryMonk1 has quit [Ping timeout: 252 seconds]
09:22:19 -!- PsyMar has quit [Quit: I, Garland, will knock you all down!]
09:25:50 -!- galehar has joined ##crawl-dev
09:30:19 -!- madreisz has quit [Ping timeout: 268 seconds]
09:34:25 <Medar> edlothiol: When you have time, can you take a look at these? https://crawl.develz.org/mantis/view.php?id=6865 https://crawl.develz.org/mantis/view.php?id=6652
09:34:33 <Medar> Maybe they can make it for 0.12
09:34:35 -!- ckyle has joined ##crawl-dev
09:37:22 -!- Aryth has quit [Ping timeout: 256 seconds]
09:39:15 <Cheibriados> 03galehar 07* 0.13-a0-435-gddc62b8: Give a message about Oka's suppression of demonic guardian. 10(23 minutes ago, 3 files, 16+ 0-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=ddc62b8f65ad
09:39:15 <Cheibriados> Cherry-picked 1 commit into stone_soup-0.12
09:42:57 -!- LoveFlavored has quit [Ping timeout: 245 seconds]
09:43:47 -!- gowby has quit [Ping timeout: 245 seconds]
09:43:48 -!- BadHygiene has quit [Ping timeout: 245 seconds]
09:44:03 -!- Roarke has quit [Client Quit]
09:49:44 -!- ldf has quit [Read error: Connection reset by peer]
09:53:00 -!- ckyle has quit [Quit: ckyle]
09:53:04 -!- Mandevil has quit [Quit: leaving]
09:53:12 <Medar> My battlesphere triggered an alarm trap (that I had detected). Bug, misfeature or not?
09:55:39 -!- cjo_dcss has joined ##crawl-dev
09:56:34 -!- elliptic has quit [Quit: Leaving]
09:58:34 -!- Nakat0my has quit [Remote host closed the connection]
09:59:29 <Cheibriados> Cannot eat poisonous chunks with Vitalisation <https://crawl.develz.org/mantis/view.php?id=6957> by Psieye
09:59:44 -!- cjo_dcss has left ##crawl-dev
10:04:24 -!- ussdefiant has joined ##crawl-dev
10:04:56 -!- floatboth has quit [Read error: No route to host]
10:09:36 <Cheibriados> Finesse does not speed up throwing attacks <https://crawl.develz.org/mantis/view.php?id=6958> by BlackSheep
10:09:43 <Cryp71c> ??git
10:09:44 <Henzell> git[1/2]: Readonly: git clone git://gitorious.org/crawl/crawl.git  Read/Write: git@gitorious.org:crawl/crawl.git  Web interface: http://git.develz.org/?p=crawl.git or http://gitorious.org/crawl/crawl
10:17:08 <Cryp71c> Somewhere in the learndb there is a page which lists the build packages for dcss
10:25:29 <Grunt> ??compile crawl
10:25:29 <Henzell> compile crawl[1/1]: [Linux] You'll need git, build-essential, zlib1g-dev, libncurses5-dev, libncursesw5-dev, then "git clone git://gitorious.org/crawl/crawl.git; cd DCSS; git submodule update --init; cd crawl-ref/sources/; make [options]"
10:26:07 -!- Sealer has quit [Ping timeout: 256 seconds]
10:27:28 -!- CKyle has joined ##crawl-dev
10:30:58 -!- keszocze has quit [Ping timeout: 245 seconds]
10:47:01 <Cryp71c> !learn add compile_crawl [Linux] For faster compiling, leverage the awesomeness of ccache
10:47:01 <Henzell> compile crawl[2/2]: [Linux] For faster compiling, leverage the awesomeness of ccache
10:54:37 -!- SkaryMonk has quit [Quit: Leaving.]
10:56:42 -!- Datul has quit [Ping timeout: 245 seconds]
10:58:03 -!- ussdefiant has quit [Ping timeout: 245 seconds]
11:11:05 <Medar> Cryp71c: What's the easiest way to use ccache with crawl?
11:11:14 <Medar> Or I could of course just RTFM :)
11:12:58 -!- Vizer has joined ##crawl-dev
11:18:33 <Cryp71c> Medar, its quite straight forward, I like to install ccache and symbolically link ccache to "make" (which is what the manual suggests) so that you still do "make debug" and it uses ccache invisibly.
11:18:46 -!- Chozo has quit [Read error: Connection reset by peer]
11:18:55 <Medar> Cool, thanks
11:19:03 <|amethyst> personally, I just put /usr/lib/ccache at the front of my path
11:19:20 <Cryp71c> !learn edit compile_crawl[2] s/$/. Also, be sure to use the -j flag if you have multiple processors available.
11:19:21 <Henzell> compile crawl[2/2]: [Linux] For faster compiling, leverage the awesomeness of ccache. Also, be sure to use the -j flag if you have multiple processors available.
11:19:46 <|amethyst> you probably want to turn up the cache sizes, especially if you're switching between branches, compile flags, etc.
11:20:04 <Cryp71c> |amethyst, I've not done that before, thanks!
11:20:08 -!- voker57 has quit [Read error: Connection reset by peer]
11:20:22 <|amethyst> on cszo I have the cache size set to 8 GiB
11:20:26 <|amethyst> on my home computer, 16 GiB
11:20:32 -!- voker57 has quit [Changing host]
11:20:32 -!- voker57 has joined ##crawl-dev
11:21:10 -!- myrmidette has quit [Ping timeout: 258 seconds]
11:21:34 -!- mumra_ has joined ##crawl-dev
11:21:46 -!- Chozo has quit [Read error: Connection reset by peer]
11:23:36 -!- mumra has quit [Ping timeout: 276 seconds]
11:24:01 -!- rossi has quit [Ping timeout: 248 seconds]
11:25:32 <Medar> Sweet, works like a charm
11:27:28 -!- maha is now known as sunstruck
11:30:19 -!- sunstruck has quit [Quit: ChatZilla 0.9.90 [Firefox 20.0.1/20130409194949]]
11:31:34 -!- Yen_ has quit [Ping timeout: 248 seconds]
11:35:10 -!- elliptic has joined ##crawl-dev
11:36:04 <Cryp71c> |amethyst, can you take a look at the history of ds_trade_offs to see if it looks wierd to you? I rebased master while on ds_trade_offs and ended up having to merge with..myself..it was wierd.
11:37:33 -!- gowby has quit [Ping timeout: 245 seconds]
11:37:51 -!- floatboth has quit [Quit: floatboth]
11:40:34 <Cheibriados> 03mumra 07* 0.13-a0-436-g34441b6: Determine bordering cells during grid subdivision 10(26 minutes ago, 1 file, 58+ 11-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=34441b62d987
11:40:34 <Cheibriados> 03mumra 07* 0.13-a0-437-g8959c30: Lua util.random_weighted_keys for picking random hashmap elements 10(25 minutes ago, 1 file, 19+ 0-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=8959c3091c80
11:40:34 <Cheibriados> 03mumra 07* 0.13-a0-438-g516ff4c: A grid-based maze layout 10(23 minutes ago, 1 file, 123+ 0-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=516ff4c0972f
11:40:34 <Cheibriados> 03mumra 07* 0.13-a0-439-g741ecc0: Adjust some weights of cave layouts 10(22 minutes ago, 1 file, 7+ 6-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=741ecc082875
11:40:34 <Cheibriados> 03mumra 07* 0.13-a0-440-gdaf1e84: Spacing fix 10(22 minutes ago, 1 file, 0+ 2-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=daf1e84c6f76
11:41:46 <mumra_> Cryp71c: for posterity. can you describe how it felt to merge with yourself ? ;)
11:42:41 <|amethyst> you rebased locally but had already pushed the branch?
11:43:40 <Cryp71c> |amethyst, hrm, I didnt' think so, but perhaps.
11:43:51 <|amethyst> how did you rebase?
11:43:58 <Cryp71c> git rebase origin/master
11:44:14 <|amethyst> what did you do after that?
11:44:24 <|amethyst> git pull or something like that?
11:44:36 -!- Kalir has quit [Changing host]
11:44:55 <Cryp71c> I think I tried to push, but it said that ds_trade_offs was behind by 1 and could be fast-forwarded, which was wierd because I think I had JUST pushed prior to the rebase.
11:46:33 <|amethyst> well, from the merge it looks like the branch from gitorious was missing "Reoreder runed_hands"
11:46:45 <|amethyst> s/ored/ord/
11:47:17 -!- st_ has quit [Read error: Connection reset by peer]
11:47:33 <|amethyst> the rebase put your whole local branch on top of master, which means that your local copy and the copy on gitorious were unrelated
11:47:34 -!- st_ has joined ##crawl-dev
11:48:10 <|amethyst> then either pushing or pulling (but it looks like pulling from the order of the branches) merged those two versions again
11:48:31 <|amethyst> if you do a rebase, then you have to push with --force  (which does screw up other people using the branch)
11:50:27 -!- Stelpa has quit [Remote host closed the connection]
11:52:41 -!- st_ has quit [Read error: Connection reset by peer]
11:52:49 -!- st_ has joined ##crawl-dev
11:52:53 <|amethyst> hm
11:53:12 <|amethyst> I just pushed something to a new branch but please disregard, there's something to fix
11:53:28 -!- Vizer_ has joined ##crawl-dev
11:53:57 -!- Vizer has quit [Ping timeout: 248 seconds]
11:55:45 <Cheibriados> New branch created: ds_trade_offs_fixed (8 commits)
11:55:45 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-441-gf5e3fc4: Give monstrous DS a scale mutation 10(7 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=f5e3fc46602f
11:55:45 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-442-g05605bc: Remove dprf accidentally left in 10(7 days ago, 1 file, 0+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=05605bc50b0f
11:55:45 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-443-gedd5af4: Differentiate Iridescent and Rough Black scales 10(7 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=edd5af4e2c62
11:55:45 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-444-g2777bce: New DS mutation: Runed Hands 10(5 days ago, 4 files, 31+ 6-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=2777bce76087
11:55:45 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-445-gbd2eac8: Reorder runed_hands in the mutation list 10(2 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=bd2eac8c65a4
11:55:45 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-446-g4f5746c: New DS mutation: Runed Hands 10(5 days ago, 1 file, 1+ 0-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=4f5746cc8d74
11:55:45 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-447-g6a73f25: Remove duplicate enum for RUNED_HANDS 10(5 hours ago, 1 file, 0+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=6a73f25a73d1
11:55:45 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-448-g11264b3: Setup structure for alt effects of MUT_RUNED_HANDS 10(4 hours ago, 7 files, 65+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=11264b34215d
11:56:46 <|amethyst> no
11:56:49 <|amethyst> argh
11:57:04 <|amethyst> oh crap
11:57:09 <|amethyst> I pushed the wrong thing, no wonder
11:57:59 -!- alefury has quit [Quit: ChatZilla 0.9.85 [Iceape 2.0.11/20121208085021]]
11:58:28 <|amethyst> let's try that again
11:58:32 <|amethyst> please don't use that branch yet
12:00:46 <|amethyst> okay
12:00:50 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-398-gc73457f: Give monstrous DS a scale mutation 10(7 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=c73457f29f79
12:00:50 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-399-gf5432ac: Remove dprf accidentally left in 10(7 days ago, 1 file, 0+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=f5432ac14e6c
12:00:50 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-400-g092fa32: Differentiate Iridescent and Rough Black scales 10(7 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=092fa32faf0b
12:00:50 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-401-gafe756f: New DS mutation: Runed Hands 10(5 days ago, 4 files, 31+ 6-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=afe756faf158
12:00:50 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-435-gcd5f249: Give monstrous DS a scale mutation 10(7 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=cd5f249830e6
12:00:50 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-436-gd3168e4: Remove dprf accidentally left in 10(7 days ago, 1 file, 0+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=d3168e4aa0e1
12:00:50 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-437-gde56254: Differentiate Iridescent and Rough Black scales 10(7 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=de56254bcde0
12:00:50 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-438-g73c58b8: New DS mutation: Runed Hands 10(5 days ago, 4 files, 31+ 6-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=73c58b84b289
12:00:50 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-439-g0463c21: Reorder runed_hands in the mutation list 10(2 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=0463c216bc6f
12:00:50 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-444-g8fdc226: Merge branch 'ds_trade_offs' of gitorious.org:crawl/crawl into ds_trade_offs 10(15 hours ago,  files, + -) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=8fdc22675aa9
12:00:50 <Cheibriados> ... and 8 more commits
12:01:33 -!- mizu_no_oto has quit [Quit: ["Textual IRC Client: www.textualapp.com"]]
12:03:13 -!- st_ has quit [Ping timeout: 240 seconds]
12:03:29 <|amethyst> Cryp71c:   okay, ds_trade_offs_fixed should be good to use now, at commit 1243579
12:04:07 -!- SchwaWarrior has quit [Quit: Page closed]
12:04:24 <|amethyst> Cryp71c:  I removed two commits (one duplicate, and "remove duplicate enum" that fixed the duplicate)
12:04:55 <|amethyst> you can work on there and cherry-pick any local commits you've made since "Setup structure for alt effects"
12:05:30 <|amethyst> or you can force push it to ds_trade_offs, but with a force push you should warn anyone who is woring in/using/testing the branch
12:05:49 <Henzell> Stable (0.12) branch on crawl.akrasiac.org updated to: 0.12-b1-125-ge96bf50
12:05:54 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-441-gaaf2a86: Give monstrous DS a scale mutation 10(7 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=aaf2a86b1f6f
12:05:54 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-442-gfe00eee: Remove dprf accidentally left in 10(7 days ago, 1 file, 0+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=fe00eee53ffb
12:05:54 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-443-gbf44022: Differentiate Iridescent and Rough Black scales 10(7 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=bf44022109c1
12:05:54 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-444-g9419d3c: New DS mutation: Runed Hands 10(5 days ago, 4 files, 31+ 6-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=9419d3ce48ae
12:05:54 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-445-g13fe03c: Reorder runed_hands in the mutation list 10(2 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=13fe03cbce17
12:05:54 <Cheibriados> 03Cryp71c 07[ds_trade_offs_fixed] * 0.13-a0-446-g1243579: Setup structure for alt effects of MUT_RUNED_HANDS 10(4 hours ago, 7 files, 65+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=124357920a9e
12:06:42 <|amethyst> and Chei finally catches up :)
12:07:50 <|amethyst> what I did:  git rebase 0463c216 (that was your newest commit on the rebased branch before the merge)... that linearized history on top of an older master
12:08:00 <|amethyst> then  git rebase master   to put that on the newest master
12:08:21 <|amethyst> then  git rebase -i master   and removed that duplicate commit and the one that fixed it
12:08:38 <|amethyst> finally   git push origin ds_trade_offs:ds_trade_offs_fixed   to push it to a new branch
12:09:01 -!- eith has joined ##crawl-dev
12:09:34 <|amethyst> the middle two steps could be combined (by skipping the second)
12:09:48 <|amethyst> (skipping the one without -i that is)
12:10:03 -!- bonghitz has quit [Remote host closed the connection]
12:10:06 <Cryp71c> |amethyst, thanks, I appreciate it! For future commits, if I want to bring in all the commits to master, I can make sure both branches (master and ds_trade_offs) are up to date, switch to ds_trade_offs and rebase origin/master, correct?
12:10:13 <Henzell> Unstable branch on crawl.akrasiac.org updated to: 0.13-a0-440-gdaf1e84 (34)
12:10:13 <|amethyst> If I wanted to overwrite your branch, I would have done just  git push --force
12:10:42 <|amethyst> Cryp71c:  yes, but that rewrites history
12:10:55 <|amethyst> Cryp71c:  if you're the only person using the branch, that's fine, but you must push with --force
12:10:59 <Cheibriados> Walking Mushrooms unable to walk through plants <https://crawl.develz.org/mantis/view.php?id=6959> by Frelus
12:11:31 <Cryp71c> |amethyst, if this were an environment where that wouldn't be appropriate, what other options would I have? Go without all of the commits on master until the branch is done and can be merged (as a whole) into master?
12:11:42 <|amethyst> Cryp71c:  merge master into your branch
12:12:02 <Cryp71c> Gotcha, thanks
12:13:10 <|amethyst> Cryp71c:  then when you're ready to put that into master you could either merge, or if you prefer a linear history: create a temporary branch copied from that one, rebase the temp branch onto master, then push the temp branch to master
12:13:43 <Cryp71c> |amethyst, when you say linear history, you're referring to all of the commits from my branch being together, without being intermingled with the commits merged in from master?
12:14:07 <|amethyst> Cryp71c:  more specifically, without merges (which are branches in the history)
12:14:10 <Cryp71c> Also, regarding the branch, is it acceptable just to delete the ds_trade_offs branch and rename the ds_trade_offs_fixed and then push that, or is there a more appropriate / easier way?
12:14:33 <|amethyst> Cryp71c:  some people prefer to avoid them, but we do it plenty so I wouldn't necessarily worry about it
12:14:37 <Cryp71c> |amethyst, a linear history would be largely preferable, correct?
12:14:44 <Cryp71c> (just for my own future reference)
12:15:54 <|amethyst> Cryp71c:  all else being equal, linear is easier to read and work with... but it does lose some of the development history, and it is possible to miss things when rebasing
12:16:01 <Cheibriados> 03infiniplex 07* 0.13-a0-441-g09829b8: Modified layout_dis to a max 1 door per room wall 10(17 hours ago, 1 file, 61+ 22-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=09829b88fd36
12:16:01 <Cheibriados> 03infiniplex 07* 0.13-a0-442-ge03f76a: Forbid layout_dis placing adjacent statues 10(17 hours ago, 1 file, 11+ 4-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=e03f76a5c047
12:16:09 <|amethyst> (OTOH it's also possible to miss things when merging)
12:17:11 <|amethyst> Cryp71c:  as for replacing ds_trade_offs with that branch, you can  git fetch --force origin ds_trade_offs_fixed:ds_trade_offs
12:17:29 <|amethyst> Cryp71c:  and then git push --force   ds_trade_offs back to master
12:17:31 <|amethyst> err
12:17:35 <|amethyst> not to master, to origin
12:19:03 <|amethyst> once you've got it the way you want, you can   git push origin :ds_trade_offs_fixed   to delete my branch from the repository
12:19:36 <Cryp71c> |amethyst, hrm, I must have missed something, it said that it pushed master and ds_trade_off
12:19:53 <|amethyst> which step?
12:20:06 <Cryp71c> git push --force origin
12:20:18 <Cryp71c> was my command, clearly it took it as both master and ds_trade_off (it said it pushed both)
12:20:36 <Cryp71c> Gitorious has a record of "Cryptic pushed 0 commits to master"
12:20:59 <|amethyst> should have been   git push --force origin ds_trade_offs
12:21:00 <|amethyst> um
12:21:05 <Cheibriados> 03mumra 07[ds_trade_offs] * 0.13-a0-436-g34441b6: Determine bordering cells during grid subdivision 10(67 minutes ago, 1 file, 58+ 11-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=34441b62d987
12:21:05 <Cheibriados> 03mumra 07[ds_trade_offs] * 0.13-a0-437-g8959c30: Lua util.random_weighted_keys for picking random hashmap elements 10(66 minutes ago, 1 file, 19+ 0-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=8959c3091c80
12:21:05 <Cheibriados> 03mumra 07[ds_trade_offs] * 0.13-a0-438-g516ff4c: A grid-based maze layout 10(64 minutes ago, 1 file, 123+ 0-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=516ff4c0972f
12:21:05 <Cheibriados> 03mumra 07[ds_trade_offs] * 0.13-a0-439-g741ecc0: Adjust some weights of cave layouts 10(63 minutes ago, 1 file, 7+ 6-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=741ecc082875
12:21:05 <Cheibriados> 03mumra 07[ds_trade_offs] * 0.13-a0-440-gdaf1e84: Spacing fix 10(63 minutes ago, 1 file, 0+ 2-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=daf1e84c6f76
12:21:05 <Cheibriados> 03Cryp71c 07[ds_trade_offs] * 0.13-a0-441-gaaf2a86: Give monstrous DS a scale mutation 10(7 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=aaf2a86b1f6f
12:21:05 <Cheibriados> 03Cryp71c 07[ds_trade_offs] * 0.13-a0-442-gfe00eee: Remove dprf accidentally left in 10(7 days ago, 1 file, 0+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=fe00eee53ffb
12:21:05 <Cheibriados> 03Cryp71c 07[ds_trade_offs] * 0.13-a0-443-gbf44022: Differentiate Iridescent and Rough Black scales 10(7 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=bf44022109c1
12:21:05 <Cheibriados> 03Cryp71c 07[ds_trade_offs] * 0.13-a0-444-g9419d3c: New DS mutation: Runed Hands 10(5 days ago, 4 files, 31+ 6-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=9419d3ce48ae
12:21:05 <Cheibriados> 03Cryp71c 07[ds_trade_offs] * 0.13-a0-445-g13fe03c: Reorder runed_hands in the mutation list 10(2 days ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=13fe03cbce17
12:21:05 <Cheibriados> ... and 1 more commits
12:21:07 <|amethyst> let's see
12:21:50 <|amethyst> looks like you lost a few commits of mumra's
12:22:10 <Cryp71c> |amethyst, the product of having the wrong command, or one of the branches not being up to date?
12:22:14 -!- blabber has joined ##crawl-dev
12:22:17 <|amethyst> Cryp71c:  both
12:22:21 <mumra_> this is stuff i committed in the last hour or so
12:22:45 <|amethyst> infiniplex:  could you re-push those two commits
12:22:54 <|amethyst> oh
12:22:58 <mumra_> i pushed them
12:22:59 <|amethyst> who pushed those two
12:23:12 <elliptic> it looks like master lost seven commits, all pushed by mumra
12:23:27 <Cryp71c> Sigh, terribly sorry guys. Back to the git manual to re-read it.
12:23:51 <|amethyst> mumra_:  re-push those two, master is currently on daf1e84
12:24:28 <mumra_> pushed
12:24:33 -!- mumra_ is now known as mumra
12:24:35 <|amethyst> Cryp71c:  As a rule of thumb, whenever you use --force you should fully specify everything
12:25:10 <|amethyst> Cryp71c:  I even do   push origin foobar:foobar   even though that's the same as   push origin foobar
12:25:20 <|amethyst> Cryp71c:  just to be extra-sure of what's going to happen
12:25:32 <Cryp71c> |amethyst, that's localname:remotename correct?
12:25:36 <|amethyst> yes
12:25:42 <|amethyst> with fetch it's the opposite order
12:26:09 <Cheibriados> 03mumra 07* 0.13-a0-436-g34441b6: Determine bordering cells during grid subdivision 10(72 minutes ago, 1 file, 58+ 11-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=34441b62d987
12:26:09 <Cheibriados> 03mumra 07* 0.13-a0-437-g8959c30: Lua util.random_weighted_keys for picking random hashmap elements 10(71 minutes ago, 1 file, 19+ 0-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=8959c3091c80
12:26:09 <Cheibriados> 03mumra 07* 0.13-a0-438-g516ff4c: A grid-based maze layout 10(69 minutes ago, 1 file, 123+ 0-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=516ff4c0972f
12:26:09 <Cheibriados> 03mumra 07* 0.13-a0-439-g741ecc0: Adjust some weights of cave layouts 10(68 minutes ago, 1 file, 7+ 6-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=741ecc082875
12:26:09 <Cheibriados> 03mumra 07* 0.13-a0-440-gdaf1e84: Spacing fix 10(68 minutes ago, 1 file, 0+ 2-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=daf1e84c6f76
12:26:09 <Cheibriados> 03infiniplex 07* 0.13-a0-441-g09829b8: Modified layout_dis to a max 1 door per room wall 10(17 hours ago, 1 file, 61+ 22-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=09829b88fd36
12:26:09 <Cheibriados> 03infiniplex 07* 0.13-a0-442-ge03f76a: Forbid layout_dis placing adjacent statues 10(17 hours ago, 1 file, 11+ 4-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=e03f76a5c047
12:26:17 <|amethyst> (and actually foobar:foobar isn't the same as foobar unless that's the branch you're sitting in)
12:26:29 <Cryp71c> so current ds_trade_offs is still wrong because it was pushed with stuff wrong, but your ds_trade_offs_fixed is still correct?
12:27:09 -!- dtsund has joined ##crawl-dev
12:27:09 <|amethyst> Cryp71c:  let me look at ds_trade_offs
12:27:38 <|amethyst> Cryp71c:  it's not "wrong", but isn't based on the latest master
12:27:58 <Cryp71c> Alright, let me look back at your instructions and see if I can fix it myself
12:28:10 <Cryp71c> s/fix it/get it based on latest master
12:28:12 <|amethyst> Cryp71c:  btw, you can   git fetch origin master:master   to update your master (it should be at e03f76a)
12:28:22 <|amethyst> Cryp71c:  so you don't have to keep changing branches to update them
12:28:23 -!- st_ has joined ##crawl-dev
12:29:26 <mumra> !tell rwbarton we made some changes to layout_dis adding more variation, infiniplex stopped adjacent statues placing but i'm not sure how necessary this was; if you liked the statues how they were let me know and i'll revert ;)
12:29:27 <Henzell> mumra: OK, I'll let rwbarton know.
12:30:12 <|amethyst> Cryp71c:  and just make sure when you do the forced push you explicitly specify the branch
12:32:00 -!- namad7 has quit [Ping timeout: 264 seconds]
12:35:31 -!- nonethousand has joined ##crawl-dev
12:37:07 -!- gowby has quit [Ping timeout: 245 seconds]
12:40:56 <Cryp71c> |amethyst, hrm, re did the process, but I got "everything up to date" so I've clearly missed something. I re-fetched ds_trade_offs_fixed:ds_trade_offs and the push'd ds_trade_offs:ds_trade_offs
12:41:27 -!- MarvinPA_ has joined ##crawl-dev
12:44:29 -!- Aryth1 has quit [Ping timeout: 246 seconds]
12:45:48 -!- MarvinPA has quit [Ping timeout: 264 seconds]
12:45:48 -!- MarvinPA_ is now known as MarvinPA
12:48:06 -!- Yen_ has quit [Ping timeout: 272 seconds]
12:51:16 -!- eb has quit [Client Quit]
12:54:56 -!- ZRN has quit [Ping timeout: 255 seconds]
12:57:08 -!- gowbby has quit [Ping timeout: 245 seconds]
12:58:15 <Cryp71c> |amethyst, if I'm not here by the time you read my last message, feel free to leave a message :)
13:04:00 <|amethyst> looks like ds_trade_offs is good now
13:04:12 <|amethyst> Cryp71c:  ohh right
13:04:37 <|amethyst> Cryp71c:  I did that before you said you'd fix it yourself... then forgot about it
13:05:07 <|amethyst> Cryp71c:  so they are the same... linear, based on a master about two commits back
13:06:00 <|amethyst> Cryp71c:  you can rebase off master again and forced push if you want to incorporate those two commits
13:06:06 -!- mnoqy has joined ##crawl-dev
13:06:21 <|amethyst> and you can delete the ds_trade_offs_fixed branch
13:16:34 -!- sacje has quit [Read error: Connection reset by peer]
13:17:25 -!- CKyle has quit [Quit: CKyle]
13:19:15 -!- CKyle has joined ##crawl-dev
13:21:30 -!- floatboth has quit [Quit: floatboth]
13:21:48 <Cheibriados> rF doesn't resist red ugly thing fire damage <https://crawl.develz.org/mantis/view.php?id=6960> by morik
13:23:23 -!- gowby has quit [Ping timeout: 245 seconds]
13:41:44 -!- andermetal has quit [Remote host closed the connection]
13:43:39 <Cryp71c> |amethyst, so presuming I go about my merry way and when this merges, create a temp branch and rebase that onto master (then merge the temp branch onto master), while I'm working right now, is there anything which would push me towards merging master into ds_trade_offs or rebasing master on ds_trade_offs ?
13:45:28 -!- SchwaWarrior has quit [Ping timeout: 245 seconds]
13:48:05 -!- bmfx has quit [Ping timeout: 268 seconds]
13:51:47 -!- Stelpa has quit [Ping timeout: 268 seconds]
13:56:53 <SamB> Cryp71c: well, I think merges are easier not to screw up
13:57:30 <SamB> also I think you've got rebase the wrong way 'round: usually we would say it "rebaing ds_trade_offs on master"
14:01:12 -!- Nivim has left ##crawl-dev
14:02:58 -!- Datul has quit [Ping timeout: 245 seconds]
14:03:47 -!- Bear_ has quit [Ping timeout: 245 seconds]
14:04:12 -!- SchwaWarrior has quit [Ping timeout: 245 seconds]
14:06:47 -!- Chozo has quit [Read error: Connection reset by peer]
14:07:48 -!- mizu_no_oto has quit [Quit: ["Textual IRC Client: www.textualapp.com"]]
14:10:33 -!- johnny0 has quit [Read error: Connection reset by peer]
14:13:48 -!- Bear__ has quit [Ping timeout: 245 seconds]
14:13:48 -!- ryansee has quit [Ping timeout: 245 seconds]
14:15:20 -!- Svendre has quit []
14:15:29 -!- bonghitz has quit [Remote host closed the connection]
14:15:58 -!- anastasios has quit [Ping timeout: 245 seconds]
14:17:19 -!- Snarwin has quit [Quit: leaving]
14:18:19 -!- _D_ has quit [Quit: leaving]
14:19:28 -!- simmarine has joined ##crawl-dev
14:19:30 <Cryp71c> SamB, where ds_trade_offs is the current branch?
14:19:45 <SamB> Cryp71c: yeah
14:23:40 -!- jeanjacques has quit [Quit:  quit]
14:24:10 <Cryp71c> SamB, so if master is 2 commits ahead of ds_trade_offs (which I've been told it is), while I'm on ds_trade_offs I should be able to "git pull master" to merge the two commits from master into ds_trade_offs?
14:25:12 <SamB> well, there's not much point unless those two commits are particularly relevant
14:25:32 * SamB goes to look at what they are
14:26:51 -!- ShadeTornado has quit [Quit: Leaving]
14:29:38 <SamB> just looks like layout changes
14:29:56 <mumra> yeah they are teeny tiny changes
14:30:37 -!- CKyle has quit [Quit: CKyle]
14:31:37 -!- Arivia has quit [Quit: rivs is afk (probably sleeping)]
14:31:37 -!- Blazinghand_ has quit [Read error: Connection reset by peer]
14:43:46 -!- Adder has quit [Ping timeout: 245 seconds]
14:47:06 -!- quackv4 has quit [Ping timeout: 256 seconds]
14:47:43 -!- quackv4 has joined ##crawl-dev
14:48:34 <SamB> huh, this yred vault didn't zombify the dude for some reason
14:48:58 -!- kek has joined ##crawl-dev
14:50:10 <SamB> dk_yredelemnul_ordeal seems to be the name
14:52:27 <mumra> maybe broken since zombie changes
14:53:25 <SamB> maybe I'm mixing it up with another one
14:54:13 -!- bonghitz has quit [Ping timeout: 248 seconds]
14:55:17 -!- morik is now known as morik__
14:55:20 -!- morik__ has quit [Quit: Leaving.]
14:56:13 -!- CKyle has joined ##crawl-dev
14:56:22 <SamB> okay, yeah, it seems in this one you are just supposed to kill the dude
14:56:23 -!- drage_lanyon has quit [Quit: ChatZilla 0.9.88.2 [Firefox 15.0/20120824154833]]
14:57:32 -!- SchwaWarrior has quit [Ping timeout: 245 seconds]
14:57:41 -!- CKyle has quit [Client Quit]
14:57:48 <Cheibriados> Felid - crashes, corrupts saved game after dying with 2 lives remaining <https://crawl.develz.org/mantis/view.php?id=6961> by ylwsub68
14:59:41 <SamB> got it mixed up with tgw_kikubaaqudgha in kiku_cage.des
14:59:56 <SamB> I guess I can't keep the super-evil gods straight
15:03:07 <SamB> or I'm not mixing them up, but just don't get how the vaults fit with the gods
15:03:23 -!- BadHygiene has quit [Ping timeout: 245 seconds]
15:03:48 -!- Thalfon has quit [Ping timeout: 245 seconds]
15:04:16 -!- Serfuzz has quit [Remote host closed the connection]
15:04:27 <SamB> so am I correct in thinking Oka is neutral on the good/evil scale?
15:05:53 <elliott> yes
15:05:55 -!- CKyle has joined ##crawl-dev
15:08:50 -!- andermetalsh has quit [Ping timeout: 252 seconds]
15:09:06 -!- CreepingCrawled has quit [Ping timeout: 264 seconds]
15:14:16 <mnoqy> neutral & nonchaotic
15:17:14 * SamB finds this in the source
15:17:27 * SamB discovers that trog isn't evil either
15:17:48 <mnoqy> is beogh still evil? i remember there being a bunch of arguments about that one
15:18:20 <SamB> so why do we not have is_lawful_god ?
15:18:41 -!- infiniplex has joined ##crawl-dev
15:18:54 <SamB> mnoqy: looks like
15:18:56 <|amethyst> because it hasn't been relevant
15:19:12 -!- SchwaWarrior_ has quit [Ping timeout: 245 seconds]
15:19:25 <mnoqy> well "good" just has to do with switching between good gods
15:19:31 <mnoqy> likewise with evil and chaotic
15:19:42 <mnoqy> ..maybe a bit with piety too
15:19:47 <|amethyst> evil and chaotic are mostly there because some things hate them
15:19:53 <mnoqy> maaaaybe cleansing flame?
15:19:55 -!- yalue has quit [Read error: Connection reset by peer]
15:20:00 <|amethyst> Zin's recitations
15:20:03 <mnoqy> ah yes
15:20:06 <|amethyst> care about who the monster worships
15:20:15 <|amethyst> bolt of zin
15:20:27 <SamB> and Xom doesn't hate lawful?
15:20:56 <mnoqy> xom will give wrath regardless of who you abandon to
15:20:59 <|amethyst> nope... nor does lugonu
15:21:02 <mumra> Xom doesn't hate anything
15:21:14 <|amethyst> no one has anti-lawful attacks or anything like that
15:21:29 <phyphor> Xom loves and hates with equal abandon
15:21:48 -!- floatboth has quit [Quit: floatboth]
15:22:39 -!- TheOverlord has quit [Ping timeout: 258 seconds]
15:24:01 -!- rossi has quit [Ping timeout: 248 seconds]
15:24:48 -!- Kalir has quit [Ping timeout: 252 seconds]
15:25:43 -!- bonghitz has quit [Ping timeout: 260 seconds]
15:28:33 -!- sbanwart__ has quit [Ping timeout: 240 seconds]
15:33:32 -!- alefury has joined ##crawl-dev
15:40:48 -!- ldf has quit [Read error: Connection reset by peer]
15:41:56 -!- Stendarr has quit [Ping timeout: 246 seconds]
15:48:00 -!- Kalir has quit [Changing host]
15:49:15 -!- BadHygiene_ has quit [Quit: Page closed]
15:50:26 -!- blabber has quit [Quit: leaving]
15:54:22 -!- ZChris13 has joined ##crawl-dev
15:54:37 -!- Zifmia has quit []
15:55:22 -!- LexAckson has quit [Quit: Leaving]
15:56:59 -!- scummos^ has quit [Quit: Konversation terminated!]
15:59:08 -!- scummos^ has quit [Client Quit]
16:08:56 -!- keszocze has quit [Quit: Lost terminal]
16:12:05 -!- ahpla has quit [Ping timeout: 252 seconds]
16:17:23 -!- CKyle has quit [Quit: CKyle]
16:19:24 -!- magicpoints has quit []
16:23:33 <Pacra> <|amethyst> no one has anti-lawful attacks or anything like that
16:23:53 <Pacra> clearly we need to institute d&d 3.5 alignment axis
16:24:03 * Grunt shudders.
16:25:52 -!- VolteccerJack has quit [Ping timeout: 245 seconds]
16:26:15 -!- Sealero has quit []
16:28:33 <SwissStopwatch> but we can still be lawful good if we kill 99% of the stuff in the dungeon right
16:28:42 -!- Wehk has joined ##crawl-dev
16:29:44 -!- dupo has quit [Ping timeout: 258 seconds]
16:31:06 -!- ussdefiant has joined ##crawl-dev
16:32:15 -!- mizu_no_oto has quit [Read error: Operation timed out]
16:34:58 <Pacra> yes. no lemuel vault angels though, you chaotic evil monster
16:35:28 -!- Wehk has quit [Quit: Forlater kanalen]
16:37:05 <galehar> the player's alignement is true murderer
16:38:29 <SwissStopwatch> well not if you die to the first enemy...
16:39:16 <galehar> that's still what you intended to do, even if you fail
16:39:59 <SwissStopwatch> you might've been on a pacifist run, there's no way for the game to know until you kill someone
16:41:23 -!- mnoqy has quit [Quit: hello]
16:41:30 <elliott> what about pacifist games?!
16:41:33 <elliott> oh, I can't read.
16:53:20 -!- Krenium has quit [Ping timeout: 252 seconds]
16:56:30 -!- bonghitz has quit [Ping timeout: 264 seconds]
16:57:29 -!- CKyle has joined ##crawl-dev
17:02:00 -!- CKyle has quit [Ping timeout: 264 seconds]
17:02:04 -!- home has quit [Quit: Leaving]
17:03:49 -!- santiago_ has quit [Ping timeout: 248 seconds]
17:04:30 <Cheibriados> 03Translators 07* 0.13-a0-443-g05760b0: [Transifex] Sync 10(20 minutes ago, 6 files, 914+ 15-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=05760b0c3fac
17:05:46 -!- CKyle has joined ##crawl-dev
17:08:13 -!- alefury|2 has joined ##crawl-dev
17:08:13 -!- buki has quit [Read error: Connection reset by peer]
17:08:23 -!- alefury has quit [Ping timeout: 246 seconds]
17:09:08 -!- Nightbeer has quit [Read error: Connection reset by peer]
17:09:36 <Cheibriados> Converted connecting rooms from layout_honeycomb to C++ <https://crawl.develz.org/mantis/view.php?id=6962> by infiniplex
17:13:09 -!- Yen_ has quit [Ping timeout: 252 seconds]
17:17:36 -!- CKyle has quit [Quit: CKyle]
17:18:33 -!- HellTiger has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/]
17:18:47 -!- blackcustard has joined ##crawl-dev
17:22:17 -!- localhost has quit [Ping timeout: 256 seconds]
17:27:03 -!- scummos_ has quit [Ping timeout: 260 seconds]
17:27:47 -!- Kalir has quit [Quit: CADENZA-CLASS CLOCKWORK KNIGHT--OPERATION TERMINATED]
17:32:34 -!- edlothiol has quit [Ping timeout: 256 seconds]
17:32:40 -!- buki_ is now known as buki
17:34:25 -!- ryansee_ has quit [Quit: Page closed]
17:39:55 <Cheibriados> 03elliptic 07* 0.13-a0-444-gce3eadc: Fix Finesse being applied multiple times for reaching attacks. 10(18 minutes ago, 1 file, 5+ 6-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=ce3eadc75486
17:39:55 <Cheibriados> Cherry-picked 1 commit into stone_soup-0.12
17:40:53 -!- Fhqwhgads_ has quit [Ping timeout: 240 seconds]
17:40:56 -!- Fhqwhgads__ is now known as Fhqwhgads_
17:41:12 <Sizzell> Unstable branch on crawl.s-z.org updated to: 0.13-a0-444-gce3eadc (34)
17:42:20 <Sizzell> Stable (0.12) branch on crawl.s-z.org updated to: 0.12-b1-126-g5f1cdff
17:43:44 -!- madreisz has quit [Ping timeout: 256 seconds]
17:45:06 -!- infiniplex has quit [Quit: Page closed]
17:49:43 -!- Xenobreeder has quit [Ping timeout: 264 seconds]
17:54:43 <Henzell> Unstable branch on crawl.akrasiac.org updated to: 0.13-a0-444-gce3eadc (34)
17:57:00 <SamB> mumra: gonna take that patch? ^
17:57:43 <mumra> SamB: which you mean infiniplex's ?
17:59:39 <SamB> yeah
18:01:02 -!- ldf has quit [Quit: ldf]
18:06:41 <mumra> i think so ... random_rectangle_iterator and the other function are pretty useful ... need to test of course
18:08:54 <mumra> layout_honeycomb is a decent layout (it's one of infiniplex's anyway) and making it more reliably bigger seems good
18:09:46 -!- gluop has quit [Ping timeout: 258 seconds]
18:15:35 -!- alefury|2 has quit []
18:16:30 -!- InternetKraken has quit [Quit: Page closed]
18:17:14 -!- Chozo has quit [Remote host closed the connection]
18:26:25 <Henzell> Stable (0.12) branch on crawl.akrasiac.org updated to: 0.12-b1-126-g5f1cdff
18:29:44 -!- geekosaur has quit [Excess Flood]
18:30:07 -!- geekosaur has joined ##crawl-dev
18:33:12 -!- soundlust has quit [Ping timeout: 264 seconds]
18:41:43 -!- st_ has quit [Ping timeout: 260 seconds]
18:46:36 -!- santiago_ has quit [Read error: Connection reset by peer]
18:50:20 -!- Datul has quit [Quit: Page closed]
18:51:23 -!- mizu_no_oto has quit [Quit: Computer has gone to sleep.]
18:52:44 -!- popbob_ has quit [Read error: Connection reset by peer]
18:53:10 -!- popbob_ has joined ##crawl-dev
18:54:14 -!- popbob_ has quit [Read error: Connection reset by peer]
18:54:39 -!- popbob_ has joined ##crawl-dev
18:59:15 -!- dtsund has quit [Ping timeout: 276 seconds]
18:59:17 -!- kek has quit [Quit: Kicked by KickServ]
19:00:58 -!- pelotr0n has quit [Ping timeout: 245 seconds]
19:01:26 -!- st_ has joined ##crawl-dev
19:07:32 -!- eb has quit []
19:10:11 -!- TheOverlord has quit [Ping timeout: 246 seconds]
19:10:18 -!- bonghitz has quit [Remote host closed the connection]
19:10:54 <Cheibriados> Lair entrance blocked by teleport traps <https://crawl.develz.org/mantis/view.php?id=6963> by prozacelf
19:11:20 -!- santiago_ has joined ##crawl-dev
19:13:57 <santiago_> is it possible to remove the "Your cloak unmelds." "Your cloak melds." when you cast a form spell while in another form?
19:20:14 <SamB> probably not terribly easy
19:20:25 <SamB> you're welcome to try ;-)
19:22:25 -!- m1nced has quit [Quit: Page closed]
19:22:41 <st_> just mute all melding messages, not like they are useful
19:24:33 -!- rossi has quit [Ping timeout: 248 seconds]
19:27:48 -!- Utis has quit [Remote host closed the connection]
19:29:12 -!- FullRinse has quit [Client Quit]
19:34:06 -!- Fear has quit [Quit: Leaving]
19:41:44 -!- Blade- has quit [Quit: Page closed]
19:42:18 -!- Sprort has quit [Read error: Connection reset by peer]
19:51:30 -!- morik has quit [Disconnected by services]
19:51:33 -!- morik1 is now known as morik
19:51:53 -!- Overlord is now known as TheOverlord
19:57:17 -!- Zermako has quit []
19:57:39 -!- notmadreisz has quit [Read error: Connection reset by peer]
20:00:47 -!- freefall has quit [Remote host closed the connection]
20:01:43 -!- herself has quit [Ping timeout: 264 seconds]
20:03:48 -!- Kellhus has quit [Ping timeout: 245 seconds]
20:05:27 -!- gowby has quit [Ping timeout: 245 seconds]
20:12:12 -!- ussdefiant has quit [Ping timeout: 256 seconds]
20:15:10 -!- yxhuvud has quit [Quit: Nettalk6 - www.ntalk.de]
20:16:30 -!- Yllodra has quit []
20:19:12 -!- lambskin has quit [Ping timeout: 245 seconds]
20:21:49 -!- Poncheis has quit [Quit: ChatZilla 0.9.90 [Firefox 20.0.1/20130409194949]]
20:26:56 -!- Raycaster has quit [Ping timeout: 256 seconds]
20:27:59 -!- morik has quit [Quit: Leaving.]
20:28:29 <elliptic> it looks like builds on http://crawl.develz.org/trunk/ haven't been updated since 0.12 branching...
20:29:18 <Grunt> How does that get updated, anyway? I remember the same problem happening around the time 0.11 was branched.
20:29:53 <Grunt> The RSS feeds next to the links are being updated...
20:30:10 <Grunt> (some of them, at least)
20:34:51 <SamB> I assume Napkin has to edit PHP using ed(1)
20:35:02 <Grunt> The standard text editor!!!
20:35:02 -!- Lightli has quit [Ping timeout: 245 seconds]
20:35:56 -!- mnoqy has joined ##crawl-dev
20:40:20 -!- anastasios is now known as Pedjt
20:42:01 -!- ShadeTornado has quit [Quit: Leaving]
20:45:41 -!- ckyle has joined ##crawl-dev
20:50:15 -!- WalkerBoh has quit [Remote host closed the connection]
20:52:38 -!- morik has quit [Disconnected by services]
20:52:40 -!- morik1 is now known as morik
20:53:49 -!- SteampunkDuck has quit [Quit: Lost terminal]
20:57:37 -!- Zelda has quit [Quit: leaving]
21:05:20 -!- sbanwart__ has quit [Ping timeout: 258 seconds]
21:06:08 -!- imantor has quit [Read error: Operation timed out]
21:16:22 -!- the_glow has quit [Read error: Connection reset by peer]
21:19:32 -!- SwissStopwatch has quit [Ping timeout: 252 seconds]
21:35:51 -!- ckyle has quit [Quit: ckyle]
21:36:04 -!- mikee_ has joined ##crawl-dev
21:37:57 -!- Sorbius has quit [Quit: Leaving]
21:39:15 -!- Wester has quit [Quit:  HydraIRC -> http://www.hydrairc.com <- *I* use it, so it must be good!]
21:39:25 -!- Insomniak` has joined ##crawl-dev
21:40:00 <Insomniak`> hello
21:40:08 <Grunt> o/
21:40:22 <Insomniak`> i'm still having problems with using wscons to play crawl in text mode
21:40:48 <SamB> wscons?
21:40:55 <Insomniak`> yeah
21:41:02 <Insomniak`> NetBSD console
21:41:06 <SamB> oh
21:41:06 -!- eith has quit [Ping timeout: 276 seconds]
21:41:16 <|amethyst> you've set ascii charset?
21:41:22 <|amethyst> wscons doesn't support unicode
21:41:23 <Insomniak`> i've tried all 4
21:41:39 <|amethyst> and what shows up wrong when you use ascii?
21:42:49 <Insomniak`> i still get ?'s for water and ?? for some plants
21:43:15 <|amethyst> hm... I thought water was ~ with charset=ascii
21:43:19 <Insomniak`> and it's the same in both 80x25 and 80x50
21:43:43 <|amethyst> you don't have any   feathre =   settings
21:43:45 <|amethyst> ?
21:43:46 <Insomniak`> i got a game going here right now if you wanna observe
21:43:47 <|amethyst> err
21:43:49 <|amethyst> feature =
21:44:10 <|amethyst> oh
21:44:11 <Insomniak`> on CAO
21:44:28 <|amethyst> hm, let me check your rc
21:44:39 <SamB> so I guess we could check his rc file -- at least, those of us who know which command goes with which server ...
21:45:09 <|amethyst> http://crawl.akrasiac.org/rcfiles/crawl-0.12/Insomniak.rc
21:45:12 <Grunt> I'm seeing ≈ for water there...
21:45:28 <Grunt> "char_set = ascii" is commented out
21:45:29 <|amethyst> Insomniak`:  you don't have char_set
21:45:40 <|amethyst> what Grunt said
21:45:46 <|amethyst> lines starting with #  are ignored
21:45:47 <Insomniak`> wtf i had it set for ibm
21:46:03 <Insomniak`> oh, nvm, that's on my trunk settings
21:46:17 <|amethyst> IBM etc won't work... anything other than seven-bit and crawl will produce UTF-8 encoded output
21:46:23 <Grunt> It's commented out on your trunk settings too <_<
21:46:57 <SamB> personally I delete practically the whole file so I don't have to scroll so much in the editor
21:47:12 <elliott> IMO the file should just be blank with a comment linking to the options guide
21:47:24 -!- Fhqwhgads_ has quit [Remote host closed the connection]
21:47:32 <elliott> it's just redundant noisy duplicated documentation that will get out of date and is more likely to confuse than help anyone who wants to customise their RC :P
21:47:35 <Insomniak`> will dec work?
21:47:41 <Insomniak`> i'm using vt220 emulation
21:47:50 <SamB> no, utf-8 still applies
21:47:58 <Insomniak`> but I got it set to pcvt25-color
21:48:15 <SamB> unless you know something we don't know about curses?
21:48:24 <Insomniak`> alright so I just gotta set to ascii, uncomment it
21:48:28 <Insomniak`> ?
21:48:36 <|amethyst> that should work
21:48:48 <|amethyst> you'll get ~ for water, 7 for trees, \ for arches/portals, etc
21:49:19 * SamB wonders if screen can translate utf-8 to ACS
21:50:24 <Insomniak`> i like the way crawl looks with code page 437 characters
21:50:43 <|amethyst> Insomniak`:  it might be possible to use screen to get that effect
21:51:30 -!- freefall has quit [Ping timeout: 276 seconds]
21:53:49 <|amethyst> Insomniak`:  i.e. run screen, use ^A:encoding utf-8   to set the encoding for the current window
21:54:14 <|amethyst> Insomniak`:  then screen should translate between UTF-8 and your terminal's encoding (assuming your locale is properly set to the terminal's encoding)
21:54:53 -!- Dixlet has joined ##crawl-dev
21:55:11 <|amethyst> Insomniak`:  however, not all the characters will exist in your terminal's encoding... and I don't know if it handles line-drawing stuff (what SamB wondered)
21:57:17 <|amethyst> (it looks like, no, it does not: I get "a" for walls, "?" for floor when I try that with char_set = ibm
21:57:39 -!- Cryp71c_ has joined ##crawl-dev
21:57:46 -!- Cryp71c has quit [Disconnected by services]
21:57:48 -!- Cryp71c_ is now known as Cryp71c
21:57:51 <|amethyst> and something not quite as bad but still wrong for dec
21:58:11 -!- Cryp71c_ has joined ##crawl-dev
21:59:46 -!- pelotron has quit [Ping timeout: 258 seconds]
22:01:34 -!- Ragnor has quit [Read error: Connection reset by peer]
22:01:49 <Insomniak`> alright fnally got a gmae with some water in it
22:01:55 <Insomniak`> *finally, game
22:02:14 <Grunt> Looks like ~ to me.
22:02:25 -!- dtsund has joined ##crawl-dev
22:02:27 <Insomniak`> same on my end
22:02:36 <Grunt> Hooray.
22:02:53 <Insomniak`> it's still going to be weird, though
22:03:07 <Insomniak`> "\" for portals?
22:03:13 <Grunt> Yes.
22:05:20 -!- morik has quit [Quit: Leaving.]
22:05:20 <|amethyst> apparently someone made a unicode console driver for NetBSD called "ucons" but the link is broken and I haven't seen anything more recent than three years old
22:05:54 -!- MarvinPA_ has joined ##crawl-dev
22:05:58 -!- Dixlet has quit [Ping timeout: 256 seconds]
22:06:06 <Insomniak`> crawl usually uses ? for portals ?
22:06:17 <Grunt> ? is scrolls    :b
22:06:41 <|amethyst> Insomniak`:  in unicode mode it's an intersection sign (an arch)
22:06:43 <Grunt> Did you mean ∩?  Because that didn't come through here.
22:07:20 <|amethyst> which, since it's not ascii, would show up as mojibake or maybe a question mark for you
22:08:03 <Gretell> Debian builds of the trunk branch on crawl.develz.org updated to: 0.13-a0-444-gce3eadc
22:08:07 -!- Boyo has quit [Quit: Page closed]
22:08:38 <Cryp71c> Not quite sure whether this algorithm is statistically balanced...I'm selecting a spell to "seal" where the first spell in a monster's spell list is guaranteed to be chosen and each subsequent spell may be chosen instead based on coinflip(). For a monster with 8 spells long, it seems to me that the very last spell has a coinflip() (50%) chance of being chosen and the earlier spells are less likely?
22:08:39 * SamB believes he uses dec locally, so he's used to a paragraph symbol
22:08:42 <Insomniak`> heh i tried to copy the intersection sign
22:09:21 -!- MarvinPA has quit [Ping timeout: 258 seconds]
22:09:21 -!- MarvinPA_ is now known as MarvinPA
22:09:29 <Insomniak`> i didn't know it wasn't an ascii character
22:09:41 <|amethyst> Cryp71c:  yes, exponentially less likely the earlier in the list
22:09:49 <Grunt> Cryp71c, do this:
22:09:54 <SamB> Cryp71c: why don't you just roll a die to pick the slot?
22:09:59 -!- morik1 has quit [Client Quit]
22:10:12 <Grunt> SamB: because that might pick an already sealed slot?
22:10:33 <Grunt> I've seen "if (one_chance_in(++num_spells))"-type logic a few times.
22:10:48 <|amethyst> that was going to be my suggestion
22:10:50 <SamB> I didn't say it should simply roll for the slot number ;-P
22:11:02 <|amethyst> 1/1 for the first selectable slot, 1/2 for the second, 1/3 for the third, etc
22:11:18 <SamB> oh, hmm
22:11:29 <|amethyst> what SamB suggests is probably better (fewer random numbers)
22:12:01 <|amethyst> i.e. make a list of the currently sealable slots, then choose one of those randomly
22:12:10 -!- Sorbius has quit [Quit: Leaving]
22:13:50 <elliott> |amethyst: 1/1 chance might be a bit of a problem :p
22:14:08 <|amethyst> elliott:  no, it's what you want for that algorithm (you don't stop until the end)
22:14:28 <elliott> right, the phrasing was just funny
22:14:53 -!- DrPraetor has joined ##crawl-dev
22:15:06 <DrPraetor> Most Js should perhaps be immune to blinding?
22:17:06 -!- MarvinPA_ has joined ##crawl-dev
22:17:08 -!- Wester has quit [Quit:  HydraIRC -> http://www.hydrairc.com <- s0 d4Mn l33t |t'z 5c4rY!]
22:17:45 -!- danharaj has quit [Quit: ~ Trillian Astra - www.trillian.im ~]
22:19:01 <Insomniak`> hmm
22:19:17 <Insomniak`> clouds are appearing as 0's
22:19:35 <|amethyst> yup
22:19:53 <|amethyst> the section and currency characters are non-ascii too
22:20:03 -!- MarvinPA has quit [Ping timeout: 252 seconds]
22:20:03 -!- MarvinPA_ is now known as MarvinPA
22:20:20 <Insomniak`> weird
22:20:38 <|amethyst> ASCII doesn't have a lot of characters :)
22:20:38 <Insomniak`> but still, better than having two characters show up to represent 1 tree
22:21:15 <DrPraetor> Okay, Peudocruz (named in honor of Pseudo-democritus) is the god of alchemy.  You get evaporate, you get potion recipes (and thus a decent but not limitless supply of confusion/poison potions), you can turn base metals into gold.
22:21:27 <DrPraetor> Does that sound reasonable?
22:21:31 <|amethyst> besides letters, numbers, and control characters, you have !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~
22:21:35 <elliott> DrPraetor: no
22:22:00 -!- clouded_ has joined ##crawl-dev
22:22:02 -!- st_ has quit [Read error: Connection reset by peer]
22:22:09 -!- tcjsavannah has quit [Quit: Page closed]
22:22:30 -!- clouded_ is now known as st_
22:22:45 -!- MaxFrost has quit [Ping timeout: 258 seconds]
22:24:14 <mumra> DrPraetor: what are this god's conducts and so forth?
22:24:42 <|amethyst> metals to gold sounds bad for the same reason that shops don't buy
22:25:09 <mnoqy> have fun with shoe horning a materials system into crawl for evap god
22:25:13 <DrPraetor> He likes it when you kill enemies with poison or pain damage, or while they are confused.  He likes it when you convert base metals into gold.  Sometimes he will mark enemies for death, he hates it if you let them get away.
22:25:48 <mnoqy> requiring finishing blows done in a certain way sounds prone to tedious gaming
22:25:49 <DrPraetor> mnoqy: It could be pretty basic.  Like, leather armor -> potion of confusion (I think that would give you a reasonable number.)
22:25:59 <mnoqy> so, arbitrary?
22:26:12 <DrPraetor> Yes, completely arbitrary.
22:26:30 <DrPraetor> Alchemy never actually made sense anyway.
22:26:40 <|amethyst> randomized each game?
22:27:04 <mumra> DrPraetor: those conducts don't really fit "alchemy" other than converting base metals
22:27:21 <|amethyst> Marking enemies for death doesn't seem to fit the theme at all
22:27:37 <elliott> this sounds sort of hopeless
22:27:45 <|amethyst> and what would "letting them get away" entail?
22:27:47 <DrPraetor> |amethyst: The enemies have magic nards or something that you are supposed to harvest.
22:27:53 <mumra> poison/pain/confusion only fit the theme in that they're by-products of evap
22:27:58 <mumra> except pain
22:28:15 <DrPraetor> I'm thinking that you make needles as well.
22:28:17 <mnoqy> pain is what you get when you use evap
22:28:21 <mnoqy> (evap joke!!!)
22:28:26 <mumra> haha
22:28:42 <elliott> imo meph god, gives one power: meph; likes it when you use meph
22:28:46 <mumra> this sounds more like "assassin god"
22:28:46 <DrPraetor> I always liked evap.  I agree that Fulsome Distil was a stupid grinding pain.
22:28:51 <elliott> (might be overpowered)
22:28:51 <|amethyst> god of vivisection
22:29:01 <Grunt> |amethyst: get to 6* piety, get the Axe of Woe?
22:29:14 <|amethyst> DrPraetor:  I don't know that hoovering and converting leather armors is a lot better
22:29:17 <mumra> meat god
22:29:27 <Grunt> mumra: you mean Makhleb   :b
22:29:46 <DrPraetor> |amethyst: There are a lot fewer of them.  You'd end up with few enough confusion potions that you'd consider when they were worth using.
22:30:03 <mumra> from the literal tranlsation "makh" meaning "meat", and "leb" meaning, er...
22:30:14 <Grunt> God, obviously.
22:30:18 -!- Lightli has joined ##crawl-dev
22:30:20 <Lightli> http://pastebin.com/4K2dHebj
22:30:27 -!- Unflexed has quit [Ping timeout: 245 seconds]
22:30:28 <Lightli> How evil are these vaults?
22:30:39 <mnoqy> https://crawl.develz.org/wiki/doku.php?id=dcss:brainstorm:god:propose:alchemy hehe theres an evap god on devwiki too
22:30:44 <DrPraetor> |amethyst: But leather might be too common.  I think that the "basic" recipes would want to be fixed, but you'd get higher level recipes for things like curare needles and potions of might, and these would be semi-random.
22:31:57 <DrPraetor> Oh, the pain damage thing is because it's a god of internal alchemy as well as external.  So the other thing you get, are combat bonuses while you are one or more of: Sick, Confused, Rotting, Highly Contaminated.
22:32:22 <mumra> that sounds bad
22:33:00 <Cheibriados> 03elliptic 07* 0.13-a0-445-g980274b: De-runify a door in lightli_orcish_oven. 10(8 minutes ago, 1 file, 1+ 1-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=980274b7961f
22:33:59 -!- drage_lanyon has quit [Quit: ChatZilla 0.9.88.2 [Firefox 15.0/20120824154833]]
22:36:00 <mumra> i do think it's possible to make a god that gave limited evap or something similar but this proposal sounds like it's trying to shoehorn in various things that don't fit
22:36:23 <|amethyst> and there is very little downside to counteract that
22:36:34 <|amethyst> s/that/the bonuses/
22:36:49 <|amethyst> "occasionally, you have to kill a specific monster" isn't really much of a downside
22:37:26 <|amethyst> unless it's a really short timer
22:39:59 <|amethyst> (or, I suppose, a far-away monster:  "I need anaconda spleen!" while you are on D:10 or something like that)
22:40:21 <elliott> i sure love anaconda spleen
22:40:35 <BlastHardcheese> fr troves that want anaconda spleen
22:41:46 <|amethyst> that's the noble that gets a lava trap in his room
22:41:55 -!- TheOverlord has quit [Ping timeout: 258 seconds]
22:42:10 <|amethyst> "Why can't you just like microcline figurines or something?"
22:43:20 -!- mizu_no_oto has quit [Quit: ["Textual IRC Client: www.textualapp.com"]]
22:44:09 -!- Overlord has quit [Ping timeout: 276 seconds]
22:45:52 -!- Lightli has quit [Ping timeout: 245 seconds]
22:46:00 <DrPraetor> Can we have a wasp god that gives you red-wasp venom punches?  And a good martial arts god that gives you electric brand on your punches?
22:46:30 <elliott> ...
22:46:50 * DrPraetor has kung-fu which is suspiciously.... evil.
22:46:57 <Grunt> ??chaos spawn[2
22:46:57 <Henzell> chaos spawn[2/2]: <N78291> Your chaos spawn punches the stone giant. _The stone giant screams as it is devoured by a tear in reality.
22:47:37 <Cheibriados> Chuck (16C) | Spd: 10 | HD: 18 | HP: 120 | AC/EV: 14/2 | Dam: 45 | 10items, 10doors | Res: 06magic(96), 12drown | Chunks: 07contam | XP: 3023 | Sz: Giant | Int: normal.

22:47:37 <|amethyst> %??chuck
22:47:40 <Cheibriados> Norris (04@) | Spd: 10 | HD: 20 | HP: 214 | AC/EV: 1/9 | Dam: 36 | 10weapons, 10items, 10doors, fighter, evil, spellcaster, see invisible | Res: 06magic(133) | Vul: 08holy | Chunks: 07contam | XP: 7343 | Sp: brain feed, smiting (7-17), invisibility, confuse, paralyse, minor healing | Sz: Medium | Int: normal.

22:47:40 <|amethyst> %??norris
22:47:49 <Grunt> 1fight chuck v norris
22:48:01 <Cheibriados> Chuck (16C) | Spd: 10 | HD: 18 | HP: 120 | AC/EV: 14/2 | Dam: 45 | 10items, 10doors | Res: 06magic(96), 12drown | Chunks: 07contam | XP: 3023 | Sz: Giant | Int: normal.

22:48:01 <DrPraetor> %??chuck
22:48:19 <DrPraetor> Is he new?
22:48:27 <Grunt> Chuck is a Sprint unique.
22:48:31 <DrPraetor> Ah.
22:48:34 <Cheibriados> unknown monster: "0.9?chuck"

22:48:34 <SamB> %?0.9?chuck
22:48:38 <Cheibriados> Chuck (16C) | Speed: 10 | HD: 18 | Health: 120 | AC/EV: 14/2 | Damage: 45 | Res: 06magic(96), 12drown | Chunks: 07contaminated | XP: 3023.

22:48:38 <SamB> %0.9?chuck
22:49:07 <SamB> not particularly new
22:49:19 <SamB> ??chuck
22:49:19 <Henzell> chuck[1/1]: A sprint-specific unique stone giant. Collects rocks, comes with a rock of returning.
22:49:20 <DrPraetor> I don't play much sprint.
22:50:53 -!- ckyle has joined ##crawl-dev
22:51:08 <mumra> DrPraetor: a wasp god sounds cool but there's a lot of overlap with spider god
22:51:18 <DrPraetor> Is spider god actually going in?
22:51:24 -!- rchandra has quit [Read error: Connection reset by peer]
22:51:37 -!- rchandra1 is now known as rchandra
22:51:51 <DrPraetor> I think we've got enough branch:=god correspodence as it is, with Beogh and Jivya.
22:52:13 <SamB> wasp is a branch?
22:52:17 <DrPraetor> Problem with a wasp god is that he really wants to give you wasps for corpses - which is almost certainly broken powerful.
22:52:19 <Grunt> It used to be <_<
22:52:36 <DrPraetor> I'm saying a wasp god woul be better than a spider god because there ISN'T a wasp branch.
22:53:00 <SamB> ??wasp
22:53:01 <Henzell> jarpiain[1/1]: !lm wasp spwr rune=fiery 2 -tv:>$
22:53:28 -!- N78291 has quit [Quit: null]
22:53:46 <mumra> !lm wasp spwr rune=fiery 2 -tv:>$
22:53:47 <Sequell> 2/5. wasp, XL12 SpWr, T:4030 (milestone) requested for FooTV (telnet://termcast.develz.org or http://termcast.develz.org).
22:58:09 <mumra> the whole spider god thing mainly basically got bikeshedded to oblivion over the whole biological realism debate i think
22:59:54 <|amethyst> Is "biological realism" a euphemism for "rape"?
23:00:02 <|amethyst> because that seemed to be the big problem
23:02:16 -!- bh has joined ##crawl-dev
23:03:45 <bh> evening
23:04:02 <Grunt> Hi bh.
23:04:13 <bh> !abyss Grunt
23:04:14 <Henzell> bh casts a spell. grunt is devoured by a tear in reality!
23:04:20 * Grunt escapes from the Abyss!
23:04:24 <bh> shucks.
23:05:02 -!- kekekela has quit [Ping timeout: 245 seconds]
23:06:22 <bh> "Spatial maelstrom: leave and think "I can't believe someone with commit rights added a way to summon that""
23:06:23 <bh> hah!
23:06:27 <bh> sometimes the tavern is good.
23:07:36 <mumra> |amethyst: lots of insects inject eggs into living hosts
23:08:12 <bh> brain control wasps are scary
23:08:28 <|amethyst> mumra:  and if it were originally flavoured that way instead of using the word "mate" it wouldn't have provoked the reaction it did
23:08:47 <mumra> yes, wording was the big problem there
23:09:09 <elliott> those living hosts are not usually unique humanoids :P
23:11:32 -!- DracoOmega has joined ##crawl-dev
23:11:54 <Grunt> Hey DracoOmega.
23:11:57 <DracoOmega> Hey
23:12:07 -!- Unflexed_ has quit [Ping timeout: 245 seconds]
23:12:11 <bh> Grunt: here's a good idea: Let's add a monster that if you see it, you just die.
23:12:14 <bh> great idea, right?
23:12:22 <bh> (The tavern will love it)
23:12:42 <Grunt> You meet Medusa's gaze. You turn to stone...
23:12:44 <elliott> didn't grunthack have that
23:13:28 <bh> mumra: should I commit khalil's patch as is?
23:13:44 <elliott> are we talking about the one that crashes the game...
23:13:52 <bh> I'd rather have announced portals in ahead of waiting on him to make the text perfect
23:13:59 <bh> elliott: mumra says it's a bug in the wizmode command
23:14:05 <elliott> ah
23:14:14 <Grunt> Solution: get someone else to write the text.
23:14:36 <bh> That's a fine solution.
23:15:21 -!- dtsund has quit [Ping timeout: 276 seconds]
23:16:52 -!- ussdefiant has joined ##crawl-dev
23:19:21 <mumra> bh: &P means "Primary" vault not "Portal" ;)
23:19:30 <bh> doh.
23:19:43 <mumra> so the fact that it crashes is a bug, really it should say "sorry can't place that vault like this"
23:20:19 -!- fbafelipe has quit [Quit: Saindo]
23:20:26 <bh> worse than crashing, it loops :)
23:21:15 -!- blackcustard has quit [Read error: Connection reset by peer]
23:22:12 -!- Wah has quit [Ping timeout: 252 seconds]
23:22:48 -!- ckyle has quit [Quit: ckyle]
23:24:01 -!- rossi has quit [Ping timeout: 248 seconds]
23:24:49 <mumra> it just keeps vetoing because it can't place the vault i think. same can actually happen if you try to place any vault outside its depth range. there are lots of fun ways to crash the game in wizmode!
23:26:08 <bh> %s/ in wizmode//g
23:26:55 <mumra> ok true
23:28:29 <bh> though reliably crashing the game is a good cheat code.
23:34:11 -!- Luxivar has quit [Remote host closed the connection]
23:35:57 <st_> I don't know what patch this is but I have to question commiting anything by khalil as is
23:36:15 <Grunt> st_: it announces all portal vaults.
23:36:22 -!- DrPraetor has quit [Ping timeout: 256 seconds]
23:36:47 <bh> it also gives mummies memories of past lives.
23:37:11 * Grunt is reminded of an old Mantis ticket about death-cursing monsters that killed player mummies.
23:37:47 <bh> Grunt: that's pretty funny.
23:38:43 <Cheibriados> 03khalil 07* 0.13-a0-446-g1bf6f2f: Announce all Portals 10(4 days ago, 7 files, 46+ 29-) 13http://git.develz.org/?p=crawl.git;a=commitdiff;h=1bf6f2f353d4
23:39:29 <Grunt> https://crawl.develz.org/mantis/view.php?id=5999
23:41:04 <bh> Grunt: What would happen if you worship Makhleb, die, death curse something and gain HP?
23:41:15 <bh> Are you still (un)dead? :)
23:41:30 <Grunt> I remeber there being an exception for a case like that <_<
23:41:35 <Grunt> *remember
23:42:36 <bh> which way should it go?
23:42:58 <bh> I'm inclined to go the lifesaving route because it seems so unlikely and hilarious.
23:49:41 <mumra> bh: you wanted layout pics ;) -- http://pbrd.co/17YmlC7
23:49:45 -!- ZChris13 has quit [Remote host closed the connection]
23:50:08 <Grunt> That's pretty amazeing.
23:53:47 -!- Boyo has quit [Quit: Page closed]
23:53:55 <mumra> it can generate as a proper maze (i.e. only one proper route from any a to any b) or it can have extra circuitous routes
23:56:02 <Grunt> What are the intended branches for this?
23:56:39 <mumra> right now, D/Lair/Dis/Spider
23:57:11 <mumra> but maybe it's possible to do a Lab version where walls switch on and off
23:57:11 -!- InternetKraken has quit [Quit: Page closed]
23:57:33 <Grunt> Dis I can see, but I have a harder time imagining that in D or Lair or Spider.
23:57:45 <|amethyst> Dwarf!
23:57:50 <Grunt> I was envisioning this as sort of Crypt-like, but I guess I haven't seen it in action.
23:57:53 <Grunt> Dwarf, heh.
23:57:59 -!- CKyle has joined ##crawl-dev
23:58:00 <Grunt> Is anyone actually doing anything with Dwarf these days? <_<
23:58:25 <|amethyst> not that I know of, but that doesn't mean it couldn't happen in 0.13