Print

Please login or register.
1 Hour 1 Day 1 Week 1 Month Forever
Login with username, password and session length

[Urist McTeellox]

Warmist's new showunitsyndrome is in. Ditto for thistleknots ash/coke changes and medicine rebalance.

Master and unified branches are gone. Trying to pull or merge from them will start failing soon. Use gold and beta instead.

I've updated the contributor's guide with info on staying up to date.

Thistleknot: I've sent you a pull request, which should bring all your files up to the latest version. Although sending me patches based on old version is fine too, because git know where you're coming from, and will do the right thing to make sure they apply to the updated files.

2am in Australia, so I'm going to crash into bed soon, or at least get some time in on my Let's Play.

You all rock. Thank you all for your contributions.

~ T

[Billy Jack]

@Splinterz

When you get a chance, could you add the ability to set the [MACRO_MS:??] value in init.txt?

It would actually be nice if there could be a separate tab to manage all of the other settings from init.txt and d_init.txt. I know that DFInit does manage everything, but it starts with a set of defaults rather than reading them in from the existing files.

Thanks

P.S.  I probably wouldn't use those tabs, but I know there are others who do.

[Urist McTeellox]

Just a note that Warlocks alpha 2 is now in SWP alpha. Enjoy.

~ T

[thistleknot]

I have 22 dwarf's, and only 4 have not taken their "yearly" innoculation.

I build about 75-100 regular drinks, and 15-20 medicine... it's slowly but surely working...

update:

now 3 / 22 haven't taken it.  They could have in the past, just need to retake it.  So if an epidemic were to come, only a few would be affected at this point.

[Undeadlord]

Alright, I think I did things right but really I might have messed this up.

I did a fork, made my changes, did a commit and then a push. Was just a small fix for issue 49 and some various misspellings in descriptions I found.

Undeadlord

[Urist McTeellox]

Alright, I think I did things right but really I might have messed this up.

I did a fork, made my changes, did a commit and then a push. Was just a small fix for issue 49 and some various misspellings in descriptions I found.

Huzzah! Dwarves will once again have purple blocks!

However I can't see your commits. Could you try 'git status' to make sure they haven't missed the commit, and another 'git push' to send them to github?  If all goes well we should see them show up on your repository page.

Many thanks!

~ T

[Undeadlord]

Ah sorry, looks like there was an error with the push, I thought it went through. Will try again, setting up git is still confusing for me. I am NOT a programmer

EDIT: Looks like the push worked this time, says everything is up to date, but I don't see them on that repository page. Sorry that I am so bad at this.

[Urist McTeellox]

Ah sorry, looks like there was an error with the push, I thought it went through. Will try again, setting up git is still confusing for me. I am NOT a programmer

If you let me know what the error is, I might be able to help. My guess is that you might be trying to push to my repo rather than yours, in which case you can potentially get away with:

Code: [Select]

git remote set-url origin git@github.com:Undeadlord/masterwork-dwarf-fortress.git

Which will set git to use your own repo, after which point a 'git push' should work fine.

If that's not the cause, I'll actually need the error for clues.

~ T

[Undeadlord]

EDIT: I did run the command you suggested above.

If I do a

Code: [Select]

git commit . I get

Code: [Select]

On branch gold
Your branch is ahead of 'origin/gold' by 1
  (use "git push" to publish your local com

nothing to commit, working directory clean
then with a

Code: [Select]

git push . I get

Everything-up-to-date message.

However if I try just a

git push

with no . I get this

Code: [Select]

$ git push
Permission denied (publickey).
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

[Urist McTeellox]

Code: [Select]

[code]$ git push
Permission denied (publickey).
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

Yup, that's definitely a permissions problem. There's a troubleshooting guide which may help, although I'd be inclined to start about half way down it.  Alternatively, you could try using https for transport, which is more likely to work, but can be less convenient overall, as you may be prompted for your password:

Code: [Select]

git remote set-url origin https://github.com/Undeadlord/masterwork-dwarf-fortress.git
git push

You'll only need to do the `git remote` command once, all pushes after that point *should* work.

I'd start with trying the https solution.

~ T

[thistleknot]

i used github. makes your life a lot easier.

then you just need to do a pull request across forks or something like that

[fasquardon]

It seems a bit wrong to me that burning a fish shells or rat or cockroach corpses produces as much ash in the crematorium as burning a log worth of wood.  It might be worth changing the "burn vermin" and "burn bodyparts" to consume, say 10 vermin corpses and 10 bodyparts to produce 1 lot of ash bars.

fasquardon

[Undeadlord]

Alright, smacked some SSH around and it looked like the push went through, I see my changes under the Commit area.

*fingers crossed*

Undeadlord

Code: [Select]

[code]$ git push
Permission denied (publickey).
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

Yup, that's definitely a permissions problem. There's a troubleshooting guide which may help, although I'd be inclined to start about half way down it.  Alternatively, you could try using https for transport, which is more likely to work, but can be less convenient overall, as you may be prompted for your password:

Code: [Select]

git remote set-url origin https://github.com/Undeadlord/masterwork-dwarf-fortress.git
git push

You'll only need to do the `git remote` command once, all pushes after that point *should* work.

I'd start with trying the https solution.

~ T

[Undeadlord]

I think I got Issue #22 sorted out as well, added some child names, fixed some spellings mistakes. None of the creatures have GENERAL_BABY_NAME tokens, so I skipped that part of the issue.

[There Is No Vic]

It seems a bit wrong to me that burning a fish shells or rat or cockroach corpses produces as much ash in the crematorium as burning a log worth of wood.  It might be worth changing the "burn vermin" and "burn bodyparts" to consume, say 10 vermin corpses and 10 bodyparts to produce 1 lot of ash bars.

fasquardon

I like the current ratio of vermin/parts to ash. It takes a bit of work to get enough ash, but not too much.

Burn Bodyparts to Ash and Burn Vermin to Ash each only have a 50% chance of creating an ash bar.

You're welcome to change the rate.

 If you want to change your current save, edit reaction_masterwork.txt in your save/regionX/raw/objects/ folder. If you want to change for a new world, edit the one in df/raw/objects. Be sure to back up your originals! In reaction_masterwork.txt, find the Crematorium reactions.

Spoiler (click to show/hide)

Code: [Select]

[REACTION:MB_DESTROY_CORPSES_002]
[NAME:Burn bodyparts to ash]
[BUILDING:MB_CREMATORIUM:CUSTOM_R]
[REAGENT:A:1:CORPSE:NONE:NONE:NONE][USE_BODY_COMPONENT]
[PRODUCT:50:1:BAR:NO_SUBTYPE:ASH:NO_MATGLOSS][PRODUCT_DIMENSION:150]
[PRODUCT:10:1:BOULDER:NONE:INORGANIC:BACTERIA][PRODUCT_DIMENSION:150]
YESDUST[PRODUCT:100:1:BOULDER:NONE:INORGANIC:SMOKE][PRODUCT_DIMENSION:150]
[SKILL:WOOD_BURNING]

[REACTION:MB_DESTROY_CORPSES_001]
[NAME:Burn vermin to ash]
[BUILDING:MB_CREMATORIUM:CUSTOM_V]
[REAGENT:A:1:REMAINS:NONE:NONE:NONE]
[PRODUCT:50:1:BAR:NO_SUBTYPE:ASH:NO_MATGLOSS][PRODUCT_DIMENSION:150]
[PRODUCT:10:1:BOULDER:NONE:INORGANIC:BACTERIA][PRODUCT_DIMENSION:150]
YESDUST[PRODUCT:100:1:BOULDER:NONE:INORGANIC:SMOKE][PRODUCT_DIMENSION:150]
[SKILL:WOOD_BURNING]

I think you could change REAGENT:A:1 to REAGENT:A:10, but it seems like the gathering up of 10 items would lead to problems like items rotting/decaying during the delay.

Change PRODUCT:50 to PRODUCT:10, to change the output rate to 10% chance of ash bar, or whatever you like.