mgmg 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3f377aff6ac79ec7111b1b81fcfc5148505ca5f57606be79192f832d80d7c92
-  data.tar.gz: 3cca84c8c97b44f18945d1817a921d42b7702f77a61dff4e8836a52f1a9a0f14
+  metadata.gz: dcdae95e0d1ee5dc8d65fe012d739a896b5be27e2a68ff5a2619477461e2e9d7
+  data.tar.gz: 2a2976e6c36a2cd2c3c6bc7c6e829f7e78e2791d18bc087188b369db7ecacb17
 SHA512:
-  metadata.gz: 76db175b332d5c5d69ab12f171b734ceb82d4102151b19ce17e710e4776acaabe5e706f0b830eef251a664ae2d702b92d504af6409441da164dd64be1736a19f
-  data.tar.gz: aa9416fcbaca9dc1d631925c4b5b3eb946196d81aab90748567c3c638adba12bf6474a70f1c815806527afe334cad434d841ce19e22350816df443e4c485fbdc
+  metadata.gz: d40a50cc4cde3a115d7d9f27a93945a27f4b77ece5091917d30cf32675679f6ae52290163168cd5d8c3cf57ded10f29bbb3a6fc803e67d209c35cf8c949f3912
+  data.tar.gz: 27f15eef233a9f19a92bca31d4b4683e78fb1207768fd7b8cbc7cc2aab8d6d79c23ac3db93237a0e8b508dfaa4f50da745f001de50ce74bf5d34824ee3909dc6

data/CHANGELOG.md

@@ -152,3 +152,7 @@
 - 一部のメソッドで計算結果をキャッシュすることで，同じ材料装備を含む大量のレシピを計算する場合に高速化された．
 	- `Mgmg.#clear_cache`ですべてのキャッシュをクリアできる．
 - 一部のオプションのデフォルト値をグローバルに変更するための定数ハッシュ`Mgmg::Option::Defaults`を追加．
+
+## 1.5.5 2022/07/02
+- `Enumerable#to_recipe`が動かなくなったバグを修正．
+- `String#min_level`において，正しい答えを返さなくなったバグを修正．

data/lib/mgmg/equip.rb

@@ -309,7 +309,8 @@ module Mgmg
 			
 			def min_level(str, weight=1)
 				str = Mgmg.check_string(str)
-				return CacheML[str] if CacheML.has_key?(str)
+				key = [str.dup.freeze, weight].freeze
+				return CacheML[key] if CacheML.has_key?(key)
 				unless m = /\A(.+)\((.+\d+),?(.+\d+)\)\Z/.match(str)
 					raise InvalidSmithError.new(str)
 				end
@@ -320,7 +321,7 @@ module Mgmg
 				q, r = ((weight+1)*10000).divmod(MainWeight[main_m])
 				l = ( EquipWeight[kind] + SubWeight[sub_m] - q + ( r==0 ? 1 : 0 ) )*2
 				ret = [(main_s-1)*3, (sub_s-1)*3, l].max
-				CacheML.store(str, ret)
+				CacheML.store(key, ret)
 				ret
 			end
 			

data/lib/mgmg/option.rb

@@ -76,7 +76,16 @@ module Mgmg
 			self
 		end
 		def set_default(recipe, force: false)
-			@include_system_equips = false if @include_system_equips && !Mgmg::SystemEquipRegexp.values.any?{|re| re.match(recipe)}
+			if @include_system_equips
+				case recipe
+				when String
+					@include_system_equips = false unless Mgmg::SystemEquipRegexp.values.any?{|re| re.match(recipe)}
+				when Enumerable
+					@include_system_equips = false unless recipe.any?{|str| Mgmg::SystemEquipRegexp.values.any?{|re| re.match(str)}}
+				else
+					raise ArgumentError, 'recipe should be String or Enumerable'
+				end
+			end
 			update_sa_min(recipe, force)
 			@comp_min = recipe.min_comp(opt: self) if force || @comp_min.nil?
 			@irep = recipe.ir(opt: self) if force || @irep.nil?

data/lib/mgmg/search.rb

@@ -230,13 +230,13 @@ module Mgmg
 		end
 		if a.kind_of?(Recipe)
 			opt_a = a.option.dup
-			a = a.recipe
+			a = a.recipe.dup
 		else
 			opt_a = opt_a.dup.set_default(a)
 		end
 		if b.kind_of?(Recipe)
 			opt_b = b.option.dup
-			b = b.recipe
+			b = b.recipe.dup
 		else
 			opt_b = opt_b.dup.set_default(b)
 		end

data/lib/mgmg/version.rb

@@ -1,3 +1,3 @@
 module Mgmg
-	VERSION = "1.5.4"
+	VERSION = "1.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mgmg
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - KAZOON
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
+rubygems_version: 3.3.17
 signing_key:
 specification_version: 4
 summary: Calculate specs of equipments of Megurimeguru, a game produced by Kou.