From 2ffb6e25cddc52b7cc35504439e9a2305c1de791 Mon Sep 17 00:00:00 2001
From: DarkGod <darkgod@net-core.org>
Date: Wed, 28 Jan 2015 10:08:41 +0100
Subject: [PATCH] fix numberbox !!!!!
Reduced the volume of door creaking
---
COPYING-MEDIA | 3 +++
COPYING-TILES | 4 ----
game/engines/default/engine/interface/GameMusic.lua | 1 +
game/engines/default/engine/interface/GameSound.lua | 1 +
game/engines/default/engine/ui/Numberbox.lua | 2 +-
game/modules/tome/data/birth/races/giant.lua | 2 +-
game/modules/tome/data/sound/ambient/door_creaks/creak_1.lua | 1 +
game/modules/tome/data/sound/ambient/door_creaks/creak_2.lua | 1 +
game/modules/tome/data/sound/ambient/door_creaks/creak_3.lua | 1 +
game/modules/tome/data/sound/ambient/door_creaks/creak_4.lua | 1 +
.../tome/data/sound/ambient/door_creaks/icedoor-break.lua | 1 +
11 files changed, 12 insertions(+), 6 deletions(-)
create mode 100644 COPYING-MEDIA
delete mode 100644 COPYING-TILES
create mode 100644 game/modules/tome/data/sound/ambient/door_creaks/creak_1.lua
create mode 100644 game/modules/tome/data/sound/ambient/door_creaks/creak_2.lua
create mode 100644 game/modules/tome/data/sound/ambient/door_creaks/creak_3.lua
create mode 100644 game/modules/tome/data/sound/ambient/door_creaks/creak_4.lua
create mode 100644 game/modules/tome/data/sound/ambient/door_creaks/icedoor-break.lua
diff --git a/COPYING-MEDIA b/COPYING-MEDIA
new file mode 100644
index 0000000000..991fcc94d6
--- /dev/null
+++ b/COPYING-MEDIA
@@ -0,0 +1,3 @@
+All the medias located in all the "/data/gfx" folders are granted to use with the Tales of Maj'Eyal game only.
+
+Please contact darkgod@te4.org for more informations.
diff --git a/COPYING-TILES b/COPYING-TILES
deleted file mode 100644
index 833089f524..0000000000
--- a/COPYING-TILES
+++ /dev/null
@@ -1,4 +0,0 @@
-All the tiles located in all the "gfx/shockbolt", "gfx/lore" "gfx/achievements"
-folders are granted to use with the Tales of Maj'Eyal game only.
-
-Please contact darkgod@te4.org for more informations.
diff --git a/game/engines/default/engine/interface/GameMusic.lua b/game/engines/default/engine/interface/GameMusic.lua
index 053925f6b9..5bed92cb79 100644
--- a/game/engines/default/engine/interface/GameMusic.lua
+++ b/game/engines/default/engine/interface/GameMusic.lua
@@ -76,6 +76,7 @@ end
function _M:volumeMusic(vol)
vol = util.bound(vol, 0, 100)
+ print("====",vol)
if vol then
config.settings.audio = config.settings.audio or {}
config.settings.audio.music_volume = vol
diff --git a/game/engines/default/engine/interface/GameSound.lua b/game/engines/default/engine/interface/GameSound.lua
index 63ae76e295..47818fc7b9 100644
--- a/game/engines/default/engine/interface/GameSound.lua
+++ b/game/engines/default/engine/interface/GameSound.lua
@@ -51,6 +51,7 @@ function _M:playSound(name, position)
local f = loadfile("/data/sound/"..name..".lua")
setfenv(f, setmetatable({}, {__index=_G}))
def = f()
+ if not def.file then def.file = name..".ogg" end
print("[SOUND] loading from", "/data/sound/"..name..".lua", ":=:", "/data/sound/"..def.file, ":>")
ok, def.sample = pcall(core.sound.load, "/data/sound/"..def.file, false)
if not ok then print("Failed loading sound", def.file, def.sample) return end
diff --git a/game/engines/default/engine/ui/Numberbox.lua b/game/engines/default/engine/ui/Numberbox.lua
index 8a8ccdcc1e..51861c1b21 100644
--- a/game/engines/default/engine/ui/Numberbox.lua
+++ b/game/engines/default/engine/ui/Numberbox.lua
@@ -76,5 +76,5 @@ function _M:updateText(v)
Textbox.setText(self, text)
end
- if self.on_change and old ~= self.number then self.on_number_change(self.number) end
+ if self.on_number_change and old ~= self.number then self.on_number_change(self.number) end
end
diff --git a/game/modules/tome/data/birth/races/giant.lua b/game/modules/tome/data/birth/races/giant.lua
index dc2ae0057f..7a5264e63a 100644
--- a/game/modules/tome/data/birth/races/giant.lua
+++ b/game/modules/tome/data/birth/races/giant.lua
@@ -26,7 +26,7 @@ newBirthDescriptor{
locked = function() return profile.mod.allow_build.race_giant end,
locked_desc = "Powerful beings that tower over all, but the bigger they are, the harder they fall...",
desc = {
- [[#{italic}#"Giant"#{normal}# is a catch-all term for humanoids which are typically over nine feet in height. Their origins, cultures, and relationships to other races differ wildly, but they tend to live as refugees and outcasts, shunned by smaller sentient races who usually see them as a threat.]],
+ [[#{italic}#"Giant"#{normal}# is a catch-all term for humanoids which are typically over eight feet in height. Their origins, cultures, and relationships to other races differ wildly, but they tend to live as refugees and outcasts, shunned by smaller sentient races who usually see them as a threat.]],
},
descriptor_choices =
{
diff --git a/game/modules/tome/data/sound/ambient/door_creaks/creak_1.lua b/game/modules/tome/data/sound/ambient/door_creaks/creak_1.lua
new file mode 100644
index 0000000000..2aae7df699
--- /dev/null
+++ b/game/modules/tome/data/sound/ambient/door_creaks/creak_1.lua
@@ -0,0 +1 @@
+return { volume = 35 }
diff --git a/game/modules/tome/data/sound/ambient/door_creaks/creak_2.lua b/game/modules/tome/data/sound/ambient/door_creaks/creak_2.lua
new file mode 100644
index 0000000000..2aae7df699
--- /dev/null
+++ b/game/modules/tome/data/sound/ambient/door_creaks/creak_2.lua
@@ -0,0 +1 @@
+return { volume = 35 }
diff --git a/game/modules/tome/data/sound/ambient/door_creaks/creak_3.lua b/game/modules/tome/data/sound/ambient/door_creaks/creak_3.lua
new file mode 100644
index 0000000000..2aae7df699
--- /dev/null
+++ b/game/modules/tome/data/sound/ambient/door_creaks/creak_3.lua
@@ -0,0 +1 @@
+return { volume = 35 }
diff --git a/game/modules/tome/data/sound/ambient/door_creaks/creak_4.lua b/game/modules/tome/data/sound/ambient/door_creaks/creak_4.lua
new file mode 100644
index 0000000000..2aae7df699
--- /dev/null
+++ b/game/modules/tome/data/sound/ambient/door_creaks/creak_4.lua
@@ -0,0 +1 @@
+return { volume = 35 }
diff --git a/game/modules/tome/data/sound/ambient/door_creaks/icedoor-break.lua b/game/modules/tome/data/sound/ambient/door_creaks/icedoor-break.lua
new file mode 100644
index 0000000000..2aae7df699
--- /dev/null
+++ b/game/modules/tome/data/sound/ambient/door_creaks/icedoor-break.lua
@@ -0,0 +1 @@
+return { volume = 35 }
--
GitLab