diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index 3da4e2e10c44b28e88bfb0236878acab48c15de6..a0c5f664cdcef8d05081b11dee9488e502eb263e 100644 (file)
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.math.Intersector;
+import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.utils.TimeUtils;
import com.google.common.collect.Range;
import ru.deadsoftware.cavedroid.MainConfig;
if (checkSwim()) {
mPlayer.swim = true;
} else if (mPlayer.canJump()) {
- mPlayer.getVelocity().add(0, -180);
+ mPlayer.jump();
} else if (!mPlayer.isFlyMode() && mPlayer.gameMode == 1) {
mPlayer.setFlyMode(true);
mPlayer.getVelocity().y = 0;
} else if (mPlayer.isFlyMode()) {
- mPlayer.getVelocity().y = -GamePhysics.PL_SPEED;
+ mPlayer.getVelocity().y = -mPlayer.getSpeed();
}
}
if (mControlMode == ControlMode.WALK || !mMainConfig.isTouch()) {
switch (keycode) {
case Input.Keys.A:
- mPlayer.getVelocity().x = -GamePhysics.PL_SPEED;
+ mPlayer.getVelocity().x = -mPlayer.getSpeed();
mPlayer.setDir(Mob.Direction.LEFT);
if (mMainConfig.isTouch() && checkSwim()) {
mPlayer.swim = true;
}
break;
case Input.Keys.D:
- mPlayer.getVelocity().x = GamePhysics.PL_SPEED;
+ mPlayer.getVelocity().x = mPlayer.getSpeed();
mPlayer.setDir(Mob.Direction.RIGHT);
if (mMainConfig.isTouch() && checkSwim()) {
mPlayer.swim = true;
break;
case Input.Keys.S:
case Input.Keys.CONTROL_LEFT:
- mPlayer.getVelocity().y = GamePhysics.PL_SPEED;
+ mPlayer.getVelocity().y = mPlayer.getSpeed();
break;
}
} else {
Gdx.graphics.getWidth()) + gameRenderer.getCamX());
mCurX = tmpX / 16;
- mCurY = (int) (Gdx.input.getY() * (mMainConfig.getHeight() /
- Gdx.graphics.getHeight()) + gameRenderer.getCamY()) / 16;
+ final int tmpY = (int) (Gdx.input.getY() * (mMainConfig.getHeight() /
+ Gdx.graphics.getHeight()) + gameRenderer.getCamY());
+ mCurY = tmpY / 16;
+
if (tmpX < 0) {
mCurX--;
}
+
+ final double a = tmpX - mPlayer.x;
+ final double b = tmpY - mPlayer.y;
+
+ mPlayer.headRotation = (float) Math.atan(b / a) * MathUtils.radDeg;
}
if (pastX != mCurX || pastY != mCurY) {
}
}
+ private void hitMobs() {
+ final Player player = mMobsController.getPlayer();
+ mMobsController.forEach((mob) -> {
+ if (Intersector.overlaps(mob, player)) {
+ mob.damage(5);
+ mob.jump();
+ }
+ });
+ }
+
private void pressLMB() {
- if (mMainConfig.checkGameUiWindow(GameUiWindow.NONE) &&
- ((mGameWorld.hasForeAt(mCurX, mCurY) && mGameWorld.getForeMapBlock(mCurX, mCurY).getHp() >= 0) ||
- (!mGameWorld.hasForeAt(mCurX, mCurY) && mGameWorld.hasBackAt(mCurX, mCurY) &&
- mGameWorld.getBackMapBlock(mCurX, mCurY).getHp() >= 0))) {
- if (mPlayer.gameMode == 0) {
- mBlockDamage++;
- if (mGameWorld.hasForeAt(mCurX, mCurY)) {
- if (mBlockDamage >= mGameWorld.getForeMapBlock(mCurX, mCurY).getHp()) {
- mGameWorld.destroyForeMap(mCurX, mCurY);
- mBlockDamage = 0;
+ if (mMainConfig.checkGameUiWindow(GameUiWindow.NONE)) {
+ mPlayer.startHitting();
+
+ if ((mGameWorld.hasForeAt(mCurX, mCurY) && mGameWorld.getForeMapBlock(mCurX, mCurY).getHp() >= 0) ||
+ (!mGameWorld.hasForeAt(mCurX, mCurY) && mGameWorld.hasBackAt(mCurX, mCurY) &&
+ mGameWorld.getBackMapBlock(mCurX, mCurY).getHp() >= 0)) {
+ if (mPlayer.gameMode == 0) {
+ mBlockDamage++;
+ if (mGameWorld.hasForeAt(mCurX, mCurY)) {
+ if (mBlockDamage >= mGameWorld.getForeMapBlock(mCurX, mCurY).getHp()) {
+ mGameWorld.destroyForeMap(mCurX, mCurY);
+ mBlockDamage = 0;
+ }
+ } else if (mGameWorld.hasBackAt(mCurX, mCurY)) {
+ if (mBlockDamage >= mGameWorld.getBackMapBlock(mCurX, mCurY).getHp()) {
+ mGameWorld.destroyBackMap(mCurX, mCurY);
+ mBlockDamage = 0;
+ }
}
- } else if (mGameWorld.hasBackAt(mCurX, mCurY)) {
- if (mBlockDamage >= mGameWorld.getBackMapBlock(mCurX, mCurY).getHp()) {
- mGameWorld.destroyBackMap(mCurX, mCurY);
- mBlockDamage = 0;
+ } else {
+ if (mGameWorld.hasForeAt(mCurX, mCurY)) {
+ mGameWorld.placeToForeground(mCurX, mCurY, 0);
+ } else if (mGameWorld.hasBackAt(mCurX, mCurY)) {
+ mGameWorld.placeToBackground(mCurX, mCurY, 0);
}
+ mTouchedDown = false;
}
} else {
- if (mGameWorld.hasForeAt(mCurX, mCurY)) {
- mGameWorld.placeToForeground(mCurX, mCurY, 0);
- } else if (mGameWorld.hasBackAt(mCurX, mCurY)) {
- mGameWorld.placeToBackground(mCurX, mCurY, 0);
- }
+ hitMobs();
mTouchedDown = false;
}
}
}
public void touchDragged(float screenX, float screenY) {
+ if (Math.abs(screenX - mTouchDownX) < 16 && Math.abs(screenY - mTouchDownY) < 16) {
+ return;
+ }
+
mDragging = true;
if (mMainConfig.checkGameUiWindow(GameUiWindow.CREATIVE_INVENTORY) && Math.abs(screenY - mTouchDownY) > 16) {
if (insideCreativeInv(screenX, screenY)) {
void update() {
if (mTouchedDown && mTouchDownBtn == Input.Buttons.LEFT) {
pressLMB();
+ } else {
+ mPlayer.stopHitting();
}
if (mTouchedDown && TimeUtils.timeSinceMillis(mTouchDownTime) > 500) {
holdMB();