Ok i will move on from calculator from now on
This commit is contained in:
parent
24ad72c029
commit
1350007e1d
|
@ -328,7 +328,7 @@ class ClearData{
|
||||||
// }
|
// }
|
||||||
|
|
||||||
double comboDamage = 0;
|
double comboDamage = 0;
|
||||||
|
|
||||||
if (rules.combo) {
|
if (rules.combo) {
|
||||||
if (combo > 1){
|
if (combo > 1){
|
||||||
if (lines == 1 && rules.comboTable != ComboTables.multiplier) comboDamage += combotable[rules.comboTable]![max(0, min(combo - 1, combotable[rules.comboTable]!.length - 1))];
|
if (lines == 1 && rules.comboTable != ComboTables.multiplier) comboDamage += combotable[rules.comboTable]![max(0, min(combo - 1, combotable[rules.comboTable]!.length - 1))];
|
||||||
|
@ -404,6 +404,8 @@ class _DestinationCalculatorState extends State<DestinationCalculator> {
|
||||||
int idCounter = 0;
|
int idCounter = 0;
|
||||||
Rules rules = Rules();
|
Rules rules = Rules();
|
||||||
|
|
||||||
|
CalcCards card = CalcCards.calc;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
|
@ -750,7 +752,10 @@ class _DestinationCalculatorState extends State<DestinationCalculator> {
|
||||||
children: [
|
children: [
|
||||||
SizedBox(
|
SizedBox(
|
||||||
height: widget.constraints.maxHeight -32,
|
height: widget.constraints.maxHeight -32,
|
||||||
child: getDamageCalculator(),
|
child: switch (card){
|
||||||
|
CalcCards.calc => getCalculator(),
|
||||||
|
CalcCards.damage => getDamageCalculator()
|
||||||
|
}
|
||||||
),
|
),
|
||||||
SegmentedButton<CalcCards>(
|
SegmentedButton<CalcCards>(
|
||||||
showSelectedIcon: false,
|
showSelectedIcon: false,
|
||||||
|
@ -764,11 +769,10 @@ class _DestinationCalculatorState extends State<DestinationCalculator> {
|
||||||
label: Text('Damage Calculator'),
|
label: Text('Damage Calculator'),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
selected: <CalcCards>{CalcCards.damage},
|
selected: <CalcCards>{card},
|
||||||
onSelectionChanged: (Set<CalcCards> newSelection) {
|
onSelectionChanged: (Set<CalcCards> newSelection) {
|
||||||
setState(() {
|
setState(() {
|
||||||
// cardMod = CardMod.info;
|
card = newSelection.first;
|
||||||
// rightCard = newSelection.first;
|
|
||||||
});})
|
});})
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue