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

Armada and Cortex Submarine Colvol Standardization #4036

Merged
merged 3 commits into from
Dec 19, 2024
Merged

Armada and Cortex Submarine Colvol Standardization #4036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3318e58
armsub offset and height increase
drivver44 Dec 18, 2024
c10dd21
remaining t1 sub hitbox adjustments
drivver44 Dec 18, 2024
ac45f83
remaining sub colvol adjustments
drivver44 Dec 18, 2024
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
2 changes: 1 addition & 1 deletion units/ArmShips/T2/armacsub.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ return {
buildtime = 18000,
canmove = true,
collisionvolumeoffsets = "0 0 -1",
collisionvolumescales = "31 30 63",
collisionvolumescales = "38 38 63",
collisionvolumetype = "CylZ",
corpse = "DEAD",
energycost = 9000,
Expand Down
4 changes: 2 additions & 2 deletions units/ArmShips/T2/armserp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ return {
buildpic = "ARMSERP.DDS",
buildtime = 22770,
canmove = true,
collisionvolumeoffsets = "0 -2 0",
collisionvolumescales = "45 19 57",
collisionvolumeoffsets = "0 0 0",
collisionvolumescales = "52 30 57",
collisionvolumetype = "box",
corpse = "DEAD",
energycost = 27000,
Expand Down
4 changes: 2 additions & 2 deletions units/ArmShips/T2/armsubk.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ return {
buildpic = "ARMSUBK.DDS",
buildtime = 22000,
canmove = true,
collisionvolumeoffsets = "0.5 0 0",
collisionvolumescales = "20 15 64",
collisionvolumeoffsets = "0 5 0",
collisionvolumescales = "30 30 64",
collisionvolumetype = "box",
corpse = "DEAD",
energycost = 17000,
Expand Down
4 changes: 2 additions & 2 deletions units/ArmShips/armrecl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ return {
canassist = false,
canmove = true,
canresurrect = true,
collisionvolumeoffsets = "0 0 2",
collisionvolumescales = "38 17 50",
collisionvolumeoffsets = "0 0 -5",
collisionvolumescales = "38 20 65",
collisionvolumetype = "box",
energycost = 3000,
explodeas = "smallexplosiongeneric-uw",
Expand Down
4 changes: 2 additions & 2 deletions units/ArmShips/armsub.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ return {
buildpic = "ARMSUB.DDS",
buildtime = 5800,
canmove = true,
collisionvolumeoffsets = "0 -4 0",
collisionvolumescales = "30 15 43",
collisionvolumeoffsets = "0 0 0",
collisionvolumescales = "30 20 43",
collisionvolumetype = "box",
corpse = "DEAD",
energycost = 3100,
Expand Down
2 changes: 1 addition & 1 deletion units/CorShips/T2/coracsub.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ return {
buildtime = 18000,
canmove = true,
collisionvolumeoffsets = "0 0 4",
collisionvolumescales = "38 9 72",
collisionvolumescales = "40 25 74",
collisionvolumetype = "box",
corpse = "DEAD",
energycost = 9000,
Expand Down
4 changes: 2 additions & 2 deletions units/CorShips/T2/corshark.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ return {
buildpic = "CORSHARK.DDS",
buildtime = 18000,
canmove = true,
collisionvolumeoffsets = "0.5 0 0",
collisionvolumescales = "20 15 64",
collisionvolumeoffsets = "0 5 0",
collisionvolumescales = "30 30 64",
collisionvolumetype = "box",
corpse = "DEAD",
energycost = 14000,
Expand Down
2 changes: 1 addition & 1 deletion units/CorShips/T2/corssub.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ return {
buildtime = 24750,
canmove = true,
collisionvolumeoffsets = "0 0 0",
collisionvolumescales = "52 14 67",
collisionvolumescales = "52 25 60",
collisionvolumetype = "box",
corpse = "DEAD",
energycost = 29000,
Expand Down
4 changes: 2 additions & 2 deletions units/CorShips/corsub.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ return {
buildpic = "CORSUB.DDS",
buildtime = 7200,
canmove = true,
collisionvolumeoffsets = "0 -4 0",
collisionvolumescales = "35 17 50",
collisionvolumeoffsets = "0 0 0",
collisionvolumescales = "35 22 50",
collisionvolumetype = "box",
corpse = "DEAD",
energycost = 4000,
Expand Down