diff --git a/UI/2-Stars/BlackHole.png b/UI/2-Stars/black_hole.png similarity index 100% rename from UI/2-Stars/BlackHole.png rename to UI/2-Stars/black_hole.png diff --git a/UI/2-Stars/supermassive_blackhole.png b/UI/2-Stars/supermassive_black_hole.png similarity index 100% rename from UI/2-Stars/supermassive_blackhole.png rename to UI/2-Stars/supermassive_black_hole.png diff --git a/UI/3-Structures/GalacticFilament.png b/UI/3-structures/galactic_filament.png similarity index 100% rename from UI/3-Structures/GalacticFilament.png rename to UI/3-structures/galactic_filament.png diff --git a/UI/3-Structures/GalacticGroup.png b/UI/3-structures/galactic_group.png similarity index 100% rename from UI/3-Structures/GalacticGroup.png rename to UI/3-structures/galactic_group.png diff --git a/UI/3-Structures/GalacticSupercluster.png b/UI/3-structures/galactic_super_cluster.png similarity index 100% rename from UI/3-Structures/GalacticSupercluster.png rename to UI/3-structures/galactic_super_cluster.png diff --git a/UI/3-Structures/GalacticWall.png b/UI/3-structures/galactic_wall.png similarity index 100% rename from UI/3-Structures/GalacticWall.png rename to UI/3-structures/galactic_wall.png diff --git a/UI/3-Structures/GalaxyEllipticalDwarf.png b/UI/3-structures/galaxy_elliptical_dwarf.png similarity index 100% rename from UI/3-Structures/GalaxyEllipticalDwarf.png rename to UI/3-structures/galaxy_elliptical_dwarf.png diff --git a/UI/3-Structures/GalaxyEllipticalGiant.png b/UI/3-structures/galaxy_elliptical_giant.png similarity index 100% rename from UI/3-Structures/GalaxyEllipticalGiant.png rename to UI/3-structures/galaxy_elliptical_giant.png diff --git a/UI/3-Structures/GalaxyEllipticalLarge.png b/UI/3-structures/galaxy_elliptical_large.png similarity index 100% rename from UI/3-Structures/GalaxyEllipticalLarge.png rename to UI/3-structures/galaxy_elliptical_large.png diff --git a/UI/3-Structures/GalaxyEllipticalMedium.png b/UI/3-structures/galaxy_elliptical_medium.png similarity index 100% rename from UI/3-Structures/GalaxyEllipticalMedium.png rename to UI/3-structures/galaxy_elliptical_medium.png diff --git a/UI/3-Structures/GalaxyEllipticalSmall.png b/UI/3-structures/galaxy_elliptical_small.png similarity index 100% rename from UI/3-Structures/GalaxyEllipticalSmall.png rename to UI/3-structures/galaxy_elliptical_small.png diff --git a/UI/3-Structures/GalaxySpiralDwarf.png b/UI/3-structures/galaxy_spiral_dwarf.png similarity index 100% rename from UI/3-Structures/GalaxySpiralDwarf.png rename to UI/3-structures/galaxy_spiral_dwarf.png diff --git a/UI/3-Structures/GalaxySpiralGiant.png b/UI/3-structures/galaxy_spiral_giant.png similarity index 100% rename from UI/3-Structures/GalaxySpiralGiant.png rename to UI/3-structures/galaxy_spiral_giant.png diff --git a/UI/3-Structures/GalaxySpiralLarge.png b/UI/3-structures/galaxy_spiral_large.png similarity index 100% rename from UI/3-Structures/GalaxySpiralLarge.png rename to UI/3-structures/galaxy_spiral_large.png diff --git a/UI/3-Structures/GalaxySpiralMedium.png b/UI/3-structures/galaxy_spiral_medium.png similarity index 100% rename from UI/3-Structures/GalaxySpiralMedium.png rename to UI/3-structures/galaxy_spiral_medium.png diff --git a/UI/3-Structures/GalaxySpiralSmall.png b/UI/3-structures/galaxy_spiral_small.png similarity index 100% rename from UI/3-Structures/GalaxySpiralSmall.png rename to UI/3-structures/galaxy_spiral_small.png diff --git a/UI/3-Structures/StarClusterGiant.png b/UI/3-structures/star_cluster_giant.png similarity index 100% rename from UI/3-Structures/StarClusterGiant.png rename to UI/3-structures/star_cluster_giant.png diff --git a/UI/3-Structures/StarClusterLarge.png b/UI/3-structures/star_cluster_large.png similarity index 100% rename from UI/3-Structures/StarClusterLarge.png rename to UI/3-structures/star_cluster_large.png diff --git a/UI/3-Structures/StarClusterMedium.png b/UI/3-structures/star_cluster_medium.png similarity index 100% rename from UI/3-Structures/StarClusterMedium.png rename to UI/3-structures/star_cluster_medium.png diff --git a/UI/3-Structures/StarClusterScattered.png b/UI/3-structures/star_cluster_scattered.png similarity index 100% rename from UI/3-Structures/StarClusterScattered.png rename to UI/3-structures/star_cluster_scattered.png diff --git a/UI/3-Structures/StarClusterSmall.png b/UI/3-structures/star_cluster_small.png similarity index 100% rename from UI/3-Structures/StarClusterSmall.png rename to UI/3-structures/star_cluster_small.png diff --git a/UI/3-Structures/UniverseBubble.png b/UI/3-structures/universe_bubble.png similarity index 100% rename from UI/3-Structures/UniverseBubble.png rename to UI/3-structures/universe_bubble.png diff --git a/data/owniverse_items.txt b/data/owniverse_items.txt index f8515cf..8cd6b85 100644 --- a/data/owniverse_items.txt +++ b/data/owniverse_items.txt @@ -41,28 +41,28 @@ HG|hypergiant|ui/2-stars/|2|2|4| 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|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| -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| +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| diff --git a/world/owniverse.gd b/world/owniverse.gd index ce0de13..e0687a5 100644 --- a/world/owniverse.gd +++ b/world/owniverse.gd @@ -4,8 +4,8 @@ class_name Owniverse signal unlock_item(item_id: String) var current_year: float = 0 -var current_speed: int = 1 -var current_speed_in_years:int = 1 +var current_speed: float = 1 +var current_speed_in_years:float = 1 var entities: Dictionary[String, OwniverseEntity] = {} var entity_groups: Dictionary[String, Array] = {} @@ -86,8 +86,8 @@ func produce(item_id: String, amount: float) -> void: func automated_production(_delta: float) -> void: for entity_id in auto_production: - var entity = entities[entity_id] - var amount_to_produce = int(entity.amount * entity.product_per_year_amount * _delta) + var _entity = entities[entity_id] + var _amount_to_produce = int(_entity.amount * _entity.product_per_year_amount * _delta) func get_available_to_produce(item_id: String) -> float: @@ -140,7 +140,7 @@ func add_time_delta(delta) -> float: return current_year -func change_speed(delta: int) -> int: +func change_speed(delta: int) -> float: current_speed = clamp(current_speed + delta, 1, Global.SPEED_LIMIT) current_speed_in_years = pow(10, current_speed - 1) return current_speed