diff --git a/Stage/stage.gd b/Stage/stage.gd index ef39575..c4dc916 100644 --- a/Stage/stage.gd +++ b/Stage/stage.gd @@ -4,7 +4,7 @@ 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" +const SPEED_TEXTURE_NAME_TEMPLATE = "res://ui/topmenu/time&speed/time%s.png" const PAGE_COUNT = 5 const PAGE_WIDTH = 1080 @@ -161,9 +161,6 @@ func _init_owniverse_items() -> bool: item.init_button(item_props) item.item_activated.connect(item_activated) - #if owniverse.entities.has(item_id): - #item.visible = owniverse.entities[item_id].is_unlocked - owniverse_items[item_id] = item return false @@ -173,14 +170,11 @@ func item_activated(item: OwniverseItem) -> void: _control_page(item) _set_item_description(item) - print(item.item_id) if item.item_id == "S" or item.item_id == "H": owniverse.produce(item.item_id, 1) func _unlock_item(item_id: String): owniverse_items[item_id].visible = true - print("Unlocked ", item_id) - pass func _check_counters(delta: float) -> Array: diff --git a/UI/action/action_button.png b/UI/action/action_button.png new file mode 100644 index 0000000..ebbb4fe --- /dev/null +++ b/UI/action/action_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efff339d442098c501fd13b1caf3c0515437997d730cc72a682d2b3c00fe316e +size 37835 diff --git a/command_processor.gd b/command_processor.gd deleted file mode 100644 index ef9e5c7..0000000 --- a/command_processor.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends Node - -func print_smth(smth: String): - pass - print(smth) diff --git a/command_processor.gd.uid b/command_processor.gd.uid deleted file mode 100644 index 5b999f9..0000000 --- a/command_processor.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://xte4iwvipeve diff --git a/data/legacy/Versions.csv b/data/legacy/versions.txt similarity index 96% rename from data/legacy/Versions.csv rename to data/legacy/versions.txt index 1944034..943e9ad 100644 --- a/data/legacy/Versions.csv +++ b/data/legacy/versions.txt @@ -1,5 +1,6 @@ Version|Content:en|Content:ru -0.5.1.|Minor fixes|Незначительные правки +0.6.12.128|Unlock|Раблокироровка +0.5.1|Minor fixes|Незначительные правки 0.5.0|WooHoo! Public release|Ура! Публичный релиз 0.4.8|Ads double forces|Реклама удваивает силы 0.4.7|Forces rebalanced|Силы перебалансированы diff --git a/data/owniverse_entitites.txt b/data/owniverse_entitites.txt index 23a8335..be07a8e 100644 --- a/data/owniverse_entitites.txt +++ b/data/owniverse_entitites.txt @@ -4,8 +4,8 @@ H|1|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:0MET: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.05MET:0.01|HP:1:0.01&RP:1:0.21&GG:2:0.08&AB:3:0.4||Star|DwStar||| +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||| @@ -14,21 +14,21 @@ 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.64MET: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.3MET: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.36MET:0.48||RG|Star|||| +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.5MET: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:50MET: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:186MET: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:560MET: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:10MET: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:12MET: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:18MET: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:40MET:10||||SNGRBB||| +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||| diff --git a/data/owniverse_items.txt b/data/owniverse_items.txt index 2ab54df..d29ee83 100644 --- a/data/owniverse_items.txt +++ b/data/owniverse_items.txt @@ -1,125 +1,125 @@ id|name|image|page|row|col|sub_page -fsho|Shovelin|ui/0-forces/|0|0|0| -finf|Inflatin|ui/0-forces/|0|0|1| -ftem|Temporite|ui/0-forces/|0|0|2| -fcol|Collisite|ui/0-forces/|0|0|3| -fpri|Primex|ui/0-forces/|0|0|4| -fsin|Singularite|ui/0-forces/|0|1|0| -fren|Renewin|ui/0-forces/|0|1|1| -finf|Infusite|ui/0-forces/|0|1|2| -ffro|Frostin|ui/0-forces/|0|1|3| -fdes|Destellarite|ui/0-forces/|0|1|4| -froc|Rockex|ui/0-forces/|0|2|0| -fpan|Panspermin|ui/0-forces/|0|2|1| -fgai|Gaianite|ui/0-forces/|0|2|2| -fdar|Darwinite|ui/0-forces/|0|2|3| -fede|Edenex|ui/0-forces/|0|2|4| -fpac|Pacifin|ui/0-forces/|0|3|0| -fenr|Enragein|ui/0-forces/|0|3|1| -fmor|Moralite|ui/0-forces/|0|3|2| -fdis|Discriminite|ui/0-forces/|0|3|3| -frep|Reprex|ui/0-forces/|0|3|4| -S|Space|ui/1-resources/|1|0|0| -H|Hydrogen|ui/1-resources/|1|1|0| -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| -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| -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 -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 -C3|Civ3|ui/4-life/|4|1|3|9 -C4|Civ4|ui/4-life/|4|1|4|10 -EON1|Archean|ui/4-life/living/|5|0|0| -EON2|Proterozoic|ui/4-life/living/|5|0|1| -EON3|Paleozoic|ui/4-life/living/|5|0|2| -EON4|Mezozoic|ui/4-life/living/|5|0|3| -EON5|Cenozoic|ui/4-life/living/|5|0|4| -C0.0|Civ0.0|ui/4-life/civ0/|6|0|0| -C0.1|Civ0.1|ui/4-life/civ0/|6|0|1| -C0.2|Civ0.2|ui/4-life/civ0/|6|0|2| -C0.3|Civ0.3|ui/4-life/civ0/|6|0|3| -C0.4|Civ0.4|ui/4-life/civ0/|6|0|4| -C0.5|Civ0.5|ui/4-life/civ0/|6|1|0| -C0.6|Civ0.6|ui/4-life/civ0/|6|1|1| -C0.7|Civ0.7|ui/4-life/civ0/|6|1|2| -C0.8|Civ0.8|ui/4-life/civ0/|6|1|3| -C0.9|Civ0.9|ui/4-life/civ0/|6|1|4| -C1.0|Civ1.0|ui/4-life/civ1/|7|0|0| -C1.1|Civ1.1|ui/4-life/civ1/|7|0|1| -C1.2|Civ1.2|ui/4-life/civ1/|7|0|2| -C1.3|Civ1.3|ui/4-life/civ1/|7|0|3| -C1.4|Civ1.4|ui/4-life/civ1/|7|0|4| -C1.5|Civ1.5|ui/4-life/civ1/|7|1|0| -C1.6|Civ1.6|ui/4-life/civ1/|7|1|1| -C1.7|Civ1.7|ui/4-life/civ1/|7|1|2| -C1.8|Civ1.8|ui/4-life/civ1/|7|1|3| -C1.9|Civ1.9|ui/4-life/civ1/|7|1|4| -C2.0|Civ2.0|ui/4-life/civ2/|8|0|0| -C2.1|Civ2.1|ui/4-life/civ2/|8|0|1| -C2.2|Civ2.2|ui/4-life/civ2/|8|0|2| -C2.3|Civ2.3|ui/4-life/civ2/|8|0|3| -C2.4|Civ2.4|ui/4-life/civ2/|8|0|4| -C2.5|Civ2.5|ui/4-life/civ2/|8|1|0| -C2.6|Civ2.6|ui/4-life/civ2/|8|1|1| -C2.7|Civ2.7|ui/4-life/civ2/|8|1|2| -C2.8|Civ2.8|ui/4-life/civ2/|8|1|3| -C2.9|Civ2.9|ui/4-life/civ2/|8|1|4| -C3.0|Civ3.0|ui/4-life/civ3/|9|0|0| -C3.1|Civ3.1|ui/4-life/civ3/|9|0|1| -C3.2|Civ3.2|ui/4-life/civ3/|9|0|2| -C3.3|Civ3.3|ui/4-life/civ3/|9|0|3| -C3.4|Civ3.4|ui/4-life/civ3/|9|0|4| -C3.5|Civ3.5|ui/4-life/civ3/|9|1|0| -C3.6|Civ3.6|ui/4-life/civ3/|9|1|1| -C3.7|Civ3.7|ui/4-life/civ3/|9|1|2| -C3.8|Civ3.8|ui/4-life/civ3/|9|1|3| -C3.9|Civ3.9|ui/4-life/civ3/|9|1|4| -C4.0|Civ4.0|ui/4-life/civ4/|10|0|0| -C4.1|Civ4.1|ui/4-life/civ4/|10|0|1| -C4.2|Civ4.2|ui/4-life/civ4/|10|0|2| -C4.3|Civ4.3|ui/4-life/civ4/|10|0|3| -C4.4|Civ4.4|ui/4-life/civ4/|10|0|4| \ No newline at end of file +fsho|shovelin|ui/0-forces/|0|0|0| +finf|inflatin|ui/0-forces/|0|0|1| +ftem|temporite|ui/0-forces/|0|0|2| +fcol|collisite|ui/0-forces/|0|0|3| +fpri|primex|ui/0-forces/|0|0|4| +fsin|singularite|ui/0-forces/|0|1|0| +fren|renewin|ui/0-forces/|0|1|1| +finf|infusite|ui/0-forces/|0|1|2| +ffro|frostin|ui/0-forces/|0|1|3| +fdes|destellarite|ui/0-forces/|0|1|4| +froc|rockex|ui/0-forces/|0|2|0| +fpan|panspermin|ui/0-forces/|0|2|1| +fgai|gaianite|ui/0-forces/|0|2|2| +fdar|darwinite|ui/0-forces/|0|2|3| +fede|edenex|ui/0-forces/|0|2|4| +fpac|pacifin|ui/0-forces/|0|3|0| +fenr|enragein|ui/0-forces/|0|3|1| +fmor|moralite|ui/0-forces/|0|3|2| +fdis|discriminite|ui/0-forces/|0|3|3| +frep|reprex|ui/0-forces/|0|3|4| +S|space|ui/1-resources/|1|0|0| +H|hydrogen|ui/1-resources/|1|1|0| +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| +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| +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 +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 +C3|civ3|ui/4-life/|4|1|3|9 +C4|civ4|ui/4-life/|4|1|4|10 +EON1|archean|ui/4-life/living/|5|0|0| +EON2|proterozoic|ui/4-life/living/|5|0|1| +EON3|paleozoic|ui/4-life/living/|5|0|2| +EON4|mezozoic|ui/4-life/living/|5|0|3| +EON5|cenozoic|ui/4-life/living/|5|0|4| +C0.0|civ0.0|ui/4-life/civ0/|6|0|0| +C0.1|civ0.1|ui/4-life/civ0/|6|0|1| +C0.2|civ0.2|ui/4-life/civ0/|6|0|2| +C0.3|civ0.3|ui/4-life/civ0/|6|0|3| +C0.4|civ0.4|ui/4-life/civ0/|6|0|4| +C0.5|civ0.5|ui/4-life/civ0/|6|1|0| +C0.6|civ0.6|ui/4-life/civ0/|6|1|1| +C0.7|civ0.7|ui/4-life/civ0/|6|1|2| +C0.8|civ0.8|ui/4-life/civ0/|6|1|3| +C0.9|civ0.9|ui/4-life/civ0/|6|1|4| +C1.0|civ1.0|ui/4-life/civ1/|7|0|0| +C1.1|civ1.1|ui/4-life/civ1/|7|0|1| +C1.2|civ1.2|ui/4-life/civ1/|7|0|2| +C1.3|civ1.3|ui/4-life/civ1/|7|0|3| +C1.4|civ1.4|ui/4-life/civ1/|7|0|4| +C1.5|civ1.5|ui/4-life/civ1/|7|1|0| +C1.6|civ1.6|ui/4-life/civ1/|7|1|1| +C1.7|civ1.7|ui/4-life/civ1/|7|1|2| +C1.8|civ1.8|ui/4-life/civ1/|7|1|3| +C1.9|civ1.9|ui/4-life/civ1/|7|1|4| +C2.0|civ2.0|ui/4-life/civ2/|8|0|0| +C2.1|civ2.1|ui/4-life/civ2/|8|0|1| +C2.2|civ2.2|ui/4-life/civ2/|8|0|2| +C2.3|civ2.3|ui/4-life/civ2/|8|0|3| +C2.4|civ2.4|ui/4-life/civ2/|8|0|4| +C2.5|civ2.5|ui/4-life/civ2/|8|1|0| +C2.6|civ2.6|ui/4-life/civ2/|8|1|1| +C2.7|civ2.7|ui/4-life/civ2/|8|1|2| +C2.8|civ2.8|ui/4-life/civ2/|8|1|3| +C2.9|civ2.9|ui/4-life/civ2/|8|1|4| +C3.0|civ3.0|ui/4-life/civ3/|9|0|0| +C3.1|civ3.1|ui/4-life/civ3/|9|0|1| +C3.2|civ3.2|ui/4-life/civ3/|9|0|2| +C3.3|civ3.3|ui/4-life/civ3/|9|0|3| +C3.4|civ3.4|ui/4-life/civ3/|9|0|4| +C3.5|civ3.5|ui/4-life/civ3/|9|1|0| +C3.6|civ3.6|ui/4-life/civ3/|9|1|1| +C3.7|civ3.7|ui/4-life/civ3/|9|1|2| +C3.8|civ3.8|ui/4-life/civ3/|9|1|3| +C3.9|civ3.9|ui/4-life/civ3/|9|1|4| +C4.0|civ4.0|ui/4-life/civ4/|10|0|0| +C4.1|civ4.1|ui/4-life/civ4/|10|0|1| +C4.2|civ4.2|ui/4-life/civ4/|10|0|2| +C4.3|civ4.3|ui/4-life/civ4/|10|0|3| +C4.4|civ4.4|ui/4-life/civ4/|10|0|4| \ No newline at end of file diff --git a/export_presets.cfg b/export_presets.cfg index b15d133..d113df0 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -80,7 +80,7 @@ custom_features="" export_filter="all_resources" include_filter="res://autoload/*.*, *.gd, *.tscn, *.tres, *.json, *.txt, *.png, res://autoload/entitites.txt" exclude_filter="" -export_path="../../Documents/Owad/Owniverse.I/Builds/owniverse.0.6.11-127.aab" +export_path="../../Documents/Owad/Owniverse.I/Builds/owniverse.0.6.12-128.aab" patches=PackedStringArray() patch_delta_encoding=false patch_delta_compression_level_zstd=19 @@ -110,7 +110,7 @@ architectures/armeabi-v7a=false architectures/arm64-v8a=true architectures/x86=false architectures/x86_64=false -version/code=127 +version/code=128 version/name="" package/unique_name="com.KIDGameProduction.Owniverse" package/name="Owniverse" diff --git a/project.godot b/project.godot index b4e65fc..4b05276 100644 --- a/project.godot +++ b/project.godot @@ -15,11 +15,10 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true [application] config/name="Owniverse" -config/version="0.6.11" +config/version="0.6.12" run/main_scene="uid://bv384dpmvjv8o" config/features=PackedStringArray("4.6", "Mobile") boot_splash/show_image=false -boot_splash/stretch_mode=0 config/icon="uid://do5teb1i7uiuw" [autoload] @@ -31,7 +30,6 @@ SaveManager="*uid://ul0srjc4gcgg" window/size/viewport_width=1080 window/size/viewport_height=1920 -window/size/borderless=true window/size/extend_to_title=true window/stretch/mode="viewport" window/handheld/orientation=1 diff --git a/world/Background/background.gd b/world/Background/background.gd index 6ba98c9..c51e5a1 100644 --- a/world/Background/background.gd +++ b/world/Background/background.gd @@ -2,10 +2,9 @@ extends Node2D @export_group("Visual Settings") @export var STARRY_SKY_LAYER: PackedScene -@export var Star_Count: int = 2000: set = set_star_count +@export var Star_Count: int = 2000 -@export var Background_Image_Size: Vector2 = Vector2(1080, 1920): - set = set_Background_Image_Size +@export var Background_Image_Size: Vector2 = Vector2(1080, 1920) @export var Background_Layers: Array [StarrySkyLayer] var Stars_by_Layers: Dictionary = {} @@ -59,10 +58,11 @@ func _ready() -> void: initiate_layers() randomize_parallax() generate_layers() + randomize_parallax(0) -func _process(delta: float) -> void: - if randi_range(0, 1000) == 0: - randomize_parallax() +#func _process(delta: float) -> void: + #if randi_range(0, 1000) == 0: + #randomize_parallax() func _draw() -> void: draw_rect(Rect2(Vector2.ZERO, Background_Image_Size), BACKGROUND_COLOR) @@ -71,8 +71,8 @@ func generate_layers(): var max_rnd_seed = STAR_COLOR_DISTRIBUTION[-1][0] for ind1 in range(Star_Count): - var star_coords = Vector2(randi_range(0, Background_Image_Size.x), - randi_range(0, Background_Image_Size.y)) + var star_coords = Vector2(randf_range(0, Background_Image_Size.x), + randf_range(0, Background_Image_Size.y)) var rnd_seed = randi_range(0, max_rnd_seed) for item:Array in STAR_COLOR_DISTRIBUTION: var item_seed = item[0] @@ -94,10 +94,12 @@ func initiate_layers(): var new_star_layer:StarrySkyLayer = STARRY_SKY_LAYER.instantiate() add_child(new_star_layer) new_star_layer.Background_Image_Size = Background_Image_Size - #new_star_layer.autoscroll = (ind1 + 1) * DEFAULT_AUTOSCROL Background_Layers.append(new_star_layer) -func randomize_parallax(): +func randomize_parallax(chance: int = 120): + if randi_range(0, chance) != 0: + return + var x_offset = 0 var y_offset = 0 if _random_sign() == 1: @@ -119,14 +121,3 @@ func _random_sign() -> int: return [1, -1].pick_random() #endregion - -#region Сеттеры для автоматического обновления -func set_Background_Image_Size(value: Vector2): - Background_Image_Size = value - queue_redraw() - -func set_star_count(value: int): - Star_Count = value - queue_redraw() - -#endregion diff --git a/world/owniverse.gd b/world/owniverse.gd index 0562b56..43fc4d9 100644 --- a/world/owniverse.gd +++ b/world/owniverse.gd @@ -23,8 +23,9 @@ func cycle(delta: float) -> void: func produce(item_id: String, amount: int) -> void: - if item_id == "S" or item_id == 'H': - entities[item_id].amount += 1 + #if item_id == "S" or item_id == 'H': + #entities[item_id].amount += 1 + entities[item_id].amount += amount var entity: OwniverseEntity = entities[item_id] _process_enitity(entity, amount) @@ -54,15 +55,10 @@ func _check_locked_items() -> void: for elem in entity.unlock: if cumulative_amount[elem] < entity.unlock[elem]: continue - print(entity.id, " ", elem, ":", entity.unlock[elem]) + #print(entity.id, " ", elem, ":", entity.unlock[elem]) unlock_item.emit(entity.id) locked_entities.erase(entity) - # unlock here - return - - - - + return # SIC! #endregion diff --git a/world/world.tscn b/world/world.tscn index 529acff..322e1d3 100644 --- a/world/world.tscn +++ b/world/world.tscn @@ -49,6 +49,9 @@ script = ExtResource("1_ifjjt") STARRY_SKY_LAYER = ExtResource("2_behgl") +[node name="Timer" type="Timer" parent="Background" unique_id=188844703] +autostart = true + [node name="Stage" type="Control" parent="." unique_id=1485959841] custom_minimum_size = Vector2(1080, 1920) layout_mode = 3 @@ -214,7 +217,7 @@ layout_mode = 2 layout_mode = 2 [node name="Description" type="RichTextLabel" parent="Stage/StageRows/PageScroller/HBoxContainer/ForcePage" unique_id=1934400572] -custom_minimum_size = Vector2(0, 670) +custom_minimum_size = Vector2(0, 384) layout_mode = 2 size_flags_vertical = 3 theme_override_fonts/normal_font = ExtResource("14_o7xkw") @@ -227,8 +230,6 @@ theme_override_font_sizes/bold_italics_font_size = 42 theme_override_font_sizes/italics_font_size = 42 theme_override_font_sizes/mono_font_size = 42 bbcode_enabled = true -text = "Forces" -fit_content = true horizontal_alignment = 1 [node name="Border" parent="Stage/StageRows/PageScroller/HBoxContainer/ForcePage" unique_id=519355296 instance=ExtResource("12_58wjt")] @@ -350,7 +351,7 @@ texture = ExtResource("23_bcq5b") layout_mode = 2 [node name="Description" type="RichTextLabel" parent="Stage/StageRows/PageScroller/HBoxContainer/ResourcePage" unique_id=1171833] -custom_minimum_size = Vector2(0, 670) +custom_minimum_size = Vector2(0, 384) layout_mode = 2 size_flags_vertical = 3 theme_override_fonts/normal_font = ExtResource("14_o7xkw") @@ -363,7 +364,6 @@ theme_override_font_sizes/bold_italics_font_size = 42 theme_override_font_sizes/italics_font_size = 42 theme_override_font_sizes/mono_font_size = 42 bbcode_enabled = true -fit_content = true horizontal_alignment = 1 [node name="Border" parent="Stage/StageRows/PageScroller/HBoxContainer/ResourcePage" unique_id=1268799323 instance=ExtResource("12_58wjt")] @@ -470,7 +470,7 @@ texture = ExtResource("28_upe80") layout_mode = 2 [node name="Description" type="RichTextLabel" parent="Stage/StageRows/PageScroller/HBoxContainer/StarPage" unique_id=1195874488] -custom_minimum_size = Vector2(0, 670) +custom_minimum_size = Vector2(0, 384) layout_mode = 2 size_flags_vertical = 3 theme_override_fonts/normal_font = ExtResource("14_o7xkw") @@ -604,7 +604,7 @@ texture = ExtResource("23_bcq5b") layout_mode = 2 [node name="Description" type="RichTextLabel" parent="Stage/StageRows/PageScroller/HBoxContainer/StructurePage" unique_id=414749774] -custom_minimum_size = Vector2(0, 670) +custom_minimum_size = Vector2(0, 384) layout_mode = 2 size_flags_vertical = 3 theme_override_fonts/normal_font = ExtResource("14_o7xkw") @@ -745,7 +745,7 @@ texture = ExtResource("41_mi6gc") layout_mode = 2 [node name="Description" type="RichTextLabel" parent="Stage/StageRows/PageScroller/HBoxContainer/LifePage" unique_id=454792539] -custom_minimum_size = Vector2(0, 670) +custom_minimum_size = Vector2(0, 384) layout_mode = 2 size_flags_vertical = 3 theme_override_fonts/normal_font = ExtResource("14_o7xkw") @@ -822,6 +822,13 @@ offset_top = 512.0 offset_right = 1080.0 offset_bottom = 1024.0 +[node name="Border" parent="Stage/StageRows" unique_id=145801370 instance=ExtResource("12_58wjt")] +layout_mode = 2 + +[node name="HBoxContainer" type="HBoxContainer" parent="Stage/StageRows" unique_id=1880020851] +custom_minimum_size = Vector2(0, 184) +layout_mode = 2 + [node name="ItemAmountUpdate" type="Timer" parent="Stage" unique_id=1953928024] wait_time = 0.2 autostart = true @@ -829,6 +836,7 @@ autostart = true [node name="CommandProcessor" type="Node" parent="." unique_id=2069361293] script = ExtResource("42_1s1fv") +[connection signal="timeout" from="Background/Timer" to="Background" method="randomize_parallax"] [connection signal="pressed" from="Stage/StageRows/TopMenu/BurgerButton" to="Stage" method="_on_topmenu_button_pressed" binds= ["Burger"]] [connection signal="pressed" from="Stage/StageRows/TopMenu/TimeMinus" to="Stage" method="_change_speed" binds= [-1]] [connection signal="pressed" from="Stage/StageRows/TopMenu/TimePlus" to="Stage" method="_change_speed" binds= [1]]