manasimu 0.0.22 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 341d139d858f8ed21d1e9b2ea92f981b942fa4371cb25dad87a908ec4cf7b440
-  data.tar.gz: 80bc0a8ad47a8422c3b38caefd99fa265f24ed792c63efb3d62d9ce083d155ee
+  metadata.gz: 7789310be16e9d3b352d2aa77999dbd18b80e90e86270637cc0317bc5941be4a
+  data.tar.gz: 6b85a7a3523e6033aa1efe1d70ef8f7540799a1e72ee4e8ba7f21f0b1d946b14
 SHA512:
-  metadata.gz: 3c6d3d5223eca48ae93f6700d1d56a304fb57e32154963d635a2ff0d3bc47d2663f10a6293aea3663e97f914e0f8050c9cca141a4267ad7c105e7e0628d18323
-  data.tar.gz: d5afad4365d7a20ea84e5e8b5d2267264e85d07f3eecc0eea4519ded233189fb971b9225728bc9c287a65b4778b1586249b4b90383c374912dbdbe20be65d3fc
+  metadata.gz: 2676d3fd0ba9efc9b1aea58f4dbf9d677da052ed4cd74e31d5e3a47a25db1ab74d5ca1ccab98081556d1d72edff16d5086b43d2579075c0e2684f5b208d80a2b
+  data.tar.gz: f8bb389f4018e8d70f6f810d2475e68635feff41f78b1460f55e3e8e8e8e34414e7182d8b8c38ae3f3cbb6c02010a337c566048cac9e80f2323e5d74422311c6

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,51 +66,70 @@ 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
+
+    [-1, 4].each do |i|
+
+      distinct_types.sort! do |a,b| 
+        if i < 0
+          a.name <=> b.name 
+        elsif a.names[i] and b.names[i]
+          a.names[i] <=> b.names[i]
+        else
+          0
+        end
+      end
+
+      lines.each do |line|
+        line.chomp!
+        search_type = distinct_types.bsearch do |type|
+          if i < 0
+            name = type.name.split(' // ')[0]
+          elsif type.names[i]
+            name = type.names[i].split(' // ')[0]
+          else
+            next
+          end
+
+          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
-            elsif nc < lc
-              flag = false
-              break
-            else
-              # continue
             end
-          else
-            flag = true
-            break
           end
+          flag
         end
-        flag
-      end
-      if search_type
-        a = search_type.name.split(' // ')[0]
-        if line =~ /^#{a}.*$/ and a != 'X'
-          ret << search_type
+        if search_type
+          a = search_type.name.split(' // ')[0]
+          if line =~ /^#{a}.*$/ and a != 'X'
+            ret << search_type
+          end
         end
       end
     end
 
-    ret.sort! do |a,b| a.mana_cost <=> b.mana_cost end
+    ret.sort! do |a,b| a.converted_mana_cost <=> b.converted_mana_cost end
     ret.uniq!
+    ret
   end
 
   def self.get_card_details(deck_items)

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.22
+  version: 0.0.25
 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