From 8a91a378f4783680b87d18a3819a5ded785f75c7 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 13 Aug 2012 20:20:08 +0000
Subject: [PATCH] - updated food values (by Slax) - new item flag
 (CAMO_REMOVAL, 1024) for camo-removing items, added to rag (item 1022) -
 added xml with current ItemFlag-values (Lookup/ItemFlag.xml) - added small
 and medium pics for the masterkey (by wil473)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1489 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 Data-1.13/Interface/MDGUNS.sti          | Bin 216507 -> 216301 bytes
 Data-1.13/TableData/Food.xml            |  76 ++++++++++++------------
 Data-1.13/TableData/Items.xml           |   3 +-
 Data-1.13/TableData/Lookup/ItemFlag.xml |  51 ++++++++++++++++
 Data-1.13/tilesets/0/smguns.sti         | Bin 73838 -> 73765 bytes
 5 files changed, 91 insertions(+), 39 deletions(-)
 create mode 100644 Data-1.13/TableData/Lookup/ItemFlag.xml

diff --git a/Data-1.13/Interface/MDGUNS.sti b/Data-1.13/Interface/MDGUNS.sti
index b366e75e20c83026837e3fe11118eeed7420dea6..9527bbe7531fb30bd37bc6c6f8595f98a7e782bf 100644
GIT binary patch
delta 374
zcmdlzoA>QZUasH}XV3e|3=F+S8@arsxFZ-Dz<`fIwmDv^Jzk0th?%y>OEH@n26r<5
z`}ePh1xWmBWB_th{&lnd`#0$pkk=vd@1H+N0tS41W-SJa%fk5oPPY|0K|z~STN`iN
z^MC&sWT!iFGt1O>0M)5Xm@X_V48maWW%`7!uJ2z!pil)Qt&;Oa#l%tNM9zsqMn=ZM
zDKKfrLZC7Kfbw9#lLOT7{X1A1q8%))@(KtGfe>PN;S>-6ngCP+)SdNDn^y$_p~irz
w954wsJqH3*;JyLb2ekBG&Oe4mE`(?Yhz*nhL58UuU=C0n!*pOc0YM`J07Id-V*mgE

delta 358
zcmYL@u}i~H5QpEZDB994I!IO@1*KS|X`u*0aMD2w+R34V>kS^fUD8wwg+j4~AVU8D
zH`|JXlS3heEXg8>#LdkukjcZBRPlqm;o$rI?&~)De3wn1obDfdoHKS-dPpB?nS6>R
z<k+s&(Ao`+t4TdIw1vt}%G~b1T;y+x%l6}lZ{)x*Facuh&k^6e9Q3-~C<+xuh%nQM
z+N?|hLZKVNalk>>MORs%1I%q)!a?s}Q<+ju1zj_<OcW=-y;{-=tiTT}>3a}@N{`}}
zx%b-_BKq>ko9cAMnq`8hi~ZwatzH<aJuKAwh^v3#AR%s5?}n}~tJUg^TC7=7zk=?}
zys31hYrl{A`U-$Z0Q-B)OF1;TFf$-X2&@J6-h>y|I-Wx&yI)i{L9JyXz2C9T3E%nw
Dy`HH2

diff --git a/Data-1.13/TableData/Food.xml b/Data-1.13/TableData/Food.xml
index 207bebb08..0c7134414 100644
--- a/Data-1.13/TableData/Food.xml
+++ b/Data-1.13/TableData/Food.xml
@@ -1,7 +1,7 @@
 <FOODSLIST>
 	<FOOD>
 		<uiIndex>0</uiIndex>
-		<szName>None</szName>
+		<szName>(none)</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>0</ubPortionSize>
@@ -12,7 +12,7 @@
 		<uiIndex>1</uiIndex>
 		<szName>Canteen</szName>
 		<bFoodPoints>0</bFoodPoints>
-		<bDrinkPoints>1000</bDrinkPoints>
+		<bDrinkPoints>2000</bDrinkPoints>
 		<ubPortionSize>20</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
 		<usDecayRate>0</usDecayRate>
@@ -21,7 +21,7 @@
 		<uiIndex>2</uiIndex>
 		<szName>Alcohol</szName>
 		<bFoodPoints>0</bFoodPoints>
-		<bDrinkPoints>3000</bDrinkPoints>
+		<bDrinkPoints>6000</bDrinkPoints>
 		<ubPortionSize>10</ubPortionSize>
 		<bMoraleMod>2</bMoraleMod>
 		<usDecayRate>0</usDecayRate>
@@ -30,7 +30,7 @@
 		<uiIndex>3</uiIndex>
 		<szName>Beer</szName>
 		<bFoodPoints>0</bFoodPoints>
-		<bDrinkPoints>1200</bDrinkPoints>
+		<bDrinkPoints>2200</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>3</bMoraleMod>
 		<usDecayRate>0</usDecayRate>
@@ -39,7 +39,7 @@
 		<uiIndex>4</uiIndex>
 		<szName>Wine</szName>
 		<bFoodPoints>0</bFoodPoints>
-		<bDrinkPoints>2400</bDrinkPoints>
+		<bDrinkPoints>4400</bDrinkPoints>
 		<ubPortionSize>20</ubPortionSize>
 		<bMoraleMod>2</bMoraleMod>
 		<usDecayRate>0</usDecayRate>
@@ -47,7 +47,7 @@
 	<FOOD>
 		<uiIndex>5</uiIndex>
 		<szName>Calory bars</szName>
-		<bFoodPoints>30</bFoodPoints>
+		<bFoodPoints>150</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>20</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -56,7 +56,7 @@
 	<FOOD>
 		<uiIndex>6</uiIndex>
 		<szName>MRE</szName>
-		<bFoodPoints>310</bFoodPoints>
+		<bFoodPoints>1200</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -65,7 +65,7 @@
 	<FOOD>
 		<uiIndex>7</uiIndex>
 		<szName>EPA</szName>
-		<bFoodPoints>450</bFoodPoints>
+		<bFoodPoints>1600</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>50</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -74,7 +74,7 @@
 	<FOOD>
 		<uiIndex>8</uiIndex>
 		<szName>Calorie Mate</szName>
-		<bFoodPoints>20</bFoodPoints>
+		<bFoodPoints>100</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>10</ubPortionSize>
 		<bMoraleMod>0</bMoraleMod>
@@ -83,7 +83,7 @@
 	<FOOD>
 		<uiIndex>9</uiIndex>
 		<szName>Peak EPA</szName>
-		<bFoodPoints>20</bFoodPoints>
+		<bFoodPoints>80</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>15</ubPortionSize>
 		<bMoraleMod>0</bMoraleMod>
@@ -92,7 +92,7 @@
 	<FOOD>
 		<uiIndex>10</uiIndex>
 		<szName>Hotdog</szName>
-		<bFoodPoints>90</bFoodPoints>
+		<bFoodPoints>380</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -101,7 +101,7 @@
 	<FOOD>
 		<uiIndex>11</uiIndex>
 		<szName>Hamburger</szName>
-		<bFoodPoints>95</bFoodPoints>
+		<bFoodPoints>420</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -110,7 +110,7 @@
 	<FOOD>
 		<uiIndex>12</uiIndex>
 		<szName>Fries</szName>
-		<bFoodPoints>40</bFoodPoints>
+		<bFoodPoints>160</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -119,7 +119,7 @@
 	<FOOD>
 		<uiIndex>13</uiIndex>
 		<szName>Pizza</szName>
-		<bFoodPoints>150</bFoodPoints>
+		<bFoodPoints>620</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>13</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -128,7 +128,7 @@
 	<FOOD>
 		<uiIndex>14</uiIndex>
 		<szName>Spam</szName>
-		<bFoodPoints>165</bFoodPoints>
+		<bFoodPoints>600</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>50</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -137,7 +137,7 @@
 	<FOOD>
 		<uiIndex>15</uiIndex>
 		<szName>Spam 2</szName>
-		<bFoodPoints>170</bFoodPoints>
+		<bFoodPoints>800</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>50</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -146,7 +146,7 @@
 	<FOOD>
 		<uiIndex>16</uiIndex>
 		<szName>C. vegetables</szName>
-		<bFoodPoints>140</bFoodPoints>
+		<bFoodPoints>600</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>50</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -155,7 +155,7 @@
 <FOOD>
 		<uiIndex>17</uiIndex>
 		<szName>C. scorpions</szName>
-		<bFoodPoints>90</bFoodPoints>
+		<bFoodPoints>360</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -164,7 +164,7 @@
 	<FOOD>
 		<uiIndex>18</uiIndex>
 		<szName>Cat food</szName>
-		<bFoodPoints>80</bFoodPoints>
+		<bFoodPoints>320</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>-2</bMoraleMod>
@@ -173,7 +173,7 @@
 	<FOOD>
 		<uiIndex>19</uiIndex>
 		<szName>Baked beans</szName>
-		<bFoodPoints>150</bFoodPoints>
+		<bFoodPoints>620</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>50</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -182,7 +182,7 @@
 	<FOOD>
 		<uiIndex>20</uiIndex>
 		<szName>Steak</szName>
-		<bFoodPoints>220</bFoodPoints>
+		<bFoodPoints>920</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>2</bMoraleMod>
@@ -191,7 +191,7 @@
 	<FOOD>
 		<uiIndex>21</uiIndex>
 		<szName>Bean stew</szName>
-		<bFoodPoints>210</bFoodPoints>
+		<bFoodPoints>800</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>2</bMoraleMod>
@@ -200,7 +200,7 @@
 	<FOOD>
 		<uiIndex>22</uiIndex>
 		<szName>French toast</szName>
-		<bFoodPoints>90</bFoodPoints>
+		<bFoodPoints>300</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>2</bMoraleMod>
@@ -209,7 +209,7 @@
 	<FOOD>
 		<uiIndex>23</uiIndex>
 		<szName>Crepes</szName>
-		<bFoodPoints>90</bFoodPoints>
+		<bFoodPoints>340</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>2</bMoraleMod>
@@ -218,7 +218,7 @@
 	<FOOD>
 		<uiIndex>24</uiIndex>
 		<szName>Pasta</szName>
-		<bFoodPoints>215</bFoodPoints>
+		<bFoodPoints>860</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>2</bMoraleMod>
@@ -227,7 +227,7 @@
 	<FOOD>
 		<uiIndex>25</uiIndex>
 		<szName>Omelet</szName>
-		<bFoodPoints>200</bFoodPoints>
+		<bFoodPoints>700</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>2</bMoraleMod>
@@ -236,7 +236,7 @@
 	<FOOD>
 		<uiIndex>26</uiIndex>
 		<szName>Cow meat</szName>
-		<bFoodPoints>700</bFoodPoints>
+		<bFoodPoints>2000</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>10</ubPortionSize>
 		<bMoraleMod>-2</bMoraleMod>
@@ -245,7 +245,7 @@
   <FOOD>
 		<uiIndex>27</uiIndex>
 		<szName>Bloodcat meat</szName>
-		<bFoodPoints>500</bFoodPoints>
+		<bFoodPoints>2200</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>10</ubPortionSize>
 		<bMoraleMod>-2</bMoraleMod>
@@ -254,7 +254,7 @@
 	<FOOD>
 		<uiIndex>28</uiIndex>
 		<szName>Bread</szName>
-		<bFoodPoints>240</bFoodPoints>
+		<bFoodPoints>550</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>20</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
@@ -263,7 +263,7 @@
 	<FOOD>
 		<uiIndex>29</uiIndex>
 		<szName>Applepie</szName>
-		<bFoodPoints>120</bFoodPoints>
+		<bFoodPoints>600</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
 		<ubPortionSize>50</ubPortionSize>
 		<bMoraleMod>2</bMoraleMod>
@@ -282,7 +282,7 @@
 		<uiIndex>31</uiIndex>
 		<szName>PET bottle</szName>
 		<bFoodPoints>0</bFoodPoints>
-		<bDrinkPoints>1000</bDrinkPoints>
+		<bDrinkPoints>2000</bDrinkPoints>
 		<ubPortionSize>20</ubPortionSize>
 		<bMoraleMod>0</bMoraleMod>
 		<usDecayRate>0</usDecayRate>
@@ -290,8 +290,8 @@
 	<FOOD>
 		<uiIndex>32</uiIndex>
 		<szName>Vegetable juice</szName>
-		<bFoodPoints>40</bFoodPoints>
-		<bDrinkPoints>1000</bDrinkPoints>
+		<bFoodPoints>60</bFoodPoints>
+		<bDrinkPoints>2000</bDrinkPoints>
 		<ubPortionSize>20</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
 		<usDecayRate>1.2</usDecayRate>
@@ -299,8 +299,8 @@
 	<FOOD>
 		<uiIndex>33</uiIndex>
 		<szName>Milk</szName>
-		<bFoodPoints>5</bFoodPoints>
-		<bDrinkPoints>1000</bDrinkPoints>
+		<bFoodPoints>10</bFoodPoints>
+		<bDrinkPoints>2000</bDrinkPoints>
 		<ubPortionSize>20</ubPortionSize>
 		<bMoraleMod>1</bMoraleMod>
 		<usDecayRate>1.8</usDecayRate>
@@ -309,7 +309,7 @@
 		<uiIndex>34</uiIndex>
 		<szName>Energy drink</szName>
 		<bFoodPoints>0</bFoodPoints>
-		<bDrinkPoints>400</bDrinkPoints>
+		<bDrinkPoints>800</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>0</bMoraleMod>
 		<usDecayRate>0</usDecayRate>
@@ -318,7 +318,7 @@
 		<uiIndex>35</uiIndex>
 		<szName>Energy drink 2</szName>
 		<bFoodPoints>0</bFoodPoints>
-		<bDrinkPoints>400</bDrinkPoints>
+		<bDrinkPoints>700</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>0</bMoraleMod>
 		<usDecayRate>0</usDecayRate>
@@ -327,7 +327,7 @@
 		<uiIndex>36</uiIndex>
 		<szName>Coffee</szName>
 		<bFoodPoints>0</bFoodPoints>
-		<bDrinkPoints>300</bDrinkPoints>
+		<bDrinkPoints>600</bDrinkPoints>
 		<ubPortionSize>100</ubPortionSize>
 		<bMoraleMod>2</bMoraleMod>
 		<usDecayRate>0.2</usDecayRate>
diff --git a/Data-1.13/TableData/Items.xml b/Data-1.13/TableData/Items.xml
index 5f43818cb..b17c12dab 100644
--- a/Data-1.13/TableData/Items.xml
+++ b/Data-1.13/TableData/Items.xml
@@ -31186,6 +31186,7 @@
 		<ubCoolness>1</ubCoolness>
 		<BigGunList>1</BigGunList>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>1024</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -46611,5 +46612,5 @@
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
-	</ITEM>	
+	</ITEM>
 </ITEMLIST>
\ No newline at end of file
diff --git a/Data-1.13/TableData/Lookup/ItemFlag.xml b/Data-1.13/TableData/Lookup/ItemFlag.xml
new file mode 100644
index 000000000..ad88d6556
--- /dev/null
+++ b/Data-1.13/TableData/Lookup/ItemFlag.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<JA2Data>
+	<ItemFlag>
+		<id>0</id>
+		<name>None</name>
+	</ItemFlag>
+	<ItemFlag>
+		<id>1</id>
+		<name>Empty Sandbag</name>
+	</ItemFlag>
+	<ItemFlag>
+		<id>2</id>
+		<name>Full Sandbag</name>
+	</ItemFlag>
+	<ItemFlag>
+		<id>4</id>
+		<name>Shovel</name>
+	</ItemFlag>
+	<ItemFlag>
+		<id>8</id>
+		<name>Concertina</name>
+	</ItemFlag>
+	<ItemFlag>
+		<id>16</id>
+		<name>Water Drum</name>
+	</ItemFlag>
+	<ItemFlag>
+		<id>32</id>
+		<name>Bloodcat Meat</name>
+	</ItemFlag>
+	<ItemFlag>
+		<id>64</id>
+		<name>Cow Meat</name>
+	</ItemFlag>
+	<ItemFlag>
+		<id>128</id>
+		<name>Belt fed</name>
+	</ItemFlag>
+	<ItemFlag>
+		<id>256</id>
+		<name>Ammobelt</name>
+	</ItemFlag>
+	<ItemFlag>
+		<id>512</id>
+		<name>Ammobelt vest</name>
+	</ItemFlag>
+	<ItemFlag>
+		<id>1024</id>
+		<name>Camo removal</name>
+	</ItemFlag>
+</JA2Data>
\ No newline at end of file
diff --git a/Data-1.13/tilesets/0/smguns.sti b/Data-1.13/tilesets/0/smguns.sti
index 3e69794a0d477cbac0b50d08db27a85cd207527e..77455cc4204f6266ecd30b544d877eb64aa5b263 100644
GIT binary patch
delta 156
zcmaENfMw|c7OvnBXHQcl28N@o8@arsxC<E|fP;a*IbLdeycA<7YherXzkmN)Sb)So
z27VCvZ#tO#H~lI|ptiB`OV5|zrEI08Dk>*HDpY`gjqTQSzTPiiKq{<DOG~ddHd?5&
cwWwRe%m5pqV)jqvA44Y_kfQ=*bVDow0OzVqx&QzG

delta 159
zcmZ2_faTo*7OvnBXHQcl1_nO1ja*(*+`AYcfP+D{IbLdeycA<7D^sKR<c+UH!~Xqi
zWsv$;*Z~4xo<l%KX-7w4A)CsHfB%{pr2na?s95CPvah<Oa#`i_<;!fm&v~Ce@3>fU
z@?R4}qx8SR!k6`2T=n&Zg&^H3g&;6_<s2pEGuKZ}J~u~>>m=JhhFMJi{xvcH0KfG|
AHUIzs