From: ttwilb <ttwilb@users.sourceforge.jp>
Date: Mon, 2 Sep 2013 07:15:42 +0000 (+0900)
Subject: 左上での武器選択が実際の武器の攻撃能力に反映されるように。
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0e5ba1a51dd6dd21383265a6e2cdabb8cd491f1e;p=h58pcdgame%2FGameScriptCoreLibrary.git

左上での武器選択が実際の武器の攻撃能力に反映されるように。
---

diff --git a/www/corelib/classes/BreadItemWidgetClass.js b/www/corelib/classes/BreadItemWidgetClass.js
index a1e4195..4eced62 100644
--- a/www/corelib/classes/BreadItemWidgetClass.js
+++ b/www/corelib/classes/BreadItemWidgetClass.js
@@ -16,6 +16,8 @@ var BreadItemWidgetClass = function(manager, args)
 	this.selectedIndex = -1;	//Selected Bread
 	this.elementList = [];
 	
+	manager.breadItemWidget = this;
+	
 }.extend(WidgetClass, {
 	generateBreadImage: function(score){
 		if(score <= 0)
diff --git a/www/corelib/classes/CharacterClass.js b/www/corelib/classes/CharacterClass.js
index c41ffa0..faf07e5 100644
--- a/www/corelib/classes/CharacterClass.js
+++ b/www/corelib/classes/CharacterClass.js
@@ -101,8 +101,17 @@ var CharacterClass = function(ownerStage, args)
 	{
 		if(this.lastFireTick < this.ownerStage.manager.tickCount - this.fireTickInterval){
 			var f = new FireObjectClass(this.ownerStage, [["breadball1.png","breadball2.png","breadball3.png"]]);
-			f.fire(this);
-			this.lastFireTick = this.ownerStage.manager.tickCount;
+			if(manager.breadItemWidget)
+			{
+				var score = manager.breadItemWidget.getLastSelectedBreadIndex();
+				if(score != -1)
+				{
+					if(score > 50) score = 50;
+					this.touchDamage *= (score / 50);
+					f.fire(this);
+					this.lastFireTick = this.ownerStage.manager.tickCount;
+				}
+			}
 		}
 	}