widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/cricket_frog_sounds into lp:widelands.

Commit message:
Added sounds "crickets chirping" for palm trees and "frog croaking" for grass.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/cricket_frog_sounds/+merge/283511

Added 3 sounds:

One frog croaking joined with the three types of grass immovable
Two crickets chirping joined with different types of palm trees; Except palm coconut because this tree growths almost on all terrains

I did also another ordering in editor immovable menu so that the three types of grass are nearby.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/cricket_frog_sounds into lp:widelands.

=== modified file 'world/immovables/grass1/init.lua'
--- world/immovables/grass1/init.lua	2015-11-03 18:18:27 +0000
+++ world/immovables/grass1/init.lua	2016-01-21 17:06:00 +0000
@@ -11,6 +11,10 @@
       idle = {
          pictures = path.list_files(dirname .. "idle.png"),
          hotspot = { 10, 20 },
+         sound_effect = {
+            directory = "sound/animals",
+            name = "frog1",
+         },
       },
    }
 }

=== modified file 'world/immovables/grass2/init.lua'
--- world/immovables/grass2/init.lua	2015-11-03 18:18:27 +0000
+++ world/immovables/grass2/init.lua	2016-01-21 17:06:00 +0000
@@ -11,6 +11,10 @@
       idle = {
          pictures = path.list_files(dirname .. "idle.png"),
          hotspot = { 10, 16 },
+         sound_effect = {
+            directory = "sound/animals",
+            name = "frog1",
+         },
       },
    }
 }

=== modified file 'world/immovables/grass3/init.lua'
--- world/immovables/grass3/init.lua	2015-11-03 18:18:27 +0000
+++ world/immovables/grass3/init.lua	2016-01-21 17:06:00 +0000
@@ -11,6 +11,10 @@
       idle = {
          pictures = path.list_files(dirname .. "idle.png"),
          hotspot = { 10, 11 },
+         sound_effect = {
+            directory = "sound/animals",
+            name = "frog1",
+         },
       },
    }
 }

=== modified file 'world/immovables/trees/palm_borassus/init.lua'
--- world/immovables/trees/palm_borassus/init.lua	2015-11-03 18:18:27 +0000
+++ world/immovables/trees/palm_borassus/init.lua	2016-01-21 17:06:00 +0000
@@ -100,7 +100,7 @@
          fps = 10,
          sound_effect = {
             directory = "sound/animals",
-            name = "bird2",
+            name = "crickets1",
          },
       },
    },

=== modified file 'world/immovables/trees/palm_date/init.lua'
--- world/immovables/trees/palm_date/init.lua	2015-11-03 18:18:27 +0000
+++ world/immovables/trees/palm_date/init.lua	2016-01-21 17:06:00 +0000
@@ -103,7 +103,7 @@
          fps = 10,
          sound_effect = {
             directory = "sound/animals",
-            name = "bird1",
+            name = "crickets2",
          },
       },
    },

=== modified file 'world/immovables/trees/palm_oil/init.lua'
--- world/immovables/trees/palm_oil/init.lua	2015-11-03 18:18:27 +0000
+++ world/immovables/trees/palm_oil/init.lua	2016-01-21 17:06:00 +0000
@@ -104,7 +104,7 @@
          fps = 10,
          sound_effect = {
             directory = "sound/animals",
-            name = "bird5",
+            name = "crickets2",
          },
       },
    },

=== modified file 'world/immovables/trees/palm_roystonea/init.lua'
--- world/immovables/trees/palm_roystonea/init.lua	2015-11-03 18:18:27 +0000
+++ world/immovables/trees/palm_roystonea/init.lua	2016-01-21 17:06:00 +0000
@@ -100,7 +100,7 @@
          fps = 10,
          sound_effect = {
             directory = "sound/animals",
-            name = "bird4",
+            name = "crickets2",
          },
       },
    },

=== modified file 'world/init.lua'
--- world/init.lua	2015-11-20 18:21:27 +0000
+++ world/init.lua	2016-01-21 17:06:00 +0000
@@ -67,6 +67,8 @@
 }
 
 include "world/immovables/grass1/init.lua"
+include "world/immovables/grass2/init.lua"
+include "world/immovables/grass3/init.lua"
 include "world/immovables/bush1/init.lua"
 include "world/immovables/bush2/init.lua"
 include "world/immovables/bush3/init.lua"
@@ -76,8 +78,6 @@
 include "world/immovables/cactus2/init.lua"
 include "world/immovables/cactus3/init.lua"
 include "world/immovables/cactus4/init.lua"
-include "world/immovables/grass2/init.lua"
-include "world/immovables/grass3/init.lua"
 include "world/immovables/manmade/artifacts/artifact00/init.lua"
 include "world/immovables/manmade/artifacts/artifact01/init.lua"
 include "world/immovables/manmade/artifacts/artifact02/init.lua"