Skip to content

Commit

Permalink
new civ options and fixes
Browse files Browse the repository at this point in the history 
- added new option to choose what types of materials civs can work with
- added new option for playable adventure mode
- added new option to choose how migrant starting labors are set

- rearranged the graphics section of the settings to make things uglier
- removed the old invader materials button from the misc. section as
it's no longer used

- raws have been updated for the new reactions for materials and adv
mode

- fixed orc dodge skill which was missed when changing invader skills
- fixed an issue where choosing the skill for fortress defense civs
would change some other civs' skills

- removed materials option from dwarf_m

- entity_default still needs to be reviewed

(Squashed commit by @pjf of @splintermind's work)

Author:    Josh <splintermind@gmail.com>
  • Loading branch information
@splintermind @pjf
splintermind authored and pjf committed Dec 30, 2013
1 parent 9b0517d commit 76cf666
Show file tree
Hide file tree
Showing 30 changed files with 3,213 additions and 3,162 deletions.
2 changes: 1 addition & 1 deletion Dwarf Fortress/raw/objects/creature_masterwork.txt
View file
Expand Up @@ -6604,7 +6604,7 @@ YE_JADE:1:IRIS_EYE_OCHRE:1:IRIS_EYE_RAW_UMBER:1:IRIS_EYE_RUST:1:IRIS_EYE_SILVER:
[NATURAL_SKILL:BITE:0]YESHARDERINVADER_ORC
[NATURAL_SKILL:GRASP_STRIKE:0]YESHARDERINVADER_ORC
[NATURAL_SKILL:STANCE_STRIKE:0]YESHARDERINVADER_ORC
[NATURAL_SKILL:DODGING:1]YESHARDERINVADER
[NATURAL_SKILL:DODGING:1]YESHARDERINVADER_ORC



Expand Down
3 changes: 2 additions & 1 deletion Dwarf Fortress/raw/objects/entity_antmen.txt
View file
Expand Up @@ -2,8 +2,9 @@ entity_antmen

YESANTMEN[OBJECT:ENTITY]

YESANTMEN[ENTITY:ANTMEN]
YESANTMEN[ENTITY:ANTMEN][PERMITTED_REACTION:MATERIALS_DEFAULT]
[LAYER_LINKED]
YESADVANT[INDIV_CONTROLLABLE]
[CREATURE:ANTMAN][BABYSNATCHER]
[TRANSLATION:CZECH]
[WEAPON:ITEM_WEAPON_TRIDENT:FORCED]
Expand Down
4 changes: 2 additions & 2 deletions Dwarf Fortress/raw/objects/entity_automaton.txt
View file
Expand Up @@ -2,9 +2,9 @@ entity_automaton

YESAUTOMATON[OBJECT:ENTITY]

YESAUTOMATON[ENTITY:AUTOMATON]
YESAUTOMATON[ENTITY:AUTOMATON][PERMITTED_REACTION:MATERIALS_DEFAULT]
YESAUTOMATON[CREATURE:AUTOMATON][BABYSNATCHER]
[INDIV_CONTROLLABLE]
YESADVAUT[INDIV_CONTROLLABLE]

[CLOTHING]
[DIGGER:ITEM_WEAPON_PICK:FORCED]
Expand Down
172 changes: 71 additions & 101 deletions Dwarf Fortress/raw/objects/entity_default.txt
View file
Expand Up @@ -2,11 +2,19 @@ entity_default

[OBJECT:ENTITY]

YESPLAYABLED[ENTITY:MOUNTAIN]
YESPLAYABLED[ENTITY:MOUNTAIN][PERMITTED_REACTION:MATERIALS_DEFAULT]
YESADVD[INDIV_CONTROLLABLE]
!NOCIVD!CIV_CONTROLLABLE]--- is toggled when you play other races.
[ADVENTURE_TIER:3]

!BABYSNATCHER!

[PERMITTED_REACTION:MAKE_MEDICINE]

PERMITTED_REACTION:BREW_POT
PERMITTED_REACTION:BREW_MAGMA
PERMITTED_REACTION:BREW_WATER

[PERMITTED_REACTION:RESEARCH_IGNORE]
[PERMITTED_BUILDING:TOWNPORTAL]
[PERMITTED_REACTION:BLUEPRINT_townportal_ONE]
Expand Down Expand Up @@ -87,6 +95,8 @@ YESPLAYABLED[ENTITY:MOUNTAIN]
[PERMITTED_REACTION:PRAY_GLASS]
[PERMITTED_REACTION:PRAY_RAIN1]
[PERMITTED_REACTION:PRAY_RAIN2]
[PERMITTED_REACTION:PRAY_GLASS_SOUL]
[PERMITTED_REACTION:PRAY_RAIN1_SOUL]

[PERMITTED_REACTION:WOOD_PLANKS_1]
[PERMITTED_REACTION:WOOD_PLANKS_2]
Expand Down Expand Up @@ -295,11 +305,12 @@ YESWOODCRAFTER[PERMITTED_BUILDING:WOODCUTTER]
YESTORCHBEARER[PERMITTED_BUILDING:TORCHBEARER_STATUE]
YESGEMOFLIGHT[PERMITTED_BUILDING:GLOWING_ORB]

[PERMITTED_REACTION:LIGHT_WOOD_FIRE_INFO]
[PERMITTED_REACTION:LIGHT_WOOD_BRAZIER_FIRE]
[PERMITTED_REACTION:LIGHT_TORCH_FIRE]
[PERMITTED_REACTION:LIGHT_WOOD_FIRE]
[PERMITTED_REACTION:FIRE_WARNING]
!!! need light emitting items !!!
PERMITTED_REACTION:LIGHT_WOOD_FIRE_INFO
PERMITTED_REACTION:LIGHT_WOOD_BRAZIER_FIRE
PERMITTED_REACTION:LIGHT_TORCH_FIRE
PERMITTED_REACTION:LIGHT_WOOD_FIRE
PERMITTED_REACTION:FIRE_WARNING

[PERMITTED_REACTION:TARPITCH_BITUM]
[PERMITTED_REACTION:TARPITCH_LIGNITE]
Expand Down Expand Up @@ -969,43 +980,30 @@ YESMILLSTONE[PERMITTED_REACTION:CRAFT_GRIND_CRUSH_WEAPONRACK]
[PERMITTED_REACTION:NICKEL_MAKING_BATCH]

[PERMITTED_REACTION:CRAFT_GEM_WEAPON_HEAD]
[PERMITTED_REACTION:BONE_FAKE_BONE_WEAPON_HEAD]
[PERMITTED_REACTION:BONE_WEAPON_HEAD]
[PERMITTED_REACTION:CRAFT_GEM_BLADE_END]
[PERMITTED_REACTION:BONE_FAKE_BONE_BLADE_END]
[PERMITTED_REACTION:BONE_BLADE_END]
[PERMITTED_REACTION:CRAFT_GEM_TOOL_HILT]
[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_HILT]
[PERMITTED_REACTION:BONE_TOOL_HILT]
[PERMITTED_REACTION:CRAFT_GEM_TOOL_JUG]
[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_JUG]
[PERMITTED_REACTION:BONE_TOOL_JUG]
[PERMITTED_REACTION:CRAFT_GEM_TOOL_PIPE]
[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_PIPE]
[PERMITTED_REACTION:BONE_TOOL_PIPE]
[PERMITTED_REACTION:CRAFT_GEM_TOOL_CANDELABRA]
[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_CANDELABRA]
[PERMITTED_REACTION:BONE_TOOL_CANDELABRA]
[PERMITTED_REACTION:CRAFT_GEM_TOOL_BRAZIER]
[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_BRAZIER]
[PERMITTED_REACTION:BONE_TOOL_BRAZIER]
[PERMITTED_REACTION:CRAFT_GEM_TOOL_FIREPLACE]
[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_FIREPLACE]
[PERMITTED_REACTION:BONE_TOOL_FIREPLACE]
[PERMITTED_REACTION:CRAFT_GEM_TOOL_MORTAR]
[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_MORTAR]
[PERMITTED_REACTION:BONE_TOOL_MORTAR]
[PERMITTED_REACTION:CRAFT_GEM_TOOL_PESTLE]
[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_PESTLE]
[PERMITTED_REACTION:BONE_TOOL_PESTLE]
[PERMITTED_REACTION:CRAFT_GEM_TOOL_NEXT_BOX]
[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_NEXT_BOX]
[PERMITTED_REACTION:BONE_TOOL_NEXT_BOX]
[PERMITTED_REACTION:CRAFT_GEM_TOOL_LARGE_POT]
[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_LARGE_POT]
[PERMITTED_REACTION:BONE_TOOL_LARGE_POT]
[PERMITTED_REACTION:CRAFT_GEM_TOOL_HIVE]
[PERMITTED_REACTION:BONE_FAKE_BONE_TOOL_HIVE]
[PERMITTED_REACTION:BONE_TOOL_HIVE]

[PERMITTED_REACTION:CLOTH_WRITING_WOOL]
Expand Down Expand Up @@ -1086,48 +1084,11 @@ PERMITTED_REACTION:FORCE_CARAVAN_ELF_M

new bone stuff
YESMILLSTONE[PERMITTED_REACTION:MAKE_BONEMEAL_BONE_FAKE]
[PERMITTED_REACTION:TRAIN_BONESETTING_APO_HELM_BONE_FAKE]
[PERMITTED_REACTION:STUD_LEATHER_BONE_BONE_FAKE]
[PERMITTED_REACTION:SACRIFICE_BONES_HELM_BONE_FAKE]
[PERMITTED_REACTION:SLEEP_SETB_HELM_BONE_FAKE]
[PERMITTED_REACTION:SLEEP_SETB2_HELM_BONE_FAKE]
[PERMITTED_REACTION:DINING_SETB_HELM_BONE_FAKE]
[PERMITTED_REACTION:TOMB_SETB_HELM_BONE_FAKE]
[PERMITTED_REACTION:LIVING_SETB_HELM_BONE_FAKE]
[PERMITTED_REACTION:MAKE_IRONBONE_BONE_FAKE]
[PERMITTED_REACTION:BONE_FAKE_BONE_ARMORSTAND]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_BALLISTA]
[PERMITTED_REACTION:BONE_FAKE_BED_BONE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BLOCK_BONE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_ARMOR_BONE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_SHIELD]
[PERMITTED_REACTION:BONE_FAKE_BONE_CABINET]
[PERMITTED_REACTION:BONE_FAKE_BONE_CAGE]
[PERMITTED_REACTION:BONE_FAKE_BONE_CHEST]
[PERMITTED_REACTION:BONE_FAKE_BONE_COFFIN]
[PERMITTED_REACTION:BONE_FAKE_MAKE_CROWN_BONE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_DAGGER_BONE]
[PERMITTED_REACTION:BONE_FAKE_BONE_DOOR]
[PERMITTED_REACTION:BONE_FAKE_BONE_FLOODGATE]
[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_MECHANISMS_BONE]
[PERMITTED_REACTION:BONE_FAKE_CRAFT_BONE_MILLSTONE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_RATTLE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_SHIELD]
[PERMITTED_REACTION:BONE_FAKE_MAKE_SLAB_BONE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_SPEAR_BONE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_SPIKE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BONE_STATUE]
[PERMITTED_REACTION:BONE_FAKE_BONE_TABLE]
[PERMITTED_REACTION:BONE_FAKE_MAKE_CHAIR_BONE]
[PERMITTED_REACTION:BONE_FAKE_CRAFT_BONE_QUERN]
[PERMITTED_REACTION:BONE_FAKE_BONE_WEAPONRACK]

[PERMITTED_REACTION:DWARF]--- for traders only. Has no building.

YESCIVD[CIV_CONTROLLABLE]--- is toggled when you play other races.

[CREATURE:DWARF]
NOENGLISH[TRANSLATION:DWARF_M]--- is toggled when you play with dwarvish/english language
[USE_ANIMAL_PRODUCTS]
Expand Down Expand Up @@ -1190,7 +1151,6 @@ WEAPON:ITEM_WEAPON_AXE_GREAT:FORCED axe



[HELM:BONE_FAKE:FORCED] => dont ask.

//chaimail
[ARMOR:ITEM_ARMOR_MAIL_SHIRT:FORCED]
Expand Down Expand Up @@ -1430,7 +1390,7 @@ WEAPON:ITEM_WEAPON_AXE_GREAT:FORCED axe
[ITEM_IMPROVEMENT_MODIFIER:RINGS_HANGING:64]
[ITEM_IMPROVEMENT_MODIFIER:BANDS:384]
[ITEM_IMPROVEMENT_MODIFIER:SPIKES:384]
[ADVENTURE_TIER:3]

[FRIENDLY_COLOR:1:0:1]
[DEFAULT_SITE_TYPE:CAVE_DETAILED]
[LIKES_SITE:CAVE_DETAILED]
Expand Down Expand Up @@ -1750,8 +1710,10 @@ monastery monestary
YESMONASTERY[PERMITTED_BUILDING:MONASTERY]
[PERMITTED_REACTION:MMONASTERY_SKILL_DWARF]
[PERMITTED_REACTION:JOIN_GUILD_PRIEST]
[PERMITTED_REACTION:MAKE_CEREMONIAL_STATUE] => Maybe change it?
[PERMITTED_REACTION:MAKE_CEREMONIAL_TOTEM] => Maybe change it?
[PERMITTED_REACTION:JOIN_GUILD_PRIEST3]
[PERMITTED_REACTION:JOIN_GUILD_PRIEST4]
[PERMITTED_REACTION:JOIN_GUILD_PRIEST5]
[PERMITTED_REACTION:JOIN_GUILD_PRIEST2]
#######################################################################
title
[PERMITTED_BUILDING:WORKSHOPS]
Expand Down Expand Up @@ -2959,6 +2921,18 @@ shrine of armok
#######################################################################
altar of armok
YESALTAR[PERMITTED_BUILDING:ARMOK_ALTAR]

[PERMITTED_REACTION:PRAY_COTTON_SOUL]
[PERMITTED_REACTION:PRAY_WOOL_SOUL]
[PERMITTED_REACTION:PRAY_SILK_SOUL]
[PERMITTED_REACTION:PRAY_WATER_SOUL]
[PERMITTED_REACTION:PRAY_GEM_SOUL]
[PERMITTED_REACTION:PRAY_SOUL]
[PERMITTED_REACTION:PRAY_METAL_SOUL]
[PERMITTED_REACTION:PRAY_MUSHROOM_SOUL]
[PERMITTED_REACTION:PRAY_BOOZE_SOUL]


[PERMITTED_REACTION:DRY_HEART] => sacrifice heart.
[PERMITTED_REACTION:SACRIFICE]
[PERMITTED_REACTION:SACRIFICE_LIFE]
Expand All @@ -2971,23 +2945,28 @@ altar of armok
#######################################################################
temple of armok
YESTEMPLE[PERMITTED_BUILDING:ARMOK_TEMPLE]
[PERMITTED_REACTION:CLEANS_BLOODSTEEL]
[PERMITTED_REACTION:RESEARCH_GOLEM] => golem heart in temple
[PERMITTED_REACTION:SACRIFICE_ARMOR]
[PERMITTED_REACTION:SACRIFICE_WEAPON]
[PERMITTED_REACTION:SACRIFICE_HELM]
[PERMITTED_REACTION:SACRIFICE_GREAVES]
[PERMITTED_REACTION:SACRIFICE_GLOVES]
[PERMITTED_REACTION:SACRIFICE_BOOTS]
[PERMITTED_REACTION:SACRIFICE_SHIELD]
[PERMITTED_REACTION:SACRIFICE_LIFE_MAGMA]
[PERMITTED_REACTION:SACRIFICE_GUARDIAN]
[PERMITTED_REACTION:SACRIFICE_WARLOCK_RING]
[PERMITTED_REACTION:SACRIFICE_WARLOCK_FETISH]
[PERMITTED_REACTION:SACRIFICE_WARLOCK_AMULET]
[PERMITTED_REACTION:SACRIFICE_WARLOCK_TAROT]
[PERMITTED_REACTION:SACRIFICE_WARLOCK_DEMONIC]
[PERMITTED_REACTION:WARD_CULT]
[PERMITTED_REACTION:WARD_CULT2]
#######################################################################
oracle of armok
YESTEMPLE[PERMITTED_BUILDING:ARMOK_ORACLE]

[PERMITTED_REACTION:SACRIFICE_BLESSING]
[PERMITTED_REACTION:SACRIFICE_COURAGE]
[PERMITTED_REACTION:SACRIFICE_EMOTION]
[PERMITTED_REACTION:WARD_CULT]
[PERMITTED_REACTION:WARD_CULT2]
[PERMITTED_REACTION:COLOSSUS]
[PERMITTED_REACTION:BLESS_SILVER]
[PERMITTED_REACTION:CURSE_SILVER]

#######################################################################
title
[PERMITTED_BUILDING:MAGIC]
Expand Down Expand Up @@ -3594,15 +3573,6 @@ fletcher
[PERMITTED_REACTION:MAKE_JAVELINS_TWO_BONE_D]
[PERMITTED_REACTION:MAKE_JAVELINS_THREE_BONE_D]

[PERMITTED_REACTION:BONE_FAKE_MAKE_ARROWS_ONE_BONE_D]
[PERMITTED_REACTION:BONE_FAKE_MAKE_ARROWS_TWO_BONE_D]
[PERMITTED_REACTION:BONE_FAKE_MAKE_ARROWS_THREE_BONE_D]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BOLTS_ONE_BONE_D]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BOLTS_TWO_BONE_D]
[PERMITTED_REACTION:BONE_FAKE_MAKE_BOLTS_THREE_BONE_D]
[PERMITTED_REACTION:BONE_FAKE_MAKE_JAVELINS_ONE_BONE_D]
[PERMITTED_REACTION:BONE_FAKE_MAKE_JAVELINS_TWO_BONE_D]
[PERMITTED_REACTION:BONE_FAKE_MAKE_JAVELINS_THREE_BONE_D]
#######################################################################
toolmaker precision toolmaker
YESTOOLMAKER[PERMITTED_BUILDING:TOOLMAKER]
Expand Down Expand Up @@ -5393,16 +5363,16 @@ YESBIOLOGIST[PERMITTED_BUILDING:BIOLOGISTS_LAB]
[PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_TWO]
[PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_FIVE]
[PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_THREE]
[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_ONE]
[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FOUR]
[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_TWO]
[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FIVE]
[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_THREE]
[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_ONE]
[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FOUR]
[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_TWO]
[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FIVE]
[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_THREE]
PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_ONE
PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FOUR
PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_TWO
PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FIVE
PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_THREE
PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_ONE
PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FOUR
PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_TWO
PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FIVE
PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_THREE
[PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_ONE]
[PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_FOUR]
[PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_TWO]
Expand Down Expand Up @@ -5463,16 +5433,16 @@ YESBIOLOGIST[PERMITTED_BUILDING:BIOLOGISTS_LAB]
[PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_THREE_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_FOUR_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_WARLOCK_FIVE_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_ONE_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_TWO_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_THREE_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FOUR_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FIVE_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_ONE_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_TWO_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_THREE_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FOUR_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FIVE_SUCCESS]
PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_ONE_SUCCESS
PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_TWO_SUCCESS
PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_THREE_SUCCESS
PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FOUR_SUCCESS
PERMITTED_REACTION:STUDY_BIOLOGY_AUTOMATON_FIVE_SUCCESS
PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_ONE_SUCCESS
PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_TWO_SUCCESS
PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_THREE_SUCCESS
PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FOUR_SUCCESS
PERMITTED_REACTION:STUDY_BIOLOGY_FROST_GIANT_FIVE_SUCCESS
[PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_ONE_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_TWO_SUCCESS]
[PERMITTED_REACTION:STUDY_BIOLOGY_HUMAN_THREE_SUCCESS]
Expand Down Expand Up @@ -5565,8 +5535,8 @@ YESWOR[PERMITTED_REACTION:FIREWOOD_START]
[ETHIC:THEFT:PUNISH_SERIOUS]
[ETHIC:ASSAULT:PUNISH_SERIOUS]
[ETHIC:SLAVERY:PUNISH_CAPITAL]
[ETHIC:EAT_SAPIENT_OTHER:UNTHINKABLE]
[ETHIC:EAT_SAPIENT_KILL:UNTHINKABLE]
[ETHIC:EAT_SAPIENT_OTHER:ACCEPTABLE]=> needed for souls, was UNTHINKABLE
[ETHIC:EAT_SAPIENT_KILL:ACCEPTABLE]=> needed for souls, was UNTHINKABLE
[ETHIC:MAKE_TROPHY_SAME_RACE:ACCEPTABLE]
[ETHIC:MAKE_TROPHY_SAPIENT:ACCEPTABLE]
[ETHIC:MAKE_TROPHY_ANIMAL:ACCEPTABLE]
Expand Down
4 changes: 3 additions & 1 deletion Dwarf Fortress/raw/objects/entity_drow.txt
View file
@@ -1,7 +1,9 @@
entity_drow

YESDROW[OBJECT:ENTITY]
[ENTITY:DROW]
[ENTITY:DROW][PERMITTED_REACTION:MATERIALS_DEFAULT]

YESADVDROW[INDIV_CONTROLLABLE]
[CREATURE:DROW]!BABYSNATCHER!
[TRANSLATION:DROW]
[WANDERER]
Expand Down
3 changes: 2 additions & 1 deletion Dwarf Fortress/raw/objects/entity_drow_evil.txt
View file
Expand Up @@ -11,7 +11,8 @@ entity_drow_evil
#####
# Changed some of the Drow weapons into closest Orcish counterpart
#
[ENTITY:DROW_EVIL]
[ENTITY:DROW_EVIL][PERMITTED_REACTION:MATERIALS_DEFAULT]
YESADVDROW_EVIL[INDIV_CONTROLLABLE]
[CREATURE:DROW_EVIL][BABYSNATCHER]
[TRANSLATION:DROW]
[WANDERER]
Expand Down
4 changes: 3 additions & 1 deletion Dwarf Fortress/raw/objects/entity_dwarf_evil.txt
View file
Expand Up @@ -13,9 +13,11 @@ entity_dwarf_evil
# Remove a number (not all) swords, thrown, and 2H weapons
# Added ITEM_WEAPON_AUXILLA_KIT and ITEM_WEAPON_LEGION_KIT
# Profession names
[ENTITY:MOUNTAIN_EVIL][PERMITTED_REACTION:MATERIALS_DEFAULT]

YESADVD_EVIL[INDIV_CONTROLLABLE]
[ARMOR:ITEM_ARMOR_SHIRT:FORCED]
[PANTS:ITEM_PANTS_PANTS:FORCED]
[ENTITY:MOUNTAIN_EVIL]
[CREATURE:DWARF_EVIL][BABYSNATCHER]
[TRANSLATION:DWARF_M]
[USE_ANIMAL_PRODUCTS]
Expand Down
3 changes: 2 additions & 1 deletion Dwarf Fortress/raw/objects/entity_elf.txt
View file
Expand Up @@ -3,8 +3,9 @@ entity_elf
YESELFRACE[OBJECT:ENTITY]


[ENTITY:FOREST]
[ENTITY:FOREST][PERMITTED_REACTION:MATERIALS_DEFAULT]
[CREATURE:ELF]!BABYSNATCHER!
YESADVELF[INDIV_CONTROLLABLE]
[TRANSLATION:ELF]
[WEAPON:ITEM_WEAPON_ELF1:FORCED]
[WEAPON:ITEM_WEAPON_ELF2:FORCED]
Expand Down
3 changes: 2 additions & 1 deletion Dwarf Fortress/raw/objects/entity_elf_evil.txt
View file
Expand Up @@ -12,9 +12,10 @@ entity_elf_evil
# Small tweaks to weapons & armor for a more nomadic/ashland elf feel rather than silvans


[ENTITY:FOREST_EVIL]
[ENTITY:FOREST_EVIL][PERMITTED_REACTION:MATERIALS_DEFAULT]
[CREATURE:ELF_EVIL][BABYSNATCHER]
[TRANSLATION:ELF]
YESADVELF_EVIL[INDIV_CONTROLLABLE]
[WEAPON:ITEM_WEAPON_DAGGER_LARGE]

[ARMOR:ITEM_ARMOR_SHIRT:FORCED]
Expand Down

1 comment on commit 76cf666

@pjf
Copy link
Owner

@pjf pjf commented on 76cf666 Jan 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@splintermind: Just a quick check; this add the MATERIALS_DEFAULT reaction to all entities, but doesn't define it in any reaction_* files that I can find. Is that intentional?

Please sign in to comment.