Merge pull request #7 from GlennFolker/master

v1.2 new GlennFolker
JerichoFletcher · Apr 8, 2020 · 28914de · 28914de
2 parents e934336 + 02e1522
commit 28914de
Show file tree

Hide file tree

Showing 48 changed files with 7 additions and 7 deletions.
diff --git a/content/blocks/drills/chemical-drill.hjson → content/blocks/drills/chemical-drill.json b/content/blocks/drills/chemical-drill.hjson → content/blocks/drills/chemical-drill.json
diff --git a/content/blocks/environments/hills.hjson → content/blocks/environments/hills.json b/content/blocks/environments/hills.hjson → content/blocks/environments/hills.json
diff --git a/content/blocks/environments/lava.hjson → content/blocks/environments/lava.json b/content/blocks/environments/lava.hjson → content/blocks/environments/lava.json
diff --git a/.../blocks/environments/obsidian-rocks.hjson → ...t/blocks/environments/obsidian-rocks.json b/.../blocks/environments/obsidian-rocks.hjson → ...t/blocks/environments/obsidian-rocks.json
diff --git a/content/blocks/environments/obsidian.hjson → content/blocks/environments/obsidian.json b/content/blocks/environments/obsidian.hjson → content/blocks/environments/obsidian.json
diff --git a/content/blocks/environments/ore-iron.hjson → content/blocks/environments/ore-iron.json b/content/blocks/environments/ore-iron.hjson → content/blocks/environments/ore-iron.json
diff --git a/...ent/blocks/environments/ore-uranium.hjson → content/blocks/environments/ore-uranium.json b/...ent/blocks/environments/ore-uranium.hjson → content/blocks/environments/ore-uranium.json
@@ -1,5 +1,5 @@
 type: OreBlock
 itemDrop: uranium
 oreDefault: true
-oreThreshold: 0.8
+oreThreshold: 0.89
 oreScale: 25.828543
diff --git a/content/blocks/environments/soil.hjson → content/blocks/environments/soil.json b/content/blocks/environments/soil.hjson → content/blocks/environments/soil.json
diff --git a/content/blocks/power/uranium-reactor.hjson → content/blocks/power/uranium-reactor.json b/content/blocks/power/uranium-reactor.hjson → content/blocks/power/uranium-reactor.json
diff --git a/...locks/production/ap-shell-assembler.hjson → ...blocks/production/ap-shell-assembler.json b/...locks/production/ap-shell-assembler.hjson → ...blocks/production/ap-shell-assembler.json
diff --git a/.../blocks/production/chemical-station.hjson → ...t/blocks/production/chemical-station.json b/.../blocks/production/chemical-station.hjson → ...t/blocks/production/chemical-station.json
diff --git a/...locks/production/he-shell-assembler.hjson → ...blocks/production/he-shell-assembler.json b/...locks/production/he-shell-assembler.hjson → ...blocks/production/he-shell-assembler.json
diff --git a/content/blocks/production/oil-refinery.hjson → content/blocks/production/oil-refinery.json b/content/blocks/production/oil-refinery.hjson → content/blocks/production/oil-refinery.json
diff --git a/...nt/blocks/production/steel-crucible.hjson → ...ent/blocks/production/steel-crucible.json b/...nt/blocks/production/steel-crucible.hjson → ...ent/blocks/production/steel-crucible.json
diff --git a/content/blocks/turrets/blow.hjson → content/blocks/turrets/blow.json b/content/blocks/turrets/blow.hjson → content/blocks/turrets/blow.json
diff --git a/content/blocks/turrets/quake.hjson → content/blocks/turrets/quake.json b/content/blocks/turrets/quake.hjson → content/blocks/turrets/quake.json
diff --git a/content/blocks/turrets/spectre.hjson → content/blocks/turrets/spectre.json b/content/blocks/turrets/spectre.hjson → content/blocks/turrets/spectre.json
diff --git a/content/blocks/turrets/wave.hjson → content/blocks/turrets/wave.json b/content/blocks/turrets/wave.hjson → content/blocks/turrets/wave.json
diff --git a/content/blocks/units/sabre-factory.hjson → content/blocks/units/sabre-factory.json b/content/blocks/units/sabre-factory.hjson → content/blocks/units/sabre-factory.json
diff --git a/.../blocks/walls/reinforced-wall-large.hjson → ...t/blocks/walls/reinforced-wall-large.json b/.../blocks/walls/reinforced-wall-large.hjson → ...t/blocks/walls/reinforced-wall-large.json
diff --git a/content/blocks/walls/reinforced-wall.hjson → content/blocks/walls/reinforced-wall.json b/content/blocks/walls/reinforced-wall.hjson → content/blocks/walls/reinforced-wall.json
diff --git a/content/items/ap-shell.hjson → content/items/ap-shell.json b/content/items/ap-shell.hjson → content/items/ap-shell.json
diff --git a/content/items/he-shell.hjson → content/items/he-shell.json b/content/items/he-shell.hjson → content/items/he-shell.json
diff --git a/content/items/iron.hjson → content/items/iron.json b/content/items/iron.hjson → content/items/iron.json
diff --git a/content/items/steel.hjson → content/items/steel.json b/content/items/steel.hjson → content/items/steel.json
diff --git a/content/items/uranium.hjson → content/items/uranium.json b/content/items/uranium.hjson → content/items/uranium.json
diff --git a/content/liquids/liquid-acid.hjson → content/liquids/liquid-acid.json b/content/liquids/liquid-acid.hjson → content/liquids/liquid-acid.json
diff --git a/content/liquids/liquid-gas.hjson → content/liquids/liquid-gas.json b/content/liquids/liquid-gas.hjson → content/liquids/liquid-gas.json
diff --git a/content/liquids/liquid-lava.hjson → content/liquids/liquid-lava.json b/content/liquids/liquid-lava.hjson → content/liquids/liquid-lava.json
diff --git a/content/units/nullifier.hjson → content/units/nullifier.json b/content/units/nullifier.hjson → 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.hjson → content/units/sabre.json b/content/units/sabre.hjson → content/units/sabre.json
diff --git a/content/zones/front-gate.hjson → content/zones/front-gate.json b/content/zones/front-gate.hjson → content/zones/front-gate.json
@@ -1,10 +1,10 @@
 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. Destroy the core and move on.
+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/100
+  graphite/500
   silicon/500
   metaglass/500
   titanium/500

diff --git a/content/zones/frozen-meadow.hjson → content/zones/frozen-valley.json b/content/zones/frozen-meadow.hjson → 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.hjson → content/zones/hill-path.json b/content/zones/hill-path.hjson → content/zones/hill-path.json
@@ -11,7 +11,7 @@ launchPeriod: 10
 requirements: [
   {
     type: ZoneWave
-	zone: frozen-meadow
+	zone: frozen-valley
 	wave: 20
   }
   {

diff --git a/content/zones/volcano.hjson → content/zones/volcano.json b/content/zones/volcano.hjson → content/zones/volcano.json
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.hjson → mod.json b/mod.hjson → mod.json
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