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

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

Revision: 21743
          http://sourceforge.net/p/crossfire/code/21743
Author:   ryo_saeba
Date:     2021-01-08 19:30:08 +0000 (Fri, 08 Jan 2021)
Log Message:
-----------
Apply modified version of patch https://sourceforge.net/p/crossfire/patches/366/ by Titus.

Modified Paths:
--------------
    arch/trunk/ChangeLog
    arch/trunk/mapbuilding/building.trs
    arch/trunk/mapbuilding/objects.arc
    arch/trunk/mapbuilding/objects.trs

Added Paths:
-----------
    arch/trunk/mapbuilding/benches.arc
    arch/trunk/mapbuilding/benches.trs
    arch/trunk/mapbuilding/mb_burningfountain.base.111.png
    arch/trunk/mapbuilding/mb_lavawell.base.111.png
    arch/trunk/mapbuilding/mbforge_bench.base.111.png
    arch/trunk/mapbuilding/mbjeweler_bench.base.111.png
    arch/trunk/mapbuilding/mbkitchen_stove.base.111.png
    arch/trunk/mapbuilding/mbtanbench.base.111.png
    arch/trunk/mapbuilding/mbthaumaturgy_desk.base.111.png
    arch/trunk/mapbuilding/mbworkbench.base.111.png

Modified: arch/trunk/ChangeLog
===================================================================
--- arch/trunk/ChangeLog	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/ChangeLog	2021-01-08 19:30:08 UTC (rev 21743)
@@ -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

Added: arch/trunk/mapbuilding/benches.arc
===================================================================
--- arch/trunk/mapbuilding/benches.arc	                        (rev 0)
+++ arch/trunk/mapbuilding/benches.arc	2021-01-08 19:30:08 UTC (rev 21743)
@@ -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

Added: arch/trunk/mapbuilding/benches.trs
===================================================================
--- arch/trunk/mapbuilding/benches.trs	                        (rev 0)
+++ arch/trunk/mapbuilding/benches.trs	2021-01-08 19:30:08 UTC (rev 21743)
@@ -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

Modified: arch/trunk/mapbuilding/building.trs
===================================================================
--- arch/trunk/mapbuilding/building.trs	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/mapbuilding/building.trs	2021-01-08 19:30:08 UTC (rev 21743)
@@ -32,6 +32,9 @@
   list building_objects
    chance 5
   more
+  list building_benches
+   chance 1
+  more
   arch building_window
    chance 2
   more

Added: arch/trunk/mapbuilding/mb_burningfountain.base.111.png
===================================================================
(Binary files differ)

Index: arch/trunk/mapbuilding/mb_burningfountain.base.111.png
===================================================================
--- arch/trunk/mapbuilding/mb_burningfountain.base.111.png	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/mapbuilding/mb_burningfountain.base.111.png	2021-01-08 19:30:08 UTC (rev 21743)

Property changes on: arch/trunk/mapbuilding/mb_burningfountain.base.111.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/trunk/mapbuilding/mb_lavawell.base.111.png
===================================================================
(Binary files differ)

Index: arch/trunk/mapbuilding/mb_lavawell.base.111.png
===================================================================
--- arch/trunk/mapbuilding/mb_lavawell.base.111.png	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/mapbuilding/mb_lavawell.base.111.png	2021-01-08 19:30:08 UTC (rev 21743)

Property changes on: arch/trunk/mapbuilding/mb_lavawell.base.111.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/trunk/mapbuilding/mbforge_bench.base.111.png
===================================================================
(Binary files differ)

Index: arch/trunk/mapbuilding/mbforge_bench.base.111.png
===================================================================
--- arch/trunk/mapbuilding/mbforge_bench.base.111.png	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/mapbuilding/mbforge_bench.base.111.png	2021-01-08 19:30:08 UTC (rev 21743)

Property changes on: arch/trunk/mapbuilding/mbforge_bench.base.111.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/trunk/mapbuilding/mbjeweler_bench.base.111.png
===================================================================
(Binary files differ)

Index: arch/trunk/mapbuilding/mbjeweler_bench.base.111.png
===================================================================
--- arch/trunk/mapbuilding/mbjeweler_bench.base.111.png	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/mapbuilding/mbjeweler_bench.base.111.png	2021-01-08 19:30:08 UTC (rev 21743)

Property changes on: arch/trunk/mapbuilding/mbjeweler_bench.base.111.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/trunk/mapbuilding/mbkitchen_stove.base.111.png
===================================================================
(Binary files differ)

Index: arch/trunk/mapbuilding/mbkitchen_stove.base.111.png
===================================================================
--- arch/trunk/mapbuilding/mbkitchen_stove.base.111.png	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/mapbuilding/mbkitchen_stove.base.111.png	2021-01-08 19:30:08 UTC (rev 21743)

Property changes on: arch/trunk/mapbuilding/mbkitchen_stove.base.111.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/trunk/mapbuilding/mbtanbench.base.111.png
===================================================================
(Binary files differ)

Index: arch/trunk/mapbuilding/mbtanbench.base.111.png
===================================================================
--- arch/trunk/mapbuilding/mbtanbench.base.111.png	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/mapbuilding/mbtanbench.base.111.png	2021-01-08 19:30:08 UTC (rev 21743)

Property changes on: arch/trunk/mapbuilding/mbtanbench.base.111.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/trunk/mapbuilding/mbthaumaturgy_desk.base.111.png
===================================================================
(Binary files differ)

Index: arch/trunk/mapbuilding/mbthaumaturgy_desk.base.111.png
===================================================================
--- arch/trunk/mapbuilding/mbthaumaturgy_desk.base.111.png	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/mapbuilding/mbthaumaturgy_desk.base.111.png	2021-01-08 19:30:08 UTC (rev 21743)

Property changes on: arch/trunk/mapbuilding/mbthaumaturgy_desk.base.111.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: arch/trunk/mapbuilding/mbworkbench.base.111.png
===================================================================
(Binary files differ)

Index: arch/trunk/mapbuilding/mbworkbench.base.111.png
===================================================================
--- arch/trunk/mapbuilding/mbworkbench.base.111.png	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/mapbuilding/mbworkbench.base.111.png	2021-01-08 19:30:08 UTC (rev 21743)

Property changes on: arch/trunk/mapbuilding/mbworkbench.base.111.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: arch/trunk/mapbuilding/objects.arc
===================================================================
--- arch/trunk/mapbuilding/objects.arc	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/mapbuilding/objects.arc	2021-01-08 19:30:08 UTC (rev 21743)
@@ -69,3 +69,23 @@
 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

Modified: arch/trunk/mapbuilding/objects.trs
===================================================================
--- arch/trunk/mapbuilding/objects.trs	2021-01-08 15:52:29 UTC (rev 21742)
+++ arch/trunk/mapbuilding/objects.trs	2021-01-08 19:30:08 UTC (rev 21743)
@@ -19,4 +19,10 @@
   more
   arch building_altar
     chance 1
+  more
+  arch building_lava_well
+    chance 1
+  more
+  arch building_burning_fountain
+    chance 1
 end

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