manasimu 0.0.23 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6082f731a818265c066a58b3ff0e1c92df1444c5f08982cba8a80fd0ad73e41
-  data.tar.gz: 722690804b9fd37604dd44953678bbddfef4695c0a2d4f8d8bbba80738dc7a33
+  metadata.gz: f194c1efd40c93772541e4aa6bf1164ff46a836a91887e848944548ed5afabde
+  data.tar.gz: 1716988949899acf5972599c371dd95696748311afd728d1bcd6a9040c2ef901
 SHA512:
-  metadata.gz: 5bca43f6174a91ed763000757d517ee793042e2d84223eb14d58374ec8dbb8bec98e0ba3da79b85472cbeded392006dbf016ef882c2b80d803e51203453f0d5f
-  data.tar.gz: 6c533f61fd8832391d9a3b9bf8fd682302b0b9bf54ab07a52d3d6491f69ad3124f150d9ab7482297a9704fb2df924864cf184e452cf6bfca6b731218bbf1fb75
+  metadata.gz: 14ffb32574c728c83f737d234205e37a85748ba08a68fe952e5a3945a5fb8715ed3791105fa89971f7c874b76de8e9ca8a6168ec7a7d64992f1482adc8ec8f17
+  data.tar.gz: 5e2a6b2740ec5259ab5d60625b6201b05707022735808e75fd1d1d3753ff591db9b9a651401f48b3b91367ebf6baa9c58f0f6448d6ac73bd33a67f381bc13a1b

data/lib/manasimu/card.rb

@@ -294,6 +294,10 @@ class CardType
     return @is_land
   end
 
+  def names
+    @contents[0].names
+  end
+
   def playable?(lands, capas)
     return [false, [], []] if lands.empty?
     return [false, [], []] if converted_mana_cost > lands.length
@@ -391,17 +395,27 @@ class CardType
 end
 
 class CardTypeAggregate
+  def initialize
+    @memo = []
+  end
 
   def find(set_code, number)
-    @memo ||= []
-    @memo.find do |c|
+    ret = @memo.bsearch do |c|
       a = c.contents[0]
-      a and a.set_code == set_code and a.number == number
+      if set_code == a.set_code
+        number.to_i <= a.number
+      else
+        set_code < a.set_code
+      end
+    end
+    if ret and ret.set_code == set_code and ret.number == number.to_i
+      ret
+    else
+      nil
     end
   end
 
   def add(card_type)
-    @memo ||= []
     @memo << card_type
   end
 
@@ -420,10 +434,11 @@ class CardTypeAggregate
 end
 
 class Content
-  attr_accessor :name, :number, :side, :set_code, :mana_cost, :type, :types, :color_identity, :converted_mana_cost, :text
+  attr_accessor :name, :names, :number, :side, :set_code, :mana_cost, :type, :types, :color_identity, :converted_mana_cost, :text
 
   def initialize(hash)
     @name = hash[:name]
+    @names = hash[:names]
     @number = hash[:number]
     @side = hash[:side]
     @set_code = hash[:set_code]
@@ -447,6 +462,7 @@ class Content
     <<EOF
   factory '#{@name.underscore}_content', class: Content do
     name  {'#{@name}'}
+    names  {'#{@names}'}
     number {'#{@number}'}
     side {'#{@side}'}
     set_code { '#{@set_code}'}

data/lib/manasimu/data.rb

@@ -66,46 +66,73 @@ class Deck
   end
 
   def self.find_card_types(lines)
-    types = card_types.map do |a| a end
-    types.sort! do |a,b| a.name <=> b.name end
+    ret = []
 
     distinct_types = []
-    types.each do |type|
+    card_types.each do |type|
       next if distinct_types[-1] and distinct_types[-1].name == type.name
-      type.name
       distinct_types << type
     end
 
-    ret = []
-    lines.each do |line|
-      line.chomp!
-      search_type = distinct_types.bsearch do |type|
-        name = type.name.split(' // ')[0]
-        flag = true
-        name.chars.each_with_index do |nc,i|
-
-          if line.length > i
-            lc = line.chars[i]
-            if nc > lc
-              flag = true
-              break
-            elsif nc < lc
-              flag = false
-              break
-            else
-              # continue
+
+    [-1, 4].each do |j|
+
+      distinct_types.sort! do |a,b| 
+        if j < 0
+          a.name <=> b.name 
+        elsif a.names[j] and b.names[j]
+          a.names[j] <=> b.names[j]
+        elsif not a.names[j] and not b.names[j]
+          0
+        elsif a.names[j]
+          -1
+        else
+          1
+        end
+      end
+
+      lines.each do |line|
+        line.chomp!
+        search_type = distinct_types.bsearch do |type|
+          if j < 0
+            name = type.name.split(' // ')[0]
+          elsif type.names[j]
+            name = type.names[j].split(' // ')[0]
+          end
+
+          if name
+            flag = true
+            name.chars.each_with_index do |nc,i|
+              if line.length > i
+                lc = line.chars[i]
+                if nc > lc
+                  flag = true
+                  break
+                elsif nc < lc
+                  flag = false
+                  break
+                else
+                  # continue
+                end
+              else
+                flag = true
+                break
+              end
             end
+            flag
           else
-            flag = true
-            break
+            false
           end
         end
-        flag
-      end
-      if search_type
-        a = search_type.name.split(' // ')[0]
-        if line =~ /^#{a}.*$/ and a != 'X'
-          ret << search_type
+        if search_type
+          if j < 0
+            a = search_type.name.split(' // ')[0]
+          else
+            a = search_type.names[j].split(' // ')[0]
+          end
+          if line =~ /^#{a}.*$/ and a != 'X'
+            ret << search_type
+          end
         end
       end
     end

data/lib/manasimu/expansion.rb

@@ -0,0 +1,3 @@
+class Expansion
+  attr_accessor :code, :name, :exists
+end

data/lib/manasimu.rb

@@ -13,4 +13,5 @@ require_relative './manasimu/planner.rb'
 require_relative './manasimu/game.rb'
 require_relative './manasimu/simulator.rb'
 require_relative './manasimu/data.rb'
+require_relative './manasimu/expansion.rb'
 require_relative '../ext/ford_fulkerson.so'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manasimu
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.26
 platform: ruby
 authors:
 - so1itaryrove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-06-04 00:00:00.000000000 Z
 dependencies: []
 description: mtg arrena mana curve simulator
 email: so1itaryrove@gmail.com
@@ -27,6 +27,7 @@ files:
 - lib/manasimu/card/snc_fetchland.rb
 - lib/manasimu/card/tapland.rb
 - lib/manasimu/data.rb
+- lib/manasimu/expansion.rb
 - lib/manasimu/game.rb
 - lib/manasimu/hello.rb
 - lib/manasimu/mana_type.rb