Skip to content
Snippets Groups Projects
Commit e6b4ce6f authored by DarkGod's avatar DarkGod
Browse files

Merge branch 'i18n'

parents 9cf6a0a3 616936a8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 180 additions and 145 deletions
.gitignore
+ 4
− 1
View file @ e6b4ce6f
......@@ -26,5 +26,8 @@ game/engines/default/modules/boot/data/gfx/ts-gfx*
debug-recompile.sh
profiling-recompile.sh
recompile.sh
*.exe
*.dll
te4_log.txt
debug.log
/.idea/
game/engines/default/data/font/WenQuanYiMicroHei.ttf 0 → 100644
+ 0
− 0
View file @ e6b4ce6f
File added
game/engines/default/data/font/WenQuanYiMicroHeiMono.ttf 0 → 100644
+ 0
− 0
View file @ e6b4ce6f
File added
game/engines/default/data/font/packages/default.lua
+ 24
− 0
View file @ e6b4ce6f
......@@ -26,6 +26,9 @@ newPackage{ id = "basic", name = "Basic", weight = 1,
bignews = {font="/data/font/VeraMono.ttf", normal=30},
resources_normal = {font="/data/font/Vera.ttf", bold=true, normal=12},
resources_small = {font="/data/font/Vera.ttf", bold=true, normal=10},
classic = {font="/data/font/Vera.ttf", normal=12, small=10, big=14},
classic_mono = {font="/data/font/VeraMono.ttf", normal=12, small=10, big=14},
insular = {font="/data/font/INSULA__.ttf", normal=14, small=12, big=16},
}
newPackage{ id = "web", name = "Web", weight = 10,
......@@ -39,6 +42,9 @@ newPackage{ id = "web", name = "Web", weight = 10,
bignews = {font="/data/font/DroidSansMono.ttf", normal=30},
resources_normal = {font="/data/font/DroidSans.ttf", bold=true, normal=12},
resources_small = {font="/data/font/DroidSans.ttf", bold=true, normal=10},
classic = {font="/data/font/USENET_.ttf", normal=16, small=14, big=18},
classic_mono = {font="/data/font/SVBasicManual.ttf", normal=14, small=10, big=16},
insular = {font="/data/font/INSULA__.ttf", normal=14, small=12, big=16},
}
newPackage{ id = "fantasy", name = "Fantasy", weight = 100,
......@@ -51,4 +57,22 @@ newPackage{ id = "fantasy", name = "Fantasy", weight = 100,
bignews = {font="/data/font/Salsa-Regular.ttf", normal=30},
resources_normal = {font="/data/font/Salsa-Regular.ttf", normal=14},
resources_small = {font="/data/font/Salsa-Regular.ttf", normal=12},
classic = {font="/data/font/USENET_.ttf", normal=16, small=14, big=18},
classic_mono = {font="/data/font/SVBasicManual.ttf", normal=14, small=10, big=16},
insular = {font="/data/font/INSULA__.ttf", normal=14, small=12, big=16},
}
newPackage{ id = "chinese", name = "Chinese", weight = 100,
small = {font="/data/font/WenQuanYiMicroHei.ttf", normal=12, small=10, big=14},
default = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16, small=12, big=18},
bold = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16, small=12, big=18},
mono = {font="/data/font/WenQuanYiMicroHeiMono.ttf", normal=16, small=12, big=18},
mono_small = {font="/data/font/WenQuanYiMicroHeiMono.ttf", normal=14, small=10, big=16},
flyer = {font="/data/font/WenQuanYiMicroHei.ttf", normal=14, small=12, big=16},
bignews = {font="/data/font/WenQuanYiMicroHei.ttf", normal=30},
resources_normal = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16},
resources_small = {font="/data/font/WenQuanYiMicroHei.ttf", normal=14},
classic = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16, small=14, big=18},
classic_mono = {font="/data/font/WenQuanYiMicroHeiMono.ttf", normal=14, small=10, big=16},
}
game/engines/default/data/keybinds/actions.lua
+ 16
− 16
View file @ e6b4ce6f
......@@ -21,109 +21,109 @@ defineAction{
default = { "uni:<", "uni:>" },
type = "CHANGE_LEVEL",
group = "actions",
name = "Go to next/previous level",
name = _t"Go to next/previous level",
}
defineAction{
default = { "sym:=p:false:false:false:false", "sym:=g:false:true:false:false" },
type = "LEVELUP",
group = "actions",
name = "Levelup window",
name = _t"Levelup window",
}
defineAction{
default = { "sym:=m:false:false:false:false" },
type = "USE_TALENTS",
group = "actions",
name = "Use talents",
name = _t"Use talents",
}
defineAction{
default = { "sym:=j:false:false:false:false", "sym:_q:true:false:false:false" },
type = "SHOW_QUESTS",
group = "actions",
name = "Show quests",
name = _t"Show quests",
}
defineAction{
default = { "sym:=r:false:false:false:false", "sym:=r:false:true:false:false" },
type = "REST",
group = "actions",
name = "Rest for a while",
name = _t"Rest for a while",
}
defineAction{
default = { "sym:_s:true:false:false:false" },
type = "SAVE_GAME",
group = "actions",
name = "Save game",
name = _t"Save game",
}
defineAction{
default = { "sym:_x:true:false:false:false" },
type = "QUIT_GAME",
group = "actions",
name = "Quit game",
name = _t"Quit game",
}
defineAction{
default = { "sym:_t:false:true:false:false" },
type = "TACTICAL_DISPLAY",
group = "actions",
name = "Tactical display on/off",
name = _t"Tactical display on/off",
}
defineAction{
default = { "sym:=l:false:false:false:false" },
type = "LOOK_AROUND",
group = "actions",
name = "Look around",
name = _t"Look around",
}
defineAction{
default = { "sym:_HOME:true:false:false:false"},
type = "CENTER_ON_PLAYER",
group = "actions",
name = "Center the view on the player",
name = _t"Center the view on the player",
}
defineAction{
default = { "sym:_TAB:false:false:false:false" },
type = "TOGGLE_MINIMAP",
group = "actions",
name = "Toggle minimap",
name = _t"Toggle minimap",
}
defineAction{
default = { "sym:=t:true:false:false:false" },
type = "SHOW_TIME",
group = "actions",
name = "Show game calendar",
name = _t"Show game calendar",
}
defineAction{
default = { "sym:=c:false:false:false:false", "sym:=c:false:true:false:false" },
type = "SHOW_CHARACTER_SHEET",
group = "actions",
name = "Show character sheet",
name = _t"Show character sheet",
}
defineAction{
default = { "sym:_s:false:false:true:false" },
type = "SWITCH_GFX",
group = "actions",
name = "Switch graphical modes",
name = _t"Switch graphical modes",
}
defineAction{
default = { "sym:_RETURN:false:false:false:false", "sym:_KP_ENTER:false:false:false:false" },
type = "ACCEPT",
group = "actions",
name = "Accept action",
name = _t"Accept action",
}
defineAction{
default = { "sym:_ESCAPE:false:false:false:false" },
type = "EXIT",
group = "actions",
name = "Exit menu",
name = _t"Exit menu",
}
game/engines/default/data/keybinds/chat.lua
+ 3
− 3
View file @ e6b4ce6f
......@@ -21,19 +21,19 @@ defineAction{
default = { "sym:_SPACE:false:false:false:false" },
type = "USERCHAT_TALK",
group = "user chat",
name = "Talk to people",
name = _t"Talk to people",
}
defineAction{
default = { "sym:_SPACE:true:false:false:false" },
type = "USERCHAT_SHOW_TALK",
group = "user chat",
name = "Display chat log",
name = _t"Display chat log",
}
defineAction{
default = { "sym:_SPACE:false:true:false:false" },
type = "USERCHAT_SWITCH_CHANNEL",
group = "user chat",
name = "Cycle chat channels",
name = _t"Cycle chat channels",
}
game/engines/default/data/keybinds/debug.lua
+ 2
− 2
View file @ e6b4ce6f
......@@ -21,7 +21,7 @@ defineAction{
default = { "sym:_l:true:false:false:false" },
type = "LUA_CONSOLE",
group = "debug",
name = "Show Lua console",
name = _t"Show Lua console",
only_on_cheat = true,
}
......@@ -29,6 +29,6 @@ defineAction{
default = { "sym:_a:true:false:false:false" },
type = "DEBUG_MODE",
group = "debug",
name = "Debug Mode",
name = _t"Debug Mode",
only_on_cheat = true,
}
game/engines/default/data/keybinds/hotkeys.lua
+ 64
− 64
View file @ e6b4ce6f
......@@ -22,73 +22,73 @@ defineAction{
default = { "sym:_1:false:false:false:false" },
type = "HOTKEY_1",
group = "hotkeys",
name = "Hotkey 1",
name = _t"Hotkey 1",
}
defineAction{
default = { "sym:_2:false:false:false:false" },
type = "HOTKEY_2",
group = "hotkeys",
name = "Hotkey 2",
name = _t"Hotkey 2",
}
defineAction{
default = { "sym:_3:false:false:false:false" },
type = "HOTKEY_3",
group = "hotkeys",
name = "Hotkey 3",
name = _t"Hotkey 3",
}
defineAction{
default = { "sym:_4:false:false:false:false" },
type = "HOTKEY_4",
group = "hotkeys",
name = "Hotkey 4",
name = _t"Hotkey 4",
}
defineAction{
default = { "sym:_5:false:false:false:false" },
type = "HOTKEY_5",
group = "hotkeys",
name = "Hotkey 5",
name = _t"Hotkey 5",
}
defineAction{
default = { "sym:_6:false:false:false:false" },
type = "HOTKEY_6",
group = "hotkeys",
name = "Hotkey 6",
name = _t"Hotkey 6",
}
defineAction{
default = { "sym:_7:false:false:false:false" },
type = "HOTKEY_7",
group = "hotkeys",
name = "Hotkey 7",
name = _t"Hotkey 7",
}
defineAction{
default = { "sym:_8:false:false:false:false" },
type = "HOTKEY_8",
group = "hotkeys",
name = "Hotkey 8",
name = _t"Hotkey 8",
}
defineAction{
default = { "sym:_9:false:false:false:false" },
type = "HOTKEY_9",
group = "hotkeys",
name = "Hotkey 9",
name = _t"Hotkey 9",
}
defineAction{
default = { "sym:_0:false:false:false:false" },
type = "HOTKEY_10",
group = "hotkeys",
name = "Hotkey 10",
name = _t"Hotkey 10",
}
defineAction{
default = { "sym:_MINUS:false:false:false:false" },
type = "HOTKEY_11",
group = "hotkeys",
name = "Hotkey 11",
name = _t"Hotkey 11",
}
defineAction{
default = { "sym:_EQUALS:false:false:false:false" },
type = "HOTKEY_12",
group = "hotkeys",
name = "Hotkey 12",
name = _t"Hotkey 12",
}
-- Ctrl + Hotkeys
......@@ -96,73 +96,73 @@ defineAction{
default = { "sym:_1:true:false:false:false" },
type = "HOTKEY_SECOND_1",
group = "hotkeys",
name = "Secondary Hotkey 1",
name = _t"Secondary Hotkey 1",
}
defineAction{
default = { "sym:_2:true:false:false:false" },
type = "HOTKEY_SECOND_2",
group = "hotkeys",
name = "Secondary Hotkey 2",
name = _t"Secondary Hotkey 2",
}
defineAction{
default = { "sym:_3:true:false:false:false" },
type = "HOTKEY_SECOND_3",
group = "hotkeys",
name = "Secondary Hotkey 3",
name = _t"Secondary Hotkey 3",
}
defineAction{
default = { "sym:_4:true:false:false:false" },
type = "HOTKEY_SECOND_4",
group = "hotkeys",
name = "Secondary Hotkey 4",
name = _t"Secondary Hotkey 4",
}
defineAction{
default = { "sym:_5:true:false:false:false" },
type = "HOTKEY_SECOND_5",
group = "hotkeys",
name = "Secondary Hotkey 5",
name = _t"Secondary Hotkey 5",
}
defineAction{
default = { "sym:_6:true:false:false:false" },
type = "HOTKEY_SECOND_6",
group = "hotkeys",
name = "Secondary Hotkey 6",
name = _t"Secondary Hotkey 6",
}
defineAction{
default = { "sym:_7:true:false:false:false" },
type = "HOTKEY_SECOND_7",
group = "hotkeys",
name = "Secondary Hotkey 7",
name = _t"Secondary Hotkey 7",
}
defineAction{
default = { "sym:_8:true:false:false:false" },
type = "HOTKEY_SECOND_8",
group = "hotkeys",
name = "Secondary Hotkey 8",
name = _t"Secondary Hotkey 8",
}
defineAction{
default = { "sym:_9:true:false:false:false" },
type = "HOTKEY_SECOND_9",
group = "hotkeys",
name = "Secondary Hotkey 9",
name = _t"Secondary Hotkey 9",
}
defineAction{
default = { "sym:_0:true:false:false:false" },
type = "HOTKEY_SECOND_10",
group = "hotkeys",
name = "Secondary Hotkey 10",
name = _t"Secondary Hotkey 10",
}
defineAction{
default = { "sym:_MINUS:true:false:false:false" },
type = "HOTKEY_SECOND_11",
group = "hotkeys",
name = "Secondary Hotkey 11",
name = _t"Secondary Hotkey 11",
}
defineAction{
default = { "sym:_EQUALS:true:false:false:false" },
type = "HOTKEY_SECOND_12",
group = "hotkeys",
name = "Secondary Hotkey 12",
name = _t"Secondary Hotkey 12",
}
-- Shift + Hotkeys
......@@ -170,73 +170,73 @@ defineAction{
default = { "sym:_1:false:true:false:false" },
type = "HOTKEY_THIRD_1",
group = "hotkeys",
name = "Third Hotkey 1",
name = _t"Third Hotkey 1",
}
defineAction{
default = { "sym:_2:false:true:false:false" },
type = "HOTKEY_THIRD_2",
group = "hotkeys",
name = "Third Hotkey 2",
name = _t"Third Hotkey 2",
}
defineAction{
default = { "sym:_3:false:true:false:false" },
type = "HOTKEY_THIRD_3",
group = "hotkeys",
name = "Third Hotkey 3",
name = _t"Third Hotkey 3",
}
defineAction{
default = { "sym:_4:false:true:false:false" },
type = "HOTKEY_THIRD_4",
group = "hotkeys",
name = "Third Hotkey 4",
name = _t"Third Hotkey 4",
}
defineAction{
default = { "sym:_5:false:true:false:false" },
type = "HOTKEY_THIRD_5",
group = "hotkeys",
name = "Third Hotkey 5",
name = _t"Third Hotkey 5",
}
defineAction{
default = { "sym:_6:false:true:false:false" },
type = "HOTKEY_THIRD_6",
group = "hotkeys",
name = "Third Hotkey 6",
name = _t"Third Hotkey 6",
}
defineAction{
default = { "sym:_7:false:true:false:false" },
type = "HOTKEY_THIRD_7",
group = "hotkeys",
name = "Third Hotkey 7",
name = _t"Third Hotkey 7",
}
defineAction{
default = { "sym:_8:false:true:false:false" },
type = "HOTKEY_THIRD_8",
group = "hotkeys",
name = "Third Hotkey 8",
name = _t"Third Hotkey 8",
}
defineAction{
default = { "sym:_9:false:true:false:false" },
type = "HOTKEY_THIRD_9",
group = "hotkeys",
name = "Third Hotkey 9",
name = _t"Third Hotkey 9",
}
defineAction{
default = { "sym:_0:false:true:false:false" },
type = "HOTKEY_THIRD_10",
group = "hotkeys",
name = "Third Hotkey 10",
name = _t"Third Hotkey 10",
}
defineAction{
default = { "sym:_MINUS:false:true:false:false" },
type = "HOTKEY_THIRD_11",
group = "hotkeys",
name = "Third Hotkey 11",
name = _t"Third Hotkey 11",
}
defineAction{
default = { "sym:_EQUALS:false:true:false:false" },
type = "HOTKEY_THIRD_12",
group = "hotkeys",
name = "Third Hotkey 12",
name = _t"Third Hotkey 12",
}
-- Alt + Hotkeys
......@@ -244,73 +244,73 @@ defineAction{
default = { "sym:_1:false:false:true:false" },
type = "HOTKEY_FOURTH_1",
group = "hotkeys",
name = "Fourth Hotkey 1",
name = _t"Fourth Hotkey 1",
}
defineAction{
default = { "sym:_2:false:false:true:false" },
type = "HOTKEY_FOURTH_2",
group = "hotkeys",
name = "Fourth Hotkey 2",
name = _t"Fourth Hotkey 2",
}
defineAction{
default = { "sym:_3:false:false:true:false" },
type = "HOTKEY_FOURTH_3",
group = "hotkeys",
name = "Fourth Hotkey 3",
name = _t"Fourth Hotkey 3",
}
defineAction{
default = { "sym:_4:false:false:true:false" },
type = "HOTKEY_FOURTH_4",
group = "hotkeys",
name = "Fourth Hotkey 4",
name = _t"Fourth Hotkey 4",
}
defineAction{
default = { "sym:_5:false:false:true:false" },
type = "HOTKEY_FOURTH_5",
group = "hotkeys",
name = "Fourth Hotkey 5",
name = _t"Fourth Hotkey 5",
}
defineAction{
default = { "sym:_6:false:false:true:false" },
type = "HOTKEY_FOURTH_6",
group = "hotkeys",
name = "Fourth Hotkey 6",
name = _t"Fourth Hotkey 6",
}
defineAction{
default = { "sym:_7:false:false:true:false" },
type = "HOTKEY_FOURTH_7",
group = "hotkeys",
name = "Fourth Hotkey 7",
name = _t"Fourth Hotkey 7",
}
defineAction{
default = { "sym:_8:false:false:true:false" },
type = "HOTKEY_FOURTH_8",
group = "hotkeys",
name = "Fourth Hotkey 8",
name = _t"Fourth Hotkey 8",
}
defineAction{
default = { "sym:_9:false:false:true:false" },
type = "HOTKEY_FOURTH_9",
group = "hotkeys",
name = "Fourth Hotkey 9",
name = _t"Fourth Hotkey 9",
}
defineAction{
default = { "sym:_0:false:false:true:false" },
type = "HOTKEY_FOURTH_10",
group = "hotkeys",
name = "Fourth Hotkey 10",
name = _t"Fourth Hotkey 10",
}
defineAction{
default = { "sym:_MINUS:false:false:true:false" },
type = "HOTKEY_FOURTH_11",
group = "hotkeys",
name = "Fourth Hotkey 11",
name = _t"Fourth Hotkey 11",
}
defineAction{
default = { "sym:_EQUALS:false:false:true:false" },
type = "HOTKEY_FOURTH_12",
group = "hotkeys",
name = "Fourth Hotkey 12",
name = _t"Fourth Hotkey 12",
}
-- Alt + Shift + Hotkeys
......@@ -318,86 +318,86 @@ defineAction{
default = { "sym:_1:false:true:true:false" },
type = "HOTKEY_FIFTH_1",
group = "hotkeys",
name = "Fifth Hotkey 1",
name = _t"Fifth Hotkey 1",
}
defineAction{
default = { "sym:_2:false:true:true:false" },
type = "HOTKEY_FIFTH_2",
group = "hotkeys",
name = "Fifth Hotkey 2",
name = _t"Fifth Hotkey 2",
}
defineAction{
default = { "sym:_3:false:true:true:false" },
type = "HOTKEY_FIFTH_3",
group = "hotkeys",
name = "Fifth Hotkey 3",
name = _t"Fifth Hotkey 3",
}
defineAction{
default = { "sym:_4:false:true:true:false" },
type = "HOTKEY_FIFTH_4",
group = "hotkeys",
name = "Fifth Hotkey 4",
name = _t"Fifth Hotkey 4",
}
defineAction{
default = { "sym:_5:false:true:true:false" },
type = "HOTKEY_FIFTH_5",
group = "hotkeys",
name = "Fifth Hotkey 5",
name = _t"Fifth Hotkey 5",
}
defineAction{
default = { "sym:_6:false:true:true:false" },
type = "HOTKEY_FIFTH_6",
group = "hotkeys",
name = "Fifth Hotkey 6",
name = _t"Fifth Hotkey 6",
}
defineAction{
default = { "sym:_7:false:true:true:false" },
type = "HOTKEY_FIFTH_7",
group = "hotkeys",
name = "Fifth Hotkey 7",
name = _t"Fifth Hotkey 7",
}
defineAction{
default = { "sym:_8:false:true:true:false" },
type = "HOTKEY_FIFTH_8",
group = "hotkeys",
name = "Fifth Hotkey 8",
name = _t"Fifth Hotkey 8",
}
defineAction{
default = { "sym:_9:false:true:true:false" },
type = "HOTKEY_FIFTH_9",
group = "hotkeys",
name = "Fifth Hotkey 9",
name = _t"Fifth Hotkey 9",
}
defineAction{
default = { "sym:_0:false:true:true:false" },
type = "HOTKEY_FIFTH_10",
group = "hotkeys",
name = "Fifth Hotkey 10",
name = _t"Fifth Hotkey 10",
}
defineAction{
default = { "sym:_MINUS:false:true:true:false" },
type = "HOTKEY_FIFTH_11",
group = "hotkeys",
name = "Fifth Hotkey 11",
name = _t"Fifth Hotkey 11",
}
defineAction{
default = { "sym:_EQUALS:false:true:true:false" },
type = "HOTKEY_FIFTH_12",
group = "hotkeys",
name = "Fifth Hotkey 12",
name = _t"Fifth Hotkey 12",
}
defineAction{
default = { "sym:_PAGEUP:false:false:false:false" },
type = "HOTKEY_PREV_PAGE",
group = "hotkeys",
name = "Previous Hotkey Page",
name = _t"Previous Hotkey Page",
}
defineAction{
default = { "sym:_PAGEDOWN:false:false:false:false" },
type = "HOTKEY_NEXT_PAGE",
group = "hotkeys",
name = "Next Hotkey Page",
name = _t"Next Hotkey Page",
}
defineAction{
......@@ -406,7 +406,7 @@ defineAction{
updown = true,
single_key = true,
group = "hotkeys",
name = "Quick switch to Hotkey Page 2",
name = _t"Quick switch to Hotkey Page 2",
}
defineAction{
default = { "sym:_LSHIFT:false:false:false:false" },
......@@ -414,5 +414,5 @@ defineAction{
updown = true,
single_key = true,
group = "hotkeys",
name = "Quick switch to Hotkey Page 3",
name = _t"Quick switch to Hotkey Page 3",
}
game/engines/default/data/keybinds/interface.lua
+ 5
− 5
View file @ e6b4ce6f
......@@ -21,33 +21,33 @@ defineAction{
default = { "sym:_TAB:true:false:false:false" },
type = "TOGGLE_NPC_LIST",
group = "actions",
name = "Toggle list of seen creatures",
name = _t"Toggle list of seen creatures",
}
defineAction{
default = { "sym:=h:false:false:false:false", "sym:=m:true:false:false:false" },
type = "SHOW_MESSAGE_LOG",
group = "actions",
name = "Show message log",
name = _t"Show message log",
}
defineAction{
default = { "sym:_PRINTSCREEN:false:false:false:false" },
type = "SCREENSHOT",
group = "actions",
name = "Take a screenshot",
name = _t"Take a screenshot",
}
defineAction{
default = { "sym:_TAB:false:false:false:false" },
type = "SHOW_MAP",
group = "actions",
name = "Show map",
name = _t"Show map",
}
defineAction{
default = { "sym:_CAPSLOCK:false:false:false:false" },
type = "SCROLL_MAP",
group = "actions",
name = "Scroll map mode",
name = _t"Scroll map mode",
}
game/engines/default/data/keybinds/inventory.lua
+ 8
− 8
View file @ e6b4ce6f
......@@ -21,51 +21,51 @@ defineAction{
default = { "sym:=i:false:false:false:false", },
type = "SHOW_INVENTORY",
group = "inventory",
name = "Show inventory",
name = _t"Show inventory",
}
defineAction{
default = { "sym:=e:false:false:false:false", },
type = "SHOW_EQUIPMENT",
group = "inventory",
name = "Show equipment",
name = _t"Show equipment",
}
defineAction{
default = { "sym:=g:false:false:false:false" },
type = "PICKUP_FLOOR",
group = "inventory",
name = "Pickup items",
name = _t"Pickup items",
}
defineAction{
default = { "sym:=d:false:false:false:false" },
type = "DROP_FLOOR",
group = "inventory",
name = "Drop items",
name = _t"Drop items",
}
defineAction{
default = { "sym:=w:false:false:false:false", },
type = "WEAR_ITEM",
group = "inventory",
name = "Wield/wear items",
name = _t"Wield/wear items",
}
defineAction{
default = { "sym:=t:false:false:false:false", },
type = "TAKEOFF_ITEM",
group = "inventory",
name = "Takeoff items",
name = _t"Takeoff items",
}
defineAction{
default = { "sym:=u:false:false:false:false", },
type = "USE_ITEM",
group = "inventory",
name = "Use items",
name = _t"Use items",
}
defineAction{
default = { "sym:=q:false:false:false:false", },
type = "QUICK_SWITCH_WEAPON",
group = "inventory",
name = "Quick switch weapons set",
name = _t"Quick switch weapons set",
}
game/engines/default/data/keybinds/move.lua
+ 19
− 19
View file @ e6b4ce6f
......@@ -22,56 +22,56 @@ defineAction{
default = { "sym:_LEFT:false:false:false:false", "sym:_KP_4:false:false:false:false" },
type = "MOVE_LEFT",
group = "movement",
name = "Move left",
name = _t"Move left",
}
defineAction{
default = { "sym:_RIGHT:false:false:false:false", "sym:_KP_6:false:false:false:false" },
type = "MOVE_RIGHT",
group = "movement",
name = "Move right",
name = _t"Move right",
}
defineAction{
default = { "sym:_UP:false:false:false:false", "sym:_KP_8:false:false:false:false" },
type = "MOVE_UP",
group = "movement",
name = "Move up",
name = _t"Move up",
}
defineAction{
default = { "sym:_DOWN:false:false:false:false", "sym:_KP_2:false:false:false:false" },
type = "MOVE_DOWN",
group = "movement",
name = "Move down",
name = _t"Move down",
}
defineAction{
default = { "sym:_KP_7:false:false:false:false" },
type = "MOVE_LEFT_UP",
group = "movement",
name = "Move diagonally left and up",
name = _t"Move diagonally left and up",
}
defineAction{
default = { "sym:_KP_9:false:false:false:false" },
type = "MOVE_RIGHT_UP",
group = "movement",
name = "Move diagonally right and up",
name = _t"Move diagonally right and up",
}
defineAction{
default = { "sym:_KP_1:false:false:false:false" },
type = "MOVE_LEFT_DOWN",
group = "movement",
name = "Move diagonally left and down",
name = _t"Move diagonally left and down",
}
defineAction{
default = { "sym:_KP_3:false:false:false:false" },
type = "MOVE_RIGHT_DOWN",
group = "movement",
name = "Move diagonally right and down",
name = _t"Move diagonally right and down",
}
defineAction{
default = { "sym:_KP_5:false:false:false:false" },
type = "MOVE_STAY",
group = "movement",
name = "Stay for a turn",
name = _t"Stay for a turn",
}
-- Running
......@@ -79,59 +79,59 @@ defineAction{
default = { "sym:=.:false:false:false:false" },
type = "RUN",
group = "movement",
name = "Run",
name = _t"Run",
}
defineAction{
default = { "sym:_LEFT:false:true:false:false", "sym:_KP_4:false:true:false:false" },
type = "RUN_LEFT",
group = "movement",
name = "Run left",
name = _t"Run left",
}
defineAction{
default = { "sym:_RIGHT:false:true:false:false", "sym:_KP_6:false:true:false:false" },
type = "RUN_RIGHT",
group = "movement",
name = "Run right",
name = _t"Run right",
}
defineAction{
default = { "sym:_UP:false:true:false:false", "sym:_KP_8:false:true:false:false" },
type = "RUN_UP",
group = "movement",
name = "Run up",
name = _t"Run up",
}
defineAction{
default = { "sym:_DOWN:false:true:false:false", "sym:_KP_2:false:true:false:false" },
type = "RUN_DOWN",
group = "movement",
name = "Run down",
name = _t"Run down",
}
defineAction{
default = { "sym:_KP_7:false:true:false:false" },
type = "RUN_LEFT_UP",
group = "movement",
name = "Run diagonally left and up",
name = _t"Run diagonally left and up",
}
defineAction{
default = { "sym:_KP_9:false:true:false:false" },
type = "RUN_RIGHT_UP",
group = "movement",
name = "Run diagonally right and up",
name = _t"Run diagonally right and up",
}
defineAction{
default = { "sym:_KP_1:false:true:false:false" },
type = "RUN_LEFT_DOWN",
group = "movement",
name = "Run diagonally left and down",
name = _t"Run diagonally left and down",
}
defineAction{
default = { "sym:_KP_3:false:true:false:false" },
type = "RUN_RIGHT_DOWN",
group = "movement",
name = "Run diagonally right and down",
name = _t"Run diagonally right and down",
}
defineAction{
default = { "sym:_z:false:false:false:false" },
type = "RUN_AUTO",
group = "movement",
name = "Auto-explore",
name = _t"Auto-explore",
}
game/engines/default/data/keybinds/mtxn.lua
+ 2
− 2
View file @ e6b4ce6f
......@@ -21,7 +21,7 @@ defineAction{
default = { "sym:_y:true:false:false:false" },
type = "MTXN_PURCHASE",
group = "microtransactions - cosmetic",
name = "List purchasable",
name = _t"List purchasable",
check = function() return profile:canMTXN() end,
}
......@@ -29,6 +29,6 @@ defineAction{
default = { "sym:_y:false:false:true:false" },
type = "MTXN_USE",
group = "microtransactions - cosmetic",
name = "Use purchased",
name = _t"Use purchased",
check = function() return profile:canMTXN() end,
}
game/engines/default/engine/Actor.lua
+ 4
− 0
View file @ e6b4ce6f
......@@ -611,3 +611,7 @@ function _M:him_her() return string.him_her(self) end
--- he/she/self formatting
-- @return string.his_her_self(self)
function _M:his_her_self() return string.his_her_self(self) end
function _M:getName()
return _t(self.name)
end
\ No newline at end of file
game/engines/default/engine/ActorsSeenDisplay.lua
+ 1
− 1
View file @ e6b4ce6f
......@@ -108,7 +108,7 @@ function _M:display()
local x, y = 0, 0
for i, a in ipairs(l) do
self.surface:drawColorStringBlended(self.font, ("%s (%d)#WHITE#; distance [%s]"):format(a.name, a.nb, table.concat(a.dist, ",")), x, y, a.color[1], a.color[2], a.color[3])
self.surface:drawColorStringBlended(self.font, ("%s (%d)#WHITE#; distance [%s]"):tformat(a.name, a.nb, table.concat(a.dist, ",")), x, y, a.color[1], a.color[2], a.color[3])
y = y + self.font_h
if y + self.font_h >= self.h then y = 0 x = x + math.floor(self.w / self.nb_cols) end
end
......
game/engines/default/engine/Birther.lua
+ 10
− 10
View file @ e6b4ce6f
......@@ -66,7 +66,7 @@ function _M:newBirthDescriptor(t)
assert(t.type, "no birth type")
t.short_name = t.short_name or t.name
t.short_name = t.short_name:upper():gsub("[ ]", "_")
t.display_name = t.display_name or t.name
t.display_name = t.display_name or _t(t.name, "birth descriptor name")
assert(t.desc, "no birth description")
if type(t.desc) == "table" then t.desc = table.concat(t.desc, "\n") end
t.desc = t.desc:gsub("\n\t+", "\n")
......@@ -103,7 +103,7 @@ function _M:init(title, actor, order, at_end, quickbirth, w, h)
self.order = order
if order.get_name then
self.at_end = function()
game:registerDialog(require('engine.dialogs.GetText').new("Enter your character's name", "Name", 2, 25, function(text)
game:registerDialog(require('engine.dialogs.GetText').new(_t"Enter your character's name", _t"Name", 2, 25, function(text)
game:setPlayerName(text)
at_end()
end, function()
......@@ -114,22 +114,22 @@ function _M:init(title, actor, order, at_end, quickbirth, w, h)
self.at_end = at_end
end
Dialog.init(self, title and title or ("Character Creation: "..actor.name), w or 600, h or 400)
Dialog.init(self, title and title or ("Character Creation: %s"):tformat(actor:getName()), w or 600, h or 400)
self.descriptors = {}
self.descriptors_by_type = {}
self.c_tut = Textzone.new{width=math.floor(self.iw / 2 - 10), height=1, auto_height=true, no_color_bleed=true, text=[[
self.c_tut = Textzone.new{width=math.floor(self.iw / 2 - 10), height=1, auto_height=true, no_color_bleed=true, text=_t[[
Keyboard: #00FF00#up key/down key#FFFFFF# to select an option; #00FF00#Enter#FFFFFF# to accept; #00FF00#Backspace#FFFFFF# to go back.
Mouse: #00FF00#Left click#FFFFFF# to accept; #00FF00#right click#FFFFFF# to go back.
]]}
self.c_random = Button.new{text="Random", width=math.floor(self.iw / 2 - 40), fct=function() self:randomSelect() end}
self.c_desc = Textzone.new{width=math.floor(self.iw / 2 - 10), height=self.ih - self.c_tut.h - 20, scrollbar=true, no_color_bleed=true, text=""}
self.c_random = Button.new{text=_t"Random", width=math.floor(self.iw / 2 - 40), fct=function() self:randomSelect() end}
self.c_desc = Textzone.new{width=math.floor(self.iw / 2 - 10), height=self.ih - self.c_tut.h - 20, scrollbar=true, no_color_bleed=true, text=_t""}
self.c_list = ListColumns.new{width=math.floor(self.iw / 2 - 10), height=self.ih - 10 - self.c_random.h, scrollbar=true, all_clicks=true, columns={
{name="", width=8, display_prop="char"},
{name="", width=92, display_prop="display_name"},
{name=_t"", width=8, display_prop="char"},
{name=_t"", width=92, display_prop="display_name"},
}, list={}, fct=function(item, sel, button, event)
self.sel = sel
if (event == "key" or event == "button") and button == "left" then self:next()
......@@ -178,12 +178,12 @@ function _M:on_register()
self.do_quickbirth = true
self:quickBirth()
else
self:yesnoPopup("Quick Birth", "Do you want to recreate the same character?", function(ret)
self:yesnoPopup(_t"Quick Birth", _t"Do you want to recreate the same character?", function(ret)
if ret then
self.do_quickbirth = true
self:quickBirth()
end
end, "Recreate", "New character")
end, _t"Recreate", _t"New character")
end
end
end
......
game/engines/default/engine/Calendar.lua
+ 1
− 1
View file @ e6b4ce6f
......@@ -67,7 +67,7 @@ end
function _M:getTimeDate(turn, dstr)
local doy, year = self:getDayOfYear(turn)
local hour, min = self:getTimeOfDay(turn)
return (dstr or self.datestring):format(tostring(self:getDayOfMonth(doy)):ordinal(), self:getMonthName(doy), tostring(year):ordinal(), hour, min)
return (dstr or self.datestring):tformat(tostring(self:getDayOfMonth(doy)):ordinal(), self:getMonthName(doy), tostring(year):ordinal(), hour, min)
end
--- Get what day of the year it is based on turn
......
game/engines/default/engine/Chat.lua
+ 2
− 2
View file @ e6b4ce6f
......@@ -127,7 +127,7 @@ end
--- Replace some keywords in the given text
-- @string text @playername@, @npcname@, @playerdescriptor.(.-)@
function _M:replace(text)
text = text:gsub("@playername@", self.player.name):gsub("@npcname@", self.npc.name)
text = text:gsub("@playerdescriptor.(.-)@", function(what) return self.player.descriptor["fake_"..what] or self.player.descriptor[what] end)
text = text:noun_sub("@playername@", self.player:getName()):noun_sub("@npcname@", self.npc.getName and self.npc:getName() or _t(self.npc.name, "entity name"))
text = text:gsub("@playerdescriptor.(.-)@", function(what) return _t(self.player.descriptor["fake_"..what] or self.player.descriptor[what]) end)
return text
end
game/engines/default/engine/DebugConsole.lua
+ 2
− 1
View file @ e6b4ce6f
......@@ -19,6 +19,7 @@
require "engine.class"
require "engine.Dialog"
local FontPackage = require "engine.FontPackage"
--- Debug Console
-- @classmod engine.DebugConsole
......@@ -133,7 +134,7 @@ function _M:init()
self.blink_period = 20
self.blink = self.blink_period
local w, h = core.display.size()
engine.Dialog.init(self, "Lua Console", w, h, 0, 0, nil, core.display.newFont("/data/font/DroidSansMono.ttf", 12))
engine.Dialog.init(self, _t"Lua Console", w, h, 0, 0, nil, core.display.newFont(FontPackage:getFont("mono"), 12))
game:onTickEnd(function() self.key:unicodeInput(true) end)
self:keyCommands{
_RETURN = function()
......
game/engines/default/engine/Dialog.lua
+ 8
− 8
View file @ e6b4ce6f
......@@ -110,11 +110,11 @@ function _M:yesnoPopup(title, text, fct, yes_text, no_text)
d.drawDialog = function(self, s)
s:drawColorStringCentered(self.font, text, 2, 2, self.iw - 2, 25 - 2)
if d.sel == 0 then
s:drawColorStringCentered(self.font, yes_text or "Yes", 2, 25, self.iw / 2 - 2, 50 - 2, 0, 255, 255)
s:drawColorStringCentered(self.font, no_text or "No", 2 + self.iw / 2, 25, self.iw / 2 - 2, 50 - 2, 255, 255, 255)
s:drawColorStringCentered(self.font, yes_text or _t"Yes", 2, 25, self.iw / 2 - 2, 50 - 2, 0, 255, 255)
s:drawColorStringCentered(self.font, no_text or _t"No", 2 + self.iw / 2, 25, self.iw / 2 - 2, 50 - 2, 255, 255, 255)
else
s:drawColorStringCentered(self.font, yes_text or "Yes", 2, 25, self.iw / 2 - 2, 50 - 2, 255, 255, 255)
s:drawColorStringCentered(self.font, no_text or "No", 2 + self.iw / 2, 25, self.iw / 2 - 2, 50 - 2, 0, 255, 255)
s:drawColorStringCentered(self.font, yes_text or _t"Yes", 2, 25, self.iw / 2 - 2, 50 - 2, 255, 255, 255)
s:drawColorStringCentered(self.font, no_text or _t"No", 2 + self.iw / 2, 25, self.iw / 2 - 2, 50 - 2, 0, 255, 255)
end
self.changed = false
end
......@@ -157,11 +157,11 @@ function _M:yesnoLongPopup(title, text, w, fct, yes_text, no_text)
end
if d.sel == 0 then
s:drawColorStringCentered(self.font, yes_text or "Yes", 2, 10 + h, self.iw / 2 - 2, 50 - 2, 0, 255, 255)
s:drawColorStringCentered(self.font, no_text or "No", 2 + self.iw / 2, 10 + h, self.iw / 2 - 2, 50 - 2, 255, 255, 255)
s:drawColorStringCentered(self.font, yes_text or _t"Yes", 2, 10 + h, self.iw / 2 - 2, 50 - 2, 0, 255, 255)
s:drawColorStringCentered(self.font, no_text or _t"No", 2 + self.iw / 2, 10 + h, self.iw / 2 - 2, 50 - 2, 255, 255, 255)
else
s:drawColorStringCentered(self.font, yes_text or "Yes", 2, 10 + h, self.iw / 2 - 2, 50 - 2, 255, 255, 255)
s:drawColorStringCentered(self.font, no_text or "No", 2 + self.iw / 2, 10 + h, self.iw / 2 - 2, 50 - 2, 0, 255, 255)
s:drawColorStringCentered(self.font, yes_text or _t"Yes", 2, 10 + h, self.iw / 2 - 2, 50 - 2, 255, 255, 255)
s:drawColorStringCentered(self.font, no_text or _t"No", 2 + self.iw / 2, 10 + h, self.iw / 2 - 2, 50 - 2, 0, 255, 255)
end
self.changed = false
end
......
game/engines/default/engine/Emote.lua
+ 5
− 2
View file @ e6b4ce6f
......@@ -19,6 +19,7 @@
require "engine.class"
local Base = require "engine.ui.Base"
local FontPackage = require "engine.FontPackage"
--- Emotes for actors
-- @classmod engine.Emote
......@@ -38,12 +39,14 @@ function _M:init(text, dur, color, font)
self.color = color or colors.BLACK
self.use_font = font
Base.init(self, {font = self.use_font or {"/data/font/DroidSans-Bold.ttf", 16}})
-- I18N emote font.
Base.init(self, {font = self.use_font or {FontPackage:getFont("bold"), 16}})
end
--- on loaded
function _M:loaded()
Base.init(self, {font = self.use_font or {"/data/font/DroidSans-Bold.ttf", 16}})
-- I18N emote font.
Base.init(self, {font = self.use_font or {FontPackage:getFont("bold"), 16}})
end
--- Serialization
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment