Commit c3bb866de5e89cc11473ab6e1003f6990d60da3b

Authored by dg
1 parent b37ff572

Updated fonts to use google's 'Droid' series

git-svn-id: http://svn.net-core.org/repos/t-engine4@5165 51575b47-30f0-44d4-a5cc-537603b46e54
  1 +
  2 + Apache License
  3 + Version 2.0, January 2004
  4 + http://www.apache.org/licenses/
  5 +
  6 + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
  7 +
  8 + 1. Definitions.
  9 +
  10 + "License" shall mean the terms and conditions for use, reproduction,
  11 + and distribution as defined by Sections 1 through 9 of this document.
  12 +
  13 + "Licensor" shall mean the copyright owner or entity authorized by
  14 + the copyright owner that is granting the License.
  15 +
  16 + "Legal Entity" shall mean the union of the acting entity and all
  17 + other entities that control, are controlled by, or are under common
  18 + control with that entity. For the purposes of this definition,
  19 + "control" means (i) the power, direct or indirect, to cause the
  20 + direction or management of such entity, whether by contract or
  21 + otherwise, or (ii) ownership of fifty percent (50%) or more of the
  22 + outstanding shares, or (iii) beneficial ownership of such entity.
  23 +
  24 + "You" (or "Your") shall mean an individual or Legal Entity
  25 + exercising permissions granted by this License.
  26 +
  27 + "Source" form shall mean the preferred form for making modifications,
  28 + including but not limited to software source code, documentation
  29 + source, and configuration files.
  30 +
  31 + "Object" form shall mean any form resulting from mechanical
  32 + transformation or translation of a Source form, including but
  33 + not limited to compiled object code, generated documentation,
  34 + and conversions to other media types.
  35 +
  36 + "Work" shall mean the work of authorship, whether in Source or
  37 + Object form, made available under the License, as indicated by a
  38 + copyright notice that is included in or attached to the work
  39 + (an example is provided in the Appendix below).
  40 +
  41 + "Derivative Works" shall mean any work, whether in Source or Object
  42 + form, that is based on (or derived from) the Work and for which the
  43 + editorial revisions, annotations, elaborations, or other modifications
  44 + represent, as a whole, an original work of authorship. For the purposes
  45 + of this License, Derivative Works shall not include works that remain
  46 + separable from, or merely link (or bind by name) to the interfaces of,
  47 + the Work and Derivative Works thereof.
  48 +
  49 + "Contribution" shall mean any work of authorship, including
  50 + the original version of the Work and any modifications or additions
  51 + to that Work or Derivative Works thereof, that is intentionally
  52 + submitted to Licensor for inclusion in the Work by the copyright owner
  53 + or by an individual or Legal Entity authorized to submit on behalf of
  54 + the copyright owner. For the purposes of this definition, "submitted"
  55 + means any form of electronic, verbal, or written communication sent
  56 + to the Licensor or its representatives, including but not limited to
  57 + communication on electronic mailing lists, source code control systems,
  58 + and issue tracking systems that are managed by, or on behalf of, the
  59 + Licensor for the purpose of discussing and improving the Work, but
  60 + excluding communication that is conspicuously marked or otherwise
  61 + designated in writing by the copyright owner as "Not a Contribution."
  62 +
  63 + "Contributor" shall mean Licensor and any individual or Legal Entity
  64 + on behalf of whom a Contribution has been received by Licensor and
  65 + subsequently incorporated within the Work.
  66 +
  67 + 2. Grant of Copyright License. Subject to the terms and conditions of
  68 + this License, each Contributor hereby grants to You a perpetual,
  69 + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
  70 + copyright license to reproduce, prepare Derivative Works of,
  71 + publicly display, publicly perform, sublicense, and distribute the
  72 + Work and such Derivative Works in Source or Object form.
  73 +
  74 + 3. Grant of Patent License. Subject to the terms and conditions of
  75 + this License, each Contributor hereby grants to You a perpetual,
  76 + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
  77 + (except as stated in this section) patent license to make, have made,
  78 + use, offer to sell, sell, import, and otherwise transfer the Work,
  79 + where such license applies only to those patent claims licensable
  80 + by such Contributor that are necessarily infringed by their
  81 + Contribution(s) alone or by combination of their Contribution(s)
  82 + with the Work to which such Contribution(s) was submitted. If You
  83 + institute patent litigation against any entity (including a
  84 + cross-claim or counterclaim in a lawsuit) alleging that the Work
  85 + or a Contribution incorporated within the Work constitutes direct
  86 + or contributory patent infringement, then any patent licenses
  87 + granted to You under this License for that Work shall terminate
  88 + as of the date such litigation is filed.
  89 +
  90 + 4. Redistribution. You may reproduce and distribute copies of the
  91 + Work or Derivative Works thereof in any medium, with or without
  92 + modifications, and in Source or Object form, provided that You
  93 + meet the following conditions:
  94 +
  95 + (a) You must give any other recipients of the Work or
  96 + Derivative Works a copy of this License; and
  97 +
  98 + (b) You must cause any modified files to carry prominent notices
  99 + stating that You changed the files; and
  100 +
  101 + (c) You must retain, in the Source form of any Derivative Works
  102 + that You distribute, all copyright, patent, trademark, and
  103 + attribution notices from the Source form of the Work,
  104 + excluding those notices that do not pertain to any part of
  105 + the Derivative Works; and
  106 +
  107 + (d) If the Work includes a "NOTICE" text file as part of its
  108 + distribution, then any Derivative Works that You distribute must
  109 + include a readable copy of the attribution notices contained
  110 + within such NOTICE file, excluding those notices that do not
  111 + pertain to any part of the Derivative Works, in at least one
  112 + of the following places: within a NOTICE text file distributed
  113 + as part of the Derivative Works; within the Source form or
  114 + documentation, if provided along with the Derivative Works; or,
  115 + within a display generated by the Derivative Works, if and
  116 + wherever such third-party notices normally appear. The contents
  117 + of the NOTICE file are for informational purposes only and
  118 + do not modify the License. You may add Your own attribution
  119 + notices within Derivative Works that You distribute, alongside
  120 + or as an addendum to the NOTICE text from the Work, provided
  121 + that such additional attribution notices cannot be construed
  122 + as modifying the License.
  123 +
  124 + You may add Your own copyright statement to Your modifications and
  125 + may provide additional or different license terms and conditions
  126 + for use, reproduction, or distribution of Your modifications, or
  127 + for any such Derivative Works as a whole, provided Your use,
  128 + reproduction, and distribution of the Work otherwise complies with
  129 + the conditions stated in this License.
  130 +
  131 + 5. Submission of Contributions. Unless You explicitly state otherwise,
  132 + any Contribution intentionally submitted for inclusion in the Work
  133 + by You to the Licensor shall be under the terms and conditions of
  134 + this License, without any additional terms or conditions.
  135 + Notwithstanding the above, nothing herein shall supersede or modify
  136 + the terms of any separate license agreement you may have executed
  137 + with Licensor regarding such Contributions.
  138 +
  139 + 6. Trademarks. This License does not grant permission to use the trade
  140 + names, trademarks, service marks, or product names of the Licensor,
  141 + except as required for reasonable and customary use in describing the
  142 + origin of the Work and reproducing the content of the NOTICE file.
  143 +
  144 + 7. Disclaimer of Warranty. Unless required by applicable law or
  145 + agreed to in writing, Licensor provides the Work (and each
  146 + Contributor provides its Contributions) on an "AS IS" BASIS,
  147 + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
  148 + implied, including, without limitation, any warranties or conditions
  149 + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
  150 + PARTICULAR PURPOSE. You are solely responsible for determining the
  151 + appropriateness of using or redistributing the Work and assume any
  152 + risks associated with Your exercise of permissions under this License.
  153 +
  154 + 8. Limitation of Liability. In no event and under no legal theory,
  155 + whether in tort (including negligence), contract, or otherwise,
  156 + unless required by applicable law (such as deliberate and grossly
  157 + negligent acts) or agreed to in writing, shall any Contributor be
  158 + liable to You for damages, including any direct, indirect, special,
  159 + incidental, or consequential damages of any character arising as a
  160 + result of this License or out of the use or inability to use the
  161 + Work (including but not limited to damages for loss of goodwill,
  162 + work stoppage, computer failure or malfunction, or any and all
  163 + other commercial damages or losses), even if such Contributor
  164 + has been advised of the possibility of such damages.
  165 +
  166 + 9. Accepting Warranty or Additional Liability. While redistributing
  167 + the Work or Derivative Works thereof, You may choose to offer,
  168 + and charge a fee for, acceptance of support, warranty, indemnity,
  169 + or other liability obligations and/or rights consistent with this
  170 + License. However, in accepting such obligations, You may act only
  171 + on Your own behalf and on Your sole responsibility, not on behalf
  172 + of any other Contributor, and only if You agree to indemnify,
  173 + defend, and hold each Contributor harmless for any liability
  174 + incurred by, or claims asserted against, such Contributor by reason
  175 + of your accepting any such warranty or additional liability.
  176 +
  177 + END OF TERMS AND CONDITIONS
  178 +
  179 + APPENDIX: How to apply the Apache License to your work.
  180 +
  181 + To apply the Apache License to your work, attach the following
  182 + boilerplate notice, with the fields enclosed by brackets "[]"
  183 + replaced with your own identifying information. (Don't include
  184 + the brackets!) The text should be enclosed in the appropriate
  185 + comment syntax for the file format. We also recommend that a
  186 + file or class name and description of purpose be included on the
  187 + same "printed page" as the copyright notice for easier
  188 + identification within third-party archives.
  189 +
  190 + Copyright [yyyy] [name of copyright owner]
  191 +
  192 + Licensed under the Apache License, Version 2.0 (the "License");
  193 + you may not use this file except in compliance with the License.
  194 + You may obtain a copy of the License at
  195 +
  196 + http://www.apache.org/licenses/LICENSE-2.0
  197 +
  198 + Unless required by applicable law or agreed to in writing, software
  199 + distributed under the License is distributed on an "AS IS" BASIS,
  200 + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  201 + See the License for the specific language governing permissions and
  202 + limitations under the License.
... ...
No preview for this file type
No preview for this file type
... ... @@ -29,7 +29,7 @@ function _M:init(actor, x, y, w, h, bgcolor, fontname, fontsize)
29 29 self.bgcolor = {0,0,0}
30 30 self.bg_image = bgcolor
31 31 end
32   - self.font = core.display.newFont(fontname or "/data/font/VeraMono.ttf", fontsize or 10)
  32 + self.font = core.display.newFont(fontname or "/data/font/DroidSansMono.ttf", fontsize or 10)
33 33 self.font_h = self.font:lineSkip()
34 34 self:resize(x, y, w, h)
35 35 self.nb_cols = 1
... ...
... ... @@ -109,7 +109,7 @@ function _M:init()
109 109 self.blink_period = 20
110 110 self.blink = self.blink_period
111 111 local w, h = core.display.size()
112   - engine.Dialog.init(self, "Lua Console", w, h, 0, 0, nil, core.display.newFont("/data/font/VeraMono.ttf", 12))
  112 + engine.Dialog.init(self, "Lua Console", w, h, 0, 0, nil, core.display.newFont("/data/font/DroidSansMono.ttf", 12))
113 113 game:onTickEnd(function() self.key:unicodeInput(true) end)
114 114 self:keyCommands{
115 115 _RETURN = function()
... ...
... ... @@ -28,7 +28,7 @@ tiles = engine.Tiles.new(16, 16)
28 28
29 29 --- Requests a simple, press any key, dialog
30 30 function _M:simplePopup(title, text, fct, no_leave)
31   - local font = core.display.newFont("/data/font/Vera.ttf", 12)
  31 + local font = core.display.newFont("/data/font/DroidSans.ttf", 14)
32 32 local w, h = font:size(text)
33 33 local tw, th = font:size(title)
34 34 local d = new(title, math.max(w, tw) + 8, h + 25, nil, nil, nil, font)
... ... @@ -48,7 +48,7 @@ end
48 48
49 49 --- Requests a simple, press any key, dialog
50 50 function _M:simpleLongPopup(title, text, w, fct, no_leave)
51   - local font = core.display.newFont("/data/font/Vera.ttf", 12)
  51 + local font = core.display.newFont("/data/font/DroidSans.ttf", 14)
52 52 local list = text:splitLines(w - 10, font)
53 53
54 54 local fh = font:lineSkip()
... ... @@ -74,7 +74,7 @@ end
74 74
75 75 --- Requests a simple yes-no dialog
76 76 function _M:yesnoPopup(title, text, fct, yes_text, no_text)
77   - local font = core.display.newFont("/data/font/Vera.ttf", 12)
  77 + local font = core.display.newFont("/data/font/DroidSans.ttf", 14)
78 78 local w, h = font:size(text)
79 79 local tw, th = font:size(title)
80 80 local d = new(title, math.max(w, tw) + 8, h + 75, nil, nil, nil, font)
... ... @@ -109,7 +109,7 @@ end
109 109
110 110 --- Requests a long yes-no dialog
111 111 function _M:yesnoLongPopup(title, text, w, fct, yes_text, no_text)
112   - local font = core.display.newFont("/data/font/Vera.ttf", 12)
  112 + local font = core.display.newFont("/data/font/DroidSans.ttf", 14)
113 113 local list = text:splitLines(w - 10, font)
114 114
115 115 local th = font:lineSkip()
... ... @@ -156,7 +156,7 @@ function _M:init(title, w, h, x, y, alpha, font, showup)
156 156 self.state = ""
157 157 self.currenttabindex = 0
158 158 self.font = font
159   - if not font then self.font = core.display.newFont("/data/font/Vera.ttf", 12) end
  159 + if not font then self.font = core.display.newFont("/data/font/DroidSans.ttf", 14) end
160 160 self.font_h = self.font:lineSkip()
161 161
162 162 self:resize(w, h, x, y, alpha)
... ...
... ... @@ -32,11 +32,11 @@ function _M:init(text, dur, color)
32 32 self.dur = dur or 60
33 33 self.color = color or colors.BLACK
34 34
35   - Base.init(self, {font = {"/data/font/VeraBd.ttf", 16}})
  35 + Base.init(self, {font = {"/data/font/DroidSans-Bold.ttf", 16}})
36 36 end
37 37
38 38 function _M:loaded()
39   - Base.init(self, {font = {"/data/font/VeraBd.ttf", 16}})
  39 + Base.init(self, {font = {"/data/font/DroidSans-Bold.ttf", 16}})
40 40 end
41 41
42 42 --- Serialization
... ...
... ... @@ -22,8 +22,8 @@ require "engine.class"
22 22 module(..., package.seeall, class.make)
23 23
24 24 function _M:init(fontname, fontsize, bigfontname, bigfontsize)
25   - self.font = core.display.newFont(fontname or "/data/font/Vera.ttf", fontsize or 12)
26   - self.bigfont = core.display.newFont(bigfontname or "/data/font/VeraBd.ttf", bigfontsize or 14)
  25 + self.font = core.display.newFont(fontname or "/data/font/DroidSans.ttf", fontsize or 12)
  26 + self.bigfont = core.display.newFont(bigfontname or "/data/font/DroidSans-Bold.ttf", bigfontsize or 14)
27 27 self.font_h = self.font:lineSkip()
28 28 self.flyers = {}
29 29 end
... ...
... ... @@ -29,7 +29,7 @@ function _M:init(actor, x, y, w, h, bgcolor, fontname, fontsize)
29 29 self.bgcolor = {0,0,0}
30 30 self.bg_image = bgcolor
31 31 end
32   - self.font = core.display.newFont(fontname or "/data/font/VeraMono.ttf", fontsize or 10)
  32 + self.font = core.display.newFont(fontname or "/data/font/DroidSansMono.ttf", fontsize or 10)
33 33 self.font_h = self.font:lineSkip()
34 34 self.clics = {}
35 35 self.items = {}
... ...
... ... @@ -32,8 +32,8 @@ function _M:init(actor, x, y, w, h, bgcolor, fontname, fontsize, icon_w, icon_h)
32 32 self.bgcolor = {0,0,0}
33 33 self.bg_image = bgcolor
34 34 end
35   - self.font = core.display.newFont(fontname or "/data/font/VeraMono.ttf", fontsize or 10)
36   - self.fontbig = core.display.newFont(fontname or "/data/font/VeraMono.ttf", (fontsize or 10) * 2)
  35 + self.font = core.display.newFont(fontname or "/data/font/DroidSansMono.ttf", fontsize or 10)
  36 + self.fontbig = core.display.newFont(fontname or "/data/font/DroidSansMono.ttf", (fontsize or 10) * 2)
37 37 self.font_h = self.font:lineSkip()
38 38 self.dragclics = {}
39 39 self.clics = {}
... ... @@ -41,7 +41,7 @@ function _M:init(actor, x, y, w, h, bgcolor, fontname, fontsize, icon_w, icon_h)
41 41 self.cache = {}
42 42 setmetatable(self.cache, {__mode="v"})
43 43 self.icon_w, self.icon_h = icon_w, icon_h
44   - self.tiles = Tiles.new(icon_w, icon_h, fontname or "/data/font/VeraMono.ttf", fontsize or 10, true, true)
  44 + self.tiles = Tiles.new(icon_w, icon_h, fontname or "/data/font/DroidSansMono.ttf", fontsize or 10, true, true)
45 45 self.tiles.use_images = true
46 46 self.tiles.force_back_color = {r=0, g=0, b=0}
47 47
... ...
... ... @@ -33,7 +33,7 @@ function _M:init(x, y, w, h, max, fontname, fontsize, color, bgcolor)
33 33 self.bgcolor = {0,0,0}
34 34 self.bg_image = bgcolor
35 35 end
36   - self.font = core.display.newFont(fontname or "/data/font/Vera.ttf", fontsize or 12)
  36 + self.font = core.display.newFont(fontname or "/data/font/DroidSans.ttf", fontsize or 12)
37 37 self.font_h = self.font:lineSkip()
38 38 self.log = {}
39 39 getmetatable(self).__call = _M.call
... ...
... ... @@ -32,7 +32,7 @@ function _M:init(x, y, w, h, max, fontname, fontsize, color, bgcolor)
32 32 self.bgcolor = bgcolor or {0,0,0}
33 33 self.display_x, self.display_y = math.floor(x), math.floor(y)
34 34 self.w, self.h = math.floor(w), math.floor(h)
35   - self.font = core.display.newFont(fontname or "/data/font/Vera.ttf", fontsize or 16)
  35 + self.font = core.display.newFont(fontname or "/data/font/DroidSans.ttf", fontsize or 16)
36 36 self.font_h = self.font:lineSkip()
37 37 self.surface = core.display.newSurface(w, h)
38 38 self.texture, self.texture_w, self.texture_h = self.surface:glTexture()
... ...
... ... @@ -398,7 +398,7 @@ function _M:loadScreen(mod)
398 398 local middle = {core.display.loadImage("/data/gfx/waiter/middle.png"):glTexture()}
399 399 local bar = {core.display.loadImage("/data/gfx/waiter/bar.png"):glTexture()}
400 400
401   - local font = core.display.newFont("/data/font/Vera.ttf", 12)
  401 + local font = core.display.newFont("/data/font/DroidSans.ttf", 12)
402 402
403 403 local dw, dh = math.floor(sw / 2), left[7]
404 404 local dx, dy = math.floor((sw - dw) / 2), sh - dh
... ...
... ... @@ -43,7 +43,7 @@ function _M:init(w, h, fontname, fontsize, texture, allow_backcolor)
43 43 self.allow_backcolor = allow_backcolor
44 44 self.texture = texture
45 45 self.w, self.h = w, h
46   - self.font = core.display.newFont(fontname or "/data/font/VeraMoBd.ttf", fontsize or 14)
  46 + self.font = core.display.newFont(fontname or "/data/font/DroidSansMono.ttf", fontsize or 14)
47 47 self.repo = {}
48 48 self.texture_store = {}
49 49 end
... ...
... ... @@ -28,12 +28,12 @@ module(..., package.seeall, class.inherit(Base))
28 28 tooltip_bound_x1 = 0
29 29 tooltip_bound_x2 = function() return game.w end
30 30 tooltip_bound_y1 = 0
31   -tooltip_bound_y2 = function() print("=============gameh", game.h)return game.h end
  31 +tooltip_bound_y2 = function() return game.h end
32 32
33 33 function _M:init(fontname, fontsize, color, bgcolor, max)
34 34 self.max = max or 300
35 35 self.ui = "simple"
36   - self.font = {fontname or "/data/font/Vera.ttf", fontsize or 12}
  36 + self.font = {fontname or "/data/font/DroidSans.ttf", fontsize or 12}
37 37 self.default_ui = { TextzoneList.new{weakstore=true, width=self.max, height=500, variable_height=true, font=self.font, ui=self.ui} }
38 38
39 39 self.uis = {}
... ...
... ... @@ -359,7 +359,7 @@ function _M:resize(x, y, w, h, fontname, fontsize, color, bgcolor)
359 359 self.bgcolor = {0,0,0}
360 360 self.bg_image = bgcolor
361 361 end
362   - self.font = core.display.newFont(fontname or "/data/font/Vera.ttf", fontsize or 12)
  362 + self.font = core.display.newFont(fontname or "/data/font/DroidSans.ttf", fontsize or 12)
363 363 self.font_h = self.font:lineSkip()
364 364
365 365 self.scroll = 0
... ...
... ... @@ -29,12 +29,12 @@ local cache = {}
29 29 local tcache = {}
30 30
31 31 -- Default font
32   -_M.font = core.display.newFont("/data/font/Vera.ttf", 12)
  32 +_M.font = core.display.newFont("/data/font/DroidSans.ttf", 12)
33 33 _M.font_h = _M.font:lineSkip()
34   -_M.font_mono = core.display.newFont("/data/font/VeraMono.ttf", 12)
  34 +_M.font_mono = core.display.newFont("/data/font/DroidSansMono.ttf", 12)
35 35 _M.font_mono_w = _M.font_mono:size(" ")
36 36 _M.font_mono_h = _M.font_mono:lineSkip()
37   -_M.font_bold = core.display.newFont("/data/font/VeraBd.ttf", 12)
  37 +_M.font_bold = core.display.newFont("/data/font/DroidSans-Bold.ttf", 12)
38 38 _M.font_bold_h = _M.font_bold:lineSkip()
39 39
40 40 -- Default UI
... ...
... ... @@ -23,7 +23,7 @@ local Focusable = require "engine.ui.Focusable"
23 23
24 24 module(..., package.seeall, class.inherit(Base, Focusable))
25 25
26   -_M.font = core.display.newFont("/data/font/Vera.ttf", 10)
  26 +_M.font = core.display.newFont("/data/font/DroidSans.ttf", 10)
27 27 _M.font_h = _M.font:lineSkip()
28 28
29 29 function _M:init(t)
... ...
... ... @@ -27,7 +27,7 @@ function _M:init(text, key_source, force_all)
27 27 self.text = text or "Gesture: "
28 28 self.gesture = ""
29 29 self.gestures = {}
30   - self.font = core.display.newFont("/data/font/Vera.ttf", 12)
  30 + self.font = core.display.newFont("/data/font/DroidSans.ttf", 12)
31 31
32 32 local gesttext = self.text.."WWWWW"
33 33 self.fontmax_w, self.font_h = self.font:size(gesttext)
... ...
... ... @@ -50,7 +50,7 @@ function _M:init()
50 50 engine.interface.GameMusic.init(self)
51 51 engine.interface.GameSound.init(self)
52 52 engine.GameEnergyBased.init(self, engine.KeyBind.new(), 100, 100)
53   - self.profile_font = core.display.newFont("/data/font/VeraIt.ttf", 14)
  53 + self.profile_font = core.display.newFont("/data/font/DroidSerif-Italic.ttf", 14)
54 54 self.background = core.display.loadImage("/data/gfx/background/tome.png")
55 55 if self.background then
56 56 self.background_w, self.background_h = self.background:getSize()
... ...
... ... @@ -59,7 +59,7 @@ function _M:init()
59 59 self.c_auth = Textzone.new{auto_width=true, auto_height=true, text=str}
60 60 end
61 61
62   - self.c_list = List.new{width=self.iw, nb_items=#self.list, list=self.list, fct=function(item) end, font={"/data/font/VeraBd.ttf", 16}}
  62 + self.c_list = List.new{width=self.iw, nb_items=#self.list, list=self.list, fct=function(item) end, font={"/data/font/DroidSans-Bold.ttf", 16}}
63 63
64 64 self:loadUI{
65 65 {left=0, top=0, ui=self.c_list},
... ...
... ... @@ -134,14 +134,14 @@ function _M:run()
134 134 end)
135 135
136 136 -- Create the map scroll text overlay
137   - local lfont = core.display.newFont("/data/font/Vera.ttf", 30)
  137 + local lfont = core.display.newFont("/data/font/DroidSans.ttf", 30)
138 138 lfont:setStyle("bold")
139 139 local s = core.display.drawStringBlendedNewSurface(lfont, "<Scroll mode, press keys to scroll, caps lock to exit>", unpack(colors.simple(colors.GOLD)))
140 140 lfont:setStyle("normal")
141 141 self.caps_scroll = {s:glTexture()}
142 142 self.caps_scroll.w, self.caps_scroll.h = s:getSize()
143 143
144   - self.zone_font = core.display.newFont("/data/font/Vera.ttf", 12)
  144 + self.zone_font = core.display.newFont("/data/font/DroidSans.ttf", 12)
145 145
146 146 self.inited = true
147 147 end
... ...
... ... @@ -120,9 +120,9 @@ ammo_shot = {core.display.loadImage("/data/gfx/ui/resources/ammo_shot.png"):glTe
120 120 _M['ammo_shadow_alchemist-gem'] = {core.display.loadImage("/data/gfx/ui/resources/ammo_shadow_alchemist-gem.png"):glTexture()}
121 121 _M['ammo_alchemist-gem'] = {core.display.loadImage("/data/gfx/ui/resources/ammo_alchemist-gem.png"):glTexture()}
122 122
123   -font_sha = core.display.newFont("/data/font/USENET_.ttf", 14, true)
  123 +font_sha = core.display.newFont("/data/font/DroidSans.ttf", 14, true)
124 124 font_sha:setStyle("bold")
125   -sfont_sha = core.display.newFont("/data/font/USENET_.ttf", 12, true)
  125 +sfont_sha = core.display.newFont("/data/font/DroidSans.ttf", 12, true)
126 126 sfont_sha:setStyle("bold")
127 127
128 128 icon_green = { core.display.loadImage("/data/gfx/ui/talent_frame_ok.png"):glTexture() }
... ... @@ -302,8 +302,8 @@ function _M:activate()
302 302 if config.settings.tome.fonts.type == "fantasy" then
303 303 size = ({normal=16, small=14, big=18})[config.settings.tome.fonts.size]
304 304 size_mono = ({normal=14, small=10, big=16})[config.settings.tome.fonts.size]
305   - font = "/data/font/USENET_.ttf"
306   - font_mono = "/data/font/SVBasicManual.ttf"
  305 + font = "/data/font/DroidSans.ttf"
  306 + font_mono = "/data/font/DroidSansMono.ttf"
307 307 else
308 308 size = ({normal=12, small=10, big=14})[config.settings.tome.fonts.size]
309 309 size_mono = ({normal=12, small=10, big=14})[config.settings.tome.fonts.size]
... ...
... ... @@ -38,7 +38,7 @@ function _M:init(actor)
38 38 self.actor = actor
39 39 Dialog.init(self, "Character Sheet: "..self.actor.name, math.max(game.w * 0.7, 950), 500)
40 40
41   - self.font = core.display.newFont("/data/font/VeraMono.ttf", 12)
  41 + self.font = core.display.newFont("/data/font/DroidSansMono.ttf", 12)
42 42 self.font_h = self.font:lineSkip()
43 43
44 44 self.c_general = Tab.new{title="General", default=true, fct=function() end, on_change=function(s) if s then self:switchTo("general") end end}
... ...
... ... @@ -56,7 +56,7 @@ function _M:init(actor, on_finish, on_birth)
56 56 self.talent_types_learned = {}
57 57 self.stats_increased = {}
58 58
59   - self.font = core.display.newFont("/data/font/VeraMono.ttf", 12)
  59 + self.font = core.display.newFont("/data/font/DroidSansMono.ttf", 12)
60 60 self.font_h = self.font:lineSkip()
61 61
62 62 self.actor.__hidden_talent_types = self.actor.__hidden_talent_types or {}
... ...
... ... @@ -89,9 +89,9 @@ UIBase:setTextShadow(0.6)
89 89 -- Dialogs fonts
90 90 if config.settings.tome.fonts.type == "fantasy" then
91 91 local size = ({normal=16, small=12, big=18})[config.settings.tome.fonts.size]
92   - UIBase.font = core.display.newFont("/data/font/USENET_.ttf", size)
93   - UIBase.font_bold = core.display.newFont("/data/font/USENET_.ttf", size)
94   - UIBase.font_mono = core.display.newFont("/data/font/SVBasicManual.ttf", size)
  92 + UIBase.font = core.display.newFont("/data/font/DroidSans.ttf", size)
  93 + UIBase.font_bold = core.display.newFont("/data/font/DroidSans.ttf", size)
  94 + UIBase.font_mono = core.display.newFont("/data/font/DroidSansMono.ttf", size)
95 95 UIBase.font_bold:setStyle("bold")
96 96 UIBase.font_h = UIBase.font:lineSkip()
97 97 UIBase.font_bold_h = UIBase.font_bold:lineSkip()
... ...