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

SMASHED and SLAMMED Upgrade for the Summon Pitbulls spell. #36792

Merged
merged 7 commits into from
Jul 25, 2024

Conversation

Eneocho
Copy link
Collaborator

@Eneocho Eneocho commented Jul 18, 2024

Have you ever thought.. Hmm, those pitbulls I summon sure could be more smashed and slammed...

Hi, I'm Arch-Wizard Derekus Baumicus, The Allmaker, and I'm declaring WAR on NT stations and non-wizards with the new SMASHED and SLAMMED Upgrade!

average pitbull wizard

BANG BANG BANG! And 3 Toadline Pitbulls are summonned! Just make sure to UPGRADE the spell before using it.

AND YES! THIS IS EXACTLY HOW THEY LOOK!

What do they do? Why should I upgrade?

Excellent question! A toadline pitbull is so SMASHED and SLAMMED that they can pass through AIRLOCKS!
With some effort, it's NOT INSTANTANEOUS, but they sure can crawl through! They're so SMASHED that they can even walk through each other!
The boys at the wizard towerstation even managed to make them bite ever so slightly harder! They do move a bit slower though, what with their stumpy legs.

But Derekus, surely those spells are exorbitantly expensive, have you seen the prices of high quality arcana lately???

FEAR NOT MY FLEDGLING STUDENT OF THE ARTS! For you can access this upgrade for just a measly 20 spell points!

But why?

It allows You, yes YOU!, to focus harder on the pitbulls! It does mean you have to spend more points on them meaning you have less for emergency escape spells, but we both know you were not planning on that when you bought the Toadlines!

Assuming you get both speed upgrades AND the pitbull upgrade, you'll be using a full 80 of your starting 100 points.

Are you SURE these spells work fine, sir? Last time we tried one of these we almost summoned Nar's-

FRET NOT! These spells were tested with High intensity sieges against NanoTrasen stations! Our boys in the lab robes even made sure that you do NOT summon the traditional pitbull when casting, and that upgrading works as intended!
🆑

  • rscadd: Wizards can upgrade the Pitbull spell to summon Toadline Pitbulls for 20 spell points. Toadline Pitbulls move slightly slower than a regular pitbull, but have the advantage of being able to pass through airlocks and other mobs unimpeded (the airlock pass is NOT instantaneous, it takes a bit). They also do 1 more Brute damage on average compared to a regular Pitbull.


var/list/pitbulls_exclude_kinlist = list() //all pitbulls go in here so pitbulls won't attack other pitbulls when feeling treacherous (and instead attack the wizard)

/spell/aoe_turf/conjure/pitbull/perform(mob/user = usr, skipcharge = 0, list/target_override, var/ignore_timeless = FALSE, var/ignore_path = null)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

not sure if this specific change will break stuff cause it didn't cause any issues as a plain perform() call on local, but it failed the linter check here without all that stuff in the (), but I can't test that today

@Eneocho Eneocho added the Content Adds something. Neat! label Jul 18, 2024
@CrazyAmphibian
Copy link
Contributor

CrazyAmphibian commented Jul 18, 2024

>1 more brute damage on average
why even?

@jwhitak
Copy link
Collaborator

jwhitak commented Jul 18, 2024

image image

dog

@Eneocho
Copy link
Collaborator Author

Eneocho commented Jul 18, 2024

1 more brute damage on average why even?

it's a very small increase, but it stacks when you have more than 1 pitbull biting you simultaneously.
I CAN make them markedly stronger, but do you really want pitbulls that do 10 damage per bite? in practical terms i just upped the minimum and maximum damage values by 1, but that can be upped a bit more, say, by 3 instead of 1
I'm open to suggestions, cause while it is an almost negligible damage buff, it does stack up. Look at it this way, that 1 damage increase is a 25% damage increase PER pitbull (compared to the regular)

@Lumbermancer
Copy link

Lumbermancer commented Jul 18, 2024

Hats Center One 2024-06-26 000354
Sure why not. It's my go to spell.

Copy link
Collaborator

@west3436 west3436 left a comment

Choose a reason for hiding this comment

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

10/10 PR just remove the redundant code

Comment on lines +123 to +131
/mob/living/simple_animal/hostile/pitbull/smashednslammed/summoned_pitbull/death(var/gibbed = FALSE)
..()
if(!gibbed)
if(prob(90))
animate(src, alpha = 0, time = 4 SECONDS)
spawn(4 SECONDS)
qdel(src)
else
gib()
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is unnecessary as this behavior is already inherited from the parent proc.

Copy link
Collaborator Author

@Eneocho Eneocho Jul 18, 2024

Choose a reason for hiding this comment

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

Smashed and slammed is not a child of the summoned pitbulls (which would make that code redundant), it's a child of regular pitbulls, meaning the summoned one is a child of the toadline pitbulls (which in turn is a child of regular pitbulls), it's not redundant code.
As for why have regular non summonable smashed pitbulls, there are some non wizard sources, like the syndie pokeballs or the goldcore reactions.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Christ, that's a mess. I won't force you to, but cleaning up code here for consistency would be nice.

Comment on lines +119 to +122
/mob/living/simple_animal/hostile/pitbull/smashednslammed/summoned_pitbull
faction = "wizard" // so they get along with other wizard mobs
meat_type = /obj/item/weapon/ectoplasm //a magical dog

Copy link
Collaborator

Choose a reason for hiding this comment

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

Unnecessary as this is already inherited from the parent.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ditto

@SECBATON-GRIFFON
Copy link
Contributor

upboated just for that derek bum image alone

@Kromkar
Copy link

Kromkar commented Jul 19, 2024

3x Pimpy
3x BAPE

@SonixApache
Copy link
Contributor

SonixApache commented Jul 20, 2024

remind me to add wizard lab robes at some point
sufficiently advanced technology, etc

also i see TG items in the OP image so you're getting a 👎

@west3436 west3436 merged commit 9bd459b into vgstation-coders:Bleeding-Edge Jul 25, 2024
5 checks passed
@Eneocho Eneocho deleted the patch-21 branch July 26, 2024 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Content Adds something. Neat!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants