[Widelands-cvs] SF.net SVN: widelands:[3232] trunk

[<nas...@us...>]

Revision: 3232
          http://widelands.svn.sourceforge.net/widelands/?rev=3232&view=rev
Author:   nasenbaer_peter
Date:     2008-07-30 20:53:52 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
* Move all remaining old sounds to "sound", update and add more sound-entries to tribes configs

Modified Paths:
--------------
    trunk/tribes/atlantids/workers/farmer/conf
    trunk/tribes/atlantids/workers/woodcutter/conf
    trunk/tribes/barbarians/workers/farmer/conf
    trunk/tribes/barbarians/workers/lumberjack/conf
    trunk/tribes/barbarians/workers/stonemason/conf
    trunk/tribes/empire/buildings/farm/conf
    trunk/tribes/empire/buildings/headquarters/conf
    trunk/tribes/empire/buildings/mill/conf
    trunk/tribes/empire/buildings/piggery/conf
    trunk/tribes/empire/buildings/sawmill/conf
    trunk/tribes/empire/buildings/sheepfarm/conf
    trunk/tribes/empire/buildings/stonemason/conf
    trunk/tribes/empire/buildings/toolsmith/conf
    trunk/tribes/empire/buildings/warehouse/conf
    trunk/tribes/empire/buildings/weaponsmith/conf
    trunk/tribes/empire/workers/farmer/conf
    trunk/tribes/empire/workers/fisher/conf
    trunk/tribes/empire/workers/geologist/conf
    trunk/tribes/empire/workers/lumberjack/conf
    trunk/tribes/empire/workers/stonemason/conf
    trunk/worlds/blackland/bobs/sheep/conf
    trunk/worlds/desert/bobs/sheep/conf
    trunk/worlds/greenland/bobs/sheep/conf
    trunk/worlds/winterland/bobs/sheep/conf

Added Paths:
-----------
    trunk/sound/farm/sheep_00.ogg
    trunk/sound/mill/
    trunk/sound/mill/mill_turning_00.ogg
    trunk/sound/mill/mill_turning_01.ogg
    trunk/sound/woodcutting/fast_woodcutting_00.ogg
    trunk/sound/woodcutting/fast_woodcutting_01.ogg
    trunk/sound/woodcutting/fast_woodcutting_02.ogg
    trunk/sound/woodcutting/fast_woodcutting_03.ogg

Removed Paths:
-------------
    trunk/tribes/empire/buildings/farm/farm_animal_00.ogg
    trunk/tribes/empire/buildings/farm/farm_animal_01.ogg
    trunk/tribes/empire/buildings/headquarters/warehouse-bringitin_00.ogg
    trunk/tribes/empire/buildings/mill/mill_turning_00.ogg
    trunk/tribes/empire/buildings/mill/mill_turning_01.ogg
    trunk/tribes/empire/buildings/sawmill/sawmill_00.ogg
    trunk/tribes/empire/buildings/sawmill/sawmill_01.ogg
    trunk/tribes/empire/buildings/stonemason/stonemason_00.ogg
    trunk/tribes/empire/buildings/warehouse/warehouse-bringitin_00.ogg
    trunk/tribes/empire/workers/fisher/fisher_pull_net_00.ogg
    trunk/tribes/empire/workers/fisher/fisher_throw_net_00.ogg
    trunk/tribes/empire/workers/geologist/geologist_hammer_00.ogg
    trunk/tribes/empire/workers/lumberjack/lumberjack_01.ogg
    trunk/tribes/empire/workers/lumberjack/lumberjack_02.ogg
    trunk/tribes/empire/workers/lumberjack/lumberjack_03.ogg
    trunk/tribes/empire/workers/lumberjack/lumberjack_04.ogg
    trunk/tribes/empire/workers/lumberjack/timber_00.ogg
    trunk/tribes/empire/workers/lumberjack/timber_01.ogg
    trunk/tribes/empire/workers/stonemason/stonemason_00.ogg
    trunk/worlds/blackland/bobs/sheep/sheep_00.ogg
    trunk/worlds/desert/bobs/sheep/sheep_00.ogg
    trunk/worlds/greenland/bobs/sheep/sheep_00.ogg
    trunk/worlds/winterland/bobs/sheep/sheep_00.ogg


Property changes on: trunk/sound/farm/sheep_00.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: trunk/sound/mill/mill_turning_00.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: trunk/sound/mill/mill_turning_01.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: trunk/sound/woodcutting/fast_woodcutting_00.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: trunk/sound/woodcutting/fast_woodcutting_01.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: trunk/sound/woodcutting/fast_woodcutting_02.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: trunk/sound/woodcutting/fast_woodcutting_03.ogg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/tribes/atlantids/workers/farmer/conf
===================================================================
--- trunk/tribes/atlantids/workers/farmer/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/atlantids/workers/farmer/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -23,7 +23,7 @@
 [harvest]
 0=findobject attrib:cornfield radius:2
 1=walk object
-2=playFX ../../../../sound/farm/scythe 192
+2=playFX ../../../../sound/farm/scythe 220
 3=animation idle 10000
 4=object harvest
 5=animation idle 2000

Modified: trunk/tribes/atlantids/workers/woodcutter/conf
===================================================================
--- trunk/tribes/atlantids/workers/woodcutter/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/atlantids/workers/woodcutter/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -4,6 +4,7 @@
 type=generic
 menu_pic=menu.png
 program=harvest
+soundfx=../../../../sound/sawmill/sawmill
 
 [buildcost]
 carrier=1
@@ -12,11 +13,12 @@
 [harvest]
 0=findobject attrib:tree radius:8
 1=walk object
-2=animation sawing 10000
-3=object fall
-4=animation idle 2000
-5=createitem trunk
-6=return
+2=playFX ../../../../sound/sawmill/sawmill 230
+3=animation sawing 10000
+4=object fall
+5=animation idle 2000
+6=createitem trunk
+7=return
 
 [sawing]
 pics=sawing_??.png

Modified: trunk/tribes/barbarians/workers/farmer/conf
===================================================================
--- trunk/tribes/barbarians/workers/farmer/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/barbarians/workers/farmer/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -23,7 +23,7 @@
 [harvest]
 0=findobject attrib:barbarian_field radius:2
 1=walk object
-2=playFX ../../../../sound/smiths/scythe 192
+2=playFX ../../../../sound/farm/scythe 220
 3=animation idle 10000
 4=object harvest
 5=animation idle 2000

Modified: trunk/tribes/barbarians/workers/lumberjack/conf
===================================================================
--- trunk/tribes/barbarians/workers/lumberjack/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/barbarians/workers/lumberjack/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -4,7 +4,7 @@
 type=generic
 menu_pic=lumberjack_menu.png
 program=chop
-soundfx=../../../../sound/speach/timber
+soundfx=../../../../sound/spoken/timber
 soundfx=../../../../sound/woodcutting/woodcutting
 
 [buildcost]
@@ -14,9 +14,9 @@
 [chop]
 0=findobject attrib:tree radius:8
 1=walk object
-2=playFX ../../../../sound/woodcutting/woodcutting 192
+2=playFX ../../../../sound/woodcutting/woodcutting 255
 3=animation hacking 10000
-4=playFX ../../../../sound/speach/timber 192
+4=playFX ../../../../sound/spoken/timber 192
 5=object fall
 6=animation idle 2000
 7=createitem trunk

Modified: trunk/tribes/barbarians/workers/stonemason/conf
===================================================================
--- trunk/tribes/barbarians/workers/stonemason/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/barbarians/workers/stonemason/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -1,5 +1,6 @@
 [global]
 descname=_Stonemason
+soundfx=../../../../sound/stonecutting/stonecutter
 help=Cuts raw pieces of granit out of laying stones.
 type=generic
 menu_pic=stonemason_menu.png
@@ -12,10 +13,11 @@
 [cut]
 0=findobject attrib:stone radius:6
 1=walk object
-2=animation hacking 10000
-3=object shrink
-4=createitem raw_stone
-5=return
+2=playFX ../../../../sound/stonecutting/stonecutter 192
+3=animation hacking 10000
+4=object shrink
+5=createitem raw_stone
+6=return
 
 [idle]
 pics=idle_??.png

Modified: trunk/tribes/empire/buildings/farm/conf
===================================================================
--- trunk/tribes/empire/buildings/farm/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/buildings/farm/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -1,6 +1,6 @@
 [global]
 descname=_ Farm
-soundfx=farm_animal
+soundfx=../../../../sound/farm/farm_animal
 type=production
 size=big
 buildable=yes
@@ -16,7 +16,7 @@
 0=set +nostats
 1=call plant
 2=call harvest
-3=playFX farm_animal 192
+3=playFX ../../../../sound/farm/farm_animal 192
 
 [plant]
 0=set +catch

Modified: trunk/tribes/empire/buildings/headquarters/conf
===================================================================
--- trunk/tribes/empire/buildings/headquarters/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/buildings/headquarters/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -1,6 +1,6 @@
 [global]
 descname=_ Headquarters
-soundfx=warehouse-bringitin
+soundfx=../../../../sound/spoken/warehouse-bringitin
 type=warehouse
 size=big
 buildable=no
@@ -10,5 +10,5 @@
 [idle]
 pics=hq_i_??.png
 sfx_frame=0
-sfx_name=warehouse-bringitin
+sfx_name=../../../../sound/spoken/warehouse-bringitin
 hotspot=95 110

Modified: trunk/tribes/empire/buildings/mill/conf
===================================================================
--- trunk/tribes/empire/buildings/mill/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/buildings/mill/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -8,7 +8,7 @@
 program=work
 output=flour
 stopable=yes
-soundfx=mill_turning
+soundfx=../../../../sound/mill/mill_turning
 
 [inputs]
 wheat=6
@@ -17,7 +17,7 @@
 0=sleep 5000
 1=check wheat
 2=consume wheat
-3=playFX mill_turning 192
+3=playFX ../../../../sound/mill/mill_turning 240
 4=animation working 10000
 5=produce flour
 

Modified: trunk/tribes/empire/buildings/piggery/conf
===================================================================
--- trunk/tribes/empire/buildings/piggery/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/buildings/piggery/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -1,5 +1,6 @@
 [global]
 descname=_ Piggery
+soundfx=../../../../sound/farm/farm_animal
 type=production
 size=big
 buildable=yes
@@ -18,8 +19,9 @@
 2=check water
 3=consume wheat
 4=consume water
-5=animation working 30000
-6=produce meat
+5=playFX soundfx=../../../../sound/farm/farm_animal 180
+6=animation working 30000
+7=produce meat
 
 [buildcost]
 trunk=2

Modified: trunk/tribes/empire/buildings/sawmill/conf
===================================================================
--- trunk/tribes/empire/buildings/sawmill/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/buildings/sawmill/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -8,7 +8,7 @@
 worker=toolsmith # like Toolsmith's Workshop
 program=work
 output=wood
-soundfx=sawmill
+soundfx=../../../../sound/sawmill/sawmill
 
 [inputs]
 trunk=8
@@ -17,7 +17,7 @@
 0=sleep 16500 # much faster than barbarians hardener
 1=check trunk 2
 2=consume trunk 2
-3=playFX sawmill 192
+3=playFX ../../../../sound/sawmill/sawmill 180
 4=animation working 20000 # much more faster than barbarians hardener
 5=produce wood
 

Modified: trunk/tribes/empire/buildings/sheepfarm/conf
===================================================================
--- trunk/tribes/empire/buildings/sheepfarm/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/buildings/sheepfarm/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -1,5 +1,6 @@
 [global]
 descname=_ Sheepfarm
+soundfx=../../../../sound/farm/sheep
 type=production
 size=big
 buildable=yes
@@ -18,8 +19,9 @@
 2=check water
 3=consume wheat
 4=consume water
-5=animation working 30000
-6=produce wool
+5=playFX ../../../../sound/farm/sheep 192
+6=animation working 30000
+7=produce wool
 
 [buildcost]
 trunk=2

Modified: trunk/tribes/empire/buildings/stonemason/conf
===================================================================
--- trunk/tribes/empire/buildings/stonemason/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/buildings/stonemason/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -7,7 +7,7 @@
 worker=stonemason # like quary
 program=work
 output=marblecolumn
-soundfx=stonemason
+soundfx=../../../../sound/stonecutting/stonemason
 
 [inputs]
 marble=6
@@ -16,7 +16,7 @@
 0=sleep 50000
 1=check marble 2
 2=consume marble 2
-3=playFX stonemason 192
+3=playFX ../../../../sound/stonecutting/stonemason 192
 4=animation working 32000
 5=produce marblecolumn
 

Modified: trunk/tribes/empire/buildings/toolsmith/conf
===================================================================
--- trunk/tribes/empire/buildings/toolsmith/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/buildings/toolsmith/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -1,5 +1,6 @@
 [global]
 descname=_"Toolsmith's workshop"
+soundfx=../../../../sound/smiths/toolsmith
 type=production
 size=medium
 buildable=yes
@@ -62,8 +63,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce bakingtray
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce bakingtray
 
 [produce_fire_tongs]
 0=set +catch
@@ -72,8 +74,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce fire_tongs
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce fire_tongs
 
 [produce_fishing_rod]
 0=set +catch
@@ -82,8 +85,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce fishing_rod
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce fishing_rod
 
 [produce_hammer]
 0=set +catch
@@ -92,8 +96,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce hammer
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce hammer
 
 [produce_kitchen_tools]
 0=set +catch
@@ -102,8 +107,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce kitchen_tools
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce kitchen_tools
 
 [produce_pick]
 0=set +catch
@@ -112,8 +118,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce pick
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce pick
 
 [produce_scythe]
 0=set +catch
@@ -122,8 +129,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce scythe
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce scythe
 
 [produce_shovel]
 0=set +catch
@@ -132,8 +140,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce shovel
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce shovel
 
 [produce_hunting_spear]
 0=set +catch
@@ -142,8 +151,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce hunting_spear
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce hunting_spear
 
 [produce_basket]
 0=set +catch
@@ -152,8 +162,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce basket
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce basket
 
 [produce_saw]
 0=set +catch
@@ -162,8 +173,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce saw
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce saw
 
 [produce_axe]
 0=set +catch
@@ -172,8 +184,9 @@
 3=check iron
 4=consume iron
 5=consume trunk
-6=animation working 35000
-7=produce axe
+6=playFX ../../../../sound/smiths/toolsmith 192
+7=animation working 35000
+8=produce axe
 
 [idle]
 pics=toolsmith_i_??.png

Modified: trunk/tribes/empire/buildings/warehouse/conf
===================================================================
--- trunk/tribes/empire/buildings/warehouse/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/buildings/warehouse/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -1,6 +1,6 @@
 [global]
 descname=_ Warehouse
-soundfx=warehouse-bringitin
+soundfx=../../../../sound/spoken/warehouse-bringitin
 type=warehouse
 subtype=none
 size=medium
@@ -25,5 +25,5 @@
 [working]
 pics=warehouse_i_??.png  # ???
 sfx_frame=1
-sfx_name=warehouse-bringitin
+sfx_name=../../../../sound/spoken/warehouse-bringitin
 hotspot=60 72

Modified: trunk/tribes/empire/buildings/weaponsmith/conf
===================================================================
--- trunk/tribes/empire/buildings/weaponsmith/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/buildings/weaponsmith/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -1,5 +1,7 @@
 [global]
 descname=_ Weaponsmith
+soundfx=../../../../smiths/smith
+soundfx=../../../../smiths/sharpening
 type=production
 size=big
 buildable=yes
@@ -37,8 +39,10 @@
 1=sleep 20000
 2=check wood
 3=consume wood
-4=animation working 30000
-5=produce wood_lance
+4=playFX ../../../../smiths/smith 192
+5=animation working 30000
+6=playFX ../../../../smiths/sharpening 120
+7=produce wood_lance
 
 
 [produce_lance]
@@ -50,8 +54,10 @@
 5=consume iron
 6=consume coal
 7=consume wood
-8=animation working 45000
-9=produce lance
+8=playFX ../../../../smiths/smith 192
+9=animation working 45000
+10=playFX ../../../../smiths/sharpening 120
+11=produce lance
 
 
 [produce_advanced_lance]
@@ -63,8 +69,10 @@
 5=consume iron 2
 6=consume coal
 7=consume wood
-8=animation working 45000
-9=produce advanced_lance
+8=playFX ../../../../smiths/smith 192
+9=animation working 45000
+10=playFX ../../../../smiths/sharpening 120
+11=produce advanced_lance
 
 [produce_heavy_lance]
 0=set +catch
@@ -77,8 +85,10 @@
 7=consume coal 2
 8=consume wood
 9=consume gold
-10=animation working 45000
-11=produce heavy_lance
+10=playFX ../../../../smiths/smith 192
+11=animation working 45000
+12=playFX ../../../../smiths/sharpening 120
+13=produce heavy_lance
 
 [produce_war_lance]
 0=set +catch
@@ -91,8 +101,10 @@
 7=consume coal 2
 8=consume wood
 9=consume gold
-10=animation working 45000
-11=produce war_lance
+10=playFX ../../../../smiths/smith 192
+11=animation working 45000
+12=playFX ../../../../smiths/sharpening 120
+13=produce war_lance
 
 
 [buildcost]

Modified: trunk/tribes/empire/workers/farmer/conf
===================================================================
--- trunk/tribes/empire/workers/farmer/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/workers/farmer/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -1,5 +1,6 @@
 [global]
 descname=_Farmer
+soundfx=../../../../sound/farm/scythe
 help=plants fields.
 type=generic
 menu_pic=menu.png
@@ -22,11 +23,12 @@
 [harvest]
 0=findobject attrib:barbarian_field radius:2
 1=walk object
-2=animation idle 10000
-3=object harvest
-4=animation idle 2000
-5=createitem wheat
-6=return
+2=playFX ../../../../sound/farm/scythe 220
+3=animation idle 10000
+4=object harvest
+5=animation idle 2000
+6=createitem wheat
+7=return
 
 [idle]
 pics=idle_??.png

Modified: trunk/tribes/empire/workers/fisher/conf
===================================================================
--- trunk/tribes/empire/workers/fisher/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/workers/fisher/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -4,8 +4,8 @@
 type=generic
 menu_pic=menu.png
 program=fish
-soundfx=fisher_throw_net
-soundfx=fisher_pull_net
+soundfx=../../../../sound/fisher/fisher_throw_net
+soundfx=../../../../sound/fisher/fisher_pull_net
 
 [buildcost]
 carrier=1
@@ -14,10 +14,10 @@
 [fish]
 0=findspace size:any radius:7 resource:fish
 1=walk coords
-2=playFX fisher_throw_net 192
+2=playFX ../../../../sound/fisher/fisher_throw_net 192
 3=mine fish 1
 4=animation fishing 3000 # Play a fishing animation
-5=playFX fisher_pull_net 192
+5=playFX ../../../../sound/fisher/fisher_pull_net 192
 6=createitem fish
 7=return
 

Modified: trunk/tribes/empire/workers/geologist/conf
===================================================================
--- trunk/tribes/empire/workers/geologist/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/workers/geologist/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -5,7 +5,7 @@
 menu_pic=geologist_menu.png
 program=expedition
 program=search
-soundfx=geologist_hammer
+soundfx=../../../../sound/hammering/geologist_hammer
 
 [buildcost]
 carrier=1
@@ -21,7 +21,7 @@
 [search]
 0=animation hacking 5000
 1=animation idle 2000
-2=playFX geologist_hammer 192
+2=playFX ../../../../sound/hammering/geologist_hammer 192
 3=animation hacking 3000
 4=geologist-find
 

Modified: trunk/tribes/empire/workers/lumberjack/conf
===================================================================
--- trunk/tribes/empire/workers/lumberjack/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/workers/lumberjack/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -4,8 +4,8 @@
 type=generic
 menu_pic=lumberjack_menu.png
 program=chop
-soundfx=timber
-soundfx=lumberjack
+soundfx=../../../../sound/spoken/timber
+soundfx=../../../../woodcutting/fast_woodcutting
 
 [buildcost]
 carrier=1
@@ -14,9 +14,9 @@
 [chop]
 0=findobject attrib:tree radius:8
 1=walk object
-2=playFX lumberjack 192
+2=playFX ../../../../woodcutting/fast_woodcutting 250
 3=animation hacking 10000
-4=playFX timber 192
+4=playFX ../../../../sound/spoken/timber 156
 5=object fall
 6=animation idle 2000
 7=createitem trunk

Modified: trunk/tribes/empire/workers/stonemason/conf
===================================================================
--- trunk/tribes/empire/workers/stonemason/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/tribes/empire/workers/stonemason/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -5,7 +5,7 @@
 menu_pic=stonemason_menu.png
 program=cut_stone
 program=cut_marble
-soundfx=stonemason
+soundfx=../../../../sound/stonecutting/stonecutter
 
 [buildcost]
 pick=1
@@ -14,15 +14,16 @@
 [cut_stone]
 0=findobject attrib:stone radius:6
 1=walk object
-2=animation hacking 10000
-3=object shrink
-4=createitem stone
-5=return
+2=playFX ../../../../sound/stonecutting/stonecutter 220
+3=animation hacking 10000
+4=object shrink
+5=createitem stone
+6=return
 
 [cut_marble]
 0=findobject attrib:stone radius:6
 1=walk object
-2=playFX stonemason 192
+2=playFX ../../../../sound/stonecutting/stonecutter 220
 3=animation hacking 10000
 4=object shrink
 5=createitem marble

Modified: trunk/worlds/blackland/bobs/sheep/conf
===================================================================
--- trunk/worlds/blackland/bobs/sheep/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/worlds/blackland/bobs/sheep/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -3,7 +3,7 @@
 swimming=0  # defaults to 0, is only in the water?
 attrib=eatable
 program=remove
-soundfx=sheep
+soundfx=../../../../sound/farm/sheep
 
 [remove]
 0=remove
@@ -11,7 +11,7 @@
 [idle]
 pics=sheep_??.png
 sfx_frame=0
-sfx_name=sheep
+sfx_name=../../../../sound/farm/sheep
 hotspot=15 25
 fps=20
 

Modified: trunk/worlds/desert/bobs/sheep/conf
===================================================================
--- trunk/worlds/desert/bobs/sheep/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/worlds/desert/bobs/sheep/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -3,7 +3,7 @@
 swimming=0  # defaults to 0, is only in the water?
 attrib=eatable
 program=remove
-soundfx=sheep
+soundfx=../../../../sound/farm/sheep
 
 [remove]
 0=remove
@@ -11,7 +11,7 @@
 [idle]
 pics=sheep_??.png
 sfx_frame=0
-sfx_name=sheep
+sfx_name=../../../../sound/farm/sheep
 hotspot=15 25
 fps=20
 

Modified: trunk/worlds/greenland/bobs/sheep/conf
===================================================================
--- trunk/worlds/greenland/bobs/sheep/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/worlds/greenland/bobs/sheep/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -3,7 +3,7 @@
 swimming=0  # defaults to 0, is only in the water?
 attrib=eatable
 program=remove
-soundfx=sheep
+soundfx=../../../../sound/farm/sheep
 
 [remove]
 0=remove
@@ -11,7 +11,7 @@
 [idle]
 pics=sheep_??.png
 sfx_frame=0
-sfx_name=sheep
+sfx_name=../../../../sound/farm/sheep
 hotspot=15 25
 fps=20
 

Modified: trunk/worlds/winterland/bobs/sheep/conf
===================================================================
--- trunk/worlds/winterland/bobs/sheep/conf	2008-07-30 16:28:18 UTC (rev 3231)
+++ trunk/worlds/winterland/bobs/sheep/conf	2008-07-30 20:53:52 UTC (rev 3232)
@@ -3,7 +3,7 @@
 swimming=0  # defaults to 0, is only in the water?
 attrib=eatable
 program=remove
-soundfx=sheep
+soundfx=../../../../sound/farm/sheep
 
 [remove]
 0=remove
@@ -11,7 +11,7 @@
 [idle]
 pics=sheep_??.png
 sfx_frame=0
-sfx_name=sheep
+sfx_name=../../../../sound/farm/sheep
 hotspot=15 25
 fps=20
 


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