Magic Rework Part 2

maplestation.dme

@@ -6298,6 +6298,7 @@
 #include "maplestation_modules\code\__DEFINES\paperwork_defines.dm"
 #include "maplestation_modules\code\__DEFINES\signals.dm"
 #include "maplestation_modules\code\__DEFINES\spans.dm"
+#include "maplestation_modules\code\__DEFINES\status_effects.dm"
 #include "maplestation_modules\code\__DEFINES\traits.dm"
 #include "maplestation_modules\code\__DEFINES\vv.dm"
 #include "maplestation_modules\code\__DEFINES\magic\attunements.dm"
@@ -6309,9 +6310,11 @@
 #include "maplestation_modules\code\__DEFINES\magic\spellbook\spellbook_categories.dm"
 #include "maplestation_modules\code\__DEFINES\magic\spellbook\spellbook_customization_interfaces.dm"
 #include "maplestation_modules\code\__DEFINES\magic\spellbook\spellbook_entry_types.dm"
+#include "maplestation_modules\code\__DEFINES\research\techweb_nodes.dm"
 #include "maplestation_modules\code\__DEFINES\subsystems\_module_subsystem_defines.dm"
 #include "maplestation_modules\code\__DEFINES\subsystems\_module_subsystem_priorities.dm"
 #include "maplestation_modules\code\__HELPERS\magic_helpers.dm"
+#include "maplestation_modules\code\__HELPERS\object_helpers.dm"
 #include "maplestation_modules\code\__HELPERS\text_helpers.dm"
 #include "maplestation_modules\code\controllers\configuration\entries\autotransfer.dm"
 #include "maplestation_modules\code\controllers\subsystem\autotransfer.dm"
@@ -6356,6 +6359,7 @@
 #include "maplestation_modules\code\datums\pain\pain_status_effects\pain_limp.dm"
 #include "maplestation_modules\code\datums\pain\pain_status_effects\sharp_pain.dm"
 #include "maplestation_modules\code\datums\pain\pain_status_effects\temp_pack.dm"
+#include "maplestation_modules\code\datums\quirks\_quirk.dm"
 #include "maplestation_modules\code\datums\quirks\good.dm"
 #include "maplestation_modules\code\datums\quirks\negative.dm"
 #include "maplestation_modules\code\datums\quirks\neutral.dm"
@@ -6401,6 +6405,7 @@
 #include "maplestation_modules\code\game\objects\items\devices\scanners\autopsy_scanner.dm"
 #include "maplestation_modules\code\game\objects\items\devices\scanners\engineering.dm"
 #include "maplestation_modules\code\game\objects\items\devices\scanners\mana_lens.dm"
+#include "maplestation_modules\code\game\objects\items\granters\meditation.dm"
 #include "maplestation_modules\code\game\objects\items\other_loadout_items\loadout_inhand_items.dm"
 #include "maplestation_modules\code\game\objects\items\storage\belt.dm"
 #include "maplestation_modules\code\game\objects\items\storage\boxes.dm"
@@ -6515,18 +6520,10 @@
 #include "maplestation_modules\code\modules\client\preferences\spellbook\spellbook_helpers.dm"
 #include "maplestation_modules\code\modules\client\preferences\spellbook\spellbook_item_customization_menu.dm"
 #include "maplestation_modules\code\modules\client\preferences\spellbook\spellbook_manager.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_entry.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_aeromancy.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_cryokinesis.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_electrokinesis.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_geomancy.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_healing.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_hydrokinesis.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_lumenomancy.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_misc.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_thaumaturgy.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_thermokinesis.dm"
-#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_spell_entry.dm"
+#include "maplestation_modules\code\modules\client\preferences\spellbook\items\_spellbook_entry.dm"
+#include "maplestation_modules\code\modules\client\preferences\spellbook\items\_spellbook_spell_entry.dm"
+#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_cantrips.dm"
+#include "maplestation_modules\code\modules\client\preferences\spellbook\items\spellbook_item_manipulation.dm"
 #include "maplestation_modules\code\modules\client\verbs\looc.dm"
 #include "maplestation_modules\code\modules\clothing\digi_clothing.dm"
 #include "maplestation_modules\code\modules\clothing\accessories\accessories.dm"
@@ -6628,32 +6625,39 @@
 #include "maplestation_modules\code\modules\loadouts\loadout_ui\loadout_manager.dm"
 #include "maplestation_modules\code\modules\loadouts\loadout_ui\loadout_outfit_helpers.dm"
 #include "maplestation_modules\code\modules\magic\spell.dm"
-#include "maplestation_modules\code\modules\magic\components\has_mana.dm"
 #include "maplestation_modules\code\modules\magic\components\uses_mana.dm"
 #include "maplestation_modules\code\modules\magic\mana\living_mana.dm"
+#include "maplestation_modules\code\modules\magic\mana\magic_wands.dm"
 #include "maplestation_modules\code\modules\magic\mana\mana.dm"
 #include "maplestation_modules\code\modules\magic\mana\mana_chemicals.dm"
 #include "maplestation_modules\code\modules\magic\mana\mana_overload.dm"
 #include "maplestation_modules\code\modules\magic\mana\mana_pool.dm"
 #include "maplestation_modules\code\modules\magic\mana\attunements\attunement.dm"
 #include "maplestation_modules\code\modules\magic\mana\sources\mana_batteries.dm"
+#include "maplestation_modules\code\modules\magic\mana\sources\altars\_magic_altars.dm"
+#include "maplestation_modules\code\modules\magic\mana\sources\altars\meditation_mat.dm"
+#include "maplestation_modules\code\modules\magic\mana\sources\altars\nature_shrine.dm"
+#include "maplestation_modules\code\modules\magic\mana\sources\altars\stellar_oculory.dm"
 #include "maplestation_modules\code\modules\magic\mana\sources\leylines\leylines.dm"
 #include "maplestation_modules\code\modules\magic\mana\sources\leylines\leyline_intensities\leyline_attunements.dm"
 #include "maplestation_modules\code\modules\magic\mana\sources\leylines\leyline_intensities\leyline_intensities.dm"
 #include "maplestation_modules\code\modules\magic\mana\sources\leylines\leyline_intensities\leyline_variable.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\acid_touch.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\airhike.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\convect.dm"
+#include "maplestation_modules\code\modules\magic\story_spells\eyes_of_night.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\finger_flame.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\flare.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\freeze_person.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\healing_touch.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\ice_blast.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\ice_knife.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\illusion.dm"
+#include "maplestation_modules\code\modules\magic\story_spells\light_breaker.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\mage_hand.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\mana_charge.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\mana_sense.dm"
+#include "maplestation_modules\code\modules\magic\story_spells\mana_tap.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\sense_equilibrium.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\shock_touch.dm"
 #include "maplestation_modules\code\modules\magic\story_spells\soothe.dm"
@@ -6750,12 +6754,14 @@
 #include "maplestation_modules\code\modules\reagents\reagent_containers\cups\glassbottle.dm"
 #include "maplestation_modules\code\modules\recycling\holder.dm"
 #include "maplestation_modules\code\modules\research\designs\autolathe_designs.dm"
+#include "maplestation_modules\code\modules\research\designs\magic_designs.dm"
 #include "maplestation_modules\code\modules\research\designs\mecha_designs.dm"
 #include "maplestation_modules\code\modules\research\designs\medical_designs.dm"
 #include "maplestation_modules\code\modules\research\designs\wiremod_designs.dm"
 #include "maplestation_modules\code\modules\research\machinery\experimentor.dm"
 #include "maplestation_modules\code\modules\research\techweb\_research.dm"
 #include "maplestation_modules\code\modules\research\techweb\all_nodes.dm"
+#include "maplestation_modules\code\modules\research\techweb\magic_nodes.dm"
 #include "maplestation_modules\code\modules\research\xenobiology\cores.dm"
 #include "maplestation_modules\code\modules\research\xenobiology\potions.dm"
 #include "maplestation_modules\code\modules\robotic_limb_detach\robot_limb_detach_quirk.dm"

maplestation_modules/code/__DEFINES/colors.dm

@@ -9,3 +9,6 @@
 
 // unused on the downstream so it was killed over a year ago, now back with a vengeance!
 #define RUNE_COLOR_EMP "#4D94FF"
+
+// colors used for volite and magic related stuff
+#define CIRCUIT_COLOR_MAGIC "#a8ffe2"

maplestation_modules/code/__DEFINES/magic/attunements.dm

@@ -23,6 +23,8 @@
 #define MAGIC_ELEMENT_LIFE /datum/attunement/life
 #define MAGIC_ELEMENT_EARTH /datum/attunement/earth
 #define MAGIC_ELEMENT_ELECTRIC /datum/attunement/electric
+#define MAGIC_ELEMENT_DARK /datum/attunement/dark
+#define MAGIC_ELEMENT_WATER /datum/attunement/water
 // When other elements are used, add them here
 
 // Alignments

maplestation_modules/code/__DEFINES/magic/magic_bitflags.dm

@@ -9,3 +9,13 @@
 #define MANA_POOL_CANNOT_TRANSFER (1<<5)
 
 #define MANA_POOL_TRANSFER_SKIP_ACTIVE (1<<6)
+
+/// used to dictate which of the default rules a mana transfer will abide by
+// No rules, default. Doesn't do anything, actually.
+#define MANA_TRANSFER_ANARCHY (1<<0)
+// Stops or skips transfer when the transfer hits or passes the target pool's softcap
+#define MANA_TRANSFER_SOFTCAP (1<<1)
+// Same as the above, but with added behavior to prevent a transfer that would put someone above the softcap
+#define MANA_TRANSFER_SOFTCAP_NO_PASS (1<<2)
+// None of the above, just adds manual rules to transfer.
+#define MANA_TRANSFER_MANUAL_RULES (1<<3)

maplestation_modules/code/__DEFINES/magic/magic_defines.dm

@@ -7,7 +7,7 @@
 #define MANA_CRYSTAL_BASE_RECHARGE 0.001
 
 #define BASE_MANA_CAPACITY 1000
-#define MANA_CRYSTAL_BASE_MANA_CAPACITY (BASE_MANA_CAPACITY * 0.2)
+#define MANA_CRYSTAL_BASE_MANA_CAPACITY (BASE_MANA_CAPACITY * 0.3)
 #define CARBON_BASE_MANA_CAPACITY (BASE_MANA_CAPACITY)
 #define LEYLINE_BASE_CAPACITY 600 //todo: standardize
 
@@ -36,11 +36,12 @@
 #define MANA_CRYSTAL_BASE_DECAY_DIVISOR (BASE_MANA_EXPONENTIAL_DIVISOR * 5)
 
 // in vols per second
-#define BASE_MANA_DONATION_RATE (BASE_MANA_CAPACITY * 0.5)
+#define BASE_MANA_DONATION_RATE (BASE_MANA_CAPACITY * 0.1)
 #define BASE_MANA_CRYSTAL_DONATION_RATE (BASE_MANA_DONATION_RATE * 0.1)
 #define BASE_LEYLINE_DONATION_RATE 30
 
 #define MANA_BATTERY_MAX_TRANSFER_DISTANCE 3
+#define MAGIC_ALTAR_MAX_TRANSFER_DISTANCE 6
 
 #define MAGIC_MATERIAL_NAME "Volite"
 #define MAGIC_UNIT_OF_MEASUREMENT "Vol"

maplestation_modules/code/__DEFINES/magic/spellbook/spellbook_categories.dm

@@ -1,10 +1,2 @@
-#define SPELLBOOK_CATEGORY_THERMOKINESIS "Thermokinesis"
-#define SPELLBOOK_CATEGORY_CRYOKINESIS "Cryokinesis"
-#define SPELLBOOK_CATEGORY_HYDROKINESIS "Hydrokinesis"
-#define SPELLBOOK_CATEGORY_THAUMATURGY "Thaumaturgy"
-#define SPELLBOOK_CATEGORY_LUMENOMANCY "Lumenomancy"
-#define SPELLBOOK_CATEGORY_AEROMANCY "Aeromancy"
-#define SPELLBOOK_CATEGORY_GEOMANCY "Geomancy"
-#define SPELLBOOK_CATEGORY_ELECTROKINESIS "Electrokinesis"
-#define SPELLBOOK_CATEGORY_LIFE_MAGIC "Life Magic"
-#define SPELLBOOK_CATEGORY_MISC "Misc. Spells"
+#define SPELLBOOK_CATEGORY_CANTRIPS "Cantrips"
+#define SPELLBOOK_CATEGORY_MANIPULATION "Manipulation"

maplestation_modules/code/__DEFINES/research/techweb_nodes.dm

@@ -0,0 +1,3 @@
+#define TECHWEB_NODE_ARTIFICIAL_VOLITE "artificial_volite"
+#define TECHWEB_NODE_MANA_BASE "mana_base_node"
+#define TECHWEB_NODE_STELLAR_OCULORY "stellar_oculory_unlock"

maplestation_modules/code/__DEFINES/status_effects.dm

@@ -0,0 +1,2 @@
+// place for IDs like its base code equivalent
+#define MEDITATION_MAT_EFFECT "meditation_mat"

maplestation_modules/code/__DEFINES/traits.dm

@@ -4,3 +4,7 @@
 #define TRAIT_FEATHERED "feathers"
 /// Gives positive mood on drinking anything caffeinated, kinda generic so people can like coffee, tea, energy drinks, whatever.
 #define TRAIT_CAFFEINE_LOVER "caffeine_lover"
+/// First of a potential series, this is the trait a mob with the psionic quirk will get. generally affects the costs/cooldowns of specific spells
+#define TRAIT_FULL_PSIONIC "full_psionic"
+/// Used to empower other mental effects, notably the meditate family
+#define TRAIT_EMPOWERED_MEDITATION "empowered_meditation"

maplestation_modules/code/__HELPERS/object_helpers.dm

@@ -0,0 +1,76 @@
+// code that checks for starlight on a movable atom. pillaged from starlight condensation, but not used there because we're a modular codebase, so lets pretend we did that
+#define FULL_STARLIGHT 2
+#define PARTIAL_STARLIGHT 1
+#define NO_STARLIGHT 0
+
+/atom/movable/proc/checktilestarlightdirectional(turf/turf_to_check, direction, starlight_max_range)
+	if(direction == UP)
+		turf_to_check = GET_TURF_ABOVE(turf_to_check)
+		if(!turf_to_check)
+			return NO_STARLIGHT
+	var/area/area_to_check = get_area(turf_to_check)
+	var/levels_of_glass = 0 // Since starlight condensation only works 2 tiles to the side anyways, it shouldn't work with like 100 z-levels of glass
+	while(levels_of_glass <= starlight_max_range)
+		// Outdoors covers lavaland and unroofed areas but with tiles under,
+		// while space covers normal space and those caused by explosions,
+		// if there is a floor tile when checking above, that means
+		// a roof exists so the outdoors should only work downwards
+		if(isspaceturf(turf_to_check) || (area_to_check.outdoors && direction == DOWN))
+			if (levels_of_glass)
+				return PARTIAL_STARLIGHT // Glass gives a penalty.
+			return FULL_STARLIGHT // No glass = can activate fully.
+
+		// Our turf is transparent, but it's NOT openspace - it's something like glass which reduces power
+		if(istransparentturf(turf_to_check) && !(istype(turf_to_check, /turf/open/openspace)))
+			levels_of_glass += 1
+
+		// Our turf is transparent OR openspace - we can check higher or lower z-levels
+		if(istransparentturf(turf_to_check) || istype(turf_to_check, /turf/open/openspace))
+			// Check above or below us
+			if(direction == UP)
+				turf_to_check = GET_TURF_ABOVE(turf_to_check)
+			else
+				turf_to_check = GET_TURF_BELOW(turf_to_check)
+
+			// If we found a turf above or below us,
+			// then we can rerun the loop on the newly found turf / area
+			// (Probably, with +1 to levels_of_glass)
+			if(turf_to_check)
+				area_to_check = get_area(turf_to_check)
+				continue
+
+			// If we didn't find a turf above or below us -
+			// Checking below, we assume that space is below us (as we're standing on station)
+			// Checking above, we check that the area is "outdoors" before assuming if it is space or not.
+			else
+				if(direction == DOWN || (direction == UP && area_to_check.outdoors))
+					if (levels_of_glass)
+						return PARTIAL_STARLIGHT
+					return FULL_STARLIGHT
+
+		return NO_STARLIGHT // Hit a non-space, Non-transparent turf - no starlight for you
+
+/atom/movable/proc/checktilestarlight(turf/original_turf, satisfied_with_penalty, starlight_max_range)
+	var/current_starlight_level = checktilestarlightdirectional(original_turf, DOWN, starlight_max_range)
+	if(current_starlight_level == FULL_STARLIGHT)
+		return current_starlight_level
+	if(current_starlight_level && satisfied_with_penalty) // do not care if there is a +penalty or no
+		return current_starlight_level
+	var/starlight_level_from_above = checktilestarlightdirectional(original_turf, UP, starlight_max_range)
+	if(starlight_level_from_above > current_starlight_level)
+		return starlight_level_from_above
+	else
+		return current_starlight_level
+
+/atom/movable/proc/checkstarlight(check_range)
+	var/starlight_max_range = check_range
+	var/turf/turf_of_target = get_turf(src)
+	switch(checktilestarlight(turf_of_target, FALSE, starlight_max_range))
+		if(PARTIAL_STARLIGHT)
+			return PARTIAL_STARLIGHT
+		if(FULL_STARLIGHT)
+			return FULL_STARLIGHT
+	for(var/turf/turf_to_check in view(src, starlight_max_range))
+		if(checktilestarlight(turf_to_check, TRUE, starlight_max_range))
+			return PARTIAL_STARLIGHT
+	return NO_STARLIGHT

maplestation_modules/code/datums/components/crafting/recipes.dm

@@ -34,7 +34,8 @@
 	result = /obj/item/clothing/neck/mana_star
 	reqs = list(
 		/obj/item/mana_battery/mana_crystal/cut = 1,
-		/obj/item/stack/sheet/mineral/gold = 1, // cheap for now
+		/obj/item/stack/sheet/cloth = 2,
+		/obj/item/stack/sheet/mineral/gold = 4, // not so cheap now
 	)
 	tool_behaviors = list(TOOL_SCREWDRIVER)
 	time = 5 SECONDS
@@ -50,3 +51,30 @@
 	tool_behaviors = list(TOOL_CROWBAR)
 	time = 5 SECONDS
 	category = CAT_EQUIPMENT
+
+/datum/crafting_recipe/scrapwand
+	name = "Makeshift Wand"
+	result = /obj/item/magic_wand
+	reqs = list(
+		/obj/item/pen = 1,
+		/obj/item/stack/rods = 1,
+		/obj/item/stack/cable_coil = 3,
+	)
+
+/datum/crafting_recipe/woodenwand
+	name = "Gold-Capped Wooden Wand"
+	result = /obj/item/magic_wand/wooden
+	reqs = list(
+		/obj/item/stack/sheet/mineral/wood = 2,
+		/obj/item/stack/sheet/mineral/gold = 1,
+	)
+
+/datum/crafting_recipe/nature_shrine
+	name = "The Stump Which Watches"
+	time = 30 SECONDS
+	reqs = list(
+		/obj/item/stack/sheet/mineral/wood = 10,
+		/obj/item/mana_battery/mana_crystal/standard = 1,
+	)
+	result = /obj/structure/magic_altar/nature
+	category = CAT_MISC

maplestation_modules/code/datums/quirks/_quirk.dm

@@ -0,0 +1,15 @@
+// somehow i stumbled accross the first case of needing to add a power via quirks. Funny
+// also potentially overkill but honestly i fully anticipate this having more cases
+
+/datum/quirk/power_granting
+	var/datum/action/action_type
+	abstract_parent_type = /datum/quirk/power_granting
+
+/datum/quirk/power_granting/add_unique(client/client_source)
+	var/datum/action/new_action = new action_type(src)
+	// failsafe incase the power granted is somehow already owned by the quirk holder
+	var/datum/action/duplicate_check = locate(action_type) in quirk_holder.actions
+	if(duplicate_check)
+		return
+	new_action.Grant(quirk_holder)
+

maplestation_modules/code/datums/quirks/good.dm

@@ -116,3 +116,17 @@
 	if(istype(human_holder))
 		human_holder.sprint_length_max /= 1.5
 		human_holder.sprint_length = human_holder.sprint_length_max
+
+/datum/quirk/power_granting/psionic
+	name = "Psionic"
+	desc = "You are able to manipulate and control the flow of mana with your mind."
+	icon = FA_ICON_HAND_SPOCK // because theres not really many better options, and this one is highly unlikely to be used elsewise
+	value = 2
+	mob_trait = TRAIT_FULL_PSIONIC
+	gain_text = span_notice("You feel as if you can see a form of light you've never seen before.")
+	lose_text = span_danger("You feel as if a part of your being was ripped from you.")
+	medical_record_text = "Patient displays provable extrasensory perception."
+	action_type = /datum/action/cooldown/spell/touch/mana_tap
+
+
+

maplestation_modules/code/game/objects/items/devices/scanners/mana_lens.dm

@@ -13,27 +13,9 @@
 	pickup_sound = 'maplestation_modules/sound/items/pickup/device.ogg'
 
 /obj/item/mana_lens/interact_with_atom(atom/movable/interacting_with, mob/living/user)
-	if (isturf(interacting_with))
-		balloon_alert(user, "object has no mana pool!") // turfs should not ever have mana pools, doing this just so it doesn't error
+	if (isturf(interacting_with)) // turfs should not ever have mana pools, doing this so it doesn't runtime
 		return
 	if (!interacting_with.mana_pool)
 		balloon_alert(user, "object has no mana pool!")
 		return
 	balloon_alert(user, "mana amount: [interacting_with.mana_pool.amount]")
-
-/datum/design/proto_mana_lens
-	name = "Prototype Mana Lens"
-	desc = "The first prototype of a device capable of reading the prescence of mana."
-	id = "mana_lens"
-	build_type = PROTOLATHE
-	materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2.5, /datum/material/gold = SMALL_MATERIAL_AMOUNT)
-	build_path = /obj/item/mana_lens
-
-/datum/techweb_node/mana_base
-	id = "mana_base"
-	starting_node = TRUE
-	display_name = "Early Magical Tech"
-	description = "The first bits of technology surronding magic."
-	design_ids = list(
-		"mana_lens", // more will be added to this
-	)