immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1049 from colobot/dev-cbot-factory 

Rework new functions so they follow established syntax rules
1164-fix
Emxx52 2020-07-05 17:26:04 +02:00 committed by GitHub
parent 04b1944939 736c0894d1
commit 0102e45855
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 279 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data

@ -1 +1 @@
Subproject commit d1c52c9cdb763ed127e89e51b0c921f85d8760b6 Subproject commit 611cbfdd079e97a71f97810636f2ab2358cb4eeb

45
po/cs.po
View File

@ -110,9 +110,6 @@ msgstr "Analýza již byla dokončena"
msgid "Analysis performed" msgid "Analysis performed"
msgstr "Analýza dokončena" msgstr "Analýza dokončena"
msgid "Analyzes only organic matter"
msgstr "Analyzuje pouze organickou hmotu"
msgid "Anisotropy level\\Anisotropy level" msgid "Anisotropy level\\Anisotropy level"
msgstr "Úroveň anizotropie\\Úroveň anizotropie" msgstr "Úroveň anizotropie\\Úroveň anizotropie"
@ -185,6 +182,9 @@ msgstr "Robot zničen"
msgid "Bot factory" msgid "Bot factory"
msgstr "Továrna na roboty" msgstr "Továrna na roboty"
msgid "Build (\\key action;)"
msgstr ""
msgid "Build a bot factory" msgid "Build a bot factory"
msgstr "Postavit továrnu na roboty" msgstr "Postavit továrnu na roboty"
@ -203,6 +203,9 @@ msgstr "Postavit drtič"
msgid "Build a exchange post" msgid "Build a exchange post"
msgstr "Postavit komunikační stanici" msgstr "Postavit komunikační stanici"
msgid "Build a legged builder"
msgstr ""
msgid "Build a legged grabber" msgid "Build a legged grabber"
msgstr "Vyrobit chodící rameno" msgstr "Vyrobit chodící rameno"
@ -248,9 +251,15 @@ msgstr "Vyrobit mobilní štít"
msgid "Build a subber" msgid "Build a subber"
msgstr "Vyrobit ponorku" msgstr "Vyrobit ponorku"
msgid "Build a target bot"
msgstr ""
msgid "Build a thumper" msgid "Build a thumper"
msgstr "Vyrobit buchar" msgstr "Vyrobit buchar"
msgid "Build a tracked builder"
msgstr ""
msgid "Build a tracked grabber" msgid "Build a tracked grabber"
msgstr "Vyrobit pásové rameno" msgstr "Vyrobit pásové rameno"
@ -263,6 +272,9 @@ msgstr "Vyrobit pásový kanón"
msgid "Build a tracked sniffer" msgid "Build a tracked sniffer"
msgstr "Vyrobit pásový detektor" msgstr "Vyrobit pásový detektor"
msgid "Build a wheeled builder"
msgstr ""
msgid "Build a wheeled grabber" msgid "Build a wheeled grabber"
msgstr "Vyrobit pojízdné rameno" msgstr "Vyrobit pojízdné rameno"
@ -275,6 +287,9 @@ msgstr "Vyrobit pojízdný kanón"
msgid "Build a wheeled sniffer" msgid "Build a wheeled sniffer"
msgstr "Vyrobit pojízdný detektor" msgstr "Vyrobit pojízdný detektor"
msgid "Build a winged builder"
msgstr ""
msgid "Build a winged grabber" msgid "Build a winged grabber"
msgstr "Vyrobit létající rameno" msgstr "Vyrobit létající rameno"
@ -727,6 +742,9 @@ msgstr "Nevhodný typ baterie"
msgid "Inappropriate object" msgid "Inappropriate object"
msgstr "Nevhodný objekt" msgstr "Nevhodný objekt"
msgid "Inappropriate sample"
msgstr ""
msgid "Incorrect index type" msgid "Incorrect index type"
msgstr "Špatný datový typ indexu" msgstr "Špatný datový typ indexu"
@ -796,6 +814,9 @@ msgstr "Nápověda ke klíčovému slovu (\\key cbot;)"
msgid "LOADING" msgid "LOADING"
msgstr "NAČÍTÁNÍ" msgstr "NAČÍTÁNÍ"
msgid "Legged builder"
msgstr ""
msgid "Legged grabber" msgid "Legged grabber"
msgstr "Chodící rameno" msgstr "Chodící rameno"
@ -1102,6 +1123,9 @@ msgstr "Místo je obsazeno"
msgid "Planets:" msgid "Planets:"
msgstr "Planety:" msgstr "Planety:"
msgid "Plans for builder available"
msgstr ""
msgid "Plans for defense tower available" msgid "Plans for defense tower available"
msgstr "Plány pro obrannou věž jsou k dispozici" msgstr "Plány pro obrannou věž jsou k dispozici"
@ -1306,6 +1330,9 @@ msgstr "Robbie"
msgid "Ruin" msgid "Ruin"
msgstr "Trosky" msgstr "Trosky"
msgid "Run research program for builder"
msgstr ""
msgid "Run research program for defense tower" msgid "Run research program for defense tower"
msgstr "Spustit výzkum obranných věží" msgstr "Spustit výzkum obranných věží"
@ -1327,6 +1354,9 @@ msgstr "Spustit výzkum mobilního štítu"
msgid "Run research program for shooter" msgid "Run research program for shooter"
msgstr "Spustit výzkum kanónů" msgstr "Spustit výzkum kanónů"
msgid "Run research program for target bot"
msgstr ""
msgid "Run research program for thumper" msgid "Run research program for thumper"
msgstr "Spustit výzkum bucharu" msgstr "Spustit výzkum bucharu"
@ -1589,6 +1619,9 @@ msgstr "Příliš mnoho vlajek této barvy (maximálně 5)"
msgid "Too many parameters" msgid "Too many parameters"
msgstr "Příliš mnoho parametrů" msgstr "Příliš mnoho parametrů"
msgid "Tracked builder"
msgstr ""
msgid "Tracked grabber" msgid "Tracked grabber"
msgstr "Pásové rameno" msgstr "Pásové rameno"
@ -1688,6 +1721,9 @@ msgstr "Vosa byla smrtelně raněna"
msgid "Waste" msgid "Waste"
msgstr "Odpad" msgstr "Odpad"
msgid "Wheeled builder"
msgstr ""
msgid "Wheeled grabber" msgid "Wheeled grabber"
msgstr "Pojízdné rameno" msgstr "Pojízdné rameno"
@ -1700,6 +1736,9 @@ msgstr "Pojízdný kanón"
msgid "Wheeled sniffer" msgid "Wheeled sniffer"
msgstr "Pojízdný detektor" msgstr "Pojízdný detektor"
msgid "Winged builder"
msgstr ""
msgid "Winged grabber" msgid "Winged grabber"
msgstr "Létající rameno" msgstr "Létající rameno"

45
po/de.po
View File

@ -111,9 +111,6 @@ msgstr "Analyse schon durchgeführt"
msgid "Analysis performed" msgid "Analysis performed"
msgstr "Analyse vollendet" msgstr "Analyse vollendet"
msgid "Analyzes only organic matter"
msgstr "Analysiert nur Orgastoff"
msgid "Anisotropy level\\Anisotropy level" msgid "Anisotropy level\\Anisotropy level"
msgstr "Anisotropie-Level\\Anisotropie-Level" msgstr "Anisotropie-Level\\Anisotropie-Level"
@ -186,6 +183,9 @@ msgstr "Roboter zerstört"
msgid "Bot factory" msgid "Bot factory"
msgstr "Roboterfabrik" msgstr "Roboterfabrik"
msgid "Build (\\key action;)"
msgstr ""
msgid "Build a bot factory" msgid "Build a bot factory"
msgstr "Baut eine Roboterfabrik" msgstr "Baut eine Roboterfabrik"
@ -204,6 +204,9 @@ msgstr "Baue einen Zerstörer"
msgid "Build a exchange post" msgid "Build a exchange post"
msgstr "Baut einen Infoserver" msgstr "Baut einen Infoserver"
msgid "Build a legged builder"
msgstr ""
msgid "Build a legged grabber" msgid "Build a legged grabber"
msgstr "Baut einen Krabbeltransporter" msgstr "Baut einen Krabbeltransporter"
@ -249,9 +252,15 @@ msgstr "Baut einen Schutzschild"
msgid "Build a subber" msgid "Build a subber"
msgstr "Baut einen Kettentaucher" msgstr "Baut einen Kettentaucher"
msgid "Build a target bot"
msgstr ""
msgid "Build a thumper" msgid "Build a thumper"
msgstr "Baut einen Stampfer" msgstr "Baut einen Stampfer"
msgid "Build a tracked builder"
msgstr ""
msgid "Build a tracked grabber" msgid "Build a tracked grabber"
msgstr "Baut einen Kettentransporter" msgstr "Baut einen Kettentransporter"
@ -264,6 +273,9 @@ msgstr "Baut einen Kettenshooter"
msgid "Build a tracked sniffer" msgid "Build a tracked sniffer"
msgstr "Baut einen Kettenschnüffler" msgstr "Baut einen Kettenschnüffler"
msgid "Build a wheeled builder"
msgstr ""
msgid "Build a wheeled grabber" msgid "Build a wheeled grabber"
msgstr "Baut einen Radtransporter" msgstr "Baut einen Radtransporter"
@ -276,6 +288,9 @@ msgstr "Baut einen Radshooter"
msgid "Build a wheeled sniffer" msgid "Build a wheeled sniffer"
msgstr "Baut einen Radschnüffler" msgstr "Baut einen Radschnüffler"
msgid "Build a winged builder"
msgstr ""
msgid "Build a winged grabber" msgid "Build a winged grabber"
msgstr "Baut einen Jettransporter" msgstr "Baut einen Jettransporter"
@ -729,6 +744,9 @@ msgstr "Falscher Batterietyp"
msgid "Inappropriate object" msgid "Inappropriate object"
msgstr "Objekt ungeeignet" msgstr "Objekt ungeeignet"
msgid "Inappropriate sample"
msgstr ""
msgid "Incorrect index type" msgid "Incorrect index type"
msgstr "Falscher Typ für einen Index" msgstr "Falscher Typ für einen Index"
@ -798,6 +816,9 @@ msgstr "Hilfe über den Begriff (\\key cbot;)"
msgid "LOADING" msgid "LOADING"
msgstr "LADEN" msgstr "LADEN"
msgid "Legged builder"
msgstr ""
msgid "Legged grabber" msgid "Legged grabber"
msgstr "Transporter" msgstr "Transporter"
@ -1124,6 +1145,9 @@ msgstr "Stelle schon besetzt"
msgid "Planets:" msgid "Planets:"
msgstr "Liste der Planeten:" msgstr "Liste der Planeten:"
msgid "Plans for builder available"
msgstr ""
msgid "Plans for defense tower available" msgid "Plans for defense tower available"
msgstr "Errichtung eines Geschützturms möglich" msgstr "Errichtung eines Geschützturms möglich"
@ -1329,6 +1353,9 @@ msgstr "Robby"
msgid "Ruin" msgid "Ruin"
msgstr "Gebäuderuine" msgstr "Gebäuderuine"
msgid "Run research program for builder"
msgstr ""
msgid "Run research program for defense tower" msgid "Run research program for defense tower"
msgstr "Forschungsprogramm Geschützturm" msgstr "Forschungsprogramm Geschützturm"
@ -1350,6 +1377,9 @@ msgstr "Forschungsprogramm Schutzschild"
msgid "Run research program for shooter" msgid "Run research program for shooter"
msgstr "Forschungsprogramm Shooterkanone" msgstr "Forschungsprogramm Shooterkanone"
msgid "Run research program for target bot"
msgstr ""
msgid "Run research program for thumper" msgid "Run research program for thumper"
msgstr "Forschungsprogramm Stampfer" msgstr "Forschungsprogramm Stampfer"
@ -1615,6 +1645,9 @@ msgstr "Zu viele Fahnen dieser Farbe (Maximum 5)"
msgid "Too many parameters" msgid "Too many parameters"
msgstr "Zu viele Parameter" msgstr "Zu viele Parameter"
msgid "Tracked builder"
msgstr ""
msgid "Tracked grabber" msgid "Tracked grabber"
msgstr "Transporter" msgstr "Transporter"
@ -1714,6 +1747,9 @@ msgstr "Wespe tödlich verwundet"
msgid "Waste" msgid "Waste"
msgstr "Abfall" msgstr "Abfall"
msgid "Wheeled builder"
msgstr ""
msgid "Wheeled grabber" msgid "Wheeled grabber"
msgstr "Transporter" msgstr "Transporter"
@ -1726,6 +1762,9 @@ msgstr "Shooter"
msgid "Wheeled sniffer" msgid "Wheeled sniffer"
msgstr "Schnüffler" msgstr "Schnüffler"
msgid "Winged builder"
msgstr ""
msgid "Winged grabber" msgid "Winged grabber"
msgstr "Transporter" msgstr "Transporter"

46
po/fr.po
View File

@ -110,9 +110,6 @@ msgstr "Analyse déjà effectuée"
msgid "Analysis performed" msgid "Analysis performed"
msgstr "Analyse terminée" msgstr "Analyse terminée"
msgid "Analyzes only organic matter"
msgstr "N'analyse que la matière organique"
msgid "Anisotropy level\\Anisotropy level" msgid "Anisotropy level\\Anisotropy level"
msgstr "Niveau d'anisotropie\\Niveau d'anisotropie" msgstr "Niveau d'anisotropie\\Niveau d'anisotropie"
@ -188,6 +185,9 @@ msgstr "Robot détruit"
msgid "Bot factory" msgid "Bot factory"
msgstr "Usine de robots" msgstr "Usine de robots"
msgid "Build (\\key action;)"
msgstr ""
msgid "Build a bot factory" msgid "Build a bot factory"
msgstr "Construire une usine de robots" msgstr "Construire une usine de robots"
@ -206,6 +206,9 @@ msgstr "Construire un destructeur"
msgid "Build a exchange post" msgid "Build a exchange post"
msgstr "Construire une station relais" msgstr "Construire une station relais"
msgid "Build a legged builder"
msgstr ""
msgid "Build a legged grabber" msgid "Build a legged grabber"
msgstr "Fabriquer un préhenseur à pattes" msgstr "Fabriquer un préhenseur à pattes"
@ -251,9 +254,15 @@ msgstr "Fabriquer un robot bouclier"
msgid "Build a subber" msgid "Build a subber"
msgstr "Fabriquer un robot sous-marin" msgstr "Fabriquer un robot sous-marin"
msgid "Build a target bot"
msgstr ""
msgid "Build a thumper" msgid "Build a thumper"
msgstr "Fabriquer un robot secoueur" msgstr "Fabriquer un robot secoueur"
msgid "Build a tracked builder"
msgstr ""
msgid "Build a tracked grabber" msgid "Build a tracked grabber"
msgstr "Fabriquer un préhenseur à chenilles" msgstr "Fabriquer un préhenseur à chenilles"
@ -266,6 +275,9 @@ msgstr "Fabriquer un tireur à chenilles"
msgid "Build a tracked sniffer" msgid "Build a tracked sniffer"
msgstr "Fabriquer un renifleur à chenilles" msgstr "Fabriquer un renifleur à chenilles"
msgid "Build a wheeled builder"
msgstr ""
msgid "Build a wheeled grabber" msgid "Build a wheeled grabber"
msgstr "Fabriquer un préhenseur à roues" msgstr "Fabriquer un préhenseur à roues"
@ -278,6 +290,9 @@ msgstr "Fabriquer un tireur à roues"
msgid "Build a wheeled sniffer" msgid "Build a wheeled sniffer"
msgstr "Fabriquer un renifleur à roues" msgstr "Fabriquer un renifleur à roues"
msgid "Build a winged builder"
msgstr ""
msgid "Build a winged grabber" msgid "Build a winged grabber"
msgstr "Fabriquer un préhenseur volant" msgstr "Fabriquer un préhenseur volant"
@ -731,6 +746,9 @@ msgstr "Source d'énergie non adapté"
msgid "Inappropriate object" msgid "Inappropriate object"
msgstr "Pas le bon objet" msgstr "Pas le bon objet"
msgid "Inappropriate sample"
msgstr ""
msgid "Incorrect index type" msgid "Incorrect index type"
msgstr "Mauvais type d'index" msgstr "Mauvais type d'index"
@ -800,6 +818,9 @@ msgstr "Aide sur le mot-clé (\\key cbot;)"
msgid "LOADING" msgid "LOADING"
msgstr "CHARGEMENT" msgstr "CHARGEMENT"
msgid "Legged builder"
msgstr ""
msgid "Legged grabber" msgid "Legged grabber"
msgstr "Robot préhenseur à pattes" msgstr "Robot préhenseur à pattes"
@ -1126,6 +1147,9 @@ msgstr "Emplacement occupé"
msgid "Planets:" msgid "Planets:"
msgstr "Liste des planètes :" msgstr "Liste des planètes :"
msgid "Plans for builder available"
msgstr ""
msgid "Plans for defense tower available" msgid "Plans for defense tower available"
msgstr "Construction d'une tour de défense possible" msgstr "Construction d'une tour de défense possible"
@ -1331,6 +1355,9 @@ msgstr "Robbie"
msgid "Ruin" msgid "Ruin"
msgstr "Bâtiment en ruine" msgstr "Bâtiment en ruine"
msgid "Run research program for builder"
msgstr ""
msgid "Run research program for defense tower" msgid "Run research program for defense tower"
msgstr "Lancer la recherche de la tour de défense" msgstr "Lancer la recherche de la tour de défense"
@ -1352,6 +1379,9 @@ msgstr "Lancer la recherche du bouclier"
msgid "Run research program for shooter" msgid "Run research program for shooter"
msgstr "Lancer la recherche du canon de tir" msgstr "Lancer la recherche du canon de tir"
msgid "Run research program for target bot"
msgstr ""
msgid "Run research program for thumper" msgid "Run research program for thumper"
msgstr "Lancer la recherche du secoueur" msgstr "Lancer la recherche du secoueur"
@ -1617,6 +1647,9 @@ msgstr "Trop de drapeaux de cette couleur (maximum 5)"
msgid "Too many parameters" msgid "Too many parameters"
msgstr "Trop de paramètres" msgstr "Trop de paramètres"
msgid "Tracked builder"
msgstr ""
msgid "Tracked grabber" msgid "Tracked grabber"
msgstr "Robot préhenseur à chenilles" msgstr "Robot préhenseur à chenilles"
@ -1716,6 +1749,9 @@ msgstr "Guêpe mortellement touchée"
msgid "Waste" msgid "Waste"
msgstr "Déchet" msgstr "Déchet"
msgid "Wheeled builder"
msgstr ""
msgid "Wheeled grabber" msgid "Wheeled grabber"
msgstr "Robot préhenseur à roues" msgstr "Robot préhenseur à roues"
@ -1728,6 +1764,9 @@ msgstr "Robot tireur à roues"
msgid "Wheeled sniffer" msgid "Wheeled sniffer"
msgstr "Robot renifleur à roues" msgstr "Robot renifleur à roues"
msgid "Winged builder"
msgstr ""
msgid "Winged grabber" msgid "Winged grabber"
msgstr "Robot préhenseur volant" msgstr "Robot préhenseur volant"
@ -2064,4 +2103,3 @@ msgstr "epsitec.com"
#~ msgid "\\c; (none)\\n;\n" #~ msgid "\\c; (none)\\n;\n"
#~ msgstr "\\c; (aucun)\\n;\n" #~ msgstr "\\c; (aucun)\\n;\n"

45
po/pl.po
View File

@ -109,9 +109,6 @@ msgstr "Analiza została już wykonana"
msgid "Analysis performed" msgid "Analysis performed"
msgstr "Analiza wykonana" msgstr "Analiza wykonana"
msgid "Analyzes only organic matter"
msgstr "Analizuje jedynie materię organiczną"
msgid "Anisotropy level\\Anisotropy level" msgid "Anisotropy level\\Anisotropy level"
msgstr "Filtrowanie anizotropowe\\Poziom filtrowania anizotropowego" msgstr "Filtrowanie anizotropowe\\Poziom filtrowania anizotropowego"
@ -184,6 +181,9 @@ msgstr "Robot zniszczony"
msgid "Bot factory" msgid "Bot factory"
msgstr "Fabryka robotów" msgstr "Fabryka robotów"
msgid "Build (\\key action;)"
msgstr ""
msgid "Build a bot factory" msgid "Build a bot factory"
msgstr "Zbuduj fabrykę robotów" msgstr "Zbuduj fabrykę robotów"
@ -202,6 +202,9 @@ msgstr "Zbuduj niszczarkę"
msgid "Build a exchange post" msgid "Build a exchange post"
msgstr "Zbuduj stację przekaźnikową" msgstr "Zbuduj stację przekaźnikową"
msgid "Build a legged builder"
msgstr ""
msgid "Build a legged grabber" msgid "Build a legged grabber"
msgstr "Zbuduj transporter na nogach" msgstr "Zbuduj transporter na nogach"
@ -247,9 +250,15 @@ msgstr "Zbuduj robota osłaniacza"
msgid "Build a subber" msgid "Build a subber"
msgstr "Zbuduj robota nurka" msgstr "Zbuduj robota nurka"
msgid "Build a target bot"
msgstr ""
msgid "Build a thumper" msgid "Build a thumper"
msgstr "Zbuduj robota uderzacza" msgstr "Zbuduj robota uderzacza"
msgid "Build a tracked builder"
msgstr ""
msgid "Build a tracked grabber" msgid "Build a tracked grabber"
msgstr "Zbuduj transporter na gąsienicach" msgstr "Zbuduj transporter na gąsienicach"
@ -262,6 +271,9 @@ msgstr "Zbuduj działo na gąsienicach"
msgid "Build a tracked sniffer" msgid "Build a tracked sniffer"
msgstr "Zbuduj szperacz na gąsienicach" msgstr "Zbuduj szperacz na gąsienicach"
msgid "Build a wheeled builder"
msgstr ""
msgid "Build a wheeled grabber" msgid "Build a wheeled grabber"
msgstr "Zbuduj transporter na kołach" msgstr "Zbuduj transporter na kołach"
@ -274,6 +286,9 @@ msgstr "Zbuduj działo na kołach"
msgid "Build a wheeled sniffer" msgid "Build a wheeled sniffer"
msgstr "Zbuduj szperacz na kołach" msgstr "Zbuduj szperacz na kołach"
msgid "Build a winged builder"
msgstr ""
msgid "Build a winged grabber" msgid "Build a winged grabber"
msgstr "Zbuduj transporter latający" msgstr "Zbuduj transporter latający"
@ -726,6 +741,9 @@ msgstr "Nieodpowiedni rodzaj ogniw"
msgid "Inappropriate object" msgid "Inappropriate object"
msgstr "Nieodpowiedni obiekt" msgstr "Nieodpowiedni obiekt"
msgid "Inappropriate sample"
msgstr ""
msgid "Incorrect index type" msgid "Incorrect index type"
msgstr "Nieprawidłowy typ indeksu" msgstr "Nieprawidłowy typ indeksu"
@ -795,6 +813,9 @@ msgstr "Skróty klawiszowe (\\key cbot;)"
msgid "LOADING" msgid "LOADING"
msgstr "WCZYTYWANIE" msgstr "WCZYTYWANIE"
msgid "Legged builder"
msgstr ""
msgid "Legged grabber" msgid "Legged grabber"
msgstr "Transporter na nogach" msgstr "Transporter na nogach"
@ -1107,6 +1128,9 @@ msgstr "Miejsce zajęte"
msgid "Planets:" msgid "Planets:"
msgstr "Planety:" msgstr "Planety:"
msgid "Plans for builder available"
msgstr ""
msgid "Plans for defense tower available" msgid "Plans for defense tower available"
msgstr "Dostępne plany wieży obronnej" msgstr "Dostępne plany wieży obronnej"
@ -1311,6 +1335,9 @@ msgstr "Robbie"
msgid "Ruin" msgid "Ruin"
msgstr "Ruiny" msgstr "Ruiny"
msgid "Run research program for builder"
msgstr ""
msgid "Run research program for defense tower" msgid "Run research program for defense tower"
msgstr "Rozpocznij prace badawcze nad wieżą obronną" msgstr "Rozpocznij prace badawcze nad wieżą obronną"
@ -1332,6 +1359,9 @@ msgstr "Rozpocznij prace badawcze nad robotem osłaniaczem"
msgid "Run research program for shooter" msgid "Run research program for shooter"
msgstr "Rozpocznij prace badawcze nad działem" msgstr "Rozpocznij prace badawcze nad działem"
msgid "Run research program for target bot"
msgstr ""
msgid "Run research program for thumper" msgid "Run research program for thumper"
msgstr "Rozpocznij prace badawcze nad robotem uderzaczem" msgstr "Rozpocznij prace badawcze nad robotem uderzaczem"
@ -1597,6 +1627,9 @@ msgstr "Za dużo flag w tym kolorze (maksymalnie 5)"
msgid "Too many parameters" msgid "Too many parameters"
msgstr "Za dużo parametrów" msgstr "Za dużo parametrów"
msgid "Tracked builder"
msgstr ""
msgid "Tracked grabber" msgid "Tracked grabber"
msgstr "Transporter na gąsienicach" msgstr "Transporter na gąsienicach"
@ -1696,6 +1729,9 @@ msgstr "Osa śmiertelnie raniona"
msgid "Waste" msgid "Waste"
msgstr "Odpady" msgstr "Odpady"
msgid "Wheeled builder"
msgstr ""
msgid "Wheeled grabber" msgid "Wheeled grabber"
msgstr "Transporter na kołach" msgstr "Transporter na kołach"
@ -1708,6 +1744,9 @@ msgstr "Działo na kołach"
msgid "Wheeled sniffer" msgid "Wheeled sniffer"
msgstr "Szperacz na kołach" msgstr "Szperacz na kołach"
msgid "Winged builder"
msgstr ""
msgid "Winged grabber" msgid "Winged grabber"
msgstr "Transporter latający" msgstr "Transporter latający"

45
po/pt.po
View File

@ -107,9 +107,6 @@ msgstr "Análise já realizada"
msgid "Analysis performed" msgid "Analysis performed"
msgstr "Análise realizada" msgstr "Análise realizada"
msgid "Analyzes only organic matter"
msgstr "Analisa apenas matéria orgânica"
msgid "Anisotropy level\\Anisotropy level" msgid "Anisotropy level\\Anisotropy level"
msgstr "Nível de anisotropia\\Nível de anisotropia" msgstr "Nível de anisotropia\\Nível de anisotropia"
@ -182,6 +179,9 @@ msgstr "Robo destruido"
msgid "Bot factory" msgid "Bot factory"
msgstr "Fábrica de robos" msgstr "Fábrica de robos"
msgid "Build (\\key action;)"
msgstr ""
msgid "Build a bot factory" msgid "Build a bot factory"
msgstr "Construir uma fábrica de robos" msgstr "Construir uma fábrica de robos"
@ -200,6 +200,9 @@ msgstr "Construir um destruidor"
msgid "Build a exchange post" msgid "Build a exchange post"
msgstr "Construir um posto de troca" msgstr "Construir um posto de troca"
msgid "Build a legged builder"
msgstr ""
msgid "Build a legged grabber" msgid "Build a legged grabber"
msgstr "Construir um agarrador com pernas" msgstr "Construir um agarrador com pernas"
@ -245,9 +248,15 @@ msgstr "Construir um defensor"
msgid "Build a subber" msgid "Build a subber"
msgstr "Construir um mergulhador" msgstr "Construir um mergulhador"
msgid "Build a target bot"
msgstr ""
msgid "Build a thumper" msgid "Build a thumper"
msgstr "Construir um batedor" msgstr "Construir um batedor"
msgid "Build a tracked builder"
msgstr ""
msgid "Build a tracked grabber" msgid "Build a tracked grabber"
msgstr "Construir um agarrador com esteiras" msgstr "Construir um agarrador com esteiras"
@ -260,6 +269,9 @@ msgstr "Construir um atirador com esteiras"
msgid "Build a tracked sniffer" msgid "Build a tracked sniffer"
msgstr "Construir um farejador com esteiras" msgstr "Construir um farejador com esteiras"
msgid "Build a wheeled builder"
msgstr ""
msgid "Build a wheeled grabber" msgid "Build a wheeled grabber"
msgstr "Construir um agarrador com rodas" msgstr "Construir um agarrador com rodas"
@ -272,6 +284,9 @@ msgstr "Construir um atirador com rodas"
msgid "Build a wheeled sniffer" msgid "Build a wheeled sniffer"
msgstr "Construir um farejador com rodas" msgstr "Construir um farejador com rodas"
msgid "Build a winged builder"
msgstr ""
msgid "Build a winged grabber" msgid "Build a winged grabber"
msgstr "Construir um agarrador alado" msgstr "Construir um agarrador alado"
@ -726,6 +741,9 @@ msgstr "Tipo de célula inapropriada"
msgid "Inappropriate object" msgid "Inappropriate object"
msgstr "Objeto inapropiado" msgstr "Objeto inapropiado"
msgid "Inappropriate sample"
msgstr ""
msgid "Incorrect index type" msgid "Incorrect index type"
msgstr "Tipo de índice inválido" msgstr "Tipo de índice inválido"
@ -795,6 +813,9 @@ msgstr "Palavra-chave ajuda (\\key cbot;)"
msgid "LOADING" msgid "LOADING"
msgstr "CARREGANDO" msgstr "CARREGANDO"
msgid "Legged builder"
msgstr ""
msgid "Legged grabber" msgid "Legged grabber"
msgstr "Agarrador com pernas" msgstr "Agarrador com pernas"
@ -1115,6 +1136,9 @@ msgstr "Local ocupado"
msgid "Planets:" msgid "Planets:"
msgstr "Planetas:" msgstr "Planetas:"
msgid "Plans for builder available"
msgstr ""
msgid "Plans for defense tower available" msgid "Plans for defense tower available"
msgstr "Planos para a torre de defesa disponíveis" msgstr "Planos para a torre de defesa disponíveis"
@ -1320,6 +1344,9 @@ msgstr "Robbie"
msgid "Ruin" msgid "Ruin"
msgstr "Ruína" msgstr "Ruína"
msgid "Run research program for builder"
msgstr ""
msgid "Run research program for defense tower" msgid "Run research program for defense tower"
msgstr "Executar programa de pesquisa para torre de defesa" msgstr "Executar programa de pesquisa para torre de defesa"
@ -1341,6 +1368,9 @@ msgstr "Executar programa de pesquisa para defensor"
msgid "Run research program for shooter" msgid "Run research program for shooter"
msgstr "Executar programa de pesquisa para atirador" msgstr "Executar programa de pesquisa para atirador"
msgid "Run research program for target bot"
msgstr ""
msgid "Run research program for thumper" msgid "Run research program for thumper"
msgstr "Executar programa de pesquisa para batedor" msgstr "Executar programa de pesquisa para batedor"
@ -1603,6 +1633,9 @@ msgstr "Muitas bandeiras dessa cor (máximo 5)"
msgid "Too many parameters" msgid "Too many parameters"
msgstr "Muitos parâmetros" msgstr "Muitos parâmetros"
msgid "Tracked builder"
msgstr ""
msgid "Tracked grabber" msgid "Tracked grabber"
msgstr "Pegador com esteiras" msgstr "Pegador com esteiras"
@ -1702,6 +1735,9 @@ msgstr "Vespa fatalmente ferida"
msgid "Waste" msgid "Waste"
msgstr "Desperdício" msgstr "Desperdício"
msgid "Wheeled builder"
msgstr ""
msgid "Wheeled grabber" msgid "Wheeled grabber"
msgstr "Agarrador com rodas" msgstr "Agarrador com rodas"
@ -1714,6 +1750,9 @@ msgstr "Atirador com rodas"
msgid "Wheeled sniffer" msgid "Wheeled sniffer"
msgstr "Farejador com rodas" msgstr "Farejador com rodas"
msgid "Winged builder"
msgstr ""
msgid "Winged grabber" msgid "Winged grabber"
msgstr "Agarrador alado" msgstr "Agarrador alado"

45
po/ru.po
View File

@ -109,9 +109,6 @@ msgstr "Анализ уже выполнен"
msgid "Analysis performed" msgid "Analysis performed"
msgstr "Анализ выполнен" msgstr "Анализ выполнен"
msgid "Analyzes only organic matter"
msgstr "Анализирую только органические вещества"
msgid "Anisotropy level\\Anisotropy level" msgid "Anisotropy level\\Anisotropy level"
msgstr "Уровень анизотр. фильтр.\\Уровень анизотропной фильтрации" msgstr "Уровень анизотр. фильтр.\\Уровень анизотропной фильтрации"
@ -185,6 +182,9 @@ msgstr "Бот уничтожен"
msgid "Bot factory" msgid "Bot factory"
msgstr "Завод ботов" msgstr "Завод ботов"
msgid "Build (\\key action;)"
msgstr ""
msgid "Build a bot factory" msgid "Build a bot factory"
msgstr "Построить завод ботов" msgstr "Построить завод ботов"
@ -203,6 +203,9 @@ msgstr "Построить уничтожитель"
msgid "Build a exchange post" msgid "Build a exchange post"
msgstr "Построить пост по обмену сообщениями" msgstr "Построить пост по обмену сообщениями"
msgid "Build a legged builder"
msgstr ""
msgid "Build a legged grabber" msgid "Build a legged grabber"
msgstr "Собрать шагающего сборщика" msgstr "Собрать шагающего сборщика"
@ -248,9 +251,15 @@ msgstr "Собрать передвижной щит"
msgid "Build a subber" msgid "Build a subber"
msgstr "Собрать саббера" msgstr "Собрать саббера"
msgid "Build a target bot"
msgstr ""
msgid "Build a thumper" msgid "Build a thumper"
msgstr "Собрать ударника" msgstr "Собрать ударника"
msgid "Build a tracked builder"
msgstr ""
msgid "Build a tracked grabber" msgid "Build a tracked grabber"
msgstr "Собрать гусеничного сборщика" msgstr "Собрать гусеничного сборщика"
@ -263,6 +272,9 @@ msgstr "Собрать гусеничного стрелка"
msgid "Build a tracked sniffer" msgid "Build a tracked sniffer"
msgstr "Собрать гусеничного искателя" msgstr "Собрать гусеничного искателя"
msgid "Build a wheeled builder"
msgstr ""
msgid "Build a wheeled grabber" msgid "Build a wheeled grabber"
msgstr "Собрать колесного сборщика" msgstr "Собрать колесного сборщика"
@ -275,6 +287,9 @@ msgstr "Собрать колесного стрелка"
msgid "Build a wheeled sniffer" msgid "Build a wheeled sniffer"
msgstr "Собрать колесного искателя" msgstr "Собрать колесного искателя"
msgid "Build a winged builder"
msgstr ""
msgid "Build a winged grabber" msgid "Build a winged grabber"
msgstr "Собрать летающего сборщика" msgstr "Собрать летающего сборщика"
@ -735,6 +750,9 @@ msgstr "Батарея не подходит"
msgid "Inappropriate object" msgid "Inappropriate object"
msgstr "Неподходящий объект" msgstr "Неподходящий объект"
msgid "Inappropriate sample"
msgstr ""
msgid "Incorrect index type" msgid "Incorrect index type"
msgstr "Неверный тип индекса" msgstr "Неверный тип индекса"
@ -804,6 +822,9 @@ msgstr "Помощь(\\key cbot;)"
msgid "LOADING" msgid "LOADING"
msgstr "ЗАГРУЗКА" msgstr "ЗАГРУЗКА"
msgid "Legged builder"
msgstr ""
msgid "Legged grabber" msgid "Legged grabber"
msgstr "Шагающий сборщик" msgstr "Шагающий сборщик"
@ -1132,6 +1153,9 @@ msgstr "Место занято"
msgid "Planets:" msgid "Planets:"
msgstr "Планеты:" msgstr "Планеты:"
msgid "Plans for builder available"
msgstr ""
msgid "Plans for defense tower available" msgid "Plans for defense tower available"
msgstr "Доступны схемы защитной башни" msgstr "Доступны схемы защитной башни"
@ -1340,6 +1364,9 @@ msgstr "Робби"
msgid "Ruin" msgid "Ruin"
msgstr "Руины" msgstr "Руины"
msgid "Run research program for builder"
msgstr ""
msgid "Run research program for defense tower" msgid "Run research program for defense tower"
msgstr "Начать исследование программы для защитной башни" msgstr "Начать исследование программы для защитной башни"
@ -1361,6 +1388,9 @@ msgstr "Начать исследование программы для пере
msgid "Run research program for shooter" msgid "Run research program for shooter"
msgstr "Начать исследование программы для стрелка" msgstr "Начать исследование программы для стрелка"
msgid "Run research program for target bot"
msgstr ""
msgid "Run research program for thumper" msgid "Run research program for thumper"
msgstr "Начать исследование программы для ударника" msgstr "Начать исследование программы для ударника"
@ -1628,6 +1658,9 @@ msgstr "Слишком много флагов этого цвета (макси
msgid "Too many parameters" msgid "Too many parameters"
msgstr "Слишком много параметров" msgstr "Слишком много параметров"
msgid "Tracked builder"
msgstr ""
msgid "Tracked grabber" msgid "Tracked grabber"
msgstr "Гусеничный сборщик" msgstr "Гусеничный сборщик"
@ -1727,6 +1760,9 @@ msgstr "Оса смертельно ранена"
msgid "Waste" msgid "Waste"
msgstr "Мусор" msgstr "Мусор"
msgid "Wheeled builder"
msgstr ""
msgid "Wheeled grabber" msgid "Wheeled grabber"
msgstr "Колесный сборщик" msgstr "Колесный сборщик"
@ -1739,6 +1775,9 @@ msgstr "Колесный стрелок"
msgid "Wheeled sniffer" msgid "Wheeled sniffer"
msgstr "Колесный искатель" msgstr "Колесный искатель"
msgid "Winged builder"
msgstr ""
msgid "Winged grabber" msgid "Winged grabber"
msgstr "Летающий сборщик" msgstr "Летающий сборщик"

33
src/script/scriptfunc.cpp
View File

@ -393,7 +393,12 @@ bool CScriptFunctions::rDestroy(CBotVar* var, CBotVar* result, int& exception, v
exception = 0; exception = 0;
Error err; Error err;
CObject* obj = static_cast<CObject*>(var->GetUserPtr()); CObject* obj;
if (var == nullptr)
obj = CObjectManager::GetInstancePointer()->FindNearest(pThis, OBJECT_DESTROYER);
else
obj = static_cast<CObject*>(var->GetUserPtr());
if (obj == nullptr) if (obj == nullptr)
{ {
exception = ERR_WRONG_OBJ; exception = ERR_WRONG_OBJ;
@ -647,7 +652,12 @@ bool CScriptFunctions::rTakeOff(CBotVar* var, CBotVar* result, int& exception, v
Error err; Error err;
exception = 0; exception = 0;
CObject* base = static_cast<CObject*>(var->GetUserPtr()); CObject* base;
if (var == nullptr)
base = CObjectManager::GetInstancePointer()->FindNearest(pThis, OBJECT_BASE);
else
base = static_cast<CObject*>(var->GetUserPtr());
if (base == nullptr) if (base == nullptr)
{ {
exception = ERR_WRONG_OBJ; exception = ERR_WRONG_OBJ;
@ -3053,20 +3063,29 @@ bool CScriptFunctions::rPenWidth(CBotVar* var, CBotVar* result, int& exception,
CBotTypResult CScriptFunctions::cOneObject(CBotVar* &var, void* user) CBotTypResult CScriptFunctions::cOneObject(CBotVar* &var, void* user)
{ {
if ( var == nullptr ) return CBotTypResult(CBotErrLowParam); if ( var != nullptr )
var = var->GetNext(); {
if ( var == nullptr ) return CBotTypResult(CBotTypFloat); var = var->GetNext();
if ( var == nullptr ) return CBotTypResult(CBotTypFloat);
}
else
return CBotTypResult(CBotTypFloat);
return CBotTypResult(CBotErrOverParam); return CBotTypResult(CBotErrOverParam);
} }
// Instruction "camerafocus(object)". // Instruction "camerafocus(object)".
bool CScriptFunctions::rCameraFocus(CBotVar* var, CBotVar* result, int& exception, void* user) bool CScriptFunctions::rCameraFocus(CBotVar* var, CBotVar* result, int& exception, void* user)
{ {
CScript* script = static_cast<CScript*>(user); CScript* script = static_cast<CScript*>(user);
CObject* object = static_cast<CObject*>(var->GetUserPtr()); CObject* object;
if (var == nullptr)
object = script->m_object;
else
object = static_cast<CObject*>(var->GetUserPtr());
script->m_main->SelectObject(object, false); script->m_main->SelectObject(object, false);