endless-sky · ravenshining · Jan 11, 2025 · Jan 11, 2025 · Jan 11, 2025 · Jan 11, 2025
diff --git a/copyright b/copyright
@@ -2312,6 +2312,7 @@ License: CC-BY-SA-4.0
 Comment: Derived from work by Michael Zahniser (under the same licence) and Red-57 (under the same licence).
 
 Files:
+ images/asteroid/ice/*
  images/effect/korath?afterburner*
  images/ship/chaser*
  images/ship/world-ship*
@@ -2321,6 +2322,13 @@ Copyright: Lia Gerty (https://github.com/ravenshining)
 License: CC-BY-SA-4.0
 Comment: Derived from work by Michael Zahniser (under the same licence)
 
+Files:
+ images/outfit/harvested?ice*
+ images/effect/flotsam?ice*
+Copyright: Lia Gerty (https://github.com/ravenshining)
+License: CC-BY-SA-4.0
+Comment: Derived from work by Michael Zahniser (under the same licence) and public domain works from pxhere.com.
+
 Files:
  images/outfit/torpedopod*
  images/outfit/typhoonpod*

diff --git a/data/harvesting.txt b/data/harvesting.txt
@@ -77,6 +77,28 @@ outfit "Gold"
 	description "Useful for its high electrical conductivity and prized for its beauty and luxury status, gold can always find a well-paying market."
 
 
+minable "ice"
+	sprite "asteroid/ice/spin"
+	hull 150
+	"random hull" 150
+	payload "Ice" 50
+		"toughness" 1000
+	explode "puff" 40
+	explode "bolide" 20
+	explode "asteroid crunch small"
+
+outfit "Ice"
+	plural "Ice"
+	category "Minerals"
+	cost 200
+	thumbnail "outfit/harvested ice"
+	"flotsam sprite" "effect/flotsam ice"
+	"mass" 1
+	"installable" -1
+	"minable" 1
+	description "Water ice may be nearly worthless to anyone who doesn't need it, but it is the most precious thing in the universe to those who do."
+
+
 minable "iron"
 	sprite "asteroid/iron/spin"
 	hull 1440
@@ -297,6 +319,62 @@ outfit "Yottrite"
 	description "An extraordinarily rare crystalline formation, forged over tens of thousands of years in the molecular clouds around supernova remnants. Although less advanced species can potentially harvest it, very few civilizations other than the Quarg have developed the technology needed to incorporate yottrite in an alloy."
 
 
+# The following worthless, durable asteroids share the same name and sprite as the tileable asteroids, for easy conversion to and from belts
+
+minable "small metal"
+	"display name" "Barren"
+	sprite "asteroid/small metal/spin"
+	hull 30000
+	"random hull" 10000
+	explode "smoke" 30
+	explode "puff" 30
+	explode "asteroid crunch small"
+
+minable "medium metal"
+	"display name" "Barren"
+	sprite "asteroid/medium metal/spin"
+	hull 40000
+	"random hull" 10000
+	explode "smoke" 40
+	explode "puff" 40
+	explode "asteroid crunch medium"
+
+minable "large metal"
+	"display name" "Barren"
+	sprite "asteroid/large rock/spin"
+	hull 50000
+	"random hull" 10000
+	explode "smoke" 50
+	explode "puff" 50
+	explode "asteroid crunch large"
+
+minable "small rock"
+	"display name" "Barren"
+	sprite "asteroid/small rock/spin"
+	hull 20000
+	"random hull" 10000
+	explode "smoke" 20
+	explode "puff" 20
+	explode "asteroid crunch small"
+
+minable "medium rock"
+	"display name" "Barren"
+	sprite "asteroid/medium rock/spin"
+	hull 30000
+	"random hull" 10000
+	explode "smoke" 30
+	explode "puff" 30
+	explode "asteroid crunch medium"
+
+minable "large rock"
+	"display name" "Barren"
+	sprite "asteroid/large rock/spin"
+	hull 40000
+	"random hull" 10000
+	explode "smoke" 40
+	explode "puff" 40
+	explode "asteroid crunch large"
+
 
 # The following are not traditional asteroids, and are not present at the start of the game.
 # They are added to specific systems in the Ember Waste during the events of the 'Remnant: Cognizance' missions.

diff --git a/data/map planets.txt b/data/map planets.txt
@@ -705,6 +705,16 @@ planet "Celestial Third"
 	spaceport `The constant stream of freighters passing through this spaceport is a testament to how much food is needed to feed the densely populated Kimek worlds, in particular their homeworld in the neighboring star system. The city that hosts the spaceport has also become something of a tourist destination for those with adventurous culinary tastes; restaurants here serve recipes native to each of the Coalition species, along with some dishes that blend their three cuisines in unique and sometimes surprising ways.`
 	security 0.5
 
+planet Ceres
+	attributes mining moon "near earth"
+	landscape land/snow37
+	description `Once faintly and occasionally visible from Earth, Ceres enjoyed status as a planet in the ninteeth century prior the discovery of Neptune and the asteroid belt. Its status wavered, usually considered an asteroid, until the discovery of Eris which led to its classification as a dwarf planet.`
+	description	`	Ceres's clay crust over a muddy core sports brine cryovolcones and a tenuous water vapour atmosphere. Conveniently located in the asteroid belt and just within Sol's hyper limit, Ceres has long been a favored stopover for miners and interstellar travellers.`
+	spaceport `The landing pad looks extremely unstable, but you are assured that the low gravity will prevent your ship from sinking into the surface or setting off an eruption.`
+	spaceport `	In a lively cantina, friendly staff serve warm spelt pancakes to children listening with rapt attention to the miners trading stories with out-system travellers.`
+	outfitter "Basic Outfits"
+	outfitter "Ammo North"
+
 planet Charon
 	attributes moon "near earth"
 	landscape land/snow22
@@ -1441,6 +1451,13 @@ planet Eragarthro
 	bribe 0
 	security 0
 
+planet Eris
+	attributes moon "near earth"
+	landscape land/snow38
+	description `Eris's brief and controversial claim to being the "tenth planet" cast the proverbial golden apple into the scientific community, condemning Pluto and itself to "dwarf planet" status. More massive than Pluto, free from orbital resonance with Neptune, and without many objects in its orbit, it could almost qualify under the new rules, if not for its extreme distance from Sol making it difficult to perturb the remaining asteroids in its path.`
+	description `	Eris is exceptionally bright, owing to its extreme cold allowing methane to condense even it its warmer regions. The atmosphere of methane and nitrogen is formed through cycles of sublimation from the surface ice.`
+	government Uninhabited
+
 planet "Esayaku Fen"
 	attributes korath
 	landscape land/badlands5
@@ -4043,7 +4060,7 @@ planet Placer
 
 planet Pluto
 	attributes moon "near earth"
-	landscape land/moon1
+	landscape land/mars3
 	description `Pluto has been the subject of significant debate over the years. Originally termed a planet, it was reclassified as a dwarf planet back at the dawn of the third millennium. Over a thousand years later, there are still some who term it the ninth planet in the Sol system. Given that most navigational systems can track everything of gravitational significance in a system, what exactly the category of an object is has become a discussion without much interest to modern spacefarers.`
 	description `	This planet is best known for its eccentric and inclined orbit that takes it inside the orbit of Neptune. This, combined with the fact that it is considered to be a binary system, as the barycenter of its orbit does not lie within it, but instead is at a point in between Pluto and Charon's surfaces.`
 	government Uninhabited

diff --git a/data/map systems.txt b/data/map systems.txt
@@ -32313,22 +32313,24 @@ system Sol
 	arrival 4300
 	departure 4189
 	habitable 1496
-	belt 4189 100
+	belt 4189 10
+	belt 59839 100
 	haze _menu/haze-67
 	link "Alpha Centauri"
 	link Altair
 	link Caph
 	link Denebola
 	link Sirius
 	link Vega
-	# asteroids "small rock" 30 2.691
-	# asteroids "large rock" 50 5.0508
-	# asteroids "medium metal" 4 2.8566
-	# asteroids "large metal" 1 2.2356
+	minables "small rock" 300 2.691
+	minables "large rock" 500 5.0508
+	minables "medium metal" 40 2.8566
+	minables "large metal" 10 2.2356
 	minables iron 500 4.64499
 	minables aluminum 200 3
 	minables gold 20 25
 	minables silicon 300 2
+	minables ice 400 30
 	trade Clothing 282
 	trade Electronics 745
 	trade Equipment 491
@@ -32370,6 +32372,10 @@ system Sol
 		sprite planet/mars
 		distance 2281
 		period 687.001
+	object Ceres
+		sprite planet/rhea
+		distance 4140
+		period 1680
 	object Jupiter
 		sprite planet/jupiter
 		distance 7787
@@ -32427,13 +32433,23 @@ system Sol
 			distance 195
 			period -5.8
 	object Pluto
-		sprite planet/neptune
+		sprite planet/europa
 		distance 59062
 		period 90498.1
 		object Charon
 			sprite planet/tethys
 			distance 195
 			period 5.8
+	object Eris
+		sprite planet/miranda
+# Average of semi-major axis and perhelion to reduce map stretch
+		distance 79385
+		period 204199
+		object
+			sprite planet/rock7
+				scale 0.5
+			distance 373
+			period 15.8
 
 system "Sol Arach"
 	pos -711.587 649.051

diff --git a/images/asteroid/ice/spin-00.png b/images/asteroid/ice/spin-00.png
diff --git a/images/asteroid/ice/spin-01.png b/images/asteroid/ice/spin-01.png
diff --git a/images/asteroid/ice/spin-02.png b/images/asteroid/ice/spin-02.png
diff --git a/images/asteroid/ice/spin-03.png b/images/asteroid/ice/spin-03.png
diff --git a/images/asteroid/ice/spin-04.png b/images/asteroid/ice/spin-04.png
diff --git a/images/asteroid/ice/spin-05.png b/images/asteroid/ice/spin-05.png
diff --git a/images/asteroid/ice/spin-06.png b/images/asteroid/ice/spin-06.png
diff --git a/images/asteroid/ice/spin-07.png b/images/asteroid/ice/spin-07.png
diff --git a/images/asteroid/ice/spin-08.png b/images/asteroid/ice/spin-08.png
diff --git a/images/asteroid/ice/spin-09.png b/images/asteroid/ice/spin-09.png
diff --git a/images/asteroid/ice/spin-10.png b/images/asteroid/ice/spin-10.png
diff --git a/images/asteroid/ice/spin-11.png b/images/asteroid/ice/spin-11.png
diff --git a/images/asteroid/ice/spin-12.png b/images/asteroid/ice/spin-12.png
diff --git a/images/asteroid/ice/spin-13.png b/images/asteroid/ice/spin-13.png
diff --git a/images/asteroid/ice/spin-14.png b/images/asteroid/ice/spin-14.png
diff --git a/images/asteroid/ice/spin-15.png b/images/asteroid/ice/spin-15.png
diff --git a/images/asteroid/ice/spin-16.png b/images/asteroid/ice/spin-16.png
diff --git a/images/asteroid/ice/spin-17.png b/images/asteroid/ice/spin-17.png
diff --git a/images/asteroid/ice/spin-18.png b/images/asteroid/ice/spin-18.png
diff --git a/images/asteroid/ice/spin-19.png b/images/asteroid/ice/spin-19.png
diff --git a/images/asteroid/ice/spin-20.png b/images/asteroid/ice/spin-20.png
diff --git a/images/asteroid/ice/spin-21.png b/images/asteroid/ice/spin-21.png
diff --git a/images/asteroid/ice/spin-22.png b/images/asteroid/ice/spin-22.png
diff --git a/images/asteroid/ice/spin-23.png b/images/asteroid/ice/spin-23.png
diff --git a/images/asteroid/ice/spin-24.png b/images/asteroid/ice/spin-24.png
diff --git a/images/asteroid/ice/spin-25.png b/images/asteroid/ice/spin-25.png
diff --git a/images/asteroid/ice/spin-26.png b/images/asteroid/ice/spin-26.png
diff --git a/images/asteroid/ice/spin-27.png b/images/asteroid/ice/spin-27.png
diff --git a/images/asteroid/ice/spin-28.png b/images/asteroid/ice/spin-28.png
diff --git a/images/asteroid/ice/spin-29.png b/images/asteroid/ice/spin-29.png
diff --git a/images/asteroid/ice/spin-30.png b/images/asteroid/ice/spin-30.png
diff --git a/images/asteroid/ice/spin-31.png b/images/asteroid/ice/spin-31.png
diff --git a/images/asteroid/ice/spin-32.png b/images/asteroid/ice/spin-32.png
diff --git a/images/asteroid/ice/spin-33.png b/images/asteroid/ice/spin-33.png
diff --git a/images/asteroid/ice/spin-34.png b/images/asteroid/ice/spin-34.png
diff --git a/images/asteroid/ice/spin-35.png b/images/asteroid/ice/spin-35.png
diff --git a/images/asteroid/ice/spin-36.png b/images/asteroid/ice/spin-36.png
diff --git a/images/asteroid/ice/spin-37.png b/images/asteroid/ice/spin-37.png
diff --git a/images/asteroid/ice/spin-38.png b/images/asteroid/ice/spin-38.png
diff --git a/images/asteroid/ice/spin-39.png b/images/asteroid/ice/spin-39.png
diff --git a/images/asteroid/ice/spin-40.png b/images/asteroid/ice/spin-40.png
diff --git a/images/asteroid/ice/spin-41.png b/images/asteroid/ice/spin-41.png
diff --git a/images/asteroid/ice/spin-42.png b/images/asteroid/ice/spin-42.png
diff --git a/images/asteroid/ice/spin-43.png b/images/asteroid/ice/spin-43.png
diff --git a/images/asteroid/ice/spin-44.png b/images/asteroid/ice/spin-44.png
diff --git a/images/asteroid/ice/spin-45.png b/images/asteroid/ice/spin-45.png
diff --git a/images/asteroid/ice/spin-46.png b/images/asteroid/ice/spin-46.png
diff --git a/images/asteroid/ice/spin-47.png b/images/asteroid/ice/spin-47.png
diff --git a/images/asteroid/ice/spin-48.png b/images/asteroid/ice/spin-48.png
diff --git a/images/asteroid/ice/spin-49.png b/images/asteroid/ice/spin-49.png
diff --git a/images/asteroid/ice/spin-50.png b/images/asteroid/ice/spin-50.png
diff --git a/images/asteroid/ice/spin-51.png b/images/asteroid/ice/spin-51.png
diff --git a/images/asteroid/ice/spin-52.png b/images/asteroid/ice/spin-52.png
diff --git a/images/asteroid/ice/spin-53.png b/images/asteroid/ice/spin-53.png
diff --git a/images/effect/flotsam ice.png b/images/effect/flotsam ice.png
diff --git a/images/outfit/harvested ice.png b/images/outfit/harvested ice.png