Timerix/anarx-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Timerix:8d7fd07ae3407503ab99c456808dda13d08be747
Branches Tags
Timerix:master
..
compare: Timerix:7ae3bf9faa4b8ba335c1a38d92438bef4702c61b
Branches Tags
Timerix:master

No commits in common. "8d7fd07ae3407503ab99c456808dda13d08be747" and "7ae3bf9faa4b8ba335c1a38d92438bef4702c61b" have entirely different histories.
8d7fd07ae3 ... 7ae3bf9faa

1 changed files with 181 additions and 202 deletions
Show Stats Expand all files Collapse all files

35
scripts/main.zs
View File

@ -264,7 +264,9 @@ val changedrecipes = [ //Other change
<davincisvessels:engine>, <davincisvessels:engine>,
<davincisvessels:marker>, <davincisvessels:marker>,
<similsaxtranstructors:similsaxtranstructorbasic>, <similsaxtranstructors:similsaxtranstructorbasic>,
<similsaxtranstructors:similsaxtranstructoradvanced> <similsaxtranstructors:similsaxtranstructoradvanced>,
<armorunder:cool_liner_material>,
<armorunder:warm_liner_material>
] as IItemStack[]; ] as IItemStack[];
//Removing recipes //Removing recipes
@ -277,7 +279,7 @@ for item in changedrecipes { //Remove unchang
recipes.remove(item); recipes.remove(item);
} }
for item in uslessncalloys { //Remove usless NuclearCraft alloys for item in uslessncalloys { //Remove usless NuclearCraft alloys
item.addTooltip("Useless ingot"); item.addTooltip("Я бесполезный слиток");
recipes.remove(item); recipes.remove(item);
mods.jei.JEI.hide(item); mods.jei.JEI.hide(item);
} }
@ -285,7 +287,7 @@ for item in removesmelting { //Tag non-smelti
item.addTooltip("Ну давай давай переплавь в печке"); item.addTooltip("Ну давай давай переплавь в печке");
} }
for item in removedvanillagear { //Removed vanilla gear for item in removedvanillagear { //Removed vanilla gear
item.addTooltip("Removed for balancing purpose"); item.addTooltip("Ваниль? Нет, спасибо");
recipes.remove(item); recipes.remove(item);
mods.jei.JEI.hide(item); mods.jei.JEI.hide(item);
} }
@ -332,7 +334,7 @@ for item in removedvanillagear { //Removed vanill
//Adding crafting recipes //Adding crafting recipes
//Cyberware //Cyberware
recipes.addShaped(<cyberware:scanner>, [[<nuclearcraft:part:9>, <cyberware:cybereyes>.withTag({cyberwareQuality: "cyberware.quality.scavenged"}).onlyWithTag({cyberwareQuality: "cyberware.quality.scavenged"}), <nuclearcraft:part:9>],[<minecraft:glass>, <immersiveengineering:tool:2>, <minecraft:glass>], [<immersiveengineering:metal:38>, <immersiveengineering:metal:38>, <immersiveengineering:metal:38>]]); recipes.addShaped(<cyberware:scanner>, [[<nuclearcraft:part:9>, <cyberware:cybereyes>, <nuclearcraft:part:9>],[<minecraft:glass>, <immersiveengineering:tool:2>, <minecraft:glass>], [<immersiveengineering:metal:38>, <immersiveengineering:metal:38>, <immersiveengineering:metal:38>]]);
recipes.addShaped(<cyberware:charger>, [[<immersiveengineering:metal:38>, <immersiveengineering:connector:4>, <immersiveengineering:metal:38>],[<immersiveengineering:metal_decoration0:1>, <immersiveengineering:metal_device0:2>, <immersiveengineering:metal_decoration0:1>], [<immersiveengineering:metal:38>, <minecraft:glowstone>, <immersiveengineering:metal:38>]]); recipes.addShaped(<cyberware:charger>, [[<immersiveengineering:metal:38>, <immersiveengineering:connector:4>, <immersiveengineering:metal:38>],[<immersiveengineering:metal_decoration0:1>, <immersiveengineering:metal_device0:2>, <immersiveengineering:metal_decoration0:1>], [<immersiveengineering:metal:38>, <minecraft:glowstone>, <immersiveengineering:metal:38>]]);
recipes.addShaped(<cyberware:blueprint_archive>, [[<immersiveengineering:metal:39>, <immersiveengineering:metal:39>, <immersiveengineering:metal:39>],[<minecraft:paper>, <ironchest:iron_chest>, <minecraft:paper>], [<immersiveengineering:metal:39>, <immersiveengineering:metal:39>, <immersiveengineering:metal:39>]]); recipes.addShaped(<cyberware:blueprint_archive>, [[<immersiveengineering:metal:39>, <immersiveengineering:metal:39>, <immersiveengineering:metal:39>],[<minecraft:paper>, <ironchest:iron_chest>, <minecraft:paper>], [<immersiveengineering:metal:39>, <immersiveengineering:metal:39>, <immersiveengineering:metal:39>]]);
recipes.addShaped(<cyberware:engineering_table>, [[<immersiveengineering:tool>, <immersiveengineering:tool:1>, <immersiveengineering:metal:39>],[<immersiveengineering:metal:39>, <immersiveengineering:metal:38>, <nuclearcraft:part:9>], [<minecraft:anvil>, <minecraft:crafting_table>, <immersiveengineering:metal:39>]]); recipes.addShaped(<cyberware:engineering_table>, [[<immersiveengineering:tool>, <immersiveengineering:tool:1>, <immersiveengineering:metal:39>],[<immersiveengineering:metal:39>, <immersiveengineering:metal:38>, <nuclearcraft:part:9>], [<minecraft:anvil>, <minecraft:crafting_table>, <immersiveengineering:metal:39>]]);
@ -393,16 +395,6 @@ for item in removedvanillagear { //Removed vanill
recipes.addShapeless(<davincisvessels:balloon:15>, [<davincisvessels:balloon:*>,<ore:dyeBlack>]); recipes.addShapeless(<davincisvessels:balloon:15>, [<davincisvessels:balloon:*>,<ore:dyeBlack>]);
recipes.addShaped(<davincisvessels:engine>, [[<immersiveengineering:metal:31>, <immersiveengineering:material:10>, <immersiveengineering:metal:31>],[<immersiveengineering:material:11>, <simplegenerators:combustion_upgradable>, <immersiveengineering:material:11>], [<immersiveengineering:metal:31>, <immersiveengineering:material:10>, <immersiveengineering:metal:31>]]); recipes.addShaped(<davincisvessels:engine>, [[<immersiveengineering:metal:31>, <immersiveengineering:material:10>, <immersiveengineering:metal:31>],[<immersiveengineering:material:11>, <simplegenerators:combustion_upgradable>, <immersiveengineering:material:11>], [<immersiveengineering:metal:31>, <immersiveengineering:material:10>, <immersiveengineering:metal:31>]]);
recipes.addShaped(<davincisvessels:marker>, [[<ore:plankWood>, <immersiveengineering:material>, <ore:plankWood>],[<immersiveengineering:material>, <minecraft:iron_block>, <immersiveengineering:material>], [<ore:plankWood>, <immersiveengineering:material>, <ore:plankWood>]]); recipes.addShaped(<davincisvessels:marker>, [[<ore:plankWood>, <immersiveengineering:material>, <ore:plankWood>],[<immersiveengineering:material>, <minecraft:iron_block>, <immersiveengineering:material>], [<ore:plankWood>, <immersiveengineering:material>, <ore:plankWood>]]);
//ModularWarfare
//Firearms
recipes.addShaped(<modularwarfare:prototype.mosin_nagant>, [[null, <immersiveengineering:metal:38>, <tconstruct:large_plate>.withTag({Material: "treatedwood"}).onlyWithTag({Material: "treatedwood"})],[<immersiveengineering:material:14>, <immersiveengineering:material:14>, <immersiveengineering:material:9>], [<immersiveengineering:metal:38>, <immersiveengineering:material:16>, <immersiveengineering:material:13>]]);
recipes.addShaped(<modularwarfare:prototype.sks>, [[null, <immersiveengineering:metal:38>, <tconstruct:large_plate>.withTag({Material: "treatedwood"}).onlyWithTag({Material: "treatedwood"})],[<immersiveengineering:material:14>, <immersiveengineering:material:9>, <immersiveengineering:material:9>], [<immersiveengineering:metal:38>, <immersiveengineering:material:16>, <immersiveengineering:material:13>]]);
recipes.addShaped(<modularwarfare:prototype.mg42>, [[<immersiveengineering:metal:38>, <tconstruct:large_plate>.withTag({Material: "steel"}).onlyWithTag({Material: "steel"}), <tconstruct:large_plate>.withTag({Material: "treatedwood"}).onlyWithTag({Material: "treatedwood"})],[<immersiveengineering:material:14>, <immersiveengineering:material:9>, <immersiveengineering:material:16>], [<immersiveengineering:metal:38>, <immersiveengineering:metal:38>, <immersiveengineering:material:13>]]);
recipes.addShaped(<modularwarfare:prototype.mp40>, [[<immersiveengineering:metal:38>, <immersiveengineering:metal:38>, <immersiveengineering:material:2>],[<immersiveengineering:material:14>, <immersiveengineering:material:9>, <immersiveengineering:material:16>], [null, <immersiveengineering:metal:38>, <immersiveengineering:material:13>]]);
//Blueprints
recipes.addShaped(<immersiveengineering:blueprint>.withTag({blueprint: "MW Mags"}), [[<immersiveengineering:metal:38>, <immersiveengineering:material:9>, <immersiveengineering:metal:38>],[<minecraft:dye:4>, <minecraft:dye:4>, <minecraft:dye:4>], [<minecraft:paper>, <minecraft:paper>, <minecraft:paper>]]);
recipes.addShaped(<immersiveengineering:blueprint>.withTag({blueprint: "MW Clips"}), [[<immersiveengineering:metal:38>, <immersiveengineering:metal:39>, <immersiveengineering:metal:38>],[<minecraft:dye:4>, <minecraft:dye:4>, <minecraft:dye:4>], [<minecraft:paper>, <minecraft:paper>, <minecraft:paper>]]);
recipes.addShaped(<immersiveengineering:blueprint>.withTag({blueprint: "MW Ammo"}), [[<immersiveengineering:bullet>, <immersiveengineering:metal:28>, <minecraft:gunpowder>],[<minecraft:dye:4>, <minecraft:dye:4>, <minecraft:dye:4>], [<minecraft:paper>, <minecraft:paper>, <minecraft:paper>]]);
//Transtructors //Transtructors
recipes.addShaped(<similsaxtranstructors:similsaxtranstructorbasic>, [[<minecraft:prismarine_crystals>, null, <minecraft:prismarine_crystals>],[<minecraft:iron_ingot>, <minecraft:ender_pearl>, <minecraft:iron_ingot>], [null, <tconstruct:tool_rod>.withTag({Material: "copper"}).onlyWithTag({Material: "copper"}), null]]); recipes.addShaped(<similsaxtranstructors:similsaxtranstructorbasic>, [[<minecraft:prismarine_crystals>, null, <minecraft:prismarine_crystals>],[<minecraft:iron_ingot>, <minecraft:ender_pearl>, <minecraft:iron_ingot>], [null, <tconstruct:tool_rod>.withTag({Material: "copper"}).onlyWithTag({Material: "copper"}), null]]);
recipes.addShaped(<similsaxtranstructors:similsaxtranstructoradvanced>, [[<minecraft:end_crystal>, null, <minecraft:end_crystal>],[<minecraft:diamond>, <minecraft:ender_pearl>, <minecraft:diamond>], [null, <tconstruct:tool_rod>.withTag({Material: "cobalt"}).onlyWithTag({Material: "cobalt"}), null]]); recipes.addShaped(<similsaxtranstructors:similsaxtranstructoradvanced>, [[<minecraft:end_crystal>, null, <minecraft:end_crystal>],[<minecraft:diamond>, <minecraft:ender_pearl>, <minecraft:diamond>], [null, <tconstruct:tool_rod>.withTag({Material: "cobalt"}).onlyWithTag({Material: "cobalt"}), null]]);
@ -423,6 +415,7 @@ for item in removedvanillagear { //Removed vanill
mods.immersiveengineering.AlloySmelter.addRecipe(<immersiveengineering:material:19>, <immersiveengineering:material:17>*8, <forge:bucketfilled>.withTag({FluidName: "creosote", Amount: 1000}), 800); mods.immersiveengineering.AlloySmelter.addRecipe(<immersiveengineering:material:19>, <immersiveengineering:material:17>*8, <forge:bucketfilled>.withTag({FluidName: "creosote", Amount: 1000}), 800);
mods.immersiveengineering.AlloySmelter.addRecipe(<nuclearcraft:ingot:8>*16, <nuclearcraft:gem_dust:7>*16, <nuclearcraft:dust:6>, 2000); mods.immersiveengineering.AlloySmelter.addRecipe(<nuclearcraft:ingot:8>*16, <nuclearcraft:gem_dust:7>*16, <nuclearcraft:dust:6>, 2000);
mods.immersiveengineering.AlloySmelter.addRecipe(<nuclearcraft:part:6>, <tconstruct:edible:3>*2, <minecraft:reeds>*2, 1000); mods.immersiveengineering.AlloySmelter.addRecipe(<nuclearcraft:part:6>, <tconstruct:edible:3>*2, <minecraft:reeds>*2, 1000);
mods.immersiveengineering.AlloySmelter.addRecipe(<minecraft:prismarine>, <minecraft:stone:3>, <tconstruct:edible:1>*2, 40);
//IECrusher //IECrusher
mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gem_dust:8>, <minecraft:stone:1>, 8000, <nuclearcraft:gem_dust:1>*2, 0.5); //Гранит mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:gem_dust:8>, <minecraft:stone:1>, 8000, <nuclearcraft:gem_dust:1>*2, 0.5); //Гранит
mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:dust:8>, <minecraft:stone:2>, 8000, <immersiveengineering:material:25>*2, 0.7); //Полированный гранит mods.immersiveengineering.Crusher.addRecipe(<nuclearcraft:dust:8>, <minecraft:stone:2>, 8000, <immersiveengineering:material:25>*2, 0.7); //Полированный гранит
@ -443,20 +436,6 @@ for item in removedvanillagear { //Removed vanill
mods.immersiveengineering.Crusher.addRecipe(<minecraft:prismarine_shard>*4, <minecraft:prismarine>, 500); mods.immersiveengineering.Crusher.addRecipe(<minecraft:prismarine_shard>*4, <minecraft:prismarine>, 500);
//IEMetalPress //IEMetalPress
mods.immersiveengineering.MetalPress.addRecipe(<academy:wafer>, <nuclearcraft:gem:6>, <immersiveengineering:mold>, 1000, 4); mods.immersiveengineering.MetalPress.addRecipe(<academy:wafer>, <nuclearcraft:gem:6>, <immersiveengineering:mold>, 1000, 4);
//IERefinery
mods.immersiveengineering.Refinery.addRecipe(<liquid:mana_fluid>, <liquid:biodiesel>, <liquid:blood>, 2048);
//IEBlueprints
//MW Ammo //Патроны из MW
mods.immersiveengineering.Blueprint.addRecipe("MW Ammo", <modularwarfare:prototype.9x19>, [<minecraft:gunpowder>, <immersiveengineering:bullet>, <immersiveengineering:metal:28>]); //9x19(MP40)
mods.immersiveengineering.Blueprint.addRecipe("MW Ammo", <modularwarfare:prototype.7_62x39>, [<minecraft:gunpowder>, <immersiveengineering:bullet>, <immersiveengineering:metal:28>]); //7,62x39(SKS)
mods.immersiveengineering.Blueprint.addRecipe("MW Ammo", <modularwarfare:prototype.7_62x54>, [<minecraft:gunpowder>, <immersiveengineering:bullet>, <immersiveengineering:metal:28>]); //7,62x54(Mosin Nagant)
mods.immersiveengineering.Blueprint.addRecipe("MW Ammo", <modularwarfare:prototype.7_62x57>, [<minecraft:gunpowder>, <immersiveengineering:bullet>, <immersiveengineering:metal:28>]); //7,62x57(MG42)
//MW Clips //Обоймы из MW
mods.immersiveengineering.Blueprint.addRecipe("MW Clips", <modularwarfare:prototype.sksammo>, [<immersiveengineering:metal:38>*3]); //SKS x10
mods.immersiveengineering.Blueprint.addRecipe("MW Clips", <modularwarfare:prototype.mosin_nagantammo>, [<immersiveengineering:metal:38>*2]); //Mosin Nagant x5
//MW Mags //Магазины из MW
mods.immersiveengineering.Blueprint.addRecipe("MW Mags", <modularwarfare:prototype.mg42ammo>, [<immersiveengineering:metal:38>*5,<immersiveengineering:metal:9>]);
mods.immersiveengineering.Blueprint.addRecipe("MW Mags", <modularwarfare:prototype.mp40ammo>, [<immersiveengineering:metal:38>*7,<immersiveengineering:metal:9>]);
//TiC casting //TiC casting
mods.tconstruct.Casting.addTableRecipe(<nuclearcraft:gem:6>, <minecraft:sand>, <liquid:glass>, 100, true, 20); mods.tconstruct.Casting.addTableRecipe(<nuclearcraft:gem:6>, <minecraft:sand>, <liquid:glass>, 100, true, 20);
mods.tconstruct.Casting.addTableRecipe(<academy:coin>, <tconstruct:cast_custom:2>, <liquid:iron>, 72, false, 10); mods.tconstruct.Casting.addTableRecipe(<academy:coin>, <tconstruct:cast_custom:2>, <liquid:iron>, 72, false, 10);