Merge pull request #60 from subchannel13/v1.11-dev

V1.11 dev

CHANGELOG.md

@@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [v1.11] 2019-03-26
+### Added
+- Fastlane metadata
+
+### Changed
+- Updated French translation
+
+### Fixed
+- Typos in English and French translations
 
 ## [v1.10] - 2018-10-26
 ### Added

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "hr.kravarscan.enchantedfortress"
         minSdkVersion 15
         targetSdkVersion 26
-        versionCode 11
-        versionName "1.10"
+        versionCode 12
+        versionName "1.11"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/res/values-fr/strings.xml

@@ -13,7 +13,8 @@
     <string name="militaryStrength">Force</string>
     <string name="researchDelta">Recherche</string>
     <string name="walls">Murs de la ville</string>
-    <string name="scouted">Rapport d\'éclaireurs: %1$s démons</string>
+    <string name="scouted">Rapport d\'éclaireurs : %1$s démons</string>
+    <string name="scoutedLong">Rapport d\'éclaireurs :\n%1$s démons\n%2$s force\n%3$s puissance militaire totale</string>
     <string name="attacked">Attaque !\n%1$s force des démons\n%2$s victimes</string>
     <string name="noVictims">Attaque des démons repoussée sans victime</string>
     <string name="farmingTech">Agriculture</string>
@@ -52,19 +53,12 @@
     <string name="scoresButton">Temple de la renommée</string>
     <string name="banishProgress">Les savants pratiquent le rituel de bannissement et les démons tentent d\'augmenter leur puissance. La puissance des démons est maintenant de %1d.</string>
     <string name="banishProgressShort">La puissance des démons est maintenant de %1d.</string>
-    <!-- Untranslated -->
-    <!-- Untranslated -->
-    <!--
-    <string name="newsButton"></string>
-    <string name="scoutedLong"></string>
-    <string name="moreNews"></string>
-    <string name="battleNotification"></string>
-    <string name="banishNotification"></string>
-    <string name="scoutNotification"></string>
-    -->
+    <string name="newsButton">Bouton liste des rapports</string>
+    <string name="moreNews">Autres rapports</string>
+    <string name="battleNotification">Nous avons été attaqués !</string>
+    <string name="banishNotification">bannissement</string>
+    <string name="scoutNotification">rapport d\'éclaireurs</string>
     <!-- Accessibility -->
-    <!--
-    <string name="minusButton"></string>
-    <string name="plusButton"></string>
-    -->
+    <string name="minusButton">Bouton moins</string>
+    <string name="plusButton">Bouton plus</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -25,7 +25,7 @@
     <string name="defeat">Demons have defeated you!\nNobody in your fortress survived and the realm in the great peril.</string>
     <string name="victory">Victory!\nYou have banished all demons and the realm is safe now.</string>
     <string name="help">Story &amp; Help</string>
-    <string name="helpText"><b>Story</b>\n\nDark days are upon your land, twisted people have made a pact with demons, hell gates have been opened and demon kind has started to roam this world. As the time passes more hell gates open and demon army grows stronger and bolder. If they are not stopped the realm will be overrun.\n\nYour scholars speculate if there is a ritual to summon the demons then there must be the one to banish them. Help them perform the ritual and defend them from demons who will try to stop them.\n\n<b>How to play</b>\n\nMajority of the game revolves around distributing population to following jobs:\n- Farmers - increase population growth\n- Builders - build city walls\n- Soldiers - increase military strength\n- Scholars - research improvements and banish demons\n\nAs the time (turns) passes demon army strength will grow and when they grow confident enough they will mount an attack. The attacks don\'t come without the warning, your people will report how many demons they saw. It\'s not an accurate number but expect them to have at least that many troops. When the attack comes all of your population participates in the defense, both soldiers and workers. Soldiers are stronger defenders but if you are caught unprepared civilians will do their best to survive. Tall city wall is great way to not get caught unprepared.\n\nUltimately your success depends on balancing military power and economy. It might be tempting to employ as many people as possible as soldiers but if the attack doesn\'t come on given turn your economy won\'t grow fast enough to handle future demon attacks. Early on farming improves the economy the most, more people you have more of them you can employ to construct walls and field as soldiers. Research is another way to improve your military and economy in the long term. All population participates in research but similar to military strength not everyone contribute equally. Scholars (people not assigned to farming, construction and guard duty) generate more research points then others.\n\nStaying barricaded behind the wall will not make you unconquerable, eventually demons will grow powerful enough to overcome any defenses. Banishment ritual is the only way to defeat demons for good. Performing it will gradually close hell gates, making demon army grow slower and once finished will permanently stop demon invasion.</string>
+    <string name="helpText"><b>Story</b>\n\nDark days are upon your land; twisted people have made a pact with demons, hell gates have been opened, and demon kind has started to roam this world. As time passes, more hell gates open and the demon army grows stronger and bolder. If they are not stopped, the realm will be overrun.\n\nYour scholars speculate that if there is a ritual to summon the demons then there must be the one to banish them. Help them perform the ritual and defend them from demons who will try to stop them.\n\n<b>How to play</b>\n\nThe majority of the game revolves around distributing population between the following jobs:\n- Farmers - increase population growth\n- Builders - build city walls\n- Soldiers - increase military strength\n- Scholars - research improvements and banish demons\n\nAs time (turns) passes, the demon army\'s strength will grow, and they will mount an attack when they grow confident enough. The attacks don\'t come without warning; your people will report how many demons they\'ve seen. It\'s not an accurate number, but expect them to have at least that many troops. When the attack comes, all of your population participates in the defense, both soldiers and workers. Soldiers are stronger defenders, but if you are caught unprepared, civilians will do their best to survive. A tall city wall is a great way to not get caught unprepared.\n\nUltimately your success depends on balancing your military power and economy. It might be tempting to employ as many people as possible as soldiers, but if the attack doesn\'t come on a given turn, your economy won\'t grow fast enough to handle future demon attacks. Early on, farming improves the economy the most—the more people you have, the more of them you can employ to construct walls and field as soldiers. Research is another way to improve your military and economy in the long term. The entire population participates in research, but similar to military strength, not everyone contributes equally. Scholars (people not assigned to farming, construction, or guard duty) generate more research points than others.\n\nStaying barricaded behind the wall will not make you unconquerable; eventually the demons will grow powerful enough to overcome any defenses. The banishment ritual is the only way to defeat the demons for good. Performing it will gradually close the hell gates, making the demon army grow slower; once finished, it will permanently stop the demon invasion.</string>
     <string name="aboutMe">About</string>
     <string name="turns">turns</string>
     <string name="turn">Turn</string>
@@ -55,7 +55,7 @@
     <string name="newsButton">News list button</string>
     <string name="moreNews">Other reports</string>
     <string name="battleNotification">We were attacked!</string>
-    <string name="banishNotification">banishmnet</string>
+    <string name="banishNotification">banishment</string>
     <string name="scoutNotification">scout report</string>
     <!-- Accessibility -->
     <string name="minusButton">Minus button</string>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

fastlane/metadata/android/en-US/changelogs/1.txt

@@ -0,0 +1 @@
+* Initial release

fastlane/metadata/android/en-US/changelogs/10.txt

@@ -0,0 +1,6 @@
+Added
+* Debug logging
+* Adaptive icon
+Changed
+* Updated german translation
+* Untranslated entries added as comments to make it more visible what is missing

fastlane/metadata/android/en-US/changelogs/11.txt

@@ -0,0 +1,9 @@
+Added
+* News list button
+* News list screen
+Changed
+* Button images for "+" and "-"
+* Report text format on game screen
+* Demon attack event notification more prominent
+Fixed
+* Crash in main menu after orientation change

fastlane/metadata/android/en-US/changelogs/12.txt

@@ -0,0 +1,6 @@
+Added
+* Fastlane metadata
+Changed
+* Updated French translation
+Fixed
+* Typos in English and French translations

fastlane/metadata/android/en-US/changelogs/2.txt

@@ -0,0 +1,9 @@
+Added
+* Current game turn is now visible
+Changed
+* "Help" screen is now more detailed "Story & Help"
+Fixed
+* Fixed UI scaling and duplication on rotation
+* Fixed loss of game state on rotation or multitasking
+* Fixed UI duplication after pressing back button
+* Fixed negative scout report

fastlane/metadata/android/en-US/changelogs/3.txt

@@ -0,0 +1,10 @@
+Added
+* Autosave and continue game session
+* German translation
+Changed
+* Moderate code cleanup
+* Reduced APK size
+* About screen lists translators
+Fixed
+* Fixed licence statement, GLP text included too
+* Fixed defeat condition to work with decimal population count

fastlane/metadata/android/en-US/changelogs/4.txt

@@ -0,0 +1,6 @@
+Added
+* Change log file
+* French translation
+* Difficulty levels
+Fixed
+* Back button always navigates from other views to main menu

fastlane/metadata/android/en-US/changelogs/5.txt

@@ -0,0 +1,2 @@
+Fixed
+* Lint error stopping build in F-Droid

fastlane/metadata/android/en-US/changelogs/6.txt

@@ -0,0 +1,4 @@
+Changed
+* Launcher icon
+Fixed
+* Main menu duplication after phone rotation

fastlane/metadata/android/en-US/changelogs/7.txt

@@ -0,0 +1,7 @@
+Added
+* Difficulty level info when starting new game
+* Hell gate opening and closing report during banishment ritual
+Changed
+* Banishment ritual shows remaining hell gates instead of time estimation
+* Increased item size in research selection
+* German translation

fastlane/metadata/android/en-US/changelogs/8.txt

@@ -0,0 +1,9 @@
+Added
+* Round icon
+* Demon strength per unit grows exponentially over time
+* Fastest win tracking
+* Hall of Fame screen
+Changed
+* Banishment ritual time estimation again but more precisely then before v1.6
+* Banishment ritual progress now shows true goal progress instead of attempts to close demon gate
+* Few entries in French translation

fastlane/metadata/android/en-US/changelogs/9.txt

@@ -0,0 +1,8 @@
+Added
+* More German translation
+Changed
+* Hall of Fame entries from v1.7 are deleted
+* Turn, population and wall status remains displayed when the is game over
+* Population distribution buttons removed when the is game over
+Fixed
+* Hall of Fame was logging defeats

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1 @@
+A simple game inspired by the Age of Castles. Distribute your population between farming, construction, guard duty, and scholarship. Survive the demon invasion and find the way to banish them forever.

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+A game about managing resources of a fortress and overcoming demon attacks.

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+Enchanted Fortress

fastlane/metadata/android/fr-FR/full_description.txt

@@ -0,0 +1 @@
+Un jeu simple inspiré par Age of Castles. Répartissez votre population entre l’agriculture, la construction, la garde et la science. Survivez à l’invasion des démons et trouvez un moyen de les bannir pour toujours.

fastlane/metadata/android/fr-FR/short_description.txt

@@ -0,0 +1 @@
+Un jeu sur la gestion des ressources d’une forteresse et la lutte contre des attaques de démons.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Oct 19 14:34:00 CEST 2018
+#Thu Feb 14 10:57:59 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip