Merge pull request #8 from JerichoFletcher/v1.2

v1.2 master
JerichoFletcher · Apr 8, 2020 · 22018dd · 22018dd
2 parents fa1c2ba + 91c0235
commit 22018dd
Show file tree

Hide file tree

Showing 49 changed files with 97 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -2,15 +2,11 @@
 Mechanical Warfare is a Mindustry mod adding brand new units, mechs, and turrets. Not for the faintest of engines.
 
 Additions:
-- 5 new items and 3 new liquids (with the respective crafters)
+- 5 new items + 3 new liquids (with the respective crafters) mostly compatible with vanilla blocks & turrets
 - Several new environment tiles
 - 2 new powerful turrets (with custom sounds!)
 - 1 new unit + 1 new boss
-- 3 new campaign zones
-- 1 new nuclear reactor
-
-Changes:
-- Vanilla turrets and buildings can accept new items and liquids
+- 4 new campaign zones
 
 Please be aware that _this mod is still under heavy development._ Expect more features to be added regularly!
 

diff --git a/content/blocks/environments/hills.json b/content/blocks/environments/hills.json
@@ -1,3 +1,3 @@
 type: StaticWall
 name: Hills
-variants: 2
+variants: 2
diff --git a/content/blocks/environments/lava.json b/content/blocks/environments/lava.json
@@ -10,4 +10,4 @@ drownUpdateEffect: burning
 walkEffect: melting
 blendGroup: water
 drownTime: 40
-cacheLayer: tar
+cacheLayer: tar
diff --git a/content/blocks/environments/obsidian-rocks.json b/content/blocks/environments/obsidian-rocks.json
@@ -1,3 +1,3 @@
 type: StaticWall
 name: Obsidian Rocks
-variants: 2
+variants: 2
diff --git a/content/blocks/environments/obsidian.json b/content/blocks/environments/obsidian.json
@@ -1,3 +1,3 @@
 type: floor
 name: Obsidian
-variants: 3
+variants: 3
diff --git a/content/blocks/environments/ore-iron.json b/content/blocks/environments/ore-iron.json
@@ -2,4 +2,4 @@ type: OreBlock
 itemDrop: iron
 oreDefault: true
 oreThreshold: 0.864
-oreScale: 24.904762
+oreScale: 24.904762
diff --git a/content/blocks/environments/ore-uranium.json b/content/blocks/environments/ore-uranium.json
@@ -1,5 +1,5 @@
 type: OreBlock
 itemDrop: uranium
 oreDefault: true
-oreThreshold: 0.902
-oreScale: 25.828543
+oreThreshold: 0.89
+oreScale: 25.828543
diff --git a/content/blocks/environments/soil.json b/content/blocks/environments/soil.json
@@ -1,3 +1,3 @@
 type: floor
 name: Soil
-variants: 3
+variants: 3
diff --git a/content/blocks/production/ap-shell-assembler.json b/content/blocks/production/ap-shell-assembler.json
@@ -10,10 +10,10 @@ consumes: {
   power: 5
   items: {
     items: [
-	  blast-compound/4
-	  uranium/10
-	  coal/8
-	]
+	  blast-compound/2
+	  uranium/5
+	  coal/4
+	  ]
   }
 }
 itemCapacity: 20
@@ -26,4 +26,4 @@ requirements: [
   plastanium/80
 ]
 category: crafting
-research: blast-mixer
+research: blast-mixer
diff --git a/content/blocks/production/chemical-station.json b/content/blocks/production/chemical-station.json
@@ -30,4 +30,4 @@ requirements: [
 category: crafting
 research: oil-refinery
 idleSound: respawning
-idleSoundVolume: 0.5
+idleSoundVolume: 0.5
diff --git a/content/blocks/production/he-shell-assembler.json b/content/blocks/production/he-shell-assembler.json
@@ -10,10 +10,10 @@ consumes: {
   power: 5
   items: {
     items: [
-	  blast-compound/10
-	  steel/4
-	  coal/8
-	]
+	  blast-compound/5
+	  steel/2
+	  coal/4
+	  ]
   }
 }
 itemCapacity: 20
@@ -26,4 +26,4 @@ requirements: [
   surge-alloy/60
 ]
 category: crafting
-research: blast-mixer
+research: blast-mixer
diff --git a/content/blocks/production/oil-refinery.json b/content/blocks/production/oil-refinery.json
@@ -25,4 +25,4 @@ requirements: [
 category: crafting
 research: coal-centrifuge
 idleSound: respawning
-idleSoundVolume: 0.5
+idleSoundVolume: 0.5
diff --git a/content/blocks/production/steel-crucible.json b/content/blocks/production/steel-crucible.json
@@ -24,4 +24,4 @@ requirements: [
 category: crafting
 research: silicon-smelter
 idleSound: respawning
-idleSoundVolume: 0.5
+idleSoundVolume: 0.5
diff --git a/content/blocks/turrets/blow.json b/content/blocks/turrets/blow.json
@@ -31,4 +31,4 @@ requirements: [
 ]
 category: turret
 research: fuse
-shootSound: blowshot
+shootSound: blowshot
diff --git a/content/blocks/turrets/quake.json b/content/blocks/turrets/quake.json
@@ -25,6 +25,7 @@ ammo: {
 	bulletHeight: 22
 	backColor: b6573a
 	frontColor: ffd385
+	ammoMultiplier: 4
   }
   ap-shell: {
     damage: 1700
@@ -39,6 +40,7 @@ ammo: {
 	bulletHeight: 22
 	backColor: b68f3a
 	frontColor: fbff85
+	ammoMultiplier: 4
   }
 }
 requirements: [
@@ -50,4 +52,4 @@ requirements: [
 ]
 category: turret
 research: ripple
-shootSound: quakeshot
+shootSound: quakeshot
diff --git a/content/blocks/turrets/spectre.json b/content/blocks/turrets/spectre.json
@@ -10,5 +10,6 @@ ammo: {
     frontColor: b3ffb2
     backColor: 729e5c
     speed: 8
+    ammoMultiplier: 4
   }
 }
diff --git a/content/blocks/units/sabre-factory.json b/content/blocks/units/sabre-factory.json
@@ -20,4 +20,4 @@ requirements: [
   lead/95
   silicon/60
   steel/60
-]
+]
diff --git a/content/blocks/walls/reinforced-wall-large.json b/content/blocks/walls/reinforced-wall-large.json
@@ -8,5 +8,5 @@ requirements: [
   surge-alloy/16
   uranium/12
 ]
-research: reinforced-wall
 category: defense
+research: reinforced-wall
diff --git a/content/blocks/walls/reinforced-wall.json b/content/blocks/walls/reinforced-wall.json
@@ -7,5 +7,5 @@ requirements: [
   surge-alloy/4
   uranium/3
 ]
-research: surge-wall
 category: defense
+research: surge-wall
diff --git a/content/items/ap-shell.json b/content/items/ap-shell.json
@@ -2,4 +2,4 @@ type: resource
 name: AP Shell
 description: Armor-piercing artillery shells to counter heavy armors.
 explosiveness: 0.6
-color: c9e75f
+color: c9e75f
diff --git a/content/items/he-shell.json b/content/items/he-shell.json
@@ -2,4 +2,4 @@ type: resource
 name: HE Shell
 description: High-explosive artillery shells made for long range strikes.
 explosiveness: 1.8
-color: f3885e
+color: f3885e
diff --git a/content/items/iron.json b/content/items/iron.json
@@ -3,4 +3,4 @@ name: Iron
 description: A heavy metal used primarily in armor plates and steel casting.
 hardness: 3
 cost: 1
-color: cce7ff
+color: cce7ff
diff --git a/content/items/steel.json b/content/items/steel.json
@@ -2,4 +2,4 @@ type: material
 name: Steel
 description: A durable material with various uses.
 cost: 3
-color: aeaeae
+color: aeaeae
diff --git a/content/items/uranium.json b/content/items/uranium.json
@@ -5,4 +5,4 @@ hardness: 6
 cost: 1.2
 explosiveness: 0.3
 radioactivity: 1.4
-color: 309926
+color: 309926
diff --git a/content/liquids/liquid-acid.json b/content/liquids/liquid-acid.json
@@ -3,4 +3,4 @@ description: A highly corrosive fluid. Rain it down on the enemies or feed it to
 viscosity: 0.8
 temperature: 0.6
 effect: corroded
-color: c9eb86
+color: c9eb86
diff --git a/content/liquids/liquid-gas.json b/content/liquids/liquid-gas.json
@@ -2,4 +2,4 @@ name: Gas
 description: A dangerously explosive oil product. Handle with care.
 flammability: 1.25
 explosiveness: 1
-color: b33eb3
+color: b33eb3
diff --git a/content/units/nullifier.json b/content/units/nullifier.json
@@ -2,7 +2,6 @@ type: GroundUnit
 name: Nullifier
 description: "Extremely durable and dangerous. Use AP ammo whenever encountered."
 health: 18000
-
 speed: 0.1
 maxVelocity: 0.6
 mass: 6

diff --git a/content/units/sabre.json b/content/units/sabre.json
@@ -2,12 +2,14 @@ type: GroundUnit
 name: Sabre
 description: A well-armored unit that fires acid frag-rockets.
 health: 600
-
 speed: 0.12
 drag: 0.4
 mass: 5
 hitsize: 9
 rotatespeed: 0.08
+immunities: [
+  corroded
+]
 weapon: {
   name: swarm
   length: 1
@@ -53,4 +55,4 @@ weapon: {
 	  }
 	}
   }
-}
+}
diff --git a/content/zones/front-gate.json b/content/zones/front-gate.json
@@ -0,0 +1,45 @@
+name: Front Gate
+description: A main gate to the enemy's capital. Heavily guarded, knowing that the main factory is inside. Uranium is present, but is already taken and fortified. Take out the two cores and move on.
+loadout: basicFoundation
+startingItems: [
+  copper/1500
+  lead/1250
+  graphite/500
+  silicon/500
+  metaglass/500
+  titanium/500
+  iron/750
+  steel/500
+]
+conditionWave: 20
+configureObjective: {
+  type: Launched
+  zone: front-gate
+}
+launchPeriod: 10
+requirements: [
+  {
+    type: ZoneWave
+    zone: nuclearComplex
+    wave: 30
+  }
+  {
+    type: ZoneWave
+    zone: volcano
+    wave: 20
+  }
+  {
+    type: Unlock
+    block: thorium-reactor
+  }
+]
+resources: [
+  copper
+  lead
+  coal
+  titanium
+  iron
+  thorium
+  uranium
+  sand
+]
diff --git a/content/zones/frozen-meadow.json → content/zones/frozen-valley.json b/content/zones/frozen-meadow.json → content/zones/frozen-valley.json
@@ -1,5 +1,5 @@
-name: Frozen Meadow
-description: Several abandoned iron mining camp can be seen here. Explore the grassy outskirts. Traverse the wet terrain carefully. Mine iron and learn how to use it.
+name: Frozen Valley
+description: Iron vains can be seen here. Explore the grassy outskirts. Traverse the wet terrain carefully. Mine iron and learn how to use it.
 loadout: basicFoundation
 startingItems: [
   copper/200
@@ -26,6 +26,7 @@ resources: [
   copper
   lead
   coal
+  titanium
   iron
   sand
-]
+]
diff --git a/content/zones/hill-path.json b/content/zones/hill-path.json
@@ -11,7 +11,7 @@ launchPeriod: 10
 requirements: [
   {
     type: ZoneWave
-	zone: frozen-meadow
+	zone: frozen-valley
 	wave: 20
   }
   {
@@ -39,4 +39,4 @@ resources: [
   titanium
   iron
   sand
-]
+]
diff --git a/content/zones/volcano.json b/content/zones/volcano.json
@@ -35,4 +35,4 @@ resources: [
   thorium
   uranium
   sand
-]
+]
diff --git a/maps/coastline.msav b/maps/coastline.msav
diff --git a/maps/front-gate.msav b/maps/front-gate.msav
diff --git a/maps/frozen-meadow.msav b/maps/frozen-meadow.msav
diff --git a/maps/frozen-valley.msav b/maps/frozen-valley.msav
diff --git a/maps/hill-path.msav b/maps/hill-path.msav
diff --git a/maps/volcano.msav b/maps/volcano.msav
diff --git a/mod.json b/mod.json
@@ -1,7 +1,7 @@
-name: "scientific-expansion"
+name: "mechanical-warfare"
 displayName: "[gold]Mechanical [accent]Warfare[]"
-author: "Folker + JerichoFletcher"
+author: "GlennFolker + JerichoFletcher"
 description: "Not for the faintest of engines."
-version: "1.1.1"
+version: "1.2"
 minGameVersion: "104.5"
 dependencies: []
diff --git a/sprites/blocks/turrets/blow-heat.png b/sprites/blocks/turrets/blow-heat.png
diff --git a/sprites/blocks/turrets/blow.png b/sprites/blocks/turrets/blow.png
diff --git a/sprites/blocks/walls/reinforced-wall-large.png b/sprites/blocks/walls/reinforced-wall-large.png
diff --git a/sprites/blocks/walls/reinforced-wall.png b/sprites/blocks/walls/reinforced-wall.png
diff --git a/sprites/zones/coastline-zone.png b/sprites/zones/coastline-zone.png
diff --git a/sprites/zones/front-gate-zone.png b/sprites/zones/front-gate-zone.png
diff --git a/sprites/zones/frozen-meadow-zone.png b/sprites/zones/frozen-meadow-zone.png
diff --git a/sprites/zones/frozen-valley-zone.png b/sprites/zones/frozen-valley-zone.png
diff --git a/sprites/zones/hill-path-zone.png b/sprites/zones/hill-path-zone.png
diff --git a/sprites/zones/volcano-zone.png b/sprites/zones/volcano-zone.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,4 @@ requirements: [ @@
       lead/95
       silicon/60
       steel/60
-    ]
+    ]