Commit 2ffb6e25cddc52b7cc35504439e9a2305c1de791

Authored by DarkGod
1 parent e9fe69e7

fix numberbox !!!!!

Reduced the volume of door creaking
  1 +All the medias located in all the "/data/gfx" folders are granted to use with the Tales of Maj'Eyal game only.
  2 +
  3 +Please contact darkgod@te4.org for more informations.
1 -All the tiles located in all the "gfx/shockbolt", "gfx/lore" "gfx/achievements"  
2 -folders are granted to use with the Tales of Maj'Eyal game only.  
3 -  
4 -Please contact darkgod@te4.org for more informations.  
@@ -76,6 +76,7 @@ end @@ -76,6 +76,7 @@ end
76 76
77 function _M:volumeMusic(vol) 77 function _M:volumeMusic(vol)
78 vol = util.bound(vol, 0, 100) 78 vol = util.bound(vol, 0, 100)
  79 + print("====",vol)
79 if vol then 80 if vol then
80 config.settings.audio = config.settings.audio or {} 81 config.settings.audio = config.settings.audio or {}
81 config.settings.audio.music_volume = vol 82 config.settings.audio.music_volume = vol
@@ -51,6 +51,7 @@ function _M:playSound(name, position) @@ -51,6 +51,7 @@ function _M:playSound(name, position)
51 local f = loadfile("/data/sound/"..name..".lua") 51 local f = loadfile("/data/sound/"..name..".lua")
52 setfenv(f, setmetatable({}, {__index=_G})) 52 setfenv(f, setmetatable({}, {__index=_G}))
53 def = f() 53 def = f()
  54 + if not def.file then def.file = name..".ogg" end
54 print("[SOUND] loading from", "/data/sound/"..name..".lua", ":=:", "/data/sound/"..def.file, ":>") 55 print("[SOUND] loading from", "/data/sound/"..name..".lua", ":=:", "/data/sound/"..def.file, ":>")
55 ok, def.sample = pcall(core.sound.load, "/data/sound/"..def.file, false) 56 ok, def.sample = pcall(core.sound.load, "/data/sound/"..def.file, false)
56 if not ok then print("Failed loading sound", def.file, def.sample) return end 57 if not ok then print("Failed loading sound", def.file, def.sample) return end
@@ -76,5 +76,5 @@ function _M:updateText(v) @@ -76,5 +76,5 @@ function _M:updateText(v)
76 Textbox.setText(self, text) 76 Textbox.setText(self, text)
77 end 77 end
78 78
79 - if self.on_change and old ~= self.number then self.on_number_change(self.number) end 79 + if self.on_number_change and old ~= self.number then self.on_number_change(self.number) end
80 end 80 end
@@ -26,7 +26,7 @@ newBirthDescriptor{ @@ -26,7 +26,7 @@ newBirthDescriptor{
26 locked = function() return profile.mod.allow_build.race_giant end, 26 locked = function() return profile.mod.allow_build.race_giant end,
27 locked_desc = "Powerful beings that tower over all, but the bigger they are, the harder they fall...", 27 locked_desc = "Powerful beings that tower over all, but the bigger they are, the harder they fall...",
28 desc = { 28 desc = {
29 - [[#{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.]], 29 + [[#{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.]],
30 }, 30 },
31 descriptor_choices = 31 descriptor_choices =
32 { 32 {