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

[Crossfire C. r. messages. <cro...@li...>]

Revision: 21498
          http://sourceforge.net/p/crossfire/code/21498
Author:   silvernexus
Date:     2020-10-13 00:18:49 +0000 (Tue, 13 Oct 2020)
Log Message:
-----------
Move crafting containers from misc/Container/ to crafting/Container/

Modified Paths:
--------------
    arch/trunk/ChangeLog

Added Paths:
-----------
    arch/trunk/crafting/Container/
    arch/trunk/crafting/Container/cauldron.arc
    arch/trunk/crafting/Container/cauldron.base.111.png
    arch/trunk/crafting/Container/cauldron.face
    arch/trunk/crafting/Container/cauldron_open.base.111.png
    arch/trunk/crafting/Container/cauldron_open.face
    arch/trunk/crafting/Container/forge.arc
    arch/trunk/crafting/Container/forge.base.111.png
    arch/trunk/crafting/Container/forge.base.112.png
    arch/trunk/crafting/Container/forge.base.113.png
    arch/trunk/crafting/Container/forge.face
    arch/trunk/crafting/Container/jeweler_bench.arc
    arch/trunk/crafting/Container/jeweler_bench.base.111.png
    arch/trunk/crafting/Container/jeweler_bench.face
    arch/trunk/crafting/Container/stove.arc
    arch/trunk/crafting/Container/stove.base.111.png
    arch/trunk/crafting/Container/stove.base.112.png
    arch/trunk/crafting/Container/stove.base.113.png
    arch/trunk/crafting/Container/stove.face
    arch/trunk/crafting/Container/tanbench.arc
    arch/trunk/crafting/Container/tanbench.base.111.png
    arch/trunk/crafting/Container/tanbench.face
    arch/trunk/crafting/Container/thaumaturg_desk.arc
    arch/trunk/crafting/Container/thaumaturg_desk.base.111.png
    arch/trunk/crafting/Container/thaumaturg_desk.face
    arch/trunk/crafting/Container/workbench.arc
    arch/trunk/crafting/Container/workbench.base.111.png
    arch/trunk/crafting/Container/workbench.face

Removed Paths:
-------------
    arch/trunk/misc/Container/cauldron.arc
    arch/trunk/misc/Container/cauldron.base.111.png
    arch/trunk/misc/Container/cauldron.face
    arch/trunk/misc/Container/cauldron_open.base.111.png
    arch/trunk/misc/Container/cauldron_open.face
    arch/trunk/misc/Container/forge.arc
    arch/trunk/misc/Container/forge.base.111.png
    arch/trunk/misc/Container/forge.base.112.png
    arch/trunk/misc/Container/forge.base.113.png
    arch/trunk/misc/Container/forge.face
    arch/trunk/misc/Container/jeweler_bench.arc
    arch/trunk/misc/Container/jeweler_bench.base.111.png
    arch/trunk/misc/Container/jeweler_bench.face
    arch/trunk/misc/Container/stove.arc
    arch/trunk/misc/Container/stove.base.111.png
    arch/trunk/misc/Container/stove.base.112.png
    arch/trunk/misc/Container/stove.base.113.png
    arch/trunk/misc/Container/stove.face
    arch/trunk/misc/Container/tanbench.arc
    arch/trunk/misc/Container/tanbench.base.111.png
    arch/trunk/misc/Container/tanbench.face
    arch/trunk/misc/Container/thaumaturg_desk.arc
    arch/trunk/misc/Container/thaumaturg_desk.base.111.png
    arch/trunk/misc/Container/thaumaturg_desk.face
    arch/trunk/misc/Container/workbench.arc
    arch/trunk/misc/Container/workbench.base.111.png
    arch/trunk/misc/Container/workbench.face

Modified: arch/trunk/ChangeLog
===================================================================
--- arch/trunk/ChangeLog	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/ChangeLog	2020-10-13 00:18:49 UTC (rev 21498)
@@ -10,6 +10,7 @@
 crafting/Tools/slicingknife.arc
 crafting/Tools/slicingknife.base.111.png
 crafting/Tools/slicingknife.face
+crafting/Container/*
 Daniel Hawkins 2020-10-12
 
 Fix weirdness involving repeated races on dwarves.

Copied: arch/trunk/crafting/Container/cauldron.arc (from rev 21497, arch/trunk/misc/Container/cauldron.arc)
===================================================================
--- arch/trunk/crafting/Container/cauldron.arc	                        (rev 0)
+++ arch/trunk/crafting/Container/cauldron.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,33 @@
+Object cauldron
+other_arch cauldron_open
+face cauldron.111
+type 122
+material 2
+weight 80000
+container 800000
+is_cauldron 1
+Str 0
+value 18000
+name_pl cauldrons
+client_type 51
+end
+Object bad_cauldron
+name cracked cauldron
+other_arch cauldron_open
+face cauldron.111
+type 122
+material 2
+weight 20000
+container 800000
+Str -80
+value 5000
+name_pl cracked cauldrons
+client_type 51
+end
+Object cauldron_open
+name close the cauldron
+face cauldron_open.111
+type 121
+no_pick 1
+no_drop 1
+end

Copied: arch/trunk/crafting/Container/cauldron.base.111.png (from rev 21497, arch/trunk/misc/Container/cauldron.base.111.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/cauldron.face (from rev 21497, arch/trunk/misc/Container/cauldron.face)
===================================================================
--- arch/trunk/crafting/Container/cauldron.face	                        (rev 0)
+++ arch/trunk/crafting/Container/cauldron.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,3 @@
+face cauldron.111
+magicmap black
+end

Copied: arch/trunk/crafting/Container/cauldron_open.base.111.png (from rev 21497, arch/trunk/misc/Container/cauldron_open.base.111.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/cauldron_open.face (from rev 21497, arch/trunk/misc/Container/cauldron_open.face)
===================================================================
--- arch/trunk/crafting/Container/cauldron_open.face	                        (rev 0)
+++ arch/trunk/crafting/Container/cauldron_open.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,3 @@
+face cauldron_open.111
+magicmap black
+end

Copied: arch/trunk/crafting/Container/forge.arc (from rev 21497, arch/trunk/misc/Container/forge.arc)
===================================================================
--- arch/trunk/crafting/Container/forge.arc	                        (rev 0)
+++ arch/trunk/crafting/Container/forge.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,17 @@
+Object forge
+face forge.111
+animation forge
+anim_speed 5
+client_anim_random 1
+glow_radius 1
+no_pick 1
+type 122
+material 66
+weight 80000
+container 800000
+is_cauldron 1
+Str 0
+value 18000
+name_pl forges
+client_type 51
+end

Copied: arch/trunk/crafting/Container/forge.base.111.png (from rev 21497, arch/trunk/misc/Container/forge.base.111.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/forge.base.112.png (from rev 21497, arch/trunk/misc/Container/forge.base.112.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/forge.base.113.png (from rev 21497, arch/trunk/misc/Container/forge.base.113.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/forge.face (from rev 21497, arch/trunk/misc/Container/forge.face)
===================================================================
--- arch/trunk/crafting/Container/forge.face	                        (rev 0)
+++ arch/trunk/crafting/Container/forge.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,14 @@
+animation forge
+forge.111
+forge.112
+forge.113
+mina
+face forge.111
+magicmap black
+end
+face forge.112
+magicmap black
+end
+face forge.113
+magicmap black
+end

Copied: arch/trunk/crafting/Container/jeweler_bench.arc (from rev 21497, arch/trunk/misc/Container/jeweler_bench.arc)
===================================================================
--- arch/trunk/crafting/Container/jeweler_bench.arc	                        (rev 0)
+++ arch/trunk/crafting/Container/jeweler_bench.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,14 @@
+Object jeweler_bench
+face jeweler_bench.111
+name jeweler's workbench
+no_pick 1
+type 122
+material 16
+weight 80000
+container 800000
+is_cauldron 1
+Str 0
+value 18000
+name_pl jeweler's workbenches
+client_type 51
+end

Copied: arch/trunk/crafting/Container/jeweler_bench.base.111.png (from rev 21497, arch/trunk/misc/Container/jeweler_bench.base.111.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/jeweler_bench.face (from rev 21497, arch/trunk/misc/Container/jeweler_bench.face)
===================================================================
--- arch/trunk/crafting/Container/jeweler_bench.face	                        (rev 0)
+++ arch/trunk/crafting/Container/jeweler_bench.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,3 @@
+face jeweler_bench.111
+magicmap black
+end

Copied: arch/trunk/crafting/Container/stove.arc (from rev 21497, arch/trunk/misc/Container/stove.arc)
===================================================================
--- arch/trunk/crafting/Container/stove.arc	                        (rev 0)
+++ arch/trunk/crafting/Container/stove.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,17 @@
+Object stove
+face stove.111
+animation stove
+anim_speed 5
+client_anim_random 1
+glow_radius 1
+no_pick 1
+type 122
+material 66
+weight 80000
+container 800000
+is_cauldron 1
+Str 0
+value 18000
+name_pl stoves
+client_type 51
+end

Copied: arch/trunk/crafting/Container/stove.base.111.png (from rev 21497, arch/trunk/misc/Container/stove.base.111.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/stove.base.112.png (from rev 21497, arch/trunk/misc/Container/stove.base.112.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/stove.base.113.png (from rev 21497, arch/trunk/misc/Container/stove.base.113.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/stove.face (from rev 21497, arch/trunk/misc/Container/stove.face)
===================================================================
--- arch/trunk/crafting/Container/stove.face	                        (rev 0)
+++ arch/trunk/crafting/Container/stove.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,14 @@
+animation stove
+stove.111
+stove.112
+stove.113
+mina
+face stove.111
+magicmap black
+end
+face stove.112
+magicmap black
+end
+face stove.113
+magicmap black
+end

Copied: arch/trunk/crafting/Container/tanbench.arc (from rev 21497, arch/trunk/misc/Container/tanbench.arc)
===================================================================
--- arch/trunk/crafting/Container/tanbench.arc	                        (rev 0)
+++ arch/trunk/crafting/Container/tanbench.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,15 @@
+Object tanbench
+name tanning bench
+face tanbench.111
+no_pick 1
+type 122
+material 16
+weight 35000
+# Bumped up to 360 kg to hold behemoth's hide
+container 360000
+is_cauldron 1
+Str 0
+value 18000
+name_pl tanning benches
+client_type 51
+end

Copied: arch/trunk/crafting/Container/tanbench.base.111.png (from rev 21497, arch/trunk/misc/Container/tanbench.base.111.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/tanbench.face (from rev 21497, arch/trunk/misc/Container/tanbench.face)
===================================================================
--- arch/trunk/crafting/Container/tanbench.face	                        (rev 0)
+++ arch/trunk/crafting/Container/tanbench.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,3 @@
+face tanbench.111
+magicmap black
+end

Copied: arch/trunk/crafting/Container/thaumaturg_desk.arc (from rev 21497, arch/trunk/misc/Container/thaumaturg_desk.arc)
===================================================================
--- arch/trunk/crafting/Container/thaumaturg_desk.arc	                        (rev 0)
+++ arch/trunk/crafting/Container/thaumaturg_desk.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,14 @@
+Object thaumaturg_desk
+face thaumaturg_desk.111
+name thaumaturgist's desk
+no_pick 1
+type 122
+material 16
+weight 80000
+container 800000
+is_cauldron 1
+Str 0
+value 18000
+name_pl thaumaturgist's desks
+client_type 51
+end

Copied: arch/trunk/crafting/Container/thaumaturg_desk.base.111.png (from rev 21497, arch/trunk/misc/Container/thaumaturg_desk.base.111.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/thaumaturg_desk.face (from rev 21497, arch/trunk/misc/Container/thaumaturg_desk.face)
===================================================================
--- arch/trunk/crafting/Container/thaumaturg_desk.face	                        (rev 0)
+++ arch/trunk/crafting/Container/thaumaturg_desk.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,3 @@
+face thaumaturg_desk.111
+magicmap black
+end

Copied: arch/trunk/crafting/Container/workbench.arc (from rev 21497, arch/trunk/misc/Container/workbench.arc)
===================================================================
--- arch/trunk/crafting/Container/workbench.arc	                        (rev 0)
+++ arch/trunk/crafting/Container/workbench.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,14 @@
+Object workbench
+name workbench
+face workbench.111
+no_pick 1
+type 122
+material 16
+weight 80000
+container 800000
+is_cauldron 1
+Str 0
+value 18000
+name_pl workbenches
+client_type 51
+end

Copied: arch/trunk/crafting/Container/workbench.base.111.png (from rev 21497, arch/trunk/misc/Container/workbench.base.111.png)
===================================================================
(Binary files differ)

Copied: arch/trunk/crafting/Container/workbench.face (from rev 21497, arch/trunk/misc/Container/workbench.face)
===================================================================
--- arch/trunk/crafting/Container/workbench.face	                        (rev 0)
+++ arch/trunk/crafting/Container/workbench.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -0,0 +1,3 @@
+face workbench.111
+magicmap black
+end

Deleted: arch/trunk/misc/Container/cauldron.arc
===================================================================
--- arch/trunk/misc/Container/cauldron.arc	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/cauldron.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,33 +0,0 @@
-Object cauldron
-other_arch cauldron_open
-face cauldron.111
-type 122
-material 2
-weight 80000
-container 800000
-is_cauldron 1
-Str 0
-value 18000
-name_pl cauldrons
-client_type 51
-end
-Object bad_cauldron
-name cracked cauldron
-other_arch cauldron_open
-face cauldron.111
-type 122
-material 2
-weight 20000
-container 800000
-Str -80
-value 5000
-name_pl cracked cauldrons
-client_type 51
-end
-Object cauldron_open
-name close the cauldron
-face cauldron_open.111
-type 121
-no_pick 1
-no_drop 1
-end

Deleted: arch/trunk/misc/Container/cauldron.base.111.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/cauldron.face
===================================================================
--- arch/trunk/misc/Container/cauldron.face	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/cauldron.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,3 +0,0 @@
-face cauldron.111
-magicmap black
-end

Deleted: arch/trunk/misc/Container/cauldron_open.base.111.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/cauldron_open.face
===================================================================
--- arch/trunk/misc/Container/cauldron_open.face	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/cauldron_open.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,3 +0,0 @@
-face cauldron_open.111
-magicmap black
-end

Deleted: arch/trunk/misc/Container/forge.arc
===================================================================
--- arch/trunk/misc/Container/forge.arc	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/forge.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,17 +0,0 @@
-Object forge
-face forge.111
-animation forge
-anim_speed 5
-client_anim_random 1
-glow_radius 1
-no_pick 1
-type 122
-material 66
-weight 80000
-container 800000
-is_cauldron 1
-Str 0
-value 18000
-name_pl forges
-client_type 51
-end

Deleted: arch/trunk/misc/Container/forge.base.111.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/forge.base.112.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/forge.base.113.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/forge.face
===================================================================
--- arch/trunk/misc/Container/forge.face	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/forge.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,14 +0,0 @@
-animation forge
-forge.111
-forge.112
-forge.113
-mina
-face forge.111
-magicmap black
-end
-face forge.112
-magicmap black
-end
-face forge.113
-magicmap black
-end

Deleted: arch/trunk/misc/Container/jeweler_bench.arc
===================================================================
--- arch/trunk/misc/Container/jeweler_bench.arc	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/jeweler_bench.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,14 +0,0 @@
-Object jeweler_bench
-face jeweler_bench.111
-name jeweler's workbench
-no_pick 1
-type 122
-material 16
-weight 80000
-container 800000
-is_cauldron 1
-Str 0
-value 18000
-name_pl jeweler's workbenches
-client_type 51
-end

Deleted: arch/trunk/misc/Container/jeweler_bench.base.111.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/jeweler_bench.face
===================================================================
--- arch/trunk/misc/Container/jeweler_bench.face	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/jeweler_bench.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,3 +0,0 @@
-face jeweler_bench.111
-magicmap black
-end

Deleted: arch/trunk/misc/Container/stove.arc
===================================================================
--- arch/trunk/misc/Container/stove.arc	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/stove.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,17 +0,0 @@
-Object stove
-face stove.111
-animation stove
-anim_speed 5
-client_anim_random 1
-glow_radius 1
-no_pick 1
-type 122
-material 66
-weight 80000
-container 800000
-is_cauldron 1
-Str 0
-value 18000
-name_pl stoves
-client_type 51
-end

Deleted: arch/trunk/misc/Container/stove.base.111.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/stove.base.112.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/stove.base.113.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/stove.face
===================================================================
--- arch/trunk/misc/Container/stove.face	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/stove.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,14 +0,0 @@
-animation stove
-stove.111
-stove.112
-stove.113
-mina
-face stove.111
-magicmap black
-end
-face stove.112
-magicmap black
-end
-face stove.113
-magicmap black
-end

Deleted: arch/trunk/misc/Container/tanbench.arc
===================================================================
--- arch/trunk/misc/Container/tanbench.arc	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/tanbench.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,15 +0,0 @@
-Object tanbench
-name tanning bench
-face tanbench.111
-no_pick 1
-type 122
-material 16
-weight 35000
-# Bumped up to 360 kg to hold behemoth's hide
-container 360000
-is_cauldron 1
-Str 0
-value 18000
-name_pl tanning benches
-client_type 51
-end

Deleted: arch/trunk/misc/Container/tanbench.base.111.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/tanbench.face
===================================================================
--- arch/trunk/misc/Container/tanbench.face	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/tanbench.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,3 +0,0 @@
-face tanbench.111
-magicmap black
-end

Deleted: arch/trunk/misc/Container/thaumaturg_desk.arc
===================================================================
--- arch/trunk/misc/Container/thaumaturg_desk.arc	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/thaumaturg_desk.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,14 +0,0 @@
-Object thaumaturg_desk
-face thaumaturg_desk.111
-name thaumaturgist's desk
-no_pick 1
-type 122
-material 16
-weight 80000
-container 800000
-is_cauldron 1
-Str 0
-value 18000
-name_pl thaumaturgist's desks
-client_type 51
-end

Deleted: arch/trunk/misc/Container/thaumaturg_desk.base.111.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/thaumaturg_desk.face
===================================================================
--- arch/trunk/misc/Container/thaumaturg_desk.face	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/thaumaturg_desk.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,3 +0,0 @@
-face thaumaturg_desk.111
-magicmap black
-end

Deleted: arch/trunk/misc/Container/workbench.arc
===================================================================
--- arch/trunk/misc/Container/workbench.arc	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/workbench.arc	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,14 +0,0 @@
-Object workbench
-name workbench
-face workbench.111
-no_pick 1
-type 122
-material 16
-weight 80000
-container 800000
-is_cauldron 1
-Str 0
-value 18000
-name_pl workbenches
-client_type 51
-end

Deleted: arch/trunk/misc/Container/workbench.base.111.png
===================================================================
(Binary files differ)

Deleted: arch/trunk/misc/Container/workbench.face
===================================================================
--- arch/trunk/misc/Container/workbench.face	2020-10-13 00:04:18 UTC (rev 21497)
+++ arch/trunk/misc/Container/workbench.face	2020-10-13 00:18:49 UTC (rev 21498)
@@ -1,3 +0,0 @@
-face workbench.111
-magicmap black
-end

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