Print

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

[Urist McTeellox]

Tried with almost all preset gens, with only changes being length of history. Tileset was default.

Found it, and patched! Thank you very much for spotting this! That looks like it's an SWP specific bug caused me foolishly editing a file by hand, rather than getting a bot to do it.

Grabbing just the patch-file from the top node and unzipping it should fix things (or 'git pull', if you're using git).

~ T

[Urist McTeellox]

Spent the afternoon chatting with the good folks at github to help with some magic to improve the tools I use to generate the patch-files and changelogs. They should now be slimmer and more descriptive, but I still need to write a bot that will update the top post in this thread for me automatically.

One thing I noticed there is that Falconne's updated plug-ins don't seem to be included in the official release. (They're in SWP just fine.) So this is a reminder to Meph to not forget to include those.

I've also made it so that the patch-files are a little cleaner in their generation. So the master patch can be unzipped on top of an official release, and all our changes will be there!

Spoiler (click to show/hide)

• reverted allowing saves to be updated (Splinterz)
• minor setting changes, fix save updates (Splinterz)
• Orcish tribal embark actually includes wolves, and no longer blows point balance. (McTeellox)
• fixes for itemsyndrome and spawn scripts (Splinterz)
• Orcfort: All orcs now show their castes on embark (McTeellox)
• fix for priest and candelabra interactions (Splinterz)

~ T

[There Is No Vic]

i don't know why there's this notion that github is so brutally hard to use. you've learned to play dwarf fortress, you'll be fine. really.

You just had to go push that shiny, candy-like button, didn't you? Well, I've signed up for github now. Not having to move my macros and saves to new versions will be worth it.

[Urist McTeellox]

You just had to go push that shiny, candy-like button, didn't you? Well, I've signed up for github now. Not having to move my macros and saves to new versions will be worth it.

I should do a quick guide to using git to play DF. You don't actually need a github account, but it certainly doesn't hurt.

So before I show you the following, I should point you that you can just clone-and-go. The following just makes it just a little easier to manage local changes long-term:

* git clone git@github.com:pjf/masterwork-dwarf-fortress.git # This clones the main SWP project
* cd masterwork-dwarf-fortress
* git checkout -b play   # This makes a new branch called 'play', based upon my master branch.
* Play and enjoy!

Once you've got things set up the way you like, you can use: `git commit .`(note that dot!) from the top-level directory to save your changes (like macros, picking races, and the like) to your local play branch. That's useful because it means you can apply them on top of upstream changes, so you don't have to do them again every time something changes upstream. SWP should already be configured to ignore your save-game files and not keep them in git (although personally I do that as well, as means I can easily sync them between machines, and I can have meaningful mid-season checkpoints on my saves).

`git fetch` will download (but not integrate) the upstream changes, and `git merge origin/master` will merge them into your local branch.  If something goes wrong, you can always `git merge --abort` to put things back the way they were.   Apparently there are also GUIs to help make all this easier, but I practically live on the command-line.

Bonus points if you fork the repo and start contributing patches. 

If you need a hand with anything, then don't hesitate to ask!

~ T

[There Is No Vic]

Wow. Thanks.

Couple of questions:

1. How do I know which fork I'm playing? It seems that it would be the most recently fetched, but if I'd like to step back from a newer unified to an older master, is this an easy thing to do?

2. I guess this question is for Meph. Reactions in the dwarf manual appear to be from v3h. I can update by hand or parse out reaction_masterwork.txt. Were the original separate files generated by a DF utility?

[Meph]

2. I guess this question is for Meph. Reactions in the dwarf manual appear to be from v3h. I can update by hand or parse out reaction_masterwork.txt. Were the original separate files generated by a DF utility?

The files were created by a script by Roses. It still took a bit of manual work. In the end, I want to alter the manual to link directly to the actual raws in the raw/objects folder, but I would have to take the reaction files apart, and make one for each building. Thats over 300 raws. I dont know if that hurts more then it does good. The GUI would need some adjustements for this as well.

The ones that the manual shows are in another folder, in MasterworkDwarfFortress/Repository/Reactions. As you said, rather outdated, with being from 3h and all that.

[misiekm]

Quick question, are any of the current patch changes incompatible with the basic 4g? Or can I just drop them into my folder and keep playing the 4g save?

[Meph]

As far as I know you should be able to update the saves.

[Urist McTeellox]

1. How do I know which fork I'm playing? It seems that it would be the most recently fetched, but if I'd like to step back from a newer unified to an older master, is this an easy thing to do?

I have two minutes with my laptop, so this is really quick.

Git makes it super-easy to switch between versions. `git checkout MWDF_4b` gives you the offical 4b release, likewise you can `git checkout MWDF_4c` (and 4d, and 4e, and 4f, and 4g).

To see the last commit on your branch, you can `git show` or `git log`. I find that `git log --oneline --no-merges` is great for seeing history. And you can `git show ID` with any of the IDs (in the left column) to see what the changes are. However I personally find the network view on github to be most useful.

The branches in your fork won't automatically update from the branches in my fork until you ask them to. You can use `git remote -v` to see what other repositories your git set-up knows about. If mine isn't there, you can add it with `git remote add pjf git@github.com:pjf/masterwork-dwarf-fortress.git`. You can then `git fetch pjf` to download everything from my repo (which should be pretty swift!) and `git merge pjf/master` or `git merge pjf/unified` to merge a remote branch into your own.  If you want you can get fancy and set up pull targets, but I don't quite have time to get into that here.

One of the best things is that provided you can use `commit` and `push`, I can pretty much do the rest from my end. I can see when you've pushed commits, merge them into my branches, and even send you `pull requests` which will merge my changes back into yours. So don't worry if any of the advanced commands seem hard at first, you can totally start with the basics.  Github also has a bootcamp which goes through the basics, and there are lots of tutorials on-line.  Don't be afraid to try things out, it's super-easy to undo things in git (that's what `git revert` does).

And now I'm totally out of time, so keep being amazing, and I'll post more tomorrow!

~ T

P.S. misiekm: You can totally drop them over 4g, although the raw changes won't end up in your saves until you gen a new world.

[thistleknot]

it would be nice to link to all these got git posts from the 2st post for easy reference

mainly any post about github like your most recent, but especially this one
http://www.bay12forums.com/smf/index.php?topic=133174.msg4872568#msg4872568

[Meph]

it would be nice to link to all these got posts from the 2st post for easy reference

mainly any post about github like your most recent, but especially this one
http://www.bay12forums.com/smf/index.php?topic=133174.msg4872568#msg4872568

But that post is outdated. For example rendermax has been updated by now.

[thistleknot]

I meant this stuff that's referenced
https://github.com/pjf/masterwork-dwarf-fortress/tree/orc_rebalance#contributing

[Urist McTeellox]

I meant this stuff that's referenced
https://github.com/pjf/masterwork-dwarf-fortress/tree/orc_rebalance#contributing

That's a great idea! I've added links to the README, contributor's guide, and my post above.

It's a shame the forums don't allow wiki-style posts, which anyone can edit.

The files were created by a script by Roses. It still took a bit of manual work. In the end, I want to alter the manual to link directly to the actual raws in the raw/objects folder, but I would have to take the reaction files apart, and make one for each building. Thats over 300 raws. I dont know if that hurts more then it does good. The GUI would need some adjustements for this as well.

If you want to do this, I can easily write a script to do so. The only gotcha is that some reactions can be present in more than one building, and that having 300+ more files might make things more tricky to navigate, rather than less.

I can also potentially write a script that updates the manuals based upon the raws, although I'd need to actually look at the manual right now to make sure it will integrate nicely. And when you're using git (post-Warlocks), we can even set a (pre-commit) hook that will update the manuals automatically whenever the raws are changed.

~ T

[There Is No Vic]

The files were created by a script by Roses. It still took a bit of manual work. In the end, I want to alter the manual to link directly to the actual raws in the raw/objects folder, but I would have to take the reaction files apart, and make one for each building. Thats over 300 raws. I dont know if that hurts more then it does good. The GUI would need some adjustements for this as well.

If you want to do this, I can easily write a script to do so. The only gotcha is that some reactions can be present in more than one building, and that having 300+ more files might make things more tricky to navigate, rather than less.

I can also potentially write a script that updates the manuals based upon the raws, although I'd need to actually look at the manual right now to make sure it will integrate nicely. And when you're using git (post-Warlocks), we can even set a (pre-commit) hook that will update the manuals automatically whenever the raws are changed.

~ T

I found this handy raw to xml converter (although it doesn't like ampersands in the raws).

http://www.bay12forums.com/smf/index.php?topic=107340.0

[Meph]

zluker has been doing more reactions for merchants, adding more pets to the pet shop, and at some point I thought: Why not a dwarven shop that sells constructs? I just made the building file, I might just leave it here, in case he does take up the idea.

Code: [Select]

[BUILDING_WORKSHOP:CONSTRUCT_MERCHANTS_STALL]
[NAME:Stakud's Machine Chop-Shop] stakud = machine in dwarvish
!NODIMENSION!NAME:Stakud's Machine Chop-Shop 5x5]
[NAME_COLOR:7:0:1]
[BUILD_LABOR:ARCHITECT]:MASON]
[BUILD_KEY:CUSTOM_NONE] => crap, I dont have any more hotkeys free. I will do this later.
[DIM:5:5]
[WORK_LOCATION:3:3]
[BLOCK:1:0:0:0:0:0]
[BLOCK:2:0:0:0:0:0]
[BLOCK:3:0:0:0:0:0]
[BLOCK:4:0:0:0:0:0]
[BLOCK:5:0:0:0:0:0]
[TILE:0:1:219:219:219:32:32]
[TILE:0:2:32:96:219:209:32]
[TILE:0:3:32:32:32:219:32]
[TILE:0:4:32:32:32:32:32]
[TILE:0:5:32:32:32:32:32]
[COLOR:0:1:7:0:1:7:0:1:7:0:1:7:0:1:7:0:1]
[COLOR:0:2:7:0:1:7:0:0:7:0:1:7:7:1:0:0:0]
[COLOR:0:3:0:0:0:0:0:0:0:0:0:7:0:1:0:0:0]
[COLOR:0:4:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0]
[COLOR:0:5:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0]
[TILE:1:1:219:219:219:219:32]
[TILE:1:2:32:209:219:209:32]
[TILE:1:3:32:219:219:219:32]
[TILE:1:4:32:32:219:32:32]
[TILE:1:5:32:219:32:32:32]
[COLOR:1:1:7:0:1:7:0:1:7:0:1:7:0:1:7:0:1]
[COLOR:1:2:7:0:1:7:7:1:7:0:1:7:7:1:0:0:0]
[COLOR:1:3:0:0:0:7:0:1:7:0:1:7:0:1:7:0:1]
[COLOR:1:4:0:0:0:0:0:0:7:0:1:0:0:0:0:0:0]
[COLOR:1:5:0:0:0:7:0:1:0:0:0:0:0:0:0:0:0]
[TILE:2:1:219:219:219:219:219]
[TILE:2:2:32:209:96:209:219]
[TILE:2:3:219:219:219:219:32]
[TILE:2:4:32:209:219:209:219]
[TILE:2:5:32:219:32:32:32]
[COLOR:2:1:7:0:1:7:0:1:7:0:1:7:0:1:7:0:1]
[COLOR:2:2:7:0:1:7:7:1:7:0:0:7:7:1:7:0:1]
[COLOR:2:3:7:0:1:7:0:1:7:0:1:7:0:1:7:0:1]
[COLOR:2:4:0:0:0:7:7:1:7:0:1:7:7:1:7:0:1]
[COLOR:2:5:0:0:0:7:0:1:0:0:0:0:0:0:0:0:0]
[TILE:3:1:219:219:128:219:219]
[TILE:3:2:219:209:139:209:219]
[TILE:3:3:128:123:1:59:128]
[TILE:3:4:219:209:162:209:219]
[TILE:3:5:219:219:15:219:219]
[COLOR:3:1:7:0:1:7:0:1:6:0:1:7:0:1:7:0:1]
[COLOR:3:2:7:0:1:7:2:1:7:0:1:7:2:1:7:0:1]
[COLOR:3:3:7:0:1:7:0:1:6:0:1:7:0:1:7:0:1]
[COLOR:3:4:7:0:1:7:2:1:7:0:1:7:2:1:7:0:1]
[COLOR:3:5:7:0:1:7:0:1:6:0:1:7:0:1:7:0:1]
[BUILD_ITEM:5:BLOCKS:NONE:NONE:NONE][WORTHLESS_STONE_ONLY]
[BUILD_ITEM:1:BAR:NONE:CREATURE_MAT:MERCHANT_LICENSE:NONE]
Looks like this:

And for the entity file:

Code: [Select]

[PERMITTED_BUILDING:CONSTRUCT_MERCHANTS_STALL]