Skip to content
This repository was archived by the owner on Jun 29, 2024. It is now read-only.

Alchemy fixed #1418

Open
Ambrose997 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Alchemy fixed #1418

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 28 additions & 21 deletions code/modules/roguetown/roguecrafting/alchemy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,96 +1,103 @@
/datum/crafting_recipe/roguetown
/datum/crafting_recipe/roguetown/alchemy
req_table = FALSE
tools = list(/obj/item/reagent_containers/glass/mortar, /obj/item/pestle)
verbage_simple = "mix"
skillcraft = /datum/skill/misc/alchemy
subtype_reqs = TRUE

/datum/crafting_recipe/roguetown/alchemy/bbomb
name = "Bottle bomb"
result = list(/obj/item/bomb)
reqs = list(/obj/item/reagent_containers/glass/bottle = 1, /obj/item/ash = 2, /obj/item/rogueore/coal = 1, /obj/item/natural/cloth = 1)
craftdiff = 2

/datum/crafting_recipe/roguetown/alchemy/bbomb
/* /datum/crafting_recipe/roguetown/alchemy/bbomb_mana
name = "Bottle bomb m"
result = list(/obj/item/bomb)
reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot = 1, /obj/item/ash = 2, /obj/item/rogueore/coal = 1, /obj/item/natural/cloth = 1)
craftdiff = 2
craftdiff = 2 */

/datum/crafting_recipe/roguetown/alchemy/bbomb
/* /datum/crafting_recipe/roguetown/alchemy/bbomb_health
name = "Bottle bomb h"
result = list(/obj/item/bomb)
reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot = 1, /obj/item/ash = 2, /obj/item/rogueore/coal = 1, /obj/item/natural/cloth = 1)
craftdiff = 2
craftdiff = 2 */

/datum/crafting_recipe/roguetown/alchemy/manna_pot
name = "Manna Potion"
result = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot)
reqs = list(/obj/item/reagent_containers/glass/bottle = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/fish/eel = 1)
craftdiff = 4

/datum/crafting_recipe/roguetown/alchemy/manna_pot
/* /datum/crafting_recipe/roguetown/alchemy/manna_pot_mana
name = "Manna Potion m"
result = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot)
reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/fish/eel = 1)
craftdiff = 4
craftdiff = 4 */

/datum/crafting_recipe/roguetown/alchemy/manna_pot
/* /datum/crafting_recipe/roguetown/alchemy/manna_pot_health
name = "Manna Potion h"
result = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot)
reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/fish/eel = 1)
craftdiff = 4
craftdiff = 4 */

/datum/crafting_recipe/roguetown/alchemy/manna_pot_3x
name = "3x Manna Potion"
result = list(/datum/supply_pack/rogue/food/manapot)
reqs = list(/obj/item/reagent_containers/glass/bottle = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/fish/eel = 2)
craftdiff = 4

/datum/crafting_recipe/roguetown/alchemy/manna_pot_3x
/* /datum/crafting_recipe/roguetown/alchemy/manna_pot_3x_mana
name = "3x Manna Potion m"
result = list(/datum/supply_pack/rogue/food/manapot)
reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/fish/eel = 2)
craftdiff = 4
craftdiff = 4 */

/datum/crafting_recipe/roguetown/alchemy/manna_pot_3x
/* /datum/crafting_recipe/roguetown/alchemy/manna_pot_3x_health
name = "3x Manna Potion h"
result = list(/datum/supply_pack/rogue/food/manapot)
reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/fish/eel = 2)
craftdiff = 4
craftdiff = 4 */

/datum/crafting_recipe/roguetown/alchemy/health_pot
name = "Health Potion"
result = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot)
reqs = list(/obj/item/reagent_containers/glass/bottle = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 1, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1)
craftdiff = 5

/datum/crafting_recipe/roguetown/alchemy/health_pot
/* /datum/crafting_recipe/roguetown/alchemy/health_pot_mana
name = "Health Potion m"
result = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot)
reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 1, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1)
craftdiff = 5
craftdiff = 5 */


/datum/crafting_recipe/roguetown/alchemy/health_pot
/* /datum/crafting_recipe/roguetown/alchemy/health_pot_health
name = "Health Potion h"
result = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot)
reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot = 1, /obj/item/ash = 1, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 1, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1)
craftdiff = 5
craftdiff = 5 */

/datum/crafting_recipe/roguetown/alchemy/health_pot_3x
name = "3x Health Potion"
result = list(/datum/supply_pack/rogue/food/healthpot)
reqs = list(/obj/item/reagent_containers/glass/bottle = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 4, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1)
craftdiff = 5

/datum/crafting_recipe/roguetown/alchemy/health_pot_3x
/* /datum/crafting_recipe/roguetown/alchemy/health_pot_3x_mana
name = "3x Health Potion m"
result = list(/datum/supply_pack/rogue/food/healthpot)
reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/manapot = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 4, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1)
craftdiff = 5
craftdiff = 5 */

/datum/crafting_recipe/roguetown/alchemy/health_pot_3x
/* /datum/crafting_recipe/roguetown/alchemy/health_pot_3x_health
name = "3x Health Potion h"
result = list(/datum/supply_pack/rogue/food/healthpot)
reqs = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot = 3, /obj/item/ash = 3, /obj/item/reagent_containers/food/snacks/grown/berries/rogue = 4, /obj/item/reagent_containers/food/snacks/fish/clownfish = 1)
craftdiff = 5
craftdiff = 5 */

// Subtype potions apparently no longer needed apparently as subtype_reqs = TRUE already allows for all bottle subtypes (including potions) to be used interchangeably

// in crafting recipes that require them. Upon local testing, apparently doesn't affect any other item requirements this way (i.e you cant use the fish interchangeably).

// Confusing af, but happy accident I guess? Not gonna complain.