Updated to 0.5.1

Removed obsolete mods.
Revert removal of Alonso.
Revert biodiesel working in petrol engines.
Revert hard skill caps.
Revert three more broken limb changesets.
Revert another ammo rebalance changeset.
Revert craftable smokeless gunpowder changeset.
Revised book chapters revert patch.
Fix some bad terrain in the godco patch.
Fix some bad terrain in the prison island patch.

1 files changed, 46 insertions, 46 deletions

diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch
index 8ef8151..65b0d32 100644
--- a/ammo-10_ammo-order-fix.patch
+++ b/ammo-10_ammo-order-fix.patch
@@ -10,8 +10,8 @@
 +    "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
 +    "weight": "56 g",
 +    "volume": "250 ml",
-+    "price": 1500,
-+    "price_postapoc": 4000,
++    "price": "15 USD",
++    "price_postapoc": "40 USD",
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 +    "material": [ "steel", "powder" ],
 +    "symbol": "=",
@@ -45,8 +45,8 @@
 +    "type": "AMMO",
 +    "name": { "str": "20x66mm flechette" },
 +    "description": "20x66mm caseless shotgun rounds, flechette type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
-+    "price": 4000,
-+    "price_postapoc": 4000,
++    "price": "40 USD",
++    "price_postapoc": "40 USD",
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 +    "count": 10,
 +    "//": "Balanced as AP.",
@@ -65,8 +65,8 @@
 +    "type": "AMMO",
 +    "name": { "str": "20x66mm slug" },
 +    "description": "20x66mm caseless shotgun rounds, solid projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
-+    "price": 1500,
-+    "price_postapoc": 4000,
++    "price": "15 USD",
++    "price_postapoc": "40 USD",
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 +    "//": "Balanced as FMJ",
 +    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 },
@@ -87,8 +87,8 @@
 -    "type": "AMMO",
 -    "name": { "str": "20x66mm flechette" },
 -    "description": "20x66mm caseless shotgun rounds, flechette type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
--    "price": 4000,
--    "price_postapoc": 4000,
+-    "price": "40 USD",
+-    "price_postapoc": "40 USD",
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 -    "count": 10,
 -    "//": "Balanced as AP.",
@@ -111,8 +111,8 @@
 -    "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
 -    "weight": "56 g",
 -    "volume": "250 ml",
--    "price": 1500,
--    "price_postapoc": 4000,
+-    "price": "15 USD",
+-    "price_postapoc": "40 USD",
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 -    "material": [ "steel", "powder" ],
 -    "symbol": "=",
@@ -139,8 +139,8 @@
 -    "type": "AMMO",
 -    "name": { "str": "20x66mm slug" },
 -    "description": "20x66mm caseless shotgun rounds, solid projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
--    "price": 1500,
--    "price_postapoc": 4000,
+-    "price": "15 USD",
+-    "price_postapoc": "40 USD",
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 -    "//": "Balanced as FMJ",
 -    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 },
@@ -404,8 +404,8 @@
 +    "description": "8x40mm caseless rounds.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
 +    "weight": "12 g",
 +    "volume": "250 ml",
-+    "price": 225,
-+    "price_postapoc": 8000,
++    "price": "225 cent",
++    "price_postapoc": "80 USD",
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 +    "material": [ "plastic", "powder" ],
 +    "symbol": "=",
@@ -440,8 +440,8 @@
 +    "type": "AMMO",
 +    "name": { "str": "8x40mm HVP" },
 +    "description": "8x40mm caseless rounds, saboted high-velocity penetrator type.  Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette.  Being caseless rounds, these cannot be disassembled or reloaded.",
-+    "price": 2500,
-+    "price_postapoc": 50000,
++    "price": "25 USD",
++    "price_postapoc": "500 USD",
 +    "count": 20,
 +    "//": "Balanced as AP, with 25% higher damage and 50% higher arpen",
 +    "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 34 } },
@@ -479,8 +479,8 @@
 -    "description": "8x40mm caseless rounds.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
 -    "weight": "12 g",
 -    "volume": "250 ml",
--    "price": 225,
--    "price_postapoc": 8000,
+-    "price": "225 cent",
+-    "price_postapoc": "80 USD",
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 -    "material": [ "plastic", "powder" ],
 -    "symbol": "=",
@@ -509,8 +509,8 @@
 -    "type": "AMMO",
 -    "name": { "str": "8x40mm HVP" },
 -    "description": "8x40mm caseless rounds, saboted high-velocity penetrator type.  Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette.  Being caseless rounds, these cannot be disassembled or reloaded.",
--    "price": 2500,
--    "price_postapoc": 50000,
+-    "price": "25 USD",
+-    "price_postapoc": "500 USD",
 -    "count": 20,
 -    "//": "Balanced as AP, with 25% higher damage and 50% higher arpen",
 -    "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 34 } },
@@ -547,8 +547,8 @@
 +    "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  Favored by SWAT forces.",
 +    "weight": "32 g",
 +    "volume": "250 ml",
-+    "price": 500,
-+    "price_postapoc": 800,
++    "price": "5 USD",
++    "price_postapoc": "8 USD",
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 +    "material": [ "plastic", "powder" ],
 +    "symbol": "=",
@@ -559,7 +559,7 @@
 +    "ammo_type": "shot",
 +    "casing": "shot_hull",
 +    "range": 12,
-+    "damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2.0 },
++    "damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2 },
 +    "recoil": 2500,
 +    "loudness": 160,
 +    "effects": [ "COOKOFF", "SHOT" ]
@@ -577,10 +577,10 @@
 +    "type": "AMMO",
 +    "name": { "str": "birdshot" },
 +    "description": "Weak shotgun ammunition.  Designed for hunting birds and other small game, its applications in combat are very limited.",
-+    "price": 100,
-+    "price_postapoc": 400,
++    "price": "1 USD",
++    "price_postapoc": "4 USD",
 +    "range": 0,
-+    "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3.0 },
++    "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3 },
 +    "loudness": 80,
 +    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
 +    "extend": { "effects": [ "NOGIB" ] }
@@ -598,8 +598,8 @@
 +    "type": "AMMO",
 +    "name": { "str": "dragon's breath shell" },
 +    "description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool.  When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.",
-+    "price": 1000,
-+    "price_postapoc": 1600,
++    "price": "10 USD",
++    "price_postapoc": "16 USD",
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 +    "damage": { "damage_type": "heat", "amount": 30 },
 +    "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
@@ -620,12 +620,12 @@
 +    "type": "AMMO",
 +    "name": { "str": "flechette shell" },
 +    "description": "A shotgun shell filled with tiny steel darts.  Extremely damaging, plus the spread makes it very accurate at short range.  Slices through most forms of armor with ease.",
-+    "price": 2000,
-+    "price_postapoc": 800,
++    "price": "20 USD",
++    "price_postapoc": "8 USD",
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 +    "count": 10,
 +    "//": "Balanced as standard AP.",
-+    "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 30, "armor_multiplier": -1.0 } }
++    "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 30, "armor_multiplier": -1 } }
 +  },
 +  {
      "id": "reloaded_shot_flechette",
@@ -640,8 +640,8 @@
 +    "type": "AMMO",
 +    "name": { "str": "shotgun slug" },
 +    "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle.  Extremely damaging but rather inaccurate.",
-+    "price": 400,
-+    "price_postapoc": 400,
++    "price": "4 USD",
++    "price_postapoc": "4 USD",
 +    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 +    "dispersion": 80,
 +    "//": "Balanced as FMJ",
@@ -663,8 +663,8 @@
 -    "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  Favored by SWAT forces.",
 -    "weight": "32 g",
 -    "volume": "250 ml",
--    "price": 500,
--    "price_postapoc": 800,
+-    "price": "5 USD",
+-    "price_postapoc": "8 USD",
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 -    "material": [ "plastic", "powder" ],
 -    "symbol": "=",
@@ -675,7 +675,7 @@
 -    "ammo_type": "shot",
 -    "casing": "shot_hull",
 -    "range": 20,
--    "damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2.0 },
+-    "damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2 },
 -    "recoil": 2500,
 -    "loudness": 160,
 -    "effects": [ "COOKOFF", "SHOT" ]
@@ -700,10 +700,10 @@
 -    "type": "AMMO",
 -    "name": { "str": "birdshot" },
 -    "description": "Weak shotgun ammunition.  Designed for hunting birds and other small game, its applications in combat are very limited.",
--    "price": 100,
--    "price_postapoc": 400,
+-    "price": "1 USD",
+-    "price_postapoc": "4 USD",
 -    "range": 0,
--    "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3.0 },
+-    "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3 },
 -    "loudness": 80,
 -    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
 -    "extend": { "effects": [ "NOGIB" ] }
@@ -714,8 +714,8 @@
 -    "type": "AMMO",
 -    "name": { "str": "dragon's breath shell" },
 -    "description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool.  When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.",
--    "price": 1000,
--    "price_postapoc": 1600,
+-    "price": "10 USD",
+-    "price_postapoc": "16 USD",
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 -    "damage": { "damage_type": "heat", "amount": 30 },
 -    "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
@@ -729,12 +729,12 @@
 -    "type": "AMMO",
 -    "name": { "str": "flechette shell" },
 -    "description": "A shotgun shell filled with tiny steel darts.  Extremely damaging, plus the spread makes it very accurate at short range.  Slices through most forms of armor with ease.",
--    "price": 2000,
--    "price_postapoc": 800,
+-    "price": "20 USD",
+-    "price_postapoc": "8 USD",
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 -    "count": 10,
 -    "//": "Balanced as standard AP.",
--    "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 30, "armor_multiplier": -1.0 } }
+-    "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 30, "armor_multiplier": -1 } }
 -  },
 -  {
      "id": "shot_he",
@@ -751,8 +751,8 @@
 -    "type": "AMMO",
 -    "name": { "str": "shotgun slug" },
 -    "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle.  Extremely damaging but rather inaccurate.",
--    "price": 400,
--    "price_postapoc": 400,
+-    "price": "4 USD",
+-    "price_postapoc": "4 USD",
 -    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
 -    "dispersion": 80,
 -    "//": "Balanced as FMJ",