pjf / masterwork-dwarf-fortress Goto Github PK

Patches and bugfixes applied to Meph's amazing Masterwork Dwarf Fortress

Shell 0.11% F# 0.01% Lua 19.69% Ruby 28.03% AutoHotkey 1.38% Python 6.97% CSS 0.01% Visual Basic 20.13% C# 23.25% Perl 0.42%

masterwork-dwarf-fortress's Introduction

«☼Masterwork Dwarf Fortress - Studded with Patches☼»

This is a community driven branch of Meph's excellent Masterwork Dwarf Fortress.

Playing

If all you want to do is play, you can download one of two ready-to-go zip files:

The gold release contains all bugfixes and improvements which are considered stable. It is always based upon the most recently release of Masterwork Dwarf Fortress.
The beta release is the same as the gold release, but with additional changes which are not yet considered completely stable. Things don't get placed into beta until we're pretty sure they work, so it's recommended for most users, but occasionally things will still be a bit rough around the edges.
The alpha release is the same as the beta release, but also includes experimental features and bugfixes. Things here may be completely broken, but you're welcome to try it if you like.

If you already have the latest release of Dwarf Fortress, you can download patch files should update your distributions to the Studded With Patches versions of the files. These are automatically generated, and are not guaranteed to work. If in doubt, use the zips above:

Reporting bugs

Please report bugs in the issues tracker. Please try to be as specific as possible.

Contributing

We love new contributors!

Check out the Contributor's Guide for detailed information on how to help.

More information

If you want to discuss this project, please use the thread on the Dwarf Fortress message boards. The Masterwork Dwarf Fortress boards may also be useful.

masterwork-dwarf-fortress's People

Contributors

Stargazers

Watchers

masterwork-dwarf-fortress's Issues

Rebalance embark values for leather

Apparently tough leather is 20 embark points, and all other leathers are 15.

Given that many fancy leathers have properties similar to bronze and iron, they should cost more on embark.

Hide Root oil should be soapable

See update by BillyJack at:

http://www.bay12forums.com/smf/index.php?topic=133174.msg4762285#msg4762285

Add back boots and gauntlets for invaders

From #15 , of which this is essentially a more detailed sub-ticket:

I know that gloves and boots were removed from all invaders to reduce clutter, but this also has the side-effect of making invaders significantly easier against fledgling militia. Strikes to hands and feet aren't all that uncommon, and they're very effective at disabling targets, especially with edged weapons. I keep having elves and drow arrive with their mithril and bloodsteel armors, but because they're not fully covered, they're relatively easy to kill.
I have to double-check, but I seem to recall of all the elven ambushes and sieges I've encountered, none of them have been wearing pants. I know they're elves, and so that's thematic, but it means elves are now an easy source of mithril, rather than a serious threat.

This could be made a configurable option, if folks really don't want invaders with more armour.

Couriers: Revamp workshop trading...

I don't like that trading (via workshops) gives you products immediately. If my fortress is walled in and closed off, how do those products get there?

So instead I have a ridiculous idea that may be hard or impossible to implement, but I'm writing it down anyway.

Instead of workshop traders resulting in goods appearing immediately, they instead cause a courier to spawn at the map's edge. Obviously one needs to reach the courier (or get them inside) to collect the items. Now trading workshops are no longer siege/ambush proof.

One possible implementation would be spawning a merchant caravan (or using an existing one) and forcing the items onto a merchant/guard, and having them auto-drop them upon reaching the trade depot. That's nice, but I fear may be difficult to implement properly.

Another would be to spawn the courier as a pet on a depot-accessible map edge (or if no depot accessible square exists, on any map edge). Pets automatically head for meeting areas, but the player can also assign them to zones. Place a zone over your trade storehouse, pasture your courier there, and run the accept delivery reaction. That de-pops all couriers in LOS, causing them to drop their items.

Couriers should have a short 'lifespan', or other time-limiting mechanism, so if they're out in the field too long they'll eventually 'give up' and drop their gear. One season sounds about right. It also means ignored (but successful) couriers will eventually de-pop in one's meeting hall, where hopefully the items are easy to spot. ;)

Couriers should not give any meat/bones/equipment when butchered or killed, as this would be an obvious exploit. Alternatively, they could, if there was a way that the death of a courier could invalidate a trade workshop, start a siege, or otherwise have negative consequences.

Bonus points if couriers from drow and dwarf civilisations can arrive via the caverns. :)

Obviously all of this would require snazzy DFHack programming.

Rebalance orc raids, especially raiding ruins

Orc raiding currently feels unbalanced, especially when raiding ruins, which yield an average of 3 bars of deep-bronze AND 3 bars of orichalcum per raid, along with multiple weapons and trap components.

Given that orichalcum is supposed to be super-rare, having it as a common drop in raiding ruins seems wrong.

I'd adjust the loot tables so that raiding ruins returns mostly rusty bits and pieces, the odd statue, goblet, and other trinket, and only rarely orichalcum. This makes the raid much more of a gamble (which it's implied it will be in the manual), rather than a reliable source of otherwise ultra-rare materials.

Combined with the risk of provoking a clockwork or other attack ( see DF #1 ), this makes raiding ruins 'fun'. ;)

Add .gitattributes file to normalise line endings

See https://help.github.com/articles/dealing-with-line-endings .

This should avoid madness with file endings changing all over the place.

Bread and candy reactions produce cheese, and use no reagents

See: http://www.bay12forums.com/smf/index.php?topic=125628.msg4793333#msg4793333

Gun rebalance

Pistols and muskets seem to be equally effective.

Muskets in orcish arm-kits seem to be overpowered compared to regular muskets.

Discussion at:

http://www.bay12forums.com/smf/index.php?topic=125628.msg4760039#msg4760039

Fix DFHack 4 reactions that need to affect workshop occupants

DFHack r4 autosyndrome only affects the worker by default, and needs special tags to affect workshop occupants. We need to fix the reactions which affect occupants, including:

Alchemist: Changeling -> Magmaling and Waterling transformations.
Pet -> Armoured Pet
Ogre -> Armoured Ogre

(Any others? Please add them to this list.)

Non-simple minerals can't be processed at the ore processor

As per http://www.bay12forums.com/smf/index.php?topic=133564.msg4810310#msg4810310 lots of minerals are included by default (search for YESMIN in inorganic_mineral.txt). Previous versions of masterwork had these minerals disabled by default.

I can't find any reactions that actually use these minerals, which makes having them enabled questionable at best. No reactions is probably a bug.

Potential solutions include adding reactions for all minerals in question, or removing them entirely. In the meantime, changing the distro so that 'simple minerals' is switched to on (encoded as !NOMIN! in the raws) seems like a sensible option to minimise pain.

Transformations randomise stats and heals injuries

Sometimes this makes perfect sense, if we're morphing a changeling into a whatever. However for things like dwarves joining guilds, these feel weird.

This is a wishlist ticket to investigate some sort of DFHack magic that allows for injuries and stats to be retained. This may involve Deep Magic (eg: caching stats as part of a True Transformation, watching for the creature to "revert" back to its "new" class, and then re-applying stats and/or injuries along with removing the watch).

Armour rebalance / bugs

From http://www.bay12forums.com/smf/index.php?topic=125628.msg4772855#msg4772855

In item_armor.txt, all mail items are in the OVER layer. However in item_armor_masterwork.txt all mail items are in the ARMOR layer. Is this discrepancy intentional? (I'm still trying to wrap my head around how equipping armour works in DF, so it may be just fine...)
In item_armor_masterwork.txt, lamellar armor isn't listed as being SHAPED. However regular (vanilla leather) armor is shpaed. Lamellar armor isn't something I would expect you could wear underneath more serious armor, so I think it should have the shaped tag as well.
I know that gloves and boots were removed from all invaders to reduce clutter, but this also has the side-effect of making invaders significantly easier against fledgling militia. Strikes to hands and feet aren't all that uncommon, and they're very effective at disabling targets, especially with edged weapons. I keep having elves and drow arrive with their mithril and bloodsteel armors, but because they're not fully covered, they're relatively easy to kill.
I have to double-check, but I seem to recall of all the elven ambushes and sieges I've encountered, none of them have been wearing pants. I know they're elves, and so that's thematic, but it means elves are now an easy source of mithril, rather than a serious threat.

Painters workshop is missing purple blocks reaction

Reported here. Requires confirmation and fixing.

Expand orcish captives

I'd love for orcs to have a way of actually taking captives, rather than generating them from raiding.

One mechanism for this would be an interaction where an unconscious enemy can be 'taken prisoner', which would convert them to a pet or otherwise usable member of your fort. This interaction may exist natively on dreamwalkers, or may be a buff that we can apply to citizens.

Mainly this allows them to be pastured, for whatever sacrifice or slavery reactions are deemed to be appropriate.

Right now there [already exists](https://github.com/Putnam3145/masterwork-dwarf-fortress/blob/45b65824b848bc4b665510b7a114430e965d1ebd/Dwarf Fortress/hack/scripts/drowfort/take-slave.lua) code for taking slaves as part of a reaction. Doing this as an interaction would certainly set pave the way for some really cool stuff.

(Think expanded workshops, soul gems, a temple where sacrificing enemies produces various buffs or items, etc etc)

Orcs (and presumably kobolds) can catch diseases

Apparently orcs (and presumably kobolds) can catch diseases. Since they have no way of treating disease, this is bad. It also seems lame for orcs to have things like the common cold.

See: http://www.bay12forums.com/smf/index.php?topic=113621.msg4814238#msg4814238

Integrate DFHack r4

This would be really lovely, but I believe DFHack r3 has had customisations applied to it, and we don't wish to overwrite them.

Also, if any functionality has been updated between r3 and r4 and requires changing to the init files or raws, we need to adjust them as well.

See this thread on some of the changes we need to make to RAWs.

Here's a checklist from @Meph248 .

Use the ticky if you've updated/checked the raw reaction
Comment (either by 'editing' this node or as a comment in this thread) if you've tested one.
- Stables: Uses fov code. Checked working by @pjf.
- Golem from Dwarf:
- Golem activation:
- Golem Training:
- Turret Training:
- Turret/Landmine Spawning:
- Colosseum:
- Guardian of Armok:
- Temple reactions (slayrace):
- Red Marker in Archeologist:
- Pet Armoring:
- Pet Training:
- Megabeast Spawning:
- Combat Training from Megabeast Soul:
- Training from Libraries:
- Mages:
- Misc Magic reaction, like weather:
- FB spawning:
- Demon spawning:
- Pet spawning from trader:
- Town Portal:
- Alchemist Water/Magma Spawning:
- Music:
- Speeches:
- Guild: Multiple reports that they work on forums, but we should review code. -- @pjf
- Military Groups:

Overhaul kobold digging

The old implementation where kobolds could dig soft materials (soil/clay) but not hard ones (rock) was really cool. It relied upon kobolds being the only playable race, but it'd be nice to have something like this as part of Kobold Fortress.

One promising suggestion is here:

http://www.bay12forums.com/smf/index.php?topic=125626.msg4668857#msg4668857

Obscure syndrome names.

Syndromes which share the same names should be re-named with unique descriptions.

For example, interaction_biology.txt has sets of ' Biology Interaction' syndromes, which should be re-named to identify what bonus the syndrome is actually giving (double damage, no stun, etc.)

This is also an issue with the speaker's podium; all speeches simply give "inspired by a speech (permanent)".

These changes are mostly to provide easy identification for the syndromes/reactions when viewing them with things like dfhack and dwarf therapist.

greenware/leather-hard/bone-hard fake tools made from Kaolinite seem to come out weighing 25k

http://www.bay12forums.com/smf/index.php?topic=133174.msg4825193#msg4825193

Figure out what's going on with r3/4e guilds

There have been multiple reports on the forums using the upstream/r3 builds seems to be complaining that they can't turn citizens into guild members.

It'd be great to know what's causing these headaches. Hidden castes? Diseases? Something else?

It'd also be good to know if DFHack r4 fixes these, since it has a rewritten autosyndrome functionality (and guild transformations seem to be working fine there).

Orc factories produce greenware blocks; ideally these should be fired stone of some sort

As per description.

In game labor manager is missing

See the bug report here.

Hopefully this is just a matter of finding the plug-in and enabling it, but it could be that we don't yet have this plug-in for R4. Investigation needed.

Rebalance: Medicine reaction should produce less medicine

The distillery and brewery convert one stack of plants into 5 or 6 drinks respectively. The medicine reaction produces ten drinks from two plants.

Consequently, there's very little reason to produce anything other than medicine, especially because doing this also trains diagnosis (which is normally tricky to change).

This should be rebalanced so that the medicine reaction produces less drinks, rather than more.

Change minting and merchant reactions to produce coin stacks in chunks of 500

As per meph's bug report, reactions in DF always use whole stacks of items. By only producing coins in stacks of 500 in the mint and merchant reactions, we avoid silly citizens paying for their 500 shilling drink with a stack of 3000 shillings (and not receiving change).

Remove requirement on mithril boulders in druid codexes

Druid codexes require mithril boulders to create. That's fine if you have it on your map, but traders and elves usually bring more refined mithril products. Sorcerer, frostskald, and oracle codexes are much easier to create for mid-game players, using mostly bars that are common smelted/recycled/traded for.

The druid codex also requires saplings, which require trading or tree-farms, meaning a player who remembers to bring acorns will have an easy time, and a player who forgets will have a hard time. I'm tempted to replace this with requiring logs, since one refines saplings into wood anyway.

Blood may be a possible thematic reagent to add, while not being too hard to obtain.

Vorarcious cave crawlers opposed to life

See http://www.bay12forums.com/smf/index.php?topic=133174.msg4825185#msg4825185 .

These may exist because they're needed for arena reactions.

Is it possible to have the arena reactions use DFHack to set spawned mobs to be opposed to life on generation?

Orcs need a way to process mutilated corpses and megabeasts

Dwarves get all sorts of goodies from mutilated corpses and megabeasts, including clockwork gears (which IIRC orcs actually use in some reactions) and souls.

Orcs should get this too.

Previously the beastlab (now the 'research lab') provided these reactions, but they have been lost due to code drift:

[PERMITTED_BUILDING:BEASTLAB2]
[PERMITTED_REACTION:COMBINE_ESSENCE]
[PERMITTED_REACTION:CONTAINER_ESSENCE]
PERMITTED_REACTION:CLOCKWORKS
[PERMITTED_REACTION:BRAINS_AND_JARS]
[PERMITTED_REACTION:LOOT]
[PERMITTED_REACTION:CLEAN_ESSENCE]
[PERMITTED_REACTION:TRAIN_BEAST_CROSSBOW]
[PERMITTED_REACTION:TRAIN_BEAST_AXE]
[PERMITTED_REACTION:TRAIN_BEAST_HAMMER]
[PERMITTED_REACTION:TRAIN_BEAST_MACE]
[PERMITTED_REACTION:TRAIN_BEAST_SWORD]
[PERMITTED_REACTION:TRAIN_BEAST_SPEAR]
[PERMITTED_REACTION:TRAIN_BEAST_LASHER]
[PERMITTED_REACTION:TRAIN_BEAST_PIKEMAN]
[PERMITTED_REACTION:TRAIN_BEAST_DAGGER]
[PERMITTED_REACTION:TRAIN_BEAST_WRESTLING]
[PERMITTED_REACTION:TRAIN_BEAST_SHIELD]
[PERMITTED_REACTION:TRAIN_BEAST_ARMOR]
[PERMITTED_REACTION:TRAIN_BEAST_DODGE]
[PERMITTED_REACTION:TRAIN_BEAST_MELEE_COMBAT]
[PERMITTED_REACTION:TRAIN_BEAST_RANGED_COMBAT]

Have orcish raids trigger sieges

Orcish raids are currently very low-risk. I would like them to run the risk of triggering sieges.

I tried (and failed) to implement that here, but with a little DFHack coding it should be possible to do this in elegant fashion.

Rebalance diseases

@thistleknot has a set of patches in this thread:

http://www.bay12forums.com/smf/index.php?topic=133312.msg4799192#new

They need review and integration, probably into a disease_rebalanced branch. I presume they're based off a vanilla 4e checkout.

Mutilated corpses should rot

Currently they're 'finished items', and will keep indefinitely:

http://www.bay12forums.com/smf/index.php?topic=125628.msg4791021#msg4791021

Butchered bone stacks

Meph has indicated he's intending to integrate this at some point. I presume this would obsolete the 'separate bone' reactions we currently have:

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

WORKER_ONLY tags are meaningless in autosyndrome DFHACK r4

By default, autosyndrome only affects the workshop worker unless specified otherwise. As such, all WORKER_ONLY tags are now meaningless in the r4 branch.

http://www.bay12forums.com/smf/index.php?topic=133174.msg4801739#msg4801739

Settings program is slow

In trying to track down another bug, I noticed that the current settings program is significantly slower (on all screens) than the one that was bundled with 4e. At least it's slower when running under wine, but I assume from mentions in the forum threads it's also slow when running under a native OS as well.

I have no idea what's causing the slow-down, but I'm raising this issue as it means we have a known point in time (4e) when it was running swiftly.

(Looking at @splintermind here with big adorable eyes in case he spots an obvious cause of slowness, and/or has access to a profiler.)

Library systems don't train under DFHack r4

See bug report at http://www.bay12forums.com/smf/index.php?topic=133174.msg4776715#msg4776715

Typos: [untouched], golbins, and billy goat whiskers

inorganic_stone_soil.txt (needs to be fixed in graphics packs as well)

change ///[UNTOUCHED]/// (two instances) with normal comments, it's currently trying to read it as a token due to the square brackets
change INORGANIC:_CLAY to INORGANIC:CLAY in [LOAM]

default_entity.txt

replace GOLBIN with GOBLIN

creature_domestic.txt

the [SET_TL_GROUP:BY_CATEGORY:HEAD:CHIN_WHISKERS] in [GOAT] seems to be wrong. when generating a world, you'll get an error that the color couldn't be applied, which normally indicates the token is incorrect. i've been unable to resolve this one.

entity_elf.txt and entity_elf_evil.txt:

it appears elves and evil elves will never siege due to 0 for:

PROGRESS_TRIGGER_POP_SIEGE
PROGRESS_TRIGGER_PROD_SIEGE
PROGRESS_TRIGGER_TRADE_SIEGE

multiple entity files

lines prefixed with !NOMORECLOTH! can all be removed as it's an option no longer used (verified with Meph)

DFHack.init should have these options enabled/added

keybinding add Ctrl-Shift-W "getplants autochop"

fixmerchants
fixdiplomats

Update living rock reactions

According to http://www.bay12forums.com/smf/index.php?topic=125630.msg4807494#msg4807494 living rock no longer drops boulders.

We should either update the manual and RAWs so living rock reactions (eg: butchering for meat) are no longer mentioned, or update the living rock raws so that they actually drop boulders.

Resolution: Not a bug, only sub-clusters drop boulders. See discussion below.

Ghosts can spread diseases

They probably shouldn't.

Fix more of less leather types values...

should be VERY easy.

Determine a standardized value (probably look up 4c leather embark costs)
go into the creature:leather_ whatever it's called.

update value by using [material_value:x]

or modify the value in material_templates.

as is, scaleplate is better than tough leather, but less expensive.

Announcements on orc and kobold forays

Orcs and kobolds go and steal things from other civs. Announcements of there results would be nice. See the announcement.lua script for making these.

Add "raid farmlands for food" to orcish raids

Orcs farming food doesn't feel right. They're hunters and raiders, not peasants.

I'd like to add a 'raid farmlands for food' reaction to the raider's dock. I would be inclined to make this cheaper than other reactions, with a higher rate of success, but still a chance of generating an ambush or other attack (although probably not sieges).

This would allow players who wish to roleplay a hunting/raiding orcish race the ability to do without farms, and possibly breweries, instead relying upon hunting, raiding, foraging, and trade for food.

Fix all missing reactions

As mentioned in this comment there are a lot of reactions which are defined in entity files, but not mentioned anywhere. These should be updated, defined, or removed as appropriate:

== Permitted, but not defined (BUGS!) ==

== Defined, but not permitted (WARNING) ==

== Malformed headers ==

[ //This is commented code. You can place comments anywhere you like - it reads it all at the beginning and keeps it separated nicely. ] in [ ../Dwarf Fortress/raw/objects/Randomdat.txt ] is malformed

Harmonise graphics raws

In theory, there should be no gameplay differences based which graphic set is used. In practice, there is.

http://www.bay12forums.com/smf/index.php?topic=133174.msg4764487#msg4764487 has a discussion on harmonising the raws. The show-tileset-diffs.pl script can already detect differences between them.

Some poisons exist but have no corresponding syndrome

Sun berry poison, glumprong resin poison and feather resin poison have reactions to make and apply them that do nothing (and slightly worse than nothing because they fill a barrel with unspecified liquid that can't be used). That is caused by corresponding poison materials (EXTRACTs) not being defined anywhere and corresponding SYNDROMEs not existing.

I wanted to correct that but I don't see an easy way to make "hurts cavern/good/evil creatures" syndromes without massive raw modification of adding poison reaction class tags to every second creature. Please, consider disabling broken toxicologist reactions for now.

Write a contributor's guide

MWDF-SWP (this repo) really needs a contributors guide for the github README. I'm sure there'd be lots of people willing to help fix bugs if they knew the steps how.

add stone crutch to stonecrafters workshop

and appropriate reactions to entities

say add to reaction_masterwork.txt

[REACTION:CRAFT_STONE_CRUTCH]
[NAME:Make rock crutch from block]
[BUILDING:GRINDER:CUSTOM_SHIFT_E]
[REAGENT:A:2:BLOCKS:NONE:NONE:NONE][WORTHLESS_STONE_ONLY]
[PRODUCT:100:1:CRUTCH:NONE:GET_MATERIAL_FROM_REAGENT:A:NONE]
[SKILL:STONECRAFT]

and

[PERMITTED_REACTION:CRAFT_STONE_CRUTCH]

TO ENTITY_DEFAULT.TXT UNDER [ENTITY:MOUNTAIN]

Recommend Projects

React

A declarative, efficient, and flexible JavaScript library for building user interfaces.
Vue.js

🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
Typescript

TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
TensorFlow

An Open Source Machine Learning Framework for Everyone
Django

The Web framework for perfectionists with deadlines.
Laravel

A PHP framework for web artisans
D3

Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

javascript

JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
web

Some thing interesting about web. New door for the world.
server

A server is a program made to process requests and deliver data to clients.
Machine learning

Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Visualization

Some thing interesting about visualization, use data art
Game

Some thing interesting about game, make everyone happy.

Recommend Org

Facebook

We are working to build community through open source technology. NB: members must have two-factor auth.
Microsoft

Open source projects and samples from Microsoft.
Google

Google ❤️ Open Source for everyone.
Alibaba

Alibaba Open Source for everyone
D3

Data-Driven Documents codes.
Tencent

China tencent open source team.