From 7dac300e1b841341c11c1c5f64a4a4cca9989bab Mon Sep 17 00:00:00 2001 From: partmedia Date: Sat, 4 Oct 2014 20:35:16 +0000 Subject: [PATCH] Combine generic hides and leathers into a single file Also fix stacking for colored leathers git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@19678 282e977c-c81d-0410-88c4-b93c2d0d6712 --- flesh/generic/hide_black.arc | 9 ------- flesh/generic/hide_brown.arc | 9 ------- flesh/generic/hide_grey.arc | 9 ------- flesh/generic/hide_white.arc | 9 ------- flesh/generic/hides.arc | 47 ++++++++++++++++++++++++++++++++++++ misc/leather.arc | 8 ------ misc/leather_black.arc | 8 ------ misc/leather_strips.arc | 9 ------- misc/leather_white.arc | 8 ------ misc/leathers.arc | 46 +++++++++++++++++++++++++++++++++++ 10 files changed, 93 insertions(+), 69 deletions(-) delete mode 100644 flesh/generic/hide_black.arc delete mode 100644 flesh/generic/hide_brown.arc delete mode 100644 flesh/generic/hide_grey.arc delete mode 100644 flesh/generic/hide_white.arc create mode 100644 flesh/generic/hides.arc delete mode 100644 misc/leather.arc delete mode 100644 misc/leather_black.arc delete mode 100644 misc/leather_strips.arc delete mode 100644 misc/leather_white.arc create mode 100644 misc/leathers.arc diff --git a/flesh/generic/hide_black.arc b/flesh/generic/hide_black.arc deleted file mode 100644 index 27e82a77a..000000000 --- a/flesh/generic/hide_black.arc +++ /dev/null @@ -1,9 +0,0 @@ -Object hide_black -name hide -nrof 1 -face hide_black.111 -material 32 -type 72 -weight 20 -value 300 -end diff --git a/flesh/generic/hide_brown.arc b/flesh/generic/hide_brown.arc deleted file mode 100644 index 7b79b68f8..000000000 --- a/flesh/generic/hide_brown.arc +++ /dev/null @@ -1,9 +0,0 @@ -Object hide_brown -name hide -nrof 1 -face hide_brown.111 -material 32 -type 72 -weight 20 -value 300 -end diff --git a/flesh/generic/hide_grey.arc b/flesh/generic/hide_grey.arc deleted file mode 100644 index 190b9698a..000000000 --- a/flesh/generic/hide_grey.arc +++ /dev/null @@ -1,9 +0,0 @@ -Object hide_grey -name hide -nrof 1 -face hide_grey.111 -material 32 -type 72 -weight 20 -value 300 -end diff --git a/flesh/generic/hide_white.arc b/flesh/generic/hide_white.arc deleted file mode 100644 index f4bd866e3..000000000 --- a/flesh/generic/hide_white.arc +++ /dev/null @@ -1,9 +0,0 @@ -Object hide_white -name hide -nrof 1 -face hide_white.111 -material 32 -type 72 -weight 20 -value 300 -end diff --git a/flesh/generic/hides.arc b/flesh/generic/hides.arc new file mode 100644 index 000000000..a2730f487 --- /dev/null +++ b/flesh/generic/hides.arc @@ -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 diff --git a/misc/leather.arc b/misc/leather.arc deleted file mode 100644 index 688848e70..000000000 --- a/misc/leather.arc +++ /dev/null @@ -1,8 +0,0 @@ -Object leather -face leather.111 -weight 25000 -name_pl leathers -material 136 -value 500 -nrof 1 -end diff --git a/misc/leather_black.arc b/misc/leather_black.arc deleted file mode 100644 index 4f184edc7..000000000 --- a/misc/leather_black.arc +++ /dev/null @@ -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 diff --git a/misc/leather_strips.arc b/misc/leather_strips.arc deleted file mode 100644 index f4ea5704e..000000000 --- a/misc/leather_strips.arc +++ /dev/null @@ -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 diff --git a/misc/leather_white.arc b/misc/leather_white.arc deleted file mode 100644 index 321d2789e..000000000 --- a/misc/leather_white.arc +++ /dev/null @@ -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 diff --git a/misc/leathers.arc b/misc/leathers.arc new file mode 100644 index 000000000..e85cce0f9 --- /dev/null +++ b/misc/leathers.arc @@ -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