diff --git a/massmeta/code/modules/antags/wizard/equipment/spellbook_entries/offensive.dm b/massmeta/code/modules/antags/wizard/equipment/spellbook_entries/offensive.dm deleted file mode 100644 index fe97eaf69bc14..0000000000000 --- a/massmeta/code/modules/antags/wizard/equipment/spellbook_entries/offensive.dm +++ /dev/null @@ -1,11 +0,0 @@ -#define SPELLBOOK_CATEGORY_OFFENSIVE "Offensive" -// Offensive wizard spells - -/datum/spellbook_entry/testicular_torsion - name = "Testicular Torsion" - desc = "A dark spell capable of exploding victim's balls." - spell_type = /datum/action/cooldown/spell/touch/testicular_torsion - cost = 1 - category = SPELLBOOK_CATEGORY_OFFENSIVE - -#undef SPELLBOOK_CATEGORY_OFFENSIVE diff --git a/massmeta/code/modules/spells/spell_types/touch/testicular_torsion.dm b/massmeta/features/wizard_spells/code/spell_testicular_torsion.dm similarity index 63% rename from massmeta/code/modules/spells/spell_types/touch/testicular_torsion.dm rename to massmeta/features/wizard_spells/code/spell_testicular_torsion.dm index a4811d1c1abb4..44d69a4371a79 100644 --- a/massmeta/code/modules/spells/spell_types/touch/testicular_torsion.dm +++ b/massmeta/features/wizard_spells/code/spell_testicular_torsion.dm @@ -1,11 +1,10 @@ -/// Слабый Scream for me, ломает ноги, заставляет людей выкрикивать фразы, а ещё имеет прикольный звук применения. /datum/action/cooldown/spell/touch/testicular_torsion name = "Testicular Torsion" desc = "This wicked spell twistes and crushes victim's balls \ causing them to feel immense pain, may also break their legs." - button_icon = 'massmeta/icons/mob/actions/actions_spells.dmi' + button_icon = 'massmeta/features/wizard_spells/icons/actions_spells.dmi' button_icon_state = "torsion" - sound = 'massmeta/features/smites/sound/testicular_torsion.ogg' + sound = "massmeta/features/wizard_spells/sound/testicular_torsion.ogg" school = SCHOOL_SANGUINE invocation_type = INVOCATION_SHOUT @@ -26,16 +25,14 @@ /datum/action/cooldown/spell/touch/testicular_torsion/cast_on_hand_hit(obj/item/melee/touch_attack/hand, mob/living/victim, mob/living/carbon/caster) if(!ishuman(victim)) - to_chat(caster, span_warning("Must be a human!")) - return FALSE + return var/mob/living/carbon/human/human_victim = victim - human_victim.apply_damage(rand(20, 30), BRUTE, BODY_ZONE_L_LEG, wound_bonus = CANT_WOUND) - human_victim.apply_damage(rand(20, 30), BRUTE, BODY_ZONE_R_LEG, wound_bonus = CANT_WOUND) - human_victim.cause_wound_of_type_and_severity(WOUND_BLUNT, human_victim.get_bodypart(BODY_ZONE_L_LEG), WOUND_SEVERITY_TRIVIAL, WOUND_SEVERITY_MODERATE) - human_victim.cause_wound_of_type_and_severity(WOUND_BLUNT, human_victim.get_bodypart(BODY_ZONE_R_LEG), WOUND_SEVERITY_TRIVIAL, WOUND_SEVERITY_MODERATE) - var/list/phrase = world.file2list("massmeta/features/smites/string/balls_phrases.txt") - human_victim.say(pick(phrase)) - human_victim.emote("screech") + human_victim.apply_damage(rand(40, 55), BRUTE, BODY_ZONE_L_LEG, wound_bonus = rand(45, 75), forced = TRUE) + human_victim.apply_damage(rand(40, 55), BRUTE, BODY_ZONE_R_LEG, wound_bonus = rand(45, 75), forced = TRUE) + var/list/phrase = world.file2list("massmeta/strings/testicular_torsion_phrases.txt") + if(human_victim.stat != DEAD) // no ghosts speak + human_victim.say(pick(phrase)) + human_victim.emote("screech") return TRUE /obj/item/melee/touch_attack/testicular_torsion diff --git a/massmeta/features/wizard_spells/code/spellbook_offensive.dm b/massmeta/features/wizard_spells/code/spellbook_offensive.dm new file mode 100644 index 0000000000000..289ea3915e0ff --- /dev/null +++ b/massmeta/features/wizard_spells/code/spellbook_offensive.dm @@ -0,0 +1,8 @@ +// Offensive wizard spell + +/datum/spellbook_entry/testicular_torsion + name = "Testicular Torsion" + desc = "A dark spell capable of exploding victim's balls." + spell_type = /datum/action/cooldown/spell/touch/testicular_torsion + cost = 1 + category = "Offensive" diff --git a/massmeta/features/wizard_spells/icons/actions_spells.dmi b/massmeta/features/wizard_spells/icons/actions_spells.dmi new file mode 100644 index 0000000000000..95cbc8964d3a6 Binary files /dev/null and b/massmeta/features/wizard_spells/icons/actions_spells.dmi differ diff --git a/massmeta/features/wizard_spells/includes.dm b/massmeta/features/wizard_spells/includes.dm new file mode 100644 index 0000000000000..c0089e152841b --- /dev/null +++ b/massmeta/features/wizard_spells/includes.dm @@ -0,0 +1,2 @@ +#include "code\spell_testicular_torsion.dm" +#include "code\spellbook_offensive.dm" diff --git a/massmeta/features/wizard_spells/readme.md b/massmeta/features/wizard_spells/readme.md new file mode 100644 index 0000000000000..dce32c82782c2 --- /dev/null +++ b/massmeta/features/wizard_spells/readme.md @@ -0,0 +1,29 @@ +## Module ID: wizard_spells + +### Description: + +Слабый "Scream for me", но зато ломает ноги и заставляет людей выкрикивать фразы под прикольный звук применения. + +### TG Proc/File Changes: + +- N/A + + +### Modular Overrides: + +- N/A + + +### Defines: + +- N/A + + +### TGUI Files: + +- N/A + + +### Credits: + +- Bruh-24 diff --git a/massmeta/features/wizard_spells/sound/testicular_torsion.ogg b/massmeta/features/wizard_spells/sound/testicular_torsion.ogg new file mode 100644 index 0000000000000..96de4d8856c89 Binary files /dev/null and b/massmeta/features/wizard_spells/sound/testicular_torsion.ogg differ diff --git a/massmeta/icons/mob/actions/actions_spells.dmi b/massmeta/icons/mob/actions/actions_spells.dmi deleted file mode 100644 index a8ef4d21d7389..0000000000000 Binary files a/massmeta/icons/mob/actions/actions_spells.dmi and /dev/null differ diff --git a/massmeta/icons/mob/actions/actions_vehicle.dmi b/massmeta/icons/mob/actions/actions_vehicle.dmi deleted file mode 100644 index 02f435c8b8351..0000000000000 Binary files a/massmeta/icons/mob/actions/actions_vehicle.dmi and /dev/null differ diff --git a/massmeta/modular_meta_features.dm b/massmeta/modular_meta_features.dm index 282fa1a299105..8db08cf648e42 100644 --- a/massmeta/modular_meta_features.dm +++ b/massmeta/modular_meta_features.dm @@ -22,6 +22,7 @@ #include "features\quirk_augmented\includes.dm" #include "features\smites\includes.dm" #include "features\soviet_crate\includes.dm" +#include "features\wizard_spells\includes.dm" // END_INCLUDE @@ -79,7 +80,3 @@ //buts #include "code\modules\surgery\organs\internal\butts\butts.dm" #include "code\modules\surgery\organs\internal\butts\butts_init.dm" - -//Testicular_torsion wizard -#include "code\modules\spells\spell_types\touch\testicular_torsion.dm" -#include "code\modules\antags\wizard\equipment\spellbook_entries\offensive.dm"