Merge branch 'master' into Jibauni

Author: TheGiraffe3

.codespell.exclude

@@ -101,6 +101,8 @@ planet Independance
 	description `Independance, originally named for a document of emancipation for an ancient nation on old Earth, became of interest to the Confederated Councils when they began to consider plans for a defense against an invasion. One such plan involved deploying "cloud bunkers" into the gas giants of the Outer Rim from which an uprising could be staged against a foreign occupier. Independance, given its fitting name and position near Alvorada, was chosen as the testing site for this project.`
 	description `	Of the few prototype bunkers that were deployed, none ever survived the surface of Independance; the Councils simply didn't have the technology for such an ambitious project. The official who proposed the plan was shortly shuffled out of the Politburo, and what remained of the bunkers were left quietly in the depths of the gas giant.`
 	object Independance
+system Currus
+	link Currus
 		"Mian"
 		"i' amazin"          # is amazing (mispronounced)
             * Care Package 2a has been replaced with a new mission, FW Deep Memorial, a set of missions and events that offers regardless of the player's choices, but which has a branch if Brower dies during the attack.

copyright

@@ -2577,13 +2577,25 @@ Files:
  images/outfit/*efreti?thruster*
  images/outfit/fusion?cannon*
  images/outfit/nuke*
+ images/planet/pontes*
  images/projectile/fire-lance*
  images/projectile/fusion?gun?bolt*
  images/projectile/blaze-pike*
  images/projectile/korath?inferno*
  images/projectile/missile-0*
  images/projectile/missile-1*
  images/ship/battleship*
+ images/ship/cirrus*
+ images/ship/gero*
+ images/ship/nimbus*
+ images/ship/silent?harvester*
+ images/ship/stratus*
+ images/ship/venta*
+ images/thumbnail/cirrus*
+ images/thumbnail/gero*
+ images/thumbnail/nimbus*
+ images/thumbnail/stratus*
+ images/thumbnail/venta*
  images/star/coal-black-hole*
  images/star/neutron*
  images/star/small-black-hole*
@@ -2734,6 +2746,38 @@ Copyright: bene-dictator <benstaples8068@gmail.com>
 License: CC-BY-SA-4.0
 Comment: Derived from works by Michael Zahniser (under the same license).
 
+Files:
+ images/_menu/haze-dark-nebula*
+ images/effect/incipias?flare/*
+ images/effect/plasma?exhaust*
+ images/effect/plasma?particle*
+ images/effect/stagnation?beam?impact*
+ images/effect/star?tail*
+ images/hardpoint/stagnation?beam*
+ images/outfit/gas?class?shield*
+ images/outfit/liquid?class?shield*
+ images/outfit/metallic?hydrogen?cell*
+ images/outfit/mh?*
+ images/outfit/plasma?discharger*
+ images/outfit/stagnation?beamx*
+ images/outfit/star?tail?*
+ images/planet/aera*
+ images/planet/gliese*
+ images/planet/redias*
+ images/planet/treser*
+ images/planet/vulpa*
+ images/projectile/ionic?turret*
+ images/projectile/plasma?discharge*
+ images/projectile/stagnation?beam*
+ images/projectile/star?tail*
+ images/projectile/strange?ray*
+ images/scene/incipias?message*
+ images/star/a-eater*
+ images/star/neutron-small*
+ images/star/proto-planetary-disk*
+Copyright: RisingLeaf (https://github.com/RisingLeaf)
+License: CC-BY-SA-4.0
+
 Files:
  images/asteroid/*bioroid*
  images/effect/acuit?hit*
@@ -2939,14 +2983,18 @@ Files:
  sounds/korath?afterburner*
  sounds/korath?launch*
  sounds/korath?launch?external*
+ sounds/*incip?plasma*
  sounds/locust?blaster*
  sounds/mandible?cannon*
+ sounds/plasma?discharger*
  sounds/remnant?afterburner*
  sounds/remnant?launch*
  sounds/remnant?launch?external*
  sounds/neutron?bolt*
  sounds/scin?launch*
  sounds/sheragi?launch*
+ sounds/stagnation?beam*
+ sounds/star?tail*
  sounds/swarm?missile*
  sounds/thorax?cannon*
  sounds/tractor?beam*
@@ -3289,6 +3337,7 @@ Comment: Derived from works by Michael Zahniser (under the same license).
 
 Files:
  images/outfit/anti-materiel?gun*
+ images/outfit/cloud?piercer*
 Copyright: 1010todd
 License: CC-BY-SA-4.0
 
@@ -3543,12 +3592,6 @@ Copyright: RisingLeaf (https://github.com/RisingLeaf)
 License: CC-BY-SA-4.0
 Comment: Derived from _menu/haze-133 (no copyright given).
 
-Files:
- images/star/proto-planetary-disk*
- images/projectile/ionic?turret*
-Copyright: RisingLeaf (https://github.com/RisingLeaf)
-License: CC-BY-SA-4.0
-
 Files:
  images/effect/ionic?impact*
 Copyright: RisingLeaf (https://github.com/RisingLeaf)

credits.txt

@@ -59,6 +59,7 @@ Storyline & Faction Authors
   MasterOfGrey
   Peter van der Meer
   Pointedstick
+  RisingLeaf
   Saugia
   TheUnfetteredOne
   Zitchas

data/drak/drak missions.txt

@@ -113,6 +113,20 @@ mission "Drak guarding Void Sprites"
 		system Nenia
 		ship "Archon (Cloaked)" "Sleeping Dragon"
 
+mission "Drak guarding Incipias space"
+	invisible
+	landing
+	repeat
+	to offer
+		not "Drak guarding Incipias space: active"
+	to complete
+		never
+	npc save
+		government "Drak (Incipias)"
+		personality forbearing frugal heroic vindictive
+		system Il'le
+		ship "Archon (Hyperdrive Cloaked)" "Guardian of Spring"
+
 # Mission for those who had a savefile prior to 0.9.15 with the old Archon missions
 mission "Archon Personality Compatibility Patch"
 	invisible

data/drak/drak ships.txt

@@ -115,6 +115,30 @@ ship "Archon" "Archon (Cloaked)"
 		"cloak" .04
 	"final explode" "archon c teleport"
 
+ship "Archon" "Archon (Hyperdrive Cloaked)"
+	sprite "ship/archon b"
+		"frame rate" 0.87
+	"never disabled"
+	add attributes
+		"cloak" .04
+		"jump speed" 1
+		"hyperdrive" 1
+		"hyperdrive sound" ""
+		"hyperdrive out sound" ""
+		"hyperdrive in sound" ""
+	"final explode" "archon b teleport"
+	outfits
+		"Drak Antimatter Cannon"
+		"Drak Antimatter Cannon (Augmented)"
+		"Drak Anti-Missile Field" 2
+		"Drak Anti-Missile Field (Augmented)" 2
+		"Drak Draining Field"
+		"Drak Draining Field (Augmented)"
+		"Drak Distancer" 2
+		"Drak Turret" 3
+		"Drak Turret (Augmented)" 3
+
+
 effect "archon a teleport"
 	sprite "effect/archon teleport/archonateleport"
 		"no repeat"