Skip to content

Commit

Permalink
Warlocks have much more flexible ethics now.
Browse files Browse the repository at this point in the history
In particular, they're no longer vegan elves.
  • Loading branch information
pjf committed Oct 25, 2013
1 parent 0a76e17 commit 9623fd8
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions Dwarf Fortress/raw/objects/entity_warlock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -213,4 +213,4 @@ YESWARLOCK[OBJECT:ENTITY]
[REQUIRED_BEDROOM:1]
[REQUIRED_DINING:1]
[MILITARY_SCREEN_ONLY]
[VARIABLE_POSITIONS:ALL]
[VARIABLE_POSITIONS:ALL]

0 comments on commit 9623fd8

Please sign in to comment.