Make furniture non weapon, and non mergeable. Should fix bug #2816526: Monsters pick up tables.
git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@15244 282e977c-c81d-0410-88c4-b93c2d0d6712master
parent
7d8512b0fe
commit
4b3139fcb3
|
@ -1,15 +1,9 @@
|
|||
Object bed_1
|
||||
name bed
|
||||
face bed_1.111
|
||||
type 15
|
||||
dam 12
|
||||
last_sp 19
|
||||
weight 200000
|
||||
value 35
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl beds
|
||||
client_type 8002
|
||||
body_arm -2
|
||||
skill two handed weapons
|
||||
end
|
||||
|
|
|
@ -1,14 +1,8 @@
|
|||
Object chair
|
||||
face chair.111
|
||||
weight 40000
|
||||
last_sp 16
|
||||
value 20
|
||||
type 15
|
||||
material 16
|
||||
dam 4
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -1,60 +1,36 @@
|
|||
Object chair_1.1
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_1.101
|
||||
value 25
|
||||
type 15
|
||||
material 16
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_1.2
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_1.111
|
||||
value 25
|
||||
type 15
|
||||
material 16
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_1.3
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_1.121
|
||||
value 25
|
||||
type 15
|
||||
material 16
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_1.4
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_1.131
|
||||
value 25
|
||||
type 15
|
||||
material 16
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -1,63 +1,39 @@
|
|||
Object chair_2.1
|
||||
name chair
|
||||
weight 50000
|
||||
last_sp 18
|
||||
face chair_2.101
|
||||
value 25
|
||||
type 15
|
||||
material 16
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
||||
Object chair_2.2
|
||||
name chair
|
||||
weight 50000
|
||||
last_sp 18
|
||||
face chair_2.111
|
||||
value 25
|
||||
type 15
|
||||
material 16
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
||||
Object chair_2.3
|
||||
name chair
|
||||
weight 50000
|
||||
last_sp 18
|
||||
face chair_2.121
|
||||
value 25
|
||||
type 15
|
||||
material 16
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
||||
Object chair_2.4
|
||||
name chair
|
||||
weight 50000
|
||||
last_sp 18
|
||||
face chair_2.131
|
||||
value 25
|
||||
type 15
|
||||
material 16
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -1,31 +1,19 @@
|
|||
Object chair_3.1
|
||||
name chair
|
||||
weight 60000
|
||||
last_sp 19
|
||||
face chair_3.101
|
||||
value 25
|
||||
type 15
|
||||
material 16
|
||||
dam 6
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
||||
Object chair_3.2
|
||||
name chair
|
||||
weight 60000
|
||||
last_sp 19
|
||||
face chair_3.111
|
||||
value 25
|
||||
type 15
|
||||
material 16
|
||||
dam 6
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -1,67 +1,43 @@
|
|||
Object chair_bc_2.1
|
||||
name chair
|
||||
weight 50000
|
||||
last_sp 18
|
||||
face chair_bc_2.101
|
||||
value 1600
|
||||
type 15
|
||||
material 16
|
||||
materialname satin covered wood
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
||||
Object chair_bc_2.2
|
||||
name chair
|
||||
weight 50000
|
||||
last_sp 18
|
||||
face chair_bc_2.111
|
||||
value 1600
|
||||
type 15
|
||||
material 16
|
||||
materialname satin covered wood
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
||||
Object chair_bc_2.3
|
||||
name chair
|
||||
weight 50000
|
||||
last_sp 18
|
||||
face chair_bc_2.121
|
||||
value 1600
|
||||
type 15
|
||||
material 16
|
||||
materialname satin covered wood
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
||||
Object chair_bc_2.4
|
||||
name chair
|
||||
weight 50000
|
||||
last_sp 18
|
||||
face chair_bc_2.131
|
||||
value 1600
|
||||
type 15
|
||||
material 16
|
||||
materialname satin covered wood
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -1,64 +1,40 @@
|
|||
Object chair_cw_1.1
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_cw_1.101
|
||||
value 150
|
||||
type 15
|
||||
material 16
|
||||
materialname cherry
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_cw_1.2
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_cw_1.111
|
||||
value 150
|
||||
type 15
|
||||
material 16
|
||||
materialname cherry
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_cw_1.3
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_cw_1.121
|
||||
value 150
|
||||
type 15
|
||||
material 16
|
||||
materialname cherry
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_cw_1.4
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_cw_1.131
|
||||
value 150
|
||||
type 15
|
||||
material 16
|
||||
materialname cherry
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -1,64 +1,40 @@
|
|||
Object chair_gv_1.1
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_gv_1.101
|
||||
value 45000
|
||||
type 15
|
||||
material 2
|
||||
materialname gold
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_gv_1.2
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_gv_1.111
|
||||
value 45000
|
||||
type 15
|
||||
material 2
|
||||
materialname gold
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_gv_1.3
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_gv_1.121
|
||||
value 45000
|
||||
type 15
|
||||
material 2
|
||||
materialname gold
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_gv_1.4
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_gv_1.131
|
||||
value 45000
|
||||
type 15
|
||||
material 2
|
||||
materialname gold
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -1,64 +1,40 @@
|
|||
Object chair_wv_1.1
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_wv_1.101
|
||||
value 25000
|
||||
type 15
|
||||
material 16
|
||||
materialname velvet covered wood
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_wv_1.2
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_wv_1.111
|
||||
value 25000
|
||||
type 15
|
||||
material 16
|
||||
materialname velvet covered wood
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_wv_1.3
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_wv_1.121
|
||||
value 25000
|
||||
type 15
|
||||
material 16
|
||||
materialname velvet covered wood
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
Object chair_wv_1.4
|
||||
name chair
|
||||
weight 45000
|
||||
last_sp 17
|
||||
face chair_wv_1.131
|
||||
value 25000
|
||||
type 15
|
||||
material 16
|
||||
materialname velvet covered wood
|
||||
dam 5
|
||||
nrof 1
|
||||
name_pl chairs
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -1,14 +1,8 @@
|
|||
Object table
|
||||
face table_1.111
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 80000
|
||||
value 30
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -2,33 +2,21 @@ Object table_1x2
|
|||
name large table
|
||||
face table_1x2.111
|
||||
no_pick 1
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 150000
|
||||
value 55
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
More
|
||||
Object table_1x2_2
|
||||
name large table
|
||||
face table_1x2.111
|
||||
no_pick 1
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 150000
|
||||
value 55
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
y 1
|
||||
end
|
||||
|
|
|
@ -1,15 +1,9 @@
|
|||
Object table_2
|
||||
name table
|
||||
face table_2.111
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 80000
|
||||
value 30
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -2,33 +2,21 @@ Object table_2x1
|
|||
name long table
|
||||
face table_2x1.111
|
||||
no_pick 1
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 150000
|
||||
value 55
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
More
|
||||
Object table_2x1_2
|
||||
name long table
|
||||
face table_2x1.111
|
||||
no_pick 1
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 150000
|
||||
value 55
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
x 1
|
||||
end
|
||||
|
|
|
@ -2,34 +2,22 @@ Object table_2x2
|
|||
name big table
|
||||
face table_2x2.111
|
||||
no_pick 1
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 300000
|
||||
value 100
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
More
|
||||
Object table_2x2_2
|
||||
name big table
|
||||
face table_2x2.111
|
||||
no_pick 1
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 300000
|
||||
value 100
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
x 1
|
||||
end
|
||||
More
|
||||
|
@ -37,17 +25,11 @@ Object table_2x2_3
|
|||
name big table
|
||||
face table_2x2.111
|
||||
no_pick 1
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 300000
|
||||
value 100
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
y 1
|
||||
end
|
||||
More
|
||||
|
@ -55,17 +37,11 @@ Object table_2x2_4
|
|||
name big table
|
||||
face table_2x2.111
|
||||
no_pick 1
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 300000
|
||||
value 100
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
x 1
|
||||
y 1
|
||||
end
|
||||
|
|
|
@ -1,15 +1,9 @@
|
|||
Object table_3
|
||||
name table
|
||||
face table_3.111
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 80000
|
||||
value 30
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -1,15 +1,9 @@
|
|||
Object table_4
|
||||
name table
|
||||
face table_4.111
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 80000
|
||||
value 30
|
||||
material 16
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -1,16 +1,10 @@
|
|||
Object table_burl_3
|
||||
name table
|
||||
face table_burl_3.111
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 80000
|
||||
value 12000
|
||||
material 16
|
||||
materialname burlwood
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
|
@ -1,16 +1,10 @@
|
|||
Object table_cw_3
|
||||
name table
|
||||
face table_cw_3.111
|
||||
type 15
|
||||
dam 10
|
||||
last_sp 19
|
||||
weight 80000
|
||||
value 420
|
||||
material 16
|
||||
materialname cherry
|
||||
nrof 1
|
||||
name_pl tables
|
||||
client_type 8002
|
||||
skill two handed weapons
|
||||
body_arm -2
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue