Changeset 103 for pycodeshooter/trunk/shooter

Timestamp:

01/23/11 00:58:06 (14 years ago)

Author:

atzm

Message:

chousei

Location:

pycodeshooter/trunk/shooter

Files:

• action.js (modified) (1 diff)
• trooper.js (modified) (1 diff)

pycodeshooter/trunk/shooter/action.js

@@ -238 +238 @@
                 this.p2[0] * p2 + this.p3[0] * p3,
             this.p0[1] * p0 + this.p1[1] * p1 +
-                this.p2[1] * p2 + this.p3[1] * p3
+                this.p2[1] * p2 + this.p3[1] * p3,
+            3
         );
 

pycodeshooter/trunk/shooter/trooper.js

@@ -88 +88 @@
     this.barrages   = barrages;
 
-    this.move = function(x, y) {
+    this.move = function(x, y, area) {
         this.x += x;
         this.y += y;
-        this.adjustPosition();
-    };
-
-    this.moveAbs = function(x, y) {
+        this.adjustPosition(area);
+    };
+
+    this.moveAbs = function(x, y, area) {
         this.x = x;
         this.y = y;
-        this.adjustPosition();
-    };
-
-    this.adjustPosition = function() {
+        this.adjustPosition(area);
+    };
+
+    this.adjustPosition = function(area) {
+        if (area == null)
+            area = 1;
+
         if (this.x > this.w)
             this.x = this.w;
 
-        if (this.y > this.h)
-            this.y = this.h;
+        if (this.y > this.h / area)
+            this.y = this.h / area;
 
         if (this.x < 0)