From f8f950f765064a049948e470595e2e8939cd0121 Mon Sep 17 00:00:00 2001 From: Flugente Date: Wed, 20 May 2015 20:37:02 +0000 Subject: [PATCH] Deleted Feature: The poison feature has been made obsolelte by the disease feature and has been removed git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2245 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Ja2_Options.INI | 43 ------------------- gamedir/Data-1.13/TableData/Backgrounds.xml | 14 ------ .../Data-1.13/TableData/Items/AmmoTypes.xml | 33 -------------- gamedir/Data-1.13/TableData/Items/Items.xml | 29 ++++--------- .../NPCInventory/HowardInventory.xml | 13 ++---- 5 files changed, 12 insertions(+), 120 deletions(-) diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 2855c8f9e..9582dd7e2 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -2618,46 +2618,6 @@ ZOMBIE_ONLY_HEADSHOTS_PERMANENTLY_KILL = FALSE ;****************************************************************************************************************************** ;****************************************************************************************************************************** -[Tactical Poison Settings] - -;****************************************************************************************************************************** -; In this section you can specify the new poison system -;****************************************************************************************************************************** - -; The poison system is a new feature that gives a bit of variation to the life and damage system. -; Certain sources can deal poison damage (as of now, only zombies). This means that damage can be poisonous. If a merc receives -; poison damage, he not only looses life, he also gains a poison point. -; The basic consequences are: -; - if he bleeds, there is chance, depending on the ratio of total poison points to maximim life points, that he gains additional -; poison points -; - poison works as a counter to mercs natural regeneration (which is calculated every hour). If a merc is poisoned enough, he -; can lose a life point this way! This simulates the character getting sicker and sicker because of the poison in his veins. -; The lost point will be bandaged, so you do not have to immediately bandage it. -; - However, if our health drops below 15 points because of poisoning, we suffer a shock, the points won't be damaged anymore. -; We require immediate medical assistance, or we will die! -; Yes, it is possible to die this way. -; - If not treated, poison will invariably spread in an infected merc. To prevent this, you can cure him. Curing poison is a new -; action automatically performed by your doctors and the hospital, if the merc is their patient. -; Once a patient is back to full life, The poison is cured (curing 1 pt of poison costs as much as chealing 1 pt of life). -; If using the new trait system, the doctoring merc needs to have the PARAMEDIC or DOCTOR Skill to cure poison. - -; Basic medical skill needed to cure poison (in addition to doctoring skill). Range: 1-100 -POISON_BASE_MEDICAL_SKILL_TO_CURE = 50 - -; A multiplicator that determines how many heal points are needed to cure one point of poison -POISON_MEDICAL_POINTS_TO_CURE_MULTIPLICATOR = 0.5 - -; Percentage of damage dealt by zombies that will be poisoned. Range: 0 - 100 -ZOMBIE_POISON_DAMAGE_PERCENTAGE = 50 - -; This multiplier determines the damage we take every hour for being poisoned (simulating our health deteriorating from the infection). -; Roughly speaking, the damage we take equals (total poison/max life) * (100 - poison resistance) * this multiplier -; valid values from 1.0 to 10.0, 4.0 is recommended -POISON_INFECTION_DAMAGE_MULTIPLIER = 2.0 - -;****************************************************************************************************************************** -;****************************************************************************************************************************** - [Tactical Food Settings] ;****************************************************************************************************************************** @@ -2692,9 +2652,6 @@ FOOD_DECAY_IN_SECTORS = TRUE ; a global modificator to the speed at which food decays. 1.0 is normal, values between 0.1 and 10.0 FOOD_DECAY_MODIFICATOR = 1.0 -; maximum amount of food poisoning one can get from eating a single piece of food -FOOD_MAX_POISONING = 5 - ; do mercs make sounds when eating/drinking? FOOD_EATING_SOUNDS = TRUE diff --git a/gamedir/Data-1.13/TableData/Backgrounds.xml b/gamedir/Data-1.13/TableData/Backgrounds.xml index 09aa5584a..09d8db2ec 100644 --- a/gamedir/Data-1.13/TableData/Backgrounds.xml +++ b/gamedir/Data-1.13/TableData/Backgrounds.xml @@ -43,7 +43,6 @@ 0 - 0 0 0 0 @@ -784,7 +783,6 @@ Punk Living in the Urban jungle for quite a few years surely has its merits. 5 - 15 15 10 2 @@ -951,7 +949,6 @@ 3 -10 5 - 17 20 15 5 @@ -1365,7 +1362,6 @@ -3 3 3 - 15 20 10 4 @@ -1563,7 +1559,6 @@ Child Child And there goes the Geneva convention... - -20 -20 -20 -20 @@ -2360,7 +2355,6 @@ -10 -5 10 - 20 -10 1 1 @@ -2518,7 +2512,6 @@ 3 -10 5 - 17 20 15 5 @@ -2536,7 +2529,6 @@ 3 -10 5 - 17 20 15 5 @@ -2552,7 +2544,6 @@ 3 3 10 - 17 30 30 1 @@ -2860,7 +2851,6 @@ Hypochondriac When you enter a ward, all medical personnel tries to look overly busy or hides around corners in a futile attempt to avoid you. The List of your possible afflictions just keeps getting bigger and bigger! 3 - 10 -10 -20 1 @@ -2954,7 +2944,6 @@ Convict Convict Anyone surviving in a merciless prison is bound to be more dangerous on release - if he survives that long. - 5 2 5 2 @@ -3094,7 +3083,6 @@ -10 1 5 - 5 2 1 1 @@ -3270,7 +3258,6 @@ Convict Convict Anyone surviving in a merciless prison is bound to be more dangerous on release - if he survives that long. - 5 2 5 2 @@ -3683,7 +3670,6 @@ Hypochondriac When you enter a ward, all medical personnel tries to look overly busy or hides around corners in a futile attempt to avoid you. The List of your possible afflictions just keeps getting bigger and bigger! 3 - 10 -10 -20 diff --git a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml index d32c0c1bb..8a3cfbe4c 100644 --- a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml +++ b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml @@ -33,7 +33,6 @@ 0 0.0 - 0 0.0 0 1.0 @@ -72,7 +71,6 @@ 0 -0.17 - 0 0.1 0 1.0 @@ -111,7 +109,6 @@ 0 0.13 - 0 0.2 0 1.0 @@ -150,7 +147,6 @@ 0 0.3 - 0 0.2 0 1.0 @@ -189,7 +185,6 @@ 0 Buckshot 0.0 - 0 0.0 0 1.0 @@ -228,7 +223,6 @@ 0 Flechette 0.03 - 0 -0.25 0 1.0 @@ -267,7 +261,6 @@ 0 0.08 - 0 0.0 0 1.0 @@ -306,7 +299,6 @@ 0 0.0 - 0 0.0 0 1.0 @@ -345,7 +337,6 @@ 0 0.0 - 0 0.0 0 1.0 @@ -384,7 +375,6 @@ 0 0.15 - 0 0.0 0 1.0 @@ -423,7 +413,6 @@ 0 0.3 - 0 0.4 0 1.0 @@ -462,7 +451,6 @@ 0 -0.1 - 0 -0.5 0 1.0 @@ -501,7 +489,6 @@ 0 0.5 - 0 0.8 0 1.0 @@ -540,7 +527,6 @@ 0 0.35 - 0 0.3 0 1.0 @@ -579,7 +565,6 @@ 0 -0.2 - 0 0.08 0 1.0 @@ -618,7 +603,6 @@ 1 0.25 - 0 0.4 0 1.0 @@ -657,7 +641,6 @@ 1 0.35 - 0 0.5 0 1.0 @@ -696,7 +679,6 @@ 0 0.08 - 0 0.15 0 1.0 @@ -735,7 +717,6 @@ 0 0.18 - 0 0.35 0 1.0 @@ -774,7 +755,6 @@ 0 -0.1 - 0 -0.15 0 1.0 @@ -813,7 +793,6 @@ 0 -0.15 - 0 -0.05 0 1.0 @@ -852,7 +831,6 @@ 0 0.04 - 0 0.1 0 1.0 @@ -891,7 +869,6 @@ 0 0.07 - 0 0.1 0 1.0 @@ -930,7 +907,6 @@ 0 -0.05 - 0 -0.1 0 1.0 @@ -969,7 +945,6 @@ 0 0.13 - 0 0.03 0 1.0 @@ -1008,7 +983,6 @@ 0 0.06 - 0 0.35 0 1.0 @@ -1047,7 +1021,6 @@ 0 0.23 - 0 0.27 0 1.0 @@ -1086,7 +1059,6 @@ 0 Duplex 0.15 - 0 0.3 0 1.0 @@ -1125,7 +1097,6 @@ 0 -0.03 - 0 0.2 0 1.0 @@ -1164,7 +1135,6 @@ 0 -0.1 - 0 0 1 1.0 @@ -1203,7 +1173,6 @@ 0 0 - 0 0 2 1.0 @@ -1242,7 +1211,6 @@ 0 0.3 - 0 0.2 4 1.0 @@ -1281,7 +1249,6 @@ 0 -0.2 - 0 0.15 0 0.3 diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml index acddec77c..29f2dd51a 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/Data-1.13/TableData/Items/Items.xml @@ -169,7 +169,6 @@ 0.0 0.0 0.0 - 0 0 0 0 @@ -46386,28 +46385,16 @@ 1539 - Antidote - Antidote - This antidote can cure poison over time. WARNING: May cause temporary blindness and a severe migraine. - Antidote - Not for sale through BR. - 268435456 + Nada + Nothing + Index 923 + Nothing + Nothing + 1 1 - 1 - 70 - 1 - 8 - 10 - 150 - 5 - 1 - 1 + 34 + 1 1 - 1 - 1 - 1 - 1081344 - 100.0 diff --git a/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml index 16af940d8..fcfc96e00 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml @@ -77,31 +77,26 @@ 15 - 1539 - 5 - - - 16 1544 4 - 17 + 16 1547 5 - 18 + 17 1548 3 - 19 + 18 1578 3 - 20 + 19 1634 5