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

Reverts Sojourn's PR 5029 armour changes #69

Merged
merged 14 commits into from
Nov 25, 2024

Conversation

Delams-The-SM
Copy link

About The Pull Request

This PR aims to revert armour changes that happened in https://github.com/sojourn-13/pull/5029

This draft is here mostly to make it visible (not just a branch on my fork), not sure why I have done it honestly but I was bored, I done it, and now it is here.


This draft does the following :

  • Reverts the armour code to pre 5029 (Bulk combat changes; Armor Divisors, bullet balance, mob health/armor, etc.) PR state
  • Keeps most of other changes that the PR made (like global health modifiers for PVE factions or blocking)
  • Adds ABSOLUTE armour to the armour calculation (currently disabled, controlled by ABSOLUTE_ARMOR_EFFICIENCY variable)
  • Adds RELATIVE_ARMOR_EFFICIENCY and ABSOLUTE_ARMOR_EFFICIENCY both being multipliers for their respective armour type

What is not yet there :

  • Overpenetration/halloss damage in PVE
  • ablative_armor is not accounted for in armour calculations
  • ALOT OF TESTING
  • ALOT OF CLEANUP (Both armor_penetration and armor_list should have their values set by defines among other things)

SO WHY DID I DO IT

I don't know, but if I did it already might as well keep it around as a draft ? perhaps it will be educational, or something

Technically we could merge it (after fixes) but as far as I understand we are still testing and figuring out current armour system.

There probably are broken things, it feels like I frankensteined alot of things together into a lump that works.
code\modules\mob\living\living_defense.dm above all will need a look at, alot of commented out code for PVE interactions especially

Changelog

🆑
add: Added ABSOLUTE and RELATIVE armour to armour system
del: Removed old code for armour
tweak: tweaked armour
balance: rebalanced armour back to what it was (more or less)
/:cl:

Alot of things are still broken, like melee, or no abletive armour, still need more testing
melee remains
@SigDoesCode SigDoesCode added Not Ready For Merge This PR is not ready for deployment. Do not merge. Rebalance Balance tweaks to item stats, difficulty, etc. Bugfix labels Aug 29, 2024
@SigDoesCode
Copy link

Added "Bugfix", "Not ready for merge", and "rebalance" labels. Bugfix because of fixing bugs in armor code, not ready for merge because overpen/halloss not being calculated in PvE and ablative_armor not being added, plus cleanup needed for proper merge. Rebalance added because this would be a rebalance of the armor system.

I think there's currently a PR up that fixes Soj's flat-reduction armor system, so we might try that for a bit and see what's going on with that and how it feels before working on a full revert. I'll ask some of the other devs.

@SigDoesCode
Copy link

There probably are broken things, it feels like I frankensteined alot of things together into a lump that works. code\modules\mob\living\living_defense.dm above all will need a look at, alot of commented out code for PVE interactions especially

Also it can't possibly be worse than Soj shipping their armor rebalance while not having superior mobs considered in armor calculations at all, so I wouldn't worry about having some Frankenstein code on a draft/unmerged PR at the moment. XD

the fucking STUN beam and STUN shotgun shells use some snowflake code I can't track down but it does not call damage_through_armour in living defence

Also there is something funky with damage values for HALLOS into dmg for mobs

so a step forwards, two back
Takykardi and others added 2 commits September 4, 2024 11:08
…damages

weapons with tazer_effect should properly apply their damage besides just halloss
@Delams-The-SM
Copy link
Author

I am not sure what else is broken at the moment, all kinds of damage interactions for players/simples/superiors need to be checked, at the moment I am tired so ... yeh

@Takykardi
Copy link

Okay, note for testing on this- apparently Soj also redid weapons/tool mods under these, so we'll need to check those for function. Shouldn't be too difficult, just. Blargh.

@valkyria-gk
Copy link

Merged a PR that caused a MC on this. Fixed it for you.

@Delams-The-SM
Copy link
Author

At this point this PR just requires a lot of testing, it is possible that I have missed something at some point and haven't thought about it.

@Delams-The-SM Delams-The-SM marked this pull request as ready for review September 7, 2024 14:57
Takykardi
Takykardi previously approved these changes Sep 7, 2024
@valkyria-gk valkyria-gk added the Testmerge Should be testmerged, or is currently being testmerged label Sep 7, 2024
fuck no, it's obstructed in some fuck off file, just fix it by having armour values be defines, one set of defines for mobs, another for players
@SigDoesCode
Copy link

Ok I figured out why things are always overpenning. I think.

This block needs to be added to Living_defense.dm, right after the armor effectiveness calculation block.

	if(return_continuation)
		var/obj/item/projectile/P = used_weapon
		P.damage_types = dmg_types
		if(sharp)
			var/remaining_dmg = 0
			for(var/dmg_type in dmg_types)
				remaining_dmg += dmg_types[dmg_type]
			return ((total_dmg / 2 < remaining_dmg && remaining_dmg > mob_size) ? PROJECTILE_CONTINUE : PROJECTILE_STOP)
		else return PROJECTILE_STOP

	return dealt_damage

this should allow it to actuall do the proper proj stopping.

@valkyria-gk valkyria-gk removed Not Ready For Merge This PR is not ready for deployment. Do not merge. Testmerge Should be testmerged, or is currently being testmerged labels Nov 25, 2024
Copy link

@valkyria-gk valkyria-gk left a comment

Choose a reason for hiding this comment

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

It has been a long while and no changes of distressing nature had been found. It is in need of changes but we will address them in the future instead.

@valkyria-gk valkyria-gk merged commit 4c203e7 into Equinox-SS13:master Nov 25, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bugfix Rebalance Balance tweaks to item stats, difficulty, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants