Commit Graph
34 Commits
Author SHA1 Message Date
d1ba470eac Making Bearserk Good (#23796)
* First buffs + More proper Status Icon

* Slight sprite change to look a bit less shit

* Additional tweaks

* Code consistency tweak

* Slightly higher price

* More tweaks and fixing a bug

* Brand new Icon courtesy of McRamon

* Tweaked icon a bit

* A bit more recommended code cleaning

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* how did i not notice this?

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-01-21 21:31:19 +00:00
edef576f2e Martial arts now use a weight system to determine which one is active (#21037)
* martial arts have a weight system now

* remove unneeded variable

* carp cannot be deactivated once learned

* i love documentingtation

* krav can no longer delete other combos

* now ill be embarassed if i dont make it better

* i know how istype works i promise

* implement sirryan's changes

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-03 00:24:42 -05:00
QwertytofortyandGitHub 7761c32a1b Throwing items at someone no longer turns off sleeping carp deflection (#20065)
* Throwing items at someone no longer turns off sleeping carp deflection

* signals

* comment
2023-01-13 16:49:14 +01:00
warriorstar-orionandGitHub a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
24248d0ccb Removes instant stuns from Sleeping Carp (#18219)
* open rp, kicks ur ass

* Stay down

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Get your fins off me!

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-06 19:50:13 +01:00
LucandGitHub 9f67e43493 Prevents usage of martial arts with the passive trait (#16988)
* Prevent passive mobs from using martial arts

* Update laser reflection, clean up combo message

* Silence annoying message

All martial arts just check if the user is a pacifist or not before executing
2021-11-05 10:23:26 +01:00
hal9000PR 9aa3d12314 fox's requests 2021-07-26 23:11:19 +01:00
6fa31d2f72 sabre review
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-25 14:25:16 +01:00
795b941ba3 Review stuff
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-05-14 22:40:03 +01:00
hal9000PR e2bd977238 couple fixes, spellings, styling changes. 2021-04-14 21:31:12 +01:00
hal9000PR d55d6759ad cleans up code 2021-04-03 17:36:38 +01:00
hal9000PR 0059df1981 steel review 2021-04-03 13:09:00 +01:00
hal9000PR fa4c5ba070 why is this not working? 2021-04-01 21:04:24 +01:00
hal9000PR 976b4cec0c Merge remote-tracking branch 'upstream/master' into TG-carp-2-electric-boogaloo 2021-04-01 20:56:22 +01:00
hal9000PRandGitHub d0afb01509 This is probably important (#15800) 2021-04-01 19:25:04 +01:00
hal9000PR de9f36fd8a logs sound important 2021-04-01 17:06:54 +01:00
hal9000PR 8739799d84 TG carp 2021-04-01 13:03:25 +01:00
hal9000PR 62845c01c3 Merge branch 'TG-carp' into TG-carp-2-electric-boogaloo 2021-03-31 16:48:48 +01:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
hal9000PR 31512f0102 buffs some combos, makes carps friendly 2021-01-09 22:08:00 +00:00
hal9000PR f95c848041 deflection, reflection and refraction 2021-01-06 17:53:58 +00:00
farie82andGitHub 229cf3e344 Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341)
* first commit. combos, CQC started

* CQC working

* All transfered to new system

* The actual bug fix

* add time in between combos

* time between combos limit and minor explaination tweak

* Krav maga fixes, time change. Minor text changes

* Move martial_art to mind

* Merge mistake fixed

* Steels review changes
2020-09-18 11:07:19 -04:00
Mitchell 3dab40eba4 Fixes attack logs 2020-03-06 16:38:31 -06:00
Mitchell 012205aa8f Adds logs 2020-02-28 16:41:46 -06:00
Fox McCloudandvariableundefined 00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
nicetoolbox ea8cebfd5e Fix human grabbedby not returning the grab 2018-09-16 12:14:01 -07:00
Tayyyyyyy 42f85919de More their 2018-05-25 18:34:26 -07:00
Fox McCloud c0d5655f4d Further Improves Attack Animations 2018-05-17 19:48:03 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
FalseIncarnate c2ad198203 can_use_guns -> no_guns 2017-06-09 21:39:50 -04:00
FalseIncarnate 9e88e7f1db Adds Highlander Style: The Martial Art of Highlanders
Adds a new martial art: Highlander Style!
- Wielders of the powerful Highlander claymores are imbued with this
mythical prowress. Should your both your hands ever lack a grip on a
Highlander claymore, you will relinquish your newfound skill.
- Highlander Style grants immunity to ranged attacks and an unwavering
distain of cowardly guns. Just like with Sleeping Carp, you will deflect
projectiles and cannot fire guns (but can pick them up to throw in the
trash where they belong).

Adds new weapon: Highlander Claymore
- Grants the wielder the Highlander Style while held in either hand.
- Normal claymores were left in, but do not provide the martial art (so
they are "safe" to use outside highlander)

Minor refactor to martial arts which prevent use of guns.
- No longer relies on the name of the style, but rather the new
aptly-named var: `can_use_guns`

🆑
rscadd: Adds Highlander Style, granted to the wielder of Highlander
Claymores. This martial art allows you to deflect ranged attacks from
the weapons of COWARDS. FOR THE HONOR OF THE HIGHLANDERS!
tweak: Highlander now equips combatants with a Highlander claymore
instead of a normal claymore. FIGHT ON BROTHERS!
/🆑
2017-06-07 02:35:23 -04:00
Crazylemon64 6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
FreeStylaLTandFox McCloud 38dfb6db6f Adds appropriate HUH, KUH, KYAH, WROOAAAAH, etc. sounds to sleeping carp (#4798) 2016-06-30 20:39:41 -04:00
Aurorablade 2f3754af77 folder rename in progreess... 2016-04-22 23:58:03 -04:00