Merge branch 'item_descriptions' into 'master'

To resolve missing description warnings

See merge request themanaworld/evolved/clientdata!4

12 files changed, 12 insertions, 12 deletions

diff --git a/items/equip-head/item5202_PilotHat.xml b/items/equip-head/item5202_PilotHat.xml
index f6d84669..8d6af407 100644
--- a/items/equip-head/item5202_PilotHat.xml
+++ b/items/equip-head/item5202_PilotHat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5202" image="equipment/head/pilot-hat.png" name="Pilot Hat" description="" mattack="2" type="equip-head" defense="10" weight="30" sellProtected="true">
+  <item id="5202" image="equipment/head/pilot-hat.png" name="Pilot Hat" description="No pilot oufit is complete without one of these." mattack="2" type="equip-head" defense="10" weight="30" sellProtected="true">
     <sprite gender="unisex">equipment/head/pilot-hat.xml</sprite>
     <sprite gender="female">equipment/head/pilot-hat-female.xml</sprite>
   </item>
diff --git a/items/equip-head/item5203_MoonshroomHat.xml b/items/equip-head/item5203_MoonshroomHat.xml
index 670df756..d76cd1ff 100644
--- a/items/equip-head/item5203_MoonshroomHat.xml
+++ b/items/equip-head/item5203_MoonshroomHat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5203" image="equipment/head/moonshroomhat.png" name="Moonshroom Hat" description="" type="equip-head" defense="15" mattack="5" weight="30" sellProtected="true">
+  <item id="5203" image="equipment/head/moonshroomhat.png" name="Moonshroom Hat" description="No, it doesn't shoot stuff... sheesh." type="equip-head" defense="15" mattack="5" weight="30" sellProtected="true">
     <sprite gender="unisex">equipment/head/moonshroomhat.xml</sprite>
     <sprite gender="female">equipment/head/moonshroomhat-female.xml</sprite>
     <replace sprite="hair">
diff --git a/items/equip-head/item5205_EskimoHat.xml b/items/equip-head/item5205_EskimoHat.xml
index 549ba20c..74be90ae 100644
--- a/items/equip-head/item5205_EskimoHat.xml
+++ b/items/equip-head/item5205_EskimoHat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5205" image="equipment/head/eskimo.png" name="Eskimo Hat" description="" mattack="-2" type="equip-head" defense="5" weight="10" sellProtected="true">
+  <item id="5205" image="equipment/head/eskimo.png" name="Eskimo Hat" description="For one who laces snowshoes" mattack="-2" type="equip-head" defense="5" weight="10" sellProtected="true">
     <sprite gender="unisex">equipment/head/eskimohat.xml</sprite>
     <sprite gender="female">equipment/head/eskimohat-female.xml</sprite>
     <replace sprite="hair">
diff --git a/items/generic/item5218_RedTicket.xml b/items/generic/item5218_RedTicket.xml
index 98897d84..8f5aa41d 100644
--- a/items/generic/item5218_RedTicket.xml
+++ b/items/generic/item5218_RedTicket.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5218" image="generic/event-ticket.png" name="Red Ticket" description="" type="generic" weight="1"/>
+  <item id="5218" image="generic/event-ticket.png" name="Red Ticket" description="Admit one" type="generic" weight="1"/>
 </items>
diff --git a/items/generic/item5219_YellowTicket.xml b/items/generic/item5219_YellowTicket.xml
index 70b1708a..6925a1fc 100644
--- a/items/generic/item5219_YellowTicket.xml
+++ b/items/generic/item5219_YellowTicket.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5219" image="generic/event-ticket.png|S:#c02323,a39b5b,ee4c4c,e8dd7f,ff6f6f,fff8b9" name="Yellow Ticket" description="" type="generic" weight="1"/>
+  <item id="5219" image="generic/event-ticket.png|S:#c02323,a39b5b,ee4c4c,e8dd7f,ff6f6f,fff8b9" name="Yellow Ticket" description="Admit one" type="generic" weight="1"/>
 </items>
diff --git a/items/generic/item5220_GoldTicket.xml b/items/generic/item5220_GoldTicket.xml
index c1d4f0ef..b429369b 100644
--- a/items/generic/item5220_GoldTicket.xml
+++ b/items/generic/item5220_GoldTicket.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5220" image="generic/event-ticket.png|S:#c02323,bb8104,ee4c4c,e9ae30,ff6f6f,ffc852" name="Gold Ticket" description="" type="generic" weight="1"/>
+  <item id="5220" image="generic/event-ticket.png|S:#c02323,bb8104,ee4c4c,e9ae30,ff6f6f,ffc852" name="Gold Ticket" description="Admit one" type="generic" weight="1"/>
 </items>
diff --git a/items/generic/item5221_GreenTicket.xml b/items/generic/item5221_GreenTicket.xml
index f09044f2..c17f6b37 100644
--- a/items/generic/item5221_GreenTicket.xml
+++ b/items/generic/item5221_GreenTicket.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5221" image="generic/event-ticket.png|S:#c02323,62a405,ee4c4c,96d240,ff6f6f,bbf568" name="Green Event Ticket" description="" type="generic" weight="1"/>
+  <item id="5221" image="generic/event-ticket.png|S:#c02323,62a405,ee4c4c,96d240,ff6f6f,bbf568" name="Green Event Ticket" description="Admit one" type="generic" weight="1"/>
 </items>
diff --git a/items/generic/item5222_AquaTicket.xml b/items/generic/item5222_AquaTicket.xml
index 48a87ce0..0599cba2 100644
--- a/items/generic/item5222_AquaTicket.xml
+++ b/items/generic/item5222_AquaTicket.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5222" image="generic/event-ticket.png|S:#c02323,019dab,ee4c4c,2acad8,ff6f6f,4ef0ff" name="Aqua Ticket" description="" type="generic" weight="1"/>
+  <item id="5222" image="generic/event-ticket.png|S:#c02323,019dab,ee4c4c,2acad8,ff6f6f,4ef0ff" name="Aqua Ticket" description="Admit one" type="generic" weight="1"/>
 </items>
diff --git a/items/generic/item5223_BlueTicket.xml b/items/generic/item5223_BlueTicket.xml
index fc5c460a..97f19dc0 100644
--- a/items/generic/item5223_BlueTicket.xml
+++ b/items/generic/item5223_BlueTicket.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5223" image="generic/event-ticket.png|S:#c02323,001e5b,ee4c4c,1c55c8,ff6f6f,3276ff" name="Blue Ticket" description="" type="generic" weight="1"/>
+  <item id="5223" image="generic/event-ticket.png|S:#c02323,001e5b,ee4c4c,1c55c8,ff6f6f,3276ff" name="Blue Ticket" description="Admit one" type="generic" weight="1"/>
 </items>
diff --git a/items/generic/item5224_PurpleTicket.xml b/items/generic/item5224_PurpleTicket.xml
index f3b9c32e..4ab48c41 100644
--- a/items/generic/item5224_PurpleTicket.xml
+++ b/items/generic/item5224_PurpleTicket.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5224" image="generic/event-ticket.png|S:#c02323,8b01a9,ee4c4c,c822ec,ff6f6f,e051ff" name="Purple Ticket" description="" type="generic" weight="1"/>
+  <item id="5224" image="generic/event-ticket.png|S:#c02323,8b01a9,ee4c4c,c822ec,ff6f6f,e051ff" name="Purple Ticket" description="Admit one" type="generic" weight="1"/>
 </items>
diff --git a/items/generic/item5225_PinkTicket.xml b/items/generic/item5225_PinkTicket.xml
index f352b535..31a158aa 100644
--- a/items/generic/item5225_PinkTicket.xml
+++ b/items/generic/item5225_PinkTicket.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5225" image="generic/event-ticket.png|S:#c02323,bb3eb1,ee4c4c,fd67f1,ff6f6f,ff9df7" name="Pink Ticket" description="" type="generic" weight="1"/>
+  <item id="5225" image="generic/event-ticket.png|S:#c02323,bb3eb1,ee4c4c,fd67f1,ff6f6f,ff9df7" name="Pink Ticket" description="Admit one" type="generic" weight="1"/>
 </items>
diff --git a/items/usable/item5214_LactoseFreeAcorn.xml b/items/usable/item5214_LactoseFreeAcorn.xml
index 35390de7..4cbbe4b9 100644
--- a/items/usable/item5214_LactoseFreeAcorn.xml
+++ b/items/usable/item5214_LactoseFreeAcorn.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5214" image="use/food/acornroasted.png" name="Lactose-Free Acorn" description="" type="usable" hp="15" weight="1"/>
+  <item id="5214" image="use/food/acornroasted.png" name="Lactose-Free Acorn" description="An acorn. No milk added." type="usable" hp="15" weight="1"/>
 </items>