diff --git a/ChangeLog b/ChangeLog index 5ee4d5cd3..78e0e2923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Apply modified version of patch https://sourceforge.net/p/crossfire/patches/366/ by Titus +After discussion on IRC, shop tile building materials as well as flaming tower +and magma were not included, deemed too specific to HW. +mapbuilding/benches.arc +mapbuilding/benches.trs +mapbuilding/building.trs +mapbuilding/mb_burningfountain.base.111.png +mapbuilding/mb_lavawell.base.111.png +mapbuilding/mbforge_bench.base.111.png +mapbuilding/mbjeweler_bench.base.111.png +mapbuilding/mbkitchen_stove.base.111.png +mapbuilding/mbtanbench.base.111.png +mapbuilding/mbthaumaturgy_desk.base.111.png +mapbuilding/mbworkbench.base.111.png +mapbuilding/objects.arc +mapbuilding/objects.trs +Nicolas Weeger 2021-01-08 New item, unlit (or burnt out) brazier light/unlit_brazier.arc diff --git a/mapbuilding/benches.arc b/mapbuilding/benches.arc new file mode 100644 index 000000000..3bb471710 --- /dev/null +++ b/mapbuilding/benches.arc @@ -0,0 +1,60 @@ +Object building_jeweler_bench +name Jeweler Bench Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbjeweler_bench.111 +slaying jeweler_bench +end +Object building_forge +name Forge Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbforge_bench.111 +slaying forge +end +Object building_kitchen_stove +name Kitchen Stove Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbkitchen_stove.111 +slaying stove +end +Object building_thaumaturgist_desk +name Thaumaturgist's Desk Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbthaumaturgy_desk.111 +slaying thaumaturg_desk +end +Object building_workbench +name Workbench Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbworkbench.111 +slaying workbench +end +Object building_tanning_bench +name Tanning Bench Material +nrof 1 +weight 2500 +value 10000 +type 161 +subtype 3 +face mbtanbench.111 +slaying tanbench +end diff --git a/mapbuilding/benches.trs b/mapbuilding/benches.trs new file mode 100644 index 000000000..77896e229 --- /dev/null +++ b/mapbuilding/benches.trs @@ -0,0 +1,19 @@ +treasureone building_benches + arch building_jeweler_bench + chance 1 + more + arch building_forge + chance 1 + more + arch building_kitchen_stove + chance 1 + more + arch building_thaumaturgist_desk + chance 1 + more + arch building_workbench + chance 1 + more + arch building_tanning_bench + chance 1 +end diff --git a/mapbuilding/building.trs b/mapbuilding/building.trs index 3fd4723cb..01e8e34c5 100644 --- a/mapbuilding/building.trs +++ b/mapbuilding/building.trs @@ -32,6 +32,9 @@ treasureone building_material list building_objects chance 5 more + list building_benches + chance 1 + more arch building_window chance 2 more diff --git a/mapbuilding/mb_burningfountain.base.111.png b/mapbuilding/mb_burningfountain.base.111.png new file mode 100644 index 000000000..ff7841228 Binary files /dev/null and b/mapbuilding/mb_burningfountain.base.111.png differ diff --git a/mapbuilding/mb_lavawell.base.111.png b/mapbuilding/mb_lavawell.base.111.png new file mode 100644 index 000000000..2efeb6029 Binary files /dev/null and b/mapbuilding/mb_lavawell.base.111.png differ diff --git a/mapbuilding/mbforge_bench.base.111.png b/mapbuilding/mbforge_bench.base.111.png new file mode 100644 index 000000000..bbdb681f8 Binary files /dev/null and b/mapbuilding/mbforge_bench.base.111.png differ diff --git a/mapbuilding/mbjeweler_bench.base.111.png b/mapbuilding/mbjeweler_bench.base.111.png new file mode 100644 index 000000000..cb8975133 Binary files /dev/null and b/mapbuilding/mbjeweler_bench.base.111.png differ diff --git a/mapbuilding/mbkitchen_stove.base.111.png b/mapbuilding/mbkitchen_stove.base.111.png new file mode 100644 index 000000000..f43f227b5 Binary files /dev/null and b/mapbuilding/mbkitchen_stove.base.111.png differ diff --git a/mapbuilding/mbtanbench.base.111.png b/mapbuilding/mbtanbench.base.111.png new file mode 100644 index 000000000..53cabf5a3 Binary files /dev/null and b/mapbuilding/mbtanbench.base.111.png differ diff --git a/mapbuilding/mbthaumaturgy_desk.base.111.png b/mapbuilding/mbthaumaturgy_desk.base.111.png new file mode 100644 index 000000000..b7286b29b Binary files /dev/null and b/mapbuilding/mbthaumaturgy_desk.base.111.png differ diff --git a/mapbuilding/mbworkbench.base.111.png b/mapbuilding/mbworkbench.base.111.png new file mode 100644 index 000000000..e2f29be97 Binary files /dev/null and b/mapbuilding/mbworkbench.base.111.png differ diff --git a/mapbuilding/objects.arc b/mapbuilding/objects.arc index 556ade80a..9a35be37c 100644 --- a/mapbuilding/objects.arc +++ b/mapbuilding/objects.arc @@ -69,3 +69,23 @@ level 30 face mbaltar_none.111 slaying altar_none end +Object building_lava_well +name Lava Well material +nrof 1 +weight 1500 +value 9500 +type 161 +subtype 3 +face mb_lavawell.111 +slaying lava_well +end +Object building_burning_fountain +name Burning Fountain material +nrof 1 +weight 1500 +value 9500 +type 161 +subtype 3 +face mb_burningfountain.111 +slaying burning_fountain +end diff --git a/mapbuilding/objects.trs b/mapbuilding/objects.trs index f6fc55f81..7f4a22d0d 100644 --- a/mapbuilding/objects.trs +++ b/mapbuilding/objects.trs @@ -19,4 +19,10 @@ treasureone building_objects more arch building_altar chance 1 + more + arch building_lava_well + chance 1 + more + arch building_burning_fountain + chance 1 end