diff --git a/gamedir/Data-1.13/BigItems/p2item224.sti b/gamedir/Data-1.13/BigItems/p2item224.sti new file mode 100644 index 000000000..b60b6dcf1 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item224.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item225.sti b/gamedir/Data-1.13/BigItems/p2item225.sti new file mode 100644 index 000000000..08c0a3d72 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item225.sti differ diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 43587288f..6601c0cd2 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -2700,6 +2700,35 @@ FOOD_EATING_SOUNDS = TRUE ;****************************************************************************************************************************** ;****************************************************************************************************************************** +[Disease Settings] + +; If DISEASE is TRUE, your mercs can get diseases. Diseases are specified in Disease.xml. You can get them from +; -insects in swamp & tropical sectors +; -contact with other people, animals and the dead +; -open wounds +; -spoiled food (requires food system to be on) +; +; A Disease will give you certain mali. This can even be a health loss. If untreated, most diseases get worse, in extreme cases, you could die from it. +; Doctors can cure most diseases. Some medicine items also help, and you can protect yourself with other items. + +; set this to TRUE to play with diseases. +DISEASE = TRUE + +; if DISEASE and DISEASE_STRATEGIC are set to TRUE, the first disease (arulcan plague) will also affect civilians, soldiers and militia. +; It can break out in swamp & tropical sectors and spread as infected troops move around. +; In bad cases, it can affect entire cities. Infected population will suffer just as your mercs do. If you don't act, this could be a severe threat to yoru campaign. +; It does work on both sides though, the army can suffer jsut as well... especially if you give it a push ;-) +DISEASE_STRATEGIC = TRUE + +; The World Health Organization has a website that contains a few helpful tips on diseases. +; It also allows you to subscribe. This will csot you money every day; in return you have access to a new map mode that shows you where in Arulco arulcan plague has broken out. +; requires DISEASE and DISEASE_STRATEGIC to be TRUE +DISEASE_WHO_SUBSCRIPTIONCOST = 2000 + +;****************************************************************************************************************************** +;****************************************************************************************************************************** + + [Dynamic Opinion Settings] ;****************************************************************************************************************************** diff --git a/gamedir/Data-1.13/Morale_Settings.INI b/gamedir/Data-1.13/Morale_Settings.INI index 97c0df45e..88b9013cb 100644 --- a/gamedir/Data-1.13/Morale_Settings.INI +++ b/gamedir/Data-1.13/Morale_Settings.INI @@ -247,3 +247,9 @@ OPINIONEVENT_SOLVECONFLICT_REASON_BAD = -2 ; someone attempted to solve the argument by taking an aggressive stance, and we like/dislike that OPINIONEVENT_SOLVECONFLICT_AGGRESSIVE_GOOD = 3 OPINIONEVENT_SOLVECONFLICT_AGGRESSIVE_BAD = -3 + +; someone is sick, and we find that disgusting (wether disease is disgusting can be set in Disease.xml) +OPINIONEVENT_DISEASE_DISGUSTING = -3 + +; someone treated our disease +OPINIONEVENT_DISEASE_TREATMENT = 1 diff --git a/gamedir/Data-1.13/TableData/Backgrounds.xml b/gamedir/Data-1.13/TableData/Backgrounds.xml index bccdebe86..59b55479f 100644 --- a/gamedir/Data-1.13/TableData/Backgrounds.xml +++ b/gamedir/Data-1.13/TableData/Backgrounds.xml @@ -48,6 +48,7 @@ 0 0 0 + 0 0 @@ -81,6 +82,8 @@ 0 0 0 + 0 + 0 0 @@ -775,6 +778,7 @@ Living in the Urban jungle for quite a few years surely has its merits. 5 15 + 15 10 2 2 @@ -889,6 +893,8 @@ 9 -10 5 + 30 + 25 1 1 @@ -939,6 +945,7 @@ -10 5 17 + 20 15 5 1 @@ -1272,7 +1279,7 @@ Teenager Teenager So much angst. - -10 + -10 -10 -20 -20 @@ -1353,6 +1360,7 @@ 3 15 20 + 10 4 6 15 @@ -1552,6 +1560,7 @@ -20 -20 -20 + -20 -20 -50 -50 @@ -2341,6 +2350,7 @@ -5 10 20 + -10 1 1 @@ -2498,6 +2508,7 @@ -10 5 17 + 20 15 5 1 @@ -2514,6 +2525,7 @@ -10 5 17 + 20 15 5 1 @@ -2529,6 +2541,7 @@ 3 10 17 + 30 1 1 @@ -2836,6 +2849,7 @@ 3 10 -10 + -20 1 1 @@ -2926,6 +2940,7 @@ Anyone surviving in a merciless prison is bound to be more dangerous on release - if he survives that long. 5 2 + 5 2 1 1 @@ -3238,6 +3253,7 @@ Anyone surviving in a merciless prison is bound to be more dangerous on release - if he survives that long. 5 2 + 5 2 @@ -3643,6 +3659,7 @@ 3 10 -10 + -20 304 @@ -3758,7 +3775,7 @@ 30 - 315 + 315 Bomb Disposal Unit BDU Displaying nerves of steel, you thrive at a job where every mistake can be the last one. @@ -3768,4 +3785,18 @@ 50 40 + + 316 + Aid worker + Aid worker + You've been in much, MUCH worse situations for several well-known aid organisations. + 2 + 2 + 10 + -5 + 5 + 5 + 30 + 25 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Disease.xml b/gamedir/Data-1.13/TableData/Disease.xml new file mode 100644 index 000000000..dd0c1a2c4 --- /dev/null +++ b/gamedir/Data-1.13/TableData/Disease.xml @@ -0,0 +1,632 @@ + + + 0 + Arulcan plague + |A|r|u|l|c|a|n |P|l|a|g|u|e + This rare subtype of the plague is unique to Arulco. It can be spread by insects, direct contact, or by contaminated food. There have been several deadly outbreaks in the last decade. + 40 + 100 + 400 + 5 + 6 + 3 + 2 + 10 + 30 + 20 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 15 + 5 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 20 + 0 + -600 + 1 + 0 + 0 + + + 1 + Typhoid + |T|y|p|h|o|i|d + Typhoid fever is a common worldwide bacterial disease transmitted by the ingestion of food or water contaminated with the feces of an infected person. Symptoms include internal bleeding, dehydration and delirium. + 100 + 200 + 1000 + 7 + 25 + 5 + 0 + 0 + 15 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 3 + 25 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + -10 + -1 + -5 + 0 + -10 + -400 + 0 + 400 + 0 + + + 2 + Hepatitis A + |H|e|p|a|t|i|t|i|s |A + Hepatitis A is usually spread by eating or drinking contaminated food or water or through close contact with an infectious person. Symptoms may include nausea, vomiting, diarrhea, yellow skin, fever, and abdominal pain. + 100 + 400 + 800 + 4 + 25 + 0 + 20 + 2 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 35 + 1 + 1 + 0 + 0 + 0 + 0 + -10 + 0 + 0 + 0 + -5 + 0 + -10 + -450 + 0 + 200 + 200 + + + 3 + Tetanus + |T|e|t|a|n|u|s + Infection with tetanus generally occurs through wound contamination and often involves a cut or deep puncture wound. As the infection progresses, muscle spasms develop in the jaw and elsewhere in the body. + 100 + 200 + 700 + 4 + 0 + 0 + 0 + 0 + 13 + 20 + 30 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + -20 + 0 + 0 + 0 + -5 + 0 + -6 + -200 + 0 + 0 + 0 + + + 4 + Tubercolosis + |T|u|b|e|r|c|o|l|o|s|i|s + Tuberculosisis a common, and in many cases fatal, infectious disease. It is spread through the air. About one in ten latent infections eventually progresses to active disease which, if left untreated, kills more than 50% of those so infected. + 100 + 200 + 800 + 3 + 0 + 0 + 15 + 10 + 14 + 6 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 3 + 3 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + -7 + 0 + 0 + 0 + 10 + -10 + -500 + 0 + 0 + 0 + + + 5 + Cholera + |C|h|o|l|e|r|a + Main symptoms of Cholera are watery diarrhea and vomiting. This may result in dehydration and in severe cases grayish-bluish skin. Transmission occurs primarily by contaminated water or food. Severe cholera can lead to death. + 100 + 200 + 800 + 5 + 20 + 0 + 2 + 1 + 10 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 35 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + -1 + 0 + 12 + 0 + -420 + 0 + 400 + 200 + + + 6 + Ebola + |E|b|o|l|a + A deadly virus with no known treatment, Ebola has a an unusually high lethality rate of over 50%%. Symptoms include nausea, vomiting, diarrhea and internal bleeding. + 150 + 300 + 360 + 3 + 0 + 0 + 0 + 5 + 0 + 12 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + -1 + 0 + 12 + 0 + -420 + 0 + 900 + 0 + + + 7 + Malaria + |M|a|l|a|r|i|a + Malaria is a mosquito-borne infectious disease commonly transmitted by a bite from an infected mosquito. Malaria causes symptoms that typically include fever and headache, which in severe cases can progress to coma or death. + 150 + 200 + 1000 + 6 + 20 + 20 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 8 + 1 + 1 + 0 + 0 + 1 + -10 + 0 + 0 + 0 + 0 + -8 + 5 + 0 + -300 + 1 + 0 + 0 + + + 8 + Staphylococcus + |S|t|a|p|h|y|l|o|c|o|c|c|u|s + A staphylococcus infection is a common result of food poisoning. Symptoms include spontaneous vomiting and diarrhea. + 100 + 120 + 120 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 50 + 0 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + -7 + 5 + 0 + -30 + 2 + 100 + 100 + + + 9 + Chlamydia + |C|h|l|a|m|y|d|i|a + Chlamydia is one of the most common sexually transmitted infections. If left untreated, chlamydial infections can cause serious reproductive and other health problems with both short-term and long-term consequences. + 100 + 300 + 600 + 3 + 0 + 0 + 30 + 1 + 4 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + -5 + -5 + 0 + 0 + 0 + -4 + 0 + 0 + -80 + 0 + 0 + 0 + + + 10 + Ballistic trauma + |B|a|l|l|i|s|t|i|c |t|r|a|u|m|a + Ballistic trauma or gunshot wound is a form of physical trauma sustained from the discharge of arms or munitions. Non-fatal gunshot wounds frequently have severe and long-lasting effects, even after the victim has made a successful recovery. + 100 + 20 + 100 + -4 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 30 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + -4 + 4 + 0 + -100 + 0 + 0 + 0 + + + 11 + PTSD + |P|T|S|D + |Post|traumatic |stress |disorder may develop after a person is exposed to one or more traumatic events, such as sexual assault, warfare, serious injury, or threats of imminent death that result in feelings of intense fear, horror, and powerlessness. + 100 + 20 + 100 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 50 + 10 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + -5 + 0 + -2 + 0 + 0 + 0 + 1 + 0 + 0 + + + 12 + Wounded leg + |W|o|u|n|d|e|d |l|e|g + The human musculoskeletal system is complicated. Your leg received a critical wound, and while it heals, your mobility is affected. + 200 + 100 + 200 + -2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 75 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + -20 + 0 + 0 + 0 + 0 + 0 + 0 + -5 + -10 + 0 + 0 + 0 + + + 13 + Damaged arm + |D|a|m|a|g|e|d |a|r|m + You were shot in the arm. Apart from being very painful, this severely limits your motor abilities. + 200 + 100 + 200 + -2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 75 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + -20 + 0 + 0 + 0 + 0 + 0 + 0 + -10 + 0 + 0 + 0 + + + 14 + Wounded biceps + |W|o|u|n|d|e|d |b|i|c|e|p|s + A painful shot to your torso has you gasping for air. You'll have to cut back in the next days. + 200 + 100 + 200 + -2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 75 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + -20 + 0 + 0 + 0 + 10 + 0 + -10 + 0 + 0 + 0 + + diff --git a/gamedir/Data-1.13/TableData/Items/Drugs.xml b/gamedir/Data-1.13/TableData/Items/Drugs.xml index b250c9143..e9d7f9743 100644 --- a/gamedir/Data-1.13/TableData/Items/Drugs.xml +++ b/gamedir/Data-1.13/TableData/Items/Drugs.xml @@ -16,6 +16,8 @@ You can now select several drug components and build your own drugs from them. determines how fast the sideeffect will wear out. determines if there will be a morale drop once the hits 0. + + cures the amount of an outbreak of disease x - 1 How do you make a drug? - Simply create a new Item in the Items.xml with the following values set: @@ -52,7 +54,7 @@ How do you make a drug? You can combine "mix" different drug effects. For example, the new drug 'Occulin' has a 425984. This gives it the effects of DRUG_BLIND, DRUG_VISION and DRUG_TUNNELVISION. I've set the effects so that - once you take the drug, your sight range increases 10% - - once the side effect starts, your sight range is lowered 10% nad you get up to 25% tunnelvison + - once the side effect starts, your sight range is lowered 10% and you get up to 25% tunnelvison - once that is over, you are blinded for 2 turns You can test the drug effect in game by showing the vision range of your merc. You will also notice icons on the merc portraits for different drug effects. @@ -72,6 +74,7 @@ Note: The regeneration drug has no entries - that is intended, because this effe 0 0 0 + 0 1 @@ -293,4 +296,37 @@ Note: The regeneration drug has no entries - that is intended, because this effe 0 0 + + 23 + Plague cure + 10 + 1 + 10 + 0 + 0 + 0 + 1 + + + 24 + Tetanus cure + 10 + 1 + 10 + 0 + 0 + 0 + 4 + + + 25 + Cholera cure + 10 + 1 + 10 + 0 + 0 + 0 + 6 + diff --git a/gamedir/Data-1.13/TableData/Items/Food.xml b/gamedir/Data-1.13/TableData/Items/Food.xml index 5fbb6b1de..84a1fe1a7 100644 --- a/gamedir/Data-1.13/TableData/Items/Food.xml +++ b/gamedir/Data-1.13/TableData/Items/Food.xml @@ -350,4 +350,13 @@ 1 1.5 + + 39 + Medical + 1 + 0 + 5 + 0 + 0.0 + diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml index d7a44b0c1..024c13a03 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/Data-1.13/TableData/Items/Items.xml @@ -184,6 +184,8 @@ 0 0 0 + 0 + 0 0 0 @@ -6571,6 +6573,7 @@ 1 1 100.0 + 1 @@ -51296,4 +51299,119 @@ + + 1710 + Surgical mask + Surgical mask + This simple mask protects you somewhat from infection by airborne diseases. + Surgical mask + If you are doctor or live in an asian megacity, you will need these. + 32768 + 1 + 2 + 224 + 1 + 1 + 10 + 1 + 4 + 1 + 20 + 1 + + + + + + 1711 + Surgical gloves + Surgical gloves + These simple gloves protect you from infection by contact with infected persons. + Surgical gloves + Useful for doctors. Not useful in snow. + 268435456 + 1 + 2 + 225 + 1 + 1 + 10 + 1 + 4 + 1 + 20 + 1 + + + + + + 1712 + Plague medicine + Plague medicine + It may look unimportant, but this little pill can cure the plague. Who would've thought that possible? + Plague medicine + Not for sale through BR. + 268435456 + 1 + 2 + 122 + 1 + 8 + 16 + 400 + 4 + 1 + 4194304 + 39 + + + + + + 1713 + Tetanus medicine + Tetanus medicine + This injection cures tetanus. Might sting a bit. + Tetanus medicine + Not for sale through BR. + 268435456 + 1 + 1 + 70 + 1 + 8 + 16 + 300 + 2 + 1 + 1 + 8388608 + + + + + + 1714 + Cholera medicine + Cholera medicine + A cure for cholera. + Cholera medicine + Not for sale through BR. + 268435456 + 1 + 1 + 70 + 1 + 8 + 16 + 500 + 3 + 1 + 1 + 16777216 + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Map/SectorNames.xml b/gamedir/Data-1.13/TableData/Map/SectorNames.xml index 0770c2fd6..064a96f40 100644 --- a/gamedir/Data-1.13/TableData/Map/SectorNames.xml +++ b/gamedir/Data-1.13/TableData/Map/SectorNames.xml @@ -8,6 +8,7 @@ Tropical 2 300 + 2 A2 @@ -17,6 +18,7 @@ Chitzena 1 250 + 70 A3 @@ -81,6 +83,7 @@ 0 150 2 + 4 A10 @@ -91,6 +94,7 @@ 0 150 2 + 30 A11 @@ -100,6 +104,7 @@ Farmland 0 160 + 4 A12 @@ -164,6 +169,7 @@ 1 250 3 + 150 B3 @@ -191,6 +197,7 @@ Farmland 0 160 + 10 B6 @@ -200,6 +207,7 @@ Farmland 0 160 + 10 B7 @@ -218,6 +226,7 @@ Farmland 0 200 + 10 B9 @@ -254,6 +263,7 @@ Farm, road 0 210 + 10 B13 @@ -264,6 +274,7 @@ 1 100 2 + 50 B14 @@ -273,6 +284,7 @@ Water 1 120 + 6 B15 @@ -336,6 +348,7 @@ San Mona 1 100 + 200 C6 @@ -345,6 +358,7 @@ San Mona 1 100 + 150 C7 @@ -408,6 +422,7 @@ Drassen 1 100 + 200 C14 @@ -485,6 +500,7 @@ 8 9 10 + 200 D6 @@ -494,6 +510,7 @@ Farmland 0 180 + 10 D7 @@ -557,6 +574,7 @@ Drassen Mine 1 100 + 200 D14 @@ -658,6 +676,7 @@ Farmland 0 160 + 10 E9 @@ -667,6 +686,7 @@ Farm, road 1 150 + 10 E10 @@ -802,6 +822,7 @@ Cambria, Hospital 1 100 + 200 F9 @@ -812,6 +833,7 @@ 1 100 1 + 100 F10 @@ -821,6 +843,7 @@ Farmland 1 200 + 50 F11 @@ -884,6 +907,7 @@ Grumm 1 100 + 200 G2 @@ -894,6 +918,7 @@ 3 100 2 + 150 G3 @@ -939,6 +964,7 @@ Farm, road 1 175 + 10 G8 @@ -948,6 +974,7 @@ Cambria 1 100 + 200 G9 @@ -961,6 +988,7 @@ 42 44 45 + 200 G10 @@ -1033,6 +1061,7 @@ Grumm 1 100 + 200 H2 @@ -1043,6 +1072,7 @@ 3 100 1 + 200 H3 @@ -1053,6 +1083,7 @@ 3 150 1 + 200 H4 @@ -1062,6 +1093,7 @@ Forest 0 200 + 10 H5 @@ -1099,6 +1131,7 @@ 0 130 1 + 200 H9 @@ -1146,6 +1179,7 @@ 100 2 1 + 200 H14 @@ -1156,6 +1190,7 @@ 1 100 2 + 100 H15 @@ -1228,6 +1263,7 @@ Estoni 3 135 + 10 I7 @@ -1308,6 +1344,7 @@ 49 50 51 + 200 I14 @@ -1317,6 +1354,7 @@ Alma Mine 1 100 + 200 I15 @@ -1434,6 +1472,7 @@ 18 19 20 + 100 J10 @@ -1479,6 +1518,7 @@ Farm, road 0 175 + 10 J15 @@ -1732,6 +1772,7 @@ Woods 1 200 + 10 L11 @@ -1741,6 +1782,7 @@ Balime 1 100 + 150 L12 @@ -1750,6 +1792,7 @@ Balime 1 100 + 150 L13 @@ -1825,6 +1868,7 @@ 0 175 1 + 10 M5 @@ -1964,6 +2008,7 @@ 100 1 2 + 100 N4 @@ -1975,6 +2020,7 @@ 100 2 2 + 50 N5 @@ -1985,6 +2031,7 @@ 1 100 2 + 100 N6 @@ -2115,6 +2162,7 @@ 1 100 2 + 100 O4 @@ -2125,6 +2173,7 @@ 1 100 1 + 300 O5 @@ -2261,6 +2310,7 @@ 1 100 2 + 50 P4