version 1.6

PetruCHIOrus · Apr 9, 2023 · eca703e · eca703e
1 parent fddc502
commit eca703e
Show file tree

Hide file tree

Showing 61 changed files with 182 additions and 403 deletions.
diff --git a/bundles/bundle_fr.properties b/bundles/bundle_fr.properties
@@ -94,8 +94,8 @@ unit.lead_ind-lich.name = Lich
 unit.lead_ind-lich.description = Je sais que vous attendiez cela.
 unit.lead_ind-pyromaniac.name = Pyromane
 unit.lead_ind-pyromaniac.description = Unité de combat dangereuse capable de mettre le feu aux bâtiments ennemis.
-item.lead_ind-tungsten-parts.name = Pièces en Tungstène
-item.lead_ind-tungsten-parts.description = Matériau universel utilisé pour créer des outils puissants et des structures solides.
+item.lead_ind-wolframium-parts.name = Pièces en Tungstène
+item.lead_ind-wolframium-parts.description = Matériau universel utilisé pour créer des outils puissants et des structures solides.
 block.lead_ind-metal-shaper.name = Presse à Tungstène
 block.lead_ind-metal-shaper.description = Fabrique des pièces de tungstène robustes.
 item.lead_ind-wolframium.name = Wolframium
@@ -108,11 +108,11 @@ block.lead_ind-shark.name = Requin
 block.lead_ind-shark.description = Cadence de tir ultrarapide, des dégâts importants et un large rayon d'attaque, mais la tourelle est assez fragile et nécessite beaucoup d'énergie.
 block.lead_ind-massdriver.name = Catapulte Électromagnétique en Tungstène
 block.lead_ind-massdriver.description = Catapulte électromagnétique de 2x2, assez pratique et compact pour envoyer rapidements des ressources à l'endroit souhaité.
-block.lead_ind-tungsten-wall.name = Mur de Tungstène Large
-block.lead_ind-tungsten-wall.description = Mur extrêmement solide, beaucoup plus solide que leur équivalent en thorium.
-block.lead_ind-tungsten-wall-large.name = Mur de Tungstène Énorme
-block.lead_ind-tungsten-wall-large.description = Mur extrêmement solide, beaucoup plus solide qu'un mur en thorium.
-block.lead_ind-tungsten-wall-small.name = Mur de Tungstène
-block.lead_ind-tungsten-wall-small.description = Mur extrêmement solide, beaucoup plus solide que leur équivalent en thorium.
+block.lead_ind-wolframium-wall.name = Mur de Tungstène Large
+block.lead_ind-wolframium-wall.description = Mur extrêmement solide, beaucoup plus solide que leur équivalent en thorium.
+block.lead_ind-wolframium-wall-large.name = Mur de Tungstène Énorme
+block.lead_ind-wolframium-wall-large.description = Mur extrêmement solide, beaucoup plus solide qu'un mur en thorium.
+block.lead_ind-wolframium-wall-small.name = Mur de Tungstène
+block.lead_ind-wolframium-wall-small.description = Mur extrêmement solide, beaucoup plus solide que leur équivalent en thorium.
 block.lead_ind-core.name = Noyau en Tungstène
 block.lead_ind-core.description = Ne peut être détruit après avoir été construit ! Soyez prudents quand vous utilisez un faux noyau.
diff --git a/bundles/bundle_ru.properties b/bundles/bundle_ru.properties
@@ -94,10 +94,10 @@ unit.lead_ind-lich.name = Лич
 unit.lead_ind-lich.description = Я знаю, ты ждал этого
 unit.lead_ind-pyromaniac.name = Пироман
 unit.lead_ind-pyromaniac.description = Опасный боевой юнит, способный поджечь вражеские постройки
-item.lead_ind-tungsten-parts.name = Вольфрамовые детали
-item.lead_ind-tungsten-parts.description = Универсальный материал для создания мощных орудий и прочных построек
-block.lead_ind-metal-sharper.name = Формировщик металла
-block.lead_ind-metal-sharper.description = Делает сверхпрочные компоненты из вольфрама
+item.lead_ind-wolframium-parts.name = Вольфрамовые детали
+item.lead_ind-wolframium-parts.description = Универсальный материал для создания мощных орудий и прочных построек
+block.lead_ind-metal-shaper.name = Формировщик металла
+block.lead_ind-metal-shaper.description = Делает сверхпрочные компоненты из вольфрама
 item.lead_ind-wolframium.name = Вольфрам
 item.lead_ind-wolframium.description = Очень твёрдый материал, используемый в качестве боеприпасов для турелей, атакующих исключительно наземные цели и не только
 block.lead_ind-lich-factory.name = Завод боевых единиц "Лич"
@@ -108,11 +108,11 @@ block.lead_ind-shark.name = Акула
 block.lead_ind-shark.description = Стреляет быстрей скорости света! Высокий урон и большой радиус атаки, но турель непрочная
 block.lead_ind-massdriver.name = Малая катапульта из вольфрама
 block.lead_ind-massdriver.description = Катапульта 2x2 из вольфрама, довольно удобный и компактный механизм для быстрой отправки предметов в нужную точку
-block.lead_ind-tungsten-wall.name = Большая стена из вольфрама
-block.lead_ind-tungsten-wall.description = Крайне прочные стены, значительно крепче стен из тория
-block.lead_ind-tungsten-wall-large.name = Огромная стена из вольфрама
-block.lead_ind-tungsten-wall-large.description = Крайне прочные стены, значительно крепче стен из тория
-block.lead_ind-tungsten-wall-small.name = Маленькая стена из вольфрама
-block.lead_ind-tungsten-wall-small.description = Крайне прочные стены, значительно крепче стен из тория
+block.lead_ind-wolframium-wall.name = Большая стена из вольфрама
+block.lead_ind-wolframium-wall.description = Крайне прочные стены, значительно крепче стен из тория
+block.lead_ind-wolframium-wall-large.name = Огромная стена из вольфрама
+block.lead_ind-wolframium-wall-large.description = Крайне прочные стены, значительно крепче стен из тория
+block.lead_ind-wolframium-wall-small.name = Маленькая стена из вольфрама
+block.lead_ind-wolframium-wall-small.description = Крайне прочные стены, значительно крепче стен из тория
 block.lead_ind-core.name = Вольфрамовое ядро
 block.lead_ind-core.description = После установки его нельзя разрушить, будьте осторожны при установке фейкового ядра!
diff --git a/bundles/bundle_uk_UA.properties b/bundles/bundle_uk_UA.properties
@@ -29,22 +29,4 @@ item.lead_ind-plutonium.description = Радіоактивна штука
 item.lead_ind-flesh.name = Плоть
 item.lead_ind-flesh = Шматочок плоті
 item.lead_ind-banana.name = Банан
-item.lead_ind-banana.description = Просто банан
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
-block.lead_ind-
+item.lead_ind-banana.description = Просто банан
diff --git a/content/blocks/defense/turret/fleshgun.hjson b/content/blocks/defense/turret/fleshgun.hjson
@@ -5,12 +5,13 @@ targetAir: false
 targetGround: true
 size: 2
 inaccuracy: 12
-reloadTime: 18
+reload: 18
 shootCone: 40
 rotateSpeed: 22
-shots: 4
+shoot: {
+    shots: 4
+}
 range: 162
-burstSpacing: 6
 ammoTypes: {
 	flesh: {
 		speed: 3.5

diff --git a/content/blocks/defense/turret/grasshopper.hjson b/content/blocks/defense/turret/grasshopper.hjson
@@ -5,12 +5,13 @@ targetAir: false
 targetGround: true
 size: 1
 inaccuracy: 20
-reloadTime: 70
+reload: 70
 shootCone: 20
 rotateSpeed: 12
-shots: 5
+shoot: {
+    shots: 5
+}
 range: 70
-burstSpacing: 0
 ammoTypes: {
 	lead: {
 		speed: 2

diff --git a/content/blocks/defense/turret/hq-turret-xl.hjson b/content/blocks/defense/turret/hq-turret-xl.hjson
@@ -5,13 +5,14 @@ targetAir: true
 targetGround: true
 inaccuracy: 20
 size: 3
-reloadTime: 8
+reload: 8
 shootCone: 40
 shootSound:"shootBig"
 rotateSpeed: 10
-shots: 1
+shoot: {
+    shots: 1
+}
 range: 240
-burstSpacing: 15
 ammoTypes: {
 	galactical-steel: {
 		speed: 5.5

diff --git a/content/blocks/defense/turret/hq-turret.hjson b/content/blocks/defense/turret/hq-turret.hjson
@@ -5,13 +5,14 @@ targetAir: true
 targetGround: true
 inaccuracy: 40
 size: 2
-reloadTime: 15
+reload: 15
 shootCone: 40
 shootSound:"shootBig"
 rotateSpeed: 10
-shots: 1
+shoot: {
+    shots: 1
+}
 range: 150
-burstSpacing: 10
 ammoTypes: {
 	galactical-steel: {
 		speed: 4

diff --git a/content/blocks/defense/turret/minigun.hjson b/content/blocks/defense/turret/minigun.hjson
@@ -5,12 +5,13 @@ targetAir: true
 targetGround: true
 size: 2
 inaccuracy: 3
-reloadTime: 6
+reload: 6
 shootCone: 1
 rotateSpeed: 5
-shots: 1
+shoot: {
+    shots: 1
+}
 range: 110
-burstSpacing: 2
 ammoTypes: {
 	titanium: {
 		speed: 9

diff --git a/content/blocks/defense/turret/nova.hjson b/content/blocks/defense/turret/nova.hjson
@@ -4,13 +4,14 @@ description: "Shoots far"
 targetAir: true
 targetGround: true
 size: 4
-reloadTime: 180
+reload: 180
 shootCone: 40
 shootSound:"shootBig"
 rotateSpeed: 1
-shots: 1
+shoot: {
+    shots: 1
+}
 range: 750
-burstSpacing: 6
 ammoTypes: {
 	blast-compound: {
 		speed: 20
@@ -30,7 +31,7 @@ ammoTypes: {
 		height: 19
 		shootEffect: "shootBig"
 		smokeEffect: "lancerLaserShootSmoke",
-		ammoMultiplier: 1
+      ammoMultiplier: 1
 	}
 	plastanium: {
 		speed: 22

diff --git a/content/blocks/defense/turret/shark.hjson b/content/blocks/defense/turret/shark.hjson
@@ -2,9 +2,8 @@ type: "PowerTurret"
 name: "Shark"
 description: "lightning fast rate of fire! high damage and a large radius of attack, but the turret is quite fragile, and requires a lot of energy"
 health: 1500
-reloadTime: 8
+reload: 8
 rotateSpeed: 12
-powerUse: 4
 targetAir: true
 targetGround: true
 range: 150
@@ -19,15 +18,17 @@ shootType: {
   ammoMultiplier: 1
   reloadMultiplier: 1
 }
-cooldown: 3
+consumes: {
+  power: 4
+}
 heatColor: "ff0000"
 shootSound: "spark"
 requirements: [
 	silicon/35
 	titanium/70
    lead/150
 	copper/100
-	tungsten-parts/50
+	wolframium-parts/50
 ]
 category: "turret"
 research: "arc"
diff --git a/.../blocks/defense/tungsten-wall-large.hjson → ...locks/defense/wolframium-wall-large.hjson b/.../blocks/defense/tungsten-wall-large.hjson → ...locks/defense/wolframium-wall-large.hjson
@@ -1,4 +1,4 @@
-name: "Huge tungsten wall"
+name: "Huge wolframium wall"
 description: "Very strong wall"
 type: "wall"
 health: 11000

diff --git a/.../blocks/defense/tungsten-wall-small.hjson → ...locks/defense/wolframium-wall-small.hjson b/.../blocks/defense/tungsten-wall-small.hjson → ...locks/defense/wolframium-wall-small.hjson
@@ -1,4 +1,4 @@
-name: "Small tungsten wall"
+name: "Small wolframium wall"
 description: "Very strong wall"
 type: "wall"
 health: 1000

diff --git a/content/blocks/defense/tungsten-wall.hjson → content/blocks/defense/wolframium-wall.hjson b/content/blocks/defense/tungsten-wall.hjson → content/blocks/defense/wolframium-wall.hjson
@@ -1,4 +1,4 @@
-name: "Tungsten wall"
+name: "Wolframium wall"
 description: "Very strong wall"
 type: "wall"
 health: 4000

diff --git a/content/blocks/distribution/massdriver.hjson b/content/blocks/distribution/massdriver.hjson
@@ -7,15 +7,15 @@ consumes: {
 	power: 1.25
 }
 itemCapacity: 70
-reloadTime: 110
-//"buildTime": 210
+reload: 110
+//buildTime: 210
 range: 300
 requirements: [
-silicon/40
-graphite/40
-lead/50
-copper/50
-tungsten-parts/15
+    silicon/40
+    graphite/40
+    lead/50
+    copper/50
+    wolframium-parts/15
 ]
 category: "distribution"
 research: "mass-driver"
diff --git a/content/blocks/environment/ore-flesh.hjson b/content/blocks/environment/ore-flesh.hjson
@@ -1,2 +1,5 @@
 type: "OreBlock"
-itemDrop: "flesh"
+itemDrop: "flesh"
+oreDefault: true
+oreScale: 24
+oreThreshold: 0.828
diff --git a/content/blocks/environment/wolframium.hjson b/content/blocks/environment/wolframium.hjson
@@ -1,2 +1,5 @@
 type: "OreBlock"
-itemDrop: "wolframium"
+itemDrop: "wolframium"
+oreDefault: true
+oreScale: 24
+oreThreshold: 0.828
diff --git a/content/blocks/power/banana-reactor.hjson b/content/blocks/power/banana-reactor.hjson
@@ -1,4 +1,4 @@
-type: "SingleTypeGenerator"
+type: "ConsumeGenerator"
 name: "Banana reactor"
 description: "Just the best place for your bananas"
 itemCapacity: 20

diff --git a/content/blocks/power/galactical-generator.hjson b/content/blocks/power/galactical-generator.hjson
@@ -1,9 +1,10 @@
-type: "SingleTypeGenerator"
+type: "ConsumeGenerator"
 name: "Galactic Generator"
 description: "very economical and powerful internal combustion generator"
 size: 1
 hasPower: true
 hasItems: true
+hasLiquids: false
 itemDuration: 150
 powerProduction: 3.0
 consumes: {

diff --git a/content/blocks/power/super-diesel.hjson b/content/blocks/power/super-diesel.hjson
@@ -1,4 +1,4 @@
-type: "SingleTypeGenerator"
+type: "ConsumeGenerator"
 name: "Super diesel"
 description: "Just best place for your diesel"
 itemCapacity: 20

diff --git a/content/blocks/production/big-silicon-smelter.hjson b/content/blocks/production/big-silicon-smelter.hjson
@@ -1,12 +1,31 @@
 name: "Silicon furnace"
-type: "GenericSmelter"
-health: 930
+type: "GenericCrafter"
 description: "A more advanced version of the silicon smelter."
-hasPower: false
 size: 3
+category: "crafting"
+craftEffect: "smeltsmoke"
+drawer: {
+    type: "DrawMulti",
+    drawers: [
+        {
+            type: DrawDefault
+        },
+        {
+            type: DrawFlame,
+            flameRadius: 3.3,
+            flameRadiusIn: 1.5,
+            flameRadiusScl: 5.25,
+            flameRadiusMag: 3.0,
+            flameRadiusInMag: 1.5,
+            flameColor: "ffef99"
+        }
+    ]
+}
+health: 930
+hasItems: true
+hasPower: false
 hasLiquids: false
 craftTime: 36.29
-updateEffect: "smeltsmoke"
 itemCapacity: 20
 consumes: {
 	items: {
@@ -23,6 +42,6 @@ requirements: [
 	graphite/100
 	silicon/50
 ]
-category: "crafting"
 research: "silicon-smelter"
-outputItem: silicon/3
+outputItem: silicon/3
+ambientSound: "respawning"
diff --git a/content/blocks/production/drill/galax.hjson b/content/blocks/production/drill/galax.hjson
@@ -6,19 +6,19 @@ tier: 5
 drillTime: 7
 hasPower: true
 consumes: {
-power: 2.5
-liquid: {
-liquid: "water"
-amount: 0.1
-booster: true
-optional: true
-}
+    power: 2.5
+    liquid: {
+        liquid: "water"
+        amount: 0.1
+        booster: true
+        optional: true
+    }
 }
 requirements: [
-copper/200
-lead/200
-titanium/100
-galactical-steel/100
+    copper/200
+    lead/200
+    titanium/100
+    galactical-steel/100
 ]
 category: "production"
 research: "blast-drill"