Commit f5c9e422 authored by Vitaliy Vashchenko's avatar Vitaliy Vashchenko

Merge branch 'V3.7' into feature-protocol-bonus

parents 1bbd3158 a6146fa0
......@@ -43,6 +43,8 @@ import cz.nic.tablexia.util.Point;
public class SafeMechanicsHard extends AbstractMechanics {
private static final int SAFE_POINTER_WIDTH = 50;
private static final int SAFE_POINTER_HEIGHT = 250;
private static final int SAFE_PEAK_WIDTH = 398;
private static final int SAFE_PEAK_HEIGHT = 565;
private static final int SAFE_LIGHT_SIZE = 50;
private static final int SAFE_LIGHT_OFFSET = 20;
private static final int MIN_POINTER_Y = 130;
......@@ -58,6 +60,7 @@ public class SafeMechanicsHard extends AbstractMechanics {
@Override
void prepare(SafeGame safeGame, SafeSequence safeSequence) {
Image safePeak = new Image(safeGame.getScreenTextureRegion(SafeAssets.PEAK));
safePeak.setSize(SAFE_PEAK_WIDTH, SAFE_PEAK_HEIGHT);
safePeak.setPosition(getWidth() / 2 - safePeak.getWidth() / 2, safeGame.getSceneOuterBottomY());
addActor(safePeak);
......
......@@ -116,7 +116,7 @@ public class SafeAssets {
public static final String MEDIUM_HARD_LIGHT4_GREY = GFX_PATH + LIGHTS + "4grey";
//======== SAFE BONUS =============
public static final String KNIFE = GFX_PATH + BONUS + "knife";
public static final String TWEEZERS = GFX_PATH + BONUS + "tweezers";
public static final String BOOM = GFX_PATH + BONUS + "boom";
public static final String BONUS_BACKGROUND = GFX_PATH + BONUS + "background";
......
......@@ -41,6 +41,9 @@ import cz.nic.tablexia.screen.AbstractTablexiaScreen;
*/
public class BonusCableGroup extends Group {
public static final int TWEEZERS_WIDTH = 284;
public static final int TWEEZERS_HEIGHT = 179;
private Image finalSocket;
private SafeGame safeGame;
private SafeLightImage lightImage;
......@@ -115,15 +118,16 @@ public class BonusCableGroup extends Group {
}
public void cut(SequenceAction sa) {
Image knife = new Image(safeGame.getScreenTextureRegion(SafeAssets.KNIFE));
float knifeXPos = cable.getX() + (cable.getWidth()/2) -knife.getWidth()/2 + 30;
float knifeYPos = cable.getY() + cable.getHeight()/2;
knife.setPosition(knifeXPos, knifeYPos);
addActor(knife);
Image tweezers = new Image(safeGame.getScreenTextureRegion(SafeAssets.TWEEZERS));
tweezers.setSize(TWEEZERS_WIDTH, TWEEZERS_HEIGHT);
float tweezersXPos = cable.getX() + cable.getWidth();
float tweezersYPos = cable.getY() - tweezers.getHeight()/2 + 20;
tweezers.setPosition(tweezersXPos, tweezersYPos);
addActor(tweezers);
sa.addAction(Actions.sequence(Actions.run(new Runnable() {
@Override
public void run() {
knife.addAction(Actions.moveTo(knifeXPos, knifeYPos - knife.getHeight() - 20, 1f));
tweezers.addAction(Actions.moveTo(tweezersXPos - cable.getWidth()/2, tweezersYPos, 1f));
}
}), Actions.delay(1f),Actions.run(new Runnable() {
@Override
......
......@@ -19,6 +19,7 @@
package cz.nic.tablexia.game.games.safe.gameobject;
import cz.nic.tablexia.TablexiaSettings;
import cz.nic.tablexia.game.games.safe.assets.SafeAssets;
public enum BonusCableTypeDefinition {
......@@ -68,7 +69,8 @@ public enum BonusCableTypeDefinition {
}
public float getSocketPercentReduction() {
return socketPercentReduction;
if (TablexiaSettings.getInstance().isUseHdAssets()) return socketPercentReduction;
return 2*socketPercentReduction;
}
public String getFinalSocket() {
......@@ -76,7 +78,8 @@ public enum BonusCableTypeDefinition {
}
public float getFinalSocketPercentReduction() {
return finalSocketPercentReduction;
if (TablexiaSettings.getInstance().isUseHdAssets()) return finalSocketPercentReduction;
return 2*finalSocketPercentReduction;
}
public String getCable() {
......
......@@ -111,70 +111,70 @@ public class TrophyHelper {
trophiesProperties.put(GameTrophyDefinition.ROBBERY_PLAY3, new Trio<Float, Float, Float>(2.15f, 0.6f, 1f));// robbery_10_finished,15
trophiesProperties.put(GameTrophyDefinition.ROBBERY_DIFF1, new Trio<Float, Float, Float>(2.25f, 0.2f, 1f));// robbery_1_limit,16
trophiesProperties.put(GameTrophyDefinition.ROBBERY_DIFF2, new Trio<Float, Float, Float>(2.65f, 0.2f, 1f));// robbery_2_limit,19
trophiesProperties.put(GameTrophyDefinition.ROBBERY_BONUS, new Trio<Float, Float, Float>(8.3f, 0.275f, 0.3f));// robbery_bonus_finished,59
trophiesProperties.put(GameTrophyDefinition.ROBBERY_BONUS, new Trio<Float, Float, Float>(8.3f, 0.275f, 0.6f));// robbery_bonus_finished,59
trophiesProperties.put(GameTrophyDefinition.PURSUIT_PLAY1, new Trio<Float, Float, Float>(1.51f, 0.62f, 1f));// pursuit_1_finished,9
trophiesProperties.put(GameTrophyDefinition.PURSUIT_PLAY2, new Trio<Float, Float, Float>(1.35f, 0.55f, 1f));// pursuit_5_finished,7
trophiesProperties.put(GameTrophyDefinition.PURSUIT_PLAY3, new Trio<Float, Float, Float>(1.51f, 0.33f, 1f));// pursuit_10_finished,10
trophiesProperties.put(GameTrophyDefinition.PURSUIT_DIFF1, new Trio<Float, Float, Float>(1.74f, 0.68f, 1f));// pursuit_1_limit,11
trophiesProperties.put(GameTrophyDefinition.PURSUIT_DIFF2, new Trio<Float, Float, Float>(1.81f, 0.39f, 1f));// pursuit_2_limit,12
trophiesProperties.put(GameTrophyDefinition.PURSUIT_BONUS, new Trio<Float, Float, Float>(8.5f, 0.5f, 0.3f));// pursuit_bonus_finished,61
trophiesProperties.put(GameTrophyDefinition.PURSUIT_BONUS, new Trio<Float, Float, Float>(8.5f, 0.5f, 0.6f));// pursuit_bonus_finished,61
trophiesProperties.put(GameTrophyDefinition.KIDNAPPING_PLAY1, new Trio<Float, Float, Float>(0.95f, 0.65f, 1f));// kidnapping_1_finished,3
trophiesProperties.put(GameTrophyDefinition.KIDNAPPING_PLAY2, new Trio<Float, Float, Float>(1.0f, 0.2f, 1f));// kidnapping_5_finished,4
trophiesProperties.put(GameTrophyDefinition.KIDNAPPING_PLAY3, new Trio<Float, Float, Float>(1.15f, 0.5f, 1f));// kidnapping_10_finished,5
trophiesProperties.put(GameTrophyDefinition.KIDNAPPING_DIFF1, new Trio<Float, Float, Float>(0.75f, 0.4f, 1f));// kidnapping_1_limit,1
trophiesProperties.put(GameTrophyDefinition.KIDNAPPING_DIFF2, new Trio<Float, Float, Float>(0.6f, 0.7f, 1f));// kidnapping_2_limit,0
trophiesProperties.put(GameTrophyDefinition.KIDNAPPING_BONUS, new Trio<Float, Float, Float>(8.4f, 0.07f, 0.28f));// kidnapping_bonus_finished,60
trophiesProperties.put(GameTrophyDefinition.KIDNAPPING_BONUS, new Trio<Float, Float, Float>(8.4f, 0.07f, 0.56f));// kidnapping_bonus_finished,60
trophiesProperties.put(GameTrophyDefinition.NIGHT_WATCH_PLAY1, new Trio<Float, Float, Float>(3.5f, 0.5f, 1f));// night_watch_1_finished,22
trophiesProperties.put(GameTrophyDefinition.NIGHT_WATCH_PLAY2, new Trio<Float, Float, Float>(3.63f, 0.6f, 1f));// night_watch_5_finished,23
trophiesProperties.put(GameTrophyDefinition.NIGHT_WATCH_PLAY3, new Trio<Float, Float, Float>(3.8f, 0.5f, 1f));// night_watch_10_finished,25
trophiesProperties.put(GameTrophyDefinition.NIGHT_WATCH_DIFF1, new Trio<Float, Float, Float>(3.78f, 0.77f, 1f));// night_watch_1_limit,24