pazzdra 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee37f8e348768d484e8efe3a60ad129238d0ca1
-  data.tar.gz: e95b48015bd88f71560a5bafde86836264205164
+  metadata.gz: 78dcbbe385855316542f47e90b7f5d6a3fef4210
+  data.tar.gz: 9d77a1cc9bfdbe88176a6ba696a01909ac09e614
 SHA512:
-  metadata.gz: 25a8bb9c66ee65473f17a20da653093708e0a1eb22278c284758dd32c72bfa4d31d6fc7735a9540d56e2ebd80c970cfe2d0436cd8f29427e6ad514f740871ffe
-  data.tar.gz: 63b64c4cc1da8c871fe4194ef6a3140b2a04c4b08721092fdbc401455594fdcea40bc7bd8280891b9a63d44f86abf623b14646c76f9bae6ab5358e1234fd3a56
+  metadata.gz: d43622f0b752a2e15f48c47b383d63d948547a41019ce5db37b9dabc94b553f29ee1bc42a4d649cf17bc72ed8508b77a12ef232a3d88949b8b3b6c85d960bd42
+  data.tar.gz: add24662f01d7a8182a2401ade876f189aa8d4071a2e401b65ad13f4e657a79335e176e64016886b8152c3ce66690142ee358661d2ec93bcb38474df73e66cab

data/bin/pad_calc

@@ -25,6 +25,7 @@ EOS
   private
   def init
     @base = Pazzdra::Calc.new
+    @stamina_base = Pazzdra::Stamina.new
   end
 
   Pazzdra::Calc.DEFAULT_BASE.keys.each do |key|
@@ -61,6 +62,14 @@ EOS
     end
   end
 
+  def stamina_base(val)
+    @stamina_base.base_stamina = val
+  end
+
+  def stamina(val=nil)
+    @stamina_base.stamina val
+  end
+
   def show
     @base.show
   end

data/lib/pazzdra/stamina.rb

@@ -0,0 +1,41 @@
+
+require 'time'
+
+module Pazzdra
+  class Stamina
+    class << Stamina
+      def cal(target_time=nil, base_stamina=0)
+        target_time ||= Time.now + (60 * 60 * 8)
+        (base_stamina + (target_time - Time.now) / 60 / 10).to_i
+      end
+      def cal_time(target_stamina, base_stamina=0)
+        Time.now + (60 * 10 * (target_stamina - base_stamina))
+      end
+    end
+
+    attr_accessor :target_time
+    attr_accessor :base_stamina
+
+    def initialize
+      @target_time = Time.now + (60 * 60 * 8)
+      @base_stamina = 0
+    end
+
+    def stamina(val=nil)
+      case val
+      when Numeric, NilClass
+        stamina_time val
+      when String
+        stamina_val val
+      end
+    end
+
+    def stamina_time(val=0)
+      Stamina.cal_time val, @base_stamina
+    end
+
+    def stamina_val(val)
+      Stamina.cal Time.parse(val), @base_stamina
+    end
+  end
+end

data/lib/pazzdra/version.rb

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

data/lib/pazzdra.rb

@@ -1,4 +1,5 @@
 require "pazzdra/version"
+require "pazzdra/stamina"
 require "pazzdra/calc"
 
 module Pazzdra

data/spec/calc_spec.rb

@@ -0,0 +1,74 @@
+
+require 'spec_helper'
+require 'pazzdra'
+
+describe Pazzdra::Calc, "攻撃力計算機能" do
+  context 'クラスから使用する場合' do
+    it "基本の攻撃力のみ" do
+      expect(Pazzdra::Calc.cal(1010)).to eq(1010)
+    end
+
+    it "リーダー x フレンド x エンハンス" do
+      expect(Pazzdra::Calc.cal(1010,3.5)).to eq(3535)
+      expect(Pazzdra::Calc.cal(810,2.5,3.5)).to eq(7088)
+      expect(Pazzdra::Calc.cal(1234,2.5,2,1.5)).to eq(9255)
+    end
+
+    it "ドロップ追加" do
+      expect(Pazzdra::Calc.cal(1010,3.5,3.5)).to eq(12373)
+    end
+  end
+
+  context 'インスタンスで使用する場合' do
+    before do
+      @calc = Pazzdra::Calc.new
+    end
+
+    subject{ @calc.cal }
+    context '基本！' do
+      it "リーダーのみ" do
+        @calc.merge({ base: 1000, leader: 1.5 })
+        should eq 1500
+      end
+      it "リーダー x フレンド x エンハンス" do
+        @calc.merge({ base: 1000, leader: 1.5, friend: 2, skill: 3.5 })
+        should eq 10500
+      end
+    end
+    context 'コンボデータ有' do
+      it "ベースの色無し、コンボ数指定" do
+        @calc.merge({ base: 1000, leader: 2.5, combo: 3 })
+        should eq 3750
+      end
+      it "ベースの色無し、コンボ色指定" do
+        @calc.merge({ base: 1000, leader: 2.5, combo: {r: [3], g: [3,4,4], b: [3] } })
+        should eq 5000
+      end
+      it "ベースの色指定、コンボ色指定" do
+        @calc.merge({ base: [{r: 1000}], leader: 2.5, combo: {r: [3], g: [3,4,4], b: [3] } })
+        should eq [{r: 5000}]
+      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}}]
+      end
+      it "ベースの色指定、コンボ色指定 攻撃色が複数" do
+        @calc.merge({ base: [{r: 1000}], leader: 2.5, combo: {r: [3, 3], g: [3,4], b: [3] } })
+        should eq [{r: 10000}]
+      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}}]
+      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}}]
+      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}}]
+      end
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -5,3 +5,7 @@ require 'rubygems'
 #    true
 #  end
 #end
+
+def time_format(time)
+  time.strftime('%Y/%m/%d %H:%M:%S')
+end

data/spec/stamina_spec.rb

@@ -0,0 +1,21 @@
+
+require 'spec_helper'
+require 'pazzdra'
+
+describe Pazzdra::Stamina, "スタミナ回復時間計算機能" do
+  context 'インスタンスで使用する場合' do
+    before do
+      @stamina = Pazzdra::Stamina.new
+    end
+
+    context '基本機能' do
+      it "回復時刻を知る" do
+        time_format(@stamina.stamina(6)).should eq time_format(Time.now + (60 * 60))
+      end
+      it "指定時刻でのスタミナ数" do
+        @stamina.stamina(time_format(Time.now + (60 * 60 * 1))).should eq 5
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pazzdra
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - takashi.akagi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,10 +82,12 @@ files:
 - bin/pad_calc
 - lib/pazzdra.rb
 - lib/pazzdra/calc.rb
+- lib/pazzdra/stamina.rb
 - lib/pazzdra/version.rb
 - pazzdra.gemspec
-- spec/pazzdra_spec.rb
+- spec/calc_spec.rb
 - spec/spec_helper.rb
+- spec/stamina_spec.rb
 homepage: https://github.com/majosystems/pazzdra
 licenses:
 - MIT
@@ -111,6 +113,7 @@ signing_key:
 specification_version: 4
 summary: PAZZRU & DRAGONS calc.
 test_files:
-- spec/pazzdra_spec.rb
+- spec/calc_spec.rb
 - spec/spec_helper.rb
+- spec/stamina_spec.rb
 has_rdoc: 

data/spec/pazzdra_spec.rb

@@ -1,76 +0,0 @@
-
-require 'spec_helper'
-require 'pazzdra'
-
-describe Pazzdra, "パズドラ各種計算アプリ" do
-  describe Pazzdra::Calc, "攻撃力計算機能" do
-    context 'クラスから使用する場合' do
-      it "基本の攻撃力のみ" do
-        expect(Pazzdra::Calc.cal(1010)).to eq(1010)
-      end
-
-      it "リーダー x フレンド x エンハンス" do
-        expect(Pazzdra::Calc.cal(1010,3.5)).to eq(3535)
-        expect(Pazzdra::Calc.cal(810,2.5,3.5)).to eq(7088)
-        expect(Pazzdra::Calc.cal(1234,2.5,2,1.5)).to eq(9255)
-      end
-
-      it "ドロップ追加" do
-        expect(Pazzdra::Calc.cal(1010,3.5,3.5)).to eq(12373)
-      end
-    end
-
-    context 'インスタンスで使用する場合' do
-      before do
-        @calc = Pazzdra::Calc.new
-      end
-
-      subject{ @calc.cal }
-      context '基本！' do
-        it "リーダーのみ" do
-          @calc.merge({ base: 1000, leader: 1.5 })
-          should eq 1500
-        end
-        it "リーダー x フレンド x エンハンス" do
-          @calc.merge({ base: 1000, leader: 1.5, friend: 2, skill: 3.5 })
-          should eq 10500
-        end
-      end
-      context 'コンボデータ有' do
-        it "ベースの色無し、コンボ数指定" do
-          @calc.merge({ base: 1000, leader: 2.5, combo: 3 })
-          should eq 3750
-        end
-        it "ベースの色無し、コンボ色指定" do
-          @calc.merge({ base: 1000, leader: 2.5, combo: {r: [3], g: [3,4,4], b: [3] } })
-          should eq 5000
-        end
-        it "ベースの色指定、コンボ色指定" do
-          @calc.merge({ base: [{r: 1000}], leader: 2.5, combo: {r: [3], g: [3,4,4], b: [3] } })
-          should eq [{r: 5000}]
-        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}}]
-        end
-        it "ベースの色指定、コンボ色指定 攻撃色が複数" do
-          @calc.merge({ base: [{r: 1000}], leader: 2.5, combo: {r: [3, 3], g: [3,4], b: [3] } })
-          should eq [{r: 10000}]
-        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}}]
-        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}}]
-        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}}]
-        end
-      end
-    end
-  end
-end
-