diff --git a/core/src/com/unciv/civinfo/CivilizationInfo.java b/core/src/com/unciv/civinfo/CivilizationInfo.java index 88e5a9b5..59a3983e 100644 --- a/core/src/com/unciv/civinfo/CivilizationInfo.java +++ b/core/src/com/unciv/civinfo/CivilizationInfo.java @@ -59,7 +59,7 @@ public class CivilizationInfo { }); } - public void nextTurn()//out boolean displayTech) + public void nextTurn() { notifications.clear(); CivStats nextTurnStats = getStatsForNextTurn(); diff --git a/core/src/com/unciv/game/HexMath.java b/core/src/com/unciv/game/HexMath.java index e74b2e4b..ef5c1915 100644 --- a/core/src/com/unciv/game/HexMath.java +++ b/core/src/com/unciv/game/HexMath.java @@ -48,6 +48,7 @@ public class HexMath public static ArrayList GetVectorsAtDistance(Vector2 origin, int distance){ ArrayList vectors = new ArrayList(); + if(distance==0){vectors.add(origin.cpy()); return vectors;} Vector2 Current = origin.cpy().sub(distance,distance); // start at 6 o clock for (int i = 0; i < distance; i++) { // From 6 to 8 vectors.add(Current.cpy()); @@ -62,7 +63,7 @@ public class HexMath for (int i = 0; i < distance; i++) { // 10 to 12 vectors.add(Current.cpy()); vectors.add(origin.cpy().scl(2).sub(Current)); // Get vector on other side of cloick - Current.add(1,1); + Current.add(0,1); }; return vectors; } diff --git a/core/src/com/unciv/game/WorldScreen.java b/core/src/com/unciv/game/WorldScreen.java index d82ffc2a..830742b2 100644 --- a/core/src/com/unciv/game/WorldScreen.java +++ b/core/src/com/unciv/game/WorldScreen.java @@ -96,7 +96,6 @@ public class WorldScreen extends CameraStageBaseScreen { public void update(){ if(game.civInfo.tech.freeTechs!=0) { game.setScreen(new TechPickerScreen(game, true)); - return; } updateTechButton(); updateTileTable(); diff --git a/core/src/com/unciv/game/pickerscreens/TechPickerScreen.java b/core/src/com/unciv/game/pickerscreens/TechPickerScreen.java index 821e478a..bc9be609 100644 --- a/core/src/com/unciv/game/pickerscreens/TechPickerScreen.java +++ b/core/src/com/unciv/game/pickerscreens/TechPickerScreen.java @@ -93,14 +93,10 @@ public class TechPickerScreen extends PickerScreen { StringBuilder text = new StringBuilder(techName); if (selectedTech != null) { - Technology thisTech = GameBasics.Technologies.get(techName); if (techName.equals(selectedTech.name)) { TB.setChecked(true); TB.setColor(TB.getColor().lerp(Color.LIGHT_GRAY, 0.5f)); } - - if (thisTech.prerequisites.contains(selectedTech.name)) text.insert(0, "*"); - else if (selectedTech.prerequisites.contains(techName)) text.append("*"); } if (techsToResearch.contains(techName)) { text.append(" (").append(techsToResearch.indexOf(techName)).append(")");