summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2014-06-16 22:31:56 -0400
committerJesse Luehrs <doy@tozt.net>2014-06-16 22:33:32 -0400
commit421bc2088f8309b85441128658dc25ebbc76e0b3 (patch)
treef5fb566c6671caa55c261780ebb04c2eaad38a5e
parentd7bd5eb79c560ea3f26370c14f98024ca95b4885 (diff)
downloadgames-smtnocturne-demons-421bc2088f8309b85441128658dc25ebbc76e0b3.tar.gz
games-smtnocturne-demons-421bc2088f8309b85441128658dc25ebbc76e0b3.zip
spell this properly
-rwxr-xr-xbin/smt8
-rw-r--r--lib/Games/SMTNocturne/Demons.pm4
-rw-r--r--lib/Games/SMTNocturne/Demons/Fusion.pm16
-rw-r--r--lib/Games/SMTNocturne/Demons/FusionChart.pm24
-rw-r--r--t/special.t18
5 files changed, 35 insertions, 35 deletions
diff --git a/bin/smt b/bin/smt
index eb687ff..5307ad3 100755
--- a/bin/smt
+++ b/bin/smt
@@ -14,11 +14,11 @@ sub _fusions_for { Games::SMTNocturne::Demons::fusions_for(@_) }
my $command = shift @ARGV;
-my ($max_level, $deathstones, $kagatsuchi, $bosses);
+my ($max_level, $deathstones, $kagutsuchi, $bosses);
GetOptions(
"max_level=i" => \$max_level,
"deathstones=i" => \$deathstones,
- "kagatsuchi=i" => \$kagatsuchi,
+ "kagutsuchi=i" => \$kagutsuchi,
"boss=s@" => \$bosses,
) or die "couldn't parse options";
$bosses = [ split(/,/, join(',', @$bosses)) ]
@@ -27,7 +27,7 @@ $bosses = [ split(/,/, join(',', @$bosses)) ]
my $options = {
max_level => $max_level,
deathstone => $deathstones,
- kagatsuchi => $kagatsuchi,
+ kagutsuchi => $kagutsuchi,
bosses => $bosses,
};
@@ -148,7 +148,7 @@ sub _check_fusion {
%$options,
sacrifice => $sacrifice,
deathstone => $deathstones,
- kagatsuchi => $phase,
+ kagutsuchi => $phase,
},
);
return unless $fused;
diff --git a/lib/Games/SMTNocturne/Demons.pm b/lib/Games/SMTNocturne/Demons.pm
index 6f6030c..2725c8c 100644
--- a/lib/Games/SMTNocturne/Demons.pm
+++ b/lib/Games/SMTNocturne/Demons.pm
@@ -193,8 +193,8 @@ sub fusions_for {
push @$_, '<deathstone>' for @special_fusions;
}
- if ($special->{kagatsuchi}) {
- push @$_, $special->{kagatsuchi} for @special_fusions;
+ if ($special->{kagutsuchi}) {
+ push @$_, $special->{kagutsuchi} for @special_fusions;
}
}
diff --git a/lib/Games/SMTNocturne/Demons/Fusion.pm b/lib/Games/SMTNocturne/Demons/Fusion.pm
index 9ffe9bb..cdfdcd8 100644
--- a/lib/Games/SMTNocturne/Demons/Fusion.pm
+++ b/lib/Games/SMTNocturne/Demons/Fusion.pm
@@ -6,7 +6,7 @@ use overload '""' => 'to_string';
use Games::SMTNocturne::Demons::Demon;
sub new {
- my ($class, $options, $demon1, $demon2, $sacrifice, $kagatsuchi) = @_;
+ my ($class, $options, $demon1, $demon2, $sacrifice, $kagutsuchi) = @_;
my $attrs = {};
@@ -27,7 +27,7 @@ sub new {
}
}
- $attrs->{kagatsuchi} = $kagatsuchi;
+ $attrs->{kagutsuchi} = $kagutsuchi;
$attrs->{options} = $options || {};
return bless $attrs, $class;
@@ -37,7 +37,7 @@ sub options { $_[0]->{options} }
sub demons { $_[0]->{demons} }
sub sacrifice { $_[0]->{sacrifice} }
sub deathstone { $_[0]->{deathstone} }
-sub kagatsuchi { $_[0]->{kagatsuchi} }
+sub kagutsuchi { $_[0]->{kagutsuchi} }
sub result {
my $self = shift;
require Games::SMTNocturne::Demons;
@@ -47,7 +47,7 @@ sub result {
%{ $self->options },
sacrifice => $self->sacrifice,
deathstone => $self->deathstone,
- kagatsuchi => @{ $self->kagatsuchi || [] }[0],
+ kagutsuchi => @{ $self->kagutsuchi || [] }[0],
}
);
}
@@ -68,8 +68,8 @@ sub raw {
if $self->sacrifice;
push @$array, "<deathstone>"
if $self->deathstone;
- push @$array, $self->kagatsuchi
- if defined $self->kagatsuchi;
+ push @$array, $self->kagutsuchi
+ if defined $self->kagutsuchi;
return $array;
}
@@ -84,8 +84,8 @@ sub to_string {
$str .= " while sacrificing a deathstone"
if $self->deathstone;
$str .= " when Kagutsuchi is at phase "
- . join(", ", map { "$_/8" } @{ $self->kagatsuchi })
- if defined $self->kagatsuchi;
+ . join(", ", map { "$_/8" } @{ $self->kagutsuchi })
+ if defined $self->kagutsuchi;
$str .= " resulting in " . $self->result;
return $str;
diff --git a/lib/Games/SMTNocturne/Demons/FusionChart.pm b/lib/Games/SMTNocturne/Demons/FusionChart.pm
index 1454fc5..ec80f21 100644
--- a/lib/Games/SMTNocturne/Demons/FusionChart.pm
+++ b/lib/Games/SMTNocturne/Demons/FusionChart.pm
@@ -102,9 +102,9 @@ sub special_fusion {
next unless $options->{deathstone};
}
- if (my $phases = $conditions->{kagatsuchi}) {
- next unless defined $options->{kagatsuchi}
- && grep { $_ == $options->{kagatsuchi} } @$phases;
+ if (my $phases = $conditions->{kagutsuchi}) {
+ next unless defined $options->{kagutsuchi}
+ && grep { $_ == $options->{kagutsuchi} } @$phases;
}
if (my $sacrifice = $conditions->{sacrifice}) {
@@ -1552,7 +1552,7 @@ __DATA__
},
"Black Rider" : {
"deathstone" : 1,
- "kagatsuchi" : [
+ "kagutsuchi" : [
0
],
"target" : {
@@ -1561,7 +1561,7 @@ __DATA__
},
"Daisoujou" : {
"deathstone" : 1,
- "kagatsuchi" : [
+ "kagutsuchi" : [
5,
6,
7,
@@ -1597,7 +1597,7 @@ __DATA__
},
"Hell Biker" : {
"deathstone" : 1,
- "kagatsuchi" : [
+ "kagutsuchi" : [
4,
5,
6,
@@ -1609,7 +1609,7 @@ __DATA__
},
"Matador" : {
"deathstone" : 1,
- "kagatsuchi" : [
+ "kagutsuchi" : [
1,
2,
3,
@@ -1657,7 +1657,7 @@ __DATA__
},
"Pale Rider" : {
"deathstone" : 1,
- "kagatsuchi" : [
+ "kagutsuchi" : [
0
],
"target" : {
@@ -1674,7 +1674,7 @@ __DATA__
},
"Red Rider" : {
"deathstone" : 1,
- "kagatsuchi" : [
+ "kagutsuchi" : [
0
],
"target" : {
@@ -1707,7 +1707,7 @@ __DATA__
},
"The Harlot" : {
"deathstone" : 1,
- "kagatsuchi" : [
+ "kagutsuchi" : [
4
],
"target" : {
@@ -1716,7 +1716,7 @@ __DATA__
},
"Trumpeter" : {
"deathstone" : 1,
- "kagatsuchi" : [
+ "kagutsuchi" : [
8
],
"target" : {
@@ -1725,7 +1725,7 @@ __DATA__
},
"White Rider" : {
"deathstone" : 1,
- "kagatsuchi" : [
+ "kagutsuchi" : [
0
],
"target" : {
diff --git a/t/special.t b/t/special.t
index 4df8834..9310043 100644
--- a/t/special.t
+++ b/t/special.t
@@ -54,31 +54,31 @@ fusion_is('Shadow', 'Aeros', 'Sakahagi');
set_fusion_options({ bosses => ['Sakahagi'] });
fusion_is('Shadow', 'Flaemis', 'Sakahagi');
-set_fusion_options({ bosses => ['Matador'], deathstone => 1, kagatsuchi => 2 });
+set_fusion_options({ bosses => ['Matador'], deathstone => 1, kagutsuchi => 2 });
fusion_is('Yaka', 'Incubus', 'Matador');
-set_fusion_options({ bosses => ['Daisoujou'], deathstone => 1, kagatsuchi => 7 });
+set_fusion_options({ bosses => ['Daisoujou'], deathstone => 1, kagutsuchi => 7 });
fusion_is('Yurlungur', 'Mothman', 'Daisoujou');
-set_fusion_options({ bosses => ['Hell Biker'], deathstone => 1, kagatsuchi => 4 });
+set_fusion_options({ bosses => ['Hell Biker'], deathstone => 1, kagutsuchi => 4 });
fusion_is('Shikigami', 'Zhen', 'Hell Biker');
-set_fusion_options({ bosses => ['White Rider'], deathstone => 1, kagatsuchi => 0 });
+set_fusion_options({ bosses => ['White Rider'], deathstone => 1, kagutsuchi => 0 });
fusion_is('Kurama', 'Pazuzu', 'White Rider');
-set_fusion_options({ bosses => ['Red Rider'], deathstone => 1, kagatsuchi => 0 });
+set_fusion_options({ bosses => ['Red Rider'], deathstone => 1, kagutsuchi => 0 });
fusion_is('Badb Catha', 'Succubus', 'Red Rider');
-set_fusion_options({ bosses => ['Black Rider'], deathstone => 1, kagatsuchi => 0 });
+set_fusion_options({ bosses => ['Black Rider'], deathstone => 1, kagutsuchi => 0 });
fusion_is('Beelzebub', 'Koppa', 'Black Rider');
-set_fusion_options({ bosses => ['Pale Rider'], deathstone => 1, kagatsuchi => 0 });
+set_fusion_options({ bosses => ['Pale Rider'], deathstone => 1, kagutsuchi => 0 });
fusion_is('Horus', 'Gurr', 'Pale Rider');
-set_fusion_options({ bosses => ['The Harlot'], deathstone => 1, kagatsuchi => 4 });
+set_fusion_options({ bosses => ['The Harlot'], deathstone => 1, kagutsuchi => 4 });
fusion_is('Shiva', 'Girimehkala', 'The Harlot');
-set_fusion_options({ bosses => ['Trumpeter'], deathstone => 1, kagatsuchi => 8 });
+set_fusion_options({ bosses => ['Trumpeter'], deathstone => 1, kagutsuchi => 8 });
fusion_is('Dionysus', 'Tao Tie', 'Trumpeter');
done_testing;