Skip to content

Commit b87bacb

Browse files
Inq8Inq8
committed
Bug Fixes
+Forceshield causes surrounding buildings to lose power. +Removed Tiberium Stealth ability from infantry, TS lethality increased, fixed Icon Palette +Fixed some unit prereq's. +Sat Hack is now the correct scale. +Added global timer to secondary superweapons.
1 parent 094eca9 commit b87bacb

File tree

8 files changed

+107
-47
lines changed

8 files changed

+107
-47
lines changed

‎mod.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ TRAVIS_TEST_PACKAGING="True"
3636
# - Windows installers will be named as {PACKAGING_INSTALLER_NAME}-{TAG}.exe
3737
# - macOS installers will be named as {PACKAGING_INSTALLER_NAME}-{TAG}.zip
3838
# - Linux .appimages will be named as {PACKAGING_INSTALLER_NAME}-${TAG}.AppImage
39-
PACKAGING_INSTALLER_NAME="CombinedArms"
39+
PACKAGING_INSTALLER_NAME="CombinedArmsLite"
4040

4141
# The human-readable name for this project.
4242
# This is used in:
@@ -49,7 +49,7 @@ PACKAGING_INSTALLER_NAME="CombinedArms"
4949
# - Windows desktop shortcut
5050
# - Windows "Programs and Features" list
5151
# - Linux launcher shortcut
52-
PACKAGING_DISPLAY_NAME="Combined Arms"
52+
PACKAGING_DISPLAY_NAME="Combined Arms Lite"
5353

5454
# The URL for the project homepage.
5555
# This is used in:

‎mods/ca/rules/aircraft.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ HELI:
382382
Queue: Aircraft
383383
BuildAtProductionType: Helicopter
384384
BuildPaletteOrder: 40
385-
Prerequisites: ~hpad, ~!aircraft.england, atek, ~techlevel.high, ~techlevel.funits
385+
Prerequisites: ~hpad, ~!aircraft.england, ~!aircraft.soviet, atek, ~techlevel.high, ~techlevel.funits
386386
BuildDurationModifier: 50
387387
Description: Helicopter gunship armed\nwith multi-purpose missiles.\n Strong vs Buildings, Vehicles, Aircraft\n Weak vs Infantry
388388
Valued:

‎mods/ca/rules/defaults.yaml‎

Lines changed: 65 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@
363363
Inherits@2: ^GainsExperience
364364
Inherits@3: ^InfantryExperienceHospitalOverrides
365365
Inherits@4: ^SpriteActor
366-
Inherits@5: ^Cloakable
367366
Inherits@bounty: ^GlobalBounty
368367
RenderSprites:
369368
PlayerPalette: playertd
@@ -1407,6 +1406,32 @@
14071406
GrantCondition@IDISABLE:
14081407
RequiresCondition: lowpower || empdisable
14091408
Condition: disabled
1409+
1410+
^DisableOnLowPowerOrForceDisabled:
1411+
WithColoredOverlay@IDISABLE:
1412+
RequiresCondition: disabled && !invulnerability && !empdisable && !forceshield
1413+
Palette: disabled
1414+
GrantConditionOnPowerState@LOWPOWER:
1415+
Condition: lowpower
1416+
ValidPowerStates: Low, Critical
1417+
GrantCondition@IDISABLE:
1418+
RequiresCondition: lowpower || empdisable || forcedisabled
1419+
Condition: disabled
1420+
ExternalCondition:
1421+
Condition: forcedisabled
1422+
TimedConditionBar@FSDISABLE:
1423+
Condition: forcedisabled
1424+
Color: FFFF66
1425+
WithDecoration@FORCEDISABLED:
1426+
Image: poweroff
1427+
Sequence: offline
1428+
Palette: chrome
1429+
RequiresCondition: forcedisabled
1430+
ReferencePoint: Center
1431+
Offsets:
1432+
repairing: 10, 0
1433+
RepairableBuilding:
1434+
RepairCondition: repairing
14101435

14111436
^DisableOnLowPowerOrPowerDown:
14121437
Inherits: ^DisableOnLowPower
@@ -1435,31 +1460,58 @@
14351460
Offsets:
14361461
powerdown: -10, 0
14371462

1438-
^DisableOnForceShield:
1439-
WithColoredOverlay@FSDISABLE:
1440-
RequiresCondition: forcedisabled && !disabled && !forceshield && !invulnerability && !emppowerdown
1441-
Palette: disabled
1442-
ExternalCondition:
1443-
Condition: forcedisabled
1444-
PowerMultiplier@FSPOWERDOWN:
1445-
RequiresCondition: forcedisabled
1446-
Modifier: 0
1447-
WithDecoration@FSPOWERDOWN:
1463+
^DisableOnLowPowerOrPowerDownOrForceDisable:
1464+
Inherits: ^DisableOnLowPower
1465+
GrantCondition@IDISABLE:
1466+
RequiresCondition: lowpower || powerdown || empdisable || forcedisabled
1467+
Condition: disabled
1468+
ToggleConditionOnOrder:
1469+
DisabledSound: EnablePower
1470+
EnabledSound: DisablePower
1471+
Condition: powerdown
1472+
OrderName: PowerDown
1473+
WithDecoration@POWERDOWN:
14481474
Image: poweroff
14491475
Sequence: offline
14501476
Palette: chrome
1451-
RequiresCondition: forcedisabled && !forceshield
1477+
RequiresCondition: powerdown || forcedisabled
14521478
ReferencePoint: Center
1479+
Offsets:
1480+
repairing: 10, 0
1481+
PowerMultiplier@POWERDOWN:
1482+
RequiresCondition: powerdown
1483+
Modifier: 0
1484+
PowerMultiplier@FORCEDISABLE:
1485+
RequiresCondition: forcedisabled
1486+
Modifier: 0
1487+
RepairableBuilding:
1488+
RepairCondition: repairing
1489+
WithBuildingRepairDecoration:
1490+
Offsets:
1491+
powerdown: -10, 0
14531492
TimedConditionBar@FSDISABLE:
14541493
Condition: forcedisabled
14551494
Color: FFFF66
1495+
ExternalCondition:
1496+
Condition: forcedisabled
14561497

14571498
^DisabledByPowerOutage:
14581499
WithColoredOverlay@IDISABLE:
14591500
RequiresCondition: disabled && !forceshield && !invulnerability && !emppowerdown
14601501
Palette: disabled
1502+
ExternalCondition:
1503+
Condition: forcedisabled
1504+
TimedConditionBar@FSDISABLE:
1505+
Condition: forcedisabled
1506+
Color: FFFF66
1507+
WithDecoration@FSPOWERDOWN:
1508+
Image: poweroff
1509+
Sequence: offline
1510+
Palette: chrome
1511+
RequiresCondition: forcedisabled && !forceshield
1512+
ReferencePoint: Center
14611513
GrantCondition@IDISABLE:
1462-
RequiresCondition: power-outage
1514+
RequiresCondition: power-outage || forcedisabled
14631515
Condition: disabled
14641516
AffectedByPowerOutage:
14651517
Condition: power-outage

‎mods/ca/rules/infantry.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ THF:
610610
UncloakOn: Attack, Unload, Infiltrate, Demolish, Move
611611
CloakTypes: Cloak, Thief
612612
IsPlayerPalette: false
613-
PauseOnCondition: cloak-force-disabled || invisibility
613+
PauseOnCondition: cloak-force-disabled
614614
GrantConditionOnDamageState@UNCLOAK:
615615
Condition: cloak-force-disabled
616616
ValidDamageStates: Critical
@@ -994,7 +994,8 @@ SNIPER:
994994
CloakedCondition: hidden
995995
Palette: cloakTD
996996
IsPlayerPalette: true
997-
RequiresCondition: !cloak-force-disabled && !invisibility
997+
CloakTypes: Cloak, Thief
998+
RequiresCondition: !cloak-force-disabled
998999
UncloakOn: Unload, Infiltrate, Demolish, Dock, Move
9991000
GrantConditionOnDamageState@UNCLOAK:
10001001
Condition: cloak-force-disabled

‎mods/ca/rules/misc.yaml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,19 @@ camera.spyplane:
220220

221221
camera.sathack:
222222
Inherits: CAMERA
223+
-RenderSpritesEditorOnly:
224+
RenderSprites:
225+
Image: satscan
226+
Scale: 0.5
223227
EditorOnlyTooltip:
224228
Name: (support power proxy camera)
229+
RevealsShroud:
230+
Range: 10c0
231+
Type: CenterPosition
225232
DetectCloaked:
226-
Range: 24c0
227-
CloakTypes: Cloak, Hijacker
228-
WithDecoration:
229-
Image: satscan
230-
Sequence: idle
231-
ReferencePoint: Center
232-
ZOffset: 1023
233+
Range: 10c0
234+
CloakTypes: Cloak, Thief
235+
233236

234237
SONAR:
235238
Inherits: camera.spyplane

‎mods/ca/rules/structures.yaml‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MSLO:
22
Inherits: ^ScienceBuilding
3-
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
3+
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDownOrForceDisable
44
Inherits@shape: ^2x1Shape
55
Selectable:
66
Bounds: 48,24
@@ -68,7 +68,7 @@ MSLO:
6868

6969
GAP:
7070
Inherits: ^ScienceBuilding
71-
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
71+
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDownOrForceDisable
7272
Valued:
7373
Cost: 800
7474
Tooltip:
@@ -400,14 +400,14 @@ SYRD:
400400

401401
IRON:
402402
Inherits: ^ScienceBuilding
403-
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
403+
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDownOrForceDisable
404404
Inherits@shape: ^2x1Shape
405405
Buildable:
406406
Queue: Defense
407407
BuildPaletteOrder: 130
408408
Prerequisites: stek, ~structures.soviet, ~techlevel.superw
409409
BuildLimit: 1
410-
Description: Makes a group of units invulnerable\nfor a short time.\nRequires power to operate.\nMaximum 1 can be built.\n Special Ability: Invulnerability
410+
Description: Makes a group of units invulnerable\nfor a short time.\nRequires power to operate.\nMaximum 1 can be built.\n Special Ability: Iron Curtain
411411
Valued:
412412
Cost: 1500
413413
Tooltip:
@@ -444,7 +444,7 @@ IRON:
444444
WeaponDelay: 0
445445
Effect: crate-effects
446446
EffectSequence: invuln
447-
Description: Invulnerability
447+
Description: Iron Curtain
448448
LongDesc: Makes a vehicles or structures invulnerable\nfor 20 seconds. Lethal to Infantry.
449449
OnFireSound: ironcur9.aud
450450
SelectTargetSpeechNotification: SelectTarget
@@ -454,6 +454,7 @@ IRON:
454454
DisplayRadarPing: True
455455
Cursor: ability
456456
PauseOnCondition: disabled || emppowerdown
457+
DisplayTimerStances: Ally, Neutral, Enemy
457458
SupportPowerChargeBar:
458459
Power:
459460
Amount: -200
@@ -462,7 +463,7 @@ IRON:
462463

463464
PDOX:
464465
Inherits: ^ScienceBuilding
465-
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
466+
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDownOrForceDisable
466467
Inherits@shape: ^2x2Shape
467468
Selectable:
468469
Bounds: 48,48
@@ -516,6 +517,7 @@ PDOX:
516517
KillCargo: yes
517518
DisplayRadarPing: True
518519
Range: 2
520+
DisplayTimerStances: Ally, Neutral, Enemy
519521
SupportPowerChargeBar:
520522
Power:
521523
Amount: -200
@@ -620,7 +622,7 @@ AGUN:
620622

621623
DOME:
622624
Inherits: ^Building
623-
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
625+
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDownOrForceDisable
624626
Inherits@shape: ^2x2Shape
625627
Selectable:
626628
Bounds: 48,48
@@ -929,7 +931,7 @@ SAM:
929931

930932
ATEK:
931933
Inherits: ^ScienceBuilding
932-
Inherits@IDISABLE: ^DisableOnLowPower
934+
Inherits@IDISABLE: ^DisableOnLowPowerOrForceDisabled
933935
Inherits@shape: ^2x2Shape
934936
Selectable:
935937
Bounds: 48,48
@@ -1725,6 +1727,7 @@ APWR:
17251727

17261728
STEK:
17271729
Inherits: ^ScienceBuilding
1730+
Inherits@IDISABLE: ^DisableOnLowPowerOrForceDisabled
17281731
Inherits@shape: ^3x2Shape
17291732
Selectable:
17301733
Bounds: 72,48
@@ -3300,7 +3303,7 @@ ATWR:
33003303
Inherits: ^DefenseTD
33013304
RenderSprites:
33023305
PlayerPalette: playertd
3303-
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
3306+
Inherits@IDISABLE: ^DisableOnLowPower
33043307
Inherits@AUTOTARGET: ^AutoTargetGround
33053308
Buildable:
33063309
Queue: Defense
@@ -3432,7 +3435,7 @@ CHAIN:
34323435

34333436
HQ:
34343437
Inherits: ^BuildingTD
3435-
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
3438+
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDownOrForceDisable
34363439
HitShape:
34373440
TargetableOffsets: 0,0,0, 0,512,0, 420,-598,256
34383441
Type: Rectangle
@@ -3515,7 +3518,7 @@ HQ:
35153518

35163519
EYE:
35173520
Inherits: ^ScienceBuildingTD
3518-
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
3521+
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDownOrForceDisable
35193522
HitShape:
35203523
TargetableOffsets: 0,0,0, 0,512,128, 420,-598,213
35213524
Type: Rectangle
@@ -3585,7 +3588,7 @@ EYE:
35853588
SelectTargetSpeechNotification: SelectTarget
35863589
InsufficientPowerSpeechNotification: InsufficientPower
35873590
DisplayRadarPing: True
3588-
DisplayTimerStances: Ally
3591+
DisplayTimerStances: Ally, Neutral, Enemy
35893592
DisplayBeacon: True
35903593
CameraActor: camera
35913594
ArrowSequence: arrow
@@ -3978,7 +3981,7 @@ AFLD.gdi:
39783981

39793982
GTEK:
39803983
Inherits: ^ScienceBuilding
3981-
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
3984+
Inherits@IDISABLE: ^DisableOnLowPowerOrForceDisabled
39823985
Inherits@shape: ^3x2Shape
39833986
Buildable:
39843987
Queue: Building
@@ -4036,7 +4039,7 @@ GTEK:
40364039

40374040
TMPL:
40384041
Inherits: ^ScienceBuildingTD
4039-
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
4042+
Inherits@IDISABLE: ^DisableOnLowPowerOrForceDisabled
40404043
Inherits@shape: ^3x2Shape
40414044
HitShape:
40424045
UseTargetableCellsOffsets: false
@@ -4560,14 +4563,14 @@ TTUR:
45604563

45614564
SGEN:
45624565
Inherits: ^ScienceBuilding
4563-
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
4566+
Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDownOrForceDisable
45644567
Buildable:
45654568
Queue: Defense
45664569
BuildPaletteOrder: 130
45674570
Prerequisites: tmpl, ~structures.nod, ~techlevel.superw
45684571
BuildLimit: 1
45694572
IconPalette: chrometd
4570-
Description: Makes a group of units invisible\nfor a short time.\nRequires power to operate.\n Special Ability: Invisibility\nMaximum 1 can be built.
4573+
Description: Makes a group of units invisible\nfor a short time.\nRequires power to operate.\n Special Ability: Tiberium Stealth\nMaximum 1 can be built.
45714574
Valued:
45724575
Cost: 1500
45734576
Tooltip:
@@ -4604,20 +4607,21 @@ SGEN:
46044607
Prerequisites: techlevel.superw
46054608
OrderName: stealthgenc
46064609
Icon: invis
4607-
IconPalette: temptd
4610+
IconPalette: chrometd
46084611
ChargeInterval: 3000
46094612
Weapon: StealthBubble
46104613
WeaponDelay: 0
46114614
Effect: crate-effects
46124615
EffectSequence: stealth
4613-
Description: Invisibility
4616+
Description: Tiberium Stealth
46144617
LongDesc: Makes a vehicles or structures invisible\nfor 30 seconds. Harmful to Infantry.
46154618
OnFireSound: cloak6.aud
46164619
SelectTargetSpeechNotification: SelectTarget
46174620
InsufficientPowerSpeechNotification: InsufficientPower
46184621
BeginChargeSpeechNotification: ChemStealthCharging
46194622
EndChargeSpeechNotification: ChemStealthReady
46204623
DisplayRadarPing: True
4624+
DisplayTimerStances: Ally, Neutral, Enemy
46214625
Cursor: chemmissile
46224626
PauseOnCondition: disabled || emppowerdown
46234627
SupportPowerChargeBar:

‎mods/ca/rules/vehicles.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ ARTY.nod:
320320
Queue: Vehicle
321321
BuildPaletteOrder: 70
322322
IconPalette: chrometd
323-
Prerequisites: hq, ~vehicles.blackh, ~techlevel.medium, ~techlevel.funits
323+
Prerequisites: hq, ~vehicles.marked, ~techlevel.medium, ~techlevel.funits
324324
Description: Long-range artillery.\n Strong vs Infantry, Buildings\n Weak vs Vehicles, Aircraft
325325
Armament:
326326
Weapon: 155mmTD

0 commit comments

Comments
 (0)