upstream/Hardcore-Ender-Expansion
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Hardcore-Ender-Expansion.git synced 2026-10-26 14:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a Charm recipe conflict unit test and fix several issues with them

Browse Source 
Closes #173
This commit is contained in:
chylex committed 2016-07-17 23:15:10 +02:00
1 parent d604e3d2b4
commit 2159c2be94
2 files changed
+41 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/chylex/hee/mechanics/charms/CharmType.java
+5 -5
View File
@@ -48,8 +48,8 @@ public enum CharmType{
BLOCKING_REFLECTION(1, 10, new CharmRecipe[]{
new CharmRecipe(22).rune(POWER).rune(DEFENSE).rune(VOID).rune(MAGIC).prop("reducedmgblock",0.20F).prop("blockreflectdmg",0.10F),
new CharmRecipe(23).rune(POWER).rune(DEFENSE).rune(DEFENSE).rune(VOID).rune(MAGIC).prop("reducedmgblock",0.32F).prop("blockreflectdmg",0.10F),
new CharmRecipe(24).rune(POWER).rune(POWER).rune(DEFENSE).rune(VOID).rune(MAGIC).prop("reducedmgblock",0.20F).prop("blockreflectdmg",0.20F)
new CharmRecipe(23).rune(POWER).rune(DEFENSE,2).rune(VOID).rune(MAGIC).prop("reducedmgblock",0.32F).prop("blockreflectdmg",0.10F),
new CharmRecipe(24).rune(POWER,2).rune(DEFENSE).rune(VOID).rune(MAGIC).prop("reducedmgblock",0.20F).prop("blockreflectdmg",0.20F)
}, new String[]{ "perc,reducedmgblock", "perc,blockreflectdmg" }),
BLOCKING_REPULSION(2, 10, new CharmRecipe[]{
@@ -66,7 +66,7 @@ public enum CharmType{
LIFE_STEAL(5, 11, new CharmRecipe[]{
new CharmRecipe(28).rune(POWER).rune(VIGOR).rune(MAGIC).rune(VOID).prop("stealhealth",2).prop("stealdealt",16),
new CharmRecipe(29).rune(POWER).rune(VIGOR,2).rune(MAGIC).rune(VOID).prop("stealhealth",4).prop("stealdealt",16),
//new CharmRecipe(29).rune(POWER).rune(VIGOR,2).rune(MAGIC).rune(VOID).prop("stealhealth",4).prop("stealdealt",16),
new CharmRecipe(30).rune(POWER,2).rune(VIGOR,2).rune(VOID).prop("stealhealth",2).prop("stealdealt",10)
}, new String[]{ "int,stealhealth", "int,stealdealt" }),
@@ -90,7 +90,7 @@ public enum CharmType{
}, new String[]{ "perc,dmgtomagic" }),
WITCHERY_HARM(12, 4, new CharmRecipe[]{
new CharmRecipe(44).rune(POWER).rune(MAGIC).rune(VIGOR).rune(VOID).prop("badeffchance",0.08F).prop("badefflvl",1).prop("badefftime",5),
//new CharmRecipe(44).rune(POWER).rune(MAGIC).rune(VIGOR).rune(VOID).prop("badeffchance",0.08F).prop("badefflvl",1).prop("badefftime",5),
new CharmRecipe(45).rune(POWER).rune(MAGIC).rune(VIGOR,2).rune(VOID).prop("badeffchance",0.09F).prop("badefflvl",2).prop("badefftime",5),
new CharmRecipe(46).rune(POWER).rune(MAGIC,2).rune(VIGOR).rune(VOID).prop("badeffchance",0.14F).prop("badefflvl",1).prop("badefftime",5),
new CharmRecipe(65).rune(POWER,2).rune(MAGIC).rune(VIGOR).rune(VOID).prop("badeffchance",0.09F).prop("badefflvl",1).prop("badefftime",10)
@@ -137,7 +137,7 @@ public enum CharmType{
/*VOID_RESCUE(16, 0, new CharmRecipe[]{
new CharmRecipe(15).rune(DEFENSE).rune(VOID,3).prop("voidrescue",30),
new CharmRecipe(16).rune(DEFENSE,2).rune(VOID,3).prop("voidrescue",20)
new CharmRecipe(16).rune(DEFENSE,2).rune(VOID,3).prop("voidrescue",20)
}, ""),*/
SLAUGHTER_IMPACT(15, 12, new CharmRecipe[]{
src/main/java/chylex/hee/system/test/list/mechanics/CharmTests.java
+36
View File
@@ -0,0 +1,36 @@
package chylex.hee.system.test.list.mechanics;
import gnu.trove.map.hash.TIntIntHashMap;
import java.util.Map;
import java.util.Map.Entry;
import chylex.hee.mechanics.charms.CharmRecipe;
import chylex.hee.mechanics.charms.CharmType;
import chylex.hee.mechanics.charms.RuneType;
import chylex.hee.system.test.Assert;
import chylex.hee.system.test.data.MethodType;
import chylex.hee.system.test.data.RunTime;
import chylex.hee.system.test.data.UnitTest;
public class CharmTests{
@UnitTest(type = MethodType.TEST, runTime = RunTime.LOADCOMPLETE)
public void testRecipeConflicts(){
TIntIntHashMap hashes = new TIntIntHashMap(80,0.75F,-1,-1);
for(CharmType type:CharmType.values()){
for(CharmRecipe recipe:type.recipes){
Map<RuneType,Byte> data = recipe.getRunes();
int hash = 0, prevHash;
for(Entry<RuneType,Byte> entry:data.entrySet()){
int key = entry.getKey().ordinal(); // 0-6
int amount = entry.getValue(); // 0-5
hash |= amount << (key*3);
}
if ((prevHash = hashes.put(hash,recipe.id)) != -1){
Assert.fail("Found a duplicate Charm recipe: "+prevHash+" and "+recipe.id);
}
}
}
}
}