Commit a6146fa0 authored by Vitaliy Vashchenko's avatar Vitaliy Vashchenko

Merge branch 'feature-HD-assets' into 'V3.7'

Feature hd assets

See merge request !741
parents 62038657 27490b16
......@@ -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);
......
......@@ -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
trophiesProperties.put(GameTrophyDefinition.NIGHT_WATCH_DIFF2, new Trio<Float, Float, Float>(3.25f, 0.5f, 1f));// night_watch_2_limit,21
trophiesProperties.put(GameTrophyDefinition.NIGHT_WATCH_BONUS, new Trio<Float, Float, Float>(8.0f, 0.7f, 0.25f));// night_watch_bonus_finished,55
trophiesProperties.put(GameTrophyDefinition.NIGHT_WATCH_BONUS, new Trio<Float, Float, Float>(8.0f, 0.7f, 0.5f));// night_watch_bonus_finished,55
trophiesProperties.put(GameTrophyDefinition.SHOOTING_RANGE_PLAY1, new Trio<Float, Float, Float>(4.0f, 0.7f, 1f));// shooting_range_1_finished,26
trophiesProperties.put(GameTrophyDefinition.SHOOTING_RANGE_PLAY2, new Trio<Float, Float, Float>(4.1f, 0.4f, 1f));// shooting_range_5_finished,27
trophiesProperties.put(GameTrophyDefinition.SHOOTING_RANGE_PLAY3, new Trio<Float, Float, Float>(4.5f, 0.55f, 1f));// shooting_range_10_finished,30
trophiesProperties.put(GameTrophyDefinition.SHOOTING_RANGE_DIFF1, new Trio<Float, Float, Float>(4.35f, 0.5f, 0.6f));// shooting_range_1_limit,29
trophiesProperties.put(GameTrophyDefinition.SHOOTING_RANGE_DIFF2, new Trio<Float, Float, Float>(4.27f, 0.7f, 0.8f));// shooting_range_2_limit,28
trophiesProperties.put(GameTrophyDefinition.SHOOTING_RANGE_BONUS, new Trio<Float, Float, Float>(8.01f, 0.15f, 0.3f));// shooting_range_bonus_finished,56
trophiesProperties.put(GameTrophyDefinition.SHOOTING_RANGE_BONUS, new Trio<Float, Float, Float>(8.01f, 0.15f, 0.6f));// shooting_range_bonus_finished,56
trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_PLAY1, new Trio<Float, Float, Float>(4.7f, 0.43f, 0.7f));// in_the_darkness_1_finished,32
trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_PLAY2, new Trio<Float, Float, Float>(5.05f, 0.77f, 0.7f));// in_the_darkness_5_finished,33
trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_PLAY3, new Trio<Float, Float, Float>(4.85f, 0.1f, 0.7f));// in_the_darkness_10_finished.34
trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_DIFF1, new Trio<Float, Float, Float>(4.85f, 0.65f, 0.7f));// in_the_darkness_1_limit,31
trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_DIFF2, new Trio<Float, Float, Float>(5.21f, 0.4f, 0.7f));// in_the_darkness_2_limit,35
trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_BONUS, new Trio<Float, Float, Float>(8.53f, 0.13f, 0.25f));// in_the_darkness_bonus_finished,62
trophiesProperties.put(GameTrophyDefinition.IN_THE_DARKNESS_BONUS, new Trio<Float, Float, Float>(8.53f, 0.13f, 0.5f));// in_the_darkness_bonus_finished,62
trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_PLAY1, new Trio<Float, Float, Float>(5.6f, 0.65f, 0.5f));// crime_scene_1_finished,36
trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_PLAY2, new Trio<Float, Float, Float>(5.45f, 0.42f, 0.5f));// crime_scene_5_finished,37
trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_PLAY3, new Trio<Float, Float, Float>(5.75f, 0.23f, 0.5f));// crime_scene_10_finished.38
trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_DIFF1, new Trio<Float, Float, Float>(6.36f, 0.12f, 0.5f));// crime_scene_1_limit,39
trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_DIFF2, new Trio<Float, Float, Float>(6.1f, 0.14f, 0.5f));// crime_scene_2_limit,40
trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_BONUS, new Trio<Float, Float, Float>(8.8f, 0.3f, 0.3f));// crime_scene_bonus_finished,64
trophiesProperties.put(GameTrophyDefinition.CRIME_SCENE_BONUS, new Trio<Float, Float, Float>(8.8f, 0.3f, 0.6f));// crime_scene_bonus_finished,64
trophiesProperties.put(GameTrophyDefinition.RUNES_PLAY1, new Trio<Float, Float, Float>(5.89f, 0.81f, 0.5f));// runes_1_finished,41
trophiesProperties.put(GameTrophyDefinition.RUNES_PLAY2, new Trio<Float, Float, Float>(5.63f, 0.21f, 0.5f));// runes_5_finished,42
trophiesProperties.put(GameTrophyDefinition.RUNES_PLAY3, new Trio<Float, Float, Float>(5.36f, 0.63f, 0.5f));// runes_10_finished,43
trophiesProperties.put(GameTrophyDefinition.RUNES_DIFF1, new Trio<Float, Float, Float>(5.37f, 0.1f, 0.5f));// runes_1_limit,44
trophiesProperties.put(GameTrophyDefinition.RUNES_DIFF2, new Trio<Float, Float, Float>(5.98f, 0.21f, 0.5f));// runes_2_limit,45
trophiesProperties.put(GameTrophyDefinition.RUNES_BONUS, new Trio<Float, Float, Float>(8.7f, 0.21f, 0.3f));// runes_bonus_finished,63
trophiesProperties.put(GameTrophyDefinition.RUNES_BONUS, new Trio<Float, Float, Float>(8.7f, 0.21f, 0.6f));// runes_bonus_finished,63
trophiesProperties.put(GameTrophyDefinition.PROTOCOL_PLAY1, new Trio<>(6.6f,0.5f,0.5f)); //protocol_1_finished,46
trophiesProperties.put(GameTrophyDefinition.PROTOCOL_PLAY2, new Trio<>(6.72f,0.2f,0.5f)); //protocol_5_finished,47
trophiesProperties.put(GameTrophyDefinition.PROTOCOL_PLAY3, new Trio<>(6.87f,0.28f,0.5f)); //protocol_10_finished,48
trophiesProperties.put(GameTrophyDefinition.PROTOCOL_DIFF1, new Trio<>(7.05f,0.2f,0.5f)); //protocol_1_limit,49
trophiesProperties.put(GameTrophyDefinition.PROTOCOL_DIFF2, new Trio<>(7.2f,0.4f,0.5f)); //protocol_2_limit,50
trophiesProperties.put(GameTrophyDefinition.PROTOCOL_BONUS, new Trio<>(8.1f, 0.2f, 0.3f));// protocol_bonus_finished,57
trophiesProperties.put(GameTrophyDefinition.PROTOCOL_BONUS, new Trio<>(8.1f, 0.2f, 0.6f));// protocol_bonus_finished,57
trophiesProperties.put(GameTrophyDefinition.SAFE_PLAY1<