[Crossfire-cvs] SF.net SVN: crossfire:[19678] arch/trunk

[Crossfire CVS repository messages.]

Revision: 19678
http://sourceforge.net/p/crossfire/code/19678
Author: partmedia
Date: 2014-10-04 20:35:16 +0000 (Sat, 04 Oct 2014)
Log Message:
-----------
Combine generic hides and leathers into a single file

Also fix stacking for colored leathers

Added Paths:
-----------
arch/trunk/flesh/generic/hides.arc
arch/trunk/misc/leathers.arc

Removed Paths:
-------------
arch/trunk/flesh/generic/hide_black.arc
arch/trunk/flesh/generic/hide_brown.arc
arch/trunk/flesh/generic/hide_grey.arc
arch/trunk/flesh/generic/hide_white.arc
arch/trunk/misc/leather.arc
arch/trunk/misc/leather_black.arc
arch/trunk/misc/leather_strips.arc
arch/trunk/misc/leather_white.arc

Deleted: arch/trunk/flesh/generic/hide_black.arc
===================================================================
--- arch/trunk/flesh/generic/hide_black.arc 2014-10-04 20:28:48 UTC (rev 19677)
+++ arch/trunk/flesh/generic/hide_black.arc 2014-10-04 20:35:16 UTC (rev 19678)
@@ -1,9 +0,0 @@
-Object hide_black
-name hide
-nrof 1
-face hide_black.111
-material 32
-type 72
-weight 20
-value 300
-end

Deleted: arch/trunk/flesh/generic/hide_brown.arc
===================================================================
--- arch/trunk/flesh/generic/hide_brown.arc 2014-10-04 20:28:48 UTC (rev 19677)
+++ arch/trunk/flesh/generic/hide_brown.arc 2014-10-04 20:35:16 UTC (rev 19678)
@@ -1,9 +0,0 @@
-Object hide_brown
-name hide
-nrof 1
-face hide_brown.111
-material 32
-type 72
-weight 20
-value 300
-end

Deleted: arch/trunk/flesh/generic/hide_grey.arc
===================================================================
--- arch/trunk/flesh/generic/hide_grey.arc 2014-10-04 20:28:48 UTC (rev 19677)
+++ arch/trunk/flesh/generic/hide_grey.arc 2014-10-04 20:35:16 UTC (rev 19678)
@@ -1,9 +0,0 @@
-Object hide_grey
-name hide
-nrof 1
-face hide_grey.111
-material 32
-type 72
-weight 20
-value 300
-end

Deleted: arch/trunk/flesh/generic/hide_white.arc
===================================================================
--- arch/trunk/flesh/generic/hide_white.arc 2014-10-04 20:28:48 UTC (rev 19677)
+++ arch/trunk/flesh/generic/hide_white.arc 2014-10-04 20:35:16 UTC (rev 19678)
@@ -1,9 +0,0 @@
-Object hide_white
-name hide
-nrof 1
-face hide_white.111
-material 32
-type 72
-weight 20
-value 300
-end

Added: arch/trunk/flesh/generic/hides.arc
===================================================================
--- arch/trunk/flesh/generic/hides.arc (rev 0)
+++ arch/trunk/flesh/generic/hides.arc 2014-10-04 20:35:16 UTC (rev 19678)
@@ -0,0 +1,47 @@
+# ------------------
+# Generic Hides
+# ------------------
+
+# Black
+Object hide_black
+name hide
+nrof 1
+face hide_black.111
+material 32
+type 72
+weight 20
+value 300
+end
+
+# Brown
+Object hide_brown
+name hide
+nrof 1
+face hide_brown.111
+material 32
+type 72
+weight 20
+value 300
+end
+
+# Gray
+Object hide_grey
+name hide
+nrof 1
+face hide_grey.111
+material 32
+type 72
+weight 20
+value 300
+end
+
+# White
+Object hide_white
+name hide
+nrof 1
+face hide_white.111
+material 32
+type 72
+weight 20
+value 300
+end

Deleted: arch/trunk/misc/leather.arc
===================================================================
--- arch/trunk/misc/leather.arc 2014-10-04 20:28:48 UTC (rev 19677)
+++ arch/trunk/misc/leather.arc 2014-10-04 20:35:16 UTC (rev 19678)
@@ -1,8 +0,0 @@
-Object leather
-face leather.111
-weight 25000
-name_pl leathers
-material 136
-value 500
-nrof 1
-end

Deleted: arch/trunk/misc/leather_black.arc
===================================================================
--- arch/trunk/misc/leather_black.arc 2014-10-04 20:28:48 UTC (rev 19677)
+++ arch/trunk/misc/leather_black.arc 2014-10-04 20:35:16 UTC (rev 19678)
@@ -1,8 +0,0 @@
-Object leather_black
-name black leather
-face leather_black.111
-weight 25000
-name_pl black leathers
-material 136
-value 1200
-end

Deleted: arch/trunk/misc/leather_strips.arc
===================================================================
--- arch/trunk/misc/leather_strips.arc 2014-10-04 20:28:48 UTC (rev 19677)
+++ arch/trunk/misc/leather_strips.arc 2014-10-04 20:35:16 UTC (rev 19678)
@@ -1,9 +0,0 @@
-Object leather_strips
-face leather_strips.111
-weight 500
-name leather strip
-name_pl leather strips
-material 136
-value 10
-nrof 1
-end

Deleted: arch/trunk/misc/leather_white.arc
===================================================================
--- arch/trunk/misc/leather_white.arc 2014-10-04 20:28:48 UTC (rev 19677)
+++ arch/trunk/misc/leather_white.arc 2014-10-04 20:35:16 UTC (rev 19678)
@@ -1,8 +0,0 @@
-Object leather_white
-name white leather
-face leather_white.111
-weight 25000
-material 136
-name_pl white leathers
-value 1300
-end

Copied: arch/trunk/misc/leathers.arc (from rev 19676, arch/trunk/misc/leather.arc)
===================================================================
--- arch/trunk/misc/leathers.arc (rev 0)
+++ arch/trunk/misc/leathers.arc 2014-10-04 20:35:16 UTC (rev 19678)
@@ -0,0 +1,46 @@
+# ------------------
+# Leather Items
+# ------------------
+
+# Regular
+Object leather
+face leather.111
+weight 25000
+name_pl leathers
+material 136
+value 500
+nrof 1
+end
+
+# Black
+Object leather_black
+name black leather
+face leather_black.111
+weight 25000
+name_pl black leathers
+material 136
+value 1200
+nrof 1
+end
+
+# White
+Object leather_white
+name white leather
+face leather_white.111
+weight 25000
+material 136
+name_pl white leathers
+value 1300
+nrof 1
+end
+
+# Leather strips
+Object leather_strips
+face leather_strips.111
+weight 500
+name leather strip
+name_pl leather strips
+material 136
+value 10
+nrof 1
+end

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.