Merge pull request #2 from kestrel1110/resolving_conflicts

Resolving conflicts

Author: kestrel1110

data/admap.txt

@@ -25,7 +25,7 @@ system "At Andol"
 		period 10
 
 system "Ed Andol"
-	pos 642 -594
+	pos 43.5549 -1133.37
 	government Adamas
 	habitable 1715
 	link "Fen Kthest"
@@ -87,7 +87,7 @@ system "Exasir Sora"
 			period 59.0274
 
 system "Fen Dol"
-	pos 744 -517
+	pos 122.846 -1080.14
 	government Adamas
 	habitable 425.92
 	link "Fen Ustef"
@@ -133,7 +133,7 @@ system "Fen Dol"
 		period 2047.5
 
 system "Fen Kedol"
-	pos 615 -655
+	pos 26.4017 -1165.88
 	government Adamas
 	habitable 745.92
 	link Th'el
@@ -148,7 +148,7 @@ system "Fen Kedol"
 		period 30
 
 system "Fen Kthest"
-	pos 730 -565
+	pos 113.214 -1145.59
 	government Adamas
 	habitable 486.68
 	link "Ed Andol"
@@ -208,7 +208,7 @@ system "Fen Kthest"
 			period 37.2865
 
 system "Fen Quatef"
-	pos 497 -621
+	pos -80.2227 -1163.05
 	government Adamas
 	habitable 1715
 	link Th'el
@@ -269,7 +269,7 @@ system "Fen Quatef"
 			period 37.2865
 
 system "Fen Ustef"
-	pos 660 -534
+	pos 51.0606 -1099.5
 	government Adamas
 	habitable 425.92
 	link "Fen Dol"
@@ -322,7 +322,7 @@ system "Fen Ustef"
 			offset 253.413
 
 system Kth'el
-	pos 509 -585
+	pos -89.1264 -1106.65
 	government Adamas
 	habitable 233.28
 	link Thtleh
@@ -369,7 +369,7 @@ system Kth'el
 			period 22.4347
 
 system Leh'el
-	pos 606 -510
+	pos -10.0334 -1038.98
 	government Adamas
 	habitable 945
 	link Thtleh
@@ -430,7 +430,7 @@ system Leh'el
 			period 24.6031
 
 system "Nes'el Thoelst"
-	pos 531 -669
+	pos -32.4189 -1188.7
 	government Adamas
 	habitable 8640
 	link Th'el
@@ -464,7 +464,7 @@ system "Nes'el Thoelst"
 			period 14.4846
 
 system Ph'el
-	pos 518 -518
+	pos -68.7472 -1042.69
 	government Adamas
 	habitable 625
 	link Thtleh
@@ -514,7 +514,7 @@ system Ph'el
 			period 29.6191
 
 system Th'el
-	pos 562 -632
+	pos -30.513 -1145.73
 	government Adamas
 	habitable 425.92
 	link "Nes'el Thoelst"
@@ -567,7 +567,7 @@ system Th'el
 			period 27.6424
 
 system Thtleh
-	pos 575 -564
+	pos -19.6174 -1086.75
 	government Adamas
 	habitable 486.68
 	link Th'el
@@ -617,7 +617,7 @@ system Thtleh
 			period 23.3384
 
 system Tlagn'el
-	pos 567 -483
+	pos 36.7205 -1051.01
 	government Adamas
 	habitable 135
 	link Thtleh
@@ -677,17 +677,6 @@ planet Aventurine
 	bribe 0.9
 	security 0.9
 
-planet "Dolthtleh"
-	attributes adamas "adamas industrial target"
-	landscape land/blueglowland
-	description `Dolthtleh guards the sole entry to Adamas space, the Remembrance Vortex, as it is called by the Adamas. Because only one Adamas planet is suitable for agriculture, Dolthtleh was designed to hold massive districts of farmland, growing a highly adaptable food crop, which is distributed across all Adamas space. So much waste is produced and dumped, from the reactors powering the station, and from the abundant animals raised here, that the station has its own small moon orbiting it, made up entirely of this waste, and any space rocks that attempt to hit the station.`
-	spaceport `The station's docking bays are located on the interior of its semi-circular shape, in hexagonal patterns. Ships that dock in them are tethered to each of the twelve vertices of the hexagon. The station is made of metal and crystal that is referred to by the Adamas as "recycled" metal and crystal - the biological metal and crystal which grows on Adamas, after the bodies of the dead have been melted down. This allows them to create larger and more durable structures, while saving the room which cemetaries would otherwise take up.`
-	shipyard "Adamas Basics"
-	outfitter "Local Map"
-	"required reputation" 1
-	bribe 0.9
-	security 0.9
-
 planet Carodite
 	attributes adamas "adamas industrial target" "adamas food target"
 	landscape land/admsand1
@@ -719,5 +708,20 @@ planet Crozonite
 	bribe 0.9
 	security 0.9
 
-planet "Reminder Vortex"
+planet Dolthtleh
+	attributes adamas "adamas industrial target"
+	landscape land/blueglowland
+	description `Dolthtleh guards the sole entry to Adamas space, the Remembrance Vortex, as it is called by the Adamas. Because only one Adamas planet is suitable for agriculture, Dolthtleh was designed to hold massive districts of farmland, growing a highly adaptable food crop, which is distributed across all Adamas space. So much waste is produced and dumped, from the reactors powering the station, and from the abundant animals raised here, that the station has its own small moon orbiting it, made up entirely of this waste, and any space rocks that attempt to hit the station.`
+	spaceport `The station's docking bays are located on the interior of its semi-circular shape, in hexagonal patterns. Ships that dock in them are tethered to each of the twelve vertices of the hexagon. The station is made of metal and crystal that is referred to by the Adamas as "recycled" metal and crystal - the biological metal and crystal which grows on Adamas, after the bodies of the dead have been melted down. This allows them to create larger and more durable structures, while saving the room which cemetaries would otherwise take up.`
+	shipyard "Adamas Basics"
+	outfitter "Local Map"
+	"required reputation" 1
+	bribe 0.9
+	security 0.9
+
 planet "Remembrance Vortex"
+	landscape ""
+
+planet "Reminder Vortex"
+	landscape ""
+

data/scrappers.txt

@@ -9,14 +9,14 @@
 # PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
 
-ship "Scrapper"
-	sprite "ship/scrapper"
+ship "Scavenger Scrapper"
+	sprite "ship/Scavenger Scrapper"
 	attributes
-		category "Medium Warship"
+		category "Heavy Warship"
 		"cost" 88700000
 		"shields" 187000
 		"hull" 82300
-		"required crew" 342
+		"required crew" 242
 		"bunks" 422
 		"mass" 1770
 		"drag" 17.2
@@ -60,7 +60,7 @@ ship "Scrapper"
 	"final explode" "final explosion large"
 
 
-ship "Scrapper" "Scrapper (Human, Heavy Lasers)"
+ship "Scavenger Scrapper" "Scavenger Scrapper (Human, Heavy Lasers)"
 	outfits
 		"A860 Atomic Thruster"
 		"A525 Atomic Steering"
@@ -75,7 +75,7 @@ ship "Scrapper" "Scrapper (Human, Heavy Lasers)"
 		"Pug Biodefenses" 20
 
 
-ship "Scrapper" "Scrapper (Human, Blaster)"
+ship "Scavenger Scrapper" "Scavenger Scrapper (Human, Blaster)"
 	outfits
 		"Jump Drive"
 		"X5700 Ion Thruster"
@@ -93,7 +93,7 @@ ship "Scrapper" "Scrapper (Human, Blaster)"
 		"Pug Biodefenses" 20
 
 
-ship "Scrapper" "Scrapper (Adamas, Fractal)"
+ship "Scavenger Scrapper" "Scavenger Scrapper (Adamas, Fractal)"
 	outfits
 		"Jump Drive"
 		"Mass Expansion" 7
@@ -115,7 +115,7 @@ ship "Scrapper" "Scrapper (Adamas, Fractal)"
 	turret "Shatterer"
 
 
-ship "Scrapper" "Scrapper (Adamas, Needler-T)"
+ship "Scavenger Scrapper" "Scavenger Scrapper (Adamas, Needler-T)"
 	outfits
 		"Ruby Surveyor" 1
 		"Adamas Ruby Core"
@@ -133,7 +133,7 @@ ship "Scrapper" "Scrapper (Adamas, Needler-T)"
 		"Intrusion Countermeasures" 100
 
 
-ship "Scrapper" "Scrapper (Quarg, Ultimate)"
+ship "Scavenger Scrapper" "Scavenger Scrapper (Quarg, Ultimate)"
 	outfits
 		"Mass Expansion" 7
 		"Jump Drive"
@@ -157,34 +157,34 @@ fleet "Scavenger (Adamas)"
 		confusion 15
 		plunders coward
 	variant 1
-		"Scrapper (Adamas, Needler-T)"
+		"Scavenger Scrapper (Adamas, Needler-T)"
 		"Blaze"
 		"Amber"
 	variant 1
-		"Scrapper (Adamas, Fractal)"
+		"Scavenger Scrapper (Adamas, Fractal)"
 		"Blaze"
 		"Amber"
 	variant 1
-		"Scrapper (Adamas, Needler-T)" 2
+		"Scavenger Scrapper (Adamas, Needler-T)" 2
 		"Blaze" 2
 		"Amber" 2
 	variant 1
-		"Scrapper (Adamas, Fractal)" 2
+		"Scavenger Scrapper (Adamas, Fractal)" 2
 		"Blaze" 2
 		"Amber" 2
 	variant 1
-		"Scrapper (Adamas, Fractal)"
-		"Scrapper (Adamas, Needler-T)"
+		"Scavenger Scrapper (Adamas, Fractal)"
+		"Scavenger Scrapper (Adamas, Needler-T)"
 		"Blaze" 2
 		"Amber" 2
 	variant 1
-		"Scrapper (Adamas, Fractal)" 2
-		"Scrapper (Adamas, Needler-T)"
+		"Scavenger Scrapper (Adamas, Fractal)" 2
+		"Scavenger Scrapper (Adamas, Needler-T)"
 		"Blaze" 3
 		"Amber" 3	
 	variant 1
-		"Scrapper (Adamas, Fractal)"
-		"Scrapper (Adamas, Needler-T)" 2
+		"Scavenger Scrapper (Adamas, Fractal)"
+		"Scavenger Scrapper (Adamas, Needler-T)" 2
 		"Blaze" 3
 		"Amber" 3
 
@@ -197,26 +197,26 @@ fleet "Scavenger ((Quarg, Ultimate), (Adamas))"
 		confusion 15
 		plunders coward
 	variant 1
-		"Scrapper (Quarg, Ultimate)"
+		"Scavenger Scrapper (Quarg, Ultimate)"
 		"Blaze"
 		"Amber"
 	variant 1
-		"Scrapper (Quarg, Ultimate)" 2
+		"Scavenger Scrapper (Quarg, Ultimate)" 2
 		"Blaze" 2
 		"Amber" 2
 	variant 1
-		"Scrapper (Quarg, Ultimate)"
-		"Scrapper (Adamas, Fractal)"
+		"Scavenger Scrapper (Quarg, Ultimate)"
+		"Scavenger Scrapper (Adamas, Fractal)"
 		"Blaze" 2
 		"Amber" 2
 	variant 1
-		"Scrapper (Quarg, Ultimate)"
-		"Scrapper (Adamas, Needler-T)"
+		"Scavenger Scrapper (Quarg, Ultimate)"
+		"Scavenger Scrapper (Adamas, Needler-T)"
 		"Blaze" 2
 		"Amber" 2
 	variant 1
-		"Scrapper (Quarg, Ultimate)"
-		"Scrapper (Adamas, Needler-T)"
-		"Scrapper (Adamas, Fractal)"
+		"Scavenger Scrapper (Quarg, Ultimate)"
+		"Scavenger Scrapper (Adamas, Needler-T)"
+		"Scavenger Scrapper (Adamas, Fractal)"
 		"Blaze" 3
 		"Amber" 3