manasimu 0.0.24 → 0.0.25
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/manasimu/data.rb +21 -12
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7789310be16e9d3b352d2aa77999dbd18b80e90e86270637cc0317bc5941be4a
|
4
|
+
data.tar.gz: 6b85a7a3523e6033aa1efe1d70ef8f7540799a1e72ee4e8ba7f21f0b1d946b14
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2676d3fd0ba9efc9b1aea58f4dbf9d677da052ed4cd74e31d5e3a47a25db1ab74d5ca1ccab98081556d1d72edff16d5086b43d2579075c0e2684f5b208d80a2b
|
7
|
+
data.tar.gz: f8bb389f4018e8d70f6f810d2475e68635feff41f78b1460f55e3e8e8e8e34414e7182d8b8c38ae3f3cbb6c02010a337c566048cac9e80f2323e5d74422311c6
|
data/lib/manasimu/data.rb
CHANGED
@@ -66,26 +66,36 @@ class Deck
|
|
66
66
|
end
|
67
67
|
|
68
68
|
def self.find_card_types(lines)
|
69
|
-
|
70
|
-
types.sort! do |a,b| a.name <=> b.name end
|
69
|
+
ret = []
|
71
70
|
|
72
71
|
distinct_types = []
|
73
|
-
|
72
|
+
card_types.each do |type|
|
74
73
|
next if distinct_types[-1] and distinct_types[-1].name == type.name
|
75
|
-
type.name
|
76
74
|
distinct_types << type
|
77
75
|
end
|
78
76
|
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
77
|
+
|
78
|
+
[-1, 4].each do |i|
|
79
|
+
|
80
|
+
distinct_types.sort! do |a,b|
|
81
|
+
if i < 0
|
82
|
+
a.name <=> b.name
|
83
|
+
elsif a.names[i] and b.names[i]
|
84
|
+
a.names[i] <=> b.names[i]
|
85
|
+
else
|
86
|
+
0
|
87
|
+
end
|
88
|
+
end
|
89
|
+
|
90
|
+
lines.each do |line|
|
91
|
+
line.chomp!
|
83
92
|
search_type = distinct_types.bsearch do |type|
|
84
|
-
if i
|
93
|
+
if i < 0
|
85
94
|
name = type.name.split(' // ')[0]
|
86
|
-
|
87
|
-
next if not type.names[i]
|
95
|
+
elsif type.names[i]
|
88
96
|
name = type.names[i].split(' // ')[0]
|
97
|
+
else
|
98
|
+
next
|
89
99
|
end
|
90
100
|
|
91
101
|
flag = true
|
@@ -112,7 +122,6 @@ class Deck
|
|
112
122
|
a = search_type.name.split(' // ')[0]
|
113
123
|
if line =~ /^#{a}.*$/ and a != 'X'
|
114
124
|
ret << search_type
|
115
|
-
break
|
116
125
|
end
|
117
126
|
end
|
118
127
|
end
|