cmss13 icon indicating copy to clipboard operation
cmss13 copied to clipboard

Oppressor Praetorian: Fixes abduction ability interaction with objects.

Open Venuska1117 opened this issue 6 months ago • 8 comments

I am not sure if this should be QoL or Balance change, so i keep it balance because it allows you to do thing that was not possible before because of wonky code.

About the pull request

Allows Abduction ability to be casted at same tile as barricade, flipped tables and glass window panes (as long as they don't face ability casting direction), and also allows abduction to be cast trought low obstacles, such as:

  • window frames
  • small long crates
  • normal long crates
  • platform edges
  • disposal units (bins)
  • hydro trays (botany)
  • janitor cart
  • trash cans (hybrisia)
  • line nexter (hybrisia)
  • tables (not flipped)

Explain why it's good for the game

As person who enjoyed playing oppressor i found it frustrating when cade was destroyed at corner, so cade facing towards you was open, but at same tile, there was another cade facing 90 degree in other direction, so when you cast ability it gets blocked, same follows for other small obstacles, its so annoying when you want to cast through tables, trays or crates and your ability get blocked by them, this change allows for abductor main ability to be more usefull.

With this change now you can cast ability at tiles that have barricade in them as long as they dont face casting direction, same follows for flipped tables and window panes.

Testing Photographs and Procedure

>Click Here

Some testing done with abduct:

https://github.com/user-attachments/assets/1b0fc84d-517b-426f-b279-e6adde07abaf

https://github.com/user-attachments/assets/d2080ed4-0a05-4b7a-8d0c-851753dcbea7

https://github.com/user-attachments/assets/26c5acae-eecf-4050-bf83-d8b8d6f2ed54

Details for Reviewers.

Need to re-type

opressor.dm

line 117 check if tile contains any structures, if one of checks is FALSE it will continue to next check.

line 162 check if structure is barricade then go to 164 and attach cade direction to "cade_facing" var.

line 165 check if cade_facing direction faces 180^ in opposite direction of casting, for example if you cast from west to east, if cade on east is facing west (towards you) it will then trigger line 166, where it sets "blocked = TRUE", preventing ability continuation.

line 167 check if cade_facing direction faces same direction you are casting at, for example if you cast from west to east and cade east is facing east (the direction you cast to) it will then trigger var "allow_one_more_step = TRUE", afterwards it will continue to line 168, where it will check if "allow_one_more_step" is TRUE, if it is, it will break code before it will reach end of turflist, thanks to that it will make hook appear at same tile as cade, but still get blocked (so you don't cast trough it).

Changelog

:cl: Venuska1117 balance: Abduction ability can now be casted at same tile with cade, flipped table and glass window panes, as long as it doesn't face praetorian ability casting direction. balance: Abduction ability can now be casted through small obstacles such as: window frames, small long crates, normal long crates, platform edges, disposal units (bins), hydro trays (plant trays), janitor cart, trash cans (hybrisia) line nexter (hybrisia). fix: Abduction ability can no longer be casted through multitile vehicles. fix: Abduction ability can no longer be casted through glass windows panes. /:cl

Venuska1117 avatar Jun 12 '25 12:06 Venuska1117

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

cmss13-ci[bot] avatar Jun 20 '25 00:06 cmss13-ci[bot]

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

cmss13-ci[bot] avatar Jul 04 '25 00:07 cmss13-ci[bot]

Stale exempt until reviewed and tested

Drulikar avatar Jul 04 '25 22:07 Drulikar

I think there were edge case issues a few years ago with people being grabbed by warriors over cades at diagonal positions that neth fixed at some point. This might've been how it was fixed.

With how the grab works, I don't -think- it would be an issue for the praetorian, but you should double check and make sure that you can't get a successful diagonal grab on someone with a wall blocking the end of a cadeline.

Wintermote avatar Jul 24 '25 09:07 Wintermote

This pull request has conflicts, please resolve those before we can evaluate the pull request.

cm13-github avatar Sep 25 '25 11:09 cm13-github

Conflicts have been resolved. A maintainer will review the pull request shortly.

cm13-github avatar Sep 26 '25 01:09 cm13-github

Test merge deployment history:

Test Merge Deployed @ 11/12/2025 17:24:10 +00:00:
Server Instance

CM13 Live

Revision

Origin: 54b48e4bf5682cf004fc1108391d23b3e8d87ea7 Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: b53f2c149c7d8941e277ffda7c8d42e37212df2c

Test Merge Updated @ 11/12/2025 17:34:02 +00:00:
Server Instance

CM13 Live

Revision

Origin: 35806b74edf02a24a2215b123f758ed3d9fa1e0c Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: b49c92c88d3f9d17411aec69221c0b9d29dcfd6f

Test Merge Updated @ 11/12/2025 19:00:30 +00:00:
Server Instance

CM13 Live

Revision

Origin: 35806b74edf02a24a2215b123f758ed3d9fa1e0c Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: d837e2d30e3ee0743b063bc114987d04754aed42

Test Merge Updated @ 11/12/2025 19:18:44 +00:00:
Server Instance

CM13 Live

Revision

Origin: 35806b74edf02a24a2215b123f758ed3d9fa1e0c Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: 47376730c3b4d5de85f3164870b7be29ce7dd38b

Test Merge Updated @ 11/13/2025 02:05:33 +00:00:
Server Instance

CM13 Live

Revision

Origin: 1e86b6b4fc0978f2a70640d3a3bcfccd3e1ee2ec Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: be2d0d1885a1e3a971cbeb1baaac2b04a5a2af29

Test Merge Updated @ 11/13/2025 05:36:58 +00:00:
Server Instance

CM13 Live

Revision

Origin: c04943d40832162ca3e2d87bbbc091f7c157867a Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: 40917e55375fcae9a928f1f83b6bd73dbc7d8789

Test Merge Updated @ 11/13/2025 07:08:02 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2e929ad554decc1c88c6cd674bf12d4d98e3e8aa Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: ccd2a00e0937da46a76937b00843cf6adb5cb836

Test Merge Updated @ 11/13/2025 07:27:45 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2e929ad554decc1c88c6cd674bf12d4d98e3e8aa Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: 078e859a98962250db5708d127e57bae2c5f4063

Test Merge Updated @ 11/13/2025 09:06:11 +00:00:
Server Instance

CM13 Live

Revision

Origin: 2e929ad554decc1c88c6cd674bf12d4d98e3e8aa Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: dd0f8bd1e4f4f4e4da632c4f9ea595ca2db7a3e6

Test Merge Updated @ 11/13/2025 13:10:18 +00:00:
Server Instance

CM13 Live

Revision

Origin: d9b1d02e99b365650b0baa074afd7653c1040b5e Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: 6432f1ca0888f653bbbe426c48105b532b42ba7f

Test Merge Updated @ 11/13/2025 20:12:47 +00:00:
Server Instance

CM13 Live

Revision

Origin: d9b1d02e99b365650b0baa074afd7653c1040b5e Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: 3f9a990ef47cd939b6949a4a9319ca56788148aa

Test Merge Updated @ 11/14/2025 02:14:52 +00:00:
Server Instance

CM13 Live

Revision

Origin: 000033084930007c9ccdefc1f9d0511bd06331bd Pull Request: 8f1774b092c6a7b8a0295d6a95ed51cfa812d62f Server: 1786be2e4b8e4f4a0dafac028bfaa38479818179

Test Merge Updated @ 11/15/2025 01:50:57 +00:00:
Server Instance

CM13 Live

Revision

Origin: 000033084930007c9ccdefc1f9d0511bd06331bd Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 19258e00355977eacb9880a50558d0074d9aa618

Test Merge Updated @ 11/15/2025 10:53:41 +00:00:
Server Instance

CM13 Live

Revision

Origin: b0756d42cbaf846d93c60aca2062afb13c122c55 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: bcc3fdf51011a64f392355c06a0425aa38e7292c

Test Merge Updated @ 11/15/2025 11:24:33 +00:00:
Server Instance

CM13 Live

Revision

Origin: a6abe69db6f4f39d8d19ec23bde086e859f79868 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 15ca06b300780348d88339c84de7a371f049f051

Test Merge Updated @ 11/15/2025 16:26:11 +00:00:
Server Instance

CM13 Live

Revision

Origin: 5cb37e4618aaa043be76c78ab982dcc67caa2ecb Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 307a0fe69298e595340db0d8cfebda5f9883264a

Test Merge Updated @ 11/16/2025 00:28:18 +00:00:
Server Instance

CM13 Live

Revision

Origin: 5cb37e4618aaa043be76c78ab982dcc67caa2ecb Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 5530aa1ca42566234c27fe379fe820a490a0c4a6

Test Merge Updated @ 11/16/2025 01:59:18 +00:00:
Server Instance

CM13 Live

Revision

Origin: c2e0825ad9e63d1f826d9537b36e349d3095b3cd Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 1bae281b7aaec04ba5cc36fb2e6d21da36e68083

Test Merge Updated @ 11/16/2025 04:00:25 +00:00:
Server Instance

CM13 Live

Revision

Origin: c2e0825ad9e63d1f826d9537b36e349d3095b3cd Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: eb9e96f3b4d298719800e712756b3f3a1f9fbe1e

Test Merge Updated @ 11/16/2025 06:48:34 +00:00:
Server Instance

CM13 Live

Revision

Origin: c2e0825ad9e63d1f826d9537b36e349d3095b3cd Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: a0a9ba65ab4cdfcf199e6ba9567209ce52d06a64

Test Merge Updated @ 11/16/2025 09:33:29 +00:00:
Server Instance

CM13 Live

Revision

Origin: c2e0825ad9e63d1f826d9537b36e349d3095b3cd Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: bdacee92769353568046a97401e2ed04d7237379

Test Merge Updated @ 11/16/2025 11:53:48 +00:00:
Server Instance

CM13 Live

Revision

Origin: c2e0825ad9e63d1f826d9537b36e349d3095b3cd Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 936f8c541ba89c47864b737103dc0477e9934623

Test Merge Updated @ 11/16/2025 18:18:27 +00:00:
Server Instance

CM13 Live

Revision

Origin: c2e0825ad9e63d1f826d9537b36e349d3095b3cd Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 3e49ab7cf4c1d3905824049f078df5f569f30c1a

Test Merge Updated @ 11/16/2025 18:33:34 +00:00:
Server Instance

CM13 Live

Revision

Origin: cba3a14e05ab06fa5f55af955f5535a5ef80c1c8 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: c14287d0e4a7436ad3d812199b450ab6ccdfc78a

Test Merge Updated @ 11/16/2025 18:40:09 +00:00:
Server Instance

CM13 Live

Revision

Origin: cfa5931881b707164f4367c3c7bb5ece8527a617 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 63d3f66b88695707e73015a21a7e05934800d6d9

Test Merge Updated @ 11/16/2025 19:04:24 +00:00:
Server Instance

CM13 Live

Revision

Origin: 5cd6457753c6648068d9990b53403a801fd435c9 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 6458836415e380bc96342ebb49fe591da187712f

Test Merge Updated @ 11/16/2025 19:35:17 +00:00:
Server Instance

CM13 Live

Revision

Origin: d5e6db0c6b90d188f68c2d44097d73c21f7f11c7 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: c4496ab7d302506bde90d88f0a8ceea11805acc7

Test Merge Updated @ 11/17/2025 02:07:12 +00:00:
Server Instance

CM13 Live

Revision

Origin: 1ccb014bf4b2063e1e57b96f1c15cf6643b38029 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 8e81aba5be218f5cfce2a790c849c96c5c5cb709

Test Merge Updated @ 11/17/2025 06:08:00 +00:00:
Server Instance

CM13 Live

Revision

Origin: 1ccb014bf4b2063e1e57b96f1c15cf6643b38029 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 8cac649f03e29abe2f979b2bcdcf5b8e6ac537ba

Test Merge Updated @ 11/17/2025 11:31:34 +00:00:
Server Instance

CM13 Live

Revision

Origin: 1ccb014bf4b2063e1e57b96f1c15cf6643b38029 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 78f85b4e827aec84e78487eda17a4cb335fcb970

Test Merge Updated @ 11/17/2025 11:42:07 +00:00:
Server Instance

CM13 Live

Revision

Origin: 1ccb014bf4b2063e1e57b96f1c15cf6643b38029 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: a71f3e87185b0f559f0c0d061d1be0b0a57c9511

Test Merge Updated @ 11/17/2025 14:10:16 +00:00:
Server Instance

CM13 Live

Revision

Origin: 1ccb014bf4b2063e1e57b96f1c15cf6643b38029 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: c85461ebc89a4c2aca0b5dc774f650b9895636de

Test Merge Updated @ 11/17/2025 14:41:08 +00:00:
Server Instance

CM13 Live

Revision

Origin: 1ccb014bf4b2063e1e57b96f1c15cf6643b38029 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 6ba305e64fd0c4f5a9da051b923556507e6184a4

Test Merge Updated @ 11/17/2025 15:37:26 +00:00:
Server Instance

CM13 Live

Revision

Origin: 1ccb014bf4b2063e1e57b96f1c15cf6643b38029 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 7d5d3f25e10f65708a755efd59e9a6b942320c92

Test Merge Updated @ 11/17/2025 17:42:40 +00:00:
Server Instance

CM13 Live

Revision

Origin: 7bd9b6fc3e48adf70c7f09cc84e9b6338c275cc1 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: c57cc4ff9e24facb10ee462d322a2a24c07936e8

Test Merge Updated @ 11/18/2025 02:15:22 +00:00:
Server Instance

CM13 Live

Revision

Origin: 9d73f38c83d0f24b29921bd1eb1c23f28670090c Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: e719876a0e851e4275319c2fd60916e11e060f3b

Test Merge Updated @ 11/18/2025 07:48:08 +00:00:
Server Instance

CM13 Live

Revision

Origin: 9d73f38c83d0f24b29921bd1eb1c23f28670090c Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: eecaf3c7e40a12b6d393f9b37040ccc63cb3964b

Test Merge Updated @ 11/18/2025 12:20:46 +00:00:
Server Instance

CM13 Live

Revision

Origin: 9d73f38c83d0f24b29921bd1eb1c23f28670090c Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 7e6337c6ec978ad322b459bbf01c35ba112c58ca

Test Merge Updated @ 11/18/2025 15:22:20 +00:00:
Server Instance

CM13 Live

Revision

Origin: 09a4c4d638deb35fc46a26b2d42face32f49c968 Pull Request: ff7f8a755003bbbe166aca7737ff9f9e565d65fd Server: 4f8c789528f728b83a90fc7f2a9c2242b4803c91

Test Merge Removed @ 11/18/2025 15:53:11 +00:00:
Server Instance

CM13 Live

cm13-github avatar Nov 12 '25 17:11 cm13-github

I don't think you can hook while in gas anymore. Is that part of this PR or unrelated?

AnuvKH avatar Nov 16 '25 20:11 AnuvKH

I don't think you can hook while in gas anymore. Is that part of this PR or unrelated?

fixed

Venuska1117 avatar Nov 29 '25 13:11 Venuska1117