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.

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

Poisonous grenade #1091

Merged
merged 28 commits into from
Mar 2, 2023
Merged

Poisonous grenade #1091

merged 28 commits into from
Mar 2, 2023

Conversation

farooqkz
Copy link
Contributor

@farooqkz farooqkz commented Feb 3, 2023

This PR adds poisonous grenade to the game which poison enemy team members when inside or very close to the smoke.

The poison will never damage the thrower or thrower team. It won't damage the thrower even if they change team.

screenshot_20230203_115918

  • the poison must not get thrown to enemy base. it will do spawnkill
  • the poison has punch image for kill log
  • The inventory texture could be a lot greener
  • The smoke color could be a little stronger
  • Should be disabled around enemy bases, and/or maybe have a reduced lifetime
  • Doesn't spawn in classes/nade_fight treasure chests

Copy link
Member

@LoneWolfHT LoneWolfHT left a comment

Choose a reason for hiding this comment

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

image
Your PRs keep getting worse and worse baggage-wise.

You didn't base this PR off of the parent repo's master, so your team spike changes are included in this PR.
You also still have the map submodule issue, it would be nice if we could figure out how to fix that

@farooqkz
Copy link
Contributor Author

farooqkz commented Feb 3, 2023

image Your PRs keep getting worse and worse baggage-wise.

lol. My apologies! Perhaps I'm too much in a hurry or perhaps I'm overloading myself.

You didn't base this PR off of the parent repo's master, so your team spike changes are included in this PR. You also still have the map submodule issue, it would be nice if we could figure out how to fix that

Well I did git checkout -b poison up/master where up is the upstream. Perhaps I've been doing so wrong all the time?

@farooqkz
Copy link
Contributor Author

farooqkz commented Feb 3, 2023

Ready for another review

Copy link
Member

@LoneWolfHT LoneWolfHT left a comment

Choose a reason for hiding this comment

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

Nice, it worked.

There should be no nodes/abms involved in this.
Get the poison grenade explosion pos and check it against the position of all online players in a minetest.after(1) loop that stops when the smoke does

@farooqkz
Copy link
Contributor Author

farooqkz commented Feb 3, 2023

Nice, it worked.

There should be no nodes/abms involved in this. Get the poison grenade explosion pos and check it against the position of all online players in a minetest.after(1) loop that stops when the smoke does

May I ask why?

@LoneWolfHT
Copy link
Member

May I ask why?

ABMs are terribly inefficient, and temporary nodes like your poison one should be avoided whenever possible, since they rely on the explosion area meeting certain conditions (like not being underwater or containing nodes with non-default collisionboxes), and there are usually faster solutions

@farooqkz
Copy link
Contributor Author

farooqkz commented Feb 4, 2023

May I ask why?

ABMs are terribly inefficient, and temporary nodes like your poison one should be avoided whenever possible, since they rely on the explosion area meeting certain conditions (like not being underwater or containing nodes with non-default collisionboxes), and there are usually faster solutions

I'm stuck here. See my latest commit.

mods/pvp/grenades/grenades.lua Outdated Show resolved Hide resolved
mods/pvp/grenades/grenades.lua Outdated Show resolved Hide resolved
@LoneWolfHT
Copy link
Member

You got quite far, nice work

@farooqkz
Copy link
Contributor Author

farooqkz commented Feb 7, 2023

It's working now \o/

@farooqkz farooqkz requested a review from LoneWolfHT February 7, 2023 09:52
@farooqkz farooqkz requested a review from LoneWolfHT February 9, 2023 16:20
mods/pvp/grenades/grenades.lua Outdated Show resolved Hide resolved
mods/pvp/grenades/grenades.lua Outdated Show resolved Hide resolved
farooqkz and others added 3 commits February 13, 2023 03:28
Co-authored-by: LoneWolfHT <[email protected]>
Co-authored-by: LoneWolfHT <[email protected]>
@farooqkz farooqkz requested a review from LoneWolfHT February 13, 2023 03:29
@farooqkz
Copy link
Contributor Author

I don't check Discord anymore. Please let me know regarding the test session(when and where).

@LoneWolfHT
Copy link
Member

It'll probably take a while. I need to finish working on something else that I want to test

@farooqkz
Copy link
Contributor Author

You want to test this and that together?

@LoneWolfHT
Copy link
Member

@farooqkz What timezone are you in, and what would an ideal testing time be?

@farooqkz
Copy link
Contributor Author

farooqkz commented Feb 22, 2023

@farooqkz What timezone are you in, and what would an ideal testing time be?

The ideal time window for me would be about 12-18(UTC)

@farooqkz
Copy link
Contributor Author

@LoneWolfHT When is the testing session? or perhaps yet undecided?

@LoneWolfHT
Copy link
Member

14:30 UTC on February 27
Are you able to talk on Discord when the time arrives?

@farooqkz
Copy link
Contributor Author

14:30 UTC on February 27 Are you able to talk on Discord when the time arrives?

The time seems okay for me. But I won't be able to log into Discord anytime soon.

@LoneWolfHT
Copy link
Member

14:30 UTC on February 27 Are you able to talk on Discord when the time arrives?

The time seems okay for me. But I won't be able to log into Discord anytime soon.

How about IRC/Matrix?
If not those then you'll have to join the main server for the address/port I guess

@farooqkz
Copy link
Contributor Author

14:30 UTC on February 27 Are you able to talk on Discord when the time arrives?

The time seems okay for me. But I won't be able to log into Discord anytime soon.

How about IRC/Matrix? If not those then you'll have to join the main server for the address/port I guess

I am available on them.

@LoneWolfHT
Copy link
Member

LoneWolfHT commented Feb 27, 2023

  1. the poison must not get thrown to enemy base. it will do spawnkill

  2. the poison has punch image for kill log

  3. The inventory texture could be a lot greener

  4. The smoke color could be a little stronger

  5. Should be disabled around enemy bases, and/or maybe have a reduced lifetime

  6. Doesn't spawn in classes/nade_fight treasure chests

@farooqkz
Copy link
Contributor Author

Regarding kill log, I need some hints. And what do you mean the colour must be stronger?

@LoneWolfHT
Copy link
Member

And what do you mean the colour must be stronger?

It should be less grey/have more color to it

You can change the kill log image in this function: https://github.com/MT-CTF/capturetheflag/blob/master/mods/ctf/ctf_modebase/features.lua#L23-L46

@LoneWolfHT
Copy link
Member

Added the TODO list to the main post

@farooqkz
Copy link
Contributor Author

@LoneWolfHT ready for review

mods/pvp/grenades/grenades.lua Outdated Show resolved Hide resolved
mods/pvp/grenades/grenades.lua Outdated Show resolved Hide resolved
@LoneWolfHT LoneWolfHT merged commit 3d7f377 into MT-CTF:master Mar 2, 2023
@LoneWolfHT
Copy link
Member

LoneWolfHT commented Mar 2, 2023

the poison has punch image for kill log

This wasn't fixed. I've done so in f4a8d72

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants