Skip to content

Commit

Permalink
Nerfed diseases v6 by thistleknot.
Browse files Browse the repository at this point in the history 
From the release notes at
http://www.bay12forums.com/smf/index.php?topic=133312.msg4804015#msg4804015

* Reduced the % chance of certain diseases considerably...

** Dwarves can now use their disease_resistance against catching the disease
   (i.e. via spreading), also the spreading is nerfed by reducing it's
   chance from 100% spreading to nearby dwarf's to a reduced % (60% for
   influenza, 25% for [visible] plagues).

** Also, resistance is used against specific applications of the diseases (i.e.
   sub syndromes of a disease, ex... necrosis of the liver is resistable).

* If a dwarf suffered from an epidemic (i.e. influenza, meningitis, or
  pnuemonia) they are immune from catching the disease for up to one
  year, does away with the need for mutations.

* Medicine now acts as a vaccine for epidemic's for one year.

* Plague Immunity (v5): Now dwarf's have a resistance chance * 2% of
  being immune to all plagues/rabies

* Medicine now has slightly extended durations against non
  communicable diseases, (i.e. blood pressure)  (needed only 3 times a
  year vs 5.22 times a year for full coverage).
  • Loading branch information
@pjf
pjf committed Dec 2, 2013
1 parent b6f5079 commit e09a2e1
Show file tree
Hide file tree
Showing 40 changed files with 367 additions and 153 deletions.
6 changes: 6 additions & 0 deletions Dwarf Fortress/raw/objects/c_variation_disease.txt
View file
Expand Up @@ -51,6 +51,12 @@ c_variation_disease
[CV_NEW_TAG:CAN_DO_INTERACTION:DEPRESSION_PROBABILITY]
[CV_NEW_TAG:CDI:TARGET:A:SELF_ONLY][CV_NEW_TAG:CDI:WAIT_PERIOD:6000000][CV_NEW_TAG:CDI:FREE_ACTION]


[CREATURE_VARIATION:HAS_PLAGUE_IMMUNITY]

[CV_NEW_TAG:CAN_DO_INTERACTION:PLAGUE_PROB_IMMUNE]
[CV_NEW_TAG:CDI:TARGET:A:SELF_ONLY][CV_NEW_TAG:CDI:WAIT_PERIOD:6000000][CV_NEW_TAG:CDI:FREE_ACTION]


[CREATURE_VARIATION:HAS_BLACK_PLAGUE]

Expand Down
3 changes: 2 additions & 1 deletion Dwarf Fortress/raw/objects/creature_standard.txt
View file
Expand Up @@ -12,7 +12,8 @@ creature_standard
[BENIGN]
[CANOPENDOORS]
[PREFSTRING:beards]


YESNEWDISEASE[APPLY_CREATURE_VARIATION:HAS_PLAGUE_IMMUNITY]
YESNEWDISEASE[APPLY_CREATURE_VARIATION:HAS_DEPRESSION]
YESNEWDISEASE[APPLY_CREATURE_VARIATION:HAS_BLACK_PLAGUE]
YESNEWDISEASE[APPLY_CREATURE_VARIATION:HAS_BUBONIC_PLAGUE]
Expand Down
2 changes: 1 addition & 1 deletion Dwarf Fortress/raw/objects/interaction_developmental.txt
View file
Expand Up @@ -82,7 +82,7 @@ interaction_developmental
[SYN_NAME:is showing symptoms of blindness]
[SYN_CLASS:BLINDNESS]
[SYN_AFFECTED_CLASS:GENERAL_POISON]
[CE_IMPAIR_FUNCTION:SEV:9001:BP:BY_TYPE:SIGHT:ALL:START:0:PEAK:100:END:33600]
[CE_IMPAIR_FUNCTION:SEV:9001:BP:BY_TYPE:SIGHT:ALL:PROB:80:RESISTABLE:START:0:PEAK:100:END:33600]


[INTERACTION:SPREAD_DWARFISM] ## the mechanics still require this, but see below
Expand Down
71 changes: 54 additions & 17 deletions Dwarf Fortress/raw/objects/interaction_disease_probabilities.txt
View file
@@ -1,6 +1,43 @@
interaction_disease_probabilities
[OBJECT:INTERACTION]

[INTERACTION:PLAGUE_PROB_IMMUNE] ##New plague immunity check! If a dwarf passes his resistance check, he has a 2% of being immune to all plagues!

[I_TARGET:A:CREATURE][IT_LOCATION:CONTEXT_CREATURE]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED]
[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_CLASS:PLAGUE_IMMUNITY_CHECK][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:plague immunity check made]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]

##If fail, then not immune.
[CE_CAN_DO_INTERACTION:PROB:100:RESISTABLE:START:0:END:3000]
[CDI:INTERACTION:PLAGUE_NOT_IMMUNE]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]

##If resisted, 2% chance immunity to all plagues
[CE_CAN_DO_INTERACTION:PROB:2:START:0:END:3000]
[CDI:INTERACTION:PLAGUE_IMMUNE]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]

##If resisted, and !(PLAGUE_IMMUNE), then need to set to PLAGUE_NOT_IMMUNE)
[CE_CAN_DO_INTERACTION:PROB:100:START:0:END:3000]
[CDI:INTERACTION:PLAGUE_NOT_IMMUNE]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]

[INTERACTION:PLAGUE_IMMUNE]
[I_TARGET:A:CREATURE][IT_LOCATION:CONTEXT_CREATURE]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:PLAGUE_NOT_IMMUNE][IT_CANNOT_HAVE_SYNDROME_CLASS:IMMUNE]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_CLASS:PLAGUE_IMMUNE][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:plague immunity]

[INTERACTION:PLAGUE_NOT_IMMUNE]
[I_TARGET:A:CREATURE][IT_LOCATION:CONTEXT_CREATURE]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:PLAGUE_IMMUNE][IT_CANNOT_HAVE_SYNDROME_CLASS:PLAGUE_NOT_IMMUNE]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_CLASS:PLAGUE_NOT_IMMUNE][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:plague not immune]

[INTERACTION:DEPRESSION_PROBABILITY]

Expand Down Expand Up @@ -31,7 +68,7 @@ interaction_disease_probabilities
[INTERACTION:BLACK_PLAGUE_PROBABILITY]

[I_TARGET:A:CREATURE][IT_LOCATION:CONTEXT_CREATURE]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:BLACK_PLAGUE_A]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:BLACK_PLAGUE_A][IT_CANNOT_HAVE_SYNDROME_CLASS:PLAGUE_IMMUNE]
[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_CLASS:BLACK_PLAGUE_A][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:black plague check made]

Expand All @@ -44,20 +81,20 @@ interaction_disease_probabilities
[INTERACTION:BLACK_PLAGUE_PROB_INNER]

[I_TARGET:A:CREATURE][IT_LOCATION:CONTEXT_CREATURE]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:BLACK_PLAGUE_B]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:BLACK_PLAGUE_B][IT_CANNOT_HAVE_SYNDROME_CLASS:PLAGUE_IMMUNE]
[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_CLASS:BLACK_PLAGUE_B][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:black plague secondary check made]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[CE_CAN_DO_INTERACTION:PROB:3:START:0:END:3000]
[CE_CAN_DO_INTERACTION:PROB:3:RESISTABLE:START:0:END:3000]
[CDI:INTERACTION:SPREAD_BLACK_PLAGUE]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]


[INTERACTION:BUBONIC_PLAGUE_PROBABILITY]

[I_TARGET:A:CREATURE][IT_LOCATION:CONTEXT_CREATURE]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:BUBONIC_PLAGUE_A]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:BUBONIC_PLAGUE_A][IT_CANNOT_HAVE_SYNDROME_CLASS:PLAGUE_IMMUNE]
[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_CLASS:BUBONIC_PLAGUE_A][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:bubonic plague check made]

Expand All @@ -70,20 +107,20 @@ interaction_disease_probabilities
[INTERACTION:BUBONIC_PLAGUE_PROB_INNER]

[I_TARGET:A:CREATURE][IT_LOCATION:CONTEXT_CREATURE]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:BUBONIC_PLAGUE_B]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:BUBONIC_PLAGUE_B][IT_CANNOT_HAVE_SYNDROME_CLASS:PLAGUE_IMMUNE]
[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_CLASS:BUBONIC_PLAGUE_B][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:bubonic plague secondary check made]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[CE_CAN_DO_INTERACTION:PROB:3:START:0:END:3000]
[CE_CAN_DO_INTERACTION:PROB:3:RESISTABLE:START:0:END:3000]
[CDI:INTERACTION:SPREAD_BUBONIC_PLAGUE]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]


[INTERACTION:SMALLPOX_PROBABILITY]

[I_TARGET:A:CREATURE][IT_LOCATION:CONTEXT_CREATURE]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:SMALLPOX_A]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:SMALLPOX_A][IT_CANNOT_HAVE_SYNDROME_CLASS:PLAGUE_IMMUNE]
[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_CLASS:SMALLPOX_A][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:smallpox check made]

Expand All @@ -96,12 +133,12 @@ interaction_disease_probabilities
[INTERACTION:SMALLPOX_PROB_INNER]

[I_TARGET:A:CREATURE][IT_LOCATION:CONTEXT_CREATURE]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:SMALLPOX_B]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:SMALLPOX_B][IT_CANNOT_HAVE_SYNDROME_CLASS:PLAGUE_IMMUNE]
[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_CLASS:SMALLPOX_B][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:smallpox secondary check made]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[CE_CAN_DO_INTERACTION:PROB:3:START:0:END:3000]
[CE_CAN_DO_INTERACTION:PROB:3:RESISTABLE:START:0:END:3000]
[CDI:INTERACTION:SPREAD_SMALLPOX]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]

Expand All @@ -127,7 +164,7 @@ interaction_disease_probabilities
[SYN_CLASS:INFLUENZA_B][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:influenza secondary check made]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[CE_CAN_DO_INTERACTION:PROB:100:START:0:END:3000]
[CE_CAN_DO_INTERACTION:PROB:100:RESISTABLE:START:0:END:3000]
[CDI:INTERACTION:SPREAD_INFLUENZA]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]

Expand All @@ -153,7 +190,7 @@ interaction_disease_probabilities
[SYN_CLASS:MENINGITIS_B][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:meningitis secondary check made]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[CE_CAN_DO_INTERACTION:PROB:75:START:0:END:3000]
[CE_CAN_DO_INTERACTION:PROB:75:RESISTABLE:START:0:END:3000]
[CDI:INTERACTION:SPREAD_MENINGITIS]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]

Expand All @@ -179,7 +216,7 @@ interaction_disease_probabilities
[SYN_CLASS:PNEUMONITIS_B][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:pneumonitis secondary check made]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[CE_CAN_DO_INTERACTION:PROB:100:START:0:END:3000]
[CE_CAN_DO_INTERACTION:PROB:100:RESISTABLE:START:0:END:3000]
[CDI:INTERACTION:SPREAD_PNEUMONITIS]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]

Expand Down Expand Up @@ -257,7 +294,7 @@ interaction_disease_probabilities
[SYN_CLASS:LIVER_CANCER_B][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:liver cancer secondary check made]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[CE_CAN_DO_INTERACTION:PROB:10:START:0:END:3000]
[CE_CAN_DO_INTERACTION:PROB:10:RESISTABLE:START:0:END:3000]
[CDI:INTERACTION:SPREAD_LIVER_CANCER]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]

Expand Down Expand Up @@ -335,7 +372,7 @@ interaction_disease_probabilities
[SYN_CLASS:BLINDNESS_B][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:blindness secondary check made]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[CE_CAN_DO_INTERACTION:PROB:100:START:0:END:3000]
[CE_CAN_DO_INTERACTION:PROB:100:RESISTABLE:START:0:END:3000]
[CDI:INTERACTION:SPREAD_BLINDNESS]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]

Expand Down Expand Up @@ -395,7 +432,7 @@ interaction_disease_probabilities
[INTERACTION:RABIES_PROBABILITY]

[I_TARGET:A:CREATURE][IT_LOCATION:CONTEXT_CREATURE]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:RABIES_A]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:RABIES_A][IT_CANNOT_HAVE_SYNDROME_CLASS:PLAGUE_IMMUNE]
[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_CLASS:RABIES_A][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:rabies check made]

Expand All @@ -408,11 +445,11 @@ interaction_disease_probabilities
[INTERACTION:RABIES_PROB_INNER]

[I_TARGET:A:CREATURE][IT_LOCATION:CONTEXT_CREATURE]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:RABIES_B]
[IT_CANNOT_TARGET_IF_ALREADY_AFFECTED][IT_CANNOT_HAVE_SYNDROME_CLASS:RABIES_B][IT_CANNOT_HAVE_SYNDROME_CLASS:PLAGUE_IMMUNE]
[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[SYN_CLASS:RABIES_B][CE_BODY_APPEARANCE_MODIFIER:APPEARANCE_MODIFIER:BROADNESS:99:START:0][SYN_NAME:rabies secondary check made]

[I_EFFECT:ADD_SYNDROME][IE_TARGET:A][IE_IMMEDIATE][SYNDROME][SYN_AFFECTED_CLASS:GENERAL_POISON]
[CE_CAN_DO_INTERACTION:PROB:100:START:0:END:3000]
[CE_CAN_DO_INTERACTION:PROB:100:RESISTABLE:START:0:END:3000]
[CDI:INTERACTION:SPREAD_RABIES]
[CDI:TARGET:A:SELF_ONLY][CDI:FREE_ACTION][CDI:MAX_TARGET_NUMBER:A:1][CDI:WAIT_PERIOD:300001]

0 comments on commit e09a2e1

Please sign in to comment.