diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index e26b06bad903c54c3bbc2dcc4cefec8887a0749d..32826528c62ba6ed0ce38772a5b44a45ff965f13 100644 (file)
import com.badlogic.gdx.utils.TimeUtils;
import com.google.common.collect.Range;
import ru.deadsoftware.cavedroid.MainConfig;
-import ru.deadsoftware.cavedroid.game.actions.PlaceBlockActionUtilsKt;
+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.objects.Item;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
import ru.deadsoftware.cavedroid.misc.Assets;
import ru.deadsoftware.cavedroid.misc.ControlMode;
-import javax.annotation.CheckForNull;
import javax.inject.Inject;
import java.util.Map;
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;
GameWorld gameWorld,
DropController dropController,
MobsController mobsController,
- Map<String, IUseItemAction> useItemActionMap) {
+ 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() {
if (id > 0) {
final Item item = getItem(id);
- @CheckForNull final String actionKey = item.getActionKey();
- if (item.isBlock()) {
+
+ if (item instanceof Item.Placeable) {
if (!bg) {
- PlaceBlockActionUtilsKt.placeToForegroundAction(mUseItemActionMap, item, x, y);
+ CommonBlockActionUtilsKt.placeToForegroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
} else {
- PlaceBlockActionUtilsKt.placeToBackgroundAction(mUseItemActionMap, item, x, y);
+ CommonBlockActionUtilsKt.placeToBackgroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
}
- } else if (actionKey != null) {
+ } 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, x, y);
+ useItemAction.perform((Item.Usable) item, x, y);
} else {
- Gdx.app.error(TAG, "use item action " + actionKey + "not found");
+ Gdx.app.error(TAG, "use item action " + actionKey + " not found");
}
}
}
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;
}
break;
case Input.Keys.G:
- mMobsController.addMob(new Pig(mCurX * 16, mCurY * 16));
- break;
-
- case Input.Keys.Q:
- mGameWorld.placeToForeground(mCurX, mCurY, 8);
+ final Mob pig = new Pig(mCurX * 16, mCurY * 16);
+ pig.attachToController(mMobsController);
break;
case Input.Keys.GRAVE: