QoL stuff for pre-5 and the future by fourZK · Pull Request #480 · cortex-command-community/Cortex-Command-Community-Project-Source

fourZK · 2023-01-12T22:16:51Z

Particles that are colliding and penetrating with a MOSR now omit said penetrations if the MOSR has already been flagged for deletion, often due to gibbing. This (sadly) fixes armor attachables acting as grenade fragment sponges, but makes explosives (and other particle spam devices) more efficient
MovableMan::ChangeActorTeam now calls a function that forces player to lose control of an actor that's being teamswapped
New settings property CompactingHeight that allows customization of scrap column removal
AEmitter Flash now flipped properly, instead of being hackily rotated like in the stone age
Squad AI crutch for cpp brainlet AI
Other minor things!

…be run in tandem with `MovableMan` function `ChangeActorTeam` so that the player won't control an actor of the wrong team. (TODO: Allow modders to change actor team without losing control?)

… describe any method of delivery, such as teleportation

…erited from the parent actor), so that `OnDetach` can run assign scripted velocities to the dropped item (Uzira sword)

…been flagged for deletion (TODO: settings flag?)

…roperly raises the `AboveHUDPos`

…ht of a column of scrap terrain that can get collapsed. Also cleaned up around compacting height code, and made the pixels falling from the column less erratic.

…illations` and `AngOscillations` which are frankly crap methods of detecting stillness, when pos and angle shifts are already being read.

garethyr

A few questions and changes

Dropped items now need to be still in order for the HUD to show, making actor deaths less noisy visually

…ng `AddedActors`, however removing the `Actors.empty()` check is enough since `ActorRoster` is the only relevant thing in the function

…d-community/Cortex-Command-Community-Project-Source into 4zk-content-source

…er conversion, fix spelling, add Lua getter

garethyr

A few minor things

garethyr · 2023-03-18T20:49:38Z

+ if (!m_ActivateBGItem) {
+ if (deviceAsFirearm->IsFullAuto()) {
+ deviceAsFirearm->Activate();
+ m_ActivateBGItem = (deviceAsFirearm->FiredOnce() || deviceAsFirearm->IsReloading()) && deviceAsFirearm->HalfwayToNextRound();


Seems to me the logic should be
m_ActivateBGItem = (deviceAsFirearm->FiredOnce() && deviceAsFirearm->HalfwayToNextRound()) || deviceAsFirearm->IsReloading();
Otherwise a gun with a very slow fire rate will lock out firing the bg gun while it's reloading, no?

I tested it pretty thoroughly and it seemed to work fine, I guess I can give it another whirl

Okay, thanks. I may very well have been wrong haha

Looked into it, I was technically right. Your code there would brick the bg gun if the fg one is reloading and has a very low ROF
However, you have code on line 3358 that sets the bg gun activation flag to true if the fg gun is reloading.
I've cleaned up the reloading part of this stuff to make it more simple and clear. Feel free to resolve this (just leaving it open so you can read it if you want)

Oh, also, while testing I noticed that the bg item can freely activate if you keep the fire button held down through the reload. E.g. if you equip 2 guns, fire a shot, run for a in MovableMan.Actors do ToHDFirearm(ToAHuman(a).EquippedItem).RateOfFire = 1 end, reload, then hold down fire, your bg gun will fire freely. If you let go of fire and then try again it'll get stuck by the low ROF on the FG gun.
Anyway, this is a particular and silly edge case and probably not worth dealing with, but I ran into it so I figured I should mention it.

garethyr · 2023-03-19T02:38:54Z

- // Note - to avoid item HUDs flickering in and out, we need to add a little leeway when hiding them if they're already displayed.
- if (m_SeenByPlayer.at(viewingPlayer) && unheldItemDisplayRange > 0) { unheldItemDisplayRange += 3.0F; }
- m_SeenByPlayer.at(viewingPlayer) = unheldItemDisplayRange < 0 || (unheldItemDisplayRange > 0 && g_SceneMan.ShortestDistance(m_Pos, g_CameraMan.GetScrollTarget(whichScreen), g_SceneMan.SceneWrapsX()).MagnitudeIsLessThan(unheldItemDisplayRange));
+ if (!m_SeenByPlayer.at(viewingPlayer)) {


This code seems kinda overcomplicated - you have 2 separate lines of code doing basically the same thing for m_SeenByPlayer.
Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
Alternatively, you instead of this wonky method of doing things, you could have some separate m_CanShowLabel flag that is set when the HD collides with terrain and unset when it's attached to something, and respect it in here. That'd be the most correct way to do things I guess.

I tried for the longest time to figure out a solution that didn't require a new property flag lol
If I had to, I would use a timer for the purpose

Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
I guess you're not a fan of this option?
And I get not wanting to make a new property but in general I don't think you need to be worried about that, it's not a big deal (especially since this one doesn't require ini or lua bindings) and it'd be a lot cleaner than it is now.

I'm ultimately okay leaving this as-is though, I guess. I don't wanna deal with it haha

…ounds position Const ptr -> ptr to const Misc cleanup

…r precision) Made buy menu descriptions use new rounding mode and round to 1 sigfig if mass is < 50. This is a bit arbitrary, but it makes it so you generally get no decimal places on bodies but do get em on guns

fourZK · 2023-01-12T22:16:51Z

Particles that are colliding and penetrating with a MOSR now omit said penetrations if the MOSR has already been flagged for deletion, often due to gibbing. This (sadly) fixes armor attachables acting as grenade fragment sponges, but makes explosives (and other particle spam devices) more efficient
MovableMan::ChangeActorTeam now calls a function that forces player to lose control of an actor that's being teamswapped
New settings property CompactingHeight that allows customization of scrap column removal
AEmitter Flash now flipped properly, instead of being hackily rotated like in the stone age
Squad AI crutch for cpp brainlet AI
Other minor things!

…be run in tandem with `MovableMan` function `ChangeActorTeam` so that the player won't control an actor of the wrong team. (TODO: Allow modders to change actor team without losing control?)

… describe any method of delivery, such as teleportation

…erited from the parent actor), so that `OnDetach` can run assign scripted velocities to the dropped item (Uzira sword)

…been flagged for deletion (TODO: settings flag?)

…roperly raises the `AboveHUDPos`

…ht of a column of scrap terrain that can get collapsed. Also cleaned up around compacting height code, and made the pixels falling from the column less erratic.

…illations` and `AngOscillations` which are frankly crap methods of detecting stillness, when pos and angle shifts are already being read.

garethyr

A few questions and changes

Dropped items now need to be still in order for the HUD to show, making actor deaths less noisy visually

…ng `AddedActors`, however removing the `Actors.empty()` check is enough since `ActorRoster` is the only relevant thing in the function

…d-community/Cortex-Command-Community-Project-Source into 4zk-content-source

…er conversion, fix spelling, add Lua getter

garethyr

A few minor things

garethyr · 2023-03-18T20:49:38Z

+ if (!m_ActivateBGItem) {
+ if (deviceAsFirearm->IsFullAuto()) {
+ deviceAsFirearm->Activate();
+ m_ActivateBGItem = (deviceAsFirearm->FiredOnce() || deviceAsFirearm->IsReloading()) && deviceAsFirearm->HalfwayToNextRound();


Seems to me the logic should be
m_ActivateBGItem = (deviceAsFirearm->FiredOnce() && deviceAsFirearm->HalfwayToNextRound()) || deviceAsFirearm->IsReloading();
Otherwise a gun with a very slow fire rate will lock out firing the bg gun while it's reloading, no?

I tested it pretty thoroughly and it seemed to work fine, I guess I can give it another whirl

Okay, thanks. I may very well have been wrong haha

Looked into it, I was technically right. Your code there would brick the bg gun if the fg one is reloading and has a very low ROF
However, you have code on line 3358 that sets the bg gun activation flag to true if the fg gun is reloading.
I've cleaned up the reloading part of this stuff to make it more simple and clear. Feel free to resolve this (just leaving it open so you can read it if you want)

Oh, also, while testing I noticed that the bg item can freely activate if you keep the fire button held down through the reload. E.g. if you equip 2 guns, fire a shot, run for a in MovableMan.Actors do ToHDFirearm(ToAHuman(a).EquippedItem).RateOfFire = 1 end, reload, then hold down fire, your bg gun will fire freely. If you let go of fire and then try again it'll get stuck by the low ROF on the FG gun.
Anyway, this is a particular and silly edge case and probably not worth dealing with, but I ran into it so I figured I should mention it.

garethyr · 2023-03-19T02:38:54Z

- // Note - to avoid item HUDs flickering in and out, we need to add a little leeway when hiding them if they're already displayed.
- if (m_SeenByPlayer.at(viewingPlayer) && unheldItemDisplayRange > 0) { unheldItemDisplayRange += 3.0F; }
- m_SeenByPlayer.at(viewingPlayer) = unheldItemDisplayRange < 0 || (unheldItemDisplayRange > 0 && g_SceneMan.ShortestDistance(m_Pos, g_CameraMan.GetScrollTarget(whichScreen), g_SceneMan.SceneWrapsX()).MagnitudeIsLessThan(unheldItemDisplayRange));
+ if (!m_SeenByPlayer.at(viewingPlayer)) {


This code seems kinda overcomplicated - you have 2 separate lines of code doing basically the same thing for m_SeenByPlayer.
Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
Alternatively, you instead of this wonky method of doing things, you could have some separate m_CanShowLabel flag that is set when the HD collides with terrain and unset when it's attached to something, and respect it in here. That'd be the most correct way to do things I guess.

I tried for the longest time to figure out a solution that didn't require a new property flag lol
If I had to, I would use a timer for the purpose

Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
I guess you're not a fan of this option?
And I get not wanting to make a new property but in general I don't think you need to be worried about that, it's not a big deal (especially since this one doesn't require ini or lua bindings) and it'd be a lot cleaner than it is now.

I'm ultimately okay leaving this as-is though, I guess. I don't wanna deal with it haha

…ounds position Const ptr -> ptr to const Misc cleanup

…r precision) Made buy menu descriptions use new rounding mode and round to 1 sigfig if mass is < 50. This is a bit arbitrary, but it makes it so you generally get no decimal places on bodies but do get em on guns

fourZK · 2023-01-12T22:16:51Z

Particles that are colliding and penetrating with a MOSR now omit said penetrations if the MOSR has already been flagged for deletion, often due to gibbing. This (sadly) fixes armor attachables acting as grenade fragment sponges, but makes explosives (and other particle spam devices) more efficient
MovableMan::ChangeActorTeam now calls a function that forces player to lose control of an actor that's being teamswapped
New settings property CompactingHeight that allows customization of scrap column removal
AEmitter Flash now flipped properly, instead of being hackily rotated like in the stone age
Squad AI crutch for cpp brainlet AI
Other minor things!

…be run in tandem with `MovableMan` function `ChangeActorTeam` so that the player won't control an actor of the wrong team. (TODO: Allow modders to change actor team without losing control?)

… describe any method of delivery, such as teleportation

…erited from the parent actor), so that `OnDetach` can run assign scripted velocities to the dropped item (Uzira sword)

…been flagged for deletion (TODO: settings flag?)

…roperly raises the `AboveHUDPos`

…ht of a column of scrap terrain that can get collapsed. Also cleaned up around compacting height code, and made the pixels falling from the column less erratic.

…illations` and `AngOscillations` which are frankly crap methods of detecting stillness, when pos and angle shifts are already being read.

garethyr

A few questions and changes

Dropped items now need to be still in order for the HUD to show, making actor deaths less noisy visually

…ng `AddedActors`, however removing the `Actors.empty()` check is enough since `ActorRoster` is the only relevant thing in the function

…d-community/Cortex-Command-Community-Project-Source into 4zk-content-source

…er conversion, fix spelling, add Lua getter

garethyr

A few minor things

garethyr · 2023-03-18T20:49:38Z

+ if (!m_ActivateBGItem) {
+ if (deviceAsFirearm->IsFullAuto()) {
+ deviceAsFirearm->Activate();
+ m_ActivateBGItem = (deviceAsFirearm->FiredOnce() || deviceAsFirearm->IsReloading()) && deviceAsFirearm->HalfwayToNextRound();


Seems to me the logic should be
m_ActivateBGItem = (deviceAsFirearm->FiredOnce() && deviceAsFirearm->HalfwayToNextRound()) || deviceAsFirearm->IsReloading();
Otherwise a gun with a very slow fire rate will lock out firing the bg gun while it's reloading, no?

I tested it pretty thoroughly and it seemed to work fine, I guess I can give it another whirl

Okay, thanks. I may very well have been wrong haha

Looked into it, I was technically right. Your code there would brick the bg gun if the fg one is reloading and has a very low ROF
However, you have code on line 3358 that sets the bg gun activation flag to true if the fg gun is reloading.
I've cleaned up the reloading part of this stuff to make it more simple and clear. Feel free to resolve this (just leaving it open so you can read it if you want)

Oh, also, while testing I noticed that the bg item can freely activate if you keep the fire button held down through the reload. E.g. if you equip 2 guns, fire a shot, run for a in MovableMan.Actors do ToHDFirearm(ToAHuman(a).EquippedItem).RateOfFire = 1 end, reload, then hold down fire, your bg gun will fire freely. If you let go of fire and then try again it'll get stuck by the low ROF on the FG gun.
Anyway, this is a particular and silly edge case and probably not worth dealing with, but I ran into it so I figured I should mention it.

garethyr · 2023-03-19T02:38:54Z

- // Note - to avoid item HUDs flickering in and out, we need to add a little leeway when hiding them if they're already displayed.
- if (m_SeenByPlayer.at(viewingPlayer) && unheldItemDisplayRange > 0) { unheldItemDisplayRange += 3.0F; }
- m_SeenByPlayer.at(viewingPlayer) = unheldItemDisplayRange < 0 || (unheldItemDisplayRange > 0 && g_SceneMan.ShortestDistance(m_Pos, g_CameraMan.GetScrollTarget(whichScreen), g_SceneMan.SceneWrapsX()).MagnitudeIsLessThan(unheldItemDisplayRange));
+ if (!m_SeenByPlayer.at(viewingPlayer)) {


This code seems kinda overcomplicated - you have 2 separate lines of code doing basically the same thing for m_SeenByPlayer.
Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
Alternatively, you instead of this wonky method of doing things, you could have some separate m_CanShowLabel flag that is set when the HD collides with terrain and unset when it's attached to something, and respect it in here. That'd be the most correct way to do things I guess.

I tried for the longest time to figure out a solution that didn't require a new property flag lol
If I had to, I would use a timer for the purpose

Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
I guess you're not a fan of this option?
And I get not wanting to make a new property but in general I don't think you need to be worried about that, it's not a big deal (especially since this one doesn't require ini or lua bindings) and it'd be a lot cleaner than it is now.

I'm ultimately okay leaving this as-is though, I guess. I don't wanna deal with it haha

…ounds position Const ptr -> ptr to const Misc cleanup

…r precision) Made buy menu descriptions use new rounding mode and round to 1 sigfig if mass is < 50. This is a bit arbitrary, but it makes it so you generally get no decimal places on bodies but do get em on guns

fourZK · 2023-01-12T22:16:51Z

Particles that are colliding and penetrating with a MOSR now omit said penetrations if the MOSR has already been flagged for deletion, often due to gibbing. This (sadly) fixes armor attachables acting as grenade fragment sponges, but makes explosives (and other particle spam devices) more efficient
MovableMan::ChangeActorTeam now calls a function that forces player to lose control of an actor that's being teamswapped
New settings property CompactingHeight that allows customization of scrap column removal
AEmitter Flash now flipped properly, instead of being hackily rotated like in the stone age
Squad AI crutch for cpp brainlet AI
Other minor things!

…be run in tandem with `MovableMan` function `ChangeActorTeam` so that the player won't control an actor of the wrong team. (TODO: Allow modders to change actor team without losing control?)

… describe any method of delivery, such as teleportation

…erited from the parent actor), so that `OnDetach` can run assign scripted velocities to the dropped item (Uzira sword)

…been flagged for deletion (TODO: settings flag?)

…roperly raises the `AboveHUDPos`

…ht of a column of scrap terrain that can get collapsed. Also cleaned up around compacting height code, and made the pixels falling from the column less erratic.

…illations` and `AngOscillations` which are frankly crap methods of detecting stillness, when pos and angle shifts are already being read.

garethyr

A few questions and changes

Dropped items now need to be still in order for the HUD to show, making actor deaths less noisy visually

…ng `AddedActors`, however removing the `Actors.empty()` check is enough since `ActorRoster` is the only relevant thing in the function

…d-community/Cortex-Command-Community-Project-Source into 4zk-content-source

…er conversion, fix spelling, add Lua getter

garethyr

A few minor things

garethyr · 2023-03-18T20:49:38Z

+ if (!m_ActivateBGItem) {
+ if (deviceAsFirearm->IsFullAuto()) {
+ deviceAsFirearm->Activate();
+ m_ActivateBGItem = (deviceAsFirearm->FiredOnce() || deviceAsFirearm->IsReloading()) && deviceAsFirearm->HalfwayToNextRound();


Seems to me the logic should be
m_ActivateBGItem = (deviceAsFirearm->FiredOnce() && deviceAsFirearm->HalfwayToNextRound()) || deviceAsFirearm->IsReloading();
Otherwise a gun with a very slow fire rate will lock out firing the bg gun while it's reloading, no?

I tested it pretty thoroughly and it seemed to work fine, I guess I can give it another whirl

Okay, thanks. I may very well have been wrong haha

Looked into it, I was technically right. Your code there would brick the bg gun if the fg one is reloading and has a very low ROF
However, you have code on line 3358 that sets the bg gun activation flag to true if the fg gun is reloading.
I've cleaned up the reloading part of this stuff to make it more simple and clear. Feel free to resolve this (just leaving it open so you can read it if you want)

Oh, also, while testing I noticed that the bg item can freely activate if you keep the fire button held down through the reload. E.g. if you equip 2 guns, fire a shot, run for a in MovableMan.Actors do ToHDFirearm(ToAHuman(a).EquippedItem).RateOfFire = 1 end, reload, then hold down fire, your bg gun will fire freely. If you let go of fire and then try again it'll get stuck by the low ROF on the FG gun.
Anyway, this is a particular and silly edge case and probably not worth dealing with, but I ran into it so I figured I should mention it.

garethyr · 2023-03-19T02:38:54Z

- // Note - to avoid item HUDs flickering in and out, we need to add a little leeway when hiding them if they're already displayed.
- if (m_SeenByPlayer.at(viewingPlayer) && unheldItemDisplayRange > 0) { unheldItemDisplayRange += 3.0F; }
- m_SeenByPlayer.at(viewingPlayer) = unheldItemDisplayRange < 0 || (unheldItemDisplayRange > 0 && g_SceneMan.ShortestDistance(m_Pos, g_CameraMan.GetScrollTarget(whichScreen), g_SceneMan.SceneWrapsX()).MagnitudeIsLessThan(unheldItemDisplayRange));
+ if (!m_SeenByPlayer.at(viewingPlayer)) {


This code seems kinda overcomplicated - you have 2 separate lines of code doing basically the same thing for m_SeenByPlayer.
Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
Alternatively, you instead of this wonky method of doing things, you could have some separate m_CanShowLabel flag that is set when the HD collides with terrain and unset when it's attached to something, and respect it in here. That'd be the most correct way to do things I guess.

I tried for the longest time to figure out a solution that didn't require a new property flag lol
If I had to, I would use a timer for the purpose

Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
I guess you're not a fan of this option?
And I get not wanting to make a new property but in general I don't think you need to be worried about that, it's not a big deal (especially since this one doesn't require ini or lua bindings) and it'd be a lot cleaner than it is now.

I'm ultimately okay leaving this as-is though, I guess. I don't wanna deal with it haha

…ounds position Const ptr -> ptr to const Misc cleanup

…r precision) Made buy menu descriptions use new rounding mode and round to 1 sigfig if mass is < 50. This is a bit arbitrary, but it makes it so you generally get no decimal places on bodies but do get em on guns

fourZK · 2023-01-12T22:16:51Z

Particles that are colliding and penetrating with a MOSR now omit said penetrations if the MOSR has already been flagged for deletion, often due to gibbing. This (sadly) fixes armor attachables acting as grenade fragment sponges, but makes explosives (and other particle spam devices) more efficient
MovableMan::ChangeActorTeam now calls a function that forces player to lose control of an actor that's being teamswapped
New settings property CompactingHeight that allows customization of scrap column removal
AEmitter Flash now flipped properly, instead of being hackily rotated like in the stone age
Squad AI crutch for cpp brainlet AI
Other minor things!

…be run in tandem with `MovableMan` function `ChangeActorTeam` so that the player won't control an actor of the wrong team. (TODO: Allow modders to change actor team without losing control?)

… describe any method of delivery, such as teleportation

…erited from the parent actor), so that `OnDetach` can run assign scripted velocities to the dropped item (Uzira sword)

…been flagged for deletion (TODO: settings flag?)

…roperly raises the `AboveHUDPos`

…ht of a column of scrap terrain that can get collapsed. Also cleaned up around compacting height code, and made the pixels falling from the column less erratic.

…illations` and `AngOscillations` which are frankly crap methods of detecting stillness, when pos and angle shifts are already being read.

garethyr

A few questions and changes

Dropped items now need to be still in order for the HUD to show, making actor deaths less noisy visually

…ng `AddedActors`, however removing the `Actors.empty()` check is enough since `ActorRoster` is the only relevant thing in the function

…d-community/Cortex-Command-Community-Project-Source into 4zk-content-source

…er conversion, fix spelling, add Lua getter

garethyr

A few minor things

garethyr · 2023-03-18T20:49:38Z

+ if (!m_ActivateBGItem) {
+ if (deviceAsFirearm->IsFullAuto()) {
+ deviceAsFirearm->Activate();
+ m_ActivateBGItem = (deviceAsFirearm->FiredOnce() || deviceAsFirearm->IsReloading()) && deviceAsFirearm->HalfwayToNextRound();


Seems to me the logic should be
m_ActivateBGItem = (deviceAsFirearm->FiredOnce() && deviceAsFirearm->HalfwayToNextRound()) || deviceAsFirearm->IsReloading();
Otherwise a gun with a very slow fire rate will lock out firing the bg gun while it's reloading, no?

I tested it pretty thoroughly and it seemed to work fine, I guess I can give it another whirl

Okay, thanks. I may very well have been wrong haha

Looked into it, I was technically right. Your code there would brick the bg gun if the fg one is reloading and has a very low ROF
However, you have code on line 3358 that sets the bg gun activation flag to true if the fg gun is reloading.
I've cleaned up the reloading part of this stuff to make it more simple and clear. Feel free to resolve this (just leaving it open so you can read it if you want)

Oh, also, while testing I noticed that the bg item can freely activate if you keep the fire button held down through the reload. E.g. if you equip 2 guns, fire a shot, run for a in MovableMan.Actors do ToHDFirearm(ToAHuman(a).EquippedItem).RateOfFire = 1 end, reload, then hold down fire, your bg gun will fire freely. If you let go of fire and then try again it'll get stuck by the low ROF on the FG gun.
Anyway, this is a particular and silly edge case and probably not worth dealing with, but I ran into it so I figured I should mention it.

garethyr · 2023-03-19T02:38:54Z

- // Note - to avoid item HUDs flickering in and out, we need to add a little leeway when hiding them if they're already displayed.
- if (m_SeenByPlayer.at(viewingPlayer) && unheldItemDisplayRange > 0) { unheldItemDisplayRange += 3.0F; }
- m_SeenByPlayer.at(viewingPlayer) = unheldItemDisplayRange < 0 || (unheldItemDisplayRange > 0 && g_SceneMan.ShortestDistance(m_Pos, g_CameraMan.GetScrollTarget(whichScreen), g_SceneMan.SceneWrapsX()).MagnitudeIsLessThan(unheldItemDisplayRange));
+ if (!m_SeenByPlayer.at(viewingPlayer)) {


This code seems kinda overcomplicated - you have 2 separate lines of code doing basically the same thing for m_SeenByPlayer.
Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
Alternatively, you instead of this wonky method of doing things, you could have some separate m_CanShowLabel flag that is set when the HD collides with terrain and unset when it's attached to something, and respect it in here. That'd be the most correct way to do things I guess.

I tried for the longest time to figure out a solution that didn't require a new property flag lol
If I had to, I would use a timer for the purpose

Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
I guess you're not a fan of this option?
And I get not wanting to make a new property but in general I don't think you need to be worried about that, it's not a big deal (especially since this one doesn't require ini or lua bindings) and it'd be a lot cleaner than it is now.

I'm ultimately okay leaving this as-is though, I guess. I don't wanna deal with it haha

…ounds position Const ptr -> ptr to const Misc cleanup

…r precision) Made buy menu descriptions use new rounding mode and round to 1 sigfig if mass is < 50. This is a bit arbitrary, but it makes it so you generally get no decimal places on bodies but do get em on guns

fourZK · 2023-01-12T22:16:51Z

Particles that are colliding and penetrating with a MOSR now omit said penetrations if the MOSR has already been flagged for deletion, often due to gibbing. This (sadly) fixes armor attachables acting as grenade fragment sponges, but makes explosives (and other particle spam devices) more efficient
MovableMan::ChangeActorTeam now calls a function that forces player to lose control of an actor that's being teamswapped
New settings property CompactingHeight that allows customization of scrap column removal
AEmitter Flash now flipped properly, instead of being hackily rotated like in the stone age
Squad AI crutch for cpp brainlet AI
Other minor things!

…be run in tandem with `MovableMan` function `ChangeActorTeam` so that the player won't control an actor of the wrong team. (TODO: Allow modders to change actor team without losing control?)

… describe any method of delivery, such as teleportation

…erited from the parent actor), so that `OnDetach` can run assign scripted velocities to the dropped item (Uzira sword)

…been flagged for deletion (TODO: settings flag?)

…roperly raises the `AboveHUDPos`

…ht of a column of scrap terrain that can get collapsed. Also cleaned up around compacting height code, and made the pixels falling from the column less erratic.

…illations` and `AngOscillations` which are frankly crap methods of detecting stillness, when pos and angle shifts are already being read.

garethyr

A few questions and changes

Dropped items now need to be still in order for the HUD to show, making actor deaths less noisy visually

…ng `AddedActors`, however removing the `Actors.empty()` check is enough since `ActorRoster` is the only relevant thing in the function

…d-community/Cortex-Command-Community-Project-Source into 4zk-content-source

…er conversion, fix spelling, add Lua getter

garethyr

A few minor things

garethyr · 2023-03-18T20:49:38Z

+ if (!m_ActivateBGItem) {
+ if (deviceAsFirearm->IsFullAuto()) {
+ deviceAsFirearm->Activate();
+ m_ActivateBGItem = (deviceAsFirearm->FiredOnce() || deviceAsFirearm->IsReloading()) && deviceAsFirearm->HalfwayToNextRound();


Seems to me the logic should be
m_ActivateBGItem = (deviceAsFirearm->FiredOnce() && deviceAsFirearm->HalfwayToNextRound()) || deviceAsFirearm->IsReloading();
Otherwise a gun with a very slow fire rate will lock out firing the bg gun while it's reloading, no?

I tested it pretty thoroughly and it seemed to work fine, I guess I can give it another whirl

Okay, thanks. I may very well have been wrong haha

Looked into it, I was technically right. Your code there would brick the bg gun if the fg one is reloading and has a very low ROF
However, you have code on line 3358 that sets the bg gun activation flag to true if the fg gun is reloading.
I've cleaned up the reloading part of this stuff to make it more simple and clear. Feel free to resolve this (just leaving it open so you can read it if you want)

Oh, also, while testing I noticed that the bg item can freely activate if you keep the fire button held down through the reload. E.g. if you equip 2 guns, fire a shot, run for a in MovableMan.Actors do ToHDFirearm(ToAHuman(a).EquippedItem).RateOfFire = 1 end, reload, then hold down fire, your bg gun will fire freely. If you let go of fire and then try again it'll get stuck by the low ROF on the FG gun.
Anyway, this is a particular and silly edge case and probably not worth dealing with, but I ran into it so I figured I should mention it.

garethyr · 2023-03-19T02:38:54Z

- // Note - to avoid item HUDs flickering in and out, we need to add a little leeway when hiding them if they're already displayed.
- if (m_SeenByPlayer.at(viewingPlayer) && unheldItemDisplayRange > 0) { unheldItemDisplayRange += 3.0F; }
- m_SeenByPlayer.at(viewingPlayer) = unheldItemDisplayRange < 0 || (unheldItemDisplayRange > 0 && g_SceneMan.ShortestDistance(m_Pos, g_CameraMan.GetScrollTarget(whichScreen), g_SceneMan.SceneWrapsX()).MagnitudeIsLessThan(unheldItemDisplayRange));
+ if (!m_SeenByPlayer.at(viewingPlayer)) {


This code seems kinda overcomplicated - you have 2 separate lines of code doing basically the same thing for m_SeenByPlayer.
Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
Alternatively, you instead of this wonky method of doing things, you could have some separate m_CanShowLabel flag that is set when the HD collides with terrain and unset when it's attached to something, and respect it in here. That'd be the most correct way to do things I guess.

I tried for the longest time to figure out a solution that didn't require a new property flag lol
If I had to, I would use a timer for the purpose

Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
I guess you're not a fan of this option?
And I get not wanting to make a new property but in general I don't think you need to be worried about that, it's not a big deal (especially since this one doesn't require ini or lua bindings) and it'd be a lot cleaner than it is now.

I'm ultimately okay leaving this as-is though, I guess. I don't wanna deal with it haha

…ounds position Const ptr -> ptr to const Misc cleanup

…r precision) Made buy menu descriptions use new rounding mode and round to 1 sigfig if mass is < 50. This is a bit arbitrary, but it makes it so you generally get no decimal places on bodies but do get em on guns

fourZK · 2023-01-12T22:16:51Z

Particles that are colliding and penetrating with a MOSR now omit said penetrations if the MOSR has already been flagged for deletion, often due to gibbing. This (sadly) fixes armor attachables acting as grenade fragment sponges, but makes explosives (and other particle spam devices) more efficient
MovableMan::ChangeActorTeam now calls a function that forces player to lose control of an actor that's being teamswapped
New settings property CompactingHeight that allows customization of scrap column removal
AEmitter Flash now flipped properly, instead of being hackily rotated like in the stone age
Squad AI crutch for cpp brainlet AI
Other minor things!

…be run in tandem with `MovableMan` function `ChangeActorTeam` so that the player won't control an actor of the wrong team. (TODO: Allow modders to change actor team without losing control?)

… describe any method of delivery, such as teleportation

…erited from the parent actor), so that `OnDetach` can run assign scripted velocities to the dropped item (Uzira sword)

…been flagged for deletion (TODO: settings flag?)

…roperly raises the `AboveHUDPos`

…ht of a column of scrap terrain that can get collapsed. Also cleaned up around compacting height code, and made the pixels falling from the column less erratic.

…illations` and `AngOscillations` which are frankly crap methods of detecting stillness, when pos and angle shifts are already being read.

garethyr

A few questions and changes

Dropped items now need to be still in order for the HUD to show, making actor deaths less noisy visually

…ng `AddedActors`, however removing the `Actors.empty()` check is enough since `ActorRoster` is the only relevant thing in the function

…d-community/Cortex-Command-Community-Project-Source into 4zk-content-source

…er conversion, fix spelling, add Lua getter

garethyr

A few minor things

garethyr · 2023-03-18T20:49:38Z

+ if (!m_ActivateBGItem) {
+ if (deviceAsFirearm->IsFullAuto()) {
+ deviceAsFirearm->Activate();
+ m_ActivateBGItem = (deviceAsFirearm->FiredOnce() || deviceAsFirearm->IsReloading()) && deviceAsFirearm->HalfwayToNextRound();


Seems to me the logic should be
m_ActivateBGItem = (deviceAsFirearm->FiredOnce() && deviceAsFirearm->HalfwayToNextRound()) || deviceAsFirearm->IsReloading();
Otherwise a gun with a very slow fire rate will lock out firing the bg gun while it's reloading, no?

I tested it pretty thoroughly and it seemed to work fine, I guess I can give it another whirl

Okay, thanks. I may very well have been wrong haha

Looked into it, I was technically right. Your code there would brick the bg gun if the fg one is reloading and has a very low ROF
However, you have code on line 3358 that sets the bg gun activation flag to true if the fg gun is reloading.
I've cleaned up the reloading part of this stuff to make it more simple and clear. Feel free to resolve this (just leaving it open so you can read it if you want)

Oh, also, while testing I noticed that the bg item can freely activate if you keep the fire button held down through the reload. E.g. if you equip 2 guns, fire a shot, run for a in MovableMan.Actors do ToHDFirearm(ToAHuman(a).EquippedItem).RateOfFire = 1 end, reload, then hold down fire, your bg gun will fire freely. If you let go of fire and then try again it'll get stuck by the low ROF on the FG gun.
Anyway, this is a particular and silly edge case and probably not worth dealing with, but I ran into it so I figured I should mention it.

garethyr · 2023-03-19T02:38:54Z

- // Note - to avoid item HUDs flickering in and out, we need to add a little leeway when hiding them if they're already displayed.
- if (m_SeenByPlayer.at(viewingPlayer) && unheldItemDisplayRange > 0) { unheldItemDisplayRange += 3.0F; }
- m_SeenByPlayer.at(viewingPlayer) = unheldItemDisplayRange < 0 || (unheldItemDisplayRange > 0 && g_SceneMan.ShortestDistance(m_Pos, g_CameraMan.GetScrollTarget(whichScreen), g_SceneMan.SceneWrapsX()).MagnitudeIsLessThan(unheldItemDisplayRange));
+ if (!m_SeenByPlayer.at(viewingPlayer)) {


This code seems kinda overcomplicated - you have 2 separate lines of code doing basically the same thing for m_SeenByPlayer.
Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
Alternatively, you instead of this wonky method of doing things, you could have some separate m_CanShowLabel flag that is set when the HD collides with terrain and unset when it's attached to something, and respect it in here. That'd be the most correct way to do things I guess.

I tried for the longest time to figure out a solution that didn't require a new property flag lol
If I had to, I would use a timer for the purpose

Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
I guess you're not a fan of this option?
And I get not wanting to make a new property but in general I don't think you need to be worried about that, it's not a big deal (especially since this one doesn't require ini or lua bindings) and it'd be a lot cleaner than it is now.

I'm ultimately okay leaving this as-is though, I guess. I don't wanna deal with it haha

…ounds position Const ptr -> ptr to const Misc cleanup

…r precision) Made buy menu descriptions use new rounding mode and round to 1 sigfig if mass is < 50. This is a bit arbitrary, but it makes it so you generally get no decimal places on bodies but do get em on guns

fourZK · 2023-01-12T22:16:51Z

Particles that are colliding and penetrating with a MOSR now omit said penetrations if the MOSR has already been flagged for deletion, often due to gibbing. This (sadly) fixes armor attachables acting as grenade fragment sponges, but makes explosives (and other particle spam devices) more efficient
MovableMan::ChangeActorTeam now calls a function that forces player to lose control of an actor that's being teamswapped
New settings property CompactingHeight that allows customization of scrap column removal
AEmitter Flash now flipped properly, instead of being hackily rotated like in the stone age
Squad AI crutch for cpp brainlet AI
Other minor things!

…be run in tandem with `MovableMan` function `ChangeActorTeam` so that the player won't control an actor of the wrong team. (TODO: Allow modders to change actor team without losing control?)

… describe any method of delivery, such as teleportation

…erited from the parent actor), so that `OnDetach` can run assign scripted velocities to the dropped item (Uzira sword)

…been flagged for deletion (TODO: settings flag?)

…roperly raises the `AboveHUDPos`

…ht of a column of scrap terrain that can get collapsed. Also cleaned up around compacting height code, and made the pixels falling from the column less erratic.

…illations` and `AngOscillations` which are frankly crap methods of detecting stillness, when pos and angle shifts are already being read.

garethyr

A few questions and changes

Dropped items now need to be still in order for the HUD to show, making actor deaths less noisy visually

…ng `AddedActors`, however removing the `Actors.empty()` check is enough since `ActorRoster` is the only relevant thing in the function

…d-community/Cortex-Command-Community-Project-Source into 4zk-content-source

…er conversion, fix spelling, add Lua getter

garethyr

A few minor things

garethyr · 2023-03-18T20:49:38Z

+ if (!m_ActivateBGItem) {
+ if (deviceAsFirearm->IsFullAuto()) {
+ deviceAsFirearm->Activate();
+ m_ActivateBGItem = (deviceAsFirearm->FiredOnce() || deviceAsFirearm->IsReloading()) && deviceAsFirearm->HalfwayToNextRound();


Seems to me the logic should be
m_ActivateBGItem = (deviceAsFirearm->FiredOnce() && deviceAsFirearm->HalfwayToNextRound()) || deviceAsFirearm->IsReloading();
Otherwise a gun with a very slow fire rate will lock out firing the bg gun while it's reloading, no?

I tested it pretty thoroughly and it seemed to work fine, I guess I can give it another whirl

Okay, thanks. I may very well have been wrong haha

Looked into it, I was technically right. Your code there would brick the bg gun if the fg one is reloading and has a very low ROF
However, you have code on line 3358 that sets the bg gun activation flag to true if the fg gun is reloading.
I've cleaned up the reloading part of this stuff to make it more simple and clear. Feel free to resolve this (just leaving it open so you can read it if you want)

Oh, also, while testing I noticed that the bg item can freely activate if you keep the fire button held down through the reload. E.g. if you equip 2 guns, fire a shot, run for a in MovableMan.Actors do ToHDFirearm(ToAHuman(a).EquippedItem).RateOfFire = 1 end, reload, then hold down fire, your bg gun will fire freely. If you let go of fire and then try again it'll get stuck by the low ROF on the FG gun.
Anyway, this is a particular and silly edge case and probably not worth dealing with, but I ran into it so I figured I should mention it.

garethyr · 2023-03-19T02:38:54Z

- // Note - to avoid item HUDs flickering in and out, we need to add a little leeway when hiding them if they're already displayed.
- if (m_SeenByPlayer.at(viewingPlayer) && unheldItemDisplayRange > 0) { unheldItemDisplayRange += 3.0F; }
- m_SeenByPlayer.at(viewingPlayer) = unheldItemDisplayRange < 0 || (unheldItemDisplayRange > 0 && g_SceneMan.ShortestDistance(m_Pos, g_CameraMan.GetScrollTarget(whichScreen), g_SceneMan.SceneWrapsX()).MagnitudeIsLessThan(unheldItemDisplayRange));
+ if (!m_SeenByPlayer.at(viewingPlayer)) {


This code seems kinda overcomplicated - you have 2 separate lines of code doing basically the same thing for m_SeenByPlayer.
Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
Alternatively, you instead of this wonky method of doing things, you could have some separate m_CanShowLabel flag that is set when the HD collides with terrain and unset when it's attached to something, and respect it in here. That'd be the most correct way to do things I guess.

I tried for the longest time to figure out a solution that didn't require a new property flag lol
If I had to, I would use a timer for the purpose

Why not just make it so if vel magnitude is > 2.0, you break out of this more cleanly? I know it's slightly different than your intent of making it so weapons don't show labels for a bit when they're dropped, but it's probably fine for weapons that are flying through the air to now show labels anyway.
I guess you're not a fan of this option?
And I get not wanting to make a new property but in general I don't think you need to be worried about that, it's not a big deal (especially since this one doesn't require ini or lua bindings) and it'd be a lot cleaner than it is now.

I'm ultimately okay leaving this as-is though, I guess. I don't wanna deal with it haha

…ounds position Const ptr -> ptr to const Misc cleanup

…r precision) Made buy menu descriptions use new rounding mode and round to 1 sigfig if mass is < 50. This is a bit arbitrary, but it makes it so you generally get no decimal places on bodies but do get em on guns

fourZK added 9 commits January 12, 2023 22:02

Add dedicated Activity function LoseControlOfActor that needs to …
f75edf5
…be run in tandem with `MovableMan` function `ChangeActorTeam` so that the player won't control an actor of the wrong team. (TODO: Allow modders to change actor team without losing control?)

Change the preposition "on" to "via" in Preset descriptions to better…
5188215
… describe any method of delivery, such as teleportation

Crutches for the terminally ill cpp AI (sorry Causeless)
6626b1f

Refer to the Velocity of the item when it gets dropped (otherwise inh…
4c0403a
…erited from the parent actor), so that `OnDetach` can run assign scripted velocities to the dropped item (Uzira sword)

Allow penetrating particles to omit the hitee MOSR if it has already …
505cc40
…been flagged for deletion (TODO: settings flag?)

Use flip AEmitter Flashes instead of rotating them
b940fd6

AHuman head rotation fixes and HUD fix where item in pickup reach p…
89aa378
…roperly raises the `AboveHUDPos`

Added settings property for CompactingHeight, i.e. the maximum heig…
03acb75
…ht of a column of scrap terrain that can get collapsed. Also cleaned up around compacting height code, and made the pixels falling from the column less erratic.

Settling logic cleanup, namely removing seemingly prehistoric `VelOsc…
7cbb83b
…illations` and `AngOscillations` which are frankly crap methods of detecting stillness, when pos and angle shifts are already being read.

fourZK assigned garethyr and MaximDude Jan 12, 2023

garethyr requested a review from a teamJanuary 12, 2023 22:25

garethyr unassigned garethyr and MaximDude Jan 12, 2023

garethyr suggested changes Jan 12, 2023
View reviewed changes

Comment threadActivities/GameActivity.cpp
Comment threadEntities/MOSRotating.cpp Outdated
Comment threadManagers/SettingsMan.h Outdated
Comment threadEntities/MovableObject.cpp Outdated
Comment threadManagers/SceneMan.cpp

Causeless reviewed Jan 13, 2023
View reviewed changes

Comment threadEntities/MovableObject.cpp Outdated
Comment threadManagers/SettingsMan.h Outdated

Review changes + reformatting
c51c7b9

Causeless reviewed Jan 13, 2023
View reviewed changes

Comment threadEntities/MOSRotating.cpp

fourZKand others added 4 commits January 14, 2023 22:46

Reverting and reformatting settling logic
0a32cf8

Important changes regarding arms and dropped items;
cae0dc7
Dropped items now need to be still in order for the HUD to show, making actor deaths less noisy visually

Merge branch 'development' into 4zk-content-source
93ce769

Minor refactor
3c351d5

garethyr previously approved these changes Jan 15, 2023
View reviewed changes

garethyrand others added 5 commits January 15, 2023 01:18

Merge branch 'development' into 4zk-content-source
fc24cda

Fix MovableMan::GetClosestBrainActor early return due to not checki…
787ee0a
…ng `AddedActors`, however removing the `Actors.empty()` check is enough since `ActorRoster` is the only relevant thing in the function

Tutorial mission edits
a42f383

Reset actor stable recovery timer when made unstable
036fc4b

Merge branch '4zk-content-source' ofhttps://github.com/cortex-comman…
c6086e1
…d-community/Cortex-Command-Community-Project-Source into 4zk-content-source

fourZK dismissed garethyr’s stale review via c6086e1January 15, 2023 19:38

Merge branch 'development' into 4zk-content-source
11c5f5a

Causeless suggested changes Mar 13, 2023
View reviewed changes

Comment threadManagers/CameraMan.cpp Outdated
Comment threadManagers/CameraMan.cpp Outdated

fourZKand others added 6 commits March 15, 2023 15:24

Revert screen shake related changes
ca41b5d

Move DistanceTraveled from MOPixel to MovableObject, remove met…
a423804
…er conversion, fix spelling, add Lua getter

Changelog entry for DistanceTravelled
a954502

Merge branch 'development' into 4zk-content-source
c895e30

Allow Jetpack fuel indicator to persist until full
bf3456c

Merge branch 'development' into 4zk-content-source
86f6bc0

garethyr suggested changes Mar 19, 2023
View reviewed changes

Various bits of minor cleanup
9c155a2

traunts mentioned this pull request Mar 19, 2023
Add a settings flag to reenable MOSRotating objects absorbing particles when set toDelete#492
Open

MaximDude added 2 commits April 12, 2023 08:04

Merge branch 'development' into 4zk-content-source
eaeb940

Merge branch 'development' into 4zk-content-source
2802363

MaximDude linked an issue Apr 13, 2023 that may be closed by this pull request
Re-instate the old GoldCarried system as a toggleable setting #244
Closed

garethyrand others added 8 commits April 13, 2023 17:18

Merge branch 'development' into 4zk-content-source
26a2cd9

Review changes - renamed m_ActivateBGItem to m_CanActivateBGItem
ae9a127

Fix a logic flaw that didn't actually matter
106e973

Merge branch 'development' into 4zk-content-source
3f6cfcd

Prevent SceneMan::DislodgePixel from imploding if passing in out-of-b…
fb31dc8
…ounds position Const ptr -> ptr to const Misc cleanup

Use FlipFactor
ce17eff

Move ScrapCompactingHeight from SettingsMan to SceneMan
60f446e

Added new rounding mode to round things to nearest 0.5 (accounting fo…
bfd204d
…r precision) Made buy menu descriptions use new rounding mode and round to 1 sigfig if mass is < 50. This is a bit arbitrary, but it makes it so you generally get no decimal places on bodies but do get em on guns

garethyr approved these changes Apr 29, 2023
View reviewed changes

garethyr enabled auto-merge April 29, 2023 22:04

Merge branch 'development' into 4zk-content-source
0449664

garethyr disabled auto-merge April 29, 2023 23:28

garethyr enabled auto-merge April 29, 2023 23:29

garethyr disabled auto-merge April 29, 2023 23:30

garethyr merged commit 11ffdd5 into developmentApr 29, 2023

garethyr deleted the 4zk-content-source branch April 29, 2023 23:31

MaximDude mentioned this pull request Jul 8, 2023
CanFire boolean property for HDFirearms #105
Closed