From eaca1c9eed751fdb8cc878b0fc6504e0047f360b Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Mon, 4 Jul 2011 16:18:10 +0000 Subject: [PATCH] Many typos fixed git-svn-id: http://svn.net-core.org/repos/t-engine4@3785 51575b47-30f0-44d4-a5cc-537603b46e54 --- game/modules/tome/data/birth/classes/corrupted.lua | 2 +- game/modules/tome/data/birth/classes/mage.lua | 4 ++-- game/modules/tome/data/birth/classes/psionic.lua | 2 +- game/modules/tome/data/birth/classes/rogue.lua | 2 +- game/modules/tome/data/birth/races/construct.lua | 2 +- game/modules/tome/data/birth/races/elf.lua | 8 ++++---- game/modules/tome/data/birth/races/halfling.lua | 4 ++-- game/modules/tome/data/birth/races/human.lua | 2 +- game/modules/tome/data/birth/races/undead.lua | 4 ++-- game/modules/tome/data/birth/worlds.lua | 6 +++--- game/modules/tome/data/quests/anti-antimagic.lua | 4 ++-- game/modules/tome/data/quests/arena.lua | 2 +- .../tome/data/quests/brotherhood-of-alchemists.lua | 2 +- game/modules/tome/data/quests/deep-bellow.lua | 4 ++-- game/modules/tome/data/quests/east-portal.lua | 4 ++-- game/modules/tome/data/quests/high-peak.lua | 14 +++++++------- game/modules/tome/data/quests/infinite-dungeon.lua | 2 +- .../tome/data/quests/kryl-feijan-escape.lua | 8 ++++---- .../tome/data/quests/lightning-overload.lua | 6 +++--- game/modules/tome/data/quests/love-melinda.lua | 8 ++++---- .../modules/tome/data/quests/lumberjack-cursed.lua | 2 +- game/modules/tome/data/quests/mage-apprentice.lua | 2 +- game/modules/tome/data/quests/orc-pride.lua | 2 +- game/modules/tome/data/quests/paradoxology.lua | 6 +++--- game/modules/tome/data/timed_effects.lua | 2 +- game/modules/tome/data/zones/wilderness/grids.lua | 2 +- game/modules/tome/dialogs/Birther.lua | 4 ++-- game/modules/tome/dialogs/DeathDialog.lua | 4 ++-- game/modules/tome/dialogs/LevelupDialog.lua | 6 +++--- 29 files changed, 60 insertions(+), 60 deletions(-) diff --git a/game/modules/tome/data/birth/classes/corrupted.lua b/game/modules/tome/data/birth/classes/corrupted.lua index 01ea7b9c6f..9f537c3722 100644 --- a/game/modules/tome/data/birth/classes/corrupted.lua +++ b/game/modules/tome/data/birth/classes/corrupted.lua @@ -43,7 +43,7 @@ newBirthDescriptor{ type = "subclass", name = "Reaver", locked = function() return profile.mod.allow_build.corrupter_reaver end, - locked_desc = "Reap thee the souls of thine enemies, and the powers of darkness shall enter thine flesh.", + locked_desc = "Reap thee the souls of thine enemies, and the powers of darkness shall enter thy flesh.", desc = { "Reavers are terrible foes, charging their enemies with a weapon in each hand.", "They can harness the blight of evil, infecting their foes with terrible contagious diseases while crushing their skulls with devastating combat techniques.", diff --git a/game/modules/tome/data/birth/classes/mage.lua b/game/modules/tome/data/birth/classes/mage.lua index eb5e3437e4..0972442d49 100644 --- a/game/modules/tome/data/birth/classes/mage.lua +++ b/game/modules/tome/data/birth/classes/mage.lua @@ -48,7 +48,7 @@ newBirthDescriptor{ desc = { "An Archmage devotes his whole life to the study of magic above anything else.", "Most Archmagi lack basic skills that others take for granted (like general fighting sense), but they make up for it by their raw magical power.", - "Archmagi start knowing all schools of magic but the more intricate (Temporal and Meta). However, they usually refuse to have anything to do with Necromancy.", + "Archmagi start with knowledge of many schools of magic. However, they usually refuse to have anything to do with Necromancy.", "All Archmagi have been trained in the secret town of Angolwen and possess a unique spell to teleport to it directly.", "Their most important stats are: Magic and Willpower", "#GOLD#Stat modifiers:", @@ -178,7 +178,7 @@ newBirthDescriptor{ locked = function() return profile.mod.allow_build.mage_necromancer and true or "hide" end, locked_desc = "The road to necromancy is a macabre path indeed. Walk with the dead, and drink deeply of their black knowledge.", desc = { - "While most magic is viewed with suspicion since the Spellblaze, the stigma surrounding the black art of necromancy has been around since time immemorial.", + "While most magic is viewed with suspicion since the Spellblaze, the stigma surrounding the black art of Necromancy has been around since time immemorial.", "These dark spellcasters extinguish life, twist death, and raise armies of undead monsters to sate their lust for power and pursue their ultimate goal: Eternal life.", "Their most important stats are: Magic and Willpower", "#GOLD#Stat modifiers:", diff --git a/game/modules/tome/data/birth/classes/psionic.lua b/game/modules/tome/data/birth/classes/psionic.lua index 890ff9d6a0..0b8b4e8c0e 100644 --- a/game/modules/tome/data/birth/classes/psionic.lua +++ b/game/modules/tome/data/birth/classes/psionic.lua @@ -43,7 +43,7 @@ newBirthDescriptor{ type = "subclass", name = "Mindslayer", locked = function() return profile.mod.allow_build.psionic_mindslayer end, - locked_desc = "A thought can inspire, a thought can kill. After centuries of oppression, years of imprisonment, a thought shall break us free and vengeance will strike from our darkest dreams.", + locked_desc = "A thought can inspire; a thought can kill. After centuries of oppression, years of imprisonment, a thought shall break us free and vengeance will strike from our darkest dreams.", desc = { "Mindslayers specialize in direct and brutal application of mental forces to their immediate surroundings.", "When Mindslayers do battle, they will most often be found in the thick of the fighting, vast energies churning around them and telekinetically-wielded weapons hewing nearby foes at the speed of thought.", diff --git a/game/modules/tome/data/birth/classes/rogue.lua b/game/modules/tome/data/birth/classes/rogue.lua index b2b5ef8262..283950bfa5 100644 --- a/game/modules/tome/data/birth/classes/rogue.lua +++ b/game/modules/tome/data/birth/classes/rogue.lua @@ -47,7 +47,7 @@ newBirthDescriptor{ name = "Rogue", desc = { "Rogues are masters of tricks. A Rogue can get behind you unnoticed and stab you in the back for tremendous damage.", - "Rogues usually prefer to dual-wield daggers. They can also become trapping experts, from detecting and disarming traps to setting them.", + "Rogues usually prefer to dual-wield daggers. They can also become trapping experts, detecting and disarming traps as well as setting them.", "Their most important stats are: Dexterity and Cunning", "#GOLD#Stat modifiers:", "#LIGHT_BLUE# * +1 Strength, +3 Dexterity, +0 Constitution", diff --git a/game/modules/tome/data/birth/races/construct.lua b/game/modules/tome/data/birth/races/construct.lua index 8d50de4a14..592be12677 100644 --- a/game/modules/tome/data/birth/races/construct.lua +++ b/game/modules/tome/data/birth/races/construct.lua @@ -48,7 +48,7 @@ newBirthDescriptor locked_desc = "", desc = { "Runic Golems are creatures made of solid rock and animated using arcane forces.", - "They can not be of any class, but they have many intrinsinc abilities.", + "They cannot be of any class, but they have many intrinsic abilities.", "#GOLD#Stat modifiers:", "#LIGHT_BLUE# * +3 Strength, -2 Dexterity, +3 Constitution", "#LIGHT_BLUE# * +2 Magic, +2 Willpower, -5 Cunning", diff --git a/game/modules/tome/data/birth/races/elf.lua b/game/modules/tome/data/birth/races/elf.lua index ce1a0702e3..6ae3f6611f 100644 --- a/game/modules/tome/data/birth/races/elf.lua +++ b/game/modules/tome/data/birth/races/elf.lua @@ -26,8 +26,8 @@ newBirthDescriptor{ desc = { "The elven races are usually named as a whole 'elves', but this is incorrect.", "Elves are split into three separate races - albeit related - of which only two remain in the current age.", - "Elves usualy live about one thousand year, except for the shaloren who magically sustain themselves forever.", - "Their view of the world varies wildly between the different elven races.", + "Elves usually live about one thousand years, except for the Shaloren who magically sustain themselves forever.", + "Their view of the world varies wildly across the different elven races.", }, descriptor_choices = { @@ -59,8 +59,8 @@ newBirthDescriptor type = "subrace", name = "Shalore", desc = { - "Shaloren Elves have close ties with the magic of the world, and produced in the past many great mages.", - "Yet they remain quiet and try to hide their magic to the world, for they remember too well the Spellblaze - and the spellhunt that followed.", + "Shaloren elves have close ties with the magic of the world, and produced in the past many great mages.", + "Yet they remain quiet and try to hide their magic from the world, for they remember too well the Spellblaze - and the Spellhunt that followed.", "They possess the #GOLD#Grace of the Eternals#WHITE# talent which allows them a boost of speed every once in a while.", "#GOLD#Stat modifiers:", "#LIGHT_BLUE# * -2 Strength, +1 Dexterity, +0 Constitution", diff --git a/game/modules/tome/data/birth/races/halfling.lua b/game/modules/tome/data/birth/races/halfling.lua index ca588dfb05..d79e7f140d 100644 --- a/game/modules/tome/data/birth/races/halfling.lua +++ b/game/modules/tome/data/birth/races/halfling.lua @@ -25,7 +25,7 @@ newBirthDescriptor{ name = "Halfling", desc = { "Halflings are a race of very short stature, rarely exceeding four feet in height.", - "They are as humans in that they can do just about anything they set their mind to, yet they excel at ordering and studying things.", + "They are like humans in that they can do just about anything they set their minds to, yet they excel at ordering and studying things.", "Halfling armies have brought many kingdoms to their knees and they kept a balance of power with the Human kingdoms during the Age of Allure.", "Halflings are agile, lucky, and resilient but lacking in strength.", }, @@ -62,7 +62,7 @@ newBirthDescriptor name = "Halfling", desc = { "Halflings are a race of very short stature, rarely exceeding four feet in height.", - "They are as humans in that they can do just about anything they set their mind to, yet they excel at ordering and studying things.", + "They are like humans in that they can do just about anything they set their minds to, yet they excel at ordering and studying things.", "Halfling armies have brought many kingdoms to their knees and they kept a balance of power with the Human kingdoms during the Age of Allure.", "They possess the #GOLD#Luck of the Little Folk#WHITE# which allows them to increase their critical strike chance for a few turns.", "#GOLD#Stat modifiers:", diff --git a/game/modules/tome/data/birth/races/human.lua b/game/modules/tome/data/birth/races/human.lua index 780d672566..d9094a1876 100644 --- a/game/modules/tome/data/birth/races/human.lua +++ b/game/modules/tome/data/birth/races/human.lua @@ -27,7 +27,7 @@ newBirthDescriptor{ "The Humans are one of the main races on Maj'Eyal, along with the Halflings. For many thousands of years they fought each other until events, and great people, unified all the Human and Halfling nations under one rule.", "Humans of these Allied Kingdoms have known peace for over a century now.", "Humans are split into two categories: the Highers, and the rest. Highers have latent magic in their blood which gives them higher attributes and senses along with a longer life.", - "The rest of humanity is gifted with quick learning and mastery. They can do and become anything they desire.", + "The rest of Humanity is gifted with quick learning and mastery. They can do and become anything they desire.", }, descriptor_choices = { diff --git a/game/modules/tome/data/birth/races/undead.lua b/game/modules/tome/data/birth/races/undead.lua index 66c568c0bb..269fa58994 100644 --- a/game/modules/tome/data/birth/races/undead.lua +++ b/game/modules/tome/data/birth/races/undead.lua @@ -76,7 +76,7 @@ newBirthDescriptor "- stun resistance", "- fear immunity", "- special ghoul talents: ghoulish leap, gnaw and retch", - "The rotting bodies of ghouls also force them to act a bit slower than most creatures.", + "The rotting bodies of ghouls also force them to act a bit more slowly than most creatures.", "#GOLD#Stat modifiers:", "#LIGHT_BLUE# * +3 Strength, +1 Dexterity, +5 Constitution", "#LIGHT_BLUE# * +0 Magic, -2 Willpower, -2 Cunning", @@ -119,7 +119,7 @@ newBirthDescriptor type = "subrace", name = "Skeleton", locked = function() return profile.mod.allow_build.undead_skeleton end, - locked_desc = "The marching bones, each step we rattle, but servants no more, we march to battle!", + locked_desc = "The marching bones, each step we rattle; but servants no more, we march to battle!", desc = { "Skeletons are animated bones, undead creatures both strong and dexterous.", "They have access to #GOLD#special skeleton talents#WHITE# and a wide range of undead abilities:", diff --git a/game/modules/tome/data/birth/worlds.lua b/game/modules/tome/data/birth/worlds.lua index 5d489e75d0..4eb9602f3f 100644 --- a/game/modules/tome/data/birth/worlds.lua +++ b/game/modules/tome/data/birth/worlds.lua @@ -81,9 +81,9 @@ newBirthDescriptor{ { "Play as your favorite race and class and venture into the infinite dungeon.", "The only limit to how far you can go is your own skill!", - "Inside the infinite dungeon you will yourself be limitless, you can levelup after level 50 and continue to gain stat and talent points (at a reduced rate).", - "Every levels after level 50 the maximun of stats will increase by one.", - "Every 10 levels after level 50 the maximun points of every talents will increase by one.", + "Inside the infinite dungeon you will yourself be limitless. You can level up beyond level 50 and continue to gain stat and talent points (at a reduced rate).", + "Every level after level 50 the maximum of stats will increase by one.", + "Every 10 levels after level 50 the maximum points of each talent will increase by one.", }, descriptor_choices = default_eyal_descriptors{ difficulty = { Tutorial = "never"} }, copy = { diff --git a/game/modules/tome/data/quests/anti-antimagic.lua b/game/modules/tome/data/quests/anti-antimagic.lua index dab834dc7c..92d300552d 100644 --- a/game/modules/tome/data/quests/anti-antimagic.lua +++ b/game/modules/tome/data/quests/anti-antimagic.lua @@ -20,7 +20,7 @@ name = "The fall of Zigur" desc = function(self, who) local desc = {} - desc[#desc+1] = "You decided to side with the Grand Corruptor and joined forces to onslaught the Ziguranth main base of power." + desc[#desc+1] = "You decided to side with the Grand Corruptor and joined forces to assault the Ziguranth main base of power." if self:isStatus(self.FAILED) then desc[#desc+1] = "The Grand Corruptor died during the attack before he had time to teach you his ways." elseif self:isStatus(self.DONE) then @@ -123,7 +123,7 @@ end function onWin(self, who) if not self:isStatus(self.DONE) then return end return 10, { - "While you were in the Far East, the Grand Corruptor was busy in the Maj'Eyal.", + "While you were in the Far East, the Grand Corruptor was busy in Maj'Eyal.", "With the fall of Zigur he was able to attack and take control of Elvala, the Shaloren capital city.", "His plans however do not stop there.", } diff --git a/game/modules/tome/data/quests/arena.lua b/game/modules/tome/data/quests/arena.lua index 2aad27de2f..2881864aeb 100644 --- a/game/modules/tome/data/quests/arena.lua +++ b/game/modules/tome/data/quests/arena.lua @@ -37,7 +37,7 @@ function onWin(self, who) desc[#desc+1] = "#GOLD#Well done! You have won the Arena: Challenge of the Master#WHITE#" desc[#desc+1] = "" - desc[#desc+1] = "You valiantly fought every creature the arena could throw on you and you emerged victorious!" + desc[#desc+1] = "You valiantly fought every creature the arena could throw at you and you emerged victorious!" desc[#desc+1] = "Glory to you, you are now the new master and your future characters will challenge you." return 0, desc end diff --git a/game/modules/tome/data/quests/brotherhood-of-alchemists.lua b/game/modules/tome/data/quests/brotherhood-of-alchemists.lua index 9ae04e0d71..41f8ba6944 100644 --- a/game/modules/tome/data/quests/brotherhood-of-alchemists.lua +++ b/game/modules/tome/data/quests/brotherhood-of-alchemists.lua @@ -26,7 +26,7 @@ desc = function(self, player, who) elseif self:isStatus(self.DONE) and self.player_won == false then desc[#desc+1] = "#RED#You aided various denizens of Maj'Eyal in their attempts to join the Brotherhood of Alchemists, though you did not prove the deciding factor for any. This year's new member is "..self.winner..".#WHITE#" else - desc[#desc+1] = "#LIGHT_BLUE#Various alchemists around Maj'Eyal are competing to gain entry into the great Brotherhood of Alchemists, and one or more has enlisted your aid.#WHITE#" + desc[#desc+1] = "#LIGHT_BLUE#Various alchemists around Maj'Eyal are competing to gain entry into the great Brotherhood of Alchemists, and one or more have enlisted your aid.#WHITE#" end --e (for elixir) is the name of the table listing all the elixirs and their various strings and ingredients and such. self.e[2][3], for example, refers to the table containing all the information for the second alchemist's third elixir. self.e[2][3].ingredients[1] refers to the first ingredient of the third elixir of the second alchemist. This saves a ton of work in making the desc function, since it's messy and it would suck to copy/paste twelve of them (one for each elixir). for i = 1, 4 do --run through list of four alchemists diff --git a/game/modules/tome/data/quests/deep-bellow.lua b/game/modules/tome/data/quests/deep-bellow.lua index eee95078e5..a363bdbba4 100644 --- a/game/modules/tome/data/quests/deep-bellow.lua +++ b/game/modules/tome/data/quests/deep-bellow.lua @@ -20,8 +20,8 @@ name = "From bellow, it devours" desc = function(self, who) local desc = {} - desc[#desc+1] = "Your escape from Reknor got your heart pounding and your desire for wealth and power increased tenfolds." - desc[#desc+1] = "Maybe it is time for you to start an adventurer's career. Deep down the Iron Throne mountains lies the Deep Bellow." + desc[#desc+1] = "Your escape from Reknor got your heart pounding and your desire for wealth and power increased tenfold." + desc[#desc+1] = "Maybe it is time for you to start an adventurer's career. Deep below the Iron Throne mountains lies the Deep Bellow." desc[#desc+1] = "It has been long sealed away but still, from time to time adventurers go there looking for wealth." desc[#desc+1] = "None that you know of has come back yet, but you did survive Reknor. You are great." return table.concat(desc, "\n") diff --git a/game/modules/tome/data/quests/east-portal.lua b/game/modules/tome/data/quests/east-portal.lua index c5f13a2633..40ae30f7b6 100644 --- a/game/modules/tome/data/quests/east-portal.lua +++ b/game/modules/tome/data/quests/east-portal.lua @@ -27,7 +27,7 @@ desc = function(self, who) end if self:isCompleted("gave-orb") then - desc[#desc+1] = "You gave the Orb of Many Ways to Tannen for study while you look for the athame and diamond in Reknor." + desc[#desc+1] = "You gave the Orb of Many Ways to Tannen to study while you look for the athame and diamond in Reknor." end if self:isCompleted("withheld-orb") then desc[#desc+1] = "You kept the Orb of Many Ways despite Tannen's request to study it. You must now look for the athame and diamond in Reknor." @@ -174,5 +174,5 @@ back_to_last_hope = function(self) local Chat = require("engine.Chat") local chat = Chat.new("east-portal-end", g, game.player) chat:invoke() - game.logPlayer(who, "#VIOLET#You enter the swirling portal and in the blink of an eye you are back to Last Hope.") + game.logPlayer(who, "#VIOLET#You enter the swirling portal and in the blink of an eye you are back in Last Hope.") end diff --git a/game/modules/tome/data/quests/high-peak.lua b/game/modules/tome/data/quests/high-peak.lua index 0174651318..c2641e49b8 100644 --- a/game/modules/tome/data/quests/high-peak.lua +++ b/game/modules/tome/data/quests/high-peak.lua @@ -31,12 +31,12 @@ desc = function(self, who) desc[#desc+1] = "You have won the game!" end - if self:isCompleted("killed-aeryn") then desc[#desc+1] = "#LIGHT_GREEN#* You encountered Sun Paladin Aeryn who blamed you for the loss of the Sunwall and killed her.#LAST#" end - if self:isCompleted("spared-aeryn") then desc[#desc+1] = "#LIGHT_GREEN#* You encountered Sun Paladin Aeryn who blamed you for the loss of the Sunwall and spared her.#LAST#" end + if self:isCompleted("killed-aeryn") then desc[#desc+1] = "#LIGHT_GREEN#* You encountered Sun Paladin Aeryn who blamed you for the loss of the Sunwall. You were forced to kill her.#LAST#" end + if self:isCompleted("spared-aeryn") then desc[#desc+1] = "#LIGHT_GREEN#* You encountered Sun Paladin Aeryn who blamed you for the loss of the Sunwall, but you spared her.#LAST#" end if game.winner and game.winner == "full" then desc[#desc+1] = "#LIGHT_GREEN#* You defeated the Sorcerers before the Void portal could open.#LAST#" end - if game.winner and game.winner == "aeryn-sacrifice" then desc[#desc+1] = "#LIGHT_GREEN#* You defeated the Sorcerers and Aeryn sacrified herself to close the Void portal.#LAST#" end - if game.winner and game.winner == "self-sacrifice" then desc[#desc+1] = "#LIGHT_GREEN#* You defeated the Sorcerers and sacrified yourself to close the Void portal.#LAST#" end + if game.winner and game.winner == "aeryn-sacrifice" then desc[#desc+1] = "#LIGHT_GREEN#* You defeated the Sorcerers and Aeryn sacrificed herself to close the Void portal.#LAST#" end + if game.winner and game.winner == "self-sacrifice" then desc[#desc+1] = "#LIGHT_GREEN#* You defeated the Sorcerers and sacrificed yourself to close the Void portal.#LAST#" end return table.concat(desc, "\n") end @@ -132,9 +132,9 @@ function onWin(self, who) -- Yeeks are special if who:isQuestStatus("high-peak", engine.Quest.COMPLETED, "yeek") then - desc[#desc+1] = "Your sacrifice worked, your mental energies were imbued with farportal energies. The Way radiated from the High Peak toward the rest of Eyal like a mental tidal wave." - desc[#desc+1] = "Every sentient being in Eyal is now part of the Way. Peace and happiness are enforced to all." - desc[#desc+1] = "Only the mages of Angolwen were able to withstand the mental shock and thus are the only unsafe people left. But what can they do against the migth of the Way?" + desc[#desc+1] = "Your sacrifice worked. Your mental energies were imbued with farportal energies. The Way radiated from the High Peak toward the rest of Eyal like a mental tidal wave." + desc[#desc+1] = "Every sentient being in Eyal is now part of the Way. Peace and happiness are enforced for all." + desc[#desc+1] = "Only the mages of Angolwen were able to withstand the mental shock and thus are the only unsafe people left. But what can they do against the might of the Way?" return 0, desc end diff --git a/game/modules/tome/data/quests/infinite-dungeon.lua b/game/modules/tome/data/quests/infinite-dungeon.lua index 6341be6a8d..eac0f5c794 100644 --- a/game/modules/tome/data/quests/infinite-dungeon.lua +++ b/game/modules/tome/data/quests/infinite-dungeon.lua @@ -20,7 +20,7 @@ name = "The Infinite Dungeon" desc = function(self, who) local desc = {} - desc[#desc+1] = "You have entered the Infinite Dungeon. There is no coming back now." + desc[#desc+1] = "You have entered the Infinite Dungeon. There is no going back now." desc[#desc+1] = "Go deep, fight, win or die in a blaze of glory!" return table.concat(desc, "\n") end diff --git a/game/modules/tome/data/quests/kryl-feijan-escape.lua b/game/modules/tome/data/quests/kryl-feijan-escape.lua index 037775ba94..8199e33371 100644 --- a/game/modules/tome/data/quests/kryl-feijan-escape.lua +++ b/game/modules/tome/data/quests/kryl-feijan-escape.lua @@ -20,15 +20,15 @@ name = "The Sect of Kryl-Feijan" desc = function(self, who) local desc = {} - desc[#desc+1] = "You discovered a sect worshiping a demon named Kryl-Feijan in a crypt." + desc[#desc+1] = "You discovered a sect worshipping a demon named Kryl-Feijan in a crypt." desc[#desc+1] = "They were trying to bring it back into the world using a human sacrifice." if self:isStatus(self.DONE) then - desc[#desc+1] = "You have defeated the acolytes and saved the woman. She told you she is the daughter of a rich merchant of Last Hope." + desc[#desc+1] = "You defeated the acolytes and saved the woman. She told you she is the daughter of a rich merchant of Last Hope." elseif self:isStatus(self.FAILED) then if self.not_saved then - desc[#desc+1] = "You have failed to protect her when escorting her out of the crypt." + desc[#desc+1] = "You failed to protect her when escorting her out of the crypt." else - desc[#desc+1] = "You have failed to defeat the acolytes in time - the woman got torn apart by the demon growing inside her." + desc[#desc+1] = "You failed to defeat the acolytes in time - the woman got torn apart by the demon growing inside her." end end return table.concat(desc, "\n") diff --git a/game/modules/tome/data/quests/lightning-overload.lua b/game/modules/tome/data/quests/lightning-overload.lua index a9a3c05b15..c183a71042 100644 --- a/game/modules/tome/data/quests/lightning-overload.lua +++ b/game/modules/tome/data/quests/lightning-overload.lua @@ -20,7 +20,7 @@ name = "Storming the city" desc = function(self, who) local desc = {} - desc[#desc+1] = "As you came to Derth you saw a huge dark cloud over the small town." + desc[#desc+1] = "As you approached Derth you saw a huge dark cloud over the small town." desc[#desc+1] = "When you entered you were greeted by an army of air elementals slaughtering the population." if self:isCompleted("saved-derth") then desc[#desc+1] = " * You have dispatched the elementals but the cloud lingers still. You must find a powerful ally to remove it. There are rumours of a secret town in the mountains, to the southwest. You could also check out the Ziguranth group that is supposed to fight magic." @@ -134,7 +134,7 @@ enter_derth = function(self) end self.kill_count = 0 - require("engine.ui.Dialog"):simpleLongPopup("Danger...", "As you arrive in Derth you notice a huge dark cloud hovering over the town.\nYou hear screams coming from the central place.", 400) + require("engine.ui.Dialog"):simpleLongPopup("Danger...", "As you arrive in Derth you notice a huge dark cloud hovering over the town.\nYou hear screams coming from the town square.", 400) end @@ -146,7 +146,7 @@ reenter_derth = function(self) game.player:setQuestStatus(self.id, engine.Quest.COMPLETED, "restored-derth") if self:isCompleted("tempest-entrance") then - require("engine.ui.Dialog"):simpleLongPopup("Clear sky", "It seems the ziguranth have kept their word.\nDerth is free of the storm cloud.", 400) + require("engine.ui.Dialog"):simpleLongPopup("Clear sky", "It seems the Ziguranth have kept their word.\nDerth is free of the storm cloud.", 400) else require("engine.ui.Dialog"):simpleLongPopup("Clear sky", "It seems the mages have kept their word.\nDerth is free of the storm cloud.", 400) end diff --git a/game/modules/tome/data/quests/love-melinda.lua b/game/modules/tome/data/quests/love-melinda.lua index 6b61a803a8..0dd87b0fc1 100644 --- a/game/modules/tome/data/quests/love-melinda.lua +++ b/game/modules/tome/data/quests/love-melinda.lua @@ -22,9 +22,9 @@ desc = function(self, who) local desc = {} desc[#desc+1] = "After rescuing Melinda from Kryl-Feijan and the cultists you met her again in Last Hope." if who.female then - desc[#desc+1] = "You talked for a while and it seems she has a crush for you, even though you are yourself a woman." + desc[#desc+1] = "You talked for a while and it seems she has a crush on you, even though you are yourself a woman." else - desc[#desc+1] = "You talked for a while and it seems she has a crush for you." + desc[#desc+1] = "You talked for a while and it seems she has a crush on you." end return table.concat(desc, "\n") end @@ -32,7 +32,7 @@ end function onWin(self, who) if who.dead then return end return 10, { - "After your victory you came back to Last Hope and reunited with Melinda, who shown no signs of demonic corruption for the many years to come.", - "You lived together and led a happy life, Melinda even learned a few adventurers tricks and you both traveled Eyal, making new legends.", + "After your victory you came back to Last Hope and reunited with Melinda, who after many years remains free of demonic corruption.", + "You lived together and led a happy life. Melinda even learned a few adventurer's tricks and you both traveled Eyal, making new legends.", } end diff --git a/game/modules/tome/data/quests/lumberjack-cursed.lua b/game/modules/tome/data/quests/lumberjack-cursed.lua index ec429bd358..4b940cba47 100644 --- a/game/modules/tome/data/quests/lumberjack-cursed.lua +++ b/game/modules/tome/data/quests/lumberjack-cursed.lua @@ -20,7 +20,7 @@ name = "The beast within" desc = function(self, who) local desc = {} - desc[#desc+1] = "You met a half-mad lumberjack fleeing a small village, rambling about untold horrors lurking there, slaughtering people." + desc[#desc+1] = "You met a half-mad lumberjack fleeing a small village, rambling about an untold horror lurking there, slaughtering people." if self.lumberjacks_died > 0 then desc[#desc+1] = self.lumberjacks_died.." lumberjacks have died." end diff --git a/game/modules/tome/data/quests/mage-apprentice.lua b/game/modules/tome/data/quests/mage-apprentice.lua index 01a38d9178..5bf9bad07e 100644 --- a/game/modules/tome/data/quests/mage-apprentice.lua +++ b/game/modules/tome/data/quests/mage-apprentice.lua @@ -21,7 +21,7 @@ name = "An apprentice task" desc = function(self, who) local desc = {} desc[#desc+1] = "You met a novice mage who was tasked to collect many staves or jewelry." - desc[#desc+1] = "He asked for your help should you collect some that you do not use." + desc[#desc+1] = "He asked for your help, should you collect some that you do not need." if self:isCompleted() then else desc[#desc+1] = "#SLATE#* "..self.nb_collect.."/10#WHITE#" diff --git a/game/modules/tome/data/quests/orc-pride.lua b/game/modules/tome/data/quests/orc-pride.lua index 8ae4f70089..731e939e94 100644 --- a/game/modules/tome/data/quests/orc-pride.lua +++ b/game/modules/tome/data/quests/orc-pride.lua @@ -52,7 +52,7 @@ desc = function(self, who) if self:isCompleted() then desc[#desc+1] = "" - desc[#desc+1] = "#LIGHT_GREEN#* All prides lie in ruins, their masters destroyed. High Sun Paladin Aeryn would surely be glad of the news!#WHITE#" + desc[#desc+1] = "#LIGHT_GREEN#* All the bastions of the Pride lie in ruins, their masters destroyed. High Sun Paladin Aeryn would surely be glad of the news!#WHITE#" end return table.concat(desc, "\n") diff --git a/game/modules/tome/data/quests/paradoxology.lua b/game/modules/tome/data/quests/paradoxology.lua index f307bed459..f9880abe52 100644 --- a/game/modules/tome/data/quests/paradoxology.lua +++ b/game/modules/tome/data/quests/paradoxology.lua @@ -21,9 +21,9 @@ name = "The Way We Weren't" desc = function(self, who) local desc = {} desc[#desc+1] = "You have met what seems to be a future version of yourself.\n" - if self:isCompleted("combat") then desc[#desc+1] = "You tried to kill yourself to prevent you from doing something, or going somewhere, you were not very clear.\n" end + if self:isCompleted("combat") then desc[#desc+1] = "You tried to kill yourself to prevent you from doing something, or going somewhere... you were not very clear.\n" end if self:isCompleted("now-died") then desc[#desc+1] = "You were killed by your future self, and thus this event never occured.\n" end - if self:isCompleted("future-died") then desc[#desc+1] = "You killed your future self, try avoiding timetraveling to this moment in the future...\n" end + if self:isCompleted("future-died") then desc[#desc+1] = "You killed your future self. In the future, you might wish to avoid time-traveling back to this moment...\n" end return table.concat(desc, "\n") end @@ -115,7 +115,7 @@ generate = function(self, player, x, y) world:gainAchievement("PARADOX_NOW", p) local rift = game.zone:makeEntityByName(game.level, "terrain", "RIFT") - rift.change_level_check = function() game.log("This rift in time has been created by the paradox. You dare not enter it, it could make things worse. An other one will have to fix you mess.") return true end + rift.change_level_check = function() game.log("This rift in time has been created by the paradox. You dare not enter it; it could make things worse. Another Warden will have to fix your mess.") return true end game.zone:addEntity(game.level, rift, "terrain", self.x, self.y) self.on_die = nil diff --git a/game/modules/tome/data/timed_effects.lua b/game/modules/tome/data/timed_effects.lua index 426f3ee857..550a609567 100644 --- a/game/modules/tome/data/timed_effects.lua +++ b/game/modules/tome/data/timed_effects.lua @@ -3190,7 +3190,7 @@ newEffect{ status = "detrimental", parameters = { }, on_gain = function(self, err) return "#Target# is returned to a much younger state!" end, - on_lose = function(self, err) return "#Target# has regained it's natural age." end, + on_lose = function(self, err) return "#Target# has regained its natural age." end, activate = function(self, eff) eff.stat = self:addTemporaryValue("inc_stats", { [Stats.STAT_STR] =-eff.power, diff --git a/game/modules/tome/data/zones/wilderness/grids.lua b/game/modules/tome/data/zones/wilderness/grids.lua index f450573590..91ee88eef5 100644 --- a/game/modules/tome/data/zones/wilderness/grids.lua +++ b/game/modules/tome/data/zones/wilderness/grids.lua @@ -465,7 +465,7 @@ newEntity{ base="ZONE_PLAINS", define_as = "TEMPEST_PEAK", change_level_check = function() game.turn = game.turn + 5 * game.calendar.HOUR if not game.player:hasQuest("lightning-overload").walked then - require("engine.ui.Dialog"):simpleLongPopup("Danger...", [[After an hours long walk you finally reach the end of the way. You are nearly on top of one of the highest peaks you can see. + require("engine.ui.Dialog"):simpleLongPopup("Danger...", [[After walking many hours, you finally reach the end of the way. You are nearly on top of one of the highest peaks you can see. The storm is raging above your head.]], 400) game.player:hasQuest("lightning-overload").walked = true end diff --git a/game/modules/tome/dialogs/Birther.lua b/game/modules/tome/dialogs/Birther.lua index 4e372f6c38..30e1828de8 100644 --- a/game/modules/tome/dialogs/Birther.lua +++ b/game/modules/tome/dialogs/Birther.lua @@ -760,8 +760,8 @@ function _M:selectTileNoDonations() [[Custom Tiles have been added as a thank you to everyone that has donated to ToME. They are a fun cosmetic feature that allows you to choose a tile for your character from a list of nearly 180 (with more to be added over time), ranging from special humanoid tiles to downright wonky ones! -If you'd like to use this feature and find this game good you should consider donating, it will help ensure its survival. -While this is a free game that I am doing for fun, if it can help feeding my family a bit I certainly will not complain as real life can be harsh sometimes. +If you'd like to use this feature and find this game good you should consider donating. It will help ensure its survival. +While this is a free game that I am doing for fun, if it can help feed my family a bit I certainly will not complain as real life can be harsh sometimes. You will need an online profile active and connected for the tile selector to enable. If you choose to donate now you will need to restart the game to be granted access.]], 400, function(ret) if not ret then game:registerDialog(require("mod.dialogs.Donation").new()) diff --git a/game/modules/tome/dialogs/DeathDialog.lua b/game/modules/tome/dialogs/DeathDialog.lua index c5fbe0d846..58c9cb9eb4 100644 --- a/game/modules/tome/dialogs/DeathDialog.lua +++ b/game/modules/tome/dialogs/DeathDialog.lua @@ -37,7 +37,7 @@ function _M:init(actor) if self.dont_show then return end self.c_desc = Textzone.new{width=self.iw, auto_height=true, text=[[You have #LIGHT_RED#died#LAST#! -Death in T.o.M.E. is usually permanent, but if you have a means of resurrection it will be proposed in the menu below. +Death in ToME is usually permanent, but if you have a means of resurrection it will be proposed in the menu below. You can dump your character data to a file to remember her/him forever, or you can exit and try once again to survive in the wilds! ]]} self.c_list = List.new{width=self.iw, nb_items=#self.list, list=self.list, fct=function(item) self:use(item) end} @@ -156,7 +156,7 @@ function _M:eidolonPlane() end end - game.log("#LIGHT_RED#As you are on the brink of death you seem to be yanked to another plane.") + game.log("#LIGHT_RED#From the brink of death you seem to be yanked to another plane.") game.player:updateMainShader() end) return true diff --git a/game/modules/tome/dialogs/LevelupDialog.lua b/game/modules/tome/dialogs/LevelupDialog.lua index 7204552e67..bed03218cd 100644 --- a/game/modules/tome/dialogs/LevelupDialog.lua +++ b/game/modules/tome/dialogs/LevelupDialog.lua @@ -451,7 +451,7 @@ function _M:finish() return nil end - local txt = "#LIGHT_BLUE#Warning: You have increased some of your statistics or talent. Talent(s) actually sustained: \n %s if it is dependent on one of the stats you changed, you need to re-use it for the changes to take effect." + local txt = "#LIGHT_BLUE#Warning: You have increased some of your statistics or talent. Talent(s) actually sustained: \n %s If these are dependent on one of the stats you changed, you need to re-use them for the changes to take effect." local talents = "" local reset = {} for tid, act in pairs(self.actor.sustain_talents) do @@ -787,11 +787,11 @@ function _M:onDrawItem(item) if item.type then text:add({"color",0x00,0xFF,0xFF}, "Talent Category", true) - text:add({"color",0x00,0xFF,0xFF}, "A talent category allows you to learn talents of this category. You gain a talent category point at level 10, 20 and 30. You may also find trainers or artifacts that allow you to learn more.\nA talent category point can be used either to learn a new category or increase the mastery of a known one.", true, true, {"color", "WHITE"}) + text:add({"color",0x00,0xFF,0xFF}, "A talent category contains talents you may learn. You gain a talent category point at level 10, 20 and 30. You may also find trainers or artifacts that allow you to learn more.\nA talent category point can be used either to learn a new category or increase the mastery of a known one.", true, true, {"color", "WHITE"}) if self.actor.talents_types_def[item.type].generic then text:add({"color",0x00,0xFF,0xFF}, "Generic talent tree", true) - text:add({"color",0x00,0xFF,0xFF}, "A generic talent allows you to perform various utility actions and improve your character. It represents talents anybody can learn (should they find a trainer for it). You gain one point every level (except every 5th level). You may also find trainers or artifacts that allow you to learn more.", true, true, {"color", "WHITE"}) + text:add({"color",0x00,0xFF,0xFF}, "A generic talent allows you to perform various utility actions and improve your character. It represents a skill anybody can learn (should you find a trainer for it). You gain one point every level (except every 5th level). You may also find trainers or artifacts that allow you to learn more.", true, true, {"color", "WHITE"}) else text:add({"color",0x00,0xFF,0xFF}, "Class talent tree", true) text:add({"color",0x00,0xFF,0xFF}, "A class talent allows you to perform new combat moves, cast spells, and improve your character. It represents the core function of your class. You gain one point every level and two every 5th level. You may also find trainers or artifacts that allow you to learn more.", true, true, {"color", "WHITE"}) -- GitLab