Skip to content
Snippets Groups Projects
Commit 644c826b authored by dg's avatar dg
Browse files

fonts

git-svn-id: http://svn.net-core.org/repos/t-engine4@2780 51575b47-30f0-44d4-a5cc-537603b46e54
parent bd4fabee
No related branches found
No related tags found
No related merge requests found
......@@ -74,7 +74,7 @@ end
-- TODO: make it betetr than a simple dialog
function _M:talkBox()
if not profile.auth then return end
local d = require("engine.dialogs.GetText").new("Talk", self.cur_channel..":", 0, 250, function(text)
local d = require("engine.dialogs.GetText").new("Talk", self.cur_channel, 0, 250, function(text)
self:talk(text)
end)
game:registerDialog(d)
......
......@@ -145,8 +145,8 @@ function _M:resize(w, h, nogen)
self.w, self.h = math.floor(w), math.floor(h)
self.display_x = math.floor(self.force_x or (gamew - self.w) / 2)
self.display_y = math.floor(self.force_y or (gameh - self.h) / 2)
self.ix, self.iy = 5, 22 + 3
self.iw, self.ih = w - 2 * 5, h - 8 - 22 - 3
self.ix, self.iy = 5, 8 + 3 + self.font_bold_h
self.iw, self.ih = w - 2 * 5, h - 8 - 8 - 3 - self.font_bold_h
if not nogen then self:generate() end
end
......
......@@ -85,8 +85,8 @@ function _M:run()
self.flash = LogFlasher.new(0, 0, self.w, 20, nil, "/data/font/USENET_.ttf", 16, {255,255,255}, {0,0,0})
self.logdisplay = LogDisplay.new(0, self.h * 0.8 + 7, self.w * 0.5 - 30, self.h * 0.2 - 7, nil, "/data/font/USENET_.ttf", 14, {255,255,255}, "/data/gfx/ui/message-log.png")
self.player_display = PlayerDisplay.new(0, 230, 200, self.h * 0.8 - 230, {30,30,0})
self.hotkeys_display = HotkeysDisplay.new(nil, self.w * 0.5 + 30, self.h * 0.8 + 7, self.w * 0.5 - 30, self.h * 0.2 - 7, "/data/gfx/ui/talents-list.png", "/data/font/USENET_.ttf", 12)
self.npcs_display = ActorsSeenDisplay.new(nil, self.w * 0.5 + 30, self.h * 0.8 + 7, self.w * 0.5 - 30, self.h * 0.2 - 7, "/data/gfx/ui/talents-list.png", "/data/font/USENET_.ttf", 12)
self.hotkeys_display = HotkeysDisplay.new(nil, self.w * 0.5 + 30, self.h * 0.8 + 7, self.w * 0.5 - 30, self.h * 0.2 - 7, "/data/gfx/ui/talents-list.png", "/data/font/SVBasicManual.ttf", 14)
self.npcs_display = ActorsSeenDisplay.new(nil, self.w * 0.5 + 30, self.h * 0.8 + 7, self.w * 0.5 - 30, self.h * 0.2 - 7, "/data/gfx/ui/talents-list.png", "/data/font/SVBasicManual.ttf", 14)
self.tooltip = Tooltip.new("/data/font/USENET_.ttf", 14, {255,255,255}, {30,30,30,230})
self.tooltip2 = Tooltip.new(nil, nil, {255,255,255}, {30,30,30,230})
self.flyers = FlyingText.new("/data/font/INSULA__.ttf", 14, "/data/font/INSULA__.ttf", 17)
......
......@@ -28,7 +28,7 @@ function _M:init(x, y, w, h, bgcolor)
self.display_y = y
self.w, self.h = w, h
self.bgcolor = bgcolor
self.font = core.display.newFont("/data/font/VeraMono.ttf", 14)
self.font = core.display.newFont("/data/font/SVBasicManual.ttf", 16)
self.mouse = Mouse.new()
self:resize(x, y, w, h)
end
......
File added
File added
......@@ -30,7 +30,7 @@ local Talents = require("engine.interface.ActorTalents")
newEntity{ base="BASE_NPC_CRYSTAL", define_as = "SPELLBLAZE_CRYSTAL",
allow_infinite_dungeon = true,
unique = true,
name = "Spellblaze Crystal", tint=colors.PURPLE,
name = "Spellblaze Crystal", tint=colors.PURPLE, image = "npc/spellblaze_crystal.png",
color=colors.VIOLET,
desc = [[A formation of purple crystal. It seems strangely aware.]],
level_range = {7, nil}, exp_worth = 2,
......
......@@ -57,9 +57,12 @@ _2DNoise = n:makeTexture2D(64, 64)
-- Dialogs fonts
UIBase.font = core.display.newFont("/data/font/USENET_.ttf", 16)
UIBase.font_bold = core.display.newFont("/data/font/USENET_.ttf", 16)
UIBase.font_mono = core.display.newFont("/data/font/SVBasicManual.ttf", 16)
UIBase.font_bold:setStyle("bold")
UIBase.font_h = UIBase.font:lineSkip()
UIBase.font_bold_h = UIBase.font_bold:lineSkip()
UIBase.font_mono_w = UIBase.font_mono:size(" ")
UIBase.font_mono_h = UIBase.font_mono:lineSkip()
-- Achievements
WorldAchievements:loadDefinition("/data/achievements/")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment