Skip to content

Commit

Permalink
update natural substances
Browse files Browse the repository at this point in the history
  • Loading branch information
@Arathok
Arathok committed May 2, 2022
1 parent dd95768 commit c4316fd
Show file tree
Hide file tree
Showing 10 changed files with 152 additions and 155 deletions.
10 changes: 0 additions & 10 deletions .idea/runConfigurations.xml
View file

This file was deleted.

11 changes: 9 additions & 2 deletions .idea/workspace.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified bin/org/arathok/wurmunlimited/mods/alchemy/AlchItems.class
View file
Binary file not shown.
Binary file modified bin/org/arathok/wurmunlimited/mods/alchemy/essences/EssencesItems.class
View file
Binary file not shown.
Binary file modified bin/org/arathok/wurmunlimited/mods/alchemy/oils/OilItems.class
View file
Binary file not shown.
Binary file modified bin/org/arathok/wurmunlimited/mods/alchemy/potions/PotionItems.class
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions src/org/arathok/wurmunlimited/mods/alchemy/AlchItems.java
View file
Expand Up @@ -338,13 +338,13 @@ private static void registerAlchemicalCompound() throws IOException {
.dimensions(10, 10, 10)
.weightGrams(1000)
.material(Materials.MATERIAL_MAGIC)
.behaviourType((short) 1).primarySkill(SkillList.GROUP_ALCHEMY)
.behaviourType((short) 1).primarySkill(SkillList.ALCHEMY_NATURAL)
.difficulty(10) // no hard lock
.build();

alchemicalCompoundId = alchemicalCompound.getTemplateId();

CreationEntryCreator.createSimpleEntry(SkillList.GROUP_ALCHEMY, AlchItems.purifiedWaterId, ItemList.heart,alchemicalCompoundId, true, true, 0f, false, false, 0,5,CreationCategories.ALCHEMY);
CreationEntryCreator.createSimpleEntry(SkillList.ALCHEMY_NATURAL, AlchItems.purifiedWaterId, ItemList.heart,alchemicalCompoundId, true, true, 0f, false, false, 0,5,CreationCategories.ALCHEMY);
}

private static void registerGemPowder() throws IOException {
Expand All @@ -368,15 +368,15 @@ private static void registerGemPowder() throws IOException {
.weightGrams(500)
.material(Materials.MATERIAL_GLASS)
.behaviourType((short) 1)
.primarySkill(SkillList.GROUP_ALCHEMY).difficulty(30) // no hard lock
.primarySkill(SkillList.ALCHEMY_NATURAL).difficulty(30) // no hard lock
.build();

gemPowderId = gemPowder.getTemplateId();
CreationEntryCreator.createSimpleEntry(SkillList.GROUP_ALCHEMY, ItemList.mortarAndPestle, ItemList.ruby,gemPowderId, false, true, 0f, false, false, 0,30,CreationCategories.ALCHEMY);
CreationEntryCreator.createSimpleEntry(SkillList.GROUP_ALCHEMY, ItemList.mortarAndPestle, ItemList.emerald,gemPowderId, false, true, 0f, false, false, 0,30,CreationCategories.ALCHEMY);
CreationEntryCreator.createSimpleEntry(SkillList.GROUP_ALCHEMY, ItemList.mortarAndPestle, ItemList.diamond,gemPowderId, false, true, 0f, false, false, 0,30,CreationCategories.ALCHEMY);
CreationEntryCreator.createSimpleEntry(SkillList.GROUP_ALCHEMY, ItemList.mortarAndPestle, ItemList.sapphire,gemPowderId, false, true, 0f, false, false, 0,30,CreationCategories.ALCHEMY);
CreationEntryCreator.createSimpleEntry(SkillList.GROUP_ALCHEMY, ItemList.mortarAndPestle, ItemList.opal,gemPowderId, false, true, 0f, false, false, 0,30,CreationCategories.ALCHEMY);
CreationEntryCreator.createSimpleEntry(SkillList.ALCHEMY_NATURAL, ItemList.mortarAndPestle, ItemList.ruby,gemPowderId, false, true, 0f, false, false, 0,30,CreationCategories.ALCHEMY);
CreationEntryCreator.createSimpleEntry(SkillList.ALCHEMY_NATURAL, ItemList.mortarAndPestle, ItemList.emerald,gemPowderId, false, true, 0f, false, false, 0,30,CreationCategories.ALCHEMY);
CreationEntryCreator.createSimpleEntry(SkillList.ALCHEMY_NATURAL, ItemList.mortarAndPestle, ItemList.diamond,gemPowderId, false, true, 0f, false, false, 0,30,CreationCategories.ALCHEMY);
CreationEntryCreator.createSimpleEntry(SkillList.ALCHEMY_NATURAL, ItemList.mortarAndPestle, ItemList.sapphire,gemPowderId, false, true, 0f, false, false, 0,30,CreationCategories.ALCHEMY);
CreationEntryCreator.createSimpleEntry(SkillList.ALCHEMY_NATURAL, ItemList.mortarAndPestle, ItemList.opal,gemPowderId, false, true, 0f, false, false, 0,30,CreationCategories.ALCHEMY);
}


Expand Down
34 changes: 17 additions & 17 deletions src/org/arathok/wurmunlimited/mods/alchemy/essences/EssencesItems.java
View file
Expand Up @@ -43,7 +43,7 @@ private static void registerStoneCore() throws IOException {
.build();

stoneCoreId = stoneCore.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, ItemList.rock,ItemList.heart, stoneCoreId, true, true, 0.0f, true, true,0,20, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, ItemList.rock,ItemList.heart, stoneCoreId, true, true, 0.0f, true, true,0,20, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.rock,4,true));


Expand All @@ -70,7 +70,7 @@ private static void registerVitriol() throws IOException {
.build();

vitriolId = vitriol.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, ItemList.lowQlIron,ItemList.lye, vitriolId, true, true, 0.0f, true, false,0,20, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, ItemList.lowQlIron,ItemList.lye, vitriolId, true, true, 0.0f, true, false,0,20, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.charcoal,1,true));


Expand Down Expand Up @@ -100,7 +100,7 @@ private static void registerAcidEssence() throws IOException {
.build();

acidicEssenceId = acidicEssence.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, ItemList.water,ItemList.gland, acidicEssenceId, true, true, 0.0f, true, false,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, ItemList.water,ItemList.gland, acidicEssenceId, true, true, 0.0f, true, false,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.fruitJuice,1,true))
.addRequirement(new CreationRequirement(2, vitriolId,1,true));
}
Expand Down Expand Up @@ -152,7 +152,7 @@ private static void registerSandCore() throws IOException {
.build();

sandCoreId = sandCore.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, stoneCoreId,ItemList.sandstone, sandCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, stoneCoreId,ItemList.sandstone, sandCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.sandstone,4,true));


Expand Down Expand Up @@ -182,7 +182,7 @@ private static void registerSandEssence() throws IOException {
.build();

sandEssenceId = sandEssence.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, ItemList.water,sandCoreId, sandEssenceId, true, true, 0.0f, true, false,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, ItemList.water,sandCoreId, sandEssenceId, true, true, 0.0f, true, false,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.salt,1,true))
.addRequirement(new CreationRequirement(2, vitriolId,1,true));
}
Expand Down Expand Up @@ -234,7 +234,7 @@ private static void registerslateCore() throws IOException {
.build();

slateCoreId = slateCore.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, stoneCoreId,ItemList.slateShard, slateCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, stoneCoreId,ItemList.slateShard, slateCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.slateShard,4,true));


Expand Down Expand Up @@ -264,7 +264,7 @@ private static void registerslateEssence() throws IOException {
.build();

slateEssenceId = slateEssence.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, ItemList.water,slateCoreId, slateEssenceId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, ItemList.water,slateCoreId, slateEssenceId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.salt,1,true))
.addRequirement(new CreationRequirement(2, vitriolId,1,true));
}
Expand Down Expand Up @@ -316,7 +316,7 @@ private static void registermarbleCore() throws IOException {
.build();

marbleCoreId = marbleCore.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, stoneCoreId,ItemList.marbleShard, marbleCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, stoneCoreId,ItemList.marbleShard, marbleCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.marbleShard,4,true));


Expand Down Expand Up @@ -346,7 +346,7 @@ private static void registermarbleEssence() throws IOException {
.build();

marbleEssenceId = marbleEssence.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, ItemList.water,marbleCoreId, marbleEssenceId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, ItemList.water,marbleCoreId, marbleEssenceId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.salt,1,true))
.addRequirement(new CreationRequirement(2, vitriolId,1,true));
}
Expand Down Expand Up @@ -398,7 +398,7 @@ private static void registerironCore() throws IOException {
.build();

ironCoreId = ironCore.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, stoneCoreId,ItemList.ironBar, ironCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, stoneCoreId,ItemList.ironBar, ironCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.ironBar,99,true));


Expand Down Expand Up @@ -428,7 +428,7 @@ private static void registerironEssence() throws IOException {
.build();

ironEssenceId = ironEssence.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, ItemList.water,ironCoreId, ironEssenceId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, ItemList.water,ironCoreId, ironEssenceId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.salt,1,true))
.addRequirement(new CreationRequirement(2, vitriolId,1,true));
}
Expand Down Expand Up @@ -479,7 +479,7 @@ private static void registertinCore() throws IOException {
.build();

tinCoreId = tinCore.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, stoneCoreId,ItemList.tinBar, tinCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, stoneCoreId,ItemList.tinBar, tinCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.tinBar,99,true));


Expand Down Expand Up @@ -509,11 +509,11 @@ private static void registertinEssence() throws IOException {
.build();

tinEssenceId = tinEssence.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, ItemList.water,tinCoreId, tinEssenceId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, ItemList.water,tinCoreId, tinEssenceId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.salt,1,true))
.addRequirement(new CreationRequirement(2, vitriolId,1,true));
}

/*
private static void registertinExtract() throws IOException {
tinExtract = new ItemTemplateBuilder("arathok.alchemy.tinExtract")
.name("tin extract", "tin extracts",
Expand Down Expand Up @@ -561,7 +561,7 @@ private static void registertinCore() throws IOException {
.build();
tinCoreId = tinCore.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, stoneCoreId,ItemList.tinOre, tinCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, stoneCoreId,ItemList.tinOre, tinCoreId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.tinOre,4,true));
Expand Down Expand Up @@ -591,7 +591,7 @@ private static void registertinEssence() throws IOException {
.build();
tinEssenceId = tinEssence.getTemplateId();
CreationEntryCreator.createAdvancedEntry(SkillList.GROUP_ALCHEMY, ItemList.water,tinCoreId, tinEssenceId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
CreationEntryCreator.createAdvancedEntry(SkillList.ALCHEMY_NATURAL, ItemList.water,tinCoreId, tinEssenceId, true, true, 0.0f, true, true,0,30, CreationCategories.ALCHEMY)
.addRequirement(new CreationRequirement(1, ItemList.salt,1,true))
.addRequirement(new CreationRequirement(2, vitriolId,1,true));
}
Expand Down Expand Up @@ -620,7 +620,7 @@ private static void registertinExtract() throws IOException {
tinExtractId = tinExtract.getTemplateId();
}
}*/
}


0 comments on commit c4316fd

Please sign in to comment.