From 43cb1b8326102aaa78033320d4ffbf1eba9dfb63 Mon Sep 17 00:00:00 2001
From: nagoling <>
Date: Tue, 31 Dec 2013 20:55:50 +0900
Subject: [PATCH] update

---
 lib/FormSprite.js | 73 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 59 insertions(+), 14 deletions(-)

diff --git a/lib/FormSprite.js b/lib/FormSprite.js
index 92c81e0..968fe3b 100644
--- a/lib/FormSprite.js
+++ b/lib/FormSprite.js
@@ -15,7 +15,14 @@ var FormSprite = enchant.Class.create({
 		App.backgroundMap.addChild(sprite);
 	},
 	addYukkuri: function(formSprite){
-		this.formSpriteArray[] = formSprite;
+		var addIndex = function (){
+			var i = 0;
+			return function(){
+				return i++;
+			};
+		}();
+		var index = addIndex();
+		this.formSpriteArray[index] = formSprite;
 	},
 	// addChildAll:function(){
 	// 	for(var i=0;i<this.spriteArray.length;i++){
@@ -65,15 +72,63 @@ var FormSprite = enchant.Class.create({
 			spr.y += y;
 		}
 	},
+	/**
+	x
+	attr: targetTypes 許可するtypeを配列で指定する
+	*/
+	addXAttr: function(x, attr){
+		for(var i=0;i<this.spriteArray.length;i++){
+			if(this.spriteArray[i] === undefined)continue;
+			var spr = this.spriteArray[i];
+			if(!attr || attr.targetTypes.indexOf(spr.type) >= 0){
+				spr.x += x;
+			}
+		}
+	},
 	addYAttr: function(y, attr){
 		for(var i=0;i<this.spriteArray.length;i++){
 			if(this.spriteArray[i] === undefined)continue;
 			var spr = this.spriteArray[i];
-			if(!attr || attr.targetType.indexOf(spr.type) >= 0){
+			if(!attr || attr.targetTypes.indexOf(spr.type) >= 0){
 				spr.y += y;
 			}
 		}
 	},
+	setXAttr: function(x, attr){
+		for(var i=0;i<this.spriteArray.length;i++){
+			if(this.spriteArray[i] === undefined)continue;
+			var spr = this.spriteArray[i];
+			if(!attr || attr.targetTypes.indexOf(spr.type) >= 0){
+				spr.x = x;
+			}
+		}
+	},
+	setYAttr: function(y, attr){
+		for(var i=0;i<this.spriteArray.length;i++){
+			if(this.spriteArray[i] === undefined)continue;
+			var spr = this.spriteArray[i];
+			if(!attr || attr.targetTypes.indexOf(spr.type) >= 0){
+				spr.y = y;
+			}
+		}
+	},
+	calcField: function(field, value, attr){
+		for(var i=0;i<this.spriteArray.length;i++){
+			if(this.spriteArray[i] === undefined)continue;
+			var spr = this.spriteArray[i];
+			if(!attr || attr.types.indexOf(spr.type) >= 0){
+				if(attr.calc == "equal"){
+					spr[field] = value;
+				}
+				else if(attr.calc == "add"){
+					spr[field] -= value;
+				}
+				else{
+					spr[field] = value;
+				}
+			}
+		}
+	},
 	getMainSprite: function(){
 		return this.spriteArray[this.mainIndex];
 	},
@@ -121,20 +176,10 @@ var FormSprite = enchant.Class.create({
 		this.spriteArray[index].x = this.spriteArray[this.mainIndex].x;
 	},
 	setFixKukiLeft: function (){
-		for(var i=0;i<this.spriteArray.length;i++){
-			if(this.spriteArray[i] === undefined)continue;
-			var spr = this.spriteArray[i];
-			if(spr.type != "kuki")continue;
-			spr.x = this.getMainSprite().x - 30;
-		}
+		this.calcField("x", this.getMainSprite().x - 30, {types:["kuki"],calc:"equal"});
 	},
 	setFixKukiRight: function (){
-		for(var i=0;i<this.spriteArray.length;i++){
-			if(this.spriteArray[i] === undefined)continue;
-			var spr = this.spriteArray[i];
-			if(spr.type != "kuki")continue;
-			spr.x = this.getMainSprite().x + 30;
-		}
+		this.calcField("x", this.getMainSprite().x + 30, {types:["kuki"],calc:"equal"});
 	},
 	formScaleX: function(x){
 		for(var i=0;i<this.spriteArray.length;i++){
-- 
2.11.0