diff --git a/gamedir/Data-1.13/APBPConstants.ini b/gamedir/Data-1.13/APBPConstants.ini index 20ab75b8c..d4c7ae3a8 100644 --- a/gamedir/Data-1.13/APBPConstants.ini +++ b/gamedir/Data-1.13/APBPConstants.ini @@ -397,7 +397,12 @@ DEFAULT_AIMSKILL = 80 ;*********************************************************************** ;* The APs needed build a fortification structure * ;*********************************************************************** -AP_FORTIFICATION = 80 +AP_FORTIFICATION = 180 + +;*********************************************************************** +;* The APs needed to eat * +;*********************************************************************** +AP_EAT = 80 [BPConstants] BP_RATIO_RED_PTS_TO_NORMAL = 100 diff --git a/gamedir/Data-1.13/BigItems/p2item100.sti b/gamedir/Data-1.13/BigItems/p2item100.sti new file mode 100644 index 000000000..3161c10a1 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item100.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item101.sti b/gamedir/Data-1.13/BigItems/p2item101.sti new file mode 100644 index 000000000..23cfbc55c Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item101.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item102.sti b/gamedir/Data-1.13/BigItems/p2item102.sti new file mode 100644 index 000000000..a6891a7a7 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item102.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item103.sti b/gamedir/Data-1.13/BigItems/p2item103.sti new file mode 100644 index 000000000..b3509822f Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item103.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item104.sti b/gamedir/Data-1.13/BigItems/p2item104.sti new file mode 100644 index 000000000..a4675ad96 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item104.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item105.sti b/gamedir/Data-1.13/BigItems/p2item105.sti new file mode 100644 index 000000000..cf6190408 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item105.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item106.sti b/gamedir/Data-1.13/BigItems/p2item106.sti new file mode 100644 index 000000000..64275415f Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item106.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item107.sti b/gamedir/Data-1.13/BigItems/p2item107.sti new file mode 100644 index 000000000..ea915c55c Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item107.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item108.sti b/gamedir/Data-1.13/BigItems/p2item108.sti new file mode 100644 index 000000000..2a74b9a43 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item108.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item109.sti b/gamedir/Data-1.13/BigItems/p2item109.sti new file mode 100644 index 000000000..7d5520ec9 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item109.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item110.sti b/gamedir/Data-1.13/BigItems/p2item110.sti new file mode 100644 index 000000000..8dc7fe0be Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item110.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item111.sti b/gamedir/Data-1.13/BigItems/p2item111.sti new file mode 100644 index 000000000..99685fce7 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item111.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item112.sti b/gamedir/Data-1.13/BigItems/p2item112.sti new file mode 100644 index 000000000..f4205b68d Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item112.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item113.sti b/gamedir/Data-1.13/BigItems/p2item113.sti new file mode 100644 index 000000000..40f25e127 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item113.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item114.sti b/gamedir/Data-1.13/BigItems/p2item114.sti new file mode 100644 index 000000000..4dfcd4c4f Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item114.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item115.sti b/gamedir/Data-1.13/BigItems/p2item115.sti new file mode 100644 index 000000000..c18420d32 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item115.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item116.sti b/gamedir/Data-1.13/BigItems/p2item116.sti new file mode 100644 index 000000000..b3e43fdfa Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item116.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item117.sti b/gamedir/Data-1.13/BigItems/p2item117.sti new file mode 100644 index 000000000..eb9b170ce Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item117.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item118.sti b/gamedir/Data-1.13/BigItems/p2item118.sti new file mode 100644 index 000000000..651c482e1 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item118.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item119.sti b/gamedir/Data-1.13/BigItems/p2item119.sti new file mode 100644 index 000000000..c01b4dddd Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item119.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item120.sti b/gamedir/Data-1.13/BigItems/p2item120.sti new file mode 100644 index 000000000..0f3a91c8c Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item120.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item121.sti b/gamedir/Data-1.13/BigItems/p2item121.sti new file mode 100644 index 000000000..d58fc02b6 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item121.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item122.sti b/gamedir/Data-1.13/BigItems/p2item122.sti new file mode 100644 index 000000000..28b79bc20 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item122.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item123.sti b/gamedir/Data-1.13/BigItems/p2item123.sti new file mode 100644 index 000000000..b46854e4b Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item123.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item124.sti b/gamedir/Data-1.13/BigItems/p2item124.sti new file mode 100644 index 000000000..279c32fd6 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item124.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item125.sti b/gamedir/Data-1.13/BigItems/p2item125.sti new file mode 100644 index 000000000..bf47e65a1 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item125.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item126.sti b/gamedir/Data-1.13/BigItems/p2item126.sti new file mode 100644 index 000000000..8bca6c401 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item126.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item127.sti b/gamedir/Data-1.13/BigItems/p2item127.sti new file mode 100644 index 000000000..81bf3b61e Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item127.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item128.sti b/gamedir/Data-1.13/BigItems/p2item128.sti new file mode 100644 index 000000000..4a67d432d Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item128.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item129.sti b/gamedir/Data-1.13/BigItems/p2item129.sti new file mode 100644 index 000000000..455b7c58d Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item129.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item130.sti b/gamedir/Data-1.13/BigItems/p2item130.sti new file mode 100644 index 000000000..08044375c Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item130.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item131.sti b/gamedir/Data-1.13/BigItems/p2item131.sti new file mode 100644 index 000000000..c103c9470 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item131.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item98.sti b/gamedir/Data-1.13/BigItems/p2item98.sti new file mode 100644 index 000000000..f5892d827 Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item98.sti differ diff --git a/gamedir/Data-1.13/BigItems/p2item99.sti b/gamedir/Data-1.13/BigItems/p2item99.sti new file mode 100644 index 000000000..1905f9afe Binary files /dev/null and b/gamedir/Data-1.13/BigItems/p2item99.sti differ diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index a0ea51e50..316a07c87 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -276,10 +276,10 @@ EXPERTS_GET_DIFFERENT_CHOICES = TRUE ;------------------------------------------------------------------------------------------------------------------------------ ;When set to TRUE: sends the initial M.E.R.C e-mail at the beginning of the game and thus opens the website up on day #1. -MERC_WEBSITE_IMMEDIATELY_AVAILABLE = FALSE +MERC_WEBSITE_IMMEDIATELY_AVAILABLE = TRUE ;When set to TRUE will allow you to hire any of the M.E.R.C mercs as soon as the website opens. -MERC_WEBSITE_ALL_MERCS_AVAILABLE = FALSE +MERC_WEBSITE_ALL_MERCS_AVAILABLE = TRUE ;------------------------------------------------------------------------------------------------------------------------------ ; The Following settings define whether A.I.M/M.E.R.C mercenaries can die while away on other missions (if they have not been hired). @@ -290,7 +290,7 @@ MERC_WEBSITE_ALL_MERCS_AVAILABLE = FALSE ; 0 = default behaviour, mercs are on assignment at start, mercs go on assignment during campaign ; 1 = all mercs available at the start of the game, during the campaign they will go on assignment ; 2 = all mercs at your disposal. nobody goes on any other assignment than yours -MERCS_CAN_BE_ON_ASSIGNMENT = 0 +MERCS_CAN_BE_ON_ASSIGNMENT = 1 ;Can AIM/MERC mercs die while away on other assignments? MERCS_CAN_DIE_ON_ASSIGNMENT = TRUE @@ -1890,13 +1890,53 @@ ZOMBIE_RISE_WITH_ARMOUR = TRUE ; 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 = 4.0 +POISON_INFECTION_DAMAGE_MULTIPLIER = 2.0 + +;****************************************************************************************************************************** +;****************************************************************************************************************************** + +[Tactical Food Settings] + +;****************************************************************************************************************************** +; In this section you can specify the food system +;****************************************************************************************************************************** + +; Your team needs water food, otherwise they'll starve... +; If you mouse-over a merc's health bar, you will see two new values: Drink and Food. These represent the amount of drink and food +; your merc currently has. Note that 0 is the standard value (it represents the optimal value of sorts) +; Every hour, your merc digests food, lowering his food and drink values. If these are too low, there are serious drawbacks: +; - his max morale will get lowered (when your starving, you wont get happy because you jsut found a good gun...) +; - his energy regeneration due to sleeping is lowered, meaning he needs more sleep +; - breath regenerates slower +; - his performance on assignments (training milita, doctoring, repairing...) is worse +; - if seriously out of water or food, there is a chance that he'll lose strength an health points. You can die from this! +; You can regain lost stat points via surgery with the new trait system. However, this requires the pateient to be well-fed again (both values above 0) + +; how much food and water is digested every hour? This is the base value, that later gets modified. Range: 0-250 +FOOD_DIGESTION_HOURLY_BASE_FOOD = 20 +FOOD_DIGESTION_HOURLY_BASE_DRINK = 130 + +; The digestion value is modfied with the number corresponding to your current activity +FOOD_DIGESTION_SLEEP = 0.6 +FOOD_DIGESTION_TRAVEL_VEHICLE = 0.8 +FOOD_DIGESTION_TRAVEL = 1.5 +FOOD_DIGESTION_ASSIGNMENT = 0.9 +FOOD_DIGESTION_ONDUTY = 1.0 +FOOD_DIGESTION_COMBAT = 2.0 + +; allow decay of food in every sector? +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 ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -1908,7 +1948,7 @@ POISON_INFECTION_DAMAGE_MULTIPLIER = 4.0 ;****************************************************************************************************************************** ; If set to false, we cannot fill sandbags or set up/remove fortifications while enemies are in the sector -FORTIFICATION_ALLOW_IN_HOSTILE_SECTOR = FALSE +FORTIFICATION_ALLOW_IN_HOSTILE_SECTOR = TRUE ;****************************************************************************************************************************** ;****************************************************************************************************************************** @@ -2935,4 +2975,4 @@ FAST_FORWARD_PERIOD = 500 ; SCROLL, CONTROL + MENU + SHIFT + S, MULTIPLY, NUMPAD9, DECIMAL, LCONTROL + RSHIFT + LALT + NUMPAD1 ;------------------------------------------------------------------------------------------------------------------------------ -FAST_FORWARD_KEY = SUBTRACT \ No newline at end of file +FAST_FORWARD_KEY = SUBTRACT diff --git a/gamedir/Data-1.13/TableData/EnemyItemChoices.xml b/gamedir/Data-1.13/TableData/EnemyItemChoices.xml index e0192bbaf..38925a0b3 100644 --- a/gamedir/Data-1.13/TableData/EnemyItemChoices.xml +++ b/gamedir/Data-1.13/TableData/EnemyItemChoices.xml @@ -373,10 +373,10 @@ 1379 1380 1381 - 0 - 0 - 0 - 0 + 1545 + 1546 + 1567 + 1570 0 0 0 diff --git a/gamedir/Data-1.13/TableData/Food.xml b/gamedir/Data-1.13/TableData/Food.xml new file mode 100644 index 000000000..207bebb08 --- /dev/null +++ b/gamedir/Data-1.13/TableData/Food.xml @@ -0,0 +1,335 @@ + + + 0 + None + 0 + 0 + 0 + 0 + 0 + + + 1 + Canteen + 0 + 1000 + 20 + 1 + 0 + + + 2 + Alcohol + 0 + 3000 + 10 + 2 + 0 + + + 3 + Beer + 0 + 1200 + 100 + 3 + 0 + + + 4 + Wine + 0 + 2400 + 20 + 2 + 0 + + + 5 + Calory bars + 30 + 0 + 20 + 1 + 0 + + + 6 + MRE + 310 + 0 + 100 + 1 + 0 + + + 7 + EPA + 450 + 0 + 50 + 1 + 0 + + + 8 + Calorie Mate + 20 + 0 + 10 + 0 + 0 + + + 9 + Peak EPA + 20 + 0 + 15 + 0 + 0 + + + 10 + Hotdog + 90 + 0 + 100 + 1 + 1.8 + + + 11 + Hamburger + 95 + 0 + 100 + 1 + 1.6 + + + 12 + Fries + 40 + 0 + 100 + 1 + 1.5 + + + 13 + Pizza + 150 + 0 + 13 + 1 + 1.8 + + + 14 + Spam + 165 + 0 + 50 + 1 + 0 + + + 15 + Spam 2 + 170 + 0 + 50 + 1 + 0 + + + 16 + C. vegetables + 140 + 0 + 50 + 1 + 0 + + + 17 + C. scorpions + 90 + 0 + 100 + 1 + 0 + + + 18 + Cat food + 80 + 0 + 100 + -2 + 80 + + + 19 + Baked beans + 150 + 0 + 50 + 1 + 0 + + + 20 + Steak + 220 + 0 + 100 + 2 + 2.1 + + + 21 + Bean stew + 210 + 0 + 100 + 2 + 2.0 + + + 22 + French toast + 90 + 0 + 100 + 2 + 1.6 + + + 23 + Crepes + 90 + 0 + 100 + 2 + 1.9 + + + 24 + Pasta + 215 + 0 + 100 + 2 + 2.2 + + + 25 + Omelet + 200 + 0 + 100 + 2 + 2.1 + + + 26 + Cow meat + 700 + 0 + 10 + -2 + 3 + + + 27 + Bloodcat meat + 500 + 0 + 10 + -2 + 3.2 + + + 28 + Bread + 240 + 0 + 20 + 1 + 1 + + + 29 + Applepie + 120 + 0 + 50 + 2 + 1.7 + + + 30 + Water drum + 0 + 100000 + 1 + 1 + 0 + + + 31 + PET bottle + 0 + 1000 + 20 + 0 + 0 + + + 32 + Vegetable juice + 40 + 1000 + 20 + 1 + 1.2 + + + 33 + Milk + 5 + 1000 + 20 + 1 + 1.8 + + + 34 + Energy drink + 0 + 400 + 100 + 0 + 0 + + + 35 + Energy drink 2 + 0 + 400 + 100 + 0 + 0 + + + 36 + Coffee + 0 + 300 + 100 + 2 + 0.2 + + diff --git a/gamedir/Data-1.13/TableData/Item_Transformations.xml b/gamedir/Data-1.13/TableData/Item_Transformations.xml index 4276314d4..b26b7bafd 100644 --- a/gamedir/Data-1.13/TableData/Item_Transformations.xml +++ b/gamedir/Data-1.13/TableData/Item_Transformations.xml @@ -187,4 +187,38 @@ Empty sandbag Empty sand from sandbag. + + 1015 + 1543 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Build mode + Ready for building. + + + 1543 + 1015 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Combat mode + Ready for combat. + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index f2ed9cf79..f0504e216 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -167,6 +167,7 @@ 0.0 0 0 + 0 0 0 @@ -6452,10 +6453,10 @@ 1 2 5 - 10 + 13 4 22 - 10 + 30 1 1 1 @@ -6463,6 +6464,7 @@ 1 1 100.0 + 1 @@ -30967,9 +30969,11 @@ Shovel Perfect for digging your own grave, or hitting people over the head (and then dig their grave). Shovel - Not for sale through BR. - 268435456 - 1 + If it was good in Verdun, it'll still be good enough for you. + 128 + 1 + 1015 + 2 1 197 20 @@ -30983,9 +30987,12 @@ 1 1 1 - 1 + 1 + 1 + 1 + 3 + 1 100.0 - 4 @@ -45821,4 +45828,754 @@ + + 1543 + Shovel + Shovel + Perfect for digging your own grave, hitting people over the head (and then dig their grave) or building makeshift fortifications. + Shovel + Not for sale through BR. + 268435456 + 1 + 1 + 197 + 20 + 1 + 32 + 10 + 1 + -2 + 1 + 1 + 1 + 1 + 1 + 1 + 100.0 + 4 + + + + + + 1544 + Calory Bars + Calory Bars + Because normal food is sooo 2011. + Calory Bars + Calories, without distracting taste. + 268435456 + 1 + 2 + 115 + 10 + 3 + 22 + 16 + 3 + 1 + 3 + 5 + + + + + + 1545 + MRE + MRE + An individual food ration in use with the US military. + MRE + If its good for the US army, it better be good enough for you. + 268435456 + 1 + 2 + 118 + 7 + 3 + 22 + 12 + 5 + 1 + 25 + 6 + + + + + + 1546 + EPA + EPA + German army food. Beware the Raviolis! + EPA + This box of german army food will bring you through the day. Note the cookies, which also serve as burning material. + 268435456 + 1 + 2 + 111 + 16 + 2 + 22 + 28 + 5 + 1 + 20 + 7 + + + + + + 1547 + Calorie Mate + Calorie Mate + It better taste better than it looks... + Calorie Mate + Not for sale through BR. + 268435456 + 1 + 2 + 101 + 8 + 4 + 22 + 15 + 1 + 1 + 8 + + + + + + 1548 + Peak EPA + Peak EPA + A small bottle of vitamins and steroids. + Peak EPA + Not for sale through BR. + 268435456 + 1 + 2 + 122 + 4 + 2 + 22 + 12 + 1 + 1 + 9 + + + + + + 1549 + Hotdog + Hotdog + Butchery leftovers with old bread. Enjoy. + Hotdog + Not for sale through BR. + 268435456 + 1 + 2 + 114 + 6 + 2 + 22 + 4 + 1 + 1 + 10 + + + + + + 1550 + Hamburger + Hamburger + For some obscure reason, this is also sold outside Hamburg. + Hamburger + Not for sale through BR. + 268435456 + 1 + 2 + 113 + 5 + 2 + 22 + 6 + 1 + 1 + 11 + + + + + + 1551 + Fries + French Fries + Or 'Freedom Fries', as some people like to call them. + Fries + Not for sale through BR. + 268435456 + 1 + 2 + 112 + 3 + 3 + 22 + 2 + 1 + 1 + 12 + + + + + + 1552 + Pizza + Pizza + Favourite food of couch potatoes and sewer-based squads of tortoise ninjas everywhere. + Pizza + Not for sale through BR. + 268435456 + 1 + 2 + 124 + 4 + 1 + 22 + 5 + 1 + 1 + 13 + + + + + + 1553 + Spam + Spam + Spam, spam, spam, spam, spam, spam, baked beans, spam, spam, spam and spam. + Spam + A viking's favourite food. + 268435456 + 1 + 2 + 126 + 8 + 2 + 22 + 8 + 1 + 1 + 15 + 14 + + + + + + 1554 + Spam 2 + Spam in a can + Spam, spam, spam, spam, spam, spam, spam, spam, lovely spam, wonderful spam! + Spam 2 + Hey, at least it doesn't fill up your mailbox... + 268435456 + 1 + 2 + 125 + 8 + 2 + 22 + 8 + 1 + 1 + 15 + 15 + + + + + + 1555 + C. vegetables + Canned vegetables + These vegetables will stay edible forever, much to children's dismay. + C. vegetables + Nutritious, long-lasting, and animal-friendly. + 268435456 + 1 + 2 + 106 + 10 + 1 + 22 + 6 + 1 + 1 + 18 + 16 + + + + + + 1556 + C. scorpions + Canned scorpions + How about something exotic? Like poisonous insects? + C. scorpions + We were assured this is actually eaten in some place we forgot. + 268435456 + 1 + 2 + 105 + 7 + 4 + 22 + 12 + 4 + 1 + 7 + 8192 + 17 + + + + + + 1557 + Cat food + Canned cat food + Seriously? You really think about eating this? You should rethink this assignment... + Cat food + Not for sale through BR. + 268435456 + 1 + 2 + 103 + 3 + 4 + 22 + 2 + 1 + 1 + 18 + + + + + + 1558 + Baked beans + Canned baked beans + Tip: Best served with spam. + Baked beans + Not for sale through BR. + 268435456 + 1 + 2 + 102 + 8 + 4 + 22 + 6 + 1 + 1 + 19 + + + + + + 1559 + Steak + Steak + The best arulcan steak you'll find in .. Arulco. + Steak + Not for sale through BR. + 268435456 + 1 + 2 + 128 + 10 + 1 + 22 + 24 + 1 + 1 + 20 + + + + + + 1560 + Bean stew + Bean stew + A mexican-style bean stew. Really hot! + Bean stew + Not for sale through BR. + 268435456 + 1 + 2 + 116 + 10 + 1 + 22 + 22 + 1 + 1 + 21 + + + + + + 1561 + French toast + French toast + Mhmm, breakfast! + French toast + Not for sale through BR. + 268435456 + 1 + 2 + 129 + 4 + 2 + 22 + 7 + 1 + 1 + 22 + + + + + + 1562 + Crepes + Crepes + A spinach and mushroom crepe. + Crepes + Not for sale through BR. + 268435456 + 1 + 2 + 127 + 5 + 2 + 22 + 6 + 1 + 1 + 23 + + + + + + 1563 + Pasta + Pasta + Italian pasta. + Pasta + Not for sale through BR. + 268435456 + 1 + 2 + 121 + 12 + 1 + 22 + 23 + 1 + 1 + 24 + + + + + + 1564 + Omelet + Omelet + Omelet du fromage. Or not? + Omelet + Not for sale through BR. + 268435456 + 1 + 2 + 119 + 8 + 1 + 22 + 21 + 1 + 1 + 25 + + + + + + 1565 + Cow meat + Cow meat + Sure, you can eat it right now. Cooking is for wussies, eh? + Cow meat + Not for sale through BR. + 268435456 + 1 + 2 + 108 + 30 + 1 + 30 + 12 + 1 + 1 + 64 + 26 + + + + + + 1566 + Bloodcat meat + Bloodcat meat + You have to be a tough guy to kill them, but an even tougher guy to eat them! + Bloodcat meat + Not for sale through BR. + 268435456 + 1 + 2 + 99 + 30 + 1 + 22 + 60 + 1 + 1 + 32 + 27 + + + + + + 1567 + Bread + Bread loaf + A loaf of bread, made from grain of local farms. + Bread + Not for sale through BR. + 268435456 + 1 + 2 + 100 + 10 + 2 + 22 + 4 + 1 + 1 + 28 + + + + + + 1568 + Applepie + Applepie + A delicious applepie made from tasty arulcan apples. Don't you do anything naughty with it! + Applepie + Not for sale through BR. + 268435456 + 1 + 2 + 98 + 13 + 2 + 22 + 8 + 1 + 1 + 29 + + + + + + 1569 + Water drum + Water drum + A rusty old water barrel. + Water drum + Not for sale through BR. + 268435456 + 1 + 2 + 131 + 10000 + 1 + 22 + 65 + 1 + 1 + 1 + 16 + 30 + + + + + + 1570 + PET bottle + PET bottle + A bottle with 1 liter of still mineral water. + PET bottle + 1 liter of healthy mineral water, in a one-use bottle. + 268435456 + 1 + 2 + 123 + 10 + 1 + 22 + 2 + 1 + 1 + 30 + 31 + + + + + + 1571 + Vegetable juice + Vegetable juice + A drink that is so nutritious, it also stills your hunger (a bit). + Vegetable juice + For those without teeth who want to eat vegetables. + 268435456 + 1 + 2 + 130 + 10 + 1 + 22 + 3 + 1 + 1 + 14 + 32 + + + + + + 1572 + Milk + Milk + Cow milk, 1 liter. + Milk + Not for sale through BR. + 268435456 + 1 + 2 + 117 + 10 + 1 + 22 + 3 + 1 + 1 + 33 + + + + + + 1573 + Energy drink + Energy drink + You can almost taste the yummy chemicals that went into this. + Energy drink + Not for sale through BR. + 268435456 + 1 + 2 + 110 + 5 + 3 + 22 + 6 + 1 + 1 + 1 + 34 + + + + + + 1574 + Energy drink 2 + Energy drink 2 + Both tastes and refreshes like a kick in the belly. + Energy drink 2 + Not for sale through BR. + 268435456 + 1 + 2 + 109 + 5 + 4 + 22 + 6 + 1 + 1 + 1 + 35 + + + + + + 1575 + Coffee + Coffee + Apparently some people can get hooked to this stuff. + Coffee + Not for sale through BR. + 268435456 + 1 + 2 + 107 + 4 + 4 + 22 + 4 + 1 + 1 + 1 + 36 + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Map/Facilities.xml b/gamedir/Data-1.13/TableData/Map/Facilities.xml index 59ea4b082..eea916d34 100644 --- a/gamedir/Data-1.13/TableData/Map/Facilities.xml +++ b/gamedir/Data-1.13/TableData/Map/Facilities.xml @@ -8,7 +8,7 @@ 2 = No, never. --> - + B13 @@ -77,6 +77,11 @@ 18 2 + + H13 + 20 + 1 + H14 18 diff --git a/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml b/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml index e3db0a561..b642dcba6 100644 --- a/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml +++ b/gamedir/Data-1.13/TableData/Map/FacilityTypes.xml @@ -307,4 +307,30 @@ + + 20 + Army Barracks Cantina + Cantina + 10 + + FACILITY_EAT + By taking over the armies barracks, you've also taken over the cantina inside. Your mercs can eat here. + 10 + 10 + 500 + + + + 500 + 1 + 0 + + + 400 + 1 + 0 + + + + \ 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 26db5940e..dc614e68b 100644 --- a/gamedir/Data-1.13/TableData/Map/SectorNames.xml +++ b/gamedir/Data-1.13/TableData/Map/SectorNames.xml @@ -6,6 +6,7 @@ Tropical Tropical Tropical + 2 A2 @@ -13,6 +14,7 @@ Chitzena Chitzena Chitzena + 1 A3 @@ -20,6 +22,7 @@ Plains Plains Plains + 0 A4 @@ -27,6 +30,7 @@ Unknown Unknown Unknown + 0 A5 @@ -34,6 +38,7 @@ Unknown Unknown Unknown + 0 A6 @@ -41,6 +46,7 @@ Hills Hills Hills + 0 A7 @@ -48,6 +54,7 @@ Hills Hills Hills + 0 A8 @@ -55,6 +62,7 @@ Hills Hills Hills + 0 A9 @@ -62,6 +70,7 @@ Omerta Omerta Omerta + 0 A10 @@ -69,6 +78,7 @@ Omerta Omerta Omerta + 0 A11 @@ -76,6 +86,7 @@ Farmland Farmland Farmland + 0 A12 @@ -83,6 +94,7 @@ Forest Forest Forest + 0 A13 @@ -90,6 +102,7 @@ Woods Woods Woods + 0 A14 @@ -97,6 +110,7 @@ Plains Plains Plains + 0 A15 @@ -104,6 +118,7 @@ Forest Forest Forest + 0 A16 @@ -111,6 +126,7 @@ Unknown Unknown Unknown + 0 B1 @@ -118,6 +134,7 @@ Tropical Tropical Tropical + 2 B2 @@ -125,6 +142,7 @@ Chitzena Mine Chitzena Mine Chitzena Mine + 1 B3 @@ -132,6 +150,7 @@ Woods Woods Woods + 0 B4 @@ -139,6 +158,7 @@ Woods Woods Woods + 0 B5 @@ -146,6 +166,7 @@ Farmland Farmland Farmland + 0 B6 @@ -153,6 +174,7 @@ Farmland Farmland Farmland + 0 B7 @@ -160,6 +182,7 @@ Plains Plains Plains + 0 B8 @@ -167,6 +190,7 @@ Farmland Farmland Farmland + 0 B9 @@ -174,6 +198,7 @@ Plains, road Plains, road Plains, road + 0 B10 @@ -181,6 +206,7 @@ Woods Woods Woods + 0 B11 @@ -188,6 +214,7 @@ Woods Woods Woods + 0 B12 @@ -195,6 +222,7 @@ Farm, road Farm, road Farm, road + 0 B13 @@ -202,6 +230,7 @@ Drassen Airport Drassen Airport Drassen Airport + 1 B14 @@ -209,6 +238,7 @@ Water Water Water + 1 B15 @@ -216,6 +246,7 @@ Swamp Swamp Swamp + 1 B16 @@ -223,6 +254,7 @@ Forest Forest Forest + 0 C1 @@ -230,6 +262,7 @@ Tropical Tropical Tropical + 2 C2 @@ -237,6 +270,7 @@ Tropical, road Tropical, road Tropical, road + 0 C3 @@ -244,6 +278,7 @@ Tropical, road Tropical, road Tropical, road + 0 C4 @@ -251,6 +286,7 @@ Woods Woods Woods + 0 C5 @@ -258,6 +294,7 @@ San Mona San Mona San Mona + 1 C6 @@ -265,6 +302,7 @@ San Mona San Mona San Mona + 1 C7 @@ -272,6 +310,7 @@ Plains, road Plains, road Plains, road + 0 C8 @@ -279,6 +318,7 @@ Woods Woods Woods + 0 C9 @@ -286,6 +326,7 @@ Plains, road Plains, road Plains, road + 0 C10 @@ -293,6 +334,7 @@ Woods Woods Woods + 0 C11 @@ -300,6 +342,7 @@ Forest Forest Forest + 0 C12 @@ -307,6 +350,7 @@ Woods Woods Woods + 0 C13 @@ -314,6 +358,7 @@ Drassen Drassen Drassen + 1 C14 @@ -321,6 +366,7 @@ Water Water Water + 1 C15 @@ -328,6 +374,7 @@ Swamp Swamp Swamp + 1 C16 @@ -335,6 +382,7 @@ Swamp Swamp Swamp + 3 D1 @@ -342,6 +390,7 @@ Impassable Impassable Impassable + 2 D2 @@ -349,6 +398,7 @@ Tropical SAM Site Tropical, SAM Site + 2 D3 @@ -356,6 +406,7 @@ Plains, road Plains, road Plains, road + 0 D4 @@ -363,6 +414,7 @@ San Mona Mine San Mona Mine San Mona Mine + 0 D5 @@ -370,6 +422,7 @@ San Mona San Mona San Mona + 1 D6 @@ -377,6 +430,7 @@ Farmland Farmland Farmland + 0 D7 @@ -384,6 +438,7 @@ Forest, road Forest, road Forest, road + 0 D8 @@ -391,6 +446,7 @@ Forest Forest Forest + 1 D9 @@ -398,6 +454,7 @@ Plains, road Plains, road Plains, road + 1 D10 @@ -405,6 +462,7 @@ Plains Plains Plains + 1 D11 @@ -412,6 +470,7 @@ Woods Woods Woods + 0 D12 @@ -419,6 +478,7 @@ Swamp Swamp Swamp + 1 D13 @@ -426,6 +486,7 @@ Drassen Mine Drassen Mine Drassen Mine + 1 D14 @@ -433,6 +494,7 @@ Water Water Water + 1 D15 @@ -440,6 +502,7 @@ Woods SAM Site Woods, SAM Site + 1 D16 @@ -447,6 +510,7 @@ Forest Forest Forest + 0 E1 @@ -454,6 +518,7 @@ Impassable Impassable Impassable + 2 E2 @@ -461,6 +526,7 @@ Tropical Tropical Tropical + 2 E3 @@ -468,6 +534,7 @@ Plains, road Plains, road Plains, road + 0 E4 @@ -475,6 +542,7 @@ Hills Hills Hills + 0 E5 @@ -482,6 +550,7 @@ Hills Hills Hills + 0 E6 @@ -489,6 +558,7 @@ Plains Plains Plains + 0 E7 @@ -496,6 +566,7 @@ Farm, road Farm, road Farm, road + 0 E8 @@ -503,6 +574,7 @@ Farmland Farmland Farmland + 0 E9 @@ -510,6 +582,7 @@ Farm, road Farm, road Farm, road + 1 E10 @@ -517,6 +590,7 @@ Swamp Swamp Swamp + 1 E11 @@ -524,6 +598,7 @@ Woods Woods Woods + 1 E12 @@ -531,6 +606,7 @@ Woods Woods Woods + 1 E13 @@ -538,6 +614,7 @@ Water Water Water + 1 E14 @@ -545,6 +622,7 @@ Swamp Swamp Swamp + 1 E15 @@ -552,6 +630,7 @@ Forest, road Forest, road Forest, road + 0 E16 @@ -559,6 +638,7 @@ Unknown Unknown Unknown + 0 F1 @@ -566,6 +646,7 @@ Impassable Impassable Impassable + 2 F2 @@ -573,6 +654,7 @@ Coastline Coastline Coastline + 1 F3 @@ -580,6 +662,7 @@ Plains, road Plains, road Plains, road + 1 F4 @@ -587,6 +670,7 @@ Hills Hills Hills + 1 F5 @@ -594,6 +678,7 @@ Hills Hills Hills + 0 F6 @@ -601,6 +686,7 @@ Hills Hills Hills + 0 F7 @@ -608,6 +694,7 @@ Mountain, road Mountain, road Mountain, road + 0 F8 @@ -615,6 +702,7 @@ Cambria, Hospital Cambria, Hospital Cambria, Hospital + 1 F9 @@ -622,6 +710,7 @@ Cambria Cambria Cambria + 1 F10 @@ -629,6 +718,7 @@ Farmland Farmland Farmland + 1 F11 @@ -636,6 +726,7 @@ Plains Plains Plains + 0 F12 @@ -643,6 +734,7 @@ Woods Woods Woods + 0 F13 @@ -650,6 +742,7 @@ Woods Woods Woods + 1 F14 @@ -657,6 +750,7 @@ Plains, road Plains, road Plains, road + 1 F15 @@ -664,6 +758,7 @@ Forest, road Forest, road Forest, road + 1 F16 @@ -671,6 +766,7 @@ Unknown Unknown Unknown + 0 G1 @@ -678,6 +774,7 @@ Grumm Grumm Grumm + 1 G2 @@ -685,6 +782,7 @@ Grumm Grumm Grumm + 3 G3 @@ -692,6 +790,7 @@ Coastal, road Coastal, road Coastal, road + 0 G4 @@ -699,6 +798,7 @@ Mountain, road Mountain, road Mountain, road + 0 G5 @@ -706,6 +806,7 @@ Mountain, road Mountain, road Mountain, road + 0 G6 @@ -713,6 +814,7 @@ Mountain, road Mountain, road Mountain, road + 0 G7 @@ -720,6 +822,7 @@ Farm, road Farm, road Farm, road + 1 G8 @@ -727,6 +830,7 @@ Cambria Cambria Cambria + 1 G9 @@ -734,6 +838,7 @@ Cambria Cambria Cambria + 1 G10 @@ -741,6 +846,7 @@ Desert, road Desert, road Desert, road + 0 G11 @@ -748,6 +854,7 @@ Desert, road Desert, road Desert, road + 0 G12 @@ -755,6 +862,7 @@ Plains, road Plains, road Plains, road + 0 G13 @@ -762,6 +870,7 @@ Plains Plains Plains + 0 G14 @@ -769,6 +878,7 @@ Plains, road Plains, road Plains, road + 0 G15 @@ -776,6 +886,7 @@ Forest Forest Forest + 1 G16 @@ -783,6 +894,7 @@ Swamp Swamp Swamp + 1 H1 @@ -790,6 +902,7 @@ Grumm Grumm Grumm + 1 H2 @@ -797,6 +910,7 @@ Grumm Grumm Grumm + 3 H3 @@ -804,6 +918,7 @@ Grumm Mine Grumm Mine Grumm Mine + 3 H4 @@ -811,6 +926,7 @@ Forest Forest Forest + 0 H5 @@ -818,6 +934,7 @@ Hills Hills Hills + 0 H6 @@ -825,6 +942,7 @@ Mountain, road Mountain, road Mountain, road + 0 H7 @@ -832,6 +950,7 @@ Plains Plains Plains + 0 H8 @@ -839,6 +958,7 @@ Cambria Mine Cambria Mine Cambria Mine + 0 H9 @@ -846,6 +966,7 @@ Plains Plains Plains + 0 H10 @@ -853,6 +974,7 @@ Desert Desert Desert + 0 H11 @@ -860,6 +982,7 @@ Desert Desert Desert + 0 H12 @@ -867,6 +990,7 @@ Plains, road Plains, road Plains, road + 0 H13 @@ -874,6 +998,7 @@ Alma Alma Alma + 1 H14 @@ -881,6 +1006,7 @@ Alma Alma Alma + 1 H15 @@ -888,6 +1014,7 @@ Swamp Swamp Swamp + 1 H16 @@ -895,6 +1022,7 @@ Woods Woods Woods + 1 I1 @@ -902,6 +1030,7 @@ Impassable Impassable Impassable + 2 I2 @@ -909,6 +1038,7 @@ Impassable Impassable Impassable + 2 I3 @@ -916,6 +1046,7 @@ Coastal, road Coastal, road Coastal, road + 2 I4 @@ -923,6 +1054,7 @@ Forest Forest Forest + 0 I5 @@ -930,6 +1062,7 @@ Woods Woods Woods + 0 I6 @@ -937,6 +1070,7 @@ Estoni Estoni Estoni + 3 I7 @@ -944,6 +1078,7 @@ Woods Woods Woods + 0 I8 @@ -951,6 +1086,7 @@ Desert SAM Site Desert, SAM Site + 1 I9 @@ -958,6 +1094,7 @@ Desert Desert Desert + 0 I10 @@ -965,6 +1102,7 @@ Desert Desert Desert + 0 I11 @@ -972,6 +1110,7 @@ Plains Plains Plains + 0 I12 @@ -979,6 +1118,7 @@ Plains Plains Plains + 0 I13 @@ -986,6 +1126,7 @@ Alma Alma Alma + 1 I14 @@ -993,6 +1134,7 @@ Alma Mine Alma Mine Alma Mine + 1 I15 @@ -1000,6 +1142,7 @@ Woods Woods Woods + 1 I16 @@ -1007,6 +1150,7 @@ Woods Woods Woods + 0 J1 @@ -1014,6 +1158,7 @@ Impassable Impassable Impassable + 2 J2 @@ -1021,6 +1166,7 @@ Coastal, road Coastal, road Coastal, road + 2 J3 @@ -1028,6 +1174,7 @@ Coastal, road Coastal, road Coastal, road + 0 J4 @@ -1035,6 +1182,7 @@ Swamp Swamp Swamp + 3 J5 @@ -1042,6 +1190,7 @@ Swamp Swamp Swamp + 3 J6 @@ -1049,6 +1198,7 @@ Woods Woods Woods + 0 J7 @@ -1056,6 +1206,7 @@ Woods Woods Woods + 0 J8 @@ -1063,6 +1214,7 @@ Desert Desert Desert + 0 J9 @@ -1070,6 +1222,7 @@ Desert Desert Desert + 0 J10 @@ -1077,6 +1230,7 @@ Desert Desert Desert + 0 J11 @@ -1084,6 +1238,7 @@ Desert Desert Desert + 0 J12 @@ -1091,6 +1246,7 @@ Woods Woods Woods + 0 J13 @@ -1098,6 +1254,7 @@ Woods Woods Woods + 0 J14 @@ -1105,6 +1262,7 @@ Farm, road Farm, road Farm, road + 0 J15 @@ -1112,6 +1270,7 @@ Woods Woods Woods + 0 J16 @@ -1119,6 +1278,7 @@ Unknown Unknown Unknown + 0 K1 @@ -1126,6 +1286,7 @@ Impassable Impassable Impassable + 2 K2 @@ -1133,6 +1294,7 @@ Coastal, road Coastal, road Coastal, road + 2 K3 @@ -1140,6 +1302,7 @@ Swamp Swamp Swamp + 3 K4 @@ -1147,6 +1310,7 @@ Swamp Orta Orta Military Base + 1 K5 @@ -1154,6 +1318,7 @@ Swamp Swamp Swamp + 3 K6 @@ -1161,6 +1326,7 @@ Plains, road Plains, road Plains, road + 0 K7 @@ -1168,6 +1334,7 @@ Desert, road Desert, road Desert, road + 0 K8 @@ -1175,6 +1342,7 @@ Desert, road Desert, road Desert, road + 0 K9 @@ -1182,6 +1350,7 @@ Desert, road Desert, road Desert, road + 0 K10 @@ -1189,6 +1358,7 @@ Desert, road Desert, road Desert, road + 0 K11 @@ -1196,6 +1366,7 @@ Desert, road Desert, road Desert, road + 0 K12 @@ -1203,6 +1374,7 @@ Desert, road Desert, road Desert, road + 0 K13 @@ -1210,6 +1382,7 @@ Woods Woods Woods + 0 K14 @@ -1217,6 +1390,7 @@ Woods Woods Woods + 0 K15 @@ -1224,6 +1398,7 @@ Forest Forest Forest + 0 K16 @@ -1231,6 +1406,7 @@ Unknown Unknown Unknown + 0 L1 @@ -1238,6 +1414,7 @@ Coastline Coastline Coastline + 2 L2 @@ -1245,6 +1422,7 @@ Coastal, road Coastal, road Coastal, road + 2 L3 @@ -1252,6 +1430,7 @@ Swamp Swamp Swamp + 3 L4 @@ -1259,6 +1438,7 @@ Swamp Swamp Swamp + 4 L5 @@ -1266,6 +1446,7 @@ Forest Forest Forest + 0 L6 @@ -1273,6 +1454,7 @@ Plains, road Plains, road Plains, road + 0 L7 @@ -1280,6 +1462,7 @@ Plains Plains Plains + 0 L8 @@ -1287,6 +1470,7 @@ Desert Desert Desert + 0 L9 @@ -1294,6 +1478,7 @@ Plains Plains Plains + 0 L10 @@ -1301,6 +1486,7 @@ Woods Woods Woods + 1 L11 @@ -1308,6 +1494,7 @@ Balime Balime Balime + 1 L12 @@ -1315,6 +1502,7 @@ Balime Balime Balime + 1 L13 @@ -1322,6 +1510,7 @@ Coastline Coastline Coastline + 3 L14 @@ -1329,6 +1518,7 @@ Swamp Swamp Swamp + 3 L15 @@ -1336,6 +1526,7 @@ Forest Forest Forest + 0 L16 @@ -1343,6 +1534,7 @@ Unknown Unknown Unknown + 0 M1 @@ -1350,6 +1542,7 @@ Impassable Impassable Impassable + 2 M2 @@ -1357,6 +1550,7 @@ Coastal, road Coastal, road Coastal, road + 2 M3 @@ -1364,6 +1558,7 @@ Swamp, road Swamp, road Swamp, road + 3 M4 @@ -1371,6 +1566,7 @@ Farmland Farmland Farmland + 0 M5 @@ -1378,6 +1574,7 @@ Forest, road Forest, road Forest, road + 0 M6 @@ -1385,6 +1582,7 @@ Forest, road Forest, road Forest, road + 0 M7 @@ -1392,6 +1590,7 @@ Plains Plains Plains + 0 M8 @@ -1399,6 +1598,7 @@ Plains Plains Plains + 0 M9 @@ -1406,6 +1606,7 @@ Plains Plains Plains + 0 M10 @@ -1413,6 +1614,7 @@ Tropical, road Tropical, road Tropical, road + 2 M11 @@ -1420,6 +1622,7 @@ Impassable Impassable Impassable + 2 M12 @@ -1427,6 +1630,7 @@ Impassable Impassable Impassable + 2 M13 @@ -1434,6 +1638,7 @@ Woods Woods Woods + 2 M14 @@ -1441,6 +1646,7 @@ Swamp Swamp Swamp + 3 M15 @@ -1448,6 +1654,7 @@ Unknown Unknown Unknown + 0 M16 @@ -1455,6 +1662,7 @@ Unknown Unknown Unknown + 0 N1 @@ -1462,6 +1670,7 @@ Impassable Impassable Impassable + 2 N2 @@ -1469,6 +1678,7 @@ Impassable Impassable Impassable + 2 N3 @@ -1476,6 +1686,7 @@ Meduna Airport Meduna Airport Meduna Airport + 1 N4 @@ -1483,6 +1694,7 @@ Meduna SAM Site Meduna, SAM Site + 1 N5 @@ -1490,6 +1702,7 @@ Meduna Meduna Meduna + 1 N6 @@ -1497,6 +1710,7 @@ Tropical, road Tropical, road Tropical, road + 0 N7 @@ -1504,6 +1718,7 @@ Coastal, road Coastal, road Coastal, road + 1 N8 @@ -1511,6 +1726,7 @@ Coastal, road Coastal, road Coastal, road + 0 N9 @@ -1518,6 +1734,7 @@ Tropical, road Tropical, road Tropical, road + 0 N10 @@ -1525,6 +1742,7 @@ Tropical, road Tropical, road Tropical, road + 2 N11 @@ -1532,6 +1750,7 @@ Impassable Impassable Impassable + 2 N12 @@ -1539,6 +1758,7 @@ Impassable Impassable Impassable + 2 N13 @@ -1546,6 +1766,7 @@ Unknown Unknown Unknown + 0 N14 @@ -1553,6 +1774,7 @@ Unknown Unknown Unknown + 0 N15 @@ -1560,6 +1782,7 @@ Unknown Unknown Unknown + 0 N16 @@ -1567,6 +1790,7 @@ Unknown Unknown Unknown + 0 O1 @@ -1574,6 +1798,7 @@ Impassable Impassable Impassable + 2 O2 @@ -1581,6 +1806,7 @@ Impassable Impassable Impassable + 2 O3 @@ -1588,6 +1814,7 @@ Meduna Meduna Meduna + 1 O4 @@ -1595,6 +1822,7 @@ Meduna Meduna Meduna + 1 O5 @@ -1602,6 +1830,7 @@ Impassable Impassable Impassable + 2 O6 @@ -1609,6 +1838,7 @@ Impassable Impassable Impassable + 2 O7 @@ -1616,6 +1846,7 @@ Impassable Impassable Impassable + 2 O8 @@ -1623,6 +1854,7 @@ Tropical Tropical Tropical + 2 O9 @@ -1630,6 +1862,7 @@ Tropical Tropical Tropical + 2 O10 @@ -1637,6 +1870,7 @@ Impassable Impassable Impassable + 2 O11 @@ -1644,6 +1878,7 @@ Impassable Impassable Impassable + 2 O12 @@ -1651,6 +1886,7 @@ Impassable Impassable Impassable + 2 O13 @@ -1658,6 +1894,7 @@ Impassable Impassable Impassable + 2 O14 @@ -1665,6 +1902,7 @@ Unknown Unknown Unknown + 2 O15 @@ -1672,6 +1910,7 @@ Unknown Unknown Unknown + 0 O16 @@ -1679,6 +1918,7 @@ Unknown Unknown Unknown + 0 P1 @@ -1686,6 +1926,7 @@ Impassable Impassable Impassable + 2 P2 @@ -1693,6 +1934,7 @@ Impassable Impassable Impassable + 2 P3 @@ -1700,6 +1942,7 @@ Meduna Meduna Meduna + 1 P4 @@ -1707,6 +1950,7 @@ Impassable Impassable Impassable + 2 P5 @@ -1714,6 +1958,7 @@ Impassable Impassable Impassable + 2 P6 @@ -1721,6 +1966,7 @@ Impassable Impassable Impassable + 2 P7 @@ -1728,6 +1974,7 @@ Impassable Impassable Impassable + 2 P8 @@ -1735,6 +1982,7 @@ Impassable Impassable Impassable + 2 P9 @@ -1742,6 +1990,7 @@ Impassable Impassable Impassable + 2 P10 @@ -1749,6 +1998,7 @@ Impassable Impassable Impassable + 2 P11 @@ -1756,6 +2006,7 @@ Impassable Impassable Impassable + 2 P12 @@ -1763,6 +2014,7 @@ Impassable Impassable Impassable + 2 P13 @@ -1770,6 +2022,7 @@ Impassable Impassable Impassable + 2 P14 @@ -1777,6 +2030,7 @@ Unknown Unknown Unknown + 2 P15 @@ -1784,6 +2038,7 @@ Unknown Unknown Unknown + 0 P16 @@ -1791,5 +2046,6 @@ Unknown Unknown Unknown + 0 \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Merges.xml b/gamedir/Data-1.13/TableData/Merges.xml index 71b7f49d3..f38a427c6 100644 --- a/gamedir/Data-1.13/TableData/Merges.xml +++ b/gamedir/Data-1.13/TableData/Merges.xml @@ -144,14 +144,6 @@ 1 32 - - 214 - 214 - 214 - 0 - 1 - 32 - 216 161 @@ -3848,4 +3840,37 @@ 3 32 + + + 1546 + 1546 + 1546 + 0 + 1 + 32 + + + 1570 + 1570 + 1570 + 0 + 1 + 32 + + + 1571 + 1571 + 1571 + 0 + 1 + 32 + + + 1572 + 1572 + 1572 + 0 + 1 + 32 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AlbertoInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AlbertoInventory.xml index 74b3f1a18..788f42cf1 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/AlbertoInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/AlbertoInventory.xml @@ -14,5 +14,110 @@ 2 256 12 + + + 3 + 1549 + 8 + + + 4 + 1550 + 8 + + + 5 + 1551 + 16 + + + 6 + 1552 + 8 + + + 7 + 1558 + 5 + + + 8 + 1559 + 4 + + + 9 + 1560 + 6 + + + 10 + 1561 + 12 + + + 11 + 1562 + 10 + + + 12 + 1563 + 5 + + + 13 + 1563 + 5 + + + 14 + 1563 + 5 + + + 15 + 1564 + 5 + + + 16 + 1567 + 7 + + + 17 + 1568 + 4 + + + 18 + 1570 + 20 + + + 19 + 1571 + 7 + + + 20 + 1572 + 14 + + + 21 + 1573 + 4 + + + 22 + 1574 + 4 + + + 23 + 1575 + 12 \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/CarloInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/CarloInventory.xml index 74b3f1a18..16539e34e 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/CarloInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/CarloInventory.xml @@ -15,4 +15,109 @@ 256 12 + + 3 + 1549 + 8 + + + 4 + 1550 + 8 + + + 5 + 1551 + 16 + + + 6 + 1552 + 8 + + + 7 + 1558 + 5 + + + 8 + 1559 + 4 + + + 9 + 1560 + 6 + + + 10 + 1561 + 12 + + + 11 + 1562 + 10 + + + 12 + 1563 + 5 + + + 13 + 1563 + 5 + + + 14 + 1563 + 5 + + + 15 + 1564 + 5 + + + 16 + 1567 + 7 + + + 17 + 1568 + 4 + + + 18 + 1570 + 20 + + + 19 + 1571 + 7 + + + 20 + 1572 + 14 + + + 21 + 1573 + 4 + + + 22 + 1574 + 4 + + + 23 + 1575 + 12 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/ElginInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/ElginInventory.xml index 74b3f1a18..16539e34e 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/ElginInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/ElginInventory.xml @@ -15,4 +15,109 @@ 256 12 + + 3 + 1549 + 8 + + + 4 + 1550 + 8 + + + 5 + 1551 + 16 + + + 6 + 1552 + 8 + + + 7 + 1558 + 5 + + + 8 + 1559 + 4 + + + 9 + 1560 + 6 + + + 10 + 1561 + 12 + + + 11 + 1562 + 10 + + + 12 + 1563 + 5 + + + 13 + 1563 + 5 + + + 14 + 1563 + 5 + + + 15 + 1564 + 5 + + + 16 + 1567 + 7 + + + 17 + 1568 + 4 + + + 18 + 1570 + 20 + + + 19 + 1571 + 7 + + + 20 + 1572 + 14 + + + 21 + 1573 + 4 + + + 22 + 1574 + 4 + + + 23 + 1575 + 12 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/FrankInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/FrankInventory.xml index 74b3f1a18..16539e34e 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/FrankInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/FrankInventory.xml @@ -15,4 +15,109 @@ 256 12 + + 3 + 1549 + 8 + + + 4 + 1550 + 8 + + + 5 + 1551 + 16 + + + 6 + 1552 + 8 + + + 7 + 1558 + 5 + + + 8 + 1559 + 4 + + + 9 + 1560 + 6 + + + 10 + 1561 + 12 + + + 11 + 1562 + 10 + + + 12 + 1563 + 5 + + + 13 + 1563 + 5 + + + 14 + 1563 + 5 + + + 15 + 1564 + 5 + + + 16 + 1567 + 7 + + + 17 + 1568 + 4 + + + 18 + 1570 + 20 + + + 19 + 1571 + 7 + + + 20 + 1572 + 14 + + + 21 + 1573 + 4 + + + 22 + 1574 + 4 + + + 23 + 1575 + 12 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/HerveInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/HerveInventory.xml index 74b3f1a18..16539e34e 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/HerveInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/HerveInventory.xml @@ -15,4 +15,109 @@ 256 12 + + 3 + 1549 + 8 + + + 4 + 1550 + 8 + + + 5 + 1551 + 16 + + + 6 + 1552 + 8 + + + 7 + 1558 + 5 + + + 8 + 1559 + 4 + + + 9 + 1560 + 6 + + + 10 + 1561 + 12 + + + 11 + 1562 + 10 + + + 12 + 1563 + 5 + + + 13 + 1563 + 5 + + + 14 + 1563 + 5 + + + 15 + 1564 + 5 + + + 16 + 1567 + 7 + + + 17 + 1568 + 4 + + + 18 + 1570 + 20 + + + 19 + 1571 + 7 + + + 20 + 1572 + 14 + + + 21 + 1573 + 4 + + + 22 + 1574 + 4 + + + 23 + 1575 + 12 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml index e99faf689..3dad4b849 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml @@ -79,5 +79,20 @@ 15 1539 5 + + + 16 + 1544 + 4 + + + 17 + 1547 + 5 + + + 18 + 1548 + 3 \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/JakeInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/JakeInventory.xml index 6159e3c95..9c4d2c271 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/JakeInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/JakeInventory.xml @@ -323,4 +323,9 @@ 1053 1 + + 65 + 1569 + 3 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml index 36e16371d..ce6a91147 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml @@ -376,5 +376,55 @@ 77 1361 + + + 78 + 1553 + 1 + + + 79 + 1554 + 1 + + + 80 + 1555 + 1 + + + 81 + 1557 + 3 + + + 82 + 1558 + 1 + + + 83 + 1567 + 4 + + + 84 + 1568 + 4 + + + 85 + 1570 + 5 + + + 86 + 1572 + 5 + + + 87 + 1575 + 3 \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/MannyInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/MannyInventory.xml index 74b3f1a18..16539e34e 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/MannyInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/MannyInventory.xml @@ -15,4 +15,109 @@ 256 12 + + 3 + 1549 + 8 + + + 4 + 1550 + 8 + + + 5 + 1551 + 16 + + + 6 + 1552 + 8 + + + 7 + 1558 + 5 + + + 8 + 1559 + 4 + + + 9 + 1560 + 6 + + + 10 + 1561 + 12 + + + 11 + 1562 + 10 + + + 12 + 1563 + 5 + + + 13 + 1563 + 5 + + + 14 + 1563 + 5 + + + 15 + 1564 + 5 + + + 16 + 1567 + 7 + + + 17 + 1568 + 4 + + + 18 + 1570 + 20 + + + 19 + 1571 + 7 + + + 20 + 1572 + 14 + + + 21 + 1573 + 4 + + + 22 + 1574 + 4 + + + 23 + 1575 + 12 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/MickeyInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/MickeyInventory.xml index 95db49a45..6dd6e7bd4 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/MickeyInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/MickeyInventory.xml @@ -17,4 +17,8 @@ 3 232 + + 4 + 1566 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/PeterInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/PeterInventory.xml index 74b3f1a18..16539e34e 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/PeterInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/PeterInventory.xml @@ -15,4 +15,109 @@ 256 12 + + 3 + 1549 + 8 + + + 4 + 1550 + 8 + + + 5 + 1551 + 16 + + + 6 + 1552 + 8 + + + 7 + 1558 + 5 + + + 8 + 1559 + 4 + + + 9 + 1560 + 6 + + + 10 + 1561 + 12 + + + 11 + 1562 + 10 + + + 12 + 1563 + 5 + + + 13 + 1563 + 5 + + + 14 + 1563 + 5 + + + 15 + 1564 + 5 + + + 16 + 1567 + 7 + + + 17 + 1568 + 4 + + + 18 + 1570 + 20 + + + 19 + 1571 + 7 + + + 20 + 1572 + 14 + + + 21 + 1573 + 4 + + + 22 + 1574 + 4 + + + 23 + 1575 + 12 + \ No newline at end of file diff --git a/gamedir/Data/Sounds/eat1.wav b/gamedir/Data/Sounds/eat1.wav new file mode 100644 index 000000000..8e029d1a3 Binary files /dev/null and b/gamedir/Data/Sounds/eat1.wav differ