From 42bfa4f4bf92e72d0029008c1640d29de085c755 Mon Sep 17 00:00:00 2001
From: ryo_saeba <ryo_saeba@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 11 Nov 2012 19:36:13 +0000
Subject: [PATCH] Apply patch #3586094: Popcorn perspective fixed, by
 SilverNexus.

git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@18493 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 CHANGES                       |  10 ++++++++++
 food/bag_popcorn.arc          |   1 +
 food/bag_popcorn.base.111.png | Bin 349 -> 354 bytes
 potion/bag_empty.base.111.png | Bin 0 -> 272 bytes
 potion/bag_empty.face         |   3 +++
 potion/emptybottles.arc       |  17 +++++++++++++++++
 6 files changed, 31 insertions(+)
 create mode 100644 potion/bag_empty.base.111.png
 create mode 100644 potion/bag_empty.face

diff --git a/CHANGES b/CHANGES
index 719e5e1ae..793489168 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,16 @@
 Changes for SVN top of tree:
 ==============================================================================
 
+Redesigned the bag_popcorn archetype to put it
+in perspecitve. Also added a bag_empty archetype
+for when the popcorn is consumed.
+food/bag_popcorn.base.111.png
+food/bag_empty.face
+food/bag_popcorn.arc
+food/bag_empty.base.111.png
+potion/emptybottles.arc
+SilverNexus 2012-11-10
+
 Redesigned my own redesigned nondirectional sign,
 keeping borders more even on all four side. Instead
 of a third line of text, the text is expanded in a
diff --git a/food/bag_popcorn.arc b/food/bag_popcorn.arc
index 0cc4c6545..818fd17fa 100644
--- a/food/bag_popcorn.arc
+++ b/food/bag_popcorn.arc
@@ -1,6 +1,7 @@
 Object bag_popcorn
 name bag of popcorn
 face bag_popcorn.111
+on_use_yield bag_empty
 food 50
 nrof 1
 type 6
diff --git a/food/bag_popcorn.base.111.png b/food/bag_popcorn.base.111.png
index b16a6edf6a5c1926fe5a405d152b125c17886c59..81f222014e253c86781d650983274ba9a46e7e8a 100644
GIT binary patch
delta 339
zcmcc1^oVJKL_G^L0|P^2NcwRg#aJBV?!>U}oXkrghqJ&VvY3H^TNs2H8D`Cq01C2~
zc>21s-{IyG5jJ8D+G7tCk}PqJC~?lu%}vcKVQ?-=O)N=GQ7F$W$xv|j^bH7a<P!%f
zk_hk#asB`QKaiQtz))4iu$O@W$oc=j9*F->O4a%Tlwm9h@(X5gcy=QV#7XjYcVQPx
z?0602O!Rbd4AD4$_Pin2VFMo4fZ(7i=I>0F&YRgS<BXrYH)YLU%lUU-oxA2ttFYN}
zzvM*@y)S;fJT|+2SM7x`E8BuqJ$yyMy0477C(XGx?S$)luV(LOagXy9elGNx`YtKX
zBW!C|WzX7e{f!*Ix(y^IGYIetOuSmkz#zk6#_(<{%M#-sE)o+ON*Z`)d$(v8y!dnc
aCsTj6_SvTAQ+R-`WAJqKb6Mw<&;$TU-gz+q

delta 334
zcmaFFbeCy@L_G&H0|SH0lCEPwDl@<*#C7Sl@7X{$1A`X>Ll6VQUIqrB)Hw!*YYYtc
z7#N;2FnniV`2Qb>{x4-<Fl1n`WMB|rV31&7NM>NrWMC*}V0h2KP|d(Fg@IuX1A`(^
zfdB^wPyq+WS_X!#K)nnMEes4j3=DF!7CdLDXJB9~3GxeOaCmkj4QS~iPZ!6Kinynf
z%=r!*@Gv;9GXFkr-hX?eEt|T|$vjc0-pR}=VD(q|hwJec5B5m;<WurRb{Bj8Xp40$
zDLdJFAp2X0$}=vD<X;s!{t_!r6gXaQShMBp<tL{dqr0!Ru^(iaJ!P>a4@-j`SJn%6
zS4WO@?lLFp=3NzGk~VQ@{M?e-<hEzZ#%q>`*X)vhHajS4w)N)M-r5g#>SQ0?%W-F7
e<z<_j|77xuk~!m-GOyeT3M5ZgKbLh*2~7YXSa>D?

diff --git a/potion/bag_empty.base.111.png b/potion/bag_empty.base.111.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fac9cd9a189d74a9e50170e0f4dc65750c8c12e
GIT binary patch
literal 272
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%Cx&(BWL^R}oCO|{#S9GG
z!XV7ZFl&wkP>{XE)7O>#4mX#GB-;(n1wau7$r9Iy66gHf+|;}h2Ir#G#FEq$h4Rdj
z3<Y;j-+=H&K5?KTo&cW^*S!o3*$fOo@;^{lkjrAAIAckWUoeBivm0q3PLj8~3sV|*
zO$w0X?djqeB5^r6L4nWU@BjY{$08Wg3KS*&EAZ&DJQi=+$aS!SHO*ix*V!hce?aN9
zHEu~V493@#4He4Xxf}dD5W|?>P-<*&SmFvR!*dt&kDH`&CjpIR@O1TaS?83{1OSQ1
BOHcp+

literal 0
HcmV?d00001

diff --git a/potion/bag_empty.face b/potion/bag_empty.face
new file mode 100644
index 000000000..b01f34c08
--- /dev/null
+++ b/potion/bag_empty.face
@@ -0,0 +1,3 @@
+face bag_empty.111
+magicmap red
+end
diff --git a/potion/emptybottles.arc b/potion/emptybottles.arc
index 97414f6a8..b97daa3b0 100644
--- a/potion/emptybottles.arc
+++ b/potion/emptybottles.arc
@@ -124,3 +124,20 @@ body_arm -1
 skill one handed weapons
 end
 
+Object bag_empty
+name empty bag
+name_pl empty bags
+nrof 1
+last_sp 10
+type 15
+face bag_empty.111
+material 1
+dam -5
+weight 25
+value 1
+attacktype 1
+weapontype 8
+client_type 611
+body arm -1
+skill one handed weapons
+end