mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-11 15:14:27 +01:00
Table crafting refactor
This commit is contained in:
Markolie
@@ -268,7 +268,7 @@
|
||||
/obj/item/weapon/aiModule,/obj/item/weapon/airalarm_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/circular_saw,
|
||||
/obj/item/weapon/cloaking_device,/obj/item/weapon/crowbar,/obj/item/weapon/disk,/obj/item/weapon/firealarm_electronics,/obj/item/weapon/hand_tele,
|
||||
/obj/item/weapon/hand_labeler,/obj/item/weapon/hemostat,/obj/item/weapon/mop,/obj/item/weapon/locator,/obj/item/weapon/minihoe,
|
||||
/obj/item/weapon/packageWrap,/obj/item/weapon/pen,/obj/item/weapon/pickaxe,/obj/item/weapon/pinpointer,
|
||||
/obj/item/stack/packageWrap,/obj/item/weapon/pen,/obj/item/weapon/pickaxe,/obj/item/weapon/pinpointer,
|
||||
/obj/item/weapon/rcd,/obj/item/weapon/rcd_ammo,/obj/item/weapon/retractor,/obj/item/weapon/rsf,/obj/item/weapon/rsp,/obj/item/weapon/scalpel,
|
||||
/obj/item/weapon/screwdriver,/obj/item/weapon/shovel,/obj/item/weapon/soap,/obj/item/weapon/stamp,/obj/item/weapon/tray,/obj/item/weapon/weldingtool,
|
||||
/obj/item/weapon/wirecutters,/obj/item/weapon/wrench,/obj/item/weapon/extinguisher)
|
||||
|
||||
@@ -1,312 +0,0 @@
|
||||
var/global/datum/crafting_controller/crafting_master
|
||||
|
||||
/datum/crafting_recipe
|
||||
var/name = ""
|
||||
var/reqs[] = list()
|
||||
var/result_path
|
||||
var/tools[] = list()
|
||||
var/time = 0
|
||||
var/parts[] = list()
|
||||
var/chem_catalists[] = list()
|
||||
var/can_be_deconstructed = 0
|
||||
|
||||
/datum/crafting_recipe/New()
|
||||
crafting_master.all_crafting_recipes[name] = src
|
||||
|
||||
/datum/crafting_recipe/table/New()
|
||||
..()
|
||||
crafting_master.add_recipe_to_family("table", src)
|
||||
|
||||
|
||||
/datum/crafting_controller
|
||||
var/list/families = list()
|
||||
var/list/all_crafting_points = list()
|
||||
var/list/all_crafting_recipes = list()
|
||||
|
||||
/hook/startup/proc/setupCraftingMaster()
|
||||
crafting_master = new /datum/crafting_controller()
|
||||
return 1
|
||||
|
||||
/datum/crafting_controller/New()
|
||||
crafting_master = src
|
||||
add_family("table")
|
||||
add_family("forge")
|
||||
for(var/A in typesof(/datum/crafting_recipe))
|
||||
if(A == /datum/crafting_recipe)
|
||||
continue
|
||||
var/datum/crafting_recipe/CR = new A()
|
||||
all_crafting_recipes[CR.name] = CR
|
||||
|
||||
/datum/crafting_controller/proc/add_global_recipe(datum/crafting_recipe/CR)
|
||||
all_crafting_recipes[CR.name] = CR
|
||||
|
||||
/datum/crafting_controller/proc/remove_global_recipe(datum/crafting_recipe/CR)
|
||||
all_crafting_recipes[CR.name] = null
|
||||
all_crafting_recipes.Remove(CR.name)
|
||||
|
||||
/datum/crafting_controller/proc/add_family(name, list/members, list/recipes)
|
||||
var/datum/crafting_family/family = new(name, members, recipes)
|
||||
families[name] = family
|
||||
|
||||
/datum/crafting_controller/proc/get_family_by_name(name)
|
||||
return families[name]
|
||||
|
||||
/datum/crafting_controller/proc/add_member_to_family(family_name, member)
|
||||
var/datum/crafting_family/family = families[family_name]
|
||||
family.add_member(member)
|
||||
|
||||
/datum/crafting_controller/proc/add_recipe_to_family(family_name, datum/crafting_recipe/recipe)
|
||||
var/datum/crafting_family/family = families[family_name]
|
||||
family.add_recipe(recipe)
|
||||
|
||||
/datum/crafting_controller/proc/remove_recipe_from_family(family_name, datum/crafting_recipe/recipe)
|
||||
var/datum/crafting_family/family = families[family_name]
|
||||
family.remove_recipe(recipe)
|
||||
|
||||
/datum/crafting_controller/proc/remove_member(family_name, member)
|
||||
var/datum/crafting_family/family = families[family_name]
|
||||
family.remove_member(member)
|
||||
|
||||
/datum/crafting_controller/proc/remove_family(family_name)
|
||||
var/datum/crafting_family/family = families[family_name]
|
||||
del(family)
|
||||
|
||||
/datum/crafting_family
|
||||
var/name
|
||||
var/list/recipes
|
||||
var/list/members
|
||||
|
||||
/datum/crafting_family/New(new_name, list/new_members = list(), list/new_recipes = list())
|
||||
name = new_name
|
||||
recipes = new_recipes
|
||||
members = new_members
|
||||
|
||||
/datum/crafting_family/proc/add_member(datum/crafting_holder/member)
|
||||
members |= member
|
||||
member.family = src
|
||||
|
||||
/datum/crafting_family/proc/remove_member(datum/crafting_holder/member)
|
||||
members -= member
|
||||
member.family = null
|
||||
|
||||
/datum/crafting_family/proc/add_recipe(datum/crafting_recipe/recipe)
|
||||
recipes[recipe.name] = recipe
|
||||
|
||||
/datum/crafting_family/proc/remove_recipe(datum/crafting_recipe/recipe)
|
||||
recipes[recipe.name] = null
|
||||
recipes.Remove(recipe.name)
|
||||
|
||||
|
||||
/datum/crafting_holder
|
||||
var/name
|
||||
var/atom/holder
|
||||
var/recipes
|
||||
var/busy
|
||||
var/datum/crafting_family/family
|
||||
|
||||
/datum/crafting_holder/New(atom/location, family_name)
|
||||
location.craft_holder = src
|
||||
holder = location
|
||||
spawn(50)
|
||||
if(crafting_master)
|
||||
crafting_master.all_crafting_points |= src
|
||||
if(family_name)
|
||||
family = crafting_master.get_family_by_name(family_name)
|
||||
if(family)
|
||||
recipes = family.recipes
|
||||
|
||||
/datum/crafting_holder/proc/add_recipe(recipe)
|
||||
recipes |= recipe
|
||||
|
||||
/datum/crafting_holder/proc/remove_recipe(recipe)
|
||||
recipes -= recipe
|
||||
|
||||
/datum/crafting_holder/proc/deconstruct(mob/user, datum/crafting_recipe/R)
|
||||
if(!R.can_be_deconstructed)
|
||||
return
|
||||
var/list/result = list()
|
||||
var/list/holder_contents = check_holder()
|
||||
var/atom/movable/target = locate(R.result_path) in holder_contents
|
||||
if(!target)
|
||||
return
|
||||
if(check_tools(user, R, holder_contents))
|
||||
for(var/A in R.reqs)
|
||||
var/amount = R.reqs[A]
|
||||
if(ispath(A, /datum/reagent))
|
||||
for(var/obj/item/weapon/reagent_containers/RC in holder_contents)
|
||||
var/diff = RC.reagents.total_volume - RC.reagents.maximum_volume
|
||||
if(diff)
|
||||
diff = min(diff, amount)
|
||||
var/datum/reagent/C = new A()
|
||||
C.volume = diff
|
||||
RC.reagents.reagent_list.Add(C)
|
||||
RC.reagents.total_volume += diff
|
||||
result.Add(C)
|
||||
amount -= diff
|
||||
if(!amount)
|
||||
break
|
||||
else
|
||||
while(amount)
|
||||
result.Add(new A(holder.loc))
|
||||
amount--
|
||||
qdel(target)
|
||||
return result
|
||||
|
||||
/datum/crafting_holder/proc/check_contents(datum/crafting_recipe/R, list/holder_contents)
|
||||
main_loop:
|
||||
for(var/A in R.reqs)
|
||||
for(var/B in holder_contents)
|
||||
if(ispath(B, A))
|
||||
if(holder_contents[B] >= R.reqs[A])
|
||||
continue main_loop
|
||||
return 0
|
||||
for(var/A in R.chem_catalists)
|
||||
if(holder_contents[A] < R.chem_catalists[A])
|
||||
return 0
|
||||
return 1
|
||||
|
||||
/datum/crafting_holder/proc/check_holder()
|
||||
var/list/holder_contents = list()
|
||||
for(var/obj/I in holder.loc)
|
||||
if(istype(I, /obj/item/stack))
|
||||
var/obj/item/stack/S = I
|
||||
holder_contents[I.type] += S.amount
|
||||
else
|
||||
if(istype(I, /obj/item/weapon/reagent_containers))
|
||||
for(var/datum/reagent/R in I.reagents.reagent_list)
|
||||
holder_contents[R.type] += R.volume
|
||||
|
||||
holder_contents[I.type] += 1
|
||||
|
||||
return holder_contents
|
||||
|
||||
/datum/crafting_holder/proc/check_tools(mob/user, datum/crafting_recipe/R, list/holder_contents)
|
||||
if(!R.tools.len)
|
||||
return 1
|
||||
var/list/possible_tools = list()
|
||||
for(var/obj/item/I in user.contents)
|
||||
if(istype(I, /obj/item/weapon/storage))
|
||||
for(var/obj/item/SI in I.contents)
|
||||
possible_tools += SI.type
|
||||
else
|
||||
possible_tools += I.type
|
||||
possible_tools += holder_contents
|
||||
var/i = R.tools.len
|
||||
var/I
|
||||
for(var/A in R.tools)
|
||||
I = possible_tools.Find(A)
|
||||
if(I)
|
||||
possible_tools.Cut(I, I+1)
|
||||
i--
|
||||
else
|
||||
break
|
||||
return !i
|
||||
|
||||
/datum/crafting_holder/proc/construct_item(mob/user, datum/crafting_recipe/R)
|
||||
var/list/holder_contents = check_holder()
|
||||
if(check_contents(R, holder_contents) && check_tools(user, R, holder_contents))
|
||||
if(do_after(user, R.time))
|
||||
if(!check_contents(R, holder_contents) || !check_tools(user, R, holder_contents))
|
||||
return 0
|
||||
var/list/parts = del_reqs(R, holder_contents)
|
||||
var/atom/movable/I = new R.result_path
|
||||
for(var/A in parts)
|
||||
if(istype(A, /obj/item))
|
||||
var/atom/movable/B = A
|
||||
B.loc = I
|
||||
else
|
||||
if(!I.reagents)
|
||||
I.reagents = new /datum/reagents()
|
||||
I.reagents.reagent_list.Add(A)
|
||||
I.CheckParts()
|
||||
I.loc = holder.loc
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/datum/crafting_holder/proc/del_reqs(datum/crafting_recipe/R, list/holder_contents)
|
||||
var/list/Deletion = list()
|
||||
var/amt
|
||||
for(var/A in R.reqs)
|
||||
amt = R.reqs[A]
|
||||
if(ispath(A, /obj/item/stack))
|
||||
var/obj/item/stack/S
|
||||
stack_loop:
|
||||
for(var/B in holder_contents)
|
||||
if(ispath(B, A))
|
||||
while(amt > 0)
|
||||
S = locate(B) in holder.loc
|
||||
if(S.amount >= amt)
|
||||
S.use(amt)
|
||||
break stack_loop
|
||||
else
|
||||
amt -= S.amount
|
||||
qdel(S)
|
||||
else if(ispath(A, /obj/item))
|
||||
var/obj/item/I
|
||||
item_loop:
|
||||
for(var/B in holder_contents)
|
||||
if(ispath(B, A))
|
||||
while(amt > 0)
|
||||
I = locate(B) in holder.loc
|
||||
Deletion.Add(I)
|
||||
amt--
|
||||
break item_loop
|
||||
else
|
||||
var/datum/reagent/RG = new A
|
||||
reagent_loop:
|
||||
for(var/B in holder_contents)
|
||||
if(ispath(B, /obj/item/weapon/reagent_containers))
|
||||
var/obj/item/RC = locate(B) in holder.loc
|
||||
if(RC.reagents.has_reagent(RG.id, amt))
|
||||
RC.reagents.remove_reagent(RG.id, amt)
|
||||
RG.volume = amt
|
||||
Deletion.Add(RG)
|
||||
break reagent_loop
|
||||
else if(RC.reagents.has_reagent(RG.id))
|
||||
Deletion.Add(RG)
|
||||
RG.volume += RC.reagents.get_reagent_amount(RG.id)
|
||||
amt -= RC.reagents.get_reagent_amount(RG.id)
|
||||
RC.reagents.del_reagent(RG.id)
|
||||
|
||||
for(var/A in R.parts)
|
||||
for(var/B in Deletion)
|
||||
if(!istype(B, A))
|
||||
Deletion.Remove(B)
|
||||
qdel(B)
|
||||
return Deletion
|
||||
|
||||
/datum/crafting_holder/proc/interact(mob/user)
|
||||
var/list/holder_contents = check_holder()
|
||||
if(!holder_contents.len)
|
||||
return
|
||||
var/dat = "<h3>Construction menu</h3>"
|
||||
dat += "<div class='statusDisplay'>"
|
||||
if(busy)
|
||||
dat += "Construction inprogress...</div>"
|
||||
else
|
||||
for(var/A in recipes)
|
||||
var/datum/crafting_recipe/R = recipes[A]
|
||||
if(check_contents(R, holder_contents))
|
||||
dat += "<A href='?src=\ref[src];make=\ref[R]'>[R.name]</A><BR>"
|
||||
dat += "</div>"
|
||||
|
||||
var/datum/browser/popup = new(user, "craft", "Craft", 300, 300)
|
||||
popup.set_content(dat)
|
||||
popup.open()
|
||||
return
|
||||
|
||||
/datum/crafting_holder/Topic(href, href_list)
|
||||
if(usr.stat || !holder.Adjacent(usr) || usr.lying)
|
||||
return
|
||||
if(href_list["make"])
|
||||
if(busy)
|
||||
return
|
||||
busy = 1
|
||||
interact(usr)
|
||||
var/datum/crafting_recipe/TR = locate(href_list["make"])
|
||||
if(construct_item(usr, TR))
|
||||
usr << "<span class='notice'>[TR.name] constructed.</span>"
|
||||
else
|
||||
usr << "<span class ='warning'>Construction failed.</span>"
|
||||
busy = 0
|
||||
interact(usr)
|
||||
@@ -1,137 +0,0 @@
|
||||
//Basic crafting components -- Using cheap easily found items to create components that can be used to make more complex objects
|
||||
|
||||
/datum/crafting_recipe/table/igniter
|
||||
name = "Igniter"
|
||||
result_path = /obj/item/device/assembly/igniter
|
||||
reqs = list(/obj/item/weapon/lighter = 1,
|
||||
/obj/item/stack/cable_coil = 1)
|
||||
time = 20
|
||||
|
||||
/datum/crafting_recipe/table/voice
|
||||
name = "Voice analyzer"
|
||||
result_path = /obj/item/device/assembly/voice
|
||||
reqs = list(/obj/item/device/taperecorder = 1,
|
||||
/obj/item/stack/cable_coil = 1)
|
||||
time = 20
|
||||
|
||||
/datum/crafting_recipe/table/infra
|
||||
name = "Infrared Emitter"
|
||||
result_path = /obj/item/device/assembly/infra
|
||||
reqs = list(/obj/item/device/laser_pointer = 1,
|
||||
/obj/item/stack/cable_coil = 1)
|
||||
time = 20
|
||||
|
||||
//Medium crafting
|
||||
|
||||
/datum/crafting_recipe/table/IED
|
||||
name = "IED"
|
||||
result_path = /obj/item/weapon/grenade/iedcasing
|
||||
reqs = list(/obj/item/stack/cable_coil = 1,
|
||||
/obj/item/device/assembly/igniter = 1,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/cans = 1,
|
||||
/datum/reagent/fuel = 10)
|
||||
time = 80
|
||||
|
||||
/datum/crafting_recipe/table/stunprod
|
||||
name = "Stunprod"
|
||||
result_path = /obj/item/weapon/melee/baton/cattleprod
|
||||
reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1,
|
||||
/obj/item/stack/rods = 1,
|
||||
/obj/item/weapon/wirecutters = 1,
|
||||
/obj/item/weapon/stock_parts/cell = 1)
|
||||
time = 80
|
||||
parts = list(/obj/item/weapon/stock_parts/cell = 1)
|
||||
|
||||
/datum/crafting_recipe/table/flamethrower
|
||||
name = "Flamethrower"
|
||||
result_path = /obj/item/weapon/flamethrower
|
||||
reqs = list(/obj/item/weapon/weldingtool = 1,
|
||||
/obj/item/device/assembly/igniter = 1,
|
||||
/obj/item/stack/rods = 2)
|
||||
tools = list(/obj/item/weapon/screwdriver)
|
||||
time = 20
|
||||
|
||||
/datum/crafting_recipe/table/meteorshot
|
||||
name = "Meteorshot Shell"
|
||||
result_path = /obj/item/ammo_casing/shotgun/meteorshot
|
||||
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
|
||||
/obj/item/weapon/rcd_ammo = 1,
|
||||
/obj/item/weapon/stock_parts/manipulator = 2)
|
||||
tools = list(/obj/item/weapon/screwdriver)
|
||||
time = 5
|
||||
|
||||
/datum/crafting_recipe/table/pulseslug
|
||||
name = "Pulse Slug Shell"
|
||||
result_path = /obj/item/ammo_casing/shotgun/pulseslug
|
||||
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
|
||||
/obj/item/weapon/stock_parts/capacitor/adv = 2,
|
||||
/obj/item/weapon/stock_parts/micro_laser/ultra = 1)
|
||||
tools = list(/obj/item/weapon/screwdriver)
|
||||
time = 5
|
||||
|
||||
/datum/crafting_recipe/table/dragonsbreath
|
||||
name = "Dragonsbreath Shell"
|
||||
result_path = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
|
||||
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
|
||||
/datum/reagent/phosphorus = 5,)
|
||||
tools = list(/obj/item/weapon/screwdriver)
|
||||
time = 5
|
||||
|
||||
//Advanced crafting
|
||||
|
||||
/datum/crafting_recipe/table/ed209
|
||||
name = "ED209"
|
||||
result_path = /obj/machinery/bot/ed209
|
||||
reqs = list(/obj/item/robot_parts/robot_suit = 1,
|
||||
/obj/item/clothing/head/helmet = 1,
|
||||
/obj/item/clothing/suit/armor/vest = 1,
|
||||
/obj/item/robot_parts/l_leg = 1,
|
||||
/obj/item/robot_parts/r_leg = 1,
|
||||
/obj/item/stack/sheet/metal = 5,
|
||||
/obj/item/stack/cable_coil = 5,
|
||||
/obj/item/weapon/gun/energy/advtaser = 1,
|
||||
/obj/item/weapon/stock_parts/cell = 1,
|
||||
/obj/item/device/assembly/prox_sensor = 1,
|
||||
/obj/item/robot_parts/r_arm = 1)
|
||||
tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver)
|
||||
time = 120
|
||||
|
||||
/datum/crafting_recipe/table/secbot
|
||||
name = "Secbot"
|
||||
result_path = /obj/machinery/bot/secbot
|
||||
reqs = list(/obj/item/device/assembly/signaler = 1,
|
||||
/obj/item/clothing/head/helmet = 1,
|
||||
/obj/item/weapon/melee/baton = 1,
|
||||
/obj/item/device/assembly/prox_sensor = 1,
|
||||
/obj/item/robot_parts/r_arm = 1)
|
||||
tools = list(/obj/item/weapon/weldingtool)
|
||||
time = 120
|
||||
|
||||
/datum/crafting_recipe/table/cleanbot
|
||||
name = "Cleanbot"
|
||||
result_path = /obj/machinery/bot/cleanbot
|
||||
reqs = list(/obj/item/weapon/reagent_containers/glass/bucket = 1,
|
||||
/obj/item/device/assembly/prox_sensor = 1,
|
||||
/obj/item/robot_parts/r_arm = 1)
|
||||
time = 80
|
||||
|
||||
/datum/crafting_recipe/table/floorbot
|
||||
name = "Floorbot"
|
||||
result_path = /obj/machinery/bot/floorbot
|
||||
reqs = list(/obj/item/weapon/storage/toolbox/mechanical = 1,
|
||||
/obj/item/stack/tile/plasteel = 1,
|
||||
/obj/item/device/assembly/prox_sensor = 1,
|
||||
/obj/item/robot_parts/r_arm = 1)
|
||||
time = 80
|
||||
|
||||
/datum/crafting_recipe/table/medbot
|
||||
name = "Medbot"
|
||||
result_path = /obj/machinery/bot/medbot
|
||||
reqs = list(/obj/item/device/healthanalyzer = 1,
|
||||
/obj/item/weapon/storage/firstaid = 1,
|
||||
/obj/item/device/assembly/prox_sensor = 1,
|
||||
/obj/item/robot_parts/r_arm = 1)
|
||||
time = 80
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
@@ -1114,7 +1114,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
|
||||
/obj/item/device/camera_film,
|
||||
/obj/item/device/camera_film,
|
||||
/obj/item/weapon/storage/photo_album,
|
||||
/obj/item/weapon/packageWrap,
|
||||
/obj/item/stack/packageWrap,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/red,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/green,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/blue,
|
||||
@@ -1124,9 +1124,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
|
||||
/obj/item/weapon/reagent_containers/glass/paint/white,
|
||||
/obj/item/weapon/reagent_containers/glass/paint/remover,
|
||||
/obj/item/weapon/contraband/poster,
|
||||
/obj/item/weapon/wrapping_paper,
|
||||
/obj/item/weapon/wrapping_paper,
|
||||
/obj/item/weapon/wrapping_paper)
|
||||
/obj/item/stack/wrapping_paper,
|
||||
/obj/item/stack/wrapping_paper,
|
||||
/obj/item/stack/wrapping_paper)
|
||||
cost = 10
|
||||
containername = "Arts and Crafts crate"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user