github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3349 from spjspj/master

Browse source 
EDH Power level update
This commit is contained in:
spjspj 2017-05-11 16:27:10 +10:00 committed by GitHub
commit 194b7978d2
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java
View file

@ -593,11 +593,14 @@ public class Commander extends Constructed {
// Parts of infinite combos // Parts of infinite combos
if (cn.equals("animate artifact") || cn.equals("animar, soul of element") if (cn.equals("animate artifact") || cn.equals("animar, soul of element")
|| cn.equals("archaeomancer") || cn.equals("archaeomancer")
|| cn.equals("ashnod's altar") || cn.equals("azami, lady of scrolls") || cn.equals("ashnod's altar") || cn.equals("azami, lady of scrolls")
|| cn.equals("aura flux")
|| cn.equals("basalt monolith") || cn.equals("brago, king eternal") || cn.equals("basalt monolith") || cn.equals("brago, king eternal")
|| cn.equals("candelabra of tawnos") || cn.equals("cephalid aristocrat") || cn.equals("candelabra of tawnos") || cn.equals("cephalid aristocrat")
|| cn.equals("cephalid illusionist") || cn.equals("changeling berserker") || cn.equals("cephalid illusionist") || cn.equals("changeling berserker")
|| cn.equals("consecrated sphinx")
|| cn.equals("cyclonic rift")
|| cn.equals("the chain veil") || cn.equals("the chain veil")
|| cn.equals("cinderhaze wretch") || cn.equals("cryptic gateway") || cn.equals("cinderhaze wretch") || cn.equals("cryptic gateway")
|| cn.equals("deadeye navigator") || cn.equals("derevi, empyrial tactician") || cn.equals("deadeye navigator") || cn.equals("derevi, empyrial tactician")
@ -606,9 +609,12 @@ public class Commander extends Constructed {
|| cn.equals("enter the infinite") || cn.equals("omniscience") || cn.equals("enter the infinite") || cn.equals("omniscience")
|| cn.equals("exquisite blood") || cn.equals("future sight") || cn.equals("exquisite blood") || cn.equals("future sight")
|| cn.equals("ghave, guru of spores") || cn.equals("ghave, guru of spores")
|| cn.equals("grave pact")
|| cn.equals("grave titan") || cn.equals("great whale") || cn.equals("grave titan") || cn.equals("great whale")
|| cn.equals("grim monolith") || cn.equals("gush") || cn.equals("grim monolith") || cn.equals("gush")
|| cn.equals("hellkite charger") || cn.equals("intruder alarm") || cn.equals("hellkite charger") || cn.equals("intruder alarm")
|| cn.equals("hermit druid")
|| cn.equals("humility")
|| cn.equals("iona, shield of emeria") || cn.equals("iona, shield of emeria")
|| cn.equals("karn, silver golem") || cn.equals("kiki-jiki, mirror breaker") || cn.equals("karn, silver golem") || cn.equals("kiki-jiki, mirror breaker")
|| cn.equals("krark-clan ironworks") || cn.equals("krenko, mob boss") || cn.equals("krark-clan ironworks") || cn.equals("krenko, mob boss")
@ -621,14 +627,18 @@ public class Commander extends Constructed {
|| cn.equals("minion reflector") || cn.equals("mycosynth lattice") || cn.equals("minion reflector") || cn.equals("mycosynth lattice")
|| cn.equals("myr turbine") || cn.equals("narset, enlightened master") || cn.equals("myr turbine") || cn.equals("narset, enlightened master")
|| cn.equals("nekusar, the mindrazer") || cn.equals("norin the wary") || cn.equals("nekusar, the mindrazer") || cn.equals("norin the wary")
|| cn.equals("notion thief")
|| cn.equals("opalescence") || cn.equals("ornithopter") || cn.equals("opalescence") || cn.equals("ornithopter")
|| cn.equals("paradox engine") || cn.equals("paradox engine")
|| cn.equals("purphoros, god of the forge")
|| cn.equals("peregrine drake") || cn.equals("palinchron") || cn.equals("peregrine drake") || cn.equals("palinchron")
|| cn.equals("planar portal") || cn.equals("power artifact") || cn.equals("planar portal") || cn.equals("power artifact")
|| cn.equals("rings of brighthearth") || cn.equals("rite of replication") || cn.equals("rings of brighthearth") || cn.equals("rite of replication")
|| cn.equals("sanguine bond") || cn.equals("sensei's divining top") || cn.equals("sanguine bond") || cn.equals("sensei's divining top")
|| cn.equals("splinter twin") || cn.equals("stony silence") || cn.equals("splinter twin") || cn.equals("stony silence")
|| cn.equals("sunder")
|| cn.equals("storm cauldron") || cn.equals("teferi's puzzle box") || cn.equals("storm cauldron") || cn.equals("teferi's puzzle box")
|| cn.equals("tangle wire")
|| cn.equals("teferi, mage of zhalfir") || cn.equals("teferi, mage of zhalfir") || cn.equals("teferi, mage of zhalfir") || cn.equals("teferi, mage of zhalfir")
|| cn.equals("tezzeret the seeker") || cn.equals("time stretch") || cn.equals("tezzeret the seeker") || cn.equals("time stretch")
|| cn.equals("time warp") || cn.equals("training grounds") || cn.equals("time warp") || cn.equals("training grounds")
@ -638,7 +648,7 @@ public class Commander extends Constructed {
|| cn.equals("workhorse") || cn.equals("worldgorger dragon") || cn.equals("workhorse") || cn.equals("worldgorger dragon")
|| cn.equals("worthy cause") || cn.equals("yawgmoth's will") || cn.equals("worthy cause") || cn.equals("yawgmoth's will")
|| cn.equals("zealous conscripts")) { || cn.equals("zealous conscripts")) {
thisMaxPower = Math.max(thisMaxPower, 7); thisMaxPower = Math.max(thisMaxPower, 12);
numberInfinitePieces++; numberInfinitePieces++;
} }
edhPowerLevel += thisMaxPower; edhPowerLevel += thisMaxPower;
@ -722,7 +732,7 @@ public class Commander extends Constructed {
edhPowerLevel += thisMaxPower; edhPowerLevel += thisMaxPower;
} }
edhPowerLevel += numberInfinitePieces * 10; edhPowerLevel += numberInfinitePieces * 12;
edhPowerLevel = (int) Math.round(edhPowerLevel / 4.5); edhPowerLevel = (int) Math.round(edhPowerLevel / 4.5);
if (edhPowerLevel > 100) { if (edhPowerLevel > 100) {
edhPowerLevel = 100; edhPowerLevel = 100;