diff --git a/addons/medical/ACE_Medical_Treatments.hpp b/addons/medical/ACE_Medical_Treatments.hpp index cbe2e48b1e..2378a4cf92 100644 --- a/addons/medical/ACE_Medical_Treatments.hpp +++ b/addons/medical/ACE_Medical_Treatments.hpp @@ -702,41 +702,51 @@ class ACE_Medical_Advanced { effectiveness = 1; // What is the chance and delays (in seconds) of the treated default injury reopening reopeningChance = 0.1; - reopeningMinDelay = 120; - reopeningMaxDelay = 200; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; class Abrasion { - effectiveness = 3; + effectiveness = 2; reopeningChance = 0.3; - reopeningMinDelay = 200; - reopeningMaxDelay = 1000; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class AbrasionMinor: Abrasion { - effectiveness = 3; + effectiveness = 2; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; }; class AbrasionMedium: Abrasion { - effectiveness = 2.5; - reopeningChance = 0.7; + effectiveness = 1; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class AbrasionLarge: Abrasion { - effectiveness = 2; - reopeningChance = 0.9; + effectiveness = 0.5; + reopeningChance = 0.5; + reopeningMaxDelay = 2100; }; class Avulsions: Abrasion { effectiveness = 1; reopeningChance = 0.5; - reopeningMinDelay = 120; - reopeningMaxDelay = 200; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class AvulsionsMinor: Avulsions { - effectiveness = 1; + effectiveness = 2; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class AvulsionsMedium: Avulsions { - effectiveness = 0.9; + effectiveness = 1; + reopeningChance = 0.7; + reopeningMaxDelay = 1200; }; class AvulsionsLarge: Avulsions { - effectiveness = 0.75; + effectiveness = 0.5; + reopeningChance = 1; + reopeningMaxDelay = 300; }; class Contusion: Abrasion { @@ -752,225 +762,111 @@ class ACE_Medical_Advanced { class CrushWound: Abrasion { effectiveness = 1; reopeningChance = 0.2; - reopeningMinDelay = 20; - reopeningMaxDelay = 1000; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class CrushWoundMinor: CrushWound { - effectiveness = 1; - reopeningChance = 0.2; + effectiveness = 2; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; }; class CrushWoundMedium: CrushWound { - effectiveness = 0.7; - reopeningChance = 0.3; + effectiveness = 1; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class CrushWoundLarge: CrushWound { - effectiveness = 0.6; - reopeningChance = 0.4; + effectiveness = 0.5; + reopeningChance = 0.5; + reopeningMaxDelay = 2100; }; class Cut: Abrasion { effectiveness = 4; reopeningChance = 0.1; - reopeningMinDelay = 300; - reopeningMaxDelay = 1000; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class CutMinor: Cut { - effectiveness = 4; - reopeningChance = 0.1; + effectiveness = 2; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; }; class CutMedium: Cut { - effectiveness = 3; - reopeningChance = 0.3; - }; - class CutLarge: Cut { effectiveness = 1; - reopeningChance = 0.5; - }; - - class Laceration: Abrasion { - effectiveness = 0.95; - reopeningChance = 0.3; - reopeningMinDelay = 100; - reopeningMaxDelay = 800; - }; - class LacerationMinor: Laceration { - effectiveness = 0.95; - reopeningChance = 0.3; - }; - class LacerationMedium: Laceration { - effectiveness = 0.7; - reopeningChance = 0.5; - }; - class LacerationLarge: Laceration { - effectiveness = 0.5; - reopeningChance = 0.6; - }; - - class velocityWound: Abrasion { - effectiveness = 2; - reopeningChance = 0.7; - reopeningMinDelay = 100; - reopeningMaxDelay = 500; - }; - class velocityWoundMinor: velocityWound { - effectiveness = 2; - }; - class velocityWoundMedium: velocityWound { - effectiveness = 1.5; - }; - class velocityWoundLarge: velocityWound { - effectiveness = 1; - }; - - class punctureWound: Abrasion { - effectiveness = 2; - reopeningChance = 0.5; - reopeningMinDelay = 200; - reopeningMaxDelay = 850; - }; - class punctureWoundMinor: punctureWound { - effectiveness = 2; - }; - class punctureWoundMedium: punctureWound { - effectiveness = 1.3; - }; - class punctureWoundLarge: punctureWound { - effectiveness = 0.9; - }; - }; - - class PackingBandage: fieldDressing { - class Abrasion { - effectiveness = 3; - reopeningChance = 0.6; - reopeningMinDelay = 800; - reopeningMaxDelay = 1500; - }; - class AbrasionMinor: Abrasion { - effectiveness = 3; - }; - class AbrasionMedium: Abrasion { - effectiveness = 2.5; - reopeningChance = 0.9; - }; - class AbrasionLarge: Abrasion { - effectiveness = 2; - reopeningChance = 1; - }; - - class Avulsions: Abrasion { - effectiveness = 1; - reopeningChance = 0.7; - reopeningMinDelay = 1000; - reopeningMaxDelay = 1600; - }; - class AvulsionsMinor: Avulsions { - effectiveness = 1; - }; - class AvulsionsMedium: Avulsions { - effectiveness = 0.9; - }; - class AvulsionsLarge: Avulsions { - effectiveness = 0.75; - }; - - class Contusion: Abrasion { - effectiveness = 1; - reopeningChance = 0; - reopeningMinDelay = 0; - reopeningMaxDelay = 0; - }; - class ContusionMinor: Contusion {}; - class ContusionMedium: Contusion {}; - class ContusionLarge: Contusion {}; - - class CrushWound: Abrasion { - effectiveness = 1; - reopeningChance = 0.5; - reopeningMinDelay = 600; - reopeningMaxDelay = 1000; - }; - class CrushWoundMinor: CrushWound { - effectiveness = 1; - reopeningChance = 0.6; - }; - class CrushWoundMedium: CrushWound { - effectiveness = 0.7; - reopeningChance = 0.7; - }; - class CrushWoundLarge: CrushWound { - effectiveness = 0.6; - reopeningChance = 0.8; - }; - - class Cut: Abrasion { - effectiveness = 4; reopeningChance = 0.4; - reopeningMinDelay = 700; - reopeningMaxDelay = 1000; - }; - class CutMinor: Cut { - effectiveness = 4; - reopeningChance = 0.6; - }; - class CutMedium: Cut { - effectiveness = 3; - reopeningChance = 0.7; + reopeningMaxDelay = 1620; }; class CutLarge: Cut { - effectiveness = 1; - reopeningChance = 0.8; + effectiveness = 0.5; + reopeningChance = 0.5; + reopeningMaxDelay = 2100; }; class Laceration: Abrasion { effectiveness = 0.95; - reopeningChance = 0.65; - reopeningMinDelay = 500; - reopeningMaxDelay = 2000; + reopeningChance = 0.3; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class LacerationMinor: Laceration { - effectiveness = 0.95; - reopeningChance = 0.65; + effectiveness = 2; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class LacerationMedium: Laceration { - effectiveness = 0.7; - reopeningChance = 0.8; + effectiveness = 1; + reopeningChance = 0.7; + reopeningMaxDelay = 1200; }; class LacerationLarge: Laceration { effectiveness = 0.5; - reopeningChance = 0.9; + reopeningChance = 1; + reopeningMaxDelay = 300; }; class velocityWound: Abrasion { effectiveness = 2; - reopeningChance = 1; - reopeningMinDelay = 800; - reopeningMaxDelay = 2000; + reopeningChance = 0.7; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class velocityWoundMinor: velocityWound { effectiveness = 2; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class velocityWoundMedium: velocityWound { - effectiveness = 1.5; + effectiveness = 1; + reopeningChance = 0.7; + reopeningMaxDelay = 1200; }; class velocityWoundLarge: velocityWound { - effectiveness = 1; + effectiveness = 0.5; + reopeningChance = 1; + reopeningMaxDelay = 300; }; class punctureWound: Abrasion { effectiveness = 2; - reopeningChance = 1; - reopeningMinDelay = 1000; - reopeningMaxDelay = 3000; + reopeningChance = 0.5; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class punctureWoundMinor: punctureWound { effectiveness = 2; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; }; class punctureWoundMedium: punctureWound { - effectiveness = 1.3; + effectiveness = 1; + reopeningChance = 0.5; + reopeningMaxDelay = 2100; }; class punctureWoundLarge: punctureWound { - effectiveness = 0.9; + effectiveness = 0.5; + reopeningChance = 0.7; + reopeningMaxDelay = 1200; }; }; @@ -978,35 +874,45 @@ class ACE_Medical_Advanced { class Abrasion { effectiveness = 4; reopeningChance = 0.6; - reopeningMinDelay = 80; - reopeningMaxDelay = 150; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class AbrasionMinor: Abrasion { - effectiveness = 4; + effectiveness = 2; + reopeningChance = 0.2; + reopeningMaxDelay = 480; }; class AbrasionMedium: Abrasion { - effectiveness = 3; - reopeningChance = 0.9; + effectiveness = 1; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; }; class AbrasionLarge: Abrasion { - effectiveness = 2.5; - reopeningChance = 1; + effectiveness = 0.5; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class Avulsions: Abrasion { effectiveness = 2; reopeningChance = 0.7; - reopeningMinDelay = 100; - reopeningMaxDelay = 160; + reopeningMinDelay = 600; + reopeningMaxDelay = 2100; }; class AvulsionsMinor: Avulsions { effectiveness = 2; + reopeningChance = 0.3; + reopeningMaxDelay = 1620; }; class AvulsionsMedium: Avulsions { - effectiveness = 1.4; + effectiveness = 1; + reopeningChance = 0.6; + reopeningMaxDelay = 1620; }; class AvulsionsLarge: Avulsions { - effectiveness = 1; + effectiveness = 0.5; + reopeningChance = 0.8; + reopeningMaxDelay = 840; }; class Contusion: Abrasion { @@ -1023,89 +929,110 @@ class ACE_Medical_Advanced { effectiveness = 2; reopeningChance = 0.5; reopeningMinDelay = 60; - reopeningMaxDelay = 100; + reopeningMaxDelay = 2100; }; class CrushWoundMinor: CrushWound { effectiveness = 2; - reopeningChance = 0.6; + reopeningChance = 0.2; + reopeningMaxDelay = 480; }; class CrushWoundMedium: CrushWound { - effectiveness = 1.7; - reopeningChance = 0.7; + effectiveness = 1; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; }; class CrushWoundLarge: CrushWound { - effectiveness = 1.6; - reopeningChance = 0.8; + effectiveness = 0.5; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class Cut: Abrasion { effectiveness = 5; reopeningChance = 0.4; - reopeningMinDelay = 70; - reopeningMaxDelay = 100; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class CutMinor: Cut { - effectiveness = 5; - reopeningChance = 0.6; + effectiveness = 2; + reopeningChance = 0.2; + reopeningMaxDelay = 480; }; class CutMedium: Cut { - effectiveness = 3.5; - reopeningChance = 0.7; + effectiveness = 1; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class CutLarge: Cut { - effectiveness = 2; - reopeningChance = 0.8; + effectiveness = 0.5; + reopeningChance = 0.6; + reopeningMaxDelay = 1620; }; class Laceration: Abrasion { effectiveness = 2; reopeningChance = 0.65; - reopeningMinDelay = 50; - reopeningMaxDelay = 200; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class LacerationMinor: Laceration { effectiveness = 2; - reopeningChance = 0.65; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; }; class LacerationMedium: Laceration { - effectiveness = 1.5; - reopeningChance = 0.8; + effectiveness = 1; + reopeningChance = 0.6; + reopeningMaxDelay = 1620; }; class LacerationLarge: Laceration { - effectiveness = 1; - reopeningChance = 0.9; + effectiveness = 0.5; + reopeningChance = 0.8; + reopeningMaxDelay = 840; }; class velocityWound: Abrasion { effectiveness = 2.2; reopeningChance = 1; - reopeningMinDelay = 80; - reopeningMaxDelay = 200; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class velocityWoundMinor: velocityWound { - effectiveness = 2.2; + effectiveness = 2; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; }; class velocityWoundMedium: velocityWound { - effectiveness = 1.75; + effectiveness = 1; + reopeningChance = 0.6; + reopeningMaxDelay = 1620; }; class velocityWoundLarge: velocityWound { - effectiveness = 1.5; + effectiveness = 0.5; + reopeningChance = 0.8; + reopeningMaxDelay = 840; }; class punctureWound: Abrasion { effectiveness = 2.5; reopeningChance = 1; - reopeningMinDelay = 100; - reopeningMaxDelay = 300; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class punctureWoundMinor: punctureWound { - effectiveness = 2.5; + effectiveness = 2; + reopeningChance = 0.2; + reopeningMaxDelay = 480; }; class punctureWoundMedium: punctureWound { - effectiveness = 2; + effectiveness = 1; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class punctureWoundLarge: punctureWound { - effectiveness = 1.5; + effectiveness = 0.5; + reopeningChance = 0.6; + reopeningMaxDelay = 1620; }; }; @@ -1113,35 +1040,45 @@ class ACE_Medical_Advanced { class Abrasion { effectiveness = 2; reopeningChance = 0.3; - reopeningMinDelay = 800; - reopeningMaxDelay = 1500; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class AbrasionMinor: Abrasion { effectiveness = 2; + reopeningChance = 0.1; + reopeningMaxDelay = 300; }; class AbrasionMedium: Abrasion { effectiveness = 1; - reopeningChance = 0.4; + reopeningChance = 0.2; + reopeningMaxDelay = 480; }; class AbrasionLarge: Abrasion { - effectiveness = 0.7; - reopeningChance = 0.5; + effectiveness = 0.5; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; }; class Avulsions: Abrasion { effectiveness = 0.7; reopeningChance = 0.2; - reopeningMinDelay = 1000; - reopeningMaxDelay = 1600; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class AvulsionsMinor: Avulsions { - effectiveness = 0.7; + effectiveness = 2; + reopeningChance = 0.2; + reopeningMaxDelay = 480; }; class AvulsionsMedium: Avulsions { - effectiveness = 0.65; + effectiveness = 1; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class AvulsionsLarge: Avulsions { effectiveness = 0.5; + reopeningChance = 0.6; + reopeningMaxDelay = 1620; }; class Contusion: Abrasion { @@ -1157,86 +1094,279 @@ class ACE_Medical_Advanced { class CrushWound: Abrasion { effectiveness = 0.6; reopeningChance = 0.5; - reopeningMinDelay = 600; - reopeningMaxDelay = 1000; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class CrushWoundMinor: CrushWound { - effectiveness = 0.6; - reopeningChance = 0.3; + effectiveness = 2; + reopeningChance = 0.1; + reopeningMaxDelay = 300; }; class CrushWoundMedium: CrushWound { - effectiveness = 0.5; + effectiveness = 1; + reopeningChance = 0.2; + reopeningMaxDelay = 480; }; class CrushWoundLarge: CrushWound { - effectiveness = 0.4; + effectiveness = 0.5; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; }; class Cut: Abrasion { effectiveness = 2; reopeningChance = 0.2; - reopeningMinDelay = 700; - reopeningMaxDelay = 1000; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class CutMinor: Cut { effectiveness = 2; - reopeningChance = 0.3; + reopeningChance = 0.1; + reopeningMaxDelay = 300; }; class CutMedium: Cut { effectiveness = 1; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; }; class CutLarge: Cut { - effectiveness = 0.6; + effectiveness = 0.5; + reopeningChance = 0.5; + reopeningMaxDelay = 2100; }; class Laceration: Abrasion { effectiveness = 0.7; reopeningChance = 0.4; - reopeningMinDelay = 500; - reopeningMaxDelay = 2000; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class LacerationMinor: Laceration { - effectiveness = 0.7; - reopeningChance = 0.4; + effectiveness = 2; + reopeningChance = 0.2; + reopeningMaxDelay = 480; }; class LacerationMedium: Laceration { - effectiveness = 0.7; + effectiveness = 1; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class LacerationLarge: Laceration { effectiveness = 0.5; + reopeningChance = 0.6; + reopeningMaxDelay = 1620; }; class velocityWound: Abrasion { effectiveness = 1; reopeningChance = 0.5; - reopeningMinDelay = 800; - reopeningMaxDelay = 2000; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class velocityWoundMinor: velocityWound { - effectiveness = 1; + effectiveness = 2; + reopeningChance = 0.2; + reopeningMaxDelay = 480; }; class velocityWoundMedium: velocityWound { - effectiveness = 0.75; + effectiveness = 1; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; }; class velocityWoundLarge: velocityWound { effectiveness = 0.5; + reopeningChance = 0.6; + reopeningMaxDelay = 1620; }; class punctureWound: Abrasion { effectiveness = 1; reopeningChance = 0.5; - reopeningMinDelay = 1000; - reopeningMaxDelay = 3000; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; }; class punctureWoundMinor: punctureWound { - effectiveness = 1; + effectiveness = 2; + reopeningChance = 0.1; + reopeningMaxDelay = 300; }; class punctureWoundMedium: punctureWound { - effectiveness = 0.7; + effectiveness = 1; + reopeningChance = 0.2; + reopeningMaxDelay = 1080; }; class punctureWoundLarge: punctureWound { - effectiveness = 0.4; + effectiveness = 0.5; + reopeningChance = 0.3; + reopeningMaxDelay = 2100; }; }; + + class PackingBandage: fieldDressing { + class Abrasion { + effectiveness = 3; + reopeningChance = 0.6; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; + }; + class AbrasionMinor: Abrasion { + effectiveness = 2; + reopeningChance = 0.7; + reopeningMaxDelay = 1200; + }; + class AbrasionMedium: Abrasion { + effectiveness = 1; + reopeningChance = 0.6; + reopeningMaxDelay = 1620; + }; + class AbrasionLarge: Abrasion { + effectiveness = 0.5; + reopeningChance = 0.5; + reopeningMaxDelay = 2100; + }; + + class Avulsions: Abrasion { + effectiveness = 1; + reopeningChance = 0.7; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; + }; + class AvulsionsMinor: Avulsions { + effectiveness = 2; + reopeningChance = 0.6; + reopeningMaxDelay = 1620; + }; + class AvulsionsMedium: Avulsions { + effectiveness = 1; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; + }; + class AvulsionsLarge: Avulsions { + effectiveness = 0.5; + reopeningChance = 0.2; + reopeningMaxDelay = 480; + }; + + class Contusion: Abrasion { + effectiveness = 1; + reopeningChance = 0; + reopeningMinDelay = 0; + reopeningMaxDelay = 0; + }; + class ContusionMinor: Contusion {}; + class ContusionMedium: Contusion {}; + class ContusionLarge: Contusion {}; + + class CrushWound: Abrasion { + effectiveness = 1; + reopeningChance = 0.5; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; + }; + class CrushWoundMinor: CrushWound { + effectiveness = 2; + reopeningChance = 0.7; + reopeningMaxDelay = 1200; + }; + class CrushWoundMedium: CrushWound { + effectiveness = 1; + reopeningChance = 0.5; + reopeningMaxDelay = 1080; + }; + class CrushWoundLarge: CrushWound { + effectiveness = 0.5; + reopeningChance = 0.3; + reopeningMaxDelay = 2100; + }; + + class Cut: Abrasion { + effectiveness = 4; + reopeningChance = 0.4; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; + }; + class CutMinor: Cut { + effectiveness = 2; + reopeningChance = 0.7; + reopeningMaxDelay = 1200; + }; + class CutMedium: Cut { + effectiveness = 1; + reopeningChance = 0.5; + reopeningMaxDelay = 2100; + }; + class CutLarge: Cut { + effectiveness = 0.5; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; + }; + + class Laceration: Abrasion { + effectiveness = 0.95; + reopeningChance = 0.65; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; + }; + class LacerationMinor: Laceration { + effectiveness = 2; + reopeningChance = 0.7; + reopeningMaxDelay = 1200; + }; + class LacerationMedium: Laceration { + effectiveness = 1; + reopeningChance = 0.5; + reopeningMaxDelay = 2100; + }; + class LacerationLarge: Laceration { + effectiveness = 0.5; + reopeningChance = 0.3; + reopeningMaxDelay = 480; + }; + + class velocityWound: Abrasion { + effectiveness = 2; + reopeningChance = 1; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; + }; + class velocityWoundMinor: velocityWound { + effectiveness = 2; + reopeningChance = 0.6; + reopeningMaxDelay = 1620; + }; + class velocityWoundMedium: velocityWound { + effectiveness = 1; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; + }; + class velocityWoundLarge: velocityWound { + effectiveness = 0.5; + reopeningChance = 0.2; + reopeningMaxDelay = 480; + }; + + class punctureWound: Abrasion { + effectiveness = 2; + reopeningChance = 1; + reopeningMinDelay = 60; + reopeningMaxDelay = 2100; + }; + class punctureWoundMinor: punctureWound { + effectiveness = 2; + reopeningChance = 0.4; + reopeningMaxDelay = 1620; + }; + class punctureWoundMedium: punctureWound { + effectiveness = 1; + reopeningChance = 0.3; + reopeningMaxDelay = 1080; + }; + class punctureWoundLarge: punctureWound { + effectiveness = 0.5; + reopeningChance = 0.2; + reopeningMaxDelay = 480; + }; + }; }; class Medication {