1.0.4 - Fix research lab levels reporting

lainsce · Jun 19, 2019 · 6958049 · 6958049
1 parent e2f4493
commit 6958049
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/data/com.github.lainsce.reganam.appdata.xml.in b/data/com.github.lainsce.reganam.appdata.xml.in
@@ -6,7 +6,7 @@
     <name>Reganam</name>
     <summary>Resource Management game set in space</summary>
     <description>
-        <p>Build up your planet's buildings and grow yourself a ecumenopolis of native aliens.</p>
+        <p>Build up your planet's buildings and grow yourself a ecumenopolis of native aliens. Get mines of minerals, crystals and even hydrogen to build more structures and synthesizers.</p>
         <ul>
             <li>Quit anytime with the shortcut Ctrl + Q</li>
         </ul>
@@ -52,6 +52,14 @@
         <content_attribute id="money-gambling">none</content_attribute>
     </content_rating>
     <releases>
+        <release version="1.0.4" date="2019-06-21">
+            <description>
+                <p>Release: Reserch Labs Operational</p>
+                <ul>
+                    <li>Fix: The research lab levels are now reported.</li>
+                </ul>
+            </description>
+        </release>
         <release version="1.0.3" date="2019-06-15">
             <description>
                 <p>Release: Fix and Smash Bugs</p>

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 # Name our project
 project('com.github.lainsce.reganam', ['vala', 'c'],
-    version: '1.0.3'
+    version: '1.0.4'
 )
 
 # Import main lib files

diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -22,10 +22,6 @@ namespace Reganam {
         public double m_res;
         public double c_res;
         public double h_res;
-        public double l_res;
-        public double sym_res;
-        public double syc_res;
-        public double syh_res;
         public double m_total = 1000.0;
         public double c_total = 1000.0;
         public double h_total = 1000.0;
@@ -377,9 +373,9 @@ namespace Reganam {
 
             var lpm = new Gtk.ProgressBar ();
             lpm.hexpand = true;
-            lpm.fraction = l_res/l_total;
+            lpm.fraction = l_level/l_total;
             lpm.set_show_text (true);
-            lpm.set_text ("""%.0f/%.0f""".printf(l_res, l_total));
+            lpm.set_text ("""%.0f/%.0f""".printf(l_level, l_total));
 
             var button_l = new Gtk.Button.with_label (_("Build!"));
             help_l = new Gtk.Image.from_icon_name ("help-info-symbolic", Gtk.IconSize.BUTTON);
@@ -407,9 +403,9 @@ namespace Reganam {
 
             var sympm = new Gtk.ProgressBar ();
             sympm.hexpand = true;
-            sympm.fraction = sym_res/sym_total;
+            sympm.fraction = sym_level/sym_total;
             sympm.set_show_text (true);
-            sympm.set_text ("""%.0f/%.0f""".printf(sym_res, sym_total));
+            sympm.set_text ("""%.0f/%.0f""".printf(sym_level, sym_total));
 
             var button_sym = new Gtk.Button.with_label (_("Research!"));
             help_sym = new Gtk.Image.from_icon_name ("help-info-symbolic", Gtk.IconSize.BUTTON);
@@ -435,9 +431,9 @@ namespace Reganam {
 
             var sycpm = new Gtk.ProgressBar ();
             sycpm.hexpand = true;
-            sycpm.fraction = syc_res/syc_total;
+            sycpm.fraction = syc_level/syc_total;
             sycpm.set_show_text (true);
-            sycpm.set_text ("""%.0f/%.0f""".printf(syc_res, syc_total));
+            sycpm.set_text ("""%.0f/%.0f""".printf(syc_level, syc_total));
 
             var button_syc = new Gtk.Button.with_label (_("Research!"));
             help_syc = new Gtk.Image.from_icon_name ("help-info-symbolic", Gtk.IconSize.BUTTON);
@@ -463,9 +459,9 @@ namespace Reganam {
 
             var syhpm = new Gtk.ProgressBar ();
             syhpm.hexpand = true;
-            syhpm.fraction = syh_res/syh_total;
+            syhpm.fraction = syh_level/syh_total;
             syhpm.set_show_text (true);
-            syhpm.set_text ("""%.0f/%.0f""".printf(syh_res, syh_total));
+            syhpm.set_text ("""%.0f/%.0f""".printf(syh_level, syh_total));
 
             var button_syh = new Gtk.Button.with_label (_("Research!"));
             help_syh = new Gtk.Image.from_icon_name ("help-info-symbolic", Gtk.IconSize.BUTTON);