From 763a430d945b438fa5169e29b335b378c17c5235 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Sat, 1 Nov 2025 01:46:55 +0100 Subject: [PATCH] more flexible view of deliverables --- bananas.ini | 8 ++++---- bananas_description.txt | 2 +- company.nut | 9 +++------ info.nut | 10 +++++----- lang/afrikaans.txt | 12 ++++++------ lang/catalan.txt | 12 ++++++------ lang/croatian.txt | 12 ++++++------ lang/czech.txt | 12 ++++++------ lang/dutch.txt | 12 ++++++------ lang/english.txt | 2 +- lang/french.txt | 12 ++++++------ lang/german.txt | 12 ++++++------ lang/indonesian.txt | 12 ++++++------ lang/italian.txt | 12 ++++++------ lang/korean.txt | 12 ++++++------ lang/latin.txt | 12 ++++++------ lang/russian.txt | 12 ++++++------ lang/serbian.txt | 12 ++++++------ lang/simplified_chinese.txt | 6 +++--- lang/spanish.txt | 12 ++++++------ lang/swedish.txt | 6 +++--- 21 files changed, 104 insertions(+), 107 deletions(-) diff --git a/bananas.ini b/bananas.ini index d5d8c0f..e463abf 100644 --- a/bananas.ini +++ b/bananas.ini @@ -2,17 +2,17 @@ type = Game Script name = BeeReward -version = v8 +version = v10 description_file = bananas_description.txt -url = https://git.jottyfan.de/openttd/bee-reward +url = https://git.jottyfan.de/beereward/ license = GPL v2 tags = cargo, challenge, goal, cooperative, reward -openttd_minimum_supported_version = 1.4.2 +openttd_minimum_supported_version = 14.1.0 openttd_maximum_supported_version = # SuperLib_for_NoGo-36.tar dependencies = -authors = Alberth, andythenorth, jottyfan +authors = Alberth, andythenorth, jottyfan, fkally (revision) diff --git a/bananas_description.txt b/bananas_description.txt index 0b37480..7306508 100644 --- a/bananas_description.txt +++ b/bananas_description.txt @@ -1 +1 @@ -BeeReward is a fork of Busy Bee. It continuously gives you new goals for transportation, and can give rewards in the form of money for achieving it. There is no ultimate goal to achieve. +This is a reupload compatible with the newest version of OTTD. BeeReward is a fork of Busy Bee. It continuously gives you new goals for transportation, and can give rewards in the form of money for achieving it. There is no ultimate goal to achieve. diff --git a/company.nut b/company.nut index 5a56a1f..d42a5c6 100644 --- a/company.nut +++ b/company.nut @@ -79,11 +79,8 @@ class CompanyGoal { this.reward = this.reward.tointeger(); if (this.reward > 0) { - goal_text = GSText(GSText.STR_COMPANY_GOAL_REWARD, cargo.cid, this.wanted_amount, destination_string, this.reward); + goal_text = GSText(GSText.STR_COMPANY_GOAL_REWARD, this.reward, cargo.cid, this.wanted_amount, destination_string); goal_news_text = GSText(GSText.STR_COMPANY_GOAL_REWARD_NEWS, cargo.cid, this.wanted_amount, destination_string_news, this.reward); - } else { - goal_text = GSText(GSText.STR_COMPANY_GOAL, cargo.cid, this.wanted_amount, destination_string); - goal_news_text = GSText(GSText.STR_COMPANY_GOAL_NEWS, cargo.cid, this.wanted_amount, destination_string_news); } this.goal_id = GSGoal.New(comp_id, goal_text, goal_type, destination); this.PublishNews(goal_news_text, comp_id); @@ -181,8 +178,8 @@ function CompanyGoal::UpdateDelivered(mon, comp_id) } local goal_won_news; if (this.reward > 0) { - GSCompany.ChangeBankBalance(comp_id, this.reward, GSCompany.EXPENSES_OTHER); -// goal_won_news = GSText(GSText.STR_COMPANY_GOAL_REWARD_WON_NEWS, cargo.cid, this.wanted_amount, destination_string_news, this.reward); + GSCompany.ChangeBankBalance(comp_id, this.reward, GSCompany.EXPENSES_OTHER, GSMap.TILE_INVALID); + goal_won_news = GSText(GSText.STR_COMPANY_GOAL_REWARD_WON_NEWS, cargo.cid, this.wanted_amount, destination_string_news, this.reward); } else { goal_won_news = GSText(GSText.STR_COMPANY_GOAL_WON_NEWS, cargo.cid, this.wanted_amount, destination_string_news); } diff --git a/info.nut b/info.nut index cfb33fd..768f726 100644 --- a/info.nut +++ b/info.nut @@ -25,15 +25,15 @@ PROGRAM_DATE <- Syntax error, set by 'make bundle'. PROGRAM_NAME <- Syntax error, set by 'make bundle'. class BeeRewardInfo extends GSInfo { - function GetAuthor() { return "alberth, andythenorth, jottyfan"; } - function GetName() { return "Bee Reward"; } // Old: return PROGRAM_NAME; + function GetAuthor() { return "alberth, andythenorth, jottyfan, fkally (only 2025 fix and reupload)"; } + function GetName() { return "Bee Reward 2025"; } // Old: return PROGRAM_NAME; function GetDescription() { return "Make connection, transport cargo, receive reward"; } function GetVersion() { return PROGRAM_VERSION + SAVEGAME_VERSION * 100000; } function GetDate() { return PROGRAM_DATE; } function CreateInstance() { return "BeeRewardClass"; } - function GetShortName() { return "BREW"; } - function GetAPIVersion() { return "1.5"; } - function GetUrl() { return "https://gitlab.com/jottyfan/bee-reward/"; } + function GetShortName() { return "BREF"; } + function GetAPIVersion() { return "12"; } + function GetUrl() { return "https://github.com/fkally/openttd-beereward-2025/"; } function MinVersionToLoad() { return MINCOMPATIBLE_SAVEGAME_VERSION; } function GetSettings(); } diff --git a/lang/afrikaans.txt b/lang/afrikaans.txt index f361b24..f408d4c 100644 --- a/lang/afrikaans.txt +++ b/lang/afrikaans.txt @@ -1,12 +1,12 @@ ##plural 0 -STR_COMPANY_GOAL_REWARD :Lewer {GOLD}{CARGO_LONG} {ORANGE} aan {STRING1}{ORANGE} vir {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Lewer {GOLD}{CARGO_LONG} {ORANGE}aan {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Nuwe Doel! Lewer {CARGO_LONG} aan {STRING1} vir {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Nuwe doel! Lewer {CARGO_LONG} by {STRING1} af +STR_COMPANY_GOAL_REWARD :Lewer {GOLD}{CARGO_LONG} {ORANGE} aan {STRING}{ORANGE} vir {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Lewer {GOLD}{CARGO_LONG} {ORANGE}aan {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Nuwe Doel! Lewer {CARGO_LONG} aan {STRING} vir {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Nuwe doel! Lewer {CARGO_LONG} by {STRING} af STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}gedoen -STR_COMPANY_GOAL_REWARD_WON_NEWS :Doel gewen! {CARGO_LONG} afgelewer by {STRING1} en verdien {CURRENCY_LONG} -STR_COMPANY_GOAL_WON_NEWS :Doel bereik! {CARGO_LONG} afgelewer by {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :Doel gewen! {CARGO_LONG} afgelewer by {STRING} en verdien {CURRENCY_LONG} +STR_COMPANY_GOAL_WON_NEWS :Doel bereik! {CARGO_LONG} afgelewer by {STRING} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}jaar{P "" ""} oorblywend STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}maand{P "" e} oorblywend STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}da{P g e} oorblywend diff --git a/lang/catalan.txt b/lang/catalan.txt index f3a2500..fd081a7 100644 --- a/lang/catalan.txt +++ b/lang/catalan.txt @@ -1,12 +1,12 @@ ##plural 0 -STR_COMPANY_GOAL_REWARD :Envia {GOLD}{CARGO_LONG} {ORANGE}a {STRING1}{ORANGE} per {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Envia {GOLD}{CARGO_LONG} {ORANGE}a {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Nou objectiu! Envia {CARGO_LONG} a {STRING1} per {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Nou objectiu! Envia {CARGO_LONG} a {STRING1} +STR_COMPANY_GOAL_REWARD :Envia {GOLD}{CARGO_LONG} {ORANGE}a {STRING}{ORANGE} per {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Envia {GOLD}{CARGO_LONG} {ORANGE}a {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Nou objectiu! Envia {CARGO_LONG} a {STRING} per {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Nou objectiu! Envia {CARGO_LONG} a {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}fet -STR_COMPANY_GOAL_REWARD_WON_NEWS :Objectiu aconseguit! {CARGO_LONG} enviats/des a {STRING1} per {CURRENCY_LONG} -STR_COMPANY_GOAL_WON_NEWS :Objectiu aconseguit! {CARGO_LONG} enviats/des {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :Objectiu aconseguit! {CARGO_LONG} enviats/des a {STRING} per {CURRENCY_LONG} +STR_COMPANY_GOAL_WON_NEWS :Objectiu aconseguit! {CARGO_LONG} enviats/des {STRING} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}any{P "" s} restant{P "" s} STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mes{P "" os} restant{P "" s} STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}di{P a es} restant{P "" s} diff --git a/lang/croatian.txt b/lang/croatian.txt index dcb428e..e1efb76 100644 --- a/lang/croatian.txt +++ b/lang/croatian.txt @@ -1,12 +1,12 @@ ##plural 6 -STR_COMPANY_GOAL_REWARD :Dostavite{GOLD}{CARGO_LONG} {ORANGE}do {STRING1}{ORANGE} za {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Dostavite {GOLD}{CARGO_LONG} {ORANGE}do {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Novi cilj! Dostavite {CARGO_LONG} do {STRING1} za {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Novi cilj! Dostavite {CARGO_LONG} do {STRING1} +STR_COMPANY_GOAL_REWARD :Dostavite{GOLD}{CARGO_LONG} {ORANGE}do {STRING}{ORANGE} za {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Dostavite {GOLD}{CARGO_LONG} {ORANGE}do {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Novi cilj! Dostavite {CARGO_LONG} do {STRING} za {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Novi cilj! Dostavite {CARGO_LONG} do {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}završeno -STR_COMPANY_GOAL_REWARD_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno do {STRING1} i osvojeno {CURRENCY_LONG} -STR_COMPANY_GOAL_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno do {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno do {STRING} i osvojeno {CURRENCY_LONG} +STR_COMPANY_GOAL_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno do {STRING} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}godin{P a e e} ostaje STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mjesec{P "" a i} ostaje STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dan{P "" a a} ostaje diff --git a/lang/czech.txt b/lang/czech.txt index 7cebb88..43012f6 100644 --- a/lang/czech.txt +++ b/lang/czech.txt @@ -1,12 +1,12 @@ ##plural 10 -STR_COMPANY_GOAL_REWARD :Doruč {GOLD}{CARGO_LONG} {ORANGE}do {STRING1}{ORANGE} za {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Doruč {GOLD}{CARGO_LONG} {ORANGE}do {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Nový cíl! Doruč {CARGO_LONG} do {STRING1} za {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Nový cíl! Doruč {CARGO_LONG} do {STRING1} +STR_COMPANY_GOAL_REWARD :Doruč {GOLD}{CARGO_LONG} {ORANGE}do {STRING}{ORANGE} za {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Doruč {GOLD}{CARGO_LONG} {ORANGE}do {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Nový cíl! Doruč {CARGO_LONG} do {STRING} za {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Nový cíl! Doruč {CARGO_LONG} do {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}hotovo -STR_COMPANY_GOAL_REWARD_WON_NEWS :Cíl splněn! {CARGO_LONG} doručeno do {STRING1} a získáno {CURRENCY_LONG} -STR_COMPANY_GOAL_WON_NEWS :Cíl splněn! {CARGO_LONG} doručeno do {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :Cíl splněn! {CARGO_LONG} doručeno do {STRING} a získáno {CURRENCY_LONG} +STR_COMPANY_GOAL_WON_NEWS :Cíl splněn! {CARGO_LONG} doručeno do {STRING} STR_TIMEOUT_YEARS :Zbývá {GOLD}{NUM} {ORANGE}rok{P "" "y" "ů"} STR_TIMEOUT_MONTHS :Zbývá {GOLD}{NUM} {ORANGE}měsíc{P "" "e" "ů"} STR_TIMEOUT_DAYS :Zbývá {GOLD}{NUM} {ORANGE}d{P "en" "ny" "nů"} diff --git a/lang/dutch.txt b/lang/dutch.txt index 782081a..5eb6c92 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -1,12 +1,12 @@ ##plural 0 -STR_COMPANY_GOAL_REWARD :Lever {GOLD}{CARGO_LONG} {ORANGE}aan {STRING1}{ORANGE} voor {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Lever {GOLD}{CARGO_LONG} {ORANGE}aan {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Nieuw doel! lever {CARGO_LONG} aan {STRING1} voor {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Nieuw doel! Lever {CARGO_LONG} aan {STRING1} +STR_COMPANY_GOAL_REWARD :Lever {GOLD}{CARGO_LONG} {ORANGE}aan {STRING}{ORANGE} voor {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Lever {GOLD}{CARGO_LONG} {ORANGE}aan {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Nieuw doel! lever {CARGO_LONG} aan {STRING} voor {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Nieuw doel! Lever {CARGO_LONG} aan {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}gereed -STR_COMPANY_GOAL_REWARD_WON_NEWS :Doel behaald! {CARGO_LONG} geleverd aan {STRING1} en {CURRENCY_LONG} verdiend -STR_COMPANY_GOAL_WON_NEWS :Doel behaald! {CARGO_LONG} geleverd aan {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :Doel behaald! {CARGO_LONG} geleverd aan {STRING} en {CURRENCY_LONG} verdiend +STR_COMPANY_GOAL_WON_NEWS :Doel behaald! {CARGO_LONG} geleverd aan {STRING} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}jaar resterend STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}maand{P "" en} resterend STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dag{P "" en} resterend diff --git a/lang/english.txt b/lang/english.txt index 914806f..a7e86a0 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -1,6 +1,6 @@ ##plural 0 -STR_COMPANY_GOAL_REWARD :Deliver {GOLD}{CARGO_LONG} {ORANGE}to {STRING1}{ORANGE} for {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL_REWARD :{WHITE}{CURRENCY_LONG} {BLACK}for {GOLD}{CARGO_LONG} {BLACK}to {STRING1} STR_COMPANY_GOAL :Deliver {GOLD}{CARGO_LONG} {ORANGE}to {STRING1} STR_COMPANY_GOAL_REWARD_NEWS :New goal! Deliver {CARGO_LONG} to {STRING1} for {CURRENCY_LONG} STR_COMPANY_GOAL_NEWS :New goal! Deliver {CARGO_LONG} to {STRING1} diff --git a/lang/french.txt b/lang/french.txt index 9b14382..c2a753c 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -1,12 +1,12 @@ ##plural 2 -STR_COMPANY_GOAL_REWARD :Livrer {GOLD}{CARGO_LONG} {ORANGE} à {STRING1}{ORANGE} pour une récompense de {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Livrer {GOLD}{CARGO_LONG} {ORANGE}à {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Nouvelle mission{NBSP}! Livrer {CARGO_LONG} à {STRING1} pour une récompense de {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Nouvelle mission{NBSP}! Livrer {CARGO_LONG} à {STRING1} +STR_COMPANY_GOAL_REWARD :Livrer {GOLD}{CARGO_LONG} {ORANGE} à {STRING}{ORANGE} pour une récompense de {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Livrer {GOLD}{CARGO_LONG} {ORANGE}à {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Nouvelle mission{NBSP}! Livrer {CARGO_LONG} à {STRING} pour une récompense de {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Nouvelle mission{NBSP}! Livrer {CARGO_LONG} à {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}effectué -STR_COMPANY_GOAL_REWARD_WON_NEWS :But atteint{NBSP}! {CARGO_LONG} ont atteint {STRING1}{NBSP}: {CURRENCY_LONG} de récompense{NBSP}! -STR_COMPANY_GOAL_WON_NEWS :But atteint{NBSP}! {CARGO_LONG} ont atteint {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :But atteint{NBSP}! {CARGO_LONG} ont atteint {STRING}{NBSP}: {CURRENCY_LONG} de récompense{NBSP}! +STR_COMPANY_GOAL_WON_NEWS :But atteint{NBSP}! {CARGO_LONG} ont atteint {STRING} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}an{P "" s} restant{P "" s} STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mois restant{P "" s} STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}jour{P "" s} restant{P "" s} diff --git a/lang/german.txt b/lang/german.txt index 7f58c0f..2ddeea3 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -1,12 +1,12 @@ ##plural 0 -STR_COMPANY_GOAL_REWARD :{WHITE}{CURRENCY_LONG} {ORANGE} für {GOLD}{CARGO_LONG} {ORANGE}nach {STRING1}{ORANGE} -STR_COMPANY_GOAL :Liefere {GOLD}{CARGO_LONG} {ORANGE}nach {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Neues Ziel! Liefere {CARGO_LONG} nach {STRING1} für {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Neues Ziel! Liefere {CARGO_LONG} nach {STRING1} +STR_COMPANY_GOAL_REWARD :{WHITE}{CURRENCY_LONG} {BLACK}für {GOLD}{CARGO_LONG} {BLACK}nach {STRING} +STR_COMPANY_GOAL :Liefere {GOLD}{CARGO_LONG} {ORANGE}nach {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Neues Ziel! Liefere {CARGO_LONG} nach {STRING} für {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Neues Ziel! Liefere {CARGO_LONG} nach {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}erreicht -STR_COMPANY_GOAL_REWARD_WON_NEWS :Ziel erreicht! {CARGO_LONG} nach {STRING1} geliefert und {CURRENCY_LONG} kassiert -STR_COMPANY_GOAL_WON_NEWS :Ziel erreicht! {CARGO_LONG} nach {STRING1} geliefert +STR_COMPANY_GOAL_REWARD_WON_NEWS :Ziel erreicht! {CARGO_LONG} nach {STRING} geliefert und {CURRENCY_LONG} kassiert +STR_COMPANY_GOAL_WON_NEWS :Ziel erreicht! {CARGO_LONG} nach {STRING} geliefert STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}Jahr{P "" e} verbleib{P t en} STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}Monat{P "" e} verbleib{P t en} STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}Tag{P "" e} verbleib{P t en} diff --git a/lang/indonesian.txt b/lang/indonesian.txt index 3b7ceaf..fc1291f 100644 --- a/lang/indonesian.txt +++ b/lang/indonesian.txt @@ -1,12 +1,12 @@ ##plural 1 -STR_COMPANY_GOAL_REWARD :Antarkan {GOLD}{CARGO_LONG} {ORANGE}ke {STRING1}{ORANGE} untuk {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Antarkan {GOLD}{CARGO_LONG} {ORANGE}ke {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Target baru! Antarkan {CARGO_LONG} ke {STRING1} untuk {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Target baru! Antarkan {CARGO_LONG} ke {STRING1} +STR_COMPANY_GOAL_REWARD :Antarkan {GOLD}{CARGO_LONG} {ORANGE}ke {STRING}{ORANGE} untuk {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Antarkan {GOLD}{CARGO_LONG} {ORANGE}ke {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Target baru! Antarkan {CARGO_LONG} ke {STRING} untuk {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Target baru! Antarkan {CARGO_LONG} ke {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}selesai -STR_COMPANY_GOAL_REWARD_WON_NEWS :Target tercapai! {CARGO_LONG} diantarkan ke {STRING1} dan beruntung {CURRENCY_LONG} -STR_COMPANY_GOAL_WON_NEWS :Target tercapai! {CARGO_LONG} diantarkan ke {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :Target tercapai! {CARGO_LONG} diantarkan ke {STRING} dan beruntung {CURRENCY_LONG} +STR_COMPANY_GOAL_WON_NEWS :Target tercapai! {CARGO_LONG} diantarkan ke {STRING} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}tahun tersisa STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}bulan tersisa STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}hari tersisa diff --git a/lang/italian.txt b/lang/italian.txt index 861451e..021e734 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -1,12 +1,12 @@ ##plural 0 -STR_COMPANY_GOAL_REWARD :Consegnare {GOLD}{CARGO_LONG} {ORANGE}a {STRING1}{ORANGE} per {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Consegnare {GOLD}{CARGO_LONG} {ORANGE}a {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Nuovo obiettivo! Consegnare {CARGO_LONG} a {STRING1} per {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Nuovo obiettivo! Consegnare {CARGO_LONG} a {STRING1} +STR_COMPANY_GOAL_REWARD :Consegnare {GOLD}{CARGO_LONG} {ORANGE}a {STRING}{ORANGE} per {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Consegnare {GOLD}{CARGO_LONG} {ORANGE}a {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Nuovo obiettivo! Consegnare {CARGO_LONG} a {STRING} per {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Nuovo obiettivo! Consegnare {CARGO_LONG} a {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}completato -STR_COMPANY_GOAL_REWARD_WON_NEWS :Obiettivo raggiunto! {CARGO_LONG} consegnato a {STRING1} e guadagnato {CURRENCY_LONG} -STR_COMPANY_GOAL_WON_NEWS :Obiettivo raggiunto! Consegna di {CARGO_LONG} effettuata a {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :Obiettivo raggiunto! {CARGO_LONG} consegnato a {STRING} e guadagnato {CURRENCY_LONG} +STR_COMPANY_GOAL_WON_NEWS :Obiettivo raggiunto! Consegna di {CARGO_LONG} effettuata a {STRING} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}ann{P o i} rimanent{P e i} STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mes{P e i} rimanent{P e i} STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}giorn{P o i} rimanent{P e i} diff --git a/lang/korean.txt b/lang/korean.txt index d316074..99b6a81 100644 --- a/lang/korean.txt +++ b/lang/korean.txt @@ -1,12 +1,12 @@ ##plural 11 -STR_COMPANY_GOAL_REWARD :{GOLD}{CARGO_LONG} {ORANGE}을 {STRING1}{ORANGE} 으로 수송하여 {WHITE}{CURRENCY_LONG}의 보상을 받으세요 -STR_COMPANY_GOAL : {GOLD}{CARGO_LONG}을 {ORANGE} {STRING1}까지 수송하세요 -STR_COMPANY_GOAL_REWARD_NEWS :새 목표! {CARGO_LONG}을 {STRING1}으로 수송하여 {CURRENCY_LONG}만큼의 보상을 받으세요 -STR_COMPANY_GOAL_NEWS :새로운 목표! {CARGO_LONG}을 {STRING1}로 수송하세요 +STR_COMPANY_GOAL_REWARD :{GOLD}{CARGO_LONG} {ORANGE}을 {STRING}{ORANGE} 으로 수송하여 {WHITE}{CURRENCY_LONG}의 보상을 받으세요 +STR_COMPANY_GOAL : {GOLD}{CARGO_LONG}을 {ORANGE} {STRING}까지 수송하세요 +STR_COMPANY_GOAL_REWARD_NEWS :새 목표! {CARGO_LONG}을 {STRING}으로 수송하여 {CURRENCY_LONG}만큼의 보상을 받으세요 +STR_COMPANY_GOAL_NEWS :새로운 목표! {CARGO_LONG}을 {STRING}로 수송하세요 STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}완료됨 -STR_COMPANY_GOAL_REWARD_WON_NEWS :목표 달성! {CARGO_LONG}이 {STRING1}으로 수송되어 {CURRENCY_LONG}을 얻었습니다! -STR_COMPANY_GOAL_WON_NEWS :목표 달성! {CARGO_LONG} 만큼 {STRING1}으로 수송됨 +STR_COMPANY_GOAL_REWARD_WON_NEWS :목표 달성! {CARGO_LONG}이 {STRING}으로 수송되어 {CURRENCY_LONG}을 얻었습니다! +STR_COMPANY_GOAL_WON_NEWS :목표 달성! {CARGO_LONG} 만큼 {STRING}으로 수송됨 STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}년 남음 STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}달 남음 STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}일 남음 diff --git a/lang/latin.txt b/lang/latin.txt index 04a7c8d..25e6a84 100644 --- a/lang/latin.txt +++ b/lang/latin.txt @@ -1,12 +1,12 @@ ##plural 0 -STR_COMPANY_GOAL_REWARD :Trade {GOLD}{CARGO_LONG} {ORANGE}ad {STRING1}{ORANGE} ut accipias {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Trade {GOLD}{CARGO_LONG} {ORANGE}ad {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Nova meta! Trade {CARGO_LONG} ad {STRING1} ut accipias {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Meta nova! Trade {CARGO_LONG} ad {STRING1} +STR_COMPANY_GOAL_REWARD :Trade {GOLD}{CARGO_LONG} {ORANGE}ad {STRING}{ORANGE} ut accipias {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Trade {GOLD}{CARGO_LONG} {ORANGE}ad {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Nova meta! Trade {CARGO_LONG} ad {STRING} ut accipias {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Meta nova! Trade {CARGO_LONG} ad {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}tradita -STR_COMPANY_GOAL_REWARD_WON_NEWS :Meta perfecta! {CARGO_LONG} tradita ad {STRING1} et lucraris {CURRENCY_LONG} -STR_COMPANY_GOAL_WON_NEWS :Vicisti! {CARGO_LONG} tradita est ad {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :Meta perfecta! {CARGO_LONG} tradita ad {STRING} et lucraris {CURRENCY_LONG} +STR_COMPANY_GOAL_WON_NEWS :Vicisti! {CARGO_LONG} tradita est ad {STRING} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}ann{P us i} reliqu{P us i} STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mens{P is es} reliqu{P us i} STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dies reliqu{P us i} diff --git a/lang/russian.txt b/lang/russian.txt index 6a82047..af0ef4e 100644 --- a/lang/russian.txt +++ b/lang/russian.txt @@ -1,12 +1,12 @@ ##plural 6 -STR_COMPANY_GOAL_REWARD :Доставьте {GOLD}{CARGO_LONG} {ORANGE}в {STRING1}{ORANGE} за {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Доставьте {GOLD}{CARGO_LONG} {ORANGE}в {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Новая цель! Доставьте {CARGO_LONG} в {STRING1} за {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Новая цель! Доставьте {CARGO_LONG} в {STRING1} +STR_COMPANY_GOAL_REWARD :Доставьте {GOLD}{CARGO_LONG} {ORANGE}в {STRING}{ORANGE} за {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Доставьте {GOLD}{CARGO_LONG} {ORANGE}в {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Новая цель! Доставьте {CARGO_LONG} в {STRING} за {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Новая цель! Доставьте {CARGO_LONG} в {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}выполнено -STR_COMPANY_GOAL_REWARD_WON_NEWS :Цель достигнута! {CARGO_LONG} доставлено в {STRING1} и получено {CURRENCY_LONG} -STR_COMPANY_GOAL_WON_NEWS :Цель достигнута! {CARGO_LONG} доставлено в {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :Цель достигнута! {CARGO_LONG} доставлено в {STRING} и получено {CURRENCY_LONG} +STR_COMPANY_GOAL_WON_NEWS :Цель достигнута! {CARGO_LONG} доставлено в {STRING} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}{P год года лет} осталось STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}месяц{P "" а ев} осталось STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}{P день дня дней} осталось diff --git a/lang/serbian.txt b/lang/serbian.txt index 3326f32..9aa31f8 100644 --- a/lang/serbian.txt +++ b/lang/serbian.txt @@ -1,12 +1,12 @@ ##plural 6 -STR_COMPANY_GOAL_REWARD :Dostavite {GOLD}{CARGO_LONG} {ORANGE}u {STRING1}{ORANGE} za {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Dostavite {GOLD}{CARGO_LONG} {ORANGE}u {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :Novi zadatak! Dostavite {CARGO_LONG} u {STRING1} za {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :Novi zadatak! Dostavite {CARGO_LONG} u {STRING1} +STR_COMPANY_GOAL_REWARD :Dostavite {GOLD}{CARGO_LONG} {ORANGE}u {STRING}{ORANGE} za {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Dostavite {GOLD}{CARGO_LONG} {ORANGE}u {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :Novi zadatak! Dostavite {CARGO_LONG} u {STRING} za {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :Novi zadatak! Dostavite {CARGO_LONG} u {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}gotovo -STR_COMPANY_GOAL_REWARD_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno u {STRING1} i zarađeno {CURRENCY_LONG} -STR_COMPANY_GOAL_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno u {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno u {STRING} i zarađeno {CURRENCY_LONG} +STR_COMPANY_GOAL_WON_NEWS :Cilj postignut! {CARGO_LONG} dostavljeno u {STRING} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}godin{P a e a} preostaje STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}mesec{P "" a i} preostaje STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dan{P "" a a} preostaje diff --git a/lang/simplified_chinese.txt b/lang/simplified_chinese.txt index fd79104..34c391d 100644 --- a/lang/simplified_chinese.txt +++ b/lang/simplified_chinese.txt @@ -1,9 +1,9 @@ ##plural 1 -STR_COMPANY_GOAL :运送 {GOLD}{CARGO_LONG} {ORANGE} 到 {STRING1} -STR_COMPANY_GOAL_NEWS :新目标! 运送{CARGO_LONG} 到 {STRING1} +STR_COMPANY_GOAL :运送 {GOLD}{CARGO_LONG} {ORANGE} 到 {STRING} +STR_COMPANY_GOAL_NEWS :新目标! 运送{CARGO_LONG} 到 {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE} 完成 -STR_COMPANY_GOAL_WON_NEWS :目标达成! {CARGO_LONG} 已运输到 {STRING1} +STR_COMPANY_GOAL_WON_NEWS :目标达成! {CARGO_LONG} 已运输到 {STRING} STR_TIMEOUT_YEARS :剩余 {GOLD}{NUM} {ORANGE} 年 STR_TIMEOUT_MONTHS :剩余 {GOLD}{NUM} {ORANGE} 月 STR_TIMEOUT_DAYS :剩余 {GOLD}{NUM} {ORANGE} 天 diff --git a/lang/spanish.txt b/lang/spanish.txt index 357f8f0..699d8ee 100644 --- a/lang/spanish.txt +++ b/lang/spanish.txt @@ -1,12 +1,12 @@ ##plural 0 -STR_COMPANY_GOAL_REWARD :Entrega {GOLD}{CARGO_LONG} {ORANGE}a {STRING1}{ORANGE} para {WHITE}{CURRENCY_LONG} -STR_COMPANY_GOAL :Entrega {GOLD}{CARGO_LONG} {ORANGE}a {STRING1} -STR_COMPANY_GOAL_REWARD_NEWS :¡Nueva meta! Entrega {CARGO_LONG} a {STRING1} para {CURRENCY_LONG} -STR_COMPANY_GOAL_NEWS :¡Nueva meta! Entrega {CARGO_LONG} a {STRING1} +STR_COMPANY_GOAL_REWARD :Entrega {GOLD}{CARGO_LONG} {ORANGE}a {STRING}{ORANGE} para {WHITE}{CURRENCY_LONG} +STR_COMPANY_GOAL :Entrega {GOLD}{CARGO_LONG} {ORANGE}a {STRING} +STR_COMPANY_GOAL_REWARD_NEWS :¡Nueva meta! Entrega {CARGO_LONG} a {STRING} para {CURRENCY_LONG} +STR_COMPANY_GOAL_NEWS :¡Nueva meta! Entrega {CARGO_LONG} a {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}hecho -STR_COMPANY_GOAL_REWARD_WON_NEWS :¡Meta conseguida! {CARGO_LONG} entregado a {STRING1} y ganado {CURRENCY_LONG} -STR_COMPANY_GOAL_WON_NEWS :¡Meta conseguida! {CARGO_LONG} entregado a {STRING1} +STR_COMPANY_GOAL_REWARD_WON_NEWS :¡Meta conseguida! {CARGO_LONG} entregado a {STRING} y ganado {CURRENCY_LONG} +STR_COMPANY_GOAL_WON_NEWS :¡Meta conseguida! {CARGO_LONG} entregado a {STRING} STR_TIMEOUT_YEARS :{ORANGE}Quedan {GOLD}{NUM} {ORANGE}año{P "" s} STR_TIMEOUT_MONTHS :{ORANGE}Quedan {GOLD}{NUM} {ORANGE}mes{P "" es} STR_TIMEOUT_DAYS :{ORANGE}Quedan {GOLD}{NUM} {ORANGE}día{P "" s} diff --git a/lang/swedish.txt b/lang/swedish.txt index 0d46336..2f6ffc3 100644 --- a/lang/swedish.txt +++ b/lang/swedish.txt @@ -1,9 +1,9 @@ ##plural 0 -STR_COMPANY_GOAL :Leverera {GOLD}{CARGO_LONG} {ORANGE}till {STRING1} -STR_COMPANY_GOAL_NEWS :Nytt mål! Leverera {CARGO_LONG} till {STRING1} +STR_COMPANY_GOAL :Leverera {GOLD}{CARGO_LONG} {ORANGE}till {STRING} +STR_COMPANY_GOAL_NEWS :Nytt mål! Leverera {CARGO_LONG} till {STRING} STR_PROGRESS :{YELLOW}{NUM}% {ORANGE}klart -STR_COMPANY_GOAL_WON_NEWS :Mål slutfört! {CARGO_LONG} levererades till {STRING1} +STR_COMPANY_GOAL_WON_NEWS :Mål slutfört! {CARGO_LONG} levererades till {STRING} STR_TIMEOUT_YEARS :{GOLD}{NUM} {ORANGE}år återstår STR_TIMEOUT_MONTHS :{GOLD}{NUM} {ORANGE}månad{P "" er} återstår STR_TIMEOUT_DAYS :{GOLD}{NUM} {ORANGE}dag{P "" ar} återstår