diff --git a/Autoload/Global.gd.uid b/Autoload/Global.gd.uid index 4c96183..cf822c8 100644 --- a/Autoload/Global.gd.uid +++ b/Autoload/Global.gd.uid @@ -1 +1 @@ -uid://5xb12usvrifm +uid://dojk16crca3cx diff --git a/Tools/Counter.gd.uid b/Tools/Counter.gd.uid index 013c273..ddc4dbb 100644 --- a/Tools/Counter.gd.uid +++ b/Tools/Counter.gd.uid @@ -1 +1 @@ -uid://dnshr5nb2v60a +uid://b3vs2tjw60yu2 diff --git a/UI/2-Stars/ActiveStarNursery.png b/UI/2-Stars/active_star_nursery.png similarity index 100% rename from UI/2-Stars/ActiveStarNursery.png rename to UI/2-Stars/active_star_nursery.png diff --git a/UI/2-Stars/BlueGiant.png b/UI/2-Stars/blue_giant.png similarity index 100% rename from UI/2-Stars/BlueGiant.png rename to UI/2-Stars/blue_giant.png diff --git a/UI/2-Stars/BrownDwarf.png b/UI/2-Stars/brown_dwarf.png similarity index 100% rename from UI/2-Stars/BrownDwarf.png rename to UI/2-Stars/brown_dwarf.png diff --git a/UI/2-Stars/MolecularCloud.png b/UI/2-Stars/molecular_cloud.png similarity index 100% rename from UI/2-Stars/MolecularCloud.png rename to UI/2-Stars/molecular_cloud.png diff --git a/UI/2-Stars/NeutronStar.png b/UI/2-Stars/neutron_star.png similarity index 100% rename from UI/2-Stars/NeutronStar.png rename to UI/2-Stars/neutron_star.png diff --git a/UI/2-Stars/OrangeDwarf.png b/UI/2-Stars/orange_dwarf.png similarity index 100% rename from UI/2-Stars/OrangeDwarf.png rename to UI/2-Stars/orange_dwarf.png diff --git a/UI/2-Stars/RedDwarf.png b/UI/2-Stars/red_dwarf.png similarity index 100% rename from UI/2-Stars/RedDwarf.png rename to UI/2-Stars/red_dwarf.png diff --git a/UI/2-Stars/RedGiant.png b/UI/2-Stars/red_giant.png similarity index 100% rename from UI/2-Stars/RedGiant.png rename to UI/2-Stars/red_giant.png diff --git a/UI/2-Stars/StarNursery.png b/UI/2-Stars/star_nursery.png similarity index 100% rename from UI/2-Stars/StarNursery.png rename to UI/2-Stars/star_nursery.png diff --git a/UI/2-Stars/SupermassiveBlackHole.png b/UI/2-Stars/supermassive_blackhole.png similarity index 100% rename from UI/2-Stars/SupermassiveBlackHole.png rename to UI/2-Stars/supermassive_blackhole.png diff --git a/UI/2-Stars/WhiteDwarf.png b/UI/2-Stars/white_dwarf.png similarity index 100% rename from UI/2-Stars/WhiteDwarf.png rename to UI/2-Stars/white_dwarf.png diff --git a/UI/2-Stars/WhiteStar.png b/UI/2-Stars/white_star.png similarity index 100% rename from UI/2-Stars/WhiteStar.png rename to UI/2-Stars/white_star.png diff --git a/UI/2-Stars/WhiteYellowDwarf.png b/UI/2-Stars/white_yellow_dwarf.png similarity index 100% rename from UI/2-Stars/WhiteYellowDwarf.png rename to UI/2-Stars/white_yellow_dwarf.png diff --git a/UI/2-Stars/YellowDwarf.png b/UI/2-Stars/yellow_dwarf.png similarity index 100% rename from UI/2-Stars/YellowDwarf.png rename to UI/2-Stars/yellow_dwarf.png diff --git a/UI/4-Life/AsteroidBelt.png b/UI/4-Life/asteroid_belt.png similarity index 100% rename from UI/4-Life/AsteroidBelt.png rename to UI/4-Life/asteroid_belt.png diff --git a/UI/4-Life/GasGiant.png b/UI/4-Life/gas_giant.png similarity index 100% rename from UI/4-Life/GasGiant.png rename to UI/4-Life/gas_giant.png diff --git a/UI/4-Life/HabitablePlanet.png b/UI/4-Life/habitable_planet.png similarity index 100% rename from UI/4-Life/HabitablePlanet.png rename to UI/4-Life/habitable_planet.png diff --git a/UI/4-Life/LivingPlanet.png b/UI/4-Life/living_planet.png similarity index 100% rename from UI/4-Life/LivingPlanet.png rename to UI/4-Life/living_planet.png diff --git a/UI/4-Life/RockyPlanet.png b/UI/4-Life/rocky_planet.png similarity index 100% rename from UI/4-Life/RockyPlanet.png rename to UI/4-Life/rocky_planet.png diff --git a/UI/Indicators/Explosiveness/ExplosivenessPointer.png b/UI/Indicators/Explosiveness/explosiveness_pointer.png similarity index 100% rename from UI/Indicators/Explosiveness/ExplosivenessPointer.png rename to UI/Indicators/Explosiveness/explosiveness_pointer.png diff --git a/UI/owniverse_item/owniverse_item.tscn b/UI/owniverse_item/owniverse_item.tscn index 92cb83a..60f96dd 100644 --- a/UI/owniverse_item/owniverse_item.tscn +++ b/UI/owniverse_item/owniverse_item.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://d3xjfxwe3w16v"] [ext_resource type="Script" uid="uid://bxxllddlgurus" path="res://ui/owniverse_item/owniverse_item.gd" id="1_e6ro1"] -[ext_resource type="Texture2D" uid="uid://56w57w6iu3np" path="res://ui/owniverse_item/Selected.png" id="2_eurq3"] +[ext_resource type="Texture2D" uid="uid://56w57w6iu3np" path="res://ui/owniverse_item/selected.png" id="2_eurq3"] [node name="Button" type="Control" unique_id=667620208] visible = false diff --git a/data/owniverse_items.txt b/data/owniverse_items.txt index d29ee83..f8515cf 100644 --- a/data/owniverse_items.txt +++ b/data/owniverse_items.txt @@ -25,24 +25,24 @@ 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| +SMBH|supermassive_blackhole|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| @@ -63,11 +63,11 @@ 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 +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 diff --git a/world/owniverse.gd b/world/owniverse.gd index b94702e..ce0de13 100644 --- a/world/owniverse.gd +++ b/world/owniverse.gd @@ -27,7 +27,7 @@ var entity_batches = {} func cycle(year_delta: float) -> void: # all owniverse activity should be called here _auto_production(year_delta) - _entity_evolution(year_delta) + #_entity_evolution(year_delta) _check_locked_items() @@ -49,6 +49,7 @@ func _auto_production(year_delta: float) -> void: func _entity_evolution(year_delta: float) -> void: + print("evolution: ", year_delta) pass func _get_distribution(source: Dictionary) -> Dictionary: @@ -151,7 +152,7 @@ func change_speed(delta: int) -> int: func load_data() -> bool: - var is_succesfull = false + #var _is_succesfull = false var game_data: Dictionary = SaveManager.load_data("owniverse", "qwerty") if game_data == {}: diff --git a/world/world.tscn b/world/world.tscn index b45f994..04f3325 100644 --- a/world/world.tscn +++ b/world/world.tscn @@ -8,31 +8,31 @@ [ext_resource type="Texture2D" uid="uid://cjcchycx7biyl" path="res://ui/topmenu/time&speed/timex.png" id="6_pfbnl"] [ext_resource type="FontFile" uid="uid://dtyi81a0phumr" path="res://fonts/Roboto_Condensed/RobotoCondensed-Bold.ttf" id="7_gwdna"] [ext_resource type="Texture2D" uid="uid://davmv5mwt3mo1" path="res://ui/topmenu/time&speed/speed.png" id="8_h4vgh"] -[ext_resource type="Texture2D" uid="uid://cnjtnggw5ccq3" path="res://ui/topmenu/time&speed/time1.png" id="9_kvuv0"] +[ext_resource type="Texture2D" uid="uid://bftfd0d5rkon5" path="res://ui/topmenu/time&speed/time1.png" id="9_kvuv0"] [ext_resource type="Texture2D" uid="uid://rmdsdkck0vst" path="res://ui/topmenu/buttons/buton.report.normal.png" id="10_sg5c8"] [ext_resource type="Texture2D" uid="uid://dbhkuw2jshyoh" path="res://ui/topmenu/buttons/buton.report.pressed.png" id="11_vu62d"] [ext_resource type="PackedScene" uid="uid://dg15dpxiepicb" path="res://ui/border/border.tscn" id="12_58wjt"] -[ext_resource type="Texture2D" uid="uid://dgkmobpfbbffa" path="res://ui/pages/forces.en.png" id="13_dp8ul"] +[ext_resource type="Texture2D" uid="uid://btq70xgqq14od" path="res://ui/pages/Forces.en.png" id="13_dp8ul"] [ext_resource type="FontFile" uid="uid://d3k1ddvv0rmhs" path="res://fonts/Roboto_Condensed/RobotoCondensed-Light.ttf" id="14_o7xkw"] [ext_resource type="FontFile" uid="uid://8s0fv3gfj317" path="res://fonts/Roboto_Condensed/RobotoCondensed-BoldItalic.ttf" id="15_bfrib"] [ext_resource type="FontFile" uid="uid://derqj4pbwtae6" path="res://fonts/Roboto_Condensed/RobotoCondensed-Italic.ttf" id="16_mip0j"] [ext_resource type="PackedScene" uid="uid://dwneq2qq5p8ek" path="res://ui/actions/actions.tscn" id="17_ifjjt"] -[ext_resource type="Texture2D" uid="uid://i43jaaejvh5f" path="res://ui/indicators/energy/energy.png" id="17_l6135"] +[ext_resource type="Texture2D" uid="uid://rqk6n3lcxi32" path="res://ui/indicators/energy/energy.png" id="17_l6135"] [ext_resource type="Texture2D" uid="uid://bef36h52n7lxb" path="res://ui/indicators/energy/border-energy.png" id="18_uvuuk"] -[ext_resource type="Texture2D" uid="uid://blq0anccuu387" path="res://ui/pages/resources.en.png" id="19_an6vj"] -[ext_resource type="Texture2D" uid="uid://cvc1stj3hoax5" path="res://ui/indicators/density/density.png" id="20_s3ar6"] +[ext_resource type="Texture2D" uid="uid://brl8ojsykr5ki" path="res://ui/pages/Resources.en.png" id="19_an6vj"] +[ext_resource type="Texture2D" uid="uid://d3nhbp7wvctvf" path="res://ui/indicators/density/density.png" id="20_s3ar6"] [ext_resource type="Texture2D" uid="uid://df2nus1pmcc67" path="res://ui/indicators/density/density_crunch.png" id="21_d36xh"] [ext_resource type="Texture2D" uid="uid://bbk74pjqgxe32" path="res://ui/indicators/density/density_rip.png" id="22_vu83j"] [ext_resource type="Texture2D" uid="uid://bm8ae1ffv7xq5" path="res://ui/indicators/density/density_pointer.png" id="23_bcq5b"] -[ext_resource type="Texture2D" uid="uid://dbcmaot2c3tg5" path="res://ui/indicators/burnability/burnability.png" id="24_o2i0n"] +[ext_resource type="Texture2D" uid="uid://c3icljpbnj4fo" path="res://ui/indicators/burnability/burnability.png" id="24_o2i0n"] [ext_resource type="Texture2D" uid="uid://sry5js57vds4" path="res://ui/indicators/burnability/burnability_pointer.png" id="25_rur7c"] -[ext_resource type="Texture2D" uid="uid://38fl8ovnubh8" path="res://ui/pages/stars.en.png" id="26_y1rwn"] -[ext_resource type="Texture2D" uid="uid://ysbavtgmq7me" path="res://ui/indicators/explosiveness/explosiveness.png" id="27_4rajv"] -[ext_resource type="Texture2D" uid="uid://bbint5cvwtrou" path="res://ui/indicators/explosiveness/explosivenessPointer.png" id="28_upe80"] -[ext_resource type="Texture2D" uid="uid://cbi24bwo70nk" path="res://ui/pages/structures.en.png" id="29_0drd1"] -[ext_resource type="Texture2D" uid="uid://cfttpatxe6k2u" path="res://ui/indicators/aggression/aggression.png" id="30_bemti"] +[ext_resource type="Texture2D" uid="uid://bv68o2unxtljh" path="res://ui/pages/Stars.en.png" id="26_y1rwn"] +[ext_resource type="Texture2D" uid="uid://brb3hw23smntm" path="res://ui/indicators/explosiveness/explosiveness.png" id="27_4rajv"] +[ext_resource type="Texture2D" uid="uid://cno3ktmfxdiig" path="res://ui/indicators/explosiveness/explosiveness_pointer.png" id="28_upe80"] +[ext_resource type="Texture2D" uid="uid://coqcg8fo4lttb" path="res://ui/pages/Structures.en.png" id="29_0drd1"] +[ext_resource type="Texture2D" uid="uid://dxrnqx16lvca3" path="res://ui/indicators/aggression/aggression.png" id="30_bemti"] [ext_resource type="Texture2D" uid="uid://dm87u2ku8wec8" path="res://ui/indicators/aggression/aggression_pointer.png" id="31_x6tg5"] -[ext_resource type="Texture2D" uid="uid://bpff5o5oa4wag" path="res://ui/pages/planets.en.png" id="32_xitqn"] +[ext_resource type="Texture2D" uid="uid://gkr4uuva1dmt" path="res://ui/pages/Planets.en.png" id="32_xitqn"] [ext_resource type="Texture2D" uid="uid://bgjcnwl61nu5i" path="res://ui/indicators/trends/trend_bar1.png" id="33_fprte"] [ext_resource type="Texture2D" uid="uid://caiyhk6vv53iu" path="res://ui/indicators/trends/trend_bar2.png" id="34_lnsl1"] [ext_resource type="Texture2D" uid="uid://dspjxpbpwq52k" path="res://ui/indicators/trends/trend_icon_2.png" id="35_1u5dl"]