Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mod to release-20230225 #222

Merged
merged 20 commits into from
Jul 4, 2023
Merged

Update mod to release-20230225 #222

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2a01b1b
Added CODE_OF_CONDUCT.md
penev92 Feb 1, 2023
6f8bd27
Added a GitHub Actions CI workflow
penev92 Feb 1, 2023
455a90c
Updated VSCode configuration
penev92 Feb 1, 2023
daa1f68
Updated ModSDK scripts from "release-20210321" to "release-20230225"
penev92 Feb 1, 2023
7f53ff5
Updated engine version from "release-20210321" to "release-20230225"
penev92 Feb 1, 2023
2f2d65c
Updated csproj file to target .NET 6
penev92 Feb 1, 2023
b6adac1
Updated custom code to build with the new engine
penev92 Feb 4, 2023
5b664e1
Manual mod updates PART 1 - mod.yaml
penev92 Feb 4, 2023
6fdbe67
Ran the utility to automatically update rules
penev92 Feb 4, 2023
de5c543
Manual mod updates PART 2 - Added ControlGroups
penev92 Feb 4, 2023
91cfb53
Manual mod updates PART 3 - Removed explicit tileset palette
penev92 Feb 4, 2023
3c396e7
Manual mod updates PART 4 - ResourceType replacement
penev92 Feb 4, 2023
346811f
Manual mod updates PART 5 - color picker changes
penev92 Feb 4, 2023
b65c354
Manual mod updates PART 6 - chrome.yaml
penev92 Feb 5, 2023
a74075a
Manual mod updates PART 7 - Update installer paths
penev92 Mar 21, 2023
9ffc3ef
Manual mod updates PART 8 - Misc stuff
penev92 Mar 21, 2023
662e0a6
Bonus - Set up BuildableTerrainOverlay
penev92 Mar 21, 2023
ecf91f0
Updated custom code to match OpenRA style PART 1
penev92 Mar 21, 2023
aaed265
Manual mod updates PART 9 - Fixed years of accumulated technical debt
penev92 Mar 22, 2023
48a0b10
Bonus - Added Visual Studio launch profiles
penev92 Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mods/d2/maps/shellmap/map.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ Players:
Faction: Random
PlayerReference@Atreides:
Name: Atreides
Faction: Atreides
Faction: atreides
Color: 5079D6
PlayerReference@Harkonnen:
Name: Harkonnen
Faction: Harkonnen
Faction: harkonnen
Color: D60000
PlayerReference@Ordos:
Name: Ordos
Faction: Ordos
Faction: ordos
Color: 4CD64C

Actors:
Expand Down
2 changes: 2 additions & 0 deletions mods/d2/rules/arrakis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ sietch:
-GivesBuildableArea:
-Capturable:
-RepairableBuilding:
WithTilesetBody:
Sequence: idle
Power:
Amount: 0
ProvidesPrerequisite@buildingname:
6 changes: 6 additions & 0 deletions mods/d2/rules/barracks.yaml
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pips were not used in the original game. Is it important to add them in the update?
Issue #148 was created to remove pips.

Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ barracks:
GrantConditionOnPrerequisite:
Prerequisites: upgrade.barracks
Condition: stardecoration
WithDecoration@upgraded:
Image: pips
Sequence: tag-upgraded
RequiresCondition: stardecoration
Offsets:
stardecoration: -6, -6
RevealOnDeath:
Radius: 3c768
-Capturable:
Expand Down
2 changes: 1 addition & 1 deletion mods/d2/rules/building.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Selectable:
Priority: 2
RevealsShroud:
VisibilityType: CenterPosition
Type: CenterPosition
Targetable:
TargetTypes: Ground, C4, Structure
HitShape:
Expand Down
2 changes: 0 additions & 2 deletions mods/d2/rules/campaign-rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ Player:
FogCheckboxEnabled: False
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: False
PlayerResources:
DefaultCashLocked: True

World:
-SpawnStartingUnits:
Expand Down
6 changes: 3 additions & 3 deletions mods/d2/rules/carryall.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ carryall.reinforce:
Type: light
Aircraft:
CruiseAltitude: 192
CruisingCondition: cruising
InitialFacing: 0
Speed: 144 # 112 * ~1.3 for balance reasons
TurnSpeed: 16
Expand Down Expand Up @@ -51,12 +50,13 @@ carryall:
Inherits: carryall.reinforce
-Carryall:
AutoCarryall:
LoadingDelay: 10
UnloadingDelay: 15
BeforeLoadDelay: 10
BeforeUnloadDelay: 15
LocalOffset: 0, 0, -128
Aircraft:
MinAirborneAltitude: 40
InitialFacing: 768
CruisingCondition: cruising
RevealsShroud@ligting_low:
Range: 2c512
Type: GroundPosition
Expand Down
4 changes: 3 additions & 1 deletion mods/d2/rules/colorpicker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
harvester.colorpicker:
Inherits: harvester
-Health:
-Buildable:
-MapEditorData:
-WithHarvestOverlay:
-WithDockingAnimation:
RenderSprites:
Image: harvester.colorpicker
Palette: colorpicker
6 changes: 6 additions & 0 deletions mods/d2/rules/construction_yard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ construction_yard:
GrantConditionOnPrerequisite:
Prerequisites: upgrade.conyard
Condition: stardecoration
WithDecoration@upgraded:
Image: pips
Sequence: tag-upgraded
RequiresCondition: stardecoration
Offsets:
stardecoration: -6, -6
RevealOnDeath:
Radius: 5c768

Expand Down
8 changes: 3 additions & 5 deletions mods/d2/rules/devastator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ devastator:
TurnSpeed: 12
Speed: 31
Locomotor: devastator
PauseOnCondition: overload || notmobile
PauseOnCondition: notmobile # TODO: Can this overload?
AutoCarryable:
RequiresCondition: !overload
# RequiresCondition: !overload # TODO: Can this overload?
D2RevealsShroud:
Range: 4c0
MovingRange: 1c768
Expand All @@ -41,15 +41,13 @@ devastator:
Explodes:
Weapon: UnitExplodeLarge
EmptyWeapon: UnitExplodeLarge
RequiresCondition: !overload
#RequiresCondition: !overload # TODO: Can this overload?
SpawnActorOnDeath:
Actor: devastator.husk
OwnerType: InternalName
EffectiveOwnerFromOwner: true
AttractsWorms:
Intensity: 700
SelectionDecorations:
VisualBounds: 44,38,0,0
ChangesHealth:
Step: 5
Delay: 3
Expand Down
2 changes: 0 additions & 2 deletions mods/d2/rules/fremen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ fremen:
Weapon: Fremen_L
AttackFrontal:
FacingTolerance: 0
WithInfantryBody:
DefaultAttackSequence: shoot
Cloak:
InitialDelay: 85
CloakDelay: 85
Expand Down
5 changes: 1 addition & 4 deletions mods/d2/rules/harvester.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
harvester:
Inherits: ^Tank
-AttackMove:
Buildable:
Queue: Armor
Prerequisites: refinery
BuildPaletteOrder: 10
BuildDuration: 800
BuildDurationModifier: 40
InitialActivity: FindResources
Description: Collects Spice for processing\n Unarmed
Valued:
Cost: 300
Expand All @@ -29,7 +29,6 @@ harvester:
Type: harvester
Mobile:
Speed: 43
Crushes: infantry, spicebloom
D2RevealsShroud:
Range: 2c0
MovingRange: 1c768
Expand All @@ -44,8 +43,6 @@ harvester:
WithDockingAnimation:
AttractsWorms:
Intensity: 700
SelectionDecorations:
VisualBounds: 24,24
ChangesHealth:
Step: 5
Delay: 3
Expand Down
8 changes: 6 additions & 2 deletions mods/d2/rules/heavy_factory.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,15 @@ heavy_factory:
Power:
Amount: -35
ProvidesPrerequisite@buildingname:
SelectionDecorations:
VisualBounds: 32,32
GrantConditionOnPrerequisite:
Prerequisites: upgrade.heavy
Condition: stardecoration
WithDecoration@upgraded:
Image: pips
Sequence: tag-upgraded
RequiresCondition: stardecoration
Offsets:
stardecoration: -6, -6

upgrade.heavy:
AlwaysVisible:
Expand Down
8 changes: 6 additions & 2 deletions mods/d2/rules/high_tech_factory.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,15 @@ high_tech_factory:
ProvidesPrerequisite@buildingname:
Power:
Amount: -35
SelectionDecorations:
VisualBounds: 64,32
GrantConditionOnPrerequisite:
Prerequisites: upgrade.hightech
Condition: stardecoration
WithDecoration@upgraded:
Image: pips
Sequence: tag-upgraded
RequiresCondition: stardecoration
Offsets:
stardecoration: -6, -6

upgrade.hightech:
AlwaysVisible:
Expand Down
6 changes: 5 additions & 1 deletion mods/d2/rules/infantry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
DamageModifiers:
Prone50Percent: 50
DamageTriggers: TriggerProne
ProneOffser: 300 0 0
ProneOffset: 300,0,0
ProneSequencePrefix:
WithDeathAnimation:
DeathTypes:
ExplosionDeath: 1
Expand All @@ -33,6 +34,9 @@
BulletDeath: 4
CrushedSequence: die-crushed
AttackMove:
AttackMoveBlockedCursor:
AssaultMoveCursor:
AssaultMoveBlockedCursor:
Passenger:
CargoType: Infantry
CustomPipType: green
Expand Down
6 changes: 6 additions & 0 deletions mods/d2/rules/light_factory.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ light_factory:
GrantConditionOnPrerequisite:
Prerequisites: upgrade.light
Condition: stardecoration
WithDecoration@upgraded:
Image: pips
Sequence: tag-upgraded
RequiresCondition: stardecoration
Offsets:
stardecoration: -6, -6

upgrade.light:
AlwaysVisible:
Expand Down
2 changes: 0 additions & 2 deletions mods/d2/rules/light_inf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@ light_inf:
Weapon: LMG
AttackFrontal:
FacingTolerance: 0
WithInfantryBody:
DefaultAttackSequence: shoot
3 changes: 0 additions & 3 deletions mods/d2/rules/light_squad.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,12 @@ light_squad:
Health:
HP: 50
Mobile:
SharesCell: false
Speed: 43
Armament:
Weapon: LMG_squad
SpawnActorOnDeath:
Actor: light_inf
AttackFrontal:
FacingTolerance: 0
WithInfantryBody:
DefaultAttackSequence: shoot
Selectable:
Bounds: 1024, 1024, 0, 0
5 changes: 2 additions & 3 deletions mods/d2/rules/mcv.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
mcv:
Inherits: ^Vehicle
-AttackMove:
Buildable:
Prerequisites: repair_pad, upgrade.heavy, ~techlevel.medium
Queue: Armor
Expand All @@ -20,7 +21,7 @@ mcv:
Type: light
Mobile:
Speed: 31
Crushes: infantry, spicebloom
Locomotor: tank
D2RevealsShroud:
Range: 2c0
MovingRange: 1c768
Expand All @@ -42,8 +43,6 @@ mcv:
EffectiveOwnerFromOwner: true
AttractsWorms:
Intensity: 700
SelectionDecorations:
VisualBounds: 24,24
ChangesHealth:
Step: 5
Delay: 3
Expand Down
6 changes: 4 additions & 2 deletions mods/d2/rules/ornithopter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ ornithopter:
BuildPaletteOrder: 130
Prerequisites: research_centre, upgrade.hightech, ~aircraft.atreides_or_ordos, ~techlevel.high
Description: Light aircraft armed with missiles.\nAutomatically attacks nearby targets, can't be manually controlled.
AttackMove:
AttackMoveBlockedCursor:
AssaultMoveCursor:
AssaultMoveBlockedCursor:
AttackAircraft:
TargetFrozenActors: true
Armament:
Expand All @@ -27,13 +31,11 @@ ornithopter:
Type: light
Aircraft:
CruiseAltitude: 192
CruisingCondition: cruising
InitialFacing: 0
Speed: 224 # 189 * ~1.2 for balance reasons
TurnSpeed: 20
LandableTerrainTypes: Sand, Spice, SpiceSand, Dune, Concrete
Repulsable: False
AirborneCondition: airborne
CanHover: False
VTOL: False
IdleTurnSpeed: 8
Expand Down
2 changes: 1 addition & 1 deletion mods/d2/rules/outpost.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ outpost:
RequiresCondition: !disabled
WithTilesetBody:
SkipFrames: 1,2
PlayerPalette: player
RenderSprites:
Image: outpost
PlayerPalette: player
WithIdleOverlay@DISH:
Sequence: idle-dish
PauseOnCondition: disabled
Expand Down
5 changes: 2 additions & 3 deletions mods/d2/rules/palace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,15 @@ palace:
Description: Launches an atomic missile at a target location
BeginChargeSpeechNotification: DeathHandMissilePrepping
EndChargeSpeechNotification: DeathHandMissileReady
MissileLaunchDetected: MissileLaunchDetected
MissileWeapon: atomic
DetectedSpeechNotification: MissileLaunchDetected
MissileWeapon: Atomic
MissileDelay: 19
SpawnOffset: -512,1c171,0
DisplayBeacon: True
DisplayRadarPing: True
CameraRange: 10c0
ArrowSequence: arrow
CircleSequence: circles
ScreenShakeWarhead:
MissileImage: atomic
ProduceActorPower@fremen:
Name: Recruit Fremen
Expand Down
1 change: 0 additions & 1 deletion mods/d2/rules/palettes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
Name: colorpicker
BasePalette: d2
RemapIndex: 144, 145, 146, 147, 148, 149
ShadowIndex: 4
AllowModifiers: false
PaletteFromFile@shroud:
Name: shroud
Expand Down
1 change: 0 additions & 1 deletion mods/d2/rules/plane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
Type: GroundPosition
AlwaysVisibleRelationships: None
ActorLostNotification:
AttackMove:
WithFacingSpriteBody:
WithShadow:
HitShape:
Expand Down
2 changes: 0 additions & 2 deletions mods/d2/rules/repair_pad.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ repair_pad:
Range: 3c0
Selectable:
Bounds: 3072, 2048
SelectionDecorations:
VisualBounds: 48,32
Reservable:
RepairsUnits:
Interval: 10
Expand Down
2 changes: 0 additions & 2 deletions mods/d2/rules/research_centre.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ research_centre:
Power:
Amount: -40
ProvidesPrerequisite@buildingname:
SelectionDecorations:
VisualBounds: 32,32
-Capturable:
-CaptureNotification:
-CaptureManager:
2 changes: 0 additions & 2 deletions mods/d2/rules/sardaukar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ sardaukar:
HP: 1000
Mobile:
Speed: 31
WithInfantryBody:
DefaultAttackSequence: shoot
Armament@PRIMARY:
Weapon: M_LMG
Armament@SECONDARY:
Expand Down
2 changes: 0 additions & 2 deletions mods/d2/rules/trooper.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,3 @@ trooper:
LocalOffset: 128,0,256
AttackFrontal:
FacingTolerance: 0
WithInfantryBody:
DefaultAttackSequence: shoot
Loading