Arcane Spellcasting Update

code/modules/antagonists/roguetown/villain/werewolf/werewolf_spells.dm

@@ -32,6 +32,7 @@
 
 	message_admins("WEREWOLF: [werewolf_player.wolfname] howls: [message]")
 
+//Old version, ugly and no feedback with the new icons
 /obj/effect/proc_holder/spell/self/claws
 	name = "Lupine Claws"
 	desc = "!"
@@ -62,4 +63,32 @@
 		user.put_in_hands(r, TRUE, FALSE, TRUE)
 		//user.visible_message("Your claws extend.", "You feel your claws extending.", "You hear a sound of claws extending.")
 		extended = TRUE
-
+
+//New version (to work nicely with the new icons)
+/obj/effect/proc_holder/spell/invoked/claws
+	name = "Lupine Claws"
+	desc = "!"
+	overlay_state = "claws"
+	antimagic_allowed = TRUE
+	charge_max = 20 //2 seconds
+	var/extended = FALSE
+	var/obj/item/rogueweapon/werewolf_claw/left/l
+	var/obj/item/rogueweapon/werewolf_claw/right/r
+
+/obj/effect/proc_holder/spell/invoked/claws/on_activation(mob/user = usr)
+	l = new(user,1)
+	r = new(user,2)
+	user.put_in_hands(l, TRUE, FALSE, TRUE)
+	user.put_in_hands(r, TRUE, FALSE, TRUE)
+	//user.visible_message("Your claws extend.", "You feel your claws extending.", "You hear a sound of claws extending.")
+	extended = TRUE
+
+/obj/effect/proc_holder/spell/invoked/claws/on_deactivation(mob/user = usr)
+	l = user.get_active_held_item()
+	r = user.get_inactive_held_item()
+	user.dropItemToGround(l, TRUE)
+	user.dropItemToGround(r, TRUE)
+	qdel(l)
+	qdel(r)
+	//user.visible_message("Your claws retract.", "You feel your claws retracting.", "You hear a sound of claws retracting.")
+	extended = FALSE

code/modules/antagonists/roguetown/villain/werewolf/werewolf_transformation.dm

@@ -116,7 +116,7 @@
 	W.mind.adjust_skillrank(/datum/skill/misc/climbing, 6, TRUE)
 
 	W.AddSpell(new /obj/effect/proc_holder/spell/self/howl)
-	W.AddSpell(new /obj/effect/proc_holder/spell/self/claws)
+	W.AddSpell(new /obj/effect/proc_holder/spell/invoked/claws)
 
 	ADD_TRAIT(src, TRAIT_NOSLEEP, TRAIT_GENERIC)
 
@@ -171,7 +171,7 @@
 	W.mind.skill_experience = WA.stored_experience.Copy()
 
 	W.RemoveSpell(new /obj/effect/proc_holder/spell/self/howl)
-	W.RemoveSpell(new /obj/effect/proc_holder/spell/self/claws)
+	W.RemoveSpell(new /obj/effect/proc_holder/spell/invoked/claws)
 
 	W.regenerate_icons()
 

code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm

@@ -56,6 +56,20 @@
 		H.change_stat("intelligence", 3)
 		H.change_stat("constitution", 1)
 		H.change_stat("endurance", -1)
-		H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/fireball)
-		H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/lightningbolt)
-		H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/fetch)
+		var/list/possible_spells = list(
+			"/obj/effect/proc_holder/spell/arcane/telepathy",
+			"/obj/effect/proc_holder/spell/arcane/ignite",
+			"/obj/effect/proc_holder/spell/arcane/blink",
+			"/obj/effect/proc_holder/spell/arcane/swap",
+			"/obj/effect/proc_holder/spell/arcane/smokescreen",
+			"/obj/effect/proc_holder/spell/arcane/blindness",
+			"/obj/effect/proc_holder/spell/arcane/invisibility",
+			"/obj/effect/proc_holder/spell/arcane/projectile/fetch"
+		)
+		H.mind.AddSpell(pick(new /obj/effect/proc_holder/spell/arcane/projectile/fireball,new /obj/effect/proc_holder/spell/arcane/projectile/lightningbolt))
+		for(var/i=2,i>0,i--)
+			var/random_item = pick(possible_spells)
+			var typepath = text2path(random_item)
+			H.mind.AddSpell(new typepath)
+			possible_spells.Remove(random_item)
+		possible_spells = null

code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/duskblade.dm

@@ -0,0 +1,98 @@
+//duskblade
+
+/datum/advclass/duskblade
+	name = "Duskblade"
+	tutorial = "The duskblade blurs the line between spellcaster and warrior,\
+	marrying the power of magic with hand-to-hand combat prowess. A student of ancient elven spellcasting techniques,\
+	the duskblade combines arcane spellcasting with the combat skills of a fighter."
+	allowed_races = list(
+		"Humen",
+		"Elf",
+		"Half-Elf",
+		"Dwarf",
+		"Tiefling",
+		"Argonian",
+		"Dark Elf",
+		"Aasimar",
+		"Half Orc"
+	)
+	outfit = /datum/outfit/job/roguetown/adventurer/dblade
+	pickprob = 11
+	traits_applied = list(TRAIT_MEDIUMARMOR, TRAIT_DODGEEXPERT)
+	category_tags = list(CTAG_ADVENTURER)
+
+
+/datum/outfit/job/roguetown/adventurer/dblade/pre_equip(mob/living/carbon/human/H)
+	..()
+	H.mind.adjust_skillrank(/datum/skill/combat/crossbows, rand(1,2), TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/maces, 1, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/axes, 1, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/knives, rand(1,2), TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 1, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/riding, pick(1,2), TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/alchemy, 1, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/magic/arcane, 1, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE)
+	if(H.age == AGE_OLD)
+		H.mind.adjust_skillrank(/datum/skill/magic/arcane, pick(1,2,3), TRUE)
+	H.change_stat("strength", 2)
+	H.change_stat("endurance", 1)
+	H.change_stat("constitution", 1)
+	H.change_stat("intelligence", 2)
+	H.change_stat("speed", 1)
+	shoes = /obj/item/clothing/shoes/roguetown/boots
+	gloves = /obj/item/clothing/gloves/roguetown/leather
+	belt = /obj/item/storage/belt/rogue/leather
+	neck = /obj/item/storage/belt/rogue/pouch/coins/poor
+	shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random
+	if(prob(70))
+		armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk
+	else if(prob(50))
+		armor = /obj/item/clothing/suit/roguetown/armor/plate/half/iron
+	else
+		armor = /obj/item/clothing/suit/roguetown/armor/plate/scale
+	if(prob(25))
+		mask = /obj/item/clothing/mask/rogue/facemask
+	backl = /obj/item/storage/backpack/rogue/satchel
+	backr = /obj/item/rogueweapon/shield/wood
+	beltl = /obj/item/rogueweapon/huntingknife
+	if(prob(50))
+		beltr = /obj/item/rogueweapon/sword/iron
+	else
+		beltr = /obj/item/rogueweapon/sword/sabre
+	if(H.gender == MALE)
+		pants = /obj/item/clothing/under/roguetown/tights/black
+	else
+		H.underwear = "Femleotard"
+		H.underwear_color = CLOTHING_BLACK
+		H.update_body()
+		pants = /obj/item/clothing/under/roguetown/tights/black
+
+	var/list/possible_spells = list(
+		"/obj/effect/proc_holder/spell/arcane/telepathy",
+		"/obj/effect/proc_holder/spell/arcane/ignite",
+		"/obj/effect/proc_holder/spell/arcane/blink",
+		"/obj/effect/proc_holder/spell/arcane/swap",
+		"/obj/effect/proc_holder/spell/arcane/smokescreen",
+		"/obj/effect/proc_holder/spell/arcane/blindness",
+		"/obj/effect/proc_holder/spell/arcane/invisibility",
+		"/obj/effect/proc_holder/spell/arcane/projectile/fetch"
+	)
+	H.mind.AddSpell(pick(new /obj/effect/proc_holder/spell/arcane/projectile/fireball,new /obj/effect/proc_holder/spell/arcane/projectile/lightningbolt))
+	var/random_item = pick(possible_spells)
+	var typepath = text2path(random_item)
+	H.mind.AddSpell(new typepath)
+	possible_spells = null
+
+	ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/sorceress.dm

@@ -27,7 +27,7 @@
 	backl = /obj/item/storage/backpack/rogue/satchel
 	beltr = /obj/item/reagent_containers/glass/bottle/rogue/manapot
 	beltl = /obj/item/rogueweapon/huntingknife
-	neck = /obj/item/storage/belt/rogue/pouch/coins/poor	
+	neck = /obj/item/storage/belt/rogue/pouch/coins/poor
 	r_hand = /obj/item/rogueweapon/woodstaff
 	if(H.mind)
 		H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE)
@@ -47,6 +47,20 @@
 		H.change_stat("strength", -1)
 		H.change_stat("intelligence", 4)
 		H.change_stat("speed", 1)
-		H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/fireball)
-		H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/lightningbolt)
-		H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/fetch)
+		var/list/possible_spells = list(
+			"/obj/effect/proc_holder/spell/arcane/telepathy",
+			"/obj/effect/proc_holder/spell/arcane/ignite",
+			"/obj/effect/proc_holder/spell/arcane/blink",
+			"/obj/effect/proc_holder/spell/arcane/swap",
+			"/obj/effect/proc_holder/spell/arcane/smokescreen",
+			"/obj/effect/proc_holder/spell/arcane/blindness",
+			"/obj/effect/proc_holder/spell/arcane/invisibility",
+			"/obj/effect/proc_holder/spell/arcane/projectile/fetch"
+		)
+		H.mind.AddSpell(pick(new /obj/effect/proc_holder/spell/arcane/projectile/fireball,new /obj/effect/proc_holder/spell/arcane/projectile/lightningbolt))
+		for(var/i=2,i>0,i--)
+			var/random_item = pick(possible_spells)
+			var typepath = text2path(random_item)
+			H.mind.AddSpell(new typepath)
+			possible_spells.Remove(random_item)
+		possible_spells = null

code/modules/jobs/job_types/roguetown/courtier/magician.dm

@@ -13,7 +13,6 @@
 		"Half-Elf",
 		"Aasimar",
 	)
-	spells = list(/obj/effect/proc_holder/spell/invoked/projectile/fireball/greater, /obj/effect/proc_holder/spell/invoked/projectile/fireball, /obj/effect/proc_holder/spell/invoked/projectile/lightningbolt, /obj/effect/proc_holder/spell/invoked/projectile/fetch)
 	display_order = JDO_MAGICIAN
 	tutorial = "Your creed is one dedicated to the conquering of the arcane arts and the constant thrill of knowledge. \
 		You owe your life to the Lord, for it was his coin that allowed you to continue your studies in these dark times. \
@@ -70,3 +69,24 @@
 				head = /obj/item/clothing/head/roguetown/wizhat
 				armor = /obj/item/clothing/suit/roguetown/shirt/robe/wizard
 				H.dna.species.soundpack_m = new /datum/voicepack/male/wizard()
+
+		var/list/possible_spells = list(
+			"/obj/effect/proc_holder/spell/arcane/telepathy",
+			"/obj/effect/proc_holder/spell/arcane/ignite",
+			"/obj/effect/proc_holder/spell/arcane/blink",
+			"/obj/effect/proc_holder/spell/arcane/swap",
+			"/obj/effect/proc_holder/spell/arcane/smokescreen",
+			"/obj/effect/proc_holder/spell/arcane/projectile/lightningbolt",
+			"/obj/effect/proc_holder/spell/arcane/projectile/fireball",
+			"/obj/effect/proc_holder/spell/arcane/blindness",
+			"/obj/effect/proc_holder/spell/arcane/invisibility",
+			"/obj/effect/proc_holder/spell/arcane/projectile/fetch"
+		)
+		H.mind.AddSpell(new /obj/effect/proc_holder/spell/arcane/projectile/fireball/greater)
+		for(var/i=3,i>0,i--)
+			var/random_item = pick(possible_spells)
+			var typepath = text2path(random_item)
+			H.mind.AddSpell(new typepath)
+			possible_spells.Remove(random_item)
+		possible_spells = null
+

code/modules/spells/roguetown/_roguetown.dm

@@ -11,12 +11,29 @@
 	invocation_type = "shout"
 	var/active_sound
 
+//Old update icon
+///obj/effect/proc_holder/spell/update_icon()
+//	if(!action)
+//		return
+//	action.button_icon_state = "[base_icon_state][active]"
+//	if(overlay_state)
+//		action.overlay_state = overlay_state
+//	action.name = name
+//	action.UpdateButtonIcon()
+
+//That is a ugly way of checking it the spell is a mmb cast or not and I know it...
+//But it's what worked better so far for some reason.
 /obj/effect/proc_holder/spell/update_icon()
 	if(!action)
 		return
-	action.button_icon_state = "[base_icon_state][active]"
-	if(overlay_state)
-		action.overlay_state = overlay_state
+	action.button_icon_state = base_icon_state
+	if (selection_type == "view") 
+		if(overlay_state)
+			action.overlay_state = "[overlay_state]1"
+	else
+		action.button_icon_state = "[base_icon_state][active]"
+		if(overlay_state)
+			action.overlay_state = "[overlay_state][active]"
 	action.name = name
 	action.UpdateButtonIcon()