Print

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

[Urist McTeellox]

Sometimes I fix bugs and add features. When I do, they'll go here.

Patches in this thread:

• Warlocks no longer have the ethics of vegan elves
• Composite bows have correct power
• Fountains require tears of armok and provide water
• Glaives use spear skill, not whip skill
• Enable blueprints for the orcish tech-tree
• Add the Blacksmoke Furnace to Orc Fortress manual
• Dwarves no longer have ludicrously valuable body parts
• creature_birds.txt files now use APPLY_CREATURE_VARIATION

Other patches I'm integrating:

• Updated itemsyndrome for DFHack by Putnam
• Masterwork Dwarf Therapist R4 20.6.6
• Updated zombie descriptions (Deon)
• Updated spoiler creature description (Deon)
• Dwarven attributes are more dwarfy (thistleknot)
• Pressing tubers returns seeds (thistleknot)
• Re-add worldgen nicknames and Gaia (thistleknot)

Experimental patches being tested:

• Simplified leather by Billy Jack (testing)

[Urist McTeellox]

((reserved))

[Urist McTeellox]

Warlocks no longer have the ethics of vegan elves

Previously warlocks wouldn't trade any animal or plant products. Now their ethics are more flexible.

Spoiler (click to show/hide)

Code: [Select]

diff --git a/Dwarf Fortress/raw/objects/entity_warlock.txt b/Dwarf Fortress/raw/objects/entity_warlock.txt
index cb2b363..9976e91 100644
--- a/Dwarf Fortress/raw/objects/entity_warlock.txt
+++ b/Dwarf Fortress/raw/objects/entity_warlock.txt
@@ -135,14 +135,14 @@ YESWARLOCK[OBJECT:ENTITY]
  [WORLD_CONSTRUCTION:TUNNEL]
  [WORLD_CONSTRUCTION:BRIDGE]
  [ETHIC:KILL_ENTITY_MEMBER:PUNISH_CAPITAL]
- [ETHIC:KILL_NEUTRAL:PUNISH_CAPITAL]
- [ETHIC:KILL_ENEMY:PUNISH_CAPITAL]
- [ETHIC:KILL_ANIMAL:PUNISH_CAPITAL]
- [ETHIC:KILL_PLANT:PUNISH_CAPITAL]
- [ETHIC:TORTURE_AS_EXAMPLE:PUNISH_CAPITAL]
- [ETHIC:TORTURE_FOR_INFORMATION:PUNISH_CAPITAL]
- [ETHIC:TORTURE_FOR_FUN:PUNISH_CAPITAL]
- [ETHIC:TORTURE_ANIMALS:PUNISH_CAPITAL]
+ [ETHIC:KILL_NEUTRAL:ACCEPTABLE]
+ [ETHIC:KILL_ENEMY:ACCEPTABLE]
+ [ETHIC:KILL_ANIMAL:ACCEPTABLE]
+ [ETHIC:KILL_PLANT:ACCEPTABLE]
+ [ETHIC:TORTURE_AS_EXAMPLE:ACCEPTABLE]
+ [ETHIC:TORTURE_FOR_INFORMATION:ACCEPTABLE]
+ [ETHIC:TORTURE_FOR_FUN:ACCEPTABLE]
+ [ETHIC:TORTURE_ANIMALS:ACCEPTABLE]
  [ETHIC:TREASON:PUNISH_CAPITAL]
  [ETHIC:OATH_BREAKING:PUNISH_CAPITAL]
  [ETHIC:LYING:ACCEPTABLE]


[Urist McTeellox]

Composite bows are no longer overpowered

This patch drops the power level of composite bows down to 4000, the same as their bladed "upgrades". This makes them better than recurve bows, but not as good as great bows (which is how they're described in the orc fortress docs).

Spoiler (click to show/hide)

Code: [Select]

--- item_weapon_human_tech.txt 2013-10-12 02:03:39.055782252 +1300
+++ /tmp/item_weapon_human_tech.txt 2013-10-22 00:01:56.419365462 +1300
@@ -181,8 +181,8 @@
 [SIZE:500]
 [SKILL:HAMMER]
 [RANGED:BOW:ARROW]
-[SHOOT_FORCE:10000]
-[SHOOT_MAXVEL:10000]
+[SHOOT_FORCE:4000]
+[SHOOT_MAXVEL:4000]
 [TWO_HANDED:25000]
 [MINIMUM_SIZE:35000]
 [MATERIAL_SIZE:4]


[merp]

Did Meph already fix the hospital bug that causes them to stuff the boxes with all the cloth in your fortress?

[Billy Jack]

That's a patch that has been included for quite some time and is part of DFHack.

This would also not be the appropriate thread for generic bug questions. There are discussion and bug fix threads which would be more appropriate.

It would only make sense that posts to this thread would be about the changes/fixes that Urist is proposing.

[Etherdrinker]

Did Meph already fix the hospital bug that causes them to stuff the boxes with all the cloth in your fortress?

Code: [Select]

# Bug 4406 - hospital overstocking on all items
binpatch apply hospital-overstocking

From the dfhack.init MasterworkDF 4b.

This was patched long time ago.

[Urist McTeellox]

commit 4be6068d977481af8a1d9b54930e48cad05c5d18
Date:   Sun Oct 27 23:46:27 2013 +1300

Fountains require tears of armok and provide water.
   
Fountains are no longer decorative places only useful for swimming.
Using a tear of armok, a pipe section, and a mechanism, a fountain
can be created which allows for buckets and bottles to be filled.

This means that Orcs and Kobolds now have a use for the tear
of armok, as they don't normally have access to the alchemist.
This also provides an alternative way for dwarves to generate
water from a tear.

Spoiler (click to show/hide)

Code: [Select]

diff --git a/Dwarf Fortress/raw/objects/building_z_decoration.txt b/Dwarf Fortress/raw/objects/building_z_decoration.txt
index 52ec4c4..848c605 100644
--- a/Dwarf Fortress/raw/objects/building_z_decoration.txt
+++ b/Dwarf Fortress/raw/objects/building_z_decoration.txt
@@ -75,6 +75,9 @@ building_z_decoration
 [COLOR:3:2:7:2:0:3:1:1:7:2:0]
 [COLOR:3:3:2:4:1:7:2:0:2:4:1]
 [BUILD_ITEM:4:BLOCKS:NONE:NONE:NONE][BUILDMAT][CAN_USE_ARTIFACT][WORTHLESS_STONE_ONLY]
+[BUILD_ITEM:1:ROUGH:NONE:INORGANIC:TEARS_OF_ARMOK]
+[BUILD_ITEM:1:PIPE_SECTION:NONE:NONE:NONE][CAN_USE_ARTIFACT]
+[BUILD_ITEM:1:TRAPPARTS:NONE:NONE:NONE[CAN_USE_ARTIFACT]
 
 
 [BUILDING_FURNACE:LOO]
diff --git a/Dwarf Fortress/raw/objects/entity_default.txt b/Dwarf Fortress/raw/objects/entity_default.txt
index 37829ac..070c545 100644
--- a/Dwarf Fortress/raw/objects/entity_default.txt
+++ b/Dwarf Fortress/raw/objects/entity_default.txt
@@ -2496,6 +2496,7 @@ title
 fountain
  YESFOUNTAIN[PERMITTED_BUILDING:FOUNTAIN]
  [PERMITTED_REACTION:TRAIN_SWIMMING]
+        [PERMITTED_REACTION:FILL_BUCKET]
 displaycase
  YESDECORATION[PERMITTED_BUILDING:DISPLAY_CASE]
  [PERMITTED_REACTION:DECO_CASE]
diff --git a/Dwarf Fortress/raw/objects/entity_kobold_camp.txt b/Dwarf Fortress/raw/objects/entity_kobold_camp.txt
index 0f0ed68..4dcfbca 100644
--- a/Dwarf Fortress/raw/objects/entity_kobold_camp.txt
+++ b/Dwarf Fortress/raw/objects/entity_kobold_camp.txt
@@ -2394,6 +2394,8 @@ PERMITTED_BUILDING:BONEFURNACE
 
  [PERMITTED_BUILDING:DECORATION]
  YESFOUNTAIN[PERMITTED_BUILDING:FOUNTAIN]
+            [PERMITTED_REACTION:TRAIN_SWIMMING]
+            [PERMITTED_REACTION:FILL_BUCKET]
  YESDECORATION[PERMITTED_BUILDING:DISPLAY_CASE]
  YESPOTTEDPLANT[PERMITTED_BUILDING:POTTED_PLANT]
  YESPOTTEDPLANT[PERMITTED_BUILDING:POTTED_TREE]
@@ -2403,7 +2405,6 @@ YESTOTEM[PERMITTED_BUILDING:RUG]
 YESTOTEM[PERMITTED_BUILDING:CHANDELIER]
 YESTOTEM[PERMITTED_BUILDING:BRAZIER]
 YESTOTEM[PERMITTED_BUILDING:SIGN]
-[PERMITTED_REACTION:TRAIN_SWIMMING]
 
 YESTOTEM[PERMITTED_BUILDING:TOTEM2]
 YESTOTEM[PERMITTED_BUILDING:SWORDS]
diff --git a/Dwarf Fortress/raw/objects/reaction_masterwork.txt b/Dwarf Fortress/raw/objects/reaction_masterwork.txt
index 387dcd3..044444e 100644
--- a/Dwarf Fortress/raw/objects/reaction_masterwork.txt
+++ b/Dwarf Fortress/raw/objects/reaction_masterwork.txt
@@ -1503,6 +1503,17 @@ less xp now
 [PRODUCT:100:1:BOULDER:NONE:GET_MATERIAL_FROM_REAGENT:INORGANIC:WATER_SPLASH3]
 [SKILL:SWIMMING]
 
+[REACTION:FILL_BUCKET]
+ [NAME:fill bucket with water]
+ [BUILDING:FOUNTAIN:CUSTOM_F]
+ [REAGENT:A:1:BUCKET:NONE:NONE:NONE]
+ [EMPTY]
+ [NOT_IMPROVED]
+ [PRESERVE_REAGENT]
+ [DOES_NOT_DETERMINE_PRODUCT_AMOUNT]
+  [DOES_NOT_ABSORB]
+ [PRODUCT:100:7:LIQUID_MISC:NONE:WATER:NONE][PRODUCT_DIMENSION:150][PRODUCT_TO_CONTAINER:A]
+
 ##############################################################################
 ##################     CRUCIBLE AKA STEEL MAKING    #############################
 ##############################################################################
@@ -12373,18 +12384,6 @@ YESSTORAGE[PRODUCT:100:1:BAR:NONE:CREATURE_MAT:BONE_IRON_CRATE:SOAP]YESSTORAGE[P
 ##############################  CURRENTLY NOT IN USE       ##############################
 #########################################################################################
 
-[REACTION:FILL_BUCKET]
- [NAME:fill bucket with water]
- [BUILDING:FOUNTAIN:CUSTOM_F]
- [REAGENT:A:1:BUCKET:NONE:NONE:NONE]
- [EMPTY]
- [NOT_IMPROVED]
- [PRESERVE_REAGENT]
- [DOES_NOT_DETERMINE_PRODUCT_AMOUNT]
-  [DOES_NOT_ABSORB]
- [PRODUCT:100:7:LIQUID_MISC:NONE:WATER:NONE][PRODUCT_DIMENSION:150][PRODUCT_TO_CONTAINER:A]
-
-
 
 
 [REACTION:MECHANISMS_WOOD]



[Urist McTeellox]

commit 63ea9dffd70a007a89c26889041bef9faa900ec3
Date:   Fri Nov 1 23:42:18 2013 +1100

Glaives now use the spear skill, rather than whip.
   
They're pole-arms. They're not at all whippy.

Spoiler (click to show/hide)

Code: [Select]

diff --git a/Dwarf Fortress/raw/objects/item_weapon_masterwork.txt b/Dwarf Fortress/raw/objects/item_weapon_masterwork.txt
index ba53e76..be5eb17 100644
--- a/Dwarf Fortress/raw/objects/item_weapon_masterwork.txt     
+++ b/Dwarf Fortress/raw/objects/item_weapon_masterwork.txt     
@@ -1430,7 +1430,7 @@ PREFSTRING:alternative function as a backscratcher
 [ITEM_WEAPON:ITEM_WEAPON_EVIL8]
 [NAME:glaive:glaives]
 [SIZE:1250]
-[SKILL:WHIP]
+[SKILL:SPEAR]
 [TWO_HANDED:70000]
 [MINIMUM_SIZE:52500]
 [MATERIAL_SIZE:6]
@@ -1440,7 +1440,7 @@ PREFSTRING:alternative function as a backscratcher
 [ITEM_WEAPON:ITEM_WEAPON_EVIL7]
 [NAME:crescent glaive:crescent glaives]
 [SIZE:1250]
-[SKILL:WHIP]
+[SKILL:SPEAR]
 [TWO_HANDED:70000]
 [MINIMUM_SIZE:52500]
 [MATERIAL_SIZE:6]


[thistleknot]

Sometimes I fix bugs and add features. When I do, they'll go here.

Patches in this thread:

• Composite bows have correct power
• Warlocks no longer have the ethics of vegan elves
• Better fountains
• Glaives use spear skill, not whip skill

You should hyperlink to each fix.
Thx for the bugwork

[Urist McTeellox]

You should hyperlink to each fix.

Great idea!  Done!

Thx for the bugwork

You're very welcome! I'm still quite new to DF modding, and finding and fixing easy bugs is a great way for me to get started.

[thistleknot]

Attribute range fix

http://www.reddit.com/r/dwarffortress/comments/1p1o25/masterworkdf_what_do_you_dislike_the_most/ccywci8

[thistleknot]

to apply these patches

download patch for windows

add a path to your environment variables to it's binary (installation) folder

select a patch, save it as whatever...

example patching
C:\Games\Dwarf Fortress\Mods\Masterwork\MasterworkDF 4c\Dwarf Fortress\raw\objects>patch item_weapon_human_tech.txt <"c:\Games\Dwarf Fortress\Mods\Masterwork\4b-c patches\Composite bows are no longer overpowered.txt"
patching file item_weapon_human_tech.txt

[Another]

I think one very easy fix would be to add a definition for sun berry EXTRACT material with [REACTION_CLASS:LIQUID_SUN] so that sun berry poison would work.

[FengYun]

Thank you for your patches.