X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2Fobjects%2FBlock.java;h=dfd8351dffbd6dc694ee9be42f8263e2c1311d64;hp=4fa47369fd151f2760ea314e58e9eadb2009ec43;hb=bea2a3c5b967bcd90ccd83e08e833d58449e963a;hpb=4617ae53584520a741f45770e17a2a253717f83a

diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java b/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
index 4fa4736..dfd8351 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
@@ -1,29 +1,31 @@
 package ru.deadsoftware.cavecraft.game.objects;
 
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.math.Rectangle;
 
 public class Block {
 
-    private int x,y,w,h;
+    private int x, y, w, h;
     private int texture;
+    private int hp, drop;
 
     public boolean collision, background, transparent;
 
-    public Block(int texture) {
-        this(0,0,16,16,texture, true, false, false);
+    public Block(int texture, int hp, int drop) {
+        this(0, 0, 16, 16, texture, hp, drop, true, false, false);
     }
 
-    public Block(int texture, boolean collision, boolean background, boolean transparent) {
-        this(0,0,16,16,texture, collision, background, transparent);
+    public Block(int texture, int hp, int drop, boolean collision, boolean background, boolean transparent) {
+        this(0, 0, 16, 16, texture, hp, drop, collision, background, transparent);
     }
 
-    public Block(int x, int y, int w, int h, int texture, boolean collision, boolean background, boolean transparent) {
+    public Block(int x, int y, int w, int h, int texture, int hp, int drop, boolean collision, boolean background, boolean transparent) {
         this.x = x;
         this.y = y;
         this.w = w;
         this.h = h;
         this.texture = texture;
+        this.hp = hp;
+        this.drop = drop;
         this.collision = collision;
         this.background = background;
         this.transparent = transparent;
@@ -33,10 +35,22 @@ public class Block {
         return texture;
     }
 
+    public int getHp() {
+        return hp;
+    }
+
+    public int getDrop() {
+        return drop;
+    }
+
     public Rectangle getRect(int x, int y) {
-        x*=16;
-        y*=16;
-        return new Rectangle(x+this.x, y+this.y, w, h);
+        x *= 16;
+        y *= 16;
+        return new Rectangle(x + this.x, y + this.y, w, h);
+    }
+
+    public boolean toJump() {
+        return (y < 8 && collision);
     }
 
 }