Skip to content

Commit

Permalink
GH #48 - Resolved many missing reactions.
Browse files Browse the repository at this point in the history
Functional changes:

* Orcs and Dwarves can now open moon arrow crates
* Orcish fountains can fill buckets
* Fixed missing CADBLIGHT poison for orcs

Errored reactions removed/resolved:

* Lamellar bone armour is really gone.
* Copy and diff items 127, 178 and 206 removed.
* No longer existant greenskin reaction removed from warlocks and goblins
  (They have their own race-dependent reactions)
* Removed reference to non-existant mojo crafts in orcs
  (they can only be created from research or rituals)
* Duplicate scarecrow/decoy reactions for orcs removed.
* BLOCK_BOULDER reaction removed. Dunno what that was.
* Admitted that the apothecarius no longer makes soap, nor casts
* Old and removed reactions burnt from the crematorium
* Fountains don't try to provide courage.
  • Loading branch information
pjf committed Dec 22, 2013
1 parent 250caee commit 14046de
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 24 deletions.
9 changes: 1 addition & 8 deletions Dwarf Fortress/raw/objects/entity_default.txt
Expand Up @@ -1112,7 +1112,6 @@ YESMILLSTONE[PERMITTED_REACTION:MAKE_BONEMEAL_BONE_FAKE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_GRATE_BONE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_HATCH_COVER_BONE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_SHIELD]
[PERMITTED_REACTION:BONE_FAKE_MAKE_LAMELLAR_BONE]
[PERMITTED_REACTION:BONE_FAKE_MECHANISMS_BONE]
[PERMITTED_REACTION:BONE_FAKE_CRAFT_BONE_MILLSTONE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_RATTLE]
Expand Down Expand Up @@ -4878,7 +4877,6 @@ PERMITTED_REACTION:RANDOM_INVENTOR_AMMO => removed because of stacks
[PERMITTED_REACTION:COPY_ITEM_124]
[PERMITTED_REACTION:COPY_ITEM_125]
[PERMITTED_REACTION:COPY_ITEM_126]
[PERMITTED_REACTION:COPY_ITEM_127]
[PERMITTED_REACTION:COPY_ITEM_128]
[PERMITTED_REACTION:COPY_ITEM_129]
[PERMITTED_REACTION:COPY_ITEM_130]
Expand Down Expand Up @@ -4928,7 +4926,6 @@ PERMITTED_REACTION:RANDOM_INVENTOR_AMMO => removed because of stacks
[PERMITTED_REACTION:COPY_ITEM_175]
[PERMITTED_REACTION:COPY_ITEM_176]
[PERMITTED_REACTION:COPY_ITEM_177]
[PERMITTED_REACTION:COPY_ITEM_178]
[PERMITTED_REACTION:COPY_ITEM_179]
[PERMITTED_REACTION:COPY_ITEM_170]
[PERMITTED_REACTION:COPY_ITEM_181]
Expand Down Expand Up @@ -4957,7 +4954,6 @@ PERMITTED_REACTION:RANDOM_INVENTOR_AMMO => removed because of stacks
[PERMITTED_REACTION:COPY_ITEM_203]
[PERMITTED_REACTION:COPY_ITEM_204]
[PERMITTED_REACTION:COPY_ITEM_205]
[PERMITTED_REACTION:COPY_ITEM_206]
[PERMITTED_REACTION:COPY_ITEM_207]
[PERMITTED_REACTION:COPY_ITEM_208]
[PERMITTED_REACTION:COPY_ITEM_209]
Expand Down Expand Up @@ -5179,7 +5175,6 @@ PERMITTED_REACTION:RANDOM_INVENTOR_AMMO => removed because of stacks
[PERMITTED_REACTION:COPY_ITEM_DIFF_124]
[PERMITTED_REACTION:COPY_ITEM_DIFF_125]
[PERMITTED_REACTION:COPY_ITEM_DIFF_126]
[PERMITTED_REACTION:COPY_ITEM_DIFF_127]
[PERMITTED_REACTION:COPY_ITEM_DIFF_128]
[PERMITTED_REACTION:COPY_ITEM_DIFF_129]
[PERMITTED_REACTION:COPY_ITEM_DIFF_130]
Expand Down Expand Up @@ -5229,7 +5224,6 @@ PERMITTED_REACTION:RANDOM_INVENTOR_AMMO => removed because of stacks
[PERMITTED_REACTION:COPY_ITEM_DIFF_175]
[PERMITTED_REACTION:COPY_ITEM_DIFF_176]
[PERMITTED_REACTION:COPY_ITEM_DIFF_177]
[PERMITTED_REACTION:COPY_ITEM_DIFF_178]
[PERMITTED_REACTION:COPY_ITEM_DIFF_179]
[PERMITTED_REACTION:COPY_ITEM_DIFF_170]
[PERMITTED_REACTION:COPY_ITEM_DIFF_181]
Expand Down Expand Up @@ -5258,7 +5252,6 @@ PERMITTED_REACTION:RANDOM_INVENTOR_AMMO => removed because of stacks
[PERMITTED_REACTION:COPY_ITEM_DIFF_203]
[PERMITTED_REACTION:COPY_ITEM_DIFF_204]
[PERMITTED_REACTION:COPY_ITEM_DIFF_205]
[PERMITTED_REACTION:COPY_ITEM_DIFF_206]
[PERMITTED_REACTION:COPY_ITEM_DIFF_207]
[PERMITTED_REACTION:COPY_ITEM_DIFF_208]
[PERMITTED_REACTION:COPY_ITEM_DIFF_209]
Expand Down Expand Up @@ -6142,4 +6135,4 @@ YESREL[POSITION:OVERSEER]
YESGEMSHAPE[GEM_SHAPE:TAPERED_BAGUETTE_CUT_GEM]
YESGEMSHAPE[GEM_SHAPE:CUSHION_CUT_GEM]
YESGEMSHAPE[GEM_SHAPE:OCTAGON_CUT_GEM]
YESGEMSHAPE[GEM_SHAPE:SQUARE_CUT_GEM]
YESGEMSHAPE[GEM_SHAPE:SQUARE_CUT_GEM]
1 change: 0 additions & 1 deletion Dwarf Fortress/raw/objects/entity_goblin.txt
Expand Up @@ -129,7 +129,6 @@ YESGOBLIN[ENTITY:EVIL]
[PERMITTED_JOB:SUTURER]
[PERMITTED_JOB:SURGEON]
[PERMITTED_BUILDING:GREENSKIN]
[PERMITTED_REACTION:GREENSKIN]
[PERMITTED_REACTION:TAN_A_HIDE]
[PERMITTED_REACTION:RENDER_FAT]
[WORLD_CONSTRUCTION:TUNNEL]
Expand Down
18 changes: 4 additions & 14 deletions Dwarf Fortress/raw/objects/entity_orcfort_taigaorc.txt
Expand Up @@ -1057,9 +1057,6 @@ REACTION:SPORE_TREE_GLUE => if you want glue from cavern trees, you ned to add i
[PERMITTED_BUILDING:ORC_ALTAR_STORMS]
[PERMITTED_REACTION:SKULL_BLOOD_PRAYER]
[PERMITTED_REACTION:WOOD_MINOTAURTOTEM_ORC]
[PERMITTED_REACTION:MAKE_DISABLE_MOJO_ORC]
[PERMITTED_REACTION:MAKE_FRENZY_MOJO_ORC]
[PERMITTED_REACTION:MAKE_UNDEAD_MOJO_ORC]
[PERMITTED_REACTION:MAKE_SORC_CODEX_ORC]
[PERMITTED_REACTION:USE_DISABLE_MOJO_ORC]
[PERMITTED_REACTION:USE_CRUSH_MOJO_ORC]
Expand Down Expand Up @@ -1240,7 +1237,7 @@ REACTION:SPORE_TREE_GLUE => if you want glue from cavern trees, you ned to add i
[PERMITTED_REACTION:MAKE_POISON_SHADOWLEAF_ORC]
[PERMITTED_REACTION:MAKE_POISON_BITTERROOT_ORC]
[PERMITTED_REACTION:MAKE_POISON_PINKBANE_ORC]
[PERMITTED_REACTION:MAKE_POISON_CAD_BLIGHT_ORC]
[PERMITTED_REACTION:MAKE_POISON_CADBLIGHT_ORC]
[PERMITTED_REACTION:MAKE_POISON_HORROR_ORC]
[PERMITTED_REACTION:MAKE_POISON_EVERDREAM_ORC]
[PERMITTED_REACTION:MAKE_POISON_VOODOO_ORC]
Expand Down Expand Up @@ -1286,9 +1283,7 @@ REACTION:SPORE_TREE_GLUE => if you want glue from cavern trees, you ned to add i
[PERMITTED_REACTION:DART_BRONZE_ORC]

[PERMITTED_REACTION:CRAFT_SCARECROW_ORC]
[PERMITTED_REACTION:SCARECROW_ORC]
[PERMITTED_REACTION:CRAFT_DECOY_ORC]
[PERMITTED_REACTION:DECOY_ORC]

##################################################################
################## LABOR CAMPS ##########################
Expand Down Expand Up @@ -1324,7 +1319,6 @@ REACTION:SPORE_TREE_GLUE => if you want glue from cavern trees, you ned to add i
[PERMITTED_REACTION:MAKE_DAGGER_BONE]
[PERMITTED_REACTION:MAKE_SPEAR_BONE]
[PERMITTED_REACTION:MAKE_CROWN_BONE]
[PERMITTED_REACTION:MAKE_LAMELLAR_BONE]
[PERMITTED_REACTION:MAKE_BONE_SHIELD1]
[PERMITTED_REACTION:MAKE_BONE_SHIELD2]
[PERMITTED_REACTION:MAKE_BONE_SHIELD3]
Expand Down Expand Up @@ -1431,7 +1425,6 @@ YESCRAFTSMAN[PERMITTED_REACTION:ADAMANTINE_STRANDS]
-PERMITTED_REACTION:CRAFT_ROCK_TOY_RANDOM-
-PERMITTED_REACTION:BED_SILVER-
-PERMITTED_REACTION:BED_GOLD-
YESCRAFTSMAN[PERMITTED_REACTION:BLOCK_BOULDER]
YESCRAFTSMAN[PERMITTED_REACTION:MAKE_CANDLE_TALLOW_ORC]
YESCRAFTSMAN[PERMITTED_REACTION:MAKE_CANDLE_WAX_ORC]
-PERMITTED_REACTION:MECHANISMS_WOOD-
Expand Down Expand Up @@ -1595,21 +1588,20 @@ YESTANNER[PERMITTED_REACTION:UPGRADE_SHELL_ONE]
##################################################################

[PERMITTED_BUILDING:FOUNTAIN]
[PERMITTED_REACTION:TRAIN_SWIMMING]
[PERMITTED_REACTION:DRINK_OF_COURAGE]
[PERMITTED_REACTION:TRAIN_SWIMMING]
[PERMITTED_REACTION:FILL_BUCKET]


##################################################################
################## APOTHECARIUS ##########################
##################################################################

YESAPO[PERMITTED_BUILDING:APOTHECARIUS]
YESAPO[PERMITTED_REACTION:MAKE_SOAP_APO]
-PERMITTED_REACTION:MAKE_SOAP_APO-
YESAPO[PERMITTED_REACTION:EMPTY_BUCKET]
YESAPO[PERMITTED_REACTION:FILL_BUCKET_ICE]
YESAPO[PERMITTED_REACTION:SPLINTS]
YESAPO[PERMITTED_REACTION:CRUTCHES]
YESAPO[PERMITTED_REACTION:CASTS]



Expand Down Expand Up @@ -1648,8 +1640,6 @@ YESAPO[PERMITTED_REACTION:CASTS]
##################################################################

YESWOR[PERMITTED_BUILDING:MB_CREMATORIUM]
[PERMITTED_REACTION:BURN_CORPSE2]
[PERMITTED_REACTION:BURN_CORPSE]
[PERMITTED_REACTION:BURN_BARREL]
[PERMITTED_REACTION:BURN_BED]
[PERMITTED_REACTION:BURN_BIN]
Expand Down
1 change: 0 additions & 1 deletion Dwarf Fortress/raw/objects/entity_warlock.txt
Expand Up @@ -82,7 +82,6 @@ YESWARLOCK[OBJECT:ENTITY]
[PERMITTED_JOB:CARPENTER]
[PERMITTED_JOB:WOODCUTTER]
[PERMITTED_JOB:MASON]
[PERMITTED_REACTION:GREENSKIN]
[PERMITTED_JOB:ANIMAL_CARETAKER]
[PERMITTED_JOB:ANIMAL_TRAINER]
[PERMITTED_JOB:HUNTER]
Expand Down
11 changes: 11 additions & 0 deletions Dwarf Fortress/raw/objects/reaction_masterwork.txt
Expand Up @@ -7972,6 +7972,17 @@ invoke
[PRODUCT:0:1:BOULDER:NONE:INORGANIC:ANNOUNCEMENT_CRATEOPEN]
[AUTOMATIC]

[REACTION:CRATE_ARROW_MOON]
[NAME:Open ammocrate (moon arrows)]
[BUILDING:STORAGE:NONE]
[REAGENT:A:1:BAR:NONE:CREATURE_MAT:MOON_ARROW_CRATE:SOAP][DOES_NOT_DETERMINE_PRODUCT_AMOUNT]
[PRODUCT:100:25:AMMO:ITEM_AMMO_ARROWS_ENCHANTED:INORGANIC:STEELOAK]
[PRODUCT:100:25:AMMO:ITEM_AMMO_ARROWS_ENCHANTED:INORGANIC:STEELOAK]
[PRODUCT:100:25:AMMO:ITEM_AMMO_ARROWS_ENCHANTED:INORGANIC:STEELOAK]
[PRODUCT:100:25:AMMO:ITEM_AMMO_ARROWS_ENCHANTED:INORGANIC:STEELOAK]
[PRODUCT:0:1:BOULDER:NONE:INORGANIC:ANNOUNCEMENT_CRATEOPEN]
[AUTOMATIC]


[REACTION:CRATE_ARROW_SINGING]
[NAME:Open ammocrate (singing arrows)]
Expand Down

0 comments on commit 14046de

Please sign in to comment.