diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index 291311a68077622850ed90b533622ccf30ab6557..32826528c62ba6ed0ce38772a5b44a45ff965f13 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;
+import ru.deadsoftware.cavedroid.game.actions.CommonBlockActionUtilsKt;
+import ru.deadsoftware.cavedroid.game.actions.placeblock.IPlaceBlockAction;
+import ru.deadsoftware.cavedroid.game.actions.useitem.IUseItemAction;
import ru.deadsoftware.cavedroid.game.mobs.Mob;
import ru.deadsoftware.cavedroid.game.mobs.MobsController;
import ru.deadsoftware.cavedroid.game.mobs.Pig;
import ru.deadsoftware.cavedroid.game.mobs.Player;
+import ru.deadsoftware.cavedroid.game.model.item.Item;
import ru.deadsoftware.cavedroid.game.objects.DropController;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
import ru.deadsoftware.cavedroid.misc.Assets;
import javax.inject.Inject;
+import java.util.Map;
+
import static ru.deadsoftware.cavedroid.game.GameItems.*;
@GameScope
public class GameInput {
+ private static final String TAG = "GameInput";
+
private final MainConfig mMainConfig;
private final GameWorld mGameWorld;
private final DropController mDropController;
private final MobsController mMobsController;
+ private final GameItemsHolder mGameItemsHolder;
+ private final Map<String, IUseItemAction> mUseItemActionMap;
+ private final Map<String, IPlaceBlockAction> mPlaceBlockActionMap;
+
private final Player mPlayer;
private ControlMode mControlMode;
public GameInput(MainConfig mainConfig,
GameWorld gameWorld,
DropController dropController,
- MobsController mobsController) {
+ MobsController mobsController,
+ GameItemsHolder gameItemsHolder,
+ Map<String, IUseItemAction> useItemActionMap,
+ Map<String, IPlaceBlockAction> placeBlockActionMap) {
mMainConfig = mainConfig;
mGameWorld = gameWorld;
mDropController = dropController;
mMobsController = mobsController;
+ mGameItemsHolder = gameItemsHolder;
+ mUseItemActionMap = useItemActionMap;
+ mPlaceBlockActionMap = placeBlockActionMap;
mPlayer = mMobsController.getPlayer();
}
private boolean checkSwim() {
- return GameItems.isFluid(mGameWorld.getForeMap(mPlayer.getMapX(), mPlayer.getLowerMapY()));
+ return mGameWorld.getForeMap(mPlayer.getMapX(), mPlayer.getLowerMapY()).isFluid();
}
private void goUpwards() {
}
private boolean isNotAutoselectable(int x, int y) {
- return (!mGameWorld.hasForeAt(x, y) || !mGameWorld.getForeMapBlock(x, y).hasCollision());
+ return (!mGameWorld.hasForeAt(x, y) || !mGameWorld.getForeMap(x, y).hasCollision());
}
private void checkCursorBounds() {
}
private void useItem(int x, int y, int id, boolean bg) {
- String key = getItem(id).isBlock() ? getBlockKey(id) : getItemKey(id);
+ mPlayer.startHitting();
+
if (id > 0) {
- if (getItem(id).isBlock()) {
+ final Item item = getItem(id);
+
+ if (item instanceof Item.Placeable) {
if (!bg) {
- mGameWorld.placeToForeground(x, y, getBlockIdByItemId(id));
+ CommonBlockActionUtilsKt.placeToForegroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
} else {
- mGameWorld.placeToBackground(x, y, getBlockIdByItemId(id));
+ CommonBlockActionUtilsKt.placeToBackgroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
}
- } else {
- switch (key) {
- case "bucket_water":
- mGameWorld.placeToForeground(x, y, getBlockId("water"));
- mPlayer.inventory[mPlayer.slot] = getItemId("bucket_empty");
- break;
- case "bucket_lava":
- mGameWorld.placeToForeground(x, y, getBlockId("lava"));
- mPlayer.inventory[mPlayer.slot] = getItemId("bucket_empty");
- break;
+ } else if (item instanceof Item.Usable) {
+ final String actionKey = ((Item.Usable)item).getUseActionKey();
+ final IUseItemAction useItemAction = mUseItemActionMap.get(actionKey);
+
+ if (useItemAction != null) {
+ useItemAction.perform((Item.Usable) item, x, y);
+ } else {
+ Gdx.app.error(TAG, "use item action " + actionKey + " not found");
}
}
}
}
+ private void hitMobs() {
+ final Player player = mMobsController.getPlayer();
+ mMobsController.getMobs().forEach((mob) -> {
+ if (Intersector.overlaps(mob, player)) {
+ mob.damage(5);
+ mob.jump();
+ }
+ });
+ }
+
private void pressLMB() {
if (mMainConfig.checkGameUiWindow(GameUiWindow.NONE)) {
mPlayer.startHitting();
- if ((mGameWorld.hasForeAt(mCurX, mCurY) && mGameWorld.getForeMapBlock(mCurX, mCurY).getHp() >= 0) ||
+ if ((mGameWorld.hasForeAt(mCurX, mCurY) && mGameWorld.getForeMap(mCurX, mCurY).getHp() >= 0) ||
(!mGameWorld.hasForeAt(mCurX, mCurY) && mGameWorld.hasBackAt(mCurX, mCurY) &&
- mGameWorld.getBackMapBlock(mCurX, mCurY).getHp() >= 0)) {
+ mGameWorld.getBackMap(mCurX, mCurY).getHp() >= 0)) {
if (mPlayer.gameMode == 0) {
mBlockDamage++;
if (mGameWorld.hasForeAt(mCurX, mCurY)) {
- if (mBlockDamage >= mGameWorld.getForeMapBlock(mCurX, mCurY).getHp()) {
+ if (mBlockDamage >= mGameWorld.getForeMap(mCurX, mCurY).getHp()) {
mGameWorld.destroyForeMap(mCurX, mCurY);
mBlockDamage = 0;
}
} else if (mGameWorld.hasBackAt(mCurX, mCurY)) {
- if (mBlockDamage >= mGameWorld.getBackMapBlock(mCurX, mCurY).getHp()) {
+ if (mBlockDamage >= mGameWorld.getBackMap(mCurX, mCurY).getHp()) {
mGameWorld.destroyBackMap(mCurX, mCurY);
mBlockDamage = 0;
}
}
} else {
if (mGameWorld.hasForeAt(mCurX, mCurY)) {
- mGameWorld.placeToForeground(mCurX, mCurY, 0);
+ mGameWorld.placeToForeground(mCurX, mCurY, mGameItemsHolder.getFallbackBlock());
} else if (mGameWorld.hasBackAt(mCurX, mCurY)) {
- mGameWorld.placeToBackground(mCurX, mCurY, 0);
+ mGameWorld.placeToBackground(mCurX, mCurY, mGameItemsHolder.getFallbackBlock());
}
mTouchedDown = false;
}
} else {
+ hitMobs();
mTouchedDown = false;
}
}
break;
case Input.Keys.G:
- mMobsController.addMob(Pig.class, mCurX * 16, mCurY * 16);
+ final Mob pig = new Pig(mCurX * 16, mCurY * 16);
+ pig.attachToController(mMobsController);
break;
- case Input.Keys.Q:
- mGameWorld.placeToForeground(mCurX, mCurY, 8);
+ case Input.Keys.GRAVE:
+ mMobsController.getPlayer().gameMode = (mMobsController.getPlayer().gameMode + 1) % 2;
break;
case Input.Keys.ESCAPE:
}
void update() {
- if (mTouchedDown && mTouchDownBtn == Input.Buttons.LEFT) {
- pressLMB();
- } else {
+ if (!mTouchedDown) {
mPlayer.stopHitting();
+ return;
}
+
+ if (mTouchDownBtn == Input.Buttons.LEFT) {
+ pressLMB();
+ }
+
if (mTouchedDown && TimeUtils.timeSinceMillis(mTouchDownTime) > 500) {
holdMB();
}