git.shiar.nl
/
sheet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7daf512
)
sc: move attack target columns next to range
author
Mischa POSLAWSKY
<perl@shiar.org>
Fri, 19 Jun 2015 10:38:29 +0000
(12:38 +0200)
committer
Mischa POSLAWSKY
<perl@shiar.org>
Mon, 22 Jun 2015 13:38:51 +0000
(15:38 +0200)
sc.plp
patch
|
blob
|
history
diff --git
a/sc.plp
b/sc.plp
index 2b8112dc79fbd1ad196fd54a08eb4f5caaf09d5b..c86ef0bc47bd33c2d9f55bbdc8974b37bb3fa83c 100644
(file)
--- a/
sc.plp
+++ b/
sc.plp
@@
-93,9
+93,9
@@
sub coltoggle {
<th class="val unit-hp">HP</th>
<th class="val unit-shield">shield</th>
<th class="val unit-armor" title="armor">⛨</th>
<th class="val unit-hp">HP</th>
<th class="val unit-shield">shield</th>
<th class="val unit-armor" title="armor">⛨</th>
- <th class="val hurt"
colspan=3
>attack</th>
+ <th class="val hurt">attack</th>
<th class="hurt hurtrel"><:= coltoggle(qw'dps attack 1') :></th>
<th class="hurt hurtrel"><:= coltoggle(qw'dps attack 1') :></th>
- <th class="val unit-range">range</th>
+ <th class="val unit-range"
colspan=3
>range</th>
<th class="val unit-sight">sight</th>
<th class="val unit-speed">speed</th>
<th class="unit-magic">specials</th>
<th class="val unit-sight">sight</th>
<th class="val unit-speed">speed</th>
<th class="unit-magic">specials</th>
@@
-114,17
+114,13
@@
sub showrange {
my $attack = $row->{attack}->[$area]
or return '<td colspan=4 class="hurt">';
my $attack = $row->{attack}->[$area]
or return '<td colspan=4 class="hurt">';
- my $out = '';
- $out .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
- $out .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
- $out .= '<td class="val hurt">';
-
my $upattack = $row->{upgraded}->{attack}->[$area];
my $damage = $attack->{damage};
my $maxdamage = $upattack->{damage} // $damage;
$damage = $damage->[0] if ref $damage;
$maxdamage = $maxdamage->[-1] if ref $maxdamage;
my $upattack = $row->{upgraded}->{attack}->[$area];
my $damage = $attack->{damage};
my $maxdamage = $upattack->{damage} // $damage;
$damage = $damage->[0] if ref $damage;
$maxdamage = $maxdamage->[-1] if ref $maxdamage;
+ my $out = '<td class="val hurt">';
$out .= "<small>$attack->{count}× </small>" if $attack->{count} > 1;
$out .= '<span class="unit-l" title="explosive">*</span>'
if $attack->{type} eq 'explosive';
$out .= "<small>$attack->{count}× </small>" if $attack->{count} > 1;
$out .= '<span class="unit-l" title="explosive">*</span>'
if $attack->{type} eq 'explosive';
@@
-148,6
+144,7
@@
sub showrange {
),
)} keys %{ $attack->{bonus} }),
) if $attack->{bonus};
),
)} keys %{ $attack->{bonus} }),
) if $attack->{bonus};
+
$out .= showrange($damage, $maxdamage);
$out .= sprintf('<span class="unit-splash" title="%s">%s</span>',
$attack->{splash} eq 'line' ? ('linear', '×') : ('splash', '+')
$out .= showrange($damage, $maxdamage);
$out .= sprintf('<span class="unit-splash" title="%s">%s</span>',
$attack->{splash} eq 'line' ? ('linear', '×') : ('splash', '+')
@@
-174,6
+171,9
@@
sub showrange {
$out .= showrange($damage, $maxdamage);
}
$out .= showrange($damage, $maxdamage);
}
+ $out .= '<td class="unit hurt-g">' . '▽' x !!($attack->{anti} & 1);
+ $out .= '<td class="unit hurt-a">' . '△' x !!($attack->{anti} & 2);
+
return $out;
}
return $out;
}
@@
-393,8
+393,6
@@
if ($scver{major} > 1) {
<dd>reduction applies to initial damage, before size penalties
<small>(so a plasma hit of 12 to 4 armor large deals 2 damage, not ½)</small>
<dt>attack
<dd>reduction applies to initial damage, before size penalties
<small>(so a plasma hit of 12 to 4 armor large deals 2 damage, not ½)</small>
<dt>attack
- <dd>targets <span class="hurt-g">▽</span> ground
- and/or <span class="hurt-a">△</span> air
<dd>damage given per single hit
<dd><span class="hurtrel">dps</span> indicates relative amount of damage
done in 1 second of in-game time
<dd>damage given per single hit
<dd><span class="hurtrel">dps</span> indicates relative amount of damage
done in 1 second of in-game time
@@
-410,11
+408,13
@@
if ($scver{major} > 1) {
<dd><span class="unit-s">~</span>concussive/plasma damage does
25% to large, 50% medium, 100% to small units<:
} :>
<dd><span class="unit-s">~</span>concussive/plasma damage does
25% to large, 50% medium, 100% to small units<:
} :>
+ <dd>targets <span class="hurt-g">▽</span> ground
+ and/or <span class="hurt-a">△</span> air
+<dt>range
+ <dd>maximum range of weapon (note siege tank also has a minimum range)
<dt>sight
<dd>range in which the unit detects other units
<dd><strong class="unit-detect">emphasis</strong> indicates ability to detect cloaked units
<dt>sight
<dd>range in which the unit detects other units
<dd><strong class="unit-detect">emphasis</strong> indicates ability to detect cloaked units
-<dt>range
- <dd>maximum range of weapon (note siege tank also has a minimum range)
<dt>speed
<dd>relative speed of movement (when in full motion, startup speed ignored)
<dt>specials
<dt>speed
<dd>relative speed of movement (when in full motion, startup speed ignored)
<dt>specials