git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sc: prevent upgrade preparation from modifying original data
[sheet.git]
/
sc.plp
diff --git
a/sc.plp
b/sc.plp
index 1c611305dbffc1d1e42df4fa9370e4b5bc874fab..e426a6e5ae6f5c822c5386fdf4c33839d5e17cf5 100644
(file)
--- a/
sc.plp
+++ b/
sc.plp
@@
-55,13
+55,14
@@
print "Also see the $_ table.\n" for join(', ',
print "</p>\n\n";
sub addupgrade {
print "</p>\n\n";
sub addupgrade {
- my ($ref, $increase) = @_;
+ my ($ref, $increase
, $org
) = @_;
if (ref $increase eq 'HASH') {
if (ref $increase eq 'HASH') {
- addupgrade(\${$ref}->{$_}, $increase->{$_}) for keys %{$increase};
+ addupgrade(\${$ref}->{$_}, $increase->{$_}
, $org->{$_}
) for keys %{$increase};
}
elsif (ref $increase eq 'ARRAY') {
}
elsif (ref $increase eq 'ARRAY') {
- addupgrade(\${$ref}->[$_], $increase->[$_]) for 0 .. $#{$increase};
+ addupgrade(\${$ref}->[$_], $increase->[$_]
, $org->[$_]
) for 0 .. $#{$increase};
}
}
+ ${$ref} //= $org;
${$ref} += $increase if $increase =~ /^-?[0-9.]+/;
}
${$ref} += $increase if $increase =~ /^-?[0-9.]+/;
}
@@
-69,7
+70,7
@@
for my $unit (@{$units}) {
for my $upgrade (@{ $unit->{upgrade} }) {
while (my ($col, $increase) = each %{$upgrade}) {
defined $unit->{$col} or next;
for my $upgrade (@{ $unit->{upgrade} }) {
while (my ($col, $increase) = each %{$upgrade}) {
defined $unit->{$col} or next;
- addupgrade(\
( $unit->{upgraded}->{$col} //= $unit->{$col} ), $increase
);
+ addupgrade(\
$unit->{upgraded}->{$col}, $increase, $unit->{$col}
);
}
}
}
}
}
}
@@
-112,7
+113,7
@@
sub showrange {
sub showattack {
my ($row, $area) = @_;
my $attack = $row->{attack}->[$area]
sub showattack {
my ($row, $area) = @_;
my $attack = $row->{attack}->[$area]
- or return '<td colspan=
4
class="hurt">';
+ or return '<td colspan=
5
class="hurt">';
my $upattack = $row->{upgraded}->{attack}->[$area];
my $damage = $attack->{damage};
my $upattack = $row->{upgraded}->{attack}->[$area];
my $damage = $attack->{damage};
@@
-178,6
+179,9
@@
sub showrange {
$out .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
$out .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
$out .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
$out .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
+ $out .= '<td class="val unit-range">' .
+ showrange($attack->{range}, $upattack->{range});
+
return $out;
}
return $out;
}
@@
-266,8
+270,6
@@
sub showrange {
' class="val unit-armor">' .
showrange($_->{armor}, $_->{upgraded}->{armor}),
showattack($_, 0),
' class="val unit-armor">' .
showrange($_->{armor}, $_->{upgraded}->{armor}),
showattack($_, 0),
- '<td class="val unit-range">' .
- showrange(map { $_->{attack}->[0]->{range} } $_, $_->{upgraded}),
'<td class="val unit-sight">' . sprintf(
$_->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
showrange($_->{sight}, $_->{upgraded}->{sight})
'<td class="val unit-sight">' . sprintf(
$_->{detect} ? '<strong class="unit-detect">%s</strong>' : '%s',
showrange($_->{sight}, $_->{upgraded}->{sight})
@@
-280,7
+282,10
@@
sub showrange {
&& qq'<span class="unit unit-jump" title="flying">↑</span>',
'<td class="unit-magic">' . showmagic($_),
!$_->{attack}->[1] ? () : (
&& qq'<span class="unit unit-jump" title="flying">↑</span>',
'<td class="unit-magic">' . showmagic($_),
!$_->{attack}->[1] ? () : (
- '<tr><td colspan=12>', showattack($_, 1), '<td colspan=4>'
+ '<tr><td colspan=12>', showattack($_, 1), '<td colspan=3>'
+ ),
+ !$_->{attack}->[2] ? () : (
+ '<tr><td colspan=12>', showattack($_, 2), '<td colspan=3>'
),
"\n"
);
),
"\n"
);