diff --git a/install/open-ig-0.95.260.jar b/install/open-ig-0.95.260.jar new file mode 100644 index 00000000..c7bc547f Binary files /dev/null and b/install/open-ig-0.95.260.jar differ diff --git a/open-ig-config.xml b/open-ig-config.xml index a6045d7b..23384c64 100644 --- a/open-ig-config.xml +++ b/open-ig-config.xml @@ -4,9 +4,9 @@ Open Imperium Galactica Configuration open-ig-config.xml 10 -2000 +1000 hu -100 +75 true false -10 @@ -17,12 +17,12 @@ 882 false true -50 -false +30 +true true true true -false +true false false 100 @@ -34,19 +34,19 @@ 253 false 0 -50000 +0 true -2 +default 13951 true -100 +80 false -false +true true true true false -50000 +1045000 true false 0 @@ -59,7 +59,7 @@ false 13951 true -100 +75 true true true diff --git a/src/hu/openig/model/Configuration.java b/src/hu/openig/model/Configuration.java index c125c7c4..48ea7931 100644 --- a/src/hu/openig/model/Configuration.java +++ b/src/hu/openig/model/Configuration.java @@ -35,7 +35,7 @@ */ public class Configuration { /** The version string. */ - public static final String VERSION = "0.95.259"; + public static final String VERSION = "0.95.260"; /** Annotation for indicating load/save a field. */ @Retention(RetentionPolicy.RUNTIME) @interface LoadSave { } diff --git a/src/hu/openig/screen/items/DiplomacyScreen.java b/src/hu/openig/screen/items/DiplomacyScreen.java index 0d391569..354852b6 100644 --- a/src/hu/openig/screen/items/DiplomacyScreen.java +++ b/src/hu/openig/screen/items/DiplomacyScreen.java @@ -747,14 +747,15 @@ void updateRaces() { oi1.enabled = false; boolean active = !p2.isDefeated(); if (active) { - if (player().offers.containsKey(p2.id)) { + boolean hasOffer = player().offers.containsKey(p2.id); + if (hasOffer) { oi1.label = "!" + p2.shortName; } else { oi1.label = " " + p2.shortName; } oi1.userObject = p2; - oi1.enabled = rel.full && last < now - limit; + oi1.enabled = rel.full && (hasOffer || last < now - limit); if (oi1.enabled && rel.wontTalk()) { rel.wontTalk(false); diff --git a/update.xml b/update.xml index af16634e..41546b84 100644 --- a/update.xml +++ b/update.xml @@ -23,7 +23,7 @@ The launcher's main file - + Az Open Imperium Galactica játék. @@ -42,6 +42,9 @@ Bugfixes + + Fix for receiving a diplomatic call being non-interactable at times. + Play music again after finishing the main campaign and selecting continue. Fix deployment exclusion locations not scaling with the planet in skirmish. @@ -344,7 +347,7 @@ Fixed AI unable to build a power plant if the missing energy was above the capacity of available power plant types. - +