ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/arch/food/rose.arc
(Generate patch)

Comparing deliantra/arch/food/rose.arc (file contents):
Revision 1.10 by root, Tue Nov 3 09:58:47 2009 UTC vs.
Revision 1.11 by root, Sat Oct 16 09:17:16 2010 UTC

1object rose_black 1object rose_black
2name black rose 2name black rose
3name_pl black roses 3name_pl black roses
4face rose_black.x11 4face rose_black.x11
5magicmap black
6food 5 5food 5
7nrof 1 6nrof 1
8type 6 7type 6
9materialname organic 8materialname organic
10value 160 9value 160
14 13
15object rose_pink 14object rose_pink
16name pink rose 15name pink rose
17name_pl pink roses 16name_pl pink roses
18face rose_pink.x11 17face rose_pink.x11
19magicmap red
20food 5 18food 5
21nrof 1 19nrof 1
22type 6 20type 6
23materialname organic 21materialname organic
24value 60 22value 60
28 26
29object rose_red 27object rose_red
30name red rose 28name red rose
31name_pl red roses 29name_pl red roses
32face rose_red.x11 30face rose_red.x11
33magicmap red
34food 5 31food 5
35nrof 1 32nrof 1
36type 6 33type 6
37materialname organic 34materialname organic
38value 80 35value 80
42 39
43object rose_white 40object rose_white
44name white rose 41name white rose
45name_pl white roses 42name_pl white roses
46face rose_wh.x11 43face rose_wh.x11
47magicmap white
48food 5 44food 5
49nrof 1 45nrof 1
50type 6 46type 6
51materialname organic 47materialname organic
52value 45 48value 45
56 52
57object rose_yellow 53object rose_yellow
58name yellow rose 54name yellow rose
59name_pl yellow roses 55name_pl yellow roses
60face rose_yel.x11 56face rose_yel.x11
61magicmap yellow
62food 5 57food 5
63nrof 1 58nrof 1
64type 6 59type 6
65materialname organic 60materialname organic
66value 45 61value 45

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines