diff --git a/core/assets-raw/sprites/blocks/environment/thorium1.png b/core/assets-raw/sprites/blocks/environment/thorium1.png new file mode 100644 index 0000000000..80d5f306f2 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/thorium1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/thorium2.png b/core/assets-raw/sprites/blocks/environment/thorium2.png new file mode 100644 index 0000000000..cd87190ec9 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/thorium2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/thorium3.png b/core/assets-raw/sprites/blocks/environment/thorium3.png new file mode 100644 index 0000000000..32c1841e0e Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/thorium3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/uranium1.png b/core/assets-raw/sprites/blocks/environment/uranium1.png deleted file mode 100644 index c89c866a93..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/uranium1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/uranium2.png b/core/assets-raw/sprites/blocks/environment/uranium2.png deleted file mode 100644 index 20eb054ec3..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/uranium2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/uranium3.png b/core/assets-raw/sprites/blocks/environment/uranium3.png deleted file mode 100644 index dfa5ed2cc2..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/uranium3.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/production/thoriumdrill.png b/core/assets-raw/sprites/blocks/production/thoriumdrill.png new file mode 100644 index 0000000000..582b2c446e Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/thoriumdrill.png differ diff --git a/core/assets-raw/sprites/blocks/production/uraniumdrill.png b/core/assets-raw/sprites/blocks/production/uraniumdrill.png deleted file mode 100644 index 9ed2df7eba..0000000000 Binary files a/core/assets-raw/sprites/blocks/production/uraniumdrill.png and /dev/null differ diff --git a/core/assets-raw/sprites/items/item-biomatter.png b/core/assets-raw/sprites/items/item-biomatter.png index 6276d33e52..58aeaaad59 100644 Binary files a/core/assets-raw/sprites/items/item-biomatter.png and b/core/assets-raw/sprites/items/item-biomatter.png differ diff --git a/core/assets-raw/sprites/items/item-thorium.png b/core/assets-raw/sprites/items/item-thorium.png new file mode 100644 index 0000000000..8d27ce7004 Binary files /dev/null and b/core/assets-raw/sprites/items/item-thorium.png differ diff --git a/core/assets-raw/sprites/items/item-uranium.png b/core/assets-raw/sprites/items/item-uranium.png deleted file mode 100644 index 55f48f20f3..0000000000 Binary files a/core/assets-raw/sprites/items/item-uranium.png and /dev/null differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index d16d893c16..b0e64b7658 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -382,7 +382,7 @@ item.coal.name=coal item.steel.name=steel item.titanium.name=titanium item.dirium.name=dirium -item.uranium.name=uranium +item.thorium.name=thorium item.sand.name=sand liquid.water.name=water liquid.plasma.name=plasma @@ -401,7 +401,7 @@ block.blackstone.name=blackstone block.iron.name=iron block.coal.name=coal block.titanium.name=titanium -block.uranium.name=uranium +block.thorium.name=thorium block.dirt.name=dirt block.sand.name=sand block.ice.name=ice @@ -511,8 +511,8 @@ block.irondrill.name=iron drill block.irondrill.fulldescription=A basic drill. When placed on iron ore tiles, outputs iron at a slow pace indefinitely. block.coaldrill.name=coal drill block.coaldrill.fulldescription=A basic drill. When placed on coal ore tiles, outputs coal at a slow pace indefinitely. -block.uraniumdrill.name=uranium drill -block.uraniumdrill.fulldescription=An advanced drill. When placed on uranium ore tiles, outputs uranium at a slow pace indefinitely. +block.thoriumdrill.name=thorium drill +block.thoriumdrill.fulldescription=An advanced drill. When placed on thorium ore tiles, outputs thorium at a slow pace indefinitely. block.titaniumdrill.name=titanium drill block.titaniumdrill.fulldescription=An advanced drill. When placed on titanium ore tiles, outputs titanium at a slow pace indefinitely. block.omnidrill.name=omnidrill @@ -524,9 +524,9 @@ block.thermalgenerator.fulldescription=Generates power from lava. Outputs power block.combustiongenerator.name=combustion generator block.combustiongenerator.fulldescription=Generates power from oil. Outputs power as lasers to its 4 sides. block.rtgenerator.name=RTG generator -block.rtgenerator.fulldescription=Generates small amounts of power from the radioactive decay of uranium. Outputs power as lasers to its 4 sides. +block.rtgenerator.fulldescription=Generates small amounts of power from the radioactive decay of thorium. Outputs power as lasers to its 4 sides. block.nuclearreactor.name=nuclear reactor -block.nuclearreactor.fulldescription=An advanced version of the RTG Generator, and the ultimate power generator. Generates power from uranium. Requires constant water cooling. Highly volatile; will explode violently if insufficient amounts of coolant are supplied. +block.nuclearreactor.fulldescription=An advanced version of the RTG Generator, and the ultimate power generator. Generates power from thorium. Requires constant water cooling. Highly volatile; will explode violently if insufficient amounts of coolant are supplied. block.turret.name=turret block.turret.fulldescription=A basic, cheap turret. Uses stone for ammo. Has slightly more range than the double-turret. block.doubleturret.name=double turret @@ -548,8 +548,8 @@ block.waveturret.fulldescription=Advanced multi-target turret. Uses power. Mediu block.plasmaturret.name=plasma turret block.plasmaturret.fulldescription=Highly advanced version of the flamer turret. Uses coal as ammo. Very high damage, low to medium range. block.chainturret.name=chain turret -block.chainturret.fulldescription=The ultimate rapid-fire turret. Uses uranium as ammo. Shoots large slugs at a high fire rate. Medium range. Spans multiple tiles. Extremely tough. +block.chainturret.fulldescription=The ultimate rapid-fire turret. Uses thorium as ammo. Shoots large slugs at a high fire rate. Medium range. Spans multiple tiles. Extremely tough. block.titancannon.name=titan cannon -block.titancannon.fulldescription=The ultimate long-range turret. Uses uranium as ammo. Shoots large splash-damage shells at a medium rate of fire. Long range. Spans multiple tiles. Extremely tough. +block.titancannon.fulldescription=The ultimate long-range turret. Uses thorium as ammo. Shoots large splash-damage shells at a medium rate of fire. Long range. Spans multiple tiles. Extremely tough. block.playerspawn.name=playerspawn block.enemyspawn.name=enemyspawn \ No newline at end of file diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index be8fa12cf5..2439a197cd 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -312,7 +312,7 @@ item.coal.name = Kohle item.steel.name = Stahl item.titanium.name = Titan item.dirium.name = Dirium -item.uranium.name = Uran +item.thorium.name = Uran item.sand.name = Sand liquid.water.name = Wasser liquid.plasma.name = Plasma @@ -330,7 +330,7 @@ block.blackstone.name = schwarzer Stein block.iron.name = Eisen block.coal.name = Kohle block.titanium.name = Titan -block.uranium.name = Uran +block.thorium.name = Uran block.dirt.name = Erde block.sand.name = Sand block.ice.name = Eis @@ -435,8 +435,8 @@ block.irondrill.name = Eisenbohrer block.irondrill.fulldescription = Eine grundlegender Bohrer. Wenn es auf Eisenerz gelegt wird, gibt er Eisen auf endloser Zeit langsam aus. block.coaldrill.name = Kohlenbohrer block.coaldrill.fulldescription = Eine grundlegender Bohrer. Wenn es auf Kohleerz platziert wird, gibt er für endloser Zeit langsam Kohle aus. -block.uraniumdrill.name = Uran-Bohrer -block.uraniumdrill.fulldescription = Ein fortgeschrittener Bohrer. Wenn es auf Uranerz platziert wird, gibt er Uran mit einer langsamen Geschwindigkeit auf endloser Zeit ab. +block.thoriumdrill.name = Uran-Bohrer +block.thoriumdrill.fulldescription = Ein fortgeschrittener Bohrer. Wenn es auf Uranerz platziert wird, gibt er Uran mit einer langsamen Geschwindigkeit auf endloser Zeit ab. block.titaniumdrill.name = Titan-Bohrer block.titaniumdrill.fulldescription = Ein fortgeschrittener Bohrer. Wenn es auf Titanerz platziert wird, gibt er Titan langsam aus für undendlich langer Zeit block.omnidrill.name = Omni-Bohrer diff --git a/core/assets/bundles/bundle_es_LA.properties b/core/assets/bundles/bundle_es_LA.properties index 098615ea01..9705529686 100644 --- a/core/assets/bundles/bundle_es_LA.properties +++ b/core/assets/bundles/bundle_es_LA.properties @@ -238,7 +238,7 @@ item.coal.name=carbón item.steel.name=acero item.titanium.name=titanio item.dirium.name=dirio -item.uranium.name=uranio +item.thorium.name=uranio liquid.water.name=agua liquid.plasma.name=plasma liquid.lava.name=lava @@ -254,7 +254,7 @@ block.blackstone.name=piedranegra block.iron.name=hierro block.coal.name=carbón block.titanium.name=titanio -block.uranium.name=uranio +block.thorium.name=uranio block.dirt.name=tierra block.sand.name=arena block.ice.name=hielo @@ -386,9 +386,9 @@ block.irondrill.description=Mina 1 de hierro cada 5 segundos. block.coaldrill.name=taladro de carbón block.coaldrill.fulldescription=Un taladro básico. Cuando es colocado en bloques de mineral de carbón, da carbón lenta e infinitamente. block.coaldrill.description=Mina 1 de carbón cada 5 segundos. -block.uraniumdrill.name=taladro de uranio -block.uraniumdrill.fulldescription=Un taladro avanzado. Cuando es colocado en bloques de mineral de uranio, da uranio lenta e infinitamente. -block.uraniumdrill.description=Mina 1 de uranio cada 7 segundos. +block.thoriumdrill.name=taladro de uranio +block.thoriumdrill.fulldescription=Un taladro avanzado. Cuando es colocado en bloques de mineral de uranio, da uranio lenta e infinitamente. +block.thoriumdrill.description=Mina 1 de uranio cada 7 segundos. block.titaniumdrill.name=Taladro de titanio block.titaniumdrill.fulldescription=Un taladro avanzado. Cuando es colocado en bloques de mineral de titanio, da titanio lenta e infinitamente. block.titaniumdrill.description=Mina 1 de titanio cada 5 segundos. diff --git a/core/assets/bundles/bundle_fr_FR.properties b/core/assets/bundles/bundle_fr_FR.properties index c912694dc5..a130df79a2 100644 --- a/core/assets/bundles/bundle_fr_FR.properties +++ b/core/assets/bundles/bundle_fr_FR.properties @@ -259,7 +259,7 @@ item.coal.name=charbon item.steel.name=acier item.titanium.name=titane item.dirium.name=dirium -item.uranium.name=uranium +item.thorium.name=thorium liquid.water.name=eau liquid.plasma.name=plasma liquid.lava.name=lave @@ -275,7 +275,7 @@ block.blackstone.name=pierre noir block.iron.name=fer block.coal.name=charbon block.titanium.name=titane -block.uranium.name=uranium +block.thorium.name=thorium block.dirt.name=terre block.sand.name=sable block.ice.name=glace @@ -407,9 +407,9 @@ block.irondrill.description=Mine 1 fer toutes les 5 secondes. block.coaldrill.name=extracteur de charbon block.coaldrill.fulldescription=Un extracteur de base. Lorsqu'il est placé sur des cases de minerai de charbon, produit du charbon à un rythme lent, indéfiniment. block.coaldrill.description=Mine 1 charbon toutes les 5 secondes. -block.uraniumdrill.name=extracteur d'uranium -block.uraniumdrill.fulldescription=Un extracteur avancé. Lorsqu'il est placés sur des cases d'uranium, il produit de l'uranium à un rythme lent, indéfiniment. -block.uraniumdrill.description=Mine 1 uranium toutes les 7 secondes. +block.thoriumdrill.name=extracteur d'thorium +block.thoriumdrill.fulldescription=Un extracteur avancé. Lorsqu'il est placés sur des cases d'thorium, il produit de l'thorium à un rythme lent, indéfiniment. +block.thoriumdrill.description=Mine 1 thorium toutes les 7 secondes. block.titaniumdrill.name=extracteur de titane block.titaniumdrill.fulldescription=Un extracteur avancé. Lorsqu'il est placé sur des cases de minerai de titane, il produit du titane à un rythme lent, indéfiniment. block.titaniumdrill.description=Mine 1 titane toutes les 5 secondes. @@ -426,10 +426,10 @@ block.combustiongenerator.name=Générateur a combustion block.combustiongenerator.fulldescription=Génère de la puissance depuis du petrole. Emet de la puissance depuis les 4 cotés. block.combustiongenerator.description=Génère de la puissance avec du pétrole. block.rtgenerator.name=Générateur RTG -block.rtgenerator.fulldescription=Génère de petites partie de puissance avec de l'uranium. Emet de la puissance depuis les 4 cotés. -block.rtgenerator.description=Génère de la puissance depuis l'uranium +block.rtgenerator.fulldescription=Génère de petites partie de puissance avec de l'thorium. Emet de la puissance depuis les 4 cotés. +block.rtgenerator.description=Génère de la puissance depuis l'thorium block.nuclearreactor.name=Réacteur nucléaire -block.nuclearreactor.fulldescription=Une version avancée du générateur RTG, et le générateur ultime de puissance. Génère de la puissance depuis l'uranium. Requiert un refoidissement par eau. Très instable; Explose violemment s'il n'est pas bien refroidit. +block.nuclearreactor.fulldescription=Une version avancée du générateur RTG, et le générateur ultime de puissance. Génère de la puissance depuis l'thorium. Requiert un refoidissement par eau. Très instable; Explose violemment s'il n'est pas bien refroidit. block.turret.name=tourelle block.turret.fulldescription=Une tourrelle basique. Utilise de la pierre comme munition. A légèrement plus de distance que la tourelle double. block.turret.description=[turretinfo]Munition: pierre @@ -461,10 +461,10 @@ block.plasmaturret.name=tourelle à plasma block.plasmaturret.fulldescription=Version très avancée de la tourelle lance-flamme. Utilise du charbon comme munition. Dommages très élevés, de faible à moyenne portée. block.plasmaturret.description=[turretinfo]munition : charbon block.chainturret.name=tourelle à mitrailleuse -block.chainturret.fulldescription=La tourelle ultime à tir rapide. Utilise de l'uranium comme munition. Tire de grosses salves à une fréquence élevée. Portée moyenne. Traverse plusieurs carreaux. Extrêmement puissant. +block.chainturret.fulldescription=La tourelle ultime à tir rapide. Utilise de l'thorium comme munition. Tire de grosses salves à une fréquence élevée. Portée moyenne. Traverse plusieurs carreaux. Extrêmement puissant. block.chainturret.description=[turretinfo]munition : Uranium block.titancannon.name=Canon titan -block.titancannon.fulldescription=La tourelle à longue portée ultime. Utilise de l'uranium comme munition. Tire de gros obus provoquant des dégâts de zone à une cadence de tir moyenne. Traverse plusieurs carreaux. Extrêmement puissant. -block.titancannon.description=[turretinfo]munition : uranium +block.titancannon.fulldescription=La tourelle à longue portée ultime. Utilise de l'thorium comme munition. Tire de gros obus provoquant des dégâts de zone à une cadence de tir moyenne. Traverse plusieurs carreaux. Extrêmement puissant. +block.titancannon.description=[turretinfo]munition : thorium block.playerspawn.name=point d'apparition du joueur block.enemyspawn.name=point d'apparition des ennemis diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 6c96a7468c..569b89321b 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -323,7 +323,7 @@ item.coal.name = batu bara item.steel.name = baja item.titanium.name = titanium item.dirium.name = dirium -item.uranium.name = uranium +item.thorium.name = thorium item.sand.name = pasir liquid.water.name = air liquid.plasma.name = plasma @@ -342,7 +342,7 @@ block.blackstone.name = batu hitam block.iron.name = besi block.coal.name = batu bara block.titanium.name = titanium -block.uranium.name = uranium +block.thorium.name = thorium block.dirt.name = tanah block.sand.name = pasir block.ice.name = es @@ -447,8 +447,8 @@ block.irondrill.name = pertambangan besi block.irondrill.fulldescription = Pertambangan dasar. Saat diletakkan di atas ubin bijih besi, akan mengeluarkan besi pada kecepatan yang lambat tanpa batas waktu. block.coaldrill.name = pertambangan batubara block.coaldrill.fulldescription = Pertambangan dasar. Saat ditempatkan di ubin bijih batubara, akan mengeluarkan batu bara pada kecepatan yang lambat tanpa batas waktu. -block.uraniumdrill.name = pertambangan uranium -block.uraniumdrill.fulldescription = Sebuah pertambangan yang canggih. Saat ditempatkan di ubin bijih uranium, akan mengeluarkan uranium pada kecepatan lambat tanpa batas waktu. +block.thoriumdrill.name = pertambangan thorium +block.thoriumdrill.fulldescription = Sebuah pertambangan yang canggih. Saat ditempatkan di ubin bijih thorium, akan mengeluarkan thorium pada kecepatan lambat tanpa batas waktu. block.titaniumdrill.name = pertambangan titanium block.titaniumdrill.fulldescription = Sebuah pertambangan yang canggih. Saat ditempatkan pada ubin bijih titanium, akan mengeluarkan titanium pada kecepatan lambat tanpa batas waktu. block.omnidrill.name = pertambangan super @@ -460,9 +460,9 @@ block.thermalgenerator.fulldescription = Menghasilkan tenaga dari lahar. Mengelu block.combustiongenerator.name = pembangkit tenaga minyak block.combustiongenerator.fulldescription = Menghasilkan tenaga dari minyak. Mengeluarkan tenaga sebagai laser ke 4 sisi. block.rtgenerator.name = pembangkit tenaga radioaktif -block.rtgenerator.fulldescription = Menghasilkan sedikit tenaga dari peluruhan radioaktif uranium. Mengeluarkan tenaga sebagai laser ke 4 sisi. +block.rtgenerator.fulldescription = Menghasilkan sedikit tenaga dari peluruhan radioaktif thorium. Mengeluarkan tenaga sebagai laser ke 4 sisi. block.nuclearreactor.name = reaktor nuklir -block.nuclearreactor.fulldescription = Versi lanjutan Pembangkit Tenaga Radioaktif, dan generator tenaga tertinggi. Menghasilkan tenaga dari uranium. Membutuhkan pendinginan air konstan. Sangat mudah menguap; akan meledak dengan hebat jika tidak cukup jumlah pendingin yang diberikan. +block.nuclearreactor.fulldescription = Versi lanjutan Pembangkit Tenaga Radioaktif, dan generator tenaga tertinggi. Menghasilkan tenaga dari thorium. Membutuhkan pendinginan air konstan. Sangat mudah menguap; akan meledak dengan hebat jika tidak cukup jumlah pendingin yang diberikan. block.turret.name = turret block.turret.fulldescription = Sebuah menara dasar yang murah. Menggunakan batu untuk amunisi. Memiliki jangkauan yang sedikit lebih banyak daripada turret ganda. block.doubleturret.name = turret ganda @@ -484,8 +484,8 @@ block.waveturret.fulldescription = Turret target banyak. Menggunakan tenaga. Jar block.plasmaturret.name = turret plasma block.plasmaturret.fulldescription = Versi yang sangat maju dari turret api. Menggunakan batubara sebagai amunisi. Damage yang sangat tinggi, jaraknya pendek sampai sedang. block.chainturret.name = turret berantai -block.chainturret.fulldescription = Menara api yang menembak dengan cepat. Menggunakan uranium sebagai amunisi. Menembak peluru besar dengan kecepatan tinggi. Jaraknya sedang. Membentang beberapa ubin. Sangat tangguh. +block.chainturret.fulldescription = Menara api yang menembak dengan cepat. Menggunakan thorium sebagai amunisi. Menembak peluru besar dengan kecepatan tinggi. Jaraknya sedang. Membentang beberapa ubin. Sangat tangguh. block.titancannon.name = meriam titan -block.titancannon.fulldescription = Turret jarak jauh terakhir. Menggunakan uranium sebagai amunisi. Menembakkan peluru yang meledak dengan cipratan besar dengan kecepatan sedang. Jarak jauh. Membentang beberapa ubin. Sangat tangguh. +block.titancannon.fulldescription = Turret jarak jauh terakhir. Menggunakan thorium sebagai amunisi. Menembakkan peluru yang meledak dengan cipratan besar dengan kecepatan sedang. Jarak jauh. Membentang beberapa ubin. Sangat tangguh. block.playerspawn.name = spawn pemain block.enemyspawn.name = spawn musuh \ No newline at end of file diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index f27ff409be..ab5dbe0b84 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -312,7 +312,7 @@ item.coal.name = 석탄 item.steel.name = 강철 item.titanium.name = 티타늄 item.dirium.name = 디리늄 -item.uranium.name = 우라늄 +item.thorium.name = 우라늄 item.sand.name = 모래 liquid.water.name = 물 liquid.plasma.name = 플라즈마 @@ -330,7 +330,7 @@ block.blackstone.name = 검은 돌 block.iron.name = 철 block.coal.name = 석탄 block.titanium.name = 티타늄 -block.uranium.name = 우라늄 +block.thorium.name = 우라늄 block.dirt.name = 흙 block.sand.name = 모래 block.ice.name = 얼음 @@ -435,8 +435,8 @@ block.irondrill.name = 철 드릴 block.irondrill.fulldescription = 기본 드릴. 철 광석 타일에 놓으면 느린속도로 철을 채굴합니다. block.coaldrill.name = 석탄 드릴 block.coaldrill.fulldescription = 기본 드릴. 석탄 광석 타일 위에 놓으면 느린속도로 석탄을 채굴 합니다. -block.uraniumdrill.name = 우라늄 드릴 -block.uraniumdrill.fulldescription = 고급 드릴. 우라늄 광석 타일 위에 놓으면 느린 속도로 우라늄을 채굴합니다. +block.thoriumdrill.name = 우라늄 드릴 +block.thoriumdrill.fulldescription = 고급 드릴. 우라늄 광석 타일 위에 놓으면 느린 속도로 우라늄을 채굴합니다. block.titaniumdrill.name = 티타늄 드릴 block.titaniumdrill.fulldescription = 고급 드릴. 티타늄 광석 타일 위에 놓으면 느린속도로 티타늄을 채굴합니다. block.omnidrill.name = 옴니 드릴 diff --git a/core/assets/bundles/bundle_pl_PL.properties b/core/assets/bundles/bundle_pl_PL.properties index f131155ecb..3f0ee605dc 100644 --- a/core/assets/bundles/bundle_pl_PL.properties +++ b/core/assets/bundles/bundle_pl_PL.properties @@ -321,7 +321,7 @@ item.coal.name = węgiel item.steel.name = stal item.titanium.name = tytan item.dirium.name = dirium -item.uranium.name = uran +item.thorium.name = uran item.sand.name = piasek liquid.water.name = woda liquid.plasma.name = plazma @@ -339,7 +339,7 @@ block.blackstone.name = czarny kamień block.iron.name = żelazo block.coal.name = węgiel block.titanium.name = tytan -block.uranium.name = uran +block.thorium.name = uran block.dirt.name = ziemia block.sand.name = piasek block.ice.name = lód @@ -444,8 +444,8 @@ block.irondrill.name = wiertło do żelaza block.irondrill.fulldescription = Po umieszczeniu na rudzie żelaza, powoli i w nieskończoność wydobywa żelazo. block.coaldrill.name = wiertło do węgla block.coaldrill.fulldescription = Po umieszczeniu na rudzie węgla, powoli i w nieskończoność wydobywa węgiel. -block.uraniumdrill.name = wiertło do uranu -block.uraniumdrill.fulldescription = Wiertło zaawansowane. Po umieszczeniu na rudzie uranu, wydobywa uran w wolnym tempie przez czas nieokreślony. +block.thoriumdrill.name = wiertło do uranu +block.thoriumdrill.fulldescription = Wiertło zaawansowane. Po umieszczeniu na rudzie uranu, wydobywa uran w wolnym tempie przez czas nieokreślony. block.titaniumdrill.name = wiertło do tytanu block.titaniumdrill.fulldescription = Wiertło zaawansowane. Po umieszczeniu na rudzie tytanu, wydobywa tytan w wolnym tempie przez czas nieokreślony. block.omnidrill.name = omnidril diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 664b1e25a1..2feefd7f6d 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -241,7 +241,7 @@ item.coal.name=Carvão item.steel.name=Aço item.titanium.name=Titânio item.dirium.name=Dírio -item.uranium.name=Urânio +item.thorium.name=Urânio liquid.water.name=Água liquid.plasma.name=Plasma liquid.lava.name=Lava @@ -258,7 +258,7 @@ block.blackstone.name=Pedra Escura block.iron.name=Ferro block.coal.name=Carvão block.titanium.name=Titânio -block.uranium.name=Urânio +block.thorium.name=Urânio block.dirt.name=Terra block.sand.name=Areia block.ice.name=Gelo @@ -404,9 +404,9 @@ block.irondrill.description=Gera 1 ferro a cada 5 segundos. block.coaldrill.name=Broca de Carvão block.coaldrill.fulldescription=Uma broca básica. Quando colocada sobre uma jazida de carvão, lentamente gera carvão. block.coaldrill.description=Gera 1 carvão a cada 5 segundos. -block.uraniumdrill.name=Broca de Urânio -block.uraniumdrill.fulldescription=Uma broca avançada. Quando colocada sobre uma jazida de urânio, lentamente gera urânio. -block.uraniumdrill.description=Gera 1 Urânio a cada 7 segundos. +block.thoriumdrill.name=Broca de Urânio +block.thoriumdrill.fulldescription=Uma broca avançada. Quando colocada sobre uma jazida de urânio, lentamente gera urânio. +block.thoriumdrill.description=Gera 1 Urânio a cada 7 segundos. block.titaniumdrill.name=Broca de Titânio block.titaniumdrill.fulldescription=Uma broca avançada. Quando colocada sobre uma jazida de titânio, lentamente gera titânio. block.titaniumdrill.description=Gera 1 Titânio a cada 5 segundos. diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 73828be009..c3d13036ca 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -312,7 +312,7 @@ item.coal.name = Уголь item.steel.name = сталь item.titanium.name = титан item.dirium.name = дириум -item.uranium.name = уран +item.thorium.name = уран item.sand.name = песок liquid.water.name = Вода liquid.plasma.name = Плазма @@ -330,7 +330,7 @@ block.blackstone.name = черный камень block.iron.name = железо block.coal.name = уголь block.titanium.name = титан -block.uranium.name = уран +block.thorium.name = уран block.dirt.name = земля block.sand.name = песок block.ice.name = лед @@ -435,8 +435,8 @@ block.irondrill.name = Железный бур block.irondrill.fulldescription = Основной бур. При размещении на клетке с железной рудой, выдает железо медленным темпом на неопределенный срок. block.coaldrill.name = угольный бур block.coaldrill.fulldescription = Основной бур. При размещении на клетке с угольной рудой происходит медленный темп добычи угля на неопределенный срок. -block.uraniumdrill.name = урановый бур -block.uraniumdrill.fulldescription = Передовой бур. При размещении на клетке с урановой рудой выдает уран медленным темпом на неопределенный срок. +block.thoriumdrill.name = урановый бур +block.thoriumdrill.fulldescription = Передовой бур. При размещении на клетке с урановой рудой выдает уран медленным темпом на неопределенный срок. block.titaniumdrill.name = титановый бур block.titaniumdrill.fulldescription = Продвинутый бур. При размещении на клетках с титановой рудой выводится титан медленным темпом на неопределенный срок. block.omnidrill.name = Адаптивный бур diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 0630b6e4bc..58caee33e5 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -332,7 +332,7 @@ item.coal.name = Вугівалля item.steel.name = Сталь item.titanium.name = Титан item.dirium.name = Дириум -item.uranium.name = Уран +item.thorium.name = Уран item.sand.name = Пісок liquid.water.name = Вода liquid.plasma.name = Плазма @@ -351,7 +351,7 @@ block.blackstone.name = Чорний камінь block.iron.name = Залізо block.coal.name = Вугілля block.titanium.name = Титан -block.uranium.name = Уран +block.thorium.name = Уран block.dirt.name = Бруд block.sand.name = Пісок block.ice.name = Лід @@ -456,8 +456,8 @@ block.irondrill.name = Залізна свердловина block.irondrill.fulldescription = Базова свердловина.Розміщюється на родовищі залізної руди, випускає залізо в повільному темпі. block.coaldrill.name = Вугільна свердловина block.coaldrill.fulldescription = Базова свердловина.Розміщюється на родовищі вугільної руди ,видобуває вугілля повільними темпами. -block.uraniumdrill.name = Уранова свердловина -block.uraniumdrill.fulldescription = Продвинута свердловина. Розміщюється на родовищі уранової руди.Видобуток урану відбувається повільними темпами. +block.thoriumdrill.name = Уранова свердловина +block.thoriumdrill.fulldescription = Продвинута свердловина. Розміщюється на родовищі уранової руди.Видобуток урану відбувається повільними темпами. block.titaniumdrill.name = Титанова свердловина block.titaniumdrill.fulldescription = Продвинута свердловина.Розміщюється на родовищі титанової руди, Видобуток титану відбувається повільним темпом. block.omnidrill.name = Убер свердловина diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 522ec5696a..db415e2ef6 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -494,44 +494,44 @@ stoneedge orig: 12, 12 offset: 0, 0 index: -1 -titanium1 +thorium1 rotate: false xy: 672, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -titanium2 +thorium2 rotate: false xy: 682, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -titanium3 +thorium3 rotate: false xy: 650, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -uranium1 +titanium1 rotate: false - xy: 660, 249 + xy: 660, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -uranium2 +titanium2 rotate: false - xy: 670, 249 + xy: 660, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -uranium3 +titanium3 rotate: false - xy: 680, 249 + xy: 670, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -858,23 +858,23 @@ thermalgenerator orig: 8, 8 offset: 0, 0 index: -1 -titaniumdrill +thoriumdrill rotate: false xy: 650, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -titaniumextractor +titaniumdrill rotate: false - xy: 660, 269 + xy: 670, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -uraniumdrill +titaniumextractor rotate: false - xy: 492, 168 + xy: 680, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,7 +1154,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 650, 249 + xy: 492, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1399,14 +1399,14 @@ stonewall index: -1 titaniumshieldwall rotate: false - xy: 660, 259 + xy: 680, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 670, 269 + xy: 650, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1490,7 +1490,7 @@ shot-long index: -1 titanshell rotate: false - xy: 670, 259 + xy: 660, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1600,14 +1600,14 @@ item-stone orig: 8, 8 offset: 0, 0 index: -1 -item-titanium +item-thorium rotate: false xy: 620, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -item-uranium +item-titanium rotate: false xy: 630, 276 size: 8, 8 @@ -2644,14 +2644,14 @@ shockgun-equip index: -1 triblaster rotate: false - xy: 680, 269 + xy: 670, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 680, 259 + xy: 680, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 69fe6c46dd..f7841e4bc9 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/version.properties b/core/assets/version.properties index 5b72d7882f..39f45e8e96 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Fri Mar 23 22:59:10 EDT 2018 +#Sat Mar 24 00:50:32 EDT 2018 version=release -androidBuildCode=625 +androidBuildCode=633 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/io/BlockLoader.java b/core/src/io/anuke/mindustry/io/BlockLoader.java index f72eaa6354..17e524145a 100644 --- a/core/src/io/anuke/mindustry/io/BlockLoader.java +++ b/core/src/io/anuke/mindustry/io/BlockLoader.java @@ -19,7 +19,7 @@ public class BlockLoader { "iron", 8, "coal", 9, "titanium", 10, - "uranium", 11, + "thorium", 11, "dirt", 12, "sand", 13, "ice", 14, @@ -81,7 +81,7 @@ public class BlockLoader { "stonedrill", 70, "irondrill", 71, "coaldrill", 72, - "uraniumdrill", 73, + "thoriumdrill", 73, "titaniumdrill", 74, "omnidrill", 75, "coalgenerator", 76, diff --git a/core/src/io/anuke/mindustry/resource/Item.java b/core/src/io/anuke/mindustry/resource/Item.java index c1f6b1026c..488ae62aa2 100644 --- a/core/src/io/anuke/mindustry/resource/Item.java +++ b/core/src/io/anuke/mindustry/resource/Item.java @@ -26,10 +26,9 @@ public class Item implements Comparable{ }, steel = new Item("steel"), titanium = new Item("titanium"), - uranium = new Item("uranium"){ + thorium = new Item("thorium"){ { explosiveness = 0.1f; - material = false; } }, silicon = new Item("silicon"), diff --git a/core/src/io/anuke/mindustry/resource/Recipes.java b/core/src/io/anuke/mindustry/resource/Recipes.java index ad22b51b7f..a89eae100b 100644 --- a/core/src/io/anuke/mindustry/resource/Recipes.java +++ b/core/src/io/anuke/mindustry/resource/Recipes.java @@ -32,6 +32,7 @@ public class Recipes { new Recipe(distribution, DistributionBlocks.sorter, stack(Item.steel, 2)), new Recipe(distribution, DistributionBlocks.splitter, stack(Item.steel, 1)), new Recipe(distribution, DistributionBlocks.vault, stack(Item.steel, 50)), + new Recipe(distribution, ProductionBlocks.core, stack(Item.steel, 50)), new Recipe(distribution, DistributionBlocks.unloader, stack(Item.steel, 5)), new Recipe(distribution, DistributionBlocks.sortedunloader, stack(Item.steel, 5)), @@ -65,7 +66,7 @@ public class Recipes { new Recipe(production, ProductionBlocks.leaddrill, stack(Item.iron, 25)), new Recipe(production, ProductionBlocks.coaldrill, stack(Item.iron, 25), stack(Item.iron, 40)), new Recipe(production, ProductionBlocks.titaniumdrill, stack(Item.iron, 50), stack(Item.steel, 50)), - new Recipe(production, ProductionBlocks.uraniumdrill, stack(Item.iron, 40), stack(Item.steel, 40)), + new Recipe(production, ProductionBlocks.thoriumdrill, stack(Item.iron, 40), stack(Item.steel, 40)), new Recipe(production, ProductionBlocks.quartzextractor, stack(Item.titanium, 40), stack(Item.densealloy, 40)), new Recipe(production, ProductionBlocks.cultivator, stack(Item.titanium, 40), stack(Item.densealloy, 40)), new Recipe(production, ProductionBlocks.laserdrill, stack(Item.titanium, 40), stack(Item.densealloy, 40)), diff --git a/core/src/io/anuke/mindustry/world/ColorMapper.java b/core/src/io/anuke/mindustry/world/ColorMapper.java index b14b853932..58fa795668 100644 --- a/core/src/io/anuke/mindustry/world/ColorMapper.java +++ b/core/src/io/anuke/mindustry/world/ColorMapper.java @@ -36,7 +36,7 @@ public class ColorMapper{ "c3a490", pair(Blocks.iron), "161616", pair(Blocks.coal), "6277bc", pair(Blocks.titanium), - "83bc58", pair(Blocks.uranium) + "83bc58", pair(Blocks.thorium) ); public static BlockPair get(int color){ diff --git a/core/src/io/anuke/mindustry/world/blocks/Blocks.java b/core/src/io/anuke/mindustry/world/blocks/Blocks.java index 9cd18eb636..bf29b35ece 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Blocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/Blocks.java @@ -86,9 +86,9 @@ public class Blocks{ titanium = new Ore("titanium"){{ drops = new ItemStack(Item.titanium, 1); }}, - - uranium = new Ore("uranium"){{ - drops = new ItemStack(Item.uranium, 1); + + thorium = new Ore("thorium"){{ + drops = new ItemStack(Item.thorium, 1); }}, dirt = new Floor("dirt"){}, diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java index 651c02693a..9a4874b8c4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java @@ -184,10 +184,10 @@ public class ProductionBlocks{ } }, - uraniumdrill = new Drill("uraniumdrill"){ + thoriumdrill = new Drill("thoriumdrill"){ { - resource = Blocks.uranium; - result = Item.uranium; + resource = Blocks.thorium; + result = Item.thorium; drillTime = 600; } }, @@ -298,7 +298,7 @@ public class ProductionBlocks{ }, rtgenerator = new ItemPowerGenerator("rtgenerator"){ { - generateItem = Item.uranium; + generateItem = Item.thorium; powerCapacity = 40f; powerOutput = 0.03f; itemDuration = 240f; diff --git a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java index f551a46b70..714ae41756 100644 --- a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java @@ -155,7 +155,7 @@ public class WeaponBlocks{ range = 80f; reload = 8f; bullet = BulletType.chain; - ammo = Item.uranium; + ammo = Item.thorium; health = 430; size = 2; shootCone = 9f; @@ -188,7 +188,7 @@ public class WeaponBlocks{ range = 120f; reload = 23f; bullet = BulletType.titanshell; - ammo = Item.uranium; + ammo = Item.thorium; health = 800; ammoMultiplier = 4; size = 3; @@ -205,7 +205,7 @@ public class WeaponBlocks{ range = 120f; reload = 23f; bullet = BulletType.titanshell; - ammo = Item.uranium; + ammo = Item.thorium; health = 800; ammoMultiplier = 4; size = 3; @@ -221,7 +221,7 @@ public class WeaponBlocks{ range = 120f; reload = 23f; bullet = BulletType.titanshell; - ammo = Item.uranium; + ammo = Item.thorium; health = 800; ammoMultiplier = 4; size = 2; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java b/core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java index f288d8bb44..984ae9fe81 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java @@ -41,7 +41,7 @@ public class NuclearReactor extends LiquidPowerGenerator{ public NuclearReactor(String name) { super(name); - generateItem = Item.uranium; + generateItem = Item.thorium; generateLiquid = Liquid.water; itemCapacity = 30; liquidCapacity = 50; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/storage/Vault.java b/core/src/io/anuke/mindustry/world/blocks/types/storage/Vault.java index 7570917b0b..b4c60d3146 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/storage/Vault.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/storage/Vault.java @@ -37,6 +37,14 @@ public class Vault extends StorageBlock { @Override public boolean canDump(Tile tile, Tile to, Item item){ - return to.target().block() instanceof StorageBlock; + to = to.target(); + if(!(to.block() instanceof StorageBlock)) return false; + + if(to.block() instanceof Vault){ + return (float)to.entity.inventory.totalItems() / to.block().itemCapacity < + (float)tile.entity.inventory.totalItems() / itemCapacity; + } + + return true; } }