Refactor state management; update unlock logic and enhance signal bindings in scene

Reviewed-on: #1

.continue/rules/01-godot-core.md

@@ -1,13 +1,19 @@
 ---
-name: Godot 4.4 Core Rules
+name: Godot 4.7 Core Rules
 priority: high
 ---
 
-Ты — senior Godot 4.4 GDScript разработчик.
+Ты — senior Godot 4.7 GDScript разработчик.
+
+- Use Godot 4.7+ API.
+- Do not use Godot 3.x syntax or APIs.
+- Follow the existing project architecture and coding style.
+- Do not introduce unnecessary abstractions.
+- Do not modify unrelated files.
 
-- Всегда используй Godot 4.4+ API.
 - Пиши строго типизированный код (`var health: int = 100`, `: Array[Node]` и т.д.).
 - Предпочитай Signals вместо проверки в _process.
 - Используй @export, @export_range, @export_enum, @onready.
 - Composition over deep inheritance.
 - Менеджеры и автолоады выноси в отдельные singleton'ы.
+

.continue/rules/03-style.md

@@ -0,0 +1 @@
+- use spaces not tabs for indentation

.gitea/workflows/android.yml

@@ -0,0 +1,92 @@
+name: Android
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  android:
+    runs-on: godot
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          lfs: true
+      - name: Godot version
+        run: godot --version
+
+      - name: Prepare Godot
+        run: |
+          rm -rf .godot
+
+          godot \
+                --headless \
+                --path . \
+                --editor \
+                --quit \
+                --verbose
+
+
+      - name: Build APK
+        run: |
+          mkdir -p build
+
+          godot \
+            --headless \
+            --path . \
+            --editor \
+            --quit
+
+          godot \
+            --headless \
+            --path . \
+            --export-release "Android" \
+            build/app.apk
+
+
+      - name: Check imported resources
+        run: |
+          echo "=== PNG imports ==="
+          find .godot/imported -iname '*habitable*' -o -iname '*civ2*'
+
+          echo "=== PNG files ==="
+          ls -lh ui/4-life/habitable_planet.png
+          ls -lh ui/4-life/civ2.png
+
+
+      - name: Verify APK
+        run: |
+          test -f build/app.apk
+          ls -lh build/app.apk
+
+      - name: Create Release
+        env:
+          GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        run: |
+          curl -f \
+            -X POST \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            "https://gt.owad.ru/api/v1/repos/K/owniverse/releases" \
+            -d "{
+              \"tag_name\": \"${GITHUB_REF_NAME}\",
+              \"name\": \"${GITHUB_REF_NAME}\",
+              \"body\": \"Android build ${GITHUB_REF_NAME}\"
+            }"
+
+      - name: Upload APK to Release
+        env:
+          GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        run: |
+          RELEASE_ID=$(curl -fsS \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            "https://gt.owad.ru/api/v1/repos/K/owniverse/releases/tags/${GITHUB_REF_NAME}" \
+            | python3 -c 'import sys,json; print(json.load(sys.stdin)["id"])')
+
+          curl -f \
+            -X POST \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            -F "attachment=@build/app.apk" \
+            "https://gt.owad.ru/api/v1/repos/K/owniverse/releases/${RELEASE_ID}/assets?name=owniverse-${GITHUB_REF_NAME}.apk"

Autoload/Global.gd.uid

@@ -1 +0,0 @@
-uid://5xb12usvrifm

Tools/Counter.gd.uid

@@ -1 +0,0 @@
-uid://dnshr5nb2v60a

UI/Border/border.tscn

@@ -1,6 +0,0 @@
-[gd_scene format=3 uid="uid://dg15dpxiepicb"]
-
-[ext_resource type="Texture2D" uid="uid://chxxghyul1im7" path="res://ui/border/border-2px.png" id="1_6kaf8"]
-
-[node name="Border" type="TextureRect"]
-texture = ExtResource("1_6kaf8")

autoload/global.gd

@@ -1,6 +1,6 @@
 extends Node
 
-const SPEED_LIMIT = 4
+const SPEED_LIMIT: int = 4
 
 var Settings: Dictionary = {
         "filename": "save-0001",
@@ -17,6 +17,8 @@ var OwniverseEntities: Dictionary = {}
 var OwniverseItems: Dictionary = {}
 var Templates: Dictionary = {}
 
+var batch_count: float = 40.0 # must be even not odd
+
 
 func get_localized_item_description(item_id: String, item: String) -> String:
     if Locales[Locale].has(item_id):

autoload/global.gd.uid

@@ -0,0 +1 @@
+uid://dy0hrqie4ritn

data/owniverse_entitites.txt

@@ -1,153 +1,153 @@
-id|is_visible|unlock|cost|bind|mass|space|lifespan|auto|gamma|blast|life_product|voids|output|destroy_level|degradation|planets|count_as|group_as|event_group|space_bonus|civ_bonus|claim
-S|1|S:0|S:0||||||||||||||||S|||
-H|1|H:0|H:0||||||||||||||||H|||
-He|1|He:1||||||||||||||||||||
-Met|1|Met:1||||||||||||||||||||
-BD|1|BD:1||||||||||||||||||||
-HBD|0||H:0.1||0.1||5000000000||||S:0.5||CBD:1|1|mass:0.1&H:0&HE:0&MET:0||BD|||||
-RD|1|H:1|H:1||1|1|40000000000||||S:40||TWD:1&H:0.13&He:0.05&Met:0.01|1|mass:0.8&H:0.13&HE:0.05&MET:0.01|HP:1:0.01&RP:1:0.21&GG:2:0.08&AB:3:0.4||Star|DwStar|||
-OD|1|RD:1|H:8||8|1|18000000000||||S:36||SRG:1|1||HP:1:0.03&RP:2:0.34&GG:3:0.13&AB:3:0.4||Star|DwStar|||
-YD|1|OD:1|H:10||10|1|9000000000||||S:27||NRG:1|1||HP:2:0.1&RP:3:0.55&GG:4:0.21&AB:3:0.4||Star|DwStar|||
-WYD|1|YD:1|H:16||16|1|1800000000||||S:18||MRG:1|1||HP:3:0.3&RP:5:0.89&GG:5:0.34&AB:3:0.4||Star|DwStar|||
-WS|1|H:15|H:50||50|1|450000000||||S:9||LRG:1|2||||Star|GiStar|||
-BG|1|H:30&WS:1|H:100||100|1|90000000||||S:9||HRG:1|2||||Star|GiStar|||
-SG|1|H:100&BG:1|H:300||300|1|9000000||||S:9||RSG:1|2||||Star|GiStar|||
-HG|1|H:300&SG:1|H:1000||1000|1|900000||||S:9||RHG:1|2||||Star|GiStar|||
-RG|1|RG:1||||||||||||||||||||
-SRG|0||||8||2000000000||||S:80||SWD:1&H:2.32&He:0.64&Met:0.08&S:12.4|1|mass:4.8&H:2.32&HE:0.64&MET:0.08||RG|Star||||
-NRG|0||||10||1000000000||||S:120.||NWD:1&H:3.2&He:1.3&Met:0.2&S:14.3|1|mass:5&H:3.2&HE:1.3&MET:0.2||RG|Star||||
-MRG|0||||16||200000000||||S:200||LWD:1&H:4.96&He:3.36&Met:0.48&S:20.2|1|mass:6.4&H:4.96&HE:3.36&MET:0.48||RG|Star||||
-LRG|0||||50||50000000||||S:300||DSN^SGRB%0.1|2|||RG|Star||||
-HRG|0||||100||10000000||||S:400.||SN^GRB%1|2|||RG|Star||||
-RSG|0||||300||1000000||||S:500||BSN^LGRB%3|2|||RG|Star||||
-RHG|0||||1000||100000||||S:600||HN^HGRB%10|2|||RG|Star||||
-DSN|0||||||1|||2|S:59.1||SNS:1&H:6.5&He:13.5&Met:11&blast:2|2|mass:15&H:6.5&HE:13.5&MET:11||||SNGRBB|||
-SN|0||||||1|||9|S:99.1||LNS:1&H:8&He:50&Met:11&blast:9|2|mass:18&H:8&HE:50&MET:11||||SNGRBB|||
-BSN|0||||||1||.|305|S:309.1||MGT:1&H:15&He:186&Met:15&blast:305|2|mass:21&H:15&HE:186&MET:15||||SNGRBB|||
-HN|0||||||1|||9990|S:939.1||BH40:1&H:30&He:560&Met:30&blast:9990|2|mass:40&H:30&HE:560&MET:30||||SNGRBB|||
-SGRB|0||||||1||0.001|31|S:149.1||BH25:1&H:0.5&He:10&Met:4&blast:31|2|mass:25&H:0.5&HE:10&MET:4||||SNGRBB|||
-GRB|0||||||1||0.01|136|S:239.1||BH30:1&H:19&He:12&Met:5&blast:136|2|mass:30&H:19&HE:12&MET:5||||SNGRBB|||
-LGRB|0||||||1||0.03|3446|S:669.1||BH40:1&H:68&He:18&Met:9&blast:3446|2|mass:40&H:68&HE:18&MET:9||||SNGRBB|||
-HGRB|0||||||1||0.1|97342|S:1939.1||BH60:1&H:0&He:40&Met:10&blast:97342|2|mass:60&H:0&HE:40&MET:10||||SNGRBB|||
-CBD|0||||0.1||||||||||||BD|||||
-WD|1|WD:1||||||||||||||||||||
-TWD|0||||0.8||||||||||||WD|Star|Degen|||
-SWD|0||||4.8||||||||||||WD|Star|Degen|||
-NWD|0||||5||||||||||||WD|Star|Degen|||
-LWD|0||||6.4||||||||||||WD|Star|Degen|||
-NS|1|NS:1||||||||||||||||||||
-SNS|0||||15||||||||||||NS|Star|Degen|||
-LNS|0||||18||||||||||||NS|Star|Degen|||
-MGT|1|MGT:1|||21|||||||||||||Star|Degen|||
-BH|1|BH:1||||||||||||||||||||
-BH25|0||||25||||||||||||BH|BH|BH|||
-BH30|0||||30||||||||||||BH|BH|BH|||
-BH40|0||||40||||||||||||BH|BH|BH|||
-BH60|0||||60||||||||||||BH|BH|BH|||
-SMBH|1|BH:1|||||||||||||||||SMBH|||
-N|1|S:1|H:1||1|10|10000000||||H:10||H:1&S:10|||||CL|CL|||
-G|1|N:1|H:10&N:1||11|10|30000000||||H:150||H:11&S:20|||||CL|CL|||
-STN|1|G:1|H:200&G:1||211|300|30000000|0.5|||H:3000||H:211&S:320|||||CL|CL|||
-MC|1|G:1&S:1300|H:2000&G:1||2011|4000|300000000||||H:90000.||H:2011&S:4020|||||CL|CL|||
-ASTN|1|MC:1&S:60000|H:200000&MC:1||202011|200000|100000000|0.65|||H:2000000||H:202011&S:204020|||||CL|CL|||
-SCD|1|Star:300||Star:1000|||10000000|||||||||||SC|SC|0.1|4|C2.3
-SCS|1|SCD:1&Star:2000||Star:10000&BH:10|||1000000000|||||||||||SC|SC|0.2|44350|C2.4
-SCM|1|SCS:1&Star:20000||Star:100000&BH:100|||3000000000|||||||||||SC|SC|0.3|44289|C2.5
-SCL|1|SCM:1&Star:200000||Star:1000000&BH:1000|||10000000000|||||||||||SC|SC|0.5|44230|C2.6
-SCG|1|SCL:1&Star:2000000||Star:10000000&BH:10000|||30000000000|||||||||||SC|SC|0.8|3|C2.7
-GED|1|SMBH:1&SC:1|SMBH:10000|Star:1000000000&BH:1000000&SC:100|||12000000000|||||||||||GAL|GALE|1|44440|C2.9
-GES|1|GED:1&Star:2000000000|SMBH:100000|Star:10000000000&BH:10000000&SC:1000|||13000000000|||||||||||GAL|GALE|1.5|44409|C3.0
-GEM|1|GES:1&Star:20000000000|SMBH:1000000|Star:100000000000&BH:100000000&SC:10000|||15000000000|||||||||||GAL|GALE|2|44378|C3.1
-GEL|1|GEM:1&Star:200000000000|SMBH:10000000|Star:1000000000000&BH:1000000000&SC:100000|||17000000000|||||||||||GAL|GALE|3|44348|C3.2
-GEG|1|GEL:1&Star:2000000000000|SMBH:100000000|Star:10000000000000&BH:10000000000&SC:1000000|||20000000000|||||||||||GAL|GALE|4.5|44317|C3.3
-GSD|1|GED:1|STN:10000&ASTN:10|GED:1||-5240200|2000000000|0.8|||H:2400000000||H:4112110|||||GAL|GALS||44318|C2.9
-GSS|1|GES:1|STN:100000&ASTN:100|GES:1||-52402000|3000000000|0.8|||H:36000000000||H:41121100|||||GAL|GALS||44257|C3.0
-GSM|1|GEM:1|STN:1000000&ASTN:1000|GEM:1||-524020000|4000000000|0.8|||H:480000000000||H:411211000|||||GAL|GALS||44229|C3.1
-GSL|1|GEL:1|STN:10000000&ASTN:10000|GEL:1||-5240200000|6000000000|0.8|||H:7200000000000||H:4112110000|||||GAL|GALS||44198|C3.2
-GSG|1|GEG:1|STN:100000000&ASTN:100000|GEG:1||-52402000000|9000000000|0.8|||H:108000000000000||H:41121100000|||||GAL|GALS||2|C3.3
-LGG|1|GAL:20||GAL:50|||10000000000|||||||||||LS|LS||44317|C3.4
-LSC|1|LGG:1&GAL:100||LGG:200|||20000000000|||||||||||LS|LS||44287|C3.6
-LGF|1|LSC:1&LGG:400||LSC:100|||30000000000|||||5||||||LS|LS||44256|C3.8
-LGW|1|LGF:1&LSC:200||LGF:1000|||60000000000|||||10000||||||LS|LS||44228|C4.1
-LUB|1|LGW:1&LGF:2000||LGW:1000|||100000000000|||||1000000000||||||LS|LS||44197|C4.4
-GG|1|GG:1||||||||||||||||Planet|BPlanet|||
-AB|1|AB:1||||||||||||||||Planet|BPlanet|||
-RP|1|RP:1||||||||||||||||Planet|BPlanet|||
-HP|1|HP:1||||||||||||||||Planet|LPlanet|||
-LP|1|LP:1||||||||||||||||Planet|LPlanet|||
-EON1|1|EON1:1|||||||||||||||LP|Planet|LPlanet|||
-EON2|1|EON2:1|||||||||||||||LP|Planet|LPlanet|||
-EON3|1|EON3:1|||||||||||||||LP|Planet|LPlanet|||
-EON4|1|EON4:1|||||||||||||||LP|Planet|LPlanet|||
-EON5|1|EON5:1|||||||||||||||LP|Planet|LPlanet|||
-C0|1|C0:1||||||||||||||||Planet|LPlanet|||
-C0.0|1|C0.0:1|||||||||||||||C0|Planet|LPlanet|||
-C0.1|1|C0.1:1|||||||||||||||C0|Planet|LPlanet|||
-C0.2|1|C0.2:1|||||||||||||||C0|Planet|LPlanet|||
-C0.3|1|C0.3:1|||||||||||||||C0|Planet|LPlanet|||
-C0.4|1|C0.4:1|||||||||||||||C0|Planet|LPlanet|||
-C0.5|1|C0.5:1|||||||||||||||C0|Planet|LPlanet|||
-C0.6|1|C0.6:1|||||||||||||||C0|Planet|LPlanet|||
-C0.7|1|C0.7:1|||||||||||||||C0|Planet|LPlanet|||
-C0.8|1|C0.8:1|||||||||||||||C0|Planet|LPlanet|||
-C0.9|1|C0.9:1|||||||||||||||C0|Planet|LPlanet|||
-C1|1|C1:1||||||||||||||||Planet|LPlanet|||
-C1.0|1|C1.0:1|||||||||||||||C1|Planet|LPlanet|||
-C1.1|1|C1.1:1|||||||||||||||C1|Planet|LPlanet|||
-C1.2|1|C1.2:1|||||||||||||||C1|Planet|LPlanet|||
-C1.3|1|C1.3:1|||||||||||||||C1|Planet|LPlanet|||
-C1.4|1|C1.4:1|||||||||||||||C1|Planet|LPlanet|||
-C1.5|1|C1.5:1|||||||||||||||C1|Planet|LPlanet|||
-C1.6|1|C1.6:1|||||||||||||||C1|Planet|LPlanet|||
-C1.7|1|C1.7:1|||||||||||||||C1|Planet|LPlanet|||
-C1.8|1|C1.8:1|||||||||||||||C1|Planet|LPlanet|||
-C1.9|1|C1.9:1|||||||||||||||C1|Planet|LPlanet|||
-C2|1|C2:1||||||||||||||||||||
-C2.0|1|C2.0:1|||||||||||||||C2|||||
-C2.1|1|C2.1:1|||||||||||||||C2|||||
-C2.2|1|C2.2:1|||||||||||||||C2|||||
-C2.3|1|C2.3:1|||||||||||||||C2|||||
-C2.4|1|C2.4:1|||||||||||||||C2|||||
-C2.5|1|C2.5:1|||||||||||||||C2|||||
-C2.6|1|C2.6:1|||||||||||||||C2|||||
-C2.7|1|C2.7:1|||||||||||||||C2|||||
-C2.8|1|C2.8:1|||||||||||||||C2|||||
-C2.9|1|C2.9:1|||||||||||||||C2|||||
-C3|1|C3:1||||||||||||||||||||
-C3.0|1|C3.0:1|||||||||||||||C3|||||
-C3.1|1|C3.1:1|||||||||||||||C3|||||
-C3.2|1|C3.2:1|||||||||||||||C3|||||
-C3.3|1|C3.3:1|||||||||||||||C3|||||
-C3.4|1|C3.4:1|||||||||||||||C3|||||
-C3.5|1|C3.5:1|||||||||||||||C3|||||
-C3.6|1|C3.6:1|||||||||||||||C3|||||
-C3.7|1|C3.7:1|||||||||||||||C3|||||
-C3.8|1|C3.8:1|||||||||||||||C3|||||
-C3.9|1|C3.9:1|||||||||||||||C3|||||
-C4|1|C4:1||||||||||||||||||||
-C4.0|1|C4.0:1|||||||||||||||C4|||||
-C4.1|1|C4.1:1|||||||||||||||C4|||||
-C4.2|1|C4.2:1|||||||||||||||C4|||||
-C4.3|1|C4.3:1|||||||||||||||C4|||||
-C4.4|1|C4.4:1|||||||||||||||C4|||||
-Ct|0|||||||||||||||||||||
-fsho|1|fsho:1||||||||||||||||||||
-finf|1|finf:1||||||||||||||||||||
-ftem|1|ftem:1||||||||||||||||||||
-fcol|1|fcol:1||||||||||||||||||||
-fpri|1|fpri:1||||||||||||||||||||
-fsin|1|fsin:1||||||||||||||||||||
-fren|1|fren:1||||||||||||||||||||
-finf|1|finf:1||||||||||||||||||||
-ffro|1|ffro:1||||||||||||||||||||
-fdes|1|fdes:1||||||||||||||||||||
-froc|1|froc:1||||||||||||||||||||
-fpan|1|fpan:1||||||||||||||||||||
-fgai|1|fgai:1||||||||||||||||||||
-fdar|1|fdar:1||||||||||||||||||||
-fede|1|fede:1||||||||||||||||||||
-fpac|1|fpac:1||||||||||||||||||||
-fenr|1|fenr:1||||||||||||||||||||
-fmor|1|fmor:1||||||||||||||||||||
-fdis|1|fdis:1||||||||||||||||||||
-frep|1|frep:1||||||||||||||||||||
+id|is_visible|unlock|cost|bind|mass|space|lifespan|auto|gamma|blast|life_product|voids|output|destroy_level|degradation|planets|count_as|group_as|event_group|blastability|space_bonus|civ_bonus|claim
+S|1|S:0|S:0||||||||||||||||S||||
+H|1|H:0|H:0||||||||||||||||H||||
+He|1|He:1|||||||||||||||||||||
+Met|1|Met:1|||||||||||||||||||||
+BD|1|BD:1|||||||||||||||||||||
+HBD|0||H:0.1||0.1||5000000000||||S:0.5||CBD:1|1|mass:0.1&H:0&HE:0&MET:0||BD||||||
+RD|1|H:1|H:1||1|1|40000000000||||S:40||TWD:1&H:0.13&He:0.05&Met:0.01|1|mass:0.8&H:0.13&HE:0.05&MET:0.01|HP:1:0.01&RP:1:0.21&GG:2:0.08&AB:3:0.4||Star|DwStar||||
+OD|1|RD:1|H:8||8|1|18000000000||||S:36||SRG:1|1||HP:1:0.03&RP:2:0.34&GG:3:0.13&AB:3:0.4||Star|DwStar||||
+YD|1|OD:1|H:10||10|1|9000000000||||S:27||NRG:1|1||HP:2:0.1&RP:3:0.55&GG:4:0.21&AB:3:0.4||Star|DwStar||||
+WYD|1|YD:1|H:16||16|1|1800000000||||S:18||MRG:1|1||HP:3:0.3&RP:5:0.89&GG:5:0.34&AB:3:0.4||Star|DwStar||||
+WS|1|H:15|H:50||50|1|450000000||||S:9||LRG:1|2||||Star|GiStar||||
+BG|1|H:30&WS:1|H:100||100|1|90000000||||S:9||HRG:1|2||||Star|GiStar||||
+SG|1|H:100&BG:1|H:300||300|1|9000000||||S:9||RSG:1|2||||Star|GiStar||||
+HG|1|H:300&SG:1|H:1000||1000|1|900000||||S:9||RHG:1|2||||Star|GiStar||||
+RG|1|RG:1|||||||||||||||||||||
+SRG|0||||8||2000000000||||S:80||SWD:1&H:2.32&He:0.64&Met:0.08&S:12.4|1|mass:4.8&H:2.32&HE:0.64&MET:0.08||RG|Star|||||
+NRG|0||||10||1000000000||||S:120.||NWD:1&H:3.2&He:1.3&Met:0.2&S:14.3|1|mass:5&H:3.2&HE:1.3&MET:0.2||RG|Star|||||
+MRG|0||||16||200000000||||S:200||LWD:1&H:4.96&He:3.36&Met:0.48&S:20.2|1|mass:6.4&H:4.96&HE:3.36&MET:0.48||RG|Star|||||
+LRG|0||||50||50000000||||S:300||DSN^SGRB%0.1|2|||RG|Star|||||
+HRG|0||||100||10000000||||S:400.||SN^GRB%1|2|||RG|Star|||||
+RSG|0||||300||1000000||||S:500||BSN^LGRB%3|2|||RG|Star|||||
+RHG|0||||1000||100000||||S:600||HN^HGRB%10|2|||RG|Star|||||
+DSN|0||||||1|||2|S:59.1||SNS:1&H:6.5&He:13.5&Met:11&blast:2|2|mass:15&H:6.5&HE:13.5&MET:11||||SNGRBB||||
+SN|0||||||1|||9|S:99.1||LNS:1&H:8&He:50&Met:11&blast:9|2|mass:18&H:8&HE:50&MET:11||||SNGRBB||||
+BSN|0||||||1||.|305|S:309.1||MGT:1&H:15&He:186&Met:15&blast:305|2|mass:21&H:15&HE:186&MET:15||||SNGRBB||||
+HN|0||||||1|||9990|S:939.1||BH40:1&H:30&He:560&Met:30&blast:9990|2|mass:40&H:30&HE:560&MET:30||||SNGRBB||||
+SGRB|0||||||1||0.001|31|S:149.1||BH25:1&H:0.5&He:10&Met:4&blast:31|2|mass:25&H:0.5&HE:10&MET:4||||SNGRBB||||
+GRB|0||||||1||0.01|136|S:239.1||BH30:1&H:19&He:12&Met:5&blast:136|2|mass:30&H:19&HE:12&MET:5||||SNGRBB||||
+LGRB|0||||||1||0.03|3446|S:669.1||BH40:1&H:68&He:18&Met:9&blast:3446|2|mass:40&H:68&HE:18&MET:9||||SNGRBB||||
+HGRB|0||||||1||0.1|97342|S:1939.1||BH60:1&H:0&He:40&Met:10&blast:97342|2|mass:60&H:0&HE:40&MET:10||||SNGRBB||||
+CBD|0||||0.1||||||||||||BD||||||
+WD|1|WD:1|||||||||||||||||||||
+TWD|0||||0.8||||||||||||WD|Star|Degen||||
+SWD|0||||4.8||||||||||||WD|Star|Degen||||
+NWD|0||||5||||||||||||WD|Star|Degen||||
+LWD|0||||6.4||||||||||||WD|Star|Degen||||
+NS|1|NS:1|||||||||||||||||||||
+SNS|0||||15||||||||||||NS|Star|Degen||||
+LNS|0||||18||||||||||||NS|Star|Degen||||
+MGT|1|MGT:1|||21|||||||||||||Star|Degen||||
+BH|1|BH:1|||||||||||||||||||||
+BH25|0||||25||||||||||||BH|BH|BH||||
+BH30|0||||30||||||||||||BH|BH|BH||||
+BH40|0||||40||||||||||||BH|BH|BH||||
+BH60|0||||60||||||||||||BH|BH|BH||||
+SMBH|1|BH:1|||||||||||||||||SMBH||||
+N|1|S:1|H:1||1|10|10000000||||H:10||H:1&S:10|||||CL|CL||||
+G|1|N:1|H:10&N:1||11|10|30000000||||H:150||H:11&S:20|||||CL|CL||||
+STN|1|G:1|H:200&G:1||211|300|30000000|0.5|||H:3000||H:211&S:320|||||CL|CL||||
+MC|1|G:1&S:1300|H:2000&G:1||2011|4000|300000000||||H:90000.||H:2011&S:4020|||||CL|CL||||
+ASTN|1|MC:1&S:60000|H:200000&MC:1||202011|200000|100000000|0.65|||H:2000000||H:202011&S:204020|||||CL|CL||||
+SCD|1|Star:300||Star:1000|||10000000|||||||||||SC|SC||0.1|4|C2.3
+SCS|1|SCD:1&Star:2000||Star:10000&BH:10|||1000000000|||||||||||SC|SC||0.2|44350|C2.4
+SCM|1|SCS:1&Star:20000||Star:100000&BH:100|||3000000000|||||||||||SC|SC||0.3|44289|C2.5
+SCL|1|SCM:1&Star:200000||Star:1000000&BH:1000|||10000000000|||||||||||SC|SC||0.5|44230|C2.6
+SCG|1|SCL:1&Star:2000000||Star:10000000&BH:10000|||30000000000|||||||||||SC|SC||0.8|3|C2.7
+GED|1|SMBH:1&SC:1|SMBH:10000|Star:1000000000&BH:1000000&SC:100|||12000000000|||||||||||GAL|GALE||1|44440|C2.9
+GES|1|GED:1&Star:2000000000|SMBH:100000|Star:10000000000&BH:10000000&SC:1000|||13000000000|||||||||||GAL|GALE||1.5|44409|C3.0
+GEM|1|GES:1&Star:20000000000|SMBH:1000000|Star:100000000000&BH:100000000&SC:10000|||15000000000|||||||||||GAL|GALE||2|44378|C3.1
+GEL|1|GEM:1&Star:200000000000|SMBH:10000000|Star:1000000000000&BH:1000000000&SC:100000|||17000000000|||||||||||GAL|GALE||3|44348|C3.2
+GEG|1|GEL:1&Star:2000000000000|SMBH:100000000|Star:10000000000000&BH:10000000000&SC:1000000|||20000000000|||||||||||GAL|GALE||4.5|44317|C3.3
+GSD|1|GED:1|STN:10000&ASTN:10|GED:1||-5240200|2000000000|0.8|||H:2400000000||H:4112110|||||GAL|GALS|||44318|C2.9
+GSS|1|GES:1|STN:100000&ASTN:100|GES:1||-52402000|3000000000|0.8|||H:36000000000||H:41121100|||||GAL|GALS|||44257|C3.0
+GSM|1|GEM:1|STN:1000000&ASTN:1000|GEM:1||-524020000|4000000000|0.8|||H:480000000000||H:411211000|||||GAL|GALS|||44229|C3.1
+GSL|1|GEL:1|STN:10000000&ASTN:10000|GEL:1||-5240200000|6000000000|0.8|||H:7200000000000||H:4112110000|||||GAL|GALS|||44198|C3.2
+GSG|1|GEG:1|STN:100000000&ASTN:100000|GEG:1||-52402000000|9000000000|0.8|||H:108000000000000||H:41121100000|||||GAL|GALS|||2|C3.3
+LGG|1|GAL:20||GAL:50|||10000000000|||||||||||LS|LS|||44317|C3.4
+LSC|1|LGG:1&GAL:100||LGG:200|||20000000000|||||||||||LS|LS|||44287|C3.6
+LGF|1|LSC:1&LGG:400||LSC:100|||30000000000|||||5||||||LS|LS|||44256|C3.8
+LGW|1|LGF:1&LSC:200||LGF:1000|||60000000000|||||10000||||||LS|LS|||44228|C4.1
+LUB|1|LGW:1&LGF:2000||LGW:1000|||100000000000|||||1000000000||||||LS|LS|||44197|C4.4
+GG|1|GG:1||||||||||||||||Planet|BPlanet||||
+AB|1|AB:1||||||||||||||||Planet|BPlanet||||
+RP|1|RP:1||||||||||||||||Planet|BPlanet||||
+HP|1|HP:1||||||||||||||||Planet|LPlanet|1|||
+LP|1|LP:1||||||||||||||||Planet|LPlanet||||
+EON1|1|EON1:1|||||||||||||||LP|Planet|LPlanet|1|||
+EON2|1|EON2:1|||||||||||||||LP|Planet|LPlanet|1|||
+EON3|1|EON3:1|||||||||||||||LP|Planet|LPlanet|1|||
+EON4|1|EON4:1|||||||||||||||LP|Planet|LPlanet|1|||
+EON5|1|EON5:1|||||||||||||||LP|Planet|LPlanet|1|||
+C0|1|C0:1||||||||||||||||Planet|LPlanet||||
+C0.0|1|C0.0:1|||||||||||||||C0|Planet|LPlanet|1|||
+C0.1|1|C0.1:1|||||||||||||||C0|Planet|LPlanet|1|||
+C0.2|1|C0.2:1|||||||||||||||C0|Planet|LPlanet|1|||
+C0.3|1|C0.3:1|||||||||||||||C0|Planet|LPlanet|1|||
+C0.4|1|C0.4:1|||||||||||||||C0|Planet|LPlanet|1|||
+C0.5|1|C0.5:1|||||||||||||||C0|Planet|LPlanet|1|||
+C0.6|1|C0.6:1|||||||||||||||C0|Planet|LPlanet|1|||
+C0.7|1|C0.7:1|||||||||||||||C0|Planet|LPlanet|1|||
+C0.8|1|C0.8:1|||||||||||||||C0|Planet|LPlanet|1|||
+C0.9|1|C0.9:1|||||||||||||||C0|Planet|LPlanet|1|||
+C1|1|C1:1||||||||||||||||Planet|LPlanet||||
+C1.0|1|C1.0:1|||||||||||||||C1|Planet|LPlanet|1|||
+C1.1|1|C1.1:1|||||||||||||||C1|Planet|LPlanet|1|||
+C1.2|1|C1.2:1|||||||||||||||C1|Planet|LPlanet|1|||
+C1.3|1|C1.3:1|||||||||||||||C1|Planet|LPlanet||||
+C1.4|1|C1.4:1|||||||||||||||C1|Planet|LPlanet||||
+C1.5|1|C1.5:1|||||||||||||||C1|Planet|LPlanet||||
+C1.6|1|C1.6:1|||||||||||||||C1|Planet|LPlanet||||
+C1.7|1|C1.7:1|||||||||||||||C1|Planet|LPlanet||||
+C1.8|1|C1.8:1|||||||||||||||C1|Planet|LPlanet||||
+C1.9|1|C1.9:1|||||||||||||||C1|Planet|LPlanet||||
+C2|1|C2:1|||||||||||||||||||||
+C2.0|1|C2.0:1|||||||||||||||C2||||||
+C2.1|1|C2.1:1|||||||||||||||C2||||||
+C2.2|1|C2.2:1|||||||||||||||C2||||||
+C2.3|1|C2.3:1|||||||||||||||C2||||||
+C2.4|1|C2.4:1|||||||||||||||C2||||||
+C2.5|1|C2.5:1|||||||||||||||C2||||||
+C2.6|1|C2.6:1|||||||||||||||C2||||||
+C2.7|1|C2.7:1|||||||||||||||C2||||||
+C2.8|1|C2.8:1|||||||||||||||C2||||||
+C2.9|1|C2.9:1|||||||||||||||C2||||||
+C3|1|C3:1|||||||||||||||||||||
+C3.0|1|C3.0:1|||||||||||||||C3||||||
+C3.1|1|C3.1:1|||||||||||||||C3||||||
+C3.2|1|C3.2:1|||||||||||||||C3||||||
+C3.3|1|C3.3:1|||||||||||||||C3||||||
+C3.4|1|C3.4:1|||||||||||||||C3||||||
+C3.5|1|C3.5:1|||||||||||||||C3||||||
+C3.6|1|C3.6:1|||||||||||||||C3||||||
+C3.7|1|C3.7:1|||||||||||||||C3||||||
+C3.8|1|C3.8:1|||||||||||||||C3||||||
+C3.9|1|C3.9:1|||||||||||||||C3||||||
+C4|1|C4:1|||||||||||||||||||||
+C4.0|1|C4.0:1|||||||||||||||C4||||||
+C4.1|1|C4.1:1|||||||||||||||C4||||||
+C4.2|1|C4.2:1|||||||||||||||C4||||||
+C4.3|1|C4.3:1|||||||||||||||C4||||||
+C4.4|1|C4.4:1|||||||||||||||C4||||||
+Ct|0||||||||||||||||||||||
+fsho|1|fsho:1|||||||||||||||||||||
+finf|1|finf:1|||||||||||||||||||||
+ftem|1|ftem:1|||||||||||||||||||||
+fcol|1|fcol:1|||||||||||||||||||||
+fpri|1|fpri:1|||||||||||||||||||||
+fsin|1|fsin:1|||||||||||||||||||||
+fren|1|fren:1|||||||||||||||||||||
+finf|1|finf:1|||||||||||||||||||||
+ffro|1|ffro:1|||||||||||||||||||||
+fdes|1|fdes:1|||||||||||||||||||||
+froc|1|froc:1|||||||||||||||||||||
+fpan|1|fpan:1|||||||||||||||||||||
+fgai|1|fgai:1|||||||||||||||||||||
+fdar|1|fdar:1|||||||||||||||||||||
+fede|1|fede:1|||||||||||||||||||||
+fpac|1|fpac:1|||||||||||||||||||||
+fenr|1|fenr:1|||||||||||||||||||||
+fmor|1|fmor:1|||||||||||||||||||||
+fdis|1|fdis:1|||||||||||||||||||||
+frep|1|frep:1|||||||||||||||||||||

data/owniverse_items.txt

@@ -25,49 +25,49 @@ He|helium|ui/1-resources/|1|2|0|
 Met|metal|ui/1-resources/|1|3|0|
 N|nebula|ui/2-stars/|2|0|0|
 G|globula|ui/2-stars/|2|0|1|
-STN|starnursery|ui/2-stars/|2|0|2|
-MC|molecularcloud|ui/2-stars/|2|0|3|
-ASTN|activestarnursery|ui/2-stars/|2|0|4|
-BD|browndwarf|ui/2-stars/|2|1|0|
-RD|reddwarf|ui/2-stars/|2|1|1|
-OD|orangedwarf|ui/2-stars/|2|1|2|
-YD|yellowdwarf|ui/2-stars/|2|1|3|
-WYD|whiteyellowdwarf|ui/2-stars/|2|1|4|
-RG|redgiant|ui/2-stars/|2|2|0|
-WS|whitestar|ui/2-stars/|2|2|1|
-BG|bluegiant|ui/2-stars/|2|2|2|
+STN|star_nursery|ui/2-stars/|2|0|2|
+MC|molecular_cloud|ui/2-stars/|2|0|3|
+ASTN|active_star_nursery|ui/2-stars/|2|0|4|
+BD|brown_dwarf|ui/2-stars/|2|1|0|
+RD|red_dwarf|ui/2-stars/|2|1|1|
+OD|orange_dwarf|ui/2-stars/|2|1|2|
+YD|yellow_dwarf|ui/2-stars/|2|1|3|
+WYD|white_yellow_dwarf|ui/2-stars/|2|1|4|
+RG|red_giant|ui/2-stars/|2|2|0|
+WS|white_star|ui/2-stars/|2|2|1|
+BG|blue_giant|ui/2-stars/|2|2|2|
 SG|supergiant|ui/2-stars/|2|2|3|
 HG|hypergiant|ui/2-stars/|2|2|4|
-WD|whitedwarf|ui/2-stars/|2|3|0|
-NS|neutronstar|ui/2-stars/|2|3|1|
+WD|white_dwarf|ui/2-stars/|2|3|0|
+NS|neutron_star|ui/2-stars/|2|3|1|
 MGT|magnetar|ui/2-stars/|2|3|2|
-BH|blackhole|ui/2-stars/|2|3|3|
-SMBH|supermassiveblackhole|ui/2-stars/|2|3|4|
-SCD|starclusterscattered|ui/3-structures/|3|0|0|
-SCS|starclustersmall|ui/3-structures/|3|0|1|
-SCM|starclustermedium|ui/3-structures/|3|0|2|
-SCL|starclusterlarge|ui/3-structures/|3|0|3|
-SCG|starclustergiant|ui/3-structures/|3|0|4|
-GED|galaxyellipticaldwarf|ui/3-structures/|3|1|0|
-GES|galaxyellipticalsmall|ui/3-structures/|3|1|1|
-GEM|galaxyellipticalmedium|ui/3-structures/|3|1|2|
-GEL|galaxyellipticallarge|ui/3-structures/|3|1|3|
-GEG|galaxyellipticalgiant|ui/3-structures/|3|1|4|
-GSD|galaxyspiraldwarf|ui/3-structures/|3|2|0|
-GSS|galaxyspiralsmall|ui/3-structures/|3|2|1|
-GSM|galaxyspiralmedium|ui/3-structures/|3|2|2|
-GSL|galaxyspirallarge|ui/3-structures/|3|2|3|
-GSG|galaxyspiralgiant|ui/3-structures/|3|2|4|
-LGG|galacticgroup|ui/3-structures/|3|3|0|
-LSC|galacticsupercluster|ui/3-structures/|3|3|1|
-LGF|galacticfilament|ui/3-structures/|3|3|2|
-LGW|galacticwall|ui/3-structures/|3|3|3|
-LUB|universebubble|ui/3-structures/|3|3|4|
-GG|gasgiant|ui/4-life/|4|0|0|
-AB|asteroidbelt|ui/4-life/|4|0|1|
-RP|rockyplanet|ui/4-life/|4|0|2|
-HP|habitableplanet|ui/4-life/|4|0|3|
-LP|livingplanet|ui/4-life/|4|0|4|5
+BH|black_hole|ui/2-stars/|2|3|3|
+SMBH|supermassive_black_hole|ui/2-stars/|2|3|4|
+SCD|star_cluster_scattered|ui/3-structures/|3|0|0|
+SCS|star_cluster_small|ui/3-structures/|3|0|1|
+SCM|star_cluster_medium|ui/3-structures/|3|0|2|
+SCL|star_cluster_large|ui/3-structures/|3|0|3|
+SCG|star_cluster_giant|ui/3-structures/|3|0|4|
+GED|galaxy_elliptical_dwarf|ui/3-structures/|3|1|0|
+GES|galaxy_elliptical_small|ui/3-structures/|3|1|1|
+GEM|galaxy_elliptical_medium|ui/3-structures/|3|1|2|
+GEL|galaxy_elliptical_large|ui/3-structures/|3|1|3|
+GEG|galaxy_elliptical_giant|ui/3-structures/|3|1|4|
+GSD|galaxy_spiral_dwarf|ui/3-structures/|3|2|0|
+GSS|galaxy_spiral_small|ui/3-structures/|3|2|1|
+GSM|galaxy_spiral_medium|ui/3-structures/|3|2|2|
+GSL|galaxy_spiral_large|ui/3-structures/|3|2|3|
+GSG|galaxy_spiral_giant|ui/3-structures/|3|2|4|
+LGG|galactic_group|ui/3-structures/|3|3|0|
+LSC|galactic_super_cluster|ui/3-structures/|3|3|1|
+LGF|galactic_filament|ui/3-structures/|3|3|2|
+LGW|galactic_wall|ui/3-structures/|3|3|3|
+LUB|universe_bubble|ui/3-structures/|3|3|4|
+GG|gas_giant|ui/4-life/|4|0|0|
+AB|asteroid_belt|ui/4-life/|4|0|1|
+RP|rocky_planet|ui/4-life/|4|0|2|
+HP|habitable_planet|ui/4-life/|4|0|3|
+LP|living_planet|ui/4-life/|4|0|4|5
 C0|civ0|ui/4-life/|4|1|0|6
 C1|civ1|ui/4-life/|4|1|1|7
 C2|civ2|ui/4-life/|4|1|2|8

export_presets.cfg

@@ -74,7 +74,7 @@ Remove-Item -Recurse -Force '{temp_dir}'"
 
 name="Android"
 platform="Android"
-runnable=true
+runnable=false
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
@@ -98,11 +98,11 @@ script_export_mode=2
 
 custom_template/debug=""
 custom_template/release=""
-gradle_build/use_gradle_build=true
+gradle_build/use_gradle_build=false
 gradle_build/gradle_build_directory=""
 gradle_build/android_source_template=""
-gradle_build/compress_native_libraries=true
-gradle_build/export_format=1
+gradle_build/compress_native_libraries=false
+gradle_build/export_format=0
 gradle_build/min_sdk=""
 gradle_build/target_sdk=""
 gradle_build/custom_theme_attributes={}
@@ -110,11 +110,11 @@ architectures/armeabi-v7a=false
 architectures/arm64-v8a=true
 architectures/x86=false
 architectures/x86_64=false
-version/code=129
+version/code=143
 version/name=""
 package/unique_name="com.KIDGameProduction.Owniverse"
 package/name="Owniverse"
-package/signed=true
+package/signed=false
 package/app_category=2
 package/retain_data_on_uninstall=false
 package/exclude_from_recents=false

project.godot

@@ -8,24 +8,20 @@
 
 config_version=5
 
-[animation]
-
-compatibility/default_parent_skeleton_in_mesh_instance_3d=true
-
 [application]
 
 config/name="Owniverse"
-config/version="0.6.13"
+config/version="0.6.27"
 run/main_scene="uid://bv384dpmvjv8o"
-config/features=PackedStringArray("4.6", "Mobile")
+config/features=PackedStringArray("4.7", "Mobile")
 boot_splash/show_image=false
-config/icon="uid://do5teb1i7uiuw"
+config/icon="uid://djiwkyk470qb2"
 config/size/borderless=true
 config/stretch_mode=0
 
 [autoload]
 
-Global="*uid://5xb12usvrifm"
+Global="*uid://dy0hrqie4ritn"
 SaveManager="*uid://ul0srjc4gcgg"
 
 [display]

stage/stage.gd

@@ -1,7 +1,5 @@
 extends Control
 
-signal produce_items(item_id: String, amount: int)
-
 const OWNIVERSE_ITEM = preload("uid://d3xjfxwe3w16v")
 
 const SPEED_TEXTURE_NAME_TEMPLATE = "res://ui/topmenu/time&speed/time%s.png"
@@ -75,8 +73,8 @@ var g_active_items: Dictionary = {}
 
 var owniverse:Owniverse = Owniverse.new()
 var owniverse_items: Dictionary[String, OwniverseItem] = {}
+var locked_items: Array = []
 
-var item_list_to_update: Dictionary = {}
 
 func set_datetime(value: float):
     date_time.text = str(snapped(value, 0.1))
@@ -84,25 +82,32 @@ func set_datetime(value: float):
 #region Item manipulations: update and visibility
 
 
-func add_to_update_list(item_id: String, amount: int) -> void:
-    if item_list_to_update.has(item_id):
-        item_list_to_update[item_id] += amount
-    else:
-        item_list_to_update[item_id] = amount
-
-
 func set_owniverse_item_value() -> void:
-    for item_id in owniverse.items_to_update:
-        if owniverse_items.has(item_id):
-            owniverse_items[item_id].set_label(owniverse.items_to_update[item_id])
-    owniverse.items_to_update = {}
-
-
-#func unlock_owniverse_item() -> void:
-    #pass
+    for _item_id in owniverse_items:
+        owniverse_items[_item_id].set_label(owniverse.state.amount[_item_id])
+        
 
 #endregion
 
+
+func _unlock_items():
+    if locked_items.size() == 0: return
+    var _new_locked_items = []
+    for _item_id in locked_items:
+        #print(_item_id ' | ', _entity.unlock)
+        var _flag_to_unlock = true
+        for _elem in owniverse.entities[_item_id].unlock:
+            if owniverse.state.stats.total_amount[_elem] < owniverse.entities[_item_id].unlock[_elem]:
+                _flag_to_unlock = false
+                break
+
+        if _flag_to_unlock:
+            owniverse_items[_item_id].set_visible(true)
+        else:
+            _new_locked_items.append(_item_id)
+    locked_items = _new_locked_items
+
+
 func _on_indicator_pressed(indicator_name: String, page: int = 0):
     _set_description(indicator_name, page)
 
@@ -165,7 +170,7 @@ func _init_owniverse_items() -> bool:
         item.item_activated.connect(item_activated)
         
         owniverse_items[item_id] = item
-
+        
     return false
 
 
@@ -174,11 +179,8 @@ func item_activated(item: OwniverseItem) -> void:
     _set_item_description(item)
     
     if item.item_id == "S" or item.item_id == "H":
-        owniverse.produce(item.item_id, 100_000)
-        
-func _unlock_item(item_id: String):
-    owniverse_items[item_id].set_visible(true)
-
+        var _value = owniverse.produce_hs(item.item_id, 100_000)
+    
 
 func _check_counters(delta: float) -> Array:
     var actions: Array = []
@@ -196,7 +198,7 @@ func _check_counters(delta: float) -> Array:
     return actions
 
 
-#region Swipe
+#region Swipe and page
 
 func _do_actions(actions: Array) -> void:
     for action: String in actions:
@@ -231,41 +233,21 @@ func _input(event: InputEvent) -> void:
         g_counters.swipe.value = 0
     elif event is InputEventScreenTouch:
         pass
-#endregion
 
-
-func _ready() -> void:
-    owniverse.init_enitities()
-    owniverse.load_data()
-    _init_owniverse_items()
-    
-    owniverse.unlock_item.connect(_unlock_item)
-    g_counters.swipe.sec = 0.2
-
-    for pa in page_actions:
-        page_actions[pa].action_pressed.connect(_page_action_pressed)
-        page_actions[pa].page_id = pa
-
-    
-func _process(delta: float) -> void:
-    
-    var year_delta: float = owniverse.add_time_delta(delta)
-    set_datetime(year_delta)
-    owniverse.cycle(year_delta)
-    
-    var actions = _check_counters(delta)
-    _do_actions(actions)
-    
-    _set_active_page_actions()
     
 func _set_active_page_actions() -> void:
     for pa in page_actions:
         if !g_active_items.has(pa): continue
         
         var item_id: String = g_active_items[pa].item_id
-        var amount = owniverse.get_available_to_produce(item_id)
-        page_actions[pa].set_actions(item_id, amount)
+        var entity: OwniverseEntity = owniverse.entities[item_id]
+
+        #var amount = owniverse.get_available_to_produce(item_id)
         
+        #var amount = owniverse.get_available_to_produce(entity)
+        var amount = owniverse.calculate_max_producible(entity)
+        #print(item_id, " : ", amount)
+        page_actions[pa].set_actions(item_id, amount)        
 
 
 func _page_action_pressed(page_id: int, action_amount: float) -> void:
@@ -278,8 +260,42 @@ func _page_action_pressed(page_id: int, action_amount: float) -> void:
         owniverse.produce(item_id, action_amount)
 
 
+#endregion
+
+
+func _ready() -> void:
+    var inited_result = owniverse.init_enitities()
+    locked_items = inited_result.locked_items
+    owniverse.load_data()
+    _init_owniverse_items()
+    
+    g_counters.swipe.sec = 0.2
+
+    for pa in page_actions:
+        page_actions[pa].action_pressed.connect(_page_action_pressed)
+        page_actions[pa].page_id = pa
+
+    
+func _process(delta: float) -> void:
+    
+    owniverse.evolute(delta)
+    set_datetime(owniverse.state.year)
+    
+    #owniverse.cycle(delta)
+    
+    #owniverse.cycle_legacy(year_delta)
+    
+    var actions = _check_counters(delta)
+    _do_actions(actions)
+    
+    _set_active_page_actions()
+
+
 func _change_speed(delta: int) -> void:
-    var speed: int = owniverse.change_speed(delta)
+    
+    owniverse.speed = owniverse.speed + delta
+    
+    var speed: int = owniverse.speed
     var ind: int = 1
     for icon in g_speed_icons:
         if ind <= speed:
@@ -299,8 +315,15 @@ func _change_speed(delta: int) -> void:
  
    
 func _on_topmenu_button_pressed(ButtonName) -> void:
-    print(ButtonName)
+    print("Debug: ", owniverse.state)
+    #var s: float = 1E15
+    #var z = 1.0
+    #for i in range(30):
+        #print(i, " | ", z, " | ", " | ", s - z)
+        #z *= 10
 
 
-func _on_save_data() -> void:
+func _on_unlock_and_save_timeout() -> void:
     owniverse.save_data()
+    
+    _unlock_items()

tools/counter.gd.uid

@@ -0,0 +1 @@
+uid://b3vs2tjw60yu2