diff --git a/Rising Stars/data/traits/ftl/Fling.txt b/Rising Stars/data/traits/ftl/Fling.txt index d1869699..b9a8e421 100644 --- a/Rising Stars/data/traits/ftl/Fling.txt +++ b/Rising Stars/data/traits/ftl/Fling.txt @@ -20,6 +20,9 @@ Trait: Fling IfHaveTrait(Ancient, LoadDesigns(ancient/default)) IfHaveTrait(Ancient, LoadDesigns(ancient/not_hyperdrive)) + + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/default)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/not_hyperdrive)) UnlockTag(HasFling) ModAttribute(FlingBeaconConst, Add, 1) diff --git a/Rising Stars/data/traits/ftl/Flux.txt b/Rising Stars/data/traits/ftl/Flux.txt index 2ab84a9c..aa380654 100644 --- a/Rising Stars/data/traits/ftl/Flux.txt +++ b/Rising Stars/data/traits/ftl/Flux.txt @@ -26,6 +26,9 @@ Trait: Flux IfHaveTrait(Ancient, LoadDesigns(ancient/default)) IfHaveTrait(Ancient, LoadDesigns(ancient/not_hyperdrive)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/default)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/not_hyperdrive)) + ModAttribute(HasFlux, Add, 1) ModAttribute(ForbidDeepSpace, Add, 1) ModAttribute(ColonizerSpeed, Multiply, 0.25) diff --git a/Rising Stars/data/traits/ftl/Gate.txt b/Rising Stars/data/traits/ftl/Gate.txt index 20d50697..7244cdd0 100644 --- a/Rising Stars/data/traits/ftl/Gate.txt +++ b/Rising Stars/data/traits/ftl/Gate.txt @@ -28,6 +28,10 @@ Trait: Gate IfHaveTrait(Ancient, LoadDesigns(ancient/not_hyperdrive)) IfHaveTrait(Ancient, LoadDesigns(ancient/gate)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/default)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/not_hyperdrive)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/gate)) + ModAttribute(ProgenitorTechProgress, Add, 3.5) ModAttribute(GateConst, Add, 1) SpawnShip(Gate) diff --git a/Rising Stars/data/traits/ftl/Hyperdrive.txt b/Rising Stars/data/traits/ftl/Hyperdrive.txt index f54e757c..387969b5 100644 --- a/Rising Stars/data/traits/ftl/Hyperdrive.txt +++ b/Rising Stars/data/traits/ftl/Hyperdrive.txt @@ -21,6 +21,9 @@ Trait: Hyperdrive IfHaveTrait(Devout, LoadDesigns(devout/default)) IfHaveTrait(Devout, LoadDesigns(devout/hyperdrive)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/default)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/hyperdrive)) + ModAttribute(ProgenitorTechProgress, Add, 3.5) ModAttribute(HyperdriveConst, Add, 1) IfHaveTrait(Ancient, LoadDesigns(ancient/default)) diff --git a/Rising Stars/data/traits/ftl/Jumpdrive.txt b/Rising Stars/data/traits/ftl/Jumpdrive.txt index 4395e9b6..2fb45409 100644 --- a/Rising Stars/data/traits/ftl/Jumpdrive.txt +++ b/Rising Stars/data/traits/ftl/Jumpdrive.txt @@ -26,3 +26,6 @@ Trait: Jumpdrive ModAttribute(JumpdriveConst, Add, 1) IfHaveTrait(Ancient, LoadDesigns(ancient/default)) IfHaveTrait(Ancient, LoadDesigns(ancient/jumpdrive)) + + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/default)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/jumpdrive)) diff --git a/Rising Stars/data/traits/ftl/Slipstream.txt b/Rising Stars/data/traits/ftl/Slipstream.txt index 751a4eba..6aefa896 100644 --- a/Rising Stars/data/traits/ftl/Slipstream.txt +++ b/Rising Stars/data/traits/ftl/Slipstream.txt @@ -27,6 +27,10 @@ Trait: Slipstream IfHaveTrait(Ancient, LoadDesigns(ancient/not_hyperdrive)) IfHaveTrait(Ancient, LoadDesigns(ancient/slipstream)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/default)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/not_hyperdrive)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/slipstream)) + ModAttribute(SlipstreamConst, Add, 1) ModAttribute(ProgenitorTechProgress, Add, 3.5) IfNotHaveTrait(StarChildren, SpawnShip(Slipstream Generator)) diff --git a/Rising Stars/data/traits/ftl/Sublight.txt b/Rising Stars/data/traits/ftl/Sublight.txt index 88068b79..c806163a 100644 --- a/Rising Stars/data/traits/ftl/Sublight.txt +++ b/Rising Stars/data/traits/ftl/Sublight.txt @@ -25,3 +25,6 @@ Trait: Sublight IfHaveTrait(Technicists, LoadDesigns(technicist/default)) IfHaveTrait(Technicists, LoadDesigns(technicist/not_hyperdrive)) + + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/default)) + IfHaveTrait(CrimeSyndicate, LoadDesigns(syndicate/not_hyperdrive)) diff --git a/Rising Stars/data/traits/lifestyle/CrimeSyndicate.txt b/Rising Stars/data/traits/lifestyle/CrimeSyndicate.txt index 58090473..c6d67a94 100644 --- a/Rising Stars/data/traits/lifestyle/CrimeSyndicate.txt +++ b/Rising Stars/data/traits/lifestyle/CrimeSyndicate.txt @@ -15,12 +15,11 @@ Trait: CrimeSyndicate UnlockSubsystem(HackerArray) UnlockSubsystem(ShadowportHull) - IfHaveTrait(Slipstream, LoadDesigns(syndicate/slipstream)) IfHaveTrait(Hyperdrive, LoadDesigns(syndicate/hyperdrive)) - IfHaveTrait(Gate, LoadDesigns(syndicate/other)) - IfHaveTrait(Fling, LoadDesigns(syndicate/other)) - IfHaveTrait(Sublight, LoadDesigns(syndicate/other)) - IfHaveTrait(Flux, LoadDesigns(syndicate/other)) + IfHaveTrait(Gate, LoadDesigns(syndicate/not_hyperdrive)) + IfHaveTrait(Fling, LoadDesigns(syndicate/not_hyperdrive)) + IfHaveTrait(Sublight, LoadDesigns(syndicate/not_hyperdrive)) + IfHaveTrait(Flux, LoadDesigns(syndicate/not_hyperdrive)) IfHaveTrait(Jumpdrive, LoadDesigns(syndicate/jumpdrive)) SpawnShip(Defiler, Override Disable Starting = True) diff --git a/Rising Stars/scripts/definitions/ABEM_version.as b/Rising Stars/scripts/definitions/ABEM_version.as index 94b96ec0..1423c4bb 100644 --- a/Rising Stars/scripts/definitions/ABEM_version.as +++ b/Rising Stars/scripts/definitions/ABEM_version.as @@ -2,7 +2,7 @@ import version; import CP_version; // ABEMMOD's last revision was 724. -const string MOD_REVISION = "1345"; +const string MOD_REVISION = "1346"; const array VERSIONS = { "v2.0.3", "OpenSR v1.0.0",