From 84a63eb1d32b332d3b0b2cf290c35b2e0c8d8f07 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 19 Jun 2015 07:45:15 +0200
Subject: [PATCH 1/1] sc: correctly recursive through all data references in
 upgrades

---
 sc.plp | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/sc.plp b/sc.plp
index 3174511..0a0f161 100644
--- a/sc.plp
+++ b/sc.plp
@@ -48,27 +48,22 @@ my $patch = shift @{$units}
 
 print "<p>Unit properties as seen or measured in $scver{name}\n$patch.\n</p>\n\n";
 
+sub addupgrade {
+	my ($ref, $increase) = @_;
+	if (ref $increase eq 'HASH') {
+		addupgrade(\${$ref}->{$_}, $increase->{$_}) for keys %{$increase};
+	}
+	elsif (ref $increase eq 'ARRAY') {
+		addupgrade(\${$ref}->[$_], $increase->[$_]) for 0 .. $#{$increase};
+	}
+	${$ref} += $increase if $increase =~ /^-?[0-9.]+/;
+}
+
 for my $unit (@{$units}) {
 	for my $upgrade (@{ $unit->{upgrade} }) {
 		while (my ($col, $increase) = each %{$upgrade}) {
 			defined $unit->{$col} or next;
-
-			if (ref $increase eq 'ARRAY') {
-				for my $incrow (0 .. $#{$increase}) {
-					while (my ($inccol, $subinc) = each %{ $increase->[$incrow] }) {
-						$unit->{upgraded}->{$col}->[$incrow]->{$inccol}
-							//= ref $unit->{$col}->[$incrow]->{$inccol}
-								  ? $unit->{$col}->[$incrow]->{$inccol}->[-1]
-								  : $unit->{$col}->[$incrow]->{$inccol};
-						$unit->{upgraded}->{$col}->[$incrow]->{$inccol}
-							+= ref $subinc ? $subinc->[-1] : $subinc;
-					}
-				}
-			}
-			elsif ($increase =~ /^-?[0-9.]+/) {
-				$unit->{upgraded}->{$col} //= $unit->{$col};
-				$unit->{upgraded}->{$col}  += $increase;
-			}
+			addupgrade(\( $unit->{upgraded}->{$col} //= $unit->{$col} ), $increase);
 		}
 	}
 }
@@ -128,10 +123,10 @@ sub showrange {
 		$out .= '">';
 
 		my $upattack = $row->{upgraded}->{attack}->[$area];
-		my $maxdamage =
 		my $damage = $attack->{damage};
-		($damage, $maxdamage) = ($damage->[0], $upattack->{damage} // $damage->[-1])
-			if ref $damage;
+		my $maxdamage = $upattack->{damage} // $damage;
+		$damage = $damage->[0] if ref $damage;
+		$maxdamage = $maxdamage->[-1] if ref $maxdamage;
 
 		$out .= "<small>$attack->{count}× </small>" if $attack->{count} > 1;
 		$out .= showrange($damage, $maxdamage);
-- 
2.30.0