vbox combos, keep items in combiner

This commit is contained in:
Mashy
2019-02-19 14:44:15 +10:00
parent 23188f53f0
commit 54b1c8f1c0
3 changed files with 60 additions and 52 deletions
+27 -27
View File
@@ -187,48 +187,48 @@ impl Vbox {
let new = match base {
Var::Attack => match colour_code {
"rr" => Var::Strike,
"rr" => Var::Strangle,
"gg" => Var::Heal,
"bb" => Var::Blast,
"rg" => Var::Attack,
"gb" => Var::Attack,
"rb" => Var::Attack,
"rg" => Var::Slay,
"gb" => Var::Attack, // TBA
"rb" => Var::Banish,
_ => panic!("missing colour code {:?}", colour_code),
},
Var::Block => match colour_code {
"rr" => Var::Strike,
"gg" => Var::Heal,
"bb" => Var::Blast,
"rg" => Var::Attack,
"gb" => Var::Attack,
"rb" => Var::Attack,
"rr" => Var::Parry,
"gg" => Var::Reflect, // NYI
"bb" => Var::PlagueBarrier, // NYI
"rg" => Var::Shield,
"gb" => Var::Attack, // TBA
"rb" => Var::Taunt,
_ => panic!("missing colour code {:?}", colour_code),
},
Var::Buff => match colour_code {
"rr" => Var::Strike,
"gg" => Var::Heal,
"bb" => Var::Blast,
"rg" => Var::Attack,
"gb" => Var::Attack,
"rb" => Var::Attack,
"rr" => Var::Regenerate, // NYI heal red defense
"gg" => Var::Triage,
"bb" => Var::Amplify,
"rg" => Var::Purify,
"gb" => Var::Attack, // TBA
"rb" => Var::Haste,
_ => panic!("missing colour code {:?}", colour_code),
},
Var::Debuff => match colour_code {
"rr" => Var::Strike,
"gg" => Var::Heal,
"bb" => Var::Blast,
"rg" => Var::Attack,
"rr" => Var::Snare,
"gg" => Var::Purge,
"bb" => Var::Curse,
"rg" => Var::Attack, // TBA
"gb" => Var::Attack,
"rb" => Var::Attack,
"rb" => Var::Slow,
_ => panic!("missing colour code {:?}", colour_code),
},
Var::Stun => match colour_code {
"rr" => Var::Strike,
"gg" => Var::Heal,
"bb" => Var::Blast,
"rg" => Var::Attack,
"gb" => Var::Attack,
"rb" => Var::Attack,
"rr" => Var::Strangle,
"gg" => Var::Throw,
"bb" => Var::Ruin,
"rg" => Var::Silence,
"gb" => Var::Attack, // TBA
"rb" => Var::Taunt,
_ => panic!("missing colour code {:?}", colour_code),
},
_ => panic!("wrong base {:?}", base),