Add Trufflepig, Lock Transmutation. (#341)

* pain * ceratures spawners * update * Update alchemy.dm * changes Update transmutation.dm * Update transmutation.dm * Remove some classes * Update warlock.dm * erm
StoneHedgeSS13 · Dec 28, 2024 · 3b6605e · 3b6605e
1 parent d62e8bf
commit 3b6605e
Show file tree

Hide file tree

Showing 21 changed files with 402 additions and 359 deletions.
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -128,6 +128,7 @@
 #define TRAIT_LEARNMAGIC "Learn Magic" //You dont need usemagic if you have learnmagic.
 #define TRAIT_FEINT_IMMUNITY "Unfeintable"
 #define TRAIT_SOONTOWAKEUP "Soon to WAKE up"
+#define TRAIT_ALCHEMYKNOWLEDGE "Alchemy Knowledge"
 
 GLOBAL_LIST_INIT(roguetraits, list(
 	TRAIT_LEPROSY = span_necrosis("I'm a disgusting leper..."),
@@ -217,6 +218,7 @@ GLOBAL_LIST_INIT(roguetraits, list(
 	TRAIT_USEMAGIC = span_info("I know my way around magic items by legit means or trickery."),
 	TRAIT_FEINT_IMMUNITY = span_info("Those fools can not feint me."),
 	TRAIT_LEARNMAGIC = span_info("I can memorize spells long as my intellect allow me."),
+	TRAIT_ALCHEMYKNOWLEDGE = span_info("I know how to transmute things.")
 ))
 
 // trait accessor defines

diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
@@ -181,6 +181,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_FEINTIMMUNITY" = TRAIT_FEINT_IMMUNITY,
 		"TRAIT_USEMAGIC" = TRAIT_USEMAGIC,
 		"TRAIT_LEARNMAGIC" = TRAIT_LEARNMAGIC,
+		"TRAIT_ALCHEMYKNOWLEDGE" = TRAIT_ALCHEMYKNOWLEDGE,
 
 	),
 	/obj/item/bodypart = list(

diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
@@ -215,6 +215,9 @@
 		if(!(locate(R.structurecraft) in T))
 			to_chat(user, span_warning("I'm missing a structure I need."))
 			return
+	if(R.alchemists_only && !HAS_TRAIT(user, TRAIT_ALCHEMYKNOWLEDGE))
+		to_chat(user, span_warning("I do not know how to work on that."))
+		return
 	if(check_contents(R, contents))
 		if(check_tools(user, R, contents))
 			if(R.craftsound)

diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
@@ -26,6 +26,7 @@
 	var/sellprice = 0
 	var/can_be_qualitied = TRUE
 	//crafting diff, every diff removes 25% chance to craft
+	var/alchemists_only = FALSE
 
 /datum/crafting_recipe/pin_removal
 	name = "Pin Removal"

diff --git a/code/game/objects/items/rogueitems/bait.dm b/code/game/objects/items/rogueitems/bait.dm
@@ -14,7 +14,8 @@
 									/mob/living/simple_animal/hostile/retaliate/rogue/goatmale = 33,
 									/mob/living/simple_animal/hostile/retaliate/rogue/chicken = 33,
 									/mob/living/simple_animal/hostile/retaliate/rogue/turkey = 55,
-									/mob/living/simple_animal/hostile/retaliate/rogue/rabbit = 33)
+									/mob/living/simple_animal/hostile/retaliate/rogue/rabbit = 33,
+									/mob/living/simple_animal/hostile/retaliate/rogue/trufflepig = 33)
 	var/attraction_chance = 100
 	var/deployed = 0
 	resistance_flags = FLAMMABLE
@@ -99,7 +100,8 @@
 							/mob/living/simple_animal/hostile/retaliate/rogue/saiga = 20,
 							/mob/living/simple_animal/hostile/retaliate/rogue/saigabuck = 20,
 							/mob/living/simple_animal/hostile/retaliate/rogue/turkey = 20,
-							/mob/living/simple_animal/hostile/retaliate/rogue/rabbit = 10)
+							/mob/living/simple_animal/hostile/retaliate/rogue/rabbit = 10,
+							/mob/living/simple_animal/hostile/retaliate/rogue/trufflepig = 20)
 
 
 /obj/item/bait/bloody

diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm
@@ -436,7 +436,8 @@
 	ambush_mobs = list(/mob/living/simple_animal/hostile/retaliate/rogue/saiga = 10,
 	/mob/living/simple_animal/hostile/retaliate/rogue/saigabuck = 15,
 	/mob/living/simple_animal/hostile/retaliate/rogue/goat = 10,
-	/mob/living/simple_animal/hostile/retaliate/rogue/goatmale = 15)
+	/mob/living/simple_animal/hostile/retaliate/rogue/goatmale = 15,
+	/mob/living/simple_animal/hostile/retaliate/rogue/trufflepig = 15)
 
 /obj/effect/mob_spawner/wilderness/hostile
 	max_spawned_mobs = 8

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/sorceress.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/sorceress.dm
@@ -44,4 +44,5 @@
 	H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse)
 	H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/fetch)
 	H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/touch/prestidigitation)
+	ADD_TRAIT(H, TRAIT_ALCHEMYKNOWLEDGE, TRAIT_GENERIC)
 
diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warlock.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warlock.dm
@@ -112,6 +112,7 @@
 			H.mind.adjust_skillrank(/datum/skill/misc/alchemy, 3, TRUE)
 			H.put_in_hands(giveamulet(patronchoice), FALSE)
 			beltr = /obj/item/storage/belt/rogue/pouch/coins/rich
+			ADD_TRAIT(H, TRAIT_ALCHEMYKNOWLEDGE, TRAIT_GENERIC)
 			H.set_blindness(0)
 		if("purpose") //Pact of the Star Chain
 			wrists = /obj/item/rope/chain/constellation

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/apothecarian.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/apothecarian.dm
@@ -5,7 +5,7 @@
 	allowed_races = RACES_ALL_KINDSPLUS
 	outfit = /datum/outfit/job/roguetown/adventurer/apothecarian
 	category_tags = list(CTAG_PILGRIM, CTAG_TOWNER)
-	traits_applied = list(TRAIT_EMPATH)
+	traits_applied = list(TRAIT_EMPATH, TRAIT_ALCHEMYKNOWLEDGE)
 	cmode_music = 'sound/music/combat_physician.ogg'
 
 /datum/outfit/job/roguetown/adventurer/apothecarian

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/apothecary.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/apothecary.dm
@@ -21,6 +21,7 @@
 		/obj/item/reagent_containers/glass/mortar = 1,
 		/obj/item/pestle = 1,
 	)
+	ADD_TRAIT(H, TRAIT_ALCHEMYKNOWLEDGE, TRAIT_GENERIC)
 	if(H.mind)
 		H.mind.adjust_skillrank_up_to(/datum/skill/combat/knives, 4, TRUE)
 		H.mind.adjust_skillrank_up_to(/datum/skill/misc/reading, 3, TRUE)

diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/towndoctor.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/towndoctor.dm
@@ -5,7 +5,7 @@
 	allowed_races = RACES_ALL_KINDSPLUS
 	outfit = /datum/outfit/job/roguetown/adventurer/doctor
 	category_tags = list(CTAG_PILGRIM, CTAG_TOWNER)
-	traits_applied = list(TRAIT_EMPATH, TRAIT_SELF_AWARE, TRAIT_NOSTINK)
+	traits_applied = list(TRAIT_EMPATH, TRAIT_SELF_AWARE, TRAIT_NOSTINK, TRAIT_ALCHEMYKNOWLEDGE)
 	cmode_music = 'sound/music/combat_physician.ogg'
 
 /datum/outfit/job/roguetown/adventurer/doctor

diff --git a/code/modules/jobs/job_types/roguetown/breugrove/druid.dm b/code/modules/jobs/job_types/roguetown/breugrove/druid.dm
@@ -103,6 +103,7 @@
 	ADD_TRAIT(H, TRAIT_WILD_EATER, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_KNEESTINGER_IMMUNITY, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_ALCHEMYKNOWLEDGE, TRAIT_GENERIC)
 	var/datum/devotion/C = new /datum/devotion(H, H.patron)
 	C.grant_spells(H)
 	H.verbs += list(/mob/living/carbon/human/proc/devotionreport, /mob/living/carbon/human/proc/clericpray)
diff --git a/code/modules/jobs/job_types/roguetown/breugrove/greatdruid.dm b/code/modules/jobs/job_types/roguetown/breugrove/greatdruid.dm
@@ -103,6 +103,7 @@
 	ADD_TRAIT(H, TRAIT_WILD_EATER, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_KNEESTINGER_IMMUNITY, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_ALCHEMYKNOWLEDGE, TRAIT_GENERIC)
 	var/datum/devotion/C = new /datum/devotion(H, H.patron)
 	C.grant_spells(H)
 	H.verbs += list(/mob/living/carbon/human/proc/devotionreport, /mob/living/carbon/human/proc/clericpray)
diff --git a/code/modules/jobs/job_types/roguetown/courtier/physician.dm b/code/modules/jobs/job_types/roguetown/courtier/physician.dm
@@ -54,6 +54,7 @@
 	ADD_TRAIT(H, TRAIT_EMPATH, "[type]")
 	ADD_TRAIT(H, TRAIT_SELF_AWARE, "[type]") //can see exact numbers for diagnose
 	ADD_TRAIT(H, TRAIT_NOSTINK, "[type]")
+	ADD_TRAIT(H, TRAIT_ALCHEMYKNOWLEDGE, "[type]")
 	if(H.mind)
 		H.mind.adjust_skillrank_up_to(/datum/skill/misc/reading, 5, TRUE)
 		H.mind.adjust_skillrank_up_to(/datum/skill/misc/alchemy, 5, TRUE)

diff --git a/code/modules/jobs/job_types/roguetown/goblin/tribalshaman.dm b/code/modules/jobs/job_types/roguetown/goblin/tribalshaman.dm
@@ -71,6 +71,7 @@
 	ADD_TRAIT(H, TRAIT_SEEDKNOW, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_NASTY_EATER, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_PERFECT_TRACKER, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_ALCHEMYKNOWLEDGE, TRAIT_GENERIC)
 	var/datum/devotion/C = new /datum/devotion(H, H.patron)
 	C.grant_spells_priest(H)
 	H.verbs += list(/mob/living/carbon/human/proc/devotionreport, /mob/living/carbon/human/proc/clericpray)