Skip to content

Commit cb0ab1d

Browse files
committed
Merge remote-tracking branch 'darkademic/dev'
2 parents 7e872bc + d025563 commit cb0ab1d

5 files changed

Lines changed: 7 additions & 5 deletions

File tree

36.7 KB
Binary file not shown.

mods/ca/rules/custom/coop-rules.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ World:
1111
ScriptLobbyDropdown@basesharing:
1212
ID: basesharing
1313
Label: Base Sharing
14-
Description: When base sharing is enabled you can produce from the production buildings of teammates\n if you don't have your own (the most recently built will be used).\n\n- No effect in baseless missions.\n- Upgrades are never shared.\n- When enabled, the first player will own any initial MCV or Construction Yard.
14+
Description: When base sharing is enabled you can produce from the production buildings of teammates\n if you don't have your own (the most recently built will be used).\n\n- No effect in baseless missions.\n- Upgrades are never shared.\n- Power is not shared.\n- When enabled, the first player will own any initial MCV or Construction Yard.
1515
Values:
1616
0: Off
1717
1: On

mods/ca/rules/infantry.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4591,7 +4591,7 @@ CSCR:
45914591
TooltipExtras:
45924592
Strengths: • Strong vs Infantry, Light Armor
45934593
Weaknesses: • Weak vs Heavy Armor, Buildings, Defenses\n• Cannot attack Aircraft
4594-
Attributes: • Heals on Tiberium
4594+
Attributes: • Heals rapidly on Tiberium
45954595
Valued:
45964596
Cost: 500
45974597
Tooltip:
@@ -4632,6 +4632,8 @@ CSCR:
46324632
Category: Nod/Infantry
46334633
EncyclopediaExtras:
46344634
AdditionalInfo: Stolen from Scrin Portal.
4635+
ChangesHealth@THEAL:
4636+
PercentageStep: 3
46354637

46364638
CMSR:
46374639
Inherits: ^Soldier

mods/ca/rules/scrin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2182,15 +2182,15 @@ LCHR.Orb:
21822182
InheritsExperience: true
21832183
ProximityExternalCondition@LCHRHEAL:
21842184
Condition: lchr-healing
2185-
Range: 2c256
2185+
Range: 3c512
21862186
AutoTarget:
21872187
AttackOmni:
21882188
WithColoredSelectionBox@PLAYERBOX:
21892189
ColorSource: Player
21902190
ValidRelationships: Ally, Enemy
21912191
WithRangeCircleCA:
21922192
Type: LeecherOrb
2193-
Range: 2c256
2193+
Range: 3c512
21942194
UsePlayerColor: true
21952195
PlayerColorAlpha: 160
21962196
Visible: Always

mods/ca/weapons/scrin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1818,7 +1818,7 @@ LeecherOrbHeal:
18181818
ValidTargets: Ground, Water
18191819
Projectile: InstantHit
18201820
Warhead@1Dam: SpreadDamage
1821-
Spread: 1c128
1821+
Spread: 1c768
18221822
Damage: -1650
18231823
Falloff: 100, 100, 0
18241824
ValidTargets: Healable, Repairable

0 commit comments

Comments
 (0)