00:01:41 -!- valrus has quit [Remote host closed the connection] 00:14:47 -!- Zaba has quit [Ping timeout: 240 seconds] 00:23:12 next up: two-headed ogres 00:23:44 Two amulets? 00:23:47 Two helmets? 00:24:00 no thats silly. you just shout louder. 00:24:32 two headed ogres are dumb 00:24:33 but if you get hit with a slashing weapon, you get another head (and even more shouting!) 00:24:39 a four-armed race could be potentially cool though 00:29:19 double-wielding/multiple shields? 00:30:08 yes 00:30:15 http://en.wikipedia.org/wiki/Indra like him <3 00:30:20 make them the 'divine race' 00:30:46 demigods? 00:31:10 (heck, here's shiva with a trishula and four arms: http://en.wikipedia.org/wiki/File:Bangalore_Shiva.jpg) 00:47:38 -!- Pseudonut has joined ##crawl-dev 00:49:19 -!- hashc_ has quit [Quit: Ex-Chat] 01:22:32 -!- valrus_ has quit [Remote host closed the connection] 01:41:32 -!- hashc has joined ##crawl-dev 02:20:29 -!- hashc has quit [Quit: Ex-Chat] 02:27:14 -!- galehar has joined ##crawl-dev 02:27:18 morning 02:30:43 Eronarn: Why z/A/B/w/x/y/C/D? 02:34:03 sorear: that's actually how it works for normal rings (inventory letters) 02:34:07 just extended to eight 02:34:18 it's a pretty weird interface, really 02:35:14 the ordering is pretty wtf too 02:35:40 (if you think it has anything to do with hash tables - crawl doesn't use hash tables at all) 02:37:58 the ordering is just left, then right 02:38:06 or in my case, #1-8 02:38:18 the order of your rings will depend on the order you put them on 02:38:58 (also, i've had to modify like 15 files to get wearing multiple rings to work properly and i'm not even done yet) 02:39:10 good way to learn the code though i guess; i read through all of player.cc 02:59:52 -!- Kurper has quit [Remote host closed the connection] 03:53:33 -!- MarvinPA has joined ##crawl-dev 04:14:44 -!- Pseudonut has quit [Remote host closed the connection] 04:15:23 -!- Danei has quit [Ping timeout: 255 seconds] 04:30:55 -!- Mu_ has joined ##crawl-dev 04:57:14 -!- upsy has joined ##crawl-dev 05:05:04 -!- monky has quit [Quit: hello] 05:40:59 -!- Moriasc has joined ##crawl-dev 05:45:14 -!- elliptic has quit [Ping timeout: 265 seconds] 06:28:11 -!- TGWi has quit [Read error: Connection reset by peer] 06:29:58 -!- Zaba has joined ##crawl-dev 06:50:56 -!- Soadreqm has joined ##crawl-dev 07:26:03 -!- MarvinPA has quit [Ping timeout: 265 seconds] 08:05:06 -!- Moriasc has quit [Ping timeout: 240 seconds] 08:25:29 -!- syllogism has joined ##crawl-dev 08:50:16 -!- Twinge has quit [Read error: Connection reset by peer] 08:51:53 -!- Twinge has joined ##crawl-dev 09:36:39 -!- sorear has quit [Remote host closed the connection] 09:36:44 -!- sorear has joined ##crawl-dev 09:37:42 skills.cc:481 cost -= random2(5); // XXX: what's this for? 09:37:47 any idea? 09:38:58 I'm trying to double the XP cost for anti-training and this random reduction is a PITA :( 09:47:29 -!- sorear has quit [Ping timeout: 255 seconds] 09:49:51 -!- sorear has joined ##crawl-dev 10:30:04 -!- enne_ is now known as enne 10:52:09 -!- galehar has quit [Quit: Page closed] 11:25:29 -!- bmh has joined ##crawl-dev 11:29:47 -!- bmh has quit [Client Quit] 12:08:30 -!- monky has joined ##crawl-dev 12:11:27 -!- MarvinPA has joined ##crawl-dev 12:40:59 -!- elliptic has joined ##crawl-dev 13:35:35 -!- Pseudonut has joined ##crawl-dev 13:39:26 -!- MarvinPA has quit [Ping timeout: 240 seconds] 14:22:24 -!- TGWi has joined ##crawl-dev 14:33:30 -!- galehar has joined ##crawl-dev 14:43:04 -!- Kurper has joined ##crawl-dev 15:05:48 -!- syllogism has quit [] 15:49:45 so what's the process for getting a branch put onto CDO? 15:58:23 what branch? 15:58:35 did you finish octopus already? 15:58:41 it's mostly done, yes 15:58:56 it's already playable, i'm just working on making the interface a bit nicer now 15:59:45 obviously i don't expect it to get up there tomorrow just because i made a patch for it, but i am just curious about what the patch => branch => cdo progression typically looks like 16:00:05 I don't know about that 16:00:39 do octupi have basically no slots but rings? 16:00:53 casmith789: soft hat 16:00:59 you should make a wiki page with the design so we can comment on it 16:01:13 also have you considered the synergy with ash? 16:02:11 casmith789: i actually did already tweak ash and xom code relating to rings 16:02:17 (i did ctrl+f RING_LEFT) 16:02:25 there are branches on cdo? 16:02:46 octopi sound fun, square octopi would be better though :P 16:03:06 -!- Cryp71c has quit [Quit: Leaving] 16:03:26 i guess squarelos was but that wasn't exactly usual 16:05:03 mm, this is annoying, i can't figure out why i broke ring swapping 16:15:13 -!- Jude_ has joined ##crawl-dev 16:16:30 -!- due has quit [Ping timeout: 240 seconds] 16:22:49 can acquirement get bucklers normally? 16:22:57 i'm only getting shields 16:24:17 why do all new races have restricted armour slots 16:27:38 ...oh, huh 16:27:45 apparently you can only get large shields from acquirement if you're a big race 16:28:11 and you can only get bucklers if you're a spriggan 16:28:41 eronarn: that sounds messed up 16:29:11 surely it would be better to get a variety of shield types 16:30:01 oh 16:30:09 I noticed that I got loads of shields but thought it was random 16:31:01 elliptic: yeah it's pretty goofy. the acq code in general is 16:31:29 _You're already wearing eight cursed rings! Isn't that enough for you? 16:34:29 I've got a good one too 16:34:37 20 * 0.9 = 17 16:34:55 bloody type casting 16:46:06 sounds right to me. brb voting on budget 16:48:49 casmith789: i just tested, octopus works fine with ash 16:49:06 you need to have 5 cursed jewellery items 16:49:10 awesome 16:49:34 also a cursed shield + cursed hat, because ash counts shields and you have to be above 50% of slots 17:05:11 Silly beard person on c-r-d reformatting all the beards as I asked, but then emailing them directly to me. :P 17:06:03 03galehar * r237f81113d62 10/crawl-ref/source/ (godabil.cc player.cc skills.cc skills.h): Make the check_skill_level_change function public 17:06:07 03galehar * rb24ae68eaf46 10/crawl-ref/source/ (skills.cc skills.h): Anti-training refactoring 17:06:08 03galehar * r538dc9027eea 10/crawl-ref/source/ (skills.cc skills.h): Renamed _weap_crosstrain_bonus to crosstrain_bonus 17:06:19 03galehar * r6bd2a451f10b 10/crawl-ref/source/ (defines.h godabil.cc skills.cc skills.h): Refactor Ashenzari transfer knowledge abiliy 17:06:44 you did send him a link to mantis :/ 17:07:08 enne! hat patch. :3 17:07:23 Eronarn: hat patch? 17:07:41 Are you saying there is one? Or that I should write one? 17:07:56 enne: i made a patch that adds cosmetic variants for hats/helmets, boots, and gloves. including *rare* variants :D 17:08:19 (also, it works on randarts) 17:08:22 Oh! 17:08:26 Link? 17:08:40 it's not online anywhere, it still needs some work; but i'll make a wiki page for it 17:09:08 I thoroughly approve. 17:09:31 Are these doll item or normal item variants? (Or both, ideally?) 17:09:58 it uses item.plus2, which is what is currently used for gloves/gauntlets/bracers 17:10:12 they're the same base item type as normal thogh 17:11:08 so, it works in console too - it just alters the display name, currently 17:12:06 Oh, ok. I see what you're doing. That's a good idea. :) 17:14:11 oh wow, giggle is pretty nice 17:18:21 galehar: I did send him a link to Mantis. Some people are just alergic to filing bugs. 17:18:47 On the other hand, I'm way more likely to just commit this patch than file a bug myself, so I can't fault them for choosing the most effective route. 17:18:48 yeah, I saw 17:18:56 :) 17:21:13 03galehar * r8fdbcaa6c488 10/crawl-ref/source/initfile.cc: Refix double include of option file 17:21:31 -!- galehar has quit [Remote host closed the connection] 17:29:16 okay, so what's the best way to create a patch in git 17:29:24 i'm ready to post octopuses 17:33:36 https://crawl.develz.org/wiki/doku.php?id=dcss:brainstorm:species:octopus 17:45:00 this is a terrible race idea 17:46:23 haha 8 rings, hilarious 17:46:32 seriously this is awful 17:47:01 i don't understand the stuff under the level gain section 17:48:50 https://crawl.develz.org/wiki/doku.php?id=dcss:brainstorm:item:dapper_dress 17:49:15 Zannick: if xp level is evenly divisible by two on level up, give negative HP 17:49:24 if by 5, get a random stat 17:49:26 ah 17:50:16 well, not divisible by two 17:50:18 but i see 17:50:21 Eronarn: what git commands have you run so far 17:50:25 oh, yeah, that one isn't negated oops 17:50:31 sorear: checkout, branch, status, diff 17:50:41 Eronarn: You're getting warmer. 17:51:05 enne: i wish, it's cold here 17:51:38 Eronarn: git config --global user.name James Meickle; git config --global user.email XXX; git commit -a; # type description and comments when prompted; git format-patch -1 17:51:51 oh, i've done commit, yes 17:52:10 then just git format-patch -1 17:52:15 i'm more interested in how to get it to apply cleanly vs. current trunk since i started this two days ago 17:52:19 oh 17:52:22 git pull --rebase 17:58:00 and is that origin/master octopus as the arguments, if my branch is octopus? 18:02:56 One could also co master, pull --ff-only, co octupus, rebase master. 18:03:24 Or, rather, that's what I'd wind up doing, because if I ever knew how pull worked on non-remote-tracking branches, I've forgotten. 18:07:56 -!- Soadreqm has quit [Quit: plumbthroat has a thing for killing insomniac jellyfish] 18:14:25 so what do i actually enter as the name of the remote repo? do i have to use the url? 18:24:30 -!- Jude_ is now known as due 18:24:38 -!- due has quit [Changing host] 18:24:38 -!- due has joined ##crawl-dev 18:24:43 hiii 18:28:33 hi due 18:29:24 due: octopodes. :3 18:29:30 gross 18:29:37 I'm allergic to seafood :| 18:29:38 due: <3 18:41:43 Eronarn: It should all magically work as far as knowing what the remote is. 18:41:55 (This is somewhere in .git/config) 18:49:39 do they have good int? 18:50:59 jld: i just get: 18:51:02 You asked me to pull without telling me which branch you 18:51:02 want to rebase against, and 'branch.octopus.merge' in 18:51:03 your configuration file does not tell me, either. 18:51:10 Spray: yes 18:51:19 awesome 19:03:18 -!- Mu_ has quit [Quit: Defecator, may everything turn out okay so that you can leave this place.] 19:03:36 -!- eith has joined ##crawl-dev 19:16:18 -!- Cryp71c has joined ##crawl-dev 19:27:49 Eronarn: Er, well, if you're on the remote-tracking branch (master), anyway. 19:28:56 do i have to like, rebase my local master, then rebase octopus from the local, or something? 19:30:13 No; you can just pull into the local master, then rebase octopus to that. Thus, "git checkout master", "git pull --ff-only", "git checkout octopus", "git rebase master". 19:30:31 There may be a shorter way of doing that. I'd hoped someone who knows git better would chime in. 19:30:59 (Well, "git rebase master octopus" is the last two) 19:31:21 (Also, if I say "git co", I mean "git checkout". I have some aliases.) 19:31:44 whoah 19:31:49 bars? trippy 19:33:26 Where --ff-only means to bail out instead of merging; i.e., to assert that there are no local changes to the remote-tracking branch. 19:35:30 hmm, now if i do format-patch i just get a patch file with the most recent commit diff to octopus 19:35:37 whereas what i really need is a cumulative one 19:39:52 -!- Cryp71c has quit [Quit: Leaving] 19:45:11 "remote: Counting objects: 25578, done." 19:45:14 Hmm, I may be a little out of date. 19:51:50 -!- eith has quit [Ping timeout: 265 seconds] 19:55:42 [ Read 1335 lines ] 19:55:44 (for the patch) 19:56:34 quick, add two more lines 19:57:34 Eronarn: git diff master..octopus? 19:57:45 that's what i just did, yeah 20:02:40 http://eronarn.info/octopus.patch 20:42:17 -!- Twilight13 has joined ##crawl-dev 20:42:22 -!- Twilight-1 has quit [Read error: Connection reset by peer] 20:49:57 03Enne * rf278bc1286a4 10/crawl-ref/ (40 files in 4 dirs): Improved beards! (Thank you, Terence Reeves.) 20:50:29 Hmm, I guess the hook is still using a capital letter for me. 20:50:32 Whatever. 20:53:49 * due improves Enne's capitalisation. 20:56:50 -!- Pseudonut has quit [Ping timeout: 272 seconds] 20:58:54 * kilobyte mutters something about the capitalisation rules for proper names common to all languages using the Latin alphabet. 21:02:32 What are you trying to imply? I'm following those rules! ;) 21:06:09 Maybe kilobyte is an improper name. 21:14:04 okay, bed - https://crawl.develz.org/wiki/doku.php?id=dcss:brainstorm:species:octopus && https://crawl.develz.org/wiki/doku.php?id=dcss:brainstorm:item:dapper_dress 21:37:03 -!- paggas has joined ##crawl-dev 21:38:17 hej, just wanted to say I spotted a grammar error in crawl :) Specifically, in the phrase "Some of the chunks of flesh in your inventory have completely rotted away.", the past participle of rot is rotten, not rotted :) 21:38:45 Hm 21:39:09 rotted is an acceptable synonym, I Believe. 21:39:30 who cares about irregular past participles 21:39:50 Actually, no, rotten would be completely wrong. 21:40:05 "have completely rotten away"--" has rotted away" is a complicated past tense. 21:40:18 "rotten" ise purely an adejctive/adverbial word. 21:41:22 well then 21:41:40 (for one, I didn't expect such a quick response :P) 21:41:42 p.s. I looked it up and the -en forms are in fact past participles, but ur stil rong 21:42:31 No problem :) 21:42:49 Past participle in this case is purely an adjective/adverb though :) 21:43:29 It still feels a little weird to me at least :P 21:44:03 I just wanted to tell you in case you oversaw it. 21:52:13 past participle is the same as simple past (except for dumb verbs); rotten is only an adjective 21:54:21 also I'm pretty sure that's perfect, not past participle 21:55:48 except perfect uses the past participle; I hate English and I'm going to stop talking now 21:57:59 -!- stabwound has quit [Ping timeout: 265 seconds] 21:59:20 -!- stabwound has joined ##crawl-dev 22:10:58 -!- Pseudonut has joined ##crawl-dev 22:16:14 -!- upsy has quit [Quit: Leaving] 22:37:36 -!- elliptic has quit [Ping timeout: 240 seconds] 23:30:29 -!- TGWi has quit [Quit: Leaving.] 23:31:23 Windows development builds on CDO updated to: 0.8.0-a0-2436-gf278bc1