Commit 1ea6778aca4c40e0576451a4969be98de7cfd30d
1 parent
0764d2ed
needed change for merged korean texts
Showing
22 changed files
with
27 additions
and
27 deletions
... | ... | @@ -365,7 +365,7 @@ function _M:useTalentMessage(ab) |
365 | 365 | if not ab.message then return nil end |
366 | 366 | local str = util.getval(ab.message, self, ab) |
367 | 367 | local _, _, target = self:getTarget() |
368 | - local tname = _t"unknown" | |
368 | + local tname = _t("unknown", "entity name") | |
369 | 369 | if target then tname = target:getName() end |
370 | 370 | str = str:noun_sub("@Source@", self:getName():capitalize()) |
371 | 371 | str = str:noun_sub("@source@", self:getName()) | ... | ... |
... | ... | @@ -483,7 +483,7 @@ function _M:getReward(reward_type) |
483 | 483 | end |
484 | 484 | end |
485 | 485 | |
486 | -local saves_name = { mental=_t"mental", spell=_t"spell", phys=_t"physical"} | |
486 | +local saves_name = { mental=_t("mental", "save name"), spell=_t("spell", "save name"), phys=_t("physical", "save name")} | |
487 | 487 | local saves_tooltips = { mental="MENTAL", spell="SPELL", phys="PHYS"} |
488 | 488 | |
489 | 489 | function _M:rewardChatAnwsers(who, reward, jump_to, on_chose) | ... | ... |
... | ... | @@ -1681,7 +1681,7 @@ function _M:logMessage(source, srcSeen, target, tgtSeen, style, ...) |
1681 | 1681 | if source.player then |
1682 | 1682 | srcname = "#fbd578#"..source.name.."#LAST#" |
1683 | 1683 | elseif srcSeen then |
1684 | - srcname = engine.Entity.check(source, "getName") or source.name or _t"unknown" | |
1684 | + srcname = engine.Entity.check(source, "getName") or source.name or _t("unknown", "entity name") | |
1685 | 1685 | end |
1686 | 1686 | if srcname ~= _t"something" then Dstring = source.__is_actor and source.getDisplayString and source:getDisplayString() end |
1687 | 1687 | style = style:noun_sub("#source#", srcname) |
... | ... | @@ -1691,7 +1691,7 @@ function _M:logMessage(source, srcSeen, target, tgtSeen, style, ...) |
1691 | 1691 | if target.player then |
1692 | 1692 | tgtname = "#fbd578#"..target.name.."#LAST#" |
1693 | 1693 | elseif tgtSeen then |
1694 | - tgtname = engine.Entity.check(target, "getName") or target.name or _t"unknown" | |
1694 | + tgtname = engine.Entity.check(target, "getName") or target.name or _t("unknown", "entity name") | |
1695 | 1695 | end |
1696 | 1696 | end |
1697 | 1697 | style = style:noun_sub("#target#", tgtname) | ... | ... |
... | ... | @@ -55,7 +55,7 @@ function _M:onPartyDeath(src, death_note) |
55 | 55 | game.party:setPlayer(game.party:findMember{main=true}, true) |
56 | 56 | game.paused = true |
57 | 57 | game.player.energy.value = game.energy_to_act |
58 | - src = src or {name=_t"unknown"} | |
58 | + src = src or {name=_t("unknown", "entity name")} | |
59 | 59 | game.player.killedBy = src |
60 | 60 | game.player.died_times[#game.player.died_times+1] = {name=src.name, level=game.player.level, turn=game.turn} |
61 | 61 | game.player:registerDeath(game.player.killedBy) | ... | ... |
... | ... | @@ -55,7 +55,7 @@ Ahh, the intruder at last... And what shall we do with you? Why did you kill my |
55 | 55 | answers = { |
56 | 56 | {_t"I heard some cries, and your men... they were in my way. What's going on here?", jump="what"}, |
57 | 57 | {_t"I thought there might be some treasure to be had around here.", jump="greed"}, |
58 | - {_t"Sorry, I have to go!", jump="hostile"}, | |
58 | + {_t("Sorry, I have to go!", "chat_assassin-lord"), jump="hostile"}, | |
59 | 59 | } |
60 | 60 | } |
61 | 61 | ... | ... |
... | ... | @@ -46,7 +46,7 @@ There are also those Zigur-something people that claim to fight magic. Why are t |
46 | 46 | newChat{ id="zigur", |
47 | 47 | text = _t[[Well then please do something about this evil magic!]], |
48 | 48 | answers = { |
49 | - {_t"I will!", action=function(npc, player) player:hasQuest("lightning-overload"):done_derth() end}, | |
49 | + {_t("I will!", "chat_derth-attack-over"), action=function(npc, player) player:hasQuest("lightning-overload"):done_derth() end}, | |
50 | 50 | } |
51 | 51 | } |
52 | 52 | ... | ... |
... | ... | @@ -67,7 +67,7 @@ newChat{ id="jump_error", |
67 | 67 | text = _t[[It seems the threads of time and space have been disrupted... |
68 | 68 | I will try to send you to safety.]], |
69 | 69 | answers = { |
70 | - {_t"Thanks.", action=function(npc, player) game:changeLevel(1, "wilderness") end}, | |
70 | + {_t("Thanks.", "chat_eidolon-plane"), action=function(npc, player) game:changeLevel(1, "wilderness") end}, | |
71 | 71 | } |
72 | 72 | } |
73 | 73 | ... | ... |
... | ... | @@ -27,7 +27,7 @@ newChat{ id="welcome", |
27 | 27 | {_t"I have destroyed the leaders of all the Orc Prides.", jump="prides-dead", cond=function(npc, player) return player:isQuestStatus("orc-pride", engine.Quest.COMPLETED) end}, |
28 | 28 | {_t"I am back from the Charred Scar, where the orcs took the staff.", jump="charred-scar", cond=function(npc, player) return player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted() end}, |
29 | 29 | {_t"A dying paladin gave me this map; something about orc breeding pits. [tell her the story]", jump="orc-breeding-pits", cond=function(npc, player) return player:hasQuest("orc-breeding-pits") and player:isQuestStatus("orc-breeding-pits", engine.Quest.COMPLETED, "wuss-out") and not player:isQuestStatus("orc-breeding-pits", engine.Quest.COMPLETED, "wuss-out-done") end}, |
30 | - {_t"Sorry, I have to go!"}, | |
30 | + {_t("Sorry, I have to go!", "chat_gates-of-morning-main")}, | |
31 | 31 | } |
32 | 32 | } |
33 | 33 | ... | ... |
... | ... | @@ -23,7 +23,7 @@ Stop! You are clearly a stranger! Where do you come from? The Gates of Morning a |
23 | 23 | answers = { |
24 | 24 | {_t"My lady, I am indeed a stranger in these lands. I come from the west, from Maj'Eyal.", jump="from", |
25 | 25 | cond=function(npc, player) return player:hasQuest("strange-new-world") and player:hasQuest("strange-new-world"):isCompleted("helped-fillarel") end}, |
26 | - {_t"Sorry, I have to go!"}, | |
26 | + {_t("Sorry, I have to go!", "chat_gates-of-morning-welcome")}, | |
27 | 27 | } |
28 | 28 | } |
29 | 29 | ... | ... |
... | ... | @@ -40,7 +40,7 @@ Thanks to you I made it safely to this great city! I am planning to open my most |
40 | 40 | {_t"What about the unique object?", cond=function(npc, player) return game.state:isAdvanced() end, jump="unique1"}, |
41 | 41 | {_t"Ambush Trap? Sounds useful.", cond=function(npc, player) return trap end, jump="trap"}, |
42 | 42 | {_t"Smelly Toxin? What kind of smell?", cond=function(npc, player) return poison end, jump="poison"}, |
43 | - {_t"Sorry, I have to go!"}, | |
43 | + {_t("Sorry, I have to go!", "chat_last-hope-lost-merchant")}, | |
44 | 44 | } |
45 | 45 | } |
46 | 46 | |
... | ... | @@ -56,7 +56,7 @@ But since you have saved me, I'm willing to part from it for only 3000 gold piec |
56 | 56 | newChat{ id="traplearn", |
57 | 57 | text = _t[[Nice doing business with you my friend. There you go!]], |
58 | 58 | answers = { |
59 | - {_t"Thanks.", action=function(npc, player) | |
59 | + {_t("Thanks.", "chat_last-hope-lost-merchant"), action=function(npc, player) | |
60 | 60 | game.state:unlockTalent(player.T_AMBUSH_TRAP, player) |
61 | 61 | player:incMoney(-3000) |
62 | 62 | end}, |
... | ... | @@ -75,7 +75,7 @@ newChat{ id="poison", |
75 | 75 | newChat{ id="poisonlearn", |
76 | 76 | text = _t[[Here you are. Just be sure not to get any on yourself!]], |
77 | 77 | answers = { |
78 | - {_t"Thanks.", action=function(npc, player) | |
78 | + {_t("Thanks.", "chat_last-hope-lost-merchant"), action=function(npc, player) | |
79 | 79 | player:incMoney(-1500) |
80 | 80 | player:learnTalent(player.T_STONING_POISON, true, 1) |
81 | 81 | end}, | ... | ... |
... | ... | @@ -52,7 +52,7 @@ newChat{ id="welcome", |
52 | 52 | {_t"Hi, I was just checking in to see if Melinda is all right.", jump="reward", cond=function(npc, player) return not npc.rewarded_for_saving_melinda end, action=function(npc, player) npc.rewarded_for_saving_melinda = true end}, |
53 | 53 | {_t"Hi, I would like to talk to Melinda please.", jump="rewelcome", switch_npc={name=_t"Melinda"}, cond=function(npc, player) return ql and not ql:isCompleted("moved-in") and not ql.inlove end}, |
54 | 54 | {_t"Hi, I would like to talk to Melinda please.", jump="rewelcome-love", switch_npc={name=_t"Melinda"}, cond=function(npc, player) return ql and not ql:isCompleted("moved-in") and ql.inlove end}, |
55 | - {_t"Sorry, I have to go!"}, | |
55 | + {_t("Sorry, I have to go!", "chat_last-hope-melinda-father")}, | |
56 | 56 | } |
57 | 57 | } |
58 | 58 | ... | ... |
... | ... | @@ -21,7 +21,7 @@ newChat{ id="welcome", |
21 | 21 | text = _t[[Please save me! I will make it worth your whi.. |
22 | 22 | *#LIGHT_GREEN#The assassin lord hits him in the face.#WHITE#*Shut up!]], |
23 | 23 | answers = { |
24 | - {_t"Sorry, I have to go!", action = function(npc, player) npc.can_talk = nil end}, | |
24 | + {_t("Sorry, I have to go!", "chat_lost-merchant"), action = function(npc, player) npc.can_talk = nil end}, | |
25 | 25 | } |
26 | 26 | } |
27 | 27 | ... | ... |
... | ... | @@ -99,7 +99,7 @@ newChat{ id="storage", |
99 | 99 | You are the master. You can use this place as you desire. However, most of the energies are depleted and only some rooms are usable. |
100 | 100 | To the south you will find the storage room.]], |
101 | 101 | answers = { |
102 | - {_t"Thanks.", jump="welcome"}, | |
102 | + {_t("Thanks.", "chat_shertul-fortress-butler"), jump="welcome"}, | |
103 | 103 | } |
104 | 104 | } |
105 | 105 | ... | ... |
... | ... | @@ -47,7 +47,7 @@ What do you want, @playerdescriptor.race@?]], |
47 | 47 | {_t"Paladin Aeryn told me that you could help me. I need to get to Maj'Eyal.", jump="help", cond=function(npc, player) return game.state:isAdvanced() and not player:hasQuest("west-portal") end}, |
48 | 48 | {_t"I found the Blood-Runed Athame, but there was no Resonating Diamond.", jump="athame", cond=function(npc, player) return player:hasQuest("west-portal") and player:hasQuest("west-portal"):isCompleted("athame") and not player:hasQuest("west-portal"):isCompleted("gem") end}, |
49 | 49 | {_t"I have a Resonating Diamond.", jump="complete", cond=function(npc, player) return player:hasQuest("west-portal") and player:hasQuest("west-portal"):isCompleted("gem") end}, |
50 | - {_t"Sorry, I have to go!"}, | |
50 | + {_t("Sorry, I have to go!", "chat_zemekkys")}, | |
51 | 51 | } |
52 | 52 | } |
53 | 53 | ... | ... |
... | ... | @@ -189,7 +189,7 @@ g.on_move = function(self, x, y, who, act, couldpass) |
189 | 189 | end |
190 | 190 | |
191 | 191 | require("engine.ui.Dialog"):yesnoPopup(_t"Fearscape Portal", _t"Do you wish to enter the portal, destroy it, or ignore it (press escape)?", function(ret) |
192 | - if ret == "Quit" then | |
192 | + if ret == _t("Quit", "dialog_portal") then | |
193 | 193 | game.log("#VIOLET#Ignoring the portal...") |
194 | 194 | return |
195 | 195 | end |
... | ... | @@ -197,7 +197,7 @@ g.on_move = function(self, x, y, who, act, couldpass) |
197 | 197 | self:change_level_check() |
198 | 198 | else self:break_portal() |
199 | 199 | end |
200 | - end, _t"Destroy", _t"Enter", false, _t"Quit") | |
200 | + end, _t"Destroy", _t"Enter", false, _t("Quit", "dialog_portal")) | |
201 | 201 | |
202 | 202 | return false |
203 | 203 | end | ... | ... |
... | ... | @@ -142,7 +142,7 @@ g.on_move = function(self, x, y, who, act, couldpass) |
142 | 142 | return false |
143 | 143 | end |
144 | 144 | require("engine.ui.Dialog"):yesnoPopup(_t"Coral Portal", _t"Do you wish to enter the portal, destroy it, or ignore it (press escape)?", function(ret) |
145 | - if ret == "Quit" then | |
145 | + if ret == _t("Quit", "dialog_portal") then | |
146 | 146 | game.log("#VIOLET#Ignoring the portal...") |
147 | 147 | return |
148 | 148 | end |
... | ... | @@ -151,7 +151,7 @@ g.on_move = function(self, x, y, who, act, couldpass) |
151 | 151 | else self:break_portal() |
152 | 152 | end |
153 | 153 | |
154 | - end, _t"Destroy", _t"Enter", false, _t"Quit") | |
154 | + end, _t"Destroy", _t"Enter", false, _t("Quit", "dialog_portal")) | |
155 | 155 | |
156 | 156 | return false |
157 | 157 | end | ... | ... |
... | ... | @@ -60,7 +60,7 @@ on_status_change = function(self, who, status, sub) |
60 | 60 | game:addEntity(game.level, o, "object") |
61 | 61 | o:identify(true) |
62 | 62 | who:addObject(who.INVEN_INVEN, o) |
63 | - require("engine.ui.Dialog"):simplePopup(_t"Thanks", ("You saved %s of us, please take this as a reward. (They give you %s)"):tformat(self.lumberjacks_died == 0 and _t"all" or _t"most", o:getName{do_color=true})) | |
63 | + require("engine.ui.Dialog"):simplePopup(_t"Thanks", ("You saved %s of us, please take this as a reward. (They give you %s)"):tformat(self.lumberjacks_died == 0 and _t("all", "quest_lumberjack") or _t"most", o:getName{do_color=true})) | |
64 | 64 | end |
65 | 65 | end |
66 | 66 | who:setQuestStatus(self.id, engine.Quest.DONE) | ... | ... |
-
Please register or login to post a comment