0.12.4b

NiTiSon · Feb 15, 2021 · 87e0f69 · 87e0f69
1 parent e5d8492
commit 87e0f69
Show file tree

Hide file tree

Showing 35 changed files with 135 additions and 39 deletions.
diff --git a/bundles/bundle.properties b/bundles/bundle.properties
@@ -32,6 +32,8 @@ block.gravillaso-magneturn-wall-large.description = Protects structures from ene
 ###Blocks-Drills
 block.gravillaso-deep-oil-pump.name = Oil Pump
 block.gravillaso-deep-oil-pump.description = Uses colossal amounts of power to drill deep oil mine.
+block.gravillaso-overdrive-drill.name = Overdrive Drill
+block.gravillaso-overdrive-drill.description = [red]In developing
 ###Blocks-Liquids
 block.gravillaso-gravitium-conduit.name = Gravitium Conduit
 block.gravillaso-gravitium-conduit.description = Moves liquids forward. Transports faster and stores more than pulse conduits.
@@ -52,6 +54,7 @@ block.gravillaso-anxiety.name = Anxiety
 block.gravillaso-anxiety.description = A turret that uses magnetism for very fast fire
 block.gravillaso-arhiepiscop.name = Arhiepiscop
 block.gravillaso-arhiepiscop.description = [red]In developing
+block.gravillaso-arhiepiscop.details = You feel love?
 block.gravillaso-destiny.name = Destiny
 block.gravillaso-destiny.description = Shoots motionless electric spears\nFast reload allows you to keep up with fast enemies.
 block.gravillaso-divine-storm.name = Divine Storm
@@ -74,6 +77,8 @@ block.gravillaso-molecular-converter.description = The simplest molecular recons
 block.gravillaso-molecular-reconstructor.name = Molecular Reconstructor
 block.gravillaso-molecular-reconstructor.description = The true molecular reconstructor, creates a new substance from titanium, lead, silicon and is cooled with water.
 ###Blocks-Power
+block.gravillaso-benzine-generator.name = Benzine Generator
+block.gravillaso-benzine-generator.description = [red]In developing
 block.gravillaso-sunshine.name = Sunshine 
 block.gravillaso-sunshine.description = Emits powerful beams of light
 block.gravillaso-spore-generator.name = Spore Generator

diff --git a/bundles/bundle_ru.properties b/bundles/bundle_ru.properties
@@ -5,7 +5,7 @@ ui.github = GitHub
 ui.trello = Trello
 ###Units
 unit.gravillaso-release.name = Релиз
-unit.gravillaso-release.description = [red]В разработке[white]\nКакая ирония
+unit.gravillaso-release.description = [red]В разработке[white]
 unit.gravillaso-update.name = Апдейт
 unit.gravillaso-update.description = [orange]Скоро
 ###Liquids
@@ -32,6 +32,8 @@ block.gravillaso-magneturn-wall-large.description = Защищает конст
 ###Blocks-Drills
 block.gravillaso-deep-oil-pump.name = Нефтяная помпа
 block.gravillaso-deep-oil-pump.description = Использует колосальное количество энергии для бурения глубокой нефтяной шахты.
+block.gravillaso-overdrive-drill.name = Перегруженый бур
+block.gravillaso-overdrive-drill.description = [red]В разработке
 ###Blocks-Liquids
 block.gravillaso-gravitium-conduit.name = Гравитиумовый трубопровод
 block.gravillaso-gravitium-conduit.description = Передвигает жидкости вперёд. Работает быстреее чем пульсовой трубопровод.
@@ -52,6 +54,7 @@ block.gravillaso-anxiety.name = Тревожность
 block.gravillaso-anxiety.description = Турель использующая магнетизм для очень быстрого огня.
 block.gravillaso-arhiepiscop.name = Архиепископ
 block.gravillaso-arhiepiscop.description = [red]В разработке
+block.gravillaso-arhiepiscop.details = Ты чувствуешь любовь?
 block.gravillaso-destiny.name = Провидение
 block.gravillaso-destiny.description = Среляет неподвижными электрическими копьями\nБыстрая перезарядка позволяет поспевать за быстрыми врагами.
 block.gravillaso-divine-storm.name = Божественный шторм

diff --git a/content/blocks/defense/gravitol-wall-large.hjson b/content/blocks/defense/gravitol-wall-large.hjson
@@ -7,3 +7,5 @@ requirements: [
 ]
 category: defense
 research: gravitol-wall
+insulated: true
+absorbLasers: true
diff --git a/content/blocks/defense/gravitol-wall.hjson b/content/blocks/defense/gravitol-wall.hjson
@@ -7,3 +7,5 @@ requirements: [
 ]
 category: defense
 research: surge-wall
+insulated: true
+absorbLasers: true
diff --git a/content/blocks/drills/overdrive-drill.hjson b/content/blocks/drills/overdrive-drill.hjson
@@ -0,0 +1,32 @@
+type: Drill
+drawRim: true
+health: 780
+size: 4
+liquidCpacity: 20
+itemCapacity: 20
+tier: 4
+drillTime: 187
+// gravillaso/scripts/python/drillSpeed.py -run this file with python to math this 
+liquidBoostIntensity: 2
+warmupSpeed: 0.01
+rotateSpeed: 7
+requirements: [
+  copper/90
+  thorium/75
+  plastanium/55
+  gravitol/25
+  silicon/80
+]
+consumes: {
+	power: 3.5
+	liquid:{
+		liquid:"water"
+		amount:0.18
+		optional:true
+		booster:true
+}
+}
+category: production 
+research: {
+  parent: "blast-drill"
+}
diff --git a/content/blocks/environment/burning-ground-wall.hjson b/content/blocks/environment/burning-ground-wall.hjson
@@ -0,0 +1,6 @@
+type: StaticWall
+name: Burning Ground Wall
+variants: 2
+inEditor: true
+breakable: false
+targetable: false
diff --git a/content/blocks/environment/burning-ground.hjson b/content/blocks/environment/burning-ground.hjson
@@ -0,0 +1,10 @@
+type: Floor
+name: Burning ground
+variants: 4
+damageTaken: 2.75
+speedMultiplier: 0.8
+walkEffect: smeltsmoke
+status: melting
+statusDuration: 247
+#decoration: air
+#wall: air-wall
diff --git a/content/blocks/environment/iron-wall.hjson.beta b/content/blocks/environment/iron-wall.hjson.beta
@@ -1,6 +1,6 @@
-name: Obsidian Block
 type: StaticWall
+variants: 1
+inEditor: true
 breakable: false
-alwaysReplace: false
-solid: true
-variants: 1
+targetable: false
+name: TEST
diff --git a/content/blocks/power/benzine-generator.hjson b/content/blocks/power/benzine-generator.hjson
@@ -0,0 +1,27 @@
+type: SingleTypeGenerator
+health: 540
+size: 3
+itemCapacity: 20
+liquidCapacity: 45
+itemDuration: 80
+powerProduction: 26
+consumes: {
+  items: {
+  	items: [
+  		blast-compound/1
+  	]
+  }
+  liquid: {
+    liquid: benzine
+    amount: 0.12
+  }
+}
+requirements: [
+copper/90
+lead/70
+metaglass/100
+silicon/25
+thorium/40
+]
+category: power
+research: differential-generator
diff --git a/content/blocks/power/benzine-generator.hjson.beta b/content/blocks/power/benzine-generator.hjson.beta
diff --git a/content/blocks/production/benzine-barrel.hjson b/content/blocks/production/benzine-barrel.hjson
@@ -22,7 +22,7 @@ requirements: [
   silicon/35
   metaglass/70
 ]
-outputLiquid: benzine/5
+outputLiquid: benzine/2.5
 research: {
   parent: "cryofluid-mixer"
 }
diff --git a/content/blocks/cores/molecular-core.hjson → content/blocks/storages/molecular-core.hjson b/content/blocks/cores/molecular-core.hjson → content/blocks/storages/molecular-core.hjson
diff --git a/content/blocks/turrets/arhiepiscop.hjson b/content/blocks/turrets/arhiepiscop.hjson
@@ -0,0 +1,32 @@
+type: PowerTurret
+health: 1360
+size: 3
+reloadTime: 20
+inaccuracy: 0
+range: 165
+powerUse: 16
+heatColor: "5c5c02"
+shootType:{
+	type: LightningBulletType
+	lightningColor: "#f2f2c4"
+	lightningLength: 26
+	speed: 0.001
+	lifetime: 50
+	damage: 58
+	x: 0
+	y: 0
+	buildingDamageMultiplier: 0.75
+}
+requirements: [
+  graphite/220
+  metaglass/230
+  phase-fabric/120
+  surge-alloy/220
+]
+coolantMultiplier: 8
+shootSound: spark
+shootEffect: redgeneratespark
+targetAir: false
+targetGround: true
+category: turret
+research: destiny
diff --git a/content/blocks/turrets/divine-storm.hjson b/content/blocks/turrets/divine-storm.hjson
@@ -19,14 +19,15 @@ ammoTypes: {
 		shootEffect: shootSmall
 		smokeEffect: shootSmallSmoke
 		ammoMultiplier: 1
+		homingPower: 0
 }
-	coal: {
+	scrap: {
 		type: BasicBulletType
 		lifetime: 120
-		speed: 2
-		damage: 3
-		width: 3
-		height: 6
+		speed: 3
+		damage: 7
+		width: 4
+		height: 7
 		shootEffect: shootSmall
 		smokeEffect: shootSmallSmoke
 		ammoMultiplier: 1
@@ -36,8 +37,8 @@ ammoTypes: {
 		lifetime: 280
 		speed: 4.75
 		damage: 16
-		width: 3
-		height: 6
+		width: 4
+		height: 7
 		shootEffect: shootSmall
 		smokeEffect: shootSmallSmoke
 }
@@ -60,7 +61,7 @@ requirements: [
 ]
 category: turret
 research: {
-  parent: scatter
+  parent: duo
   requirements: [
     copper/2500
     metaglass/150

diff --git a/content/blocks/turrets/renunciation.hjson b/content/blocks/turrets/renunciation.hjson
@@ -110,11 +110,4 @@ requirements: [
 category: turret
 research: {
   parent: swarmer
-  requirements: [
-  graphite/9500
-  thorium/7600
-  gravitol/2340
-  surge-alloy/2980
-  magneturn/1620
-  ]
 }
diff --git a/mod.json b/mod.json
@@ -2,7 +2,7 @@ name: "gravillaso"
 displayName: "[purple]Gravillaso[white] Mod"
 author: "[orange]NickName73"
 description: "Gravillaso - mod based on magnetic materials\n\n\nDevelopers: \nNickName73\nCREAsTIVE\nSpriters:\nRadmir Yakupov\nCat fat"
-version: " 0.12.3b"
+version: " 0.12.4b"
 minGameVersion: "120"
 dependencies: [
 ]
diff --git a/sprites/blocks/drills/overdrive-drill/overdrive-drill-item.png b/sprites/blocks/drills/overdrive-drill/overdrive-drill-item.png
diff --git a/sprites/blocks/drills/overdrive-drill/overdrive-drill-rim.png b/sprites/blocks/drills/overdrive-drill/overdrive-drill-rim.png
diff --git a/sprites/blocks/drills/overdrive-drill/overdrive-drill-top.png b/sprites/blocks/drills/overdrive-drill/overdrive-drill-top.png
diff --git a/sprites/blocks/environment/burning-ground-wall-large.png b/sprites/blocks/environment/burning-ground-wall-large.png
diff --git a/sprites/blocks/environment/burning-ground-wall1.png b/sprites/blocks/environment/burning-ground-wall1.png
diff --git a/sprites/blocks/environment/burning-ground-wall2.png b/sprites/blocks/environment/burning-ground-wall2.png
diff --git a/sprites/blocks/environment/burning-ground1.png b/sprites/blocks/environment/burning-ground1.png
diff --git a/sprites/blocks/environment/burning-ground2.png b/sprites/blocks/environment/burning-ground2.png
diff --git a/sprites/blocks/environment/burning-ground3.png b/sprites/blocks/environment/burning-ground3.png
diff --git a/sprites/blocks/environment/burning-ground4.png b/sprites/blocks/environment/burning-ground4.png
diff --git a/sprites/blocks/power/benzine-generator-liquid.png b/sprites/blocks/power/benzine-generator-liquid.png
diff --git a/sprites/blocks/power/benzine-generator-top.png b/sprites/blocks/power/benzine-generator-top.png
diff --git a/sprites/blocks/power/benzine-generator.png b/sprites/blocks/power/benzine-generator.png
diff --git a/sprites/blocks/cores/molecular-core-team.png → ...s/blocks/storages/molecular-core-team.png b/sprites/blocks/cores/molecular-core-team.png → ...s/blocks/storages/molecular-core-team.png
diff --git a/sprites/blocks/cores/molecular-core.png → sprites/blocks/storages/molecular-core.png b/sprites/blocks/cores/molecular-core.png → sprites/blocks/storages/molecular-core.png
diff --git a/sprites/blocks/turrets/arhiepiscop-heat.png b/sprites/blocks/turrets/arhiepiscop-heat.png
diff --git a/sprites/blocks/turrets/arhiepiscop.png b/sprites/blocks/turrets/arhiepiscop.png
diff --git a/sprites/units/weapon/ambience-old.png b/sprites/units/weapon/ambience-old.png
diff --git a/sprites/units/weapon/ambience.png b/sprites/units/weapon/ambience.png