Merge remote-tracking branch 'origin/Meteor-tastic' into dev

GTNewHorizons · Jul 6, 2022 · cadecaf · cadecaf
2 parents cd4b29d + fb077d1
commit cadecaf
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 14 deletions.
diff --git a/config/BloodMagic/meteors/ConcentratedLeadEV.json b/config/BloodMagic/meteors/ConcentratedLeadEV.json
@@ -0,0 +1,18 @@
+{
+ "ores": [
+ "oreEndstoneLead",
+ "100",
+ "oreEndstoneGalena",
+ "200",
+ "oreEndstoneSilver",
+ "100",
+ "oreEndstoneCryolite",
+ "100"
+ ],
+ "radius": 13,
+ "cost": 2000000,
+ "focusModId": "gregtech",
+ "focusName": "gt.blockmachines",
+ "focusMeta": 214
+}
+
diff --git a/config/BloodMagic/meteors/IndiumGreaterVariant.json b/config/BloodMagic/meteors/IndiumGreaterVariant.json
@@ -0,0 +1,20 @@
+{
+ "ores": [
+ "oreEndstoneLead",
+ "1000",
+ "oreEndstoneGalena",
+ "4000",
+ "oreEndstoneSilver",
+ "1000",
+ "oreEndstoneSphalerite",
+ "1000",
+ "oreEndstoneIndium",
+ "1"
+ ],
+ "radius": 18,
+ "cost": 50000000,
+ "focusModId": "gregtech",
+ "focusName": "gt.metaitem.03",
+ "focusMeta": 32094
+}
+
diff --git a/...gic/meteors/MysteriouslyGlassyMeteor.json → .../BloodMagic/meteors/MysteriousMeteor.json b/...gic/meteors/MysteriouslyGlassyMeteor.json → .../BloodMagic/meteors/MysteriousMeteor.json
@@ -1,14 +1,14 @@
 {
  "ores": [
- "blockGlassColorless",
- "950",
+ "rockEnceladus",
+ "600",
  "oreEndstoneMysteriousCrystal",
- "50"
+ "400"
  ],
  "radius": 16,
  "cost": 44000000,
  "focusModId": "gregtech",
- "focusName": "gt.metaitem.01",
- "focusMeta": 32675
+ "focusName": "gt.blockmachines",
+ "focusMeta": 10990
 }
 
diff --git a/config/BloodMagic/meteors/NaquadahPure.json b/config/BloodMagic/meteors/NaquadahPure.json
@@ -0,0 +1,18 @@
+{
+ "ores": [
+ "oreEndstoneNaquadah",
+ "75",
+ "oreEndstoneNaquadahEnriched",
+ "50",
+ "oreEndstoneNaquadria",
+ "15",
+ "oreTiberium",
+ "100"
+ ],
+ "radius": 16,
+ "cost": 25000000,
+ "focusModId": "gregtech",
+ "focusName": "gt.metaitem.03",
+ "focusMeta": 32091
+}
+
diff --git a/config/BloodMagic/meteors/SuperPlatinumGroupMetals.json b/config/BloodMagic/meteors/SuperPlatinumGroupMetals.json
@@ -15,10 +15,10 @@
  "oreRarestMetalResidue",
  "100"
  ],
- "radius": 16,
- "cost": 25000000,
+ "radius": 14,
+ "cost": 12500000,
  "focusModId": "gregtech",
- "focusName": "gt.metaitem.01",
- "focusMeta": 32684
+ "focusName": "gt.blockmachines",
+ "focusMeta": 465
 }
 
diff --git a/config/BloodMagic/meteors/YourResourcesHandItOver.json b/config/BloodMagic/meteors/YourResourcesHandItOver.json
@@ -3,27 +3,27 @@
  "oreEndstoneBlackPlutonium",
  "50",
  "oreEndstoneCosmicNeutronium",
- "20",
+ "10",
  "oreEndstoneNaquadah",
  "50",
  "oreEndstoneNaquadahEnriched",
  "55",
  "oreEndstoneNaquadria",
- "50",
+ "40",
  "oreEndstoneEuropium",
  "25",
  "oreEndstoneElectrumFlux",
  "10",
  "oreEndstoneIndium",
- "10",
+ "5",
  "oreEndstoneAmericium",
  "10",
  "oreEndstoneLutetium",
- "25",
+ "50,"
  "oreEndstoneInfinityCatalyst",
  "50"
  ],
- "radius": 22,
+ "radius": 20,
  "cost": 125000000,
  "focusModId": "gregtech",
  "focusName": "gt.blockmachines",