pazzdra 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78dcbbe385855316542f47e90b7f5d6a3fef4210
-  data.tar.gz: 9d77a1cc9bfdbe88176a6ba696a01909ac09e614
+  metadata.gz: 531645b9c5280006fd686524c268a2464a5ceeb0
+  data.tar.gz: cd1d8fc3307e5634328b672da048d2684727e17b
 SHA512:
-  metadata.gz: d43622f0b752a2e15f48c47b383d63d948547a41019ce5db37b9dabc94b553f29ee1bc42a4d649cf17bc72ed8508b77a12ef232a3d88949b8b3b6c85d960bd42
-  data.tar.gz: add24662f01d7a8182a2401ade876f189aa8d4071a2e401b65ad13f4e657a79335e176e64016886b8152c3ce66690142ee358661d2ec93bcb38474df73e66cab
+  metadata.gz: b4003ef4416e8f8fcf99e492eb301ac6c40e843b0bd1c8cc589492b59646b26df951146ce992a13cb12abd6ef5908b1054088dda47876e4a011aa9725232f735
+  data.tar.gz: 0c8ff255bc19c02d6cd602975220bfd402d61ada36c524e2025a7ced8c31577a37df91d993268100a1d027f96bbaefa9a371b0d0919bfc4735892c47600aaabe

data/bin/pad_calc

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 #
 # (c)2014 akagi takashi
 #

data/lib/pazzdra/calc.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 module Pazzdra
   class Calc
@@ -51,7 +52,9 @@ module Pazzdra
               @data[:leader], @data[:friend], @data[:skill], combo_up_pct
             next unless val[:sub]
             dragon[:sub] = {}
-            dragon[:sub][val[:sub]] = Calc.cal attack_power_with_all_pct((val[key].to_f / 2).to_i, val[:sub]),
+            attc_pct = 0.3
+            attc_pct = 0.1 if key == val[:sub]
+            dragon[:sub][val[:sub]] = Calc.cal attack_power_with_all_pct((val[key].to_f * attc_pct).to_i, val[:sub]),
               @data[:leader], @data[:friend], @data[:skill], combo_up_pct
           end
           dragons.push(dragon)

data/lib/pazzdra/stamina.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 require 'time'
 

data/lib/pazzdra/version.rb

@@ -1,3 +1,3 @@
 module Pazzdra
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/pazzdra.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pazzdra/version'

data/spec/calc_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 require 'spec_helper'
 require 'pazzdra'
@@ -50,7 +51,7 @@ describe Pazzdra::Calc, "攻撃力計算機能" do
       end
       it "ベースの色指定、コンボ色指定 複数" do
         @calc.merge({ base: [{r: 1000, sub: :r},{b: 1200, sub: :r}], leader: 2.5, combo: {r: [3], g: [3,4,4], b: [3] } })
-        should eq [{r: 5000, sub: {r: 2500}},{b: 6000, sub: {r: 3000}}]
+        should eq [{r: 5000, sub: {r: 500}},{b: 6000, sub: {r: 1800}}]
       end
       it "ベースの色指定、コンボ色指定 攻撃色が複数" do
         @calc.merge({ base: [{r: 1000}], leader: 2.5, combo: {r: [3, 3], g: [3,4], b: [3] } })
@@ -58,15 +59,15 @@ describe Pazzdra::Calc, "攻撃力計算機能" do
       end
       it "ベースの色指定、コンボ色指定 攻撃色が複数、長さ4越え" do
         @calc.merge({ base: [{g: 1200, sub: :g}], leader: 2.5, combo: {r: [3, 3], g: [3,4], b: [3] } })
-        should eq [{g: 13500, sub: {g: 6750}}]
+        should eq [{g: 13500, sub: {g: 1350}}]
       end
       it "ベースの色指定、コンボ色指定 攻撃色が複数、長さ4越え 複数" do
         @calc.merge({ base: [{g: 1200, sub: :g},{y: 1234, sub: :r}], leader: 2.5, friend: 2, skill: 1.5, combo: {r: [3, 3], g: [3,4], b: [3], y: [4, 6] } })
-        should eq [{g: 50625, sub: {g: 25313}},{y: 69413, sub: {r: 23138}}]
+        should eq [{g: 50625, sub: {g: 5063}},{y: 69413, sub: {r: 13875}}]
       end
       it "ベースの色指定、コンボ色指定 攻撃色が複数、長さ4越え 複数、強化ドロップあり" do
         @calc.merge({ base: [{g: 1200, sub: :g},{y: 1234, sub: :r}], leader: 2.5, friend: 2, skill: 1.5, combo: {r: [3, 3], g: [3,4], b: [3], y: [4, 6] }, plus_drop: {g: 4} })
-        should eq [{g: 62775, sub: {g: 31388}},{y: 69413, sub: {r: 23138}}]
+        should eq [{g: 62775, sub: {g: 6278}},{y: 69413, sub: {r: 13875}}]
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require 'rubygems'
 
 #RSpec::Matchers.define :my_matcher do |expected|

data/spec/stamina_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 require 'spec_helper'
 require 'pazzdra'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pazzdra
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - takashi.akagi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,4 +116,3 @@ test_files:
 - spec/calc_spec.rb
 - spec/spec_helper.rb
 - spec/stamina_spec.rb
-has_rdoc: