Skip to content

Commit

Permalink
Обновление до 1.4.0
Browse files Browse the repository at this point in the history
Обновление до 1.4.0 и некоторые дополнения перевода
  • Loading branch information
xomachine authored Jun 15, 2019
2 parents abac7be + 9c4428a commit 7e9cf23
Show file tree
Hide file tree
Showing 550 changed files with 28,099 additions and 3,503 deletions.
27 changes: 23 additions & 4 deletions translations/others/scripts/actions/dialog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ function speciesDialog(dialog, targetId)
end

function staticRandomizeDialog(list)
math.randomseed(context().seed())
return list[math.random(1, #list)]
return list[sb.staticRandomI32Range(1, #list, context().seed())]
end

function sequenceDialog(list, sequenceKey)
Expand Down Expand Up @@ -96,6 +95,14 @@ function receiveClueDialog(args, board)
end
end

-- param tag
-- param text
function setDialogTag(args, board)
self.dialogTags = self.dialogTags or {}
self.dialogTags[args.tag] = args.text
return true
end

function makeTags(args)
local tags = args.tags or {}
local qgen = setmetatable({}, QuestTextGenerator)
Expand Down Expand Up @@ -148,6 +155,7 @@ function sayToEntity(args, board)
if dialog == nil then
error(string.format("Dialog type %s not specified in %s", args.dialogType, entityVariant()))
end

if dialogMode == "static" then
dialog = staticRandomizeDialog(dialog)
elseif dialogMode == "sequence" then
Expand All @@ -157,7 +165,18 @@ function sayToEntity(args, board)
end
if dialog == nil then return false end

args.tags = makeTags(args)
args.tags = sb.jsonMerge(makeTags(args), args.tags or {})

local tags = sb.jsonMerge(self.dialogTags or {}, args.tags)
tags.selfname = world.entityName(entity.id())
if args.entity then
tags.entityname = world.entityName(args.entity)

local entityType = world.entityType(args.entity)
if entityType and entityType == "npc" then
tags.entitySpecies = world.entitySpecies(args.entity)
end
end

local options = {}

Expand All @@ -166,7 +185,7 @@ function sayToEntity(args, board)
options.sound = randomChatSound()
end

context().say(dialog, args.tags, options)
context().say(dialog, tags, options)
return true
end

Expand Down
4 changes: 4 additions & 0 deletions translations/others/scripts/actions/quests.lua
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ function hasQuest(args, board)
return self.quest:hasQuest()
end

function hasRole(args, board)
return self.quest:hasRole()
end

local function tooManyQuestsNearby()
local searchRadius = config.getParameter("questGenerator.nearbyQuestRange", 50)
local questManagers = 0
Expand Down
3 changes: 1 addition & 2 deletions translations/others/scripts/quest/paramtext.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
require('/scripts/quest/declension.lua')
function itemShortDescription(itemDescriptor)
return root.itemConfig(itemDescriptor).config.shortdescription or
itemDescriptor.name
return root.itemConfig(itemDescriptor).config.shortdescription or itemDescriptor.name
end

local function getCountEnding(count)
Expand Down
1,547 changes: 1,474 additions & 73 deletions translations/substitutions.json

Large diffs are not rendered by default.

35 changes: 35 additions & 0 deletions translations/texts/ai/missioncultist1.aimission.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[
{
"DeniedAlternatives": [],
"Files": {
"ai/missioncultist1.aimission": [
"/speciesText/default/selectSpeech/text"
]
},
"Texts": {
"Eng": "Asra Nox has been located on her warship, the Dantalion."
}
},
{
"DeniedAlternatives": [],
"Files": {
"ai/missioncultist1.aimission": [
"/speciesText/default/repeatButtonText"
]
},
"Texts": {
"Eng": "Revisit The Dantalion"
}
},
{
"DeniedAlternatives": [],
"Files": {
"ai/missioncultist1.aimission": [
"/speciesText/default/buttonText"
]
},
"Texts": {
"Eng": "The Dantalion"
}
}
]
13 changes: 13 additions & 0 deletions translations/texts/biomes/surface/cyberspace.biome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[
{
"DeniedAlternatives": [],
"Files": {
"biomes/surface/cyberspace.biome": [
"/friendlyName"
]
},
"Texts": {
"Eng": "Cyberspace"
}
}
]
123 changes: 123 additions & 0 deletions translations/texts/cinematics/peacekeeper/peacekeeper.cinematic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
[
{
"DeniedAlternatives": [],
"Files": {
"cinematics/peacekeeper/peacekeeper.cinematic": [
"/panels/6/text"
]
},
"Texts": {
"Eng": "Are gonna accomplish great things together!"
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/peacekeeper/peacekeeper.cinematic": [
"/panels/16/text"
]
},
"Texts": {
"Eng": "But now Earth is gone, and so are the Peacekeepers. I may be the only Peacekeeper left, but I ain't gonna let that stop me!"
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/peacekeeper/peacekeeper.cinematic": [
"/panels/17/text"
]
},
"Texts": {
"Eng": "I wanna rebuild the Peacekeepers! I wanna bust some crime rings! And I wanna look mighty slick doin' it all! Are you with me, partner?!"
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/peacekeeper/peacekeeper.cinematic": [
"/panels/10/text"
]
},
"Texts": {
"Eng": "It was a nice goal, but it don't mean you ain't gonna have some folks wantin' to throw the first punch. That's where we came in."
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/peacekeeper/peacekeeper.cinematic": [
"/panels/7/text"
]
},
"Texts": {
"Eng": "Let me lay out the facts for yer. Sit tight, partner."
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/peacekeeper/peacekeeper.cinematic": [
"/panels/13/text"
]
},
"Texts": {
"Eng": "Out of the public eye, we'd keep Earth safe so that the Protectorate could safely promote their message of unity. It was a darn good time for us all."
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/peacekeeper/peacekeeper.cinematic": [
"/panels/12/text"
]
},
"Texts": {
"Eng": "The ^orange;Terrene Peacekeepers^white;, a quiet team of expert detectives an' bounty hunters who dismantled the organisations threatenin' peace on Earth."
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/peacekeeper/peacekeeper.cinematic": [
"/panels/5/text"
]
},
"Texts": {
"Eng": "The name's ^orange;Captain Noble^white;, an' I think you and I..."
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/peacekeeper/peacekeeper.cinematic": [
"/panels/4/text"
]
},
"Texts": {
"Eng": "Well ain't this my lucky day. One of you managed to escape, huh? Looks like you can take care of yourself as well."
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/peacekeeper/peacekeeper.cinematic": [
"/panels/8/text"
]
},
"Texts": {
"Eng": "When the Terrene Protectorate formed, it aimed to unite the universe with diplomacy - hugs an' kisses an' all that."
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/peacekeeper/peacekeeper.cinematic": [
"/panels/3/text"
]
},
"Texts": {
"Eng": "You there! You're holdin' a Matter Manipulator, ain't yer?"
}
}
]
35 changes: 35 additions & 0 deletions translations/texts/cinematics/prison/prison.cinematic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[
{
"DeniedAlternatives": [],
"Files": {
"cinematics/prison/prison.cinematic": [
"/panels/7/text"
]
},
"Texts": {
"Eng": "But the look in her eyes said she has a lot to repent for."
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/prison/prison.cinematic": [
"/panels/5/text"
]
},
"Texts": {
"Eng": "We've locked Nox away somewhere where she ain't gonna cause any trouble from now on. \nCase closed, partner."
}
},
{
"DeniedAlternatives": [],
"Files": {
"cinematics/prison/prison.cinematic": [
"/panels/6/text"
]
},
"Texts": {
"Eng": "Y'know, she didn't speak much when we brought her in..."
}
}
]
2 changes: 1 addition & 1 deletion translations/texts/codex/avian/avianhistory4.codex.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"Texts": {
"Eng": "Leading 30,000 Warriors\n\nThe field of battle must be chosen carefully - seek out wide plains where the weight and extent of our forces can be most powerfully displayed.\n\nOur warriors should amass methodically, and in silence. Once assembled in their vastness let each individual scream out his battle cry, and shriek the songs of war. Set the battle drums to thunder.",
"Rus": "Как вести 30,000 воителей\n\nПоле брани следует выбирать осмотрительно - ищите широкие равнины, на которых враг сможет воочию наблюдать всю мощь наших войск разом.\n\nВоители должны строиться в порядки спокойно и в полной тишине. А выстроившись, пусть каждый издаст свой боевой клич и возопит песнь войны. И пусть барабаны вторят штормовому грохоту."
"Rus": "Как вести 30,000 воинов\n\nПоле битвы следует выбирать осмотрительно - ищите широкие равнины, на которых враг сможет воочию наблюдать всю мощь наших войск разом.\n\nВоины должны строиться в порядки спокойно и в полной тишине. А выстроившись, пусть каждый издаст свой боевой клич и возопит песнь войны. И пусть барабаны вторят штормовому грохоту."
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@
"Rus": "Эти травмы, ужас, который подопытным внушила cистема \"Большой Эйп\", значительно поднял уровень их лояльности, что предусмотрено не было. Данный факт позволил нелетальщикам выдвинуть тезис о воспитательном значении проекционно-баллистической системы.\n\nДанная точка зрения набирает всё больше сторонников, так что весьма вероятно, что в систему будет заложена программа, предусматривающая обязательное выживание для ограниченного числа подопытных."
}
}
]
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
[
{
"DeniedAlternatives": [],
"Files": {
"codex/missions/cultist mission/cultistmission1.codex": [
"/contentPages/1"
]
},
"Texts": {
"Eng": "Nox has explained how the Protector opened some sort of wormhole to the pocket dimension where the core of the entity resided, where she pursued them. Our most cognizant Lady was wise enough to take some samples of the smaller lifeforms that dwelled on the surface of the entity's planetoid form during her visit.\n\nNox believes that the remaining organic samples left over from the entity's destruction might give the Occasus some insight into its powers, and how they may be harnessed."
}
},
{
"DeniedAlternatives": [],
"Files": {
"codex/missions/cultist mission/cultistmission1.codex": [
"/title"
]
},
"Texts": {
"Eng": "Occasus Lab Report: RUIN"
}
},
{
"DeniedAlternatives": [],
"Files": {
"codex/missions/cultist mission/cultistmission1.codex": [
"/contentPages/2"
]
},
"Texts": {
"Eng": "^yellow;ANALYSIS^white;\n\nThe findings from these specimens has continued to be fascinating. They do not act as independent organisms - their synapses are more akin to wireless radios, broadcasting sensory information across space and dimensions. \n\nWe believe they are remote limbs, used to observe and report back to a central organism - no doubt the Ruin."
}
},
{
"DeniedAlternatives": [],
"Files": {
"codex/missions/cultist mission/cultistmission1.codex": [
"/contentPages/0"
]
},
"Texts": {
"Eng": "^yellow;ASSIGNMENT^white;\n\nUpon the request of Asra Nox herself, the Occasus Research team on board the Dantalion have began an investigation into the nature of the lifeform or lifeforms associated with the now-deceased entity more commonly referred to as the \"Ruin\". \n\nThe entity was unfortunately destroyed by an individual referred to as the \"Protector\", much to the chagrin of Lady Nox."
}
},
{
"DeniedAlternatives": [],
"Files": {
"codex/missions/cultist mission/cultistmission1.codex": [
"/contentPages/3"
]
},
"Texts": {
"Eng": "^yellow;CONCLUSION^white;\n\nSolving the Ruin's talents for cross-dimensional transportation could be incredibly valuable to the Occasus. We are all aware of the Ruin's ability to travel across dimensions as it attempted to leave its pocket dimension (resulting in the unfortunate - but unsympathetic - destruction of Earth) and harnessing this could result in new horizons for our cause. \n\nResearch continues."
}
}
]
Loading

0 comments on commit 7e9cf23

Please sign in to comment.