From 3537367b95b612d0b4cf0711fe66494c84658be1 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 7 Mar 2019 16:29:12 -0300
Subject: More bugs + red plush wine

---
 items.xml      | 2 +-
 maps/013-1.tmx | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/items.xml b/items.xml
index 77521edd..916f4994 100644
--- a/items.xml
+++ b/items.xml
@@ -457,7 +457,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	<item id="531"
 		image="usable/food/wine.png"
 		name="Red Plush Wine"
-		description="Wine produced from black grapes in the south-east of Aurora."
+		description="Delicious wine hand-produced by someone."
 		effect="Heal 50-110 HP, Makes you Drunk"
 		useButton="Drink"
 		type="usable"
diff --git a/maps/013-1.tmx b/maps/013-1.tmx
index 6246a292..aaa2c72d 100644
--- a/maps/013-1.tmx
+++ b/maps/013-1.tmx
@@ -1205,7 +1205,6 @@
     <property name="death" value="50000"/>
     <property name="max_beings" value="9"/>
     <property name="monster_id" value="1132"/>
-    <property name="script" value="Oscar::OnKillPinkie"/>
     <property name="spawn" value="30000"/>
    </properties>
   </object>
@@ -1221,7 +1220,7 @@
   </object>
  </objectgroup>
  <objectgroup color="#ffff00" id="12" name="margin">
-  <object id="43" name="Margem" type="fixme" x="0.078125" y="2080" width="960" height="640"/>
+  <object id="43" name="Margem" type="fixme" x="0" y="2080" width="960" height="640"/>
   <object id="44" name="Margem" type="fixme" x="2240" y="3264" width="960" height="640"/>
   <object id="45" name="Margem" type="fixme" x="4320" y="672" width="960" height="640"/>
   <object id="46" name="Margem" type="fixme" x="2912" y="0" width="960" height="640"/>
-- 
cgit v1.2.3-60-g2f50