Skip to content

Commit d4a0b2d

Browse files
DaloLornDaloLorn
committed
#STEAM Merge branch 'master' into WorkshopBuild
# Conflicts: # branch-description.txt
2 parents 9610e89 + c4f961a commit d4a0b2d

File tree

261 files changed

+29715
-1925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+29715
-1925
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@
2020
*.PDF diff=astextplain
2121
*.rtf diff=astextplain
2222
*.RTF diff=astextplain
23+
24+
branch-description.txt merge=ours

‎Rising Stars/data/abilities/artifact/TelescopeOre.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Ability: TelescopeOre
22
Name: #ABL_TELESCOPE
3-
Description: #ABL_TELESCOPEORE_DESC:40000
3+
Description: #ABL_TELESCOPEORE_DESC:400000
44
Icon: VoteIcons::3
55
Activate Sound: telescope_activate
66

77

88

99
Target: targ = Object
10-
Range: 40000 * $FTL_MULT
10+
Range: 400000 * $FTL_MULT
1111
Cooldown: 180
1212
Hotkey: T
1313
TargetFilterRegion(targ)

‎Rising Stars/data/abilities/mining/BindAsteroid.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ Ability: BindAsteroid
33
Description: #ABL_BIND_ASTEROID_DESC
44
Icon: OreAsteroidIcon
55

6-
Range: 200
6+
Range: 400
77

88
Target: targ = Object
99
Hotkey: B
1010

1111
IsToggleTarget(targ, Check Range = False, Channels = False)
12-
TractorObject(targ, Max Distance = 300)
12+
TractorObject(targ, Max Distance = 600)
1313
PersistentBeamEffect(targ, #b8b8d8, Tractor, 0.5)
1414

1515
ABEM_cargo::MaintainMiningBase(targ)

‎Rising Stars/data/abilities/mining/SwarmerBindAsteroid.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Ability: SwarmerBindAsteroid
2+
Name: #ABL_BIND_ASTEROID
3+
Description: #ABL_BIND_ASTEROID_DESC
4+
Icon: OreAsteroidIcon
5+
6+
Range: 400
7+
8+
Target: targ = Object
9+
Hotkey: B
10+
11+
IsToggleTarget(targ, Check Range = False, Channels = False)
12+
TractorObject(targ, Max Distance = 600)
13+
PersistentBeamEffect(targ, #b8b8d8, Tractor, 0.5)
14+
15+
ABEM_cargo::MaintainMiningBase(targ, Package Size = 325.0, Mining Rate = 2.5, Minimum Mining Rate = 0.75)

‎Rising Stars/data/abilities/shipmanagement/RemnantCommandCodes.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Ability: RemnantCommandCodes
55

66
Cooldown: 5
77
Energy Cost: 500
8-
Range: 1000
8+
Range: 2000
99
Target: targ = Object
1010

1111
Either(ABEM_hooks::TargetRequireCommand(targ), TargetFilterType(targ, Orbital))

‎Rising Stars/data/abilities/shipmanagement/ScuttleDerelict.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Ability: ScuttleDerelict
55

66
Cooldown: 5
77
Target: targ = Object
8-
Range: 300
8+
Range: 600
99

1010
ABEM_hooks::TargetFilterStatus(targ, DerelictShip)
1111
ABEM_hooks::DestroyTarget(targ)

‎Rising Stars/data/abilities/subsystem/Blink.txt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Ability: Blink
2+
Name: #ABL_BLINK
3+
Description: #ABL_BLINK_DESC
4+
Icon: GuiOrbitalIcons::2 * #ff0000
5+
6+
Target: dest = Point
7+
TargetFilterMovableTo(dest)
8+
9+
Cooldown: 45
10+
11+
//DistanceEnergyCost(dest, 0.1, Sqrt Cost = 6.5)
12+
DistanceEnergyCost(dest, 0.05, Sqrt Cost = 0.325)
13+
MultiplyEnergyCost(Sys.CostFactor:1)
14+
15+
PlayParticles(SkipDriveEvent, Scale = 3.0, Object Tied = False)
16+
TeleportTo(dest)
17+
PlayParticlesAt(dest, SkipDriveEvent, Scale = 3.0)
18+
19+
SubsystemOrConsumeStatus(SkipDrive)

‎Rising Stars/data/abilities/subsystem/BoardingParty.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Ability: BoardingParty
33
Description: #ABL_BOARDING_PARTY_DESC
44
Icon: ABEMShuttle
55

6-
Range: 300
6+
Range: 600
77
Hotkey: B
88

99
Target: targ = Object

‎Rising Stars/data/abilities/subsystem/BusterBeam.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Ability: BusterBeam
33
Description: #ABL_BUSTER_BEAM_DESC
44
Icon: BusterMachine
55

6-
Range: 200
6+
Range: 2000
77

88
Target: targ = Object
99
TargetFilterType(targ, Planet)

‎Rising Stars/data/abilities/subsystem/FlareBomb.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Ability: FlareBomb
2+
Name: #ABL_FLARE_BOMB
3+
Description: #ABL_FLARE_BOMB_DESC
4+
Icon: MissileLauncher::0 * #e45500
5+
6+
Range: 500
7+
8+
Target: targ = Object
9+
TargetFilterType(targ, Star)
10+
TargetFilterAttackable(targ)
11+
12+
IsToggleTarget(targ, Range Margin = 1.5, Channels = True)
13+
14+
AfterChannel(targ, 60, PlayParticles(FlareBomb), Clear = False)
15+
AfterChannel(targ, 60, AddRegionStatus(FlareRadiation, 300, Empire Limited = False), Clear = False)
16+
AfterChannelSelf(targ, 60, Destroy(), Clear = True)
17+
18+
PersistentBeamEffect(targ, #e45500, Tractor, Width = 7.0)
19+
20+
DealStellarDamageOverTime(targ, 20000000)
21+
22+
OffensiveToTarget(targ)

0 commit comments

Comments
 (0)