Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crafting qols. #150

Merged
merged 10 commits into from
Aug 28, 2024
Merged

Crafting qols. #150

Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d650629
Update stack.dm
Helg2 Aug 27, 2024
e8d71a9
Update stack.dm
Helg2 Aug 27, 2024
c394ab9
Update stack.dm
Helg2 Aug 27, 2024
3ff4ccc
Update stack.dm
Helg2 Aug 27, 2024
28d31d0
Update stack.dm
Helg2 Aug 27, 2024
3b835eb
Update stack.dm
Helg2 Aug 27, 2024
4563c48
Update stack.dm
Helg2 Aug 27, 2024
f8090ed
Update stack.dm
Helg2 Aug 27, 2024
6ec0552
Merge branch 'master' into crafting-qol
Helg2 Aug 28, 2024
88ac535
Update stack.dm
Helg2 Aug 28, 2024
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
176 changes: 79 additions & 97 deletions code/game/objects/items/stacks/stack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
/* Stack type objects!
* Contains:
* Stacks
* Recipe datum
* Recipe list datum
*/

/*
* Stacks
*/
/obj/item/stack
icon = 'icons/obj/stack_objects.dmi'
gender = PLURAL
var/list/datum/stack_recipe/recipes
var/singular_name
var/stack_name = "stack"
var/amount = 1
var/max_amount = 50 //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount
var/merge_type // This path and its children should merge with this stack, defaults to src.type
var/number_of_extra_variants = 0 //Determines whether the item should update it's sprites based on amount.

///Also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount
var/max_amount = 50
///This path and its children should merge with this stack, defaults to src.type
var/merge_type
///Determines whether the item should update it's sprites based on amount.
var/number_of_extra_variants = 0

/obj/item/stack/Initialize(mapload, new_amount)
. = ..()
Expand All @@ -36,7 +28,6 @@
)
AddElement(/datum/element/connect_loc, connections)


/obj/item/stack/proc/update_weight()
var/percent = round((amount * 100) / max_amount)
var/full_w_class = initial(w_class)
Expand All @@ -54,7 +45,6 @@
w_class = new_w_class
loc?.recalculate_storage_space() //No need to do icon updates if there are no changes.


/obj/item/stack/update_icon_state()
. = ..()
if(!number_of_extra_variants)
Expand All @@ -74,13 +64,11 @@
number.maptext = MAPTEXT(amount)
. += number


/obj/item/stack/Destroy()
if(usr && usr.interactee == src)
usr << browse(null, "window=stack")
return ..()


/obj/item/stack/examine(mob/user)
. = ..()
if(amount > 1)
Expand Down Expand Up @@ -128,37 +116,36 @@
t1 += "<a href='?src=[REF(src)];sublist=[i]'>[srl.title]</a>"

if(istype(E, /datum/stack_recipe))
var/datum/stack_recipe/R = E
var/max_multiplier = round(get_amount() / R.req_amount)
var/datum/stack_recipe/recipe = E
var/max_multiplier = round(get_amount() / recipe.req_amount)
var/title
var/can_build = TRUE
can_build = can_build && (max_multiplier > 0)

if(R.res_amount > 1)
title += "[R.res_amount]x [R.title]\s"
if(recipe.res_amount > 1)
title += "[recipe.res_amount]x [recipe.title]\s"
else
title += "[R.title]"
title += " ([R.req_amount] [singular_name]\s)"
title += "[recipe.title]"
title += " ([recipe.req_amount] [singular_name]\s)"
if(can_build)
t1 += "<A href='?src=[REF(src)];sublist=[recipes_sublist];make=[i];multiplier=1'>[title]</A> "
else
t1 += "[title]"
continue
if(R.max_res_amount > 1 && max_multiplier > 1)
max_multiplier = min(max_multiplier, round(R.max_res_amount/R.res_amount))
if(recipe.max_res_amount > 1 && max_multiplier > 1)
max_multiplier = min(max_multiplier, round(recipe.max_res_amount / recipe.res_amount))
t1 += " |"
var/list/multipliers = list(5,10,25)
for(var/n in multipliers)
if(max_multiplier >= n)
t1 += " <A href='?src=[REF(src)];make=[i];multiplier=[n]'>[n*R.res_amount]x</A>"
t1 += " <A href='?src=[REF(src)];make=[i];multiplier=[n]'>[n * recipe.res_amount]x</A>"
if(!(max_multiplier in multipliers))
t1 += " <A href='?src=[REF(src)];make=[i];multiplier=[max_multiplier]'>[max_multiplier*R.res_amount]x</A>"
t1 += " <A href='?src=[REF(src)];make=[i];multiplier=[max_multiplier]'>[max_multiplier * recipe.res_amount]x</A>"

var/datum/browser/popup = new(user, "stack", name, 400, 400)
popup.set_content(t1)
popup.open()


/obj/item/stack/Topic(href, href_list)
. = ..()
if(.)
Expand All @@ -174,96 +161,96 @@
if(href_list["sublist"])
var/datum/stack_recipe_list/srl = recipes_list[text2num(href_list["sublist"])]
recipes_list = srl.recipes
var/datum/stack_recipe/R = recipes_list[text2num(href_list["make"])]
var/datum/stack_recipe/recipe = recipes_list[text2num(href_list["make"])]
var/multiplier = text2num(href_list["multiplier"])
var/max_multiplier = round(max_amount / R.req_amount)
var/max_multiplier = round(max_amount / recipe.req_amount)
if(multiplier <= 0 || multiplier > max_multiplier) //href protection
log_admin_private("[key_name(usr)] attempted to create a ([src]) stack ([R]) recipe with multiplier [multiplier] at [AREACOORD(usr.loc)].")
message_admins("[ADMIN_TPMONTY(usr)] attempted to create a ([src]) stack ([R]) recipe with multiplier [multiplier]. Possible HREF exploit.")
log_admin_private("[key_name(usr)] attempted to create a ([src]) stack ([recipe]) recipe with multiplier [multiplier] at [AREACOORD(usr.loc)].")
message_admins("[ADMIN_TPMONTY(usr)] attempted to create a ([src]) stack ([recipe]) recipe with multiplier [multiplier]. Possible HREF exploit.")
return

create_object(usr, R, multiplier)
create_object(usr, recipe, multiplier)


/// Creates multiplier amount of objects based off of stack recipe R. Most creation variables are changed through stack recipe datum's variables
/obj/item/stack/proc/create_object(mob/user, datum/stack_recipe/R, multiplier)
/// Creates multiplier amount of objects based off oт stack recipe. Most creation variables are changed through stack recipe datum's variables
/obj/item/stack/proc/create_object(mob/user, datum/stack_recipe/recipe, multiplier)
if(user.get_active_held_item() != src)
return
if(!can_interact(user))
return TRUE
if(!building_checks(user, R, multiplier))
if(!building_checks(user, recipe, multiplier))
return
if(user.do_actions)
return
var/building_time = R.time
if(R.skill_req && user.skills.getRating(SKILL_CONSTRUCTION) < R.skill_req)
//building_time += R.time * ( R.skill_req - user.skills.getRating(SKILL_CONSTRUCTION) ) * 0.5 // +50% time each skill point lacking.
building_time += R.time * ( R.skill_req - user.skills.getRating(SKILL_CONSTRUCTION) ) * 0.2 // RUTGMC EDIT CHANGE
if(R.skill_req && user.skills.getRating(SKILL_CONSTRUCTION) > R.skill_req)
//building_time -= clamp(R.time * ( user.skills.getRating(SKILL_CONSTRUCTION) - R.skill_req ) * 0.40, 0 , 0.85 * building_time) // -40% time each extra skill point
building_time -= clamp(R.time * ( user.skills.getRating(SKILL_CONSTRUCTION) - R.skill_req ) * 0.20, 0 , 0.85 * building_time) // RUTGMC EDIT CHANGE
var/building_time = recipe.time
if(recipe.skill_req && user.skills.getRating(SKILL_CONSTRUCTION) < recipe.skill_req)
building_time += recipe.time * (recipe.skill_req - user.skills.getRating(SKILL_CONSTRUCTION)) * 0.5
if(recipe.skill_req && user.skills.getRating(SKILL_CONSTRUCTION) > recipe.skill_req)
building_time -= clamp(recipe.time * (user.skills.getRating(SKILL_CONSTRUCTION) - recipe.skill_req) * 0.40, 0 , 0.85 * building_time)
if(building_time)
balloon_alert_to_viewers("building [R.title]")
if(!do_after(user, building_time, NONE, src, (building_time > R.time ? BUSY_ICON_UNSKILLED : BUSY_ICON_BUILD)))
balloon_alert_to_viewers("building [recipe.title]")
if(!do_after(user, building_time, NONE, src, (building_time > recipe.time ? BUSY_ICON_UNSKILLED : BUSY_ICON_BUILD)))
return
if(!building_checks(user, R, multiplier))
if(!building_checks(user, recipe, multiplier))
return

var/obj/O
if(R.max_res_amount > 1) //Is it a stack?
O = new R.result_type(get_turf(user), R.res_amount * multiplier)
else if(ispath(R.result_type, /turf))
var/turf/T = get_turf(user)
if(!isturf(T))
var/obj/object
if(recipe.max_res_amount > 1) //Is it a stack?
object = new recipe.result_type(get_turf(user), recipe.res_amount * multiplier)
else if(ispath(recipe.result_type, /turf))
var/turf/our_turf = get_turf(user)
if(!isturf(our_turf))
return
T.PlaceOnTop(R.result_type)
our_turf.PlaceOnTop(recipe.result_type)
else
O = new R.result_type(get_turf(user))
if(O)
O.setDir(user.dir)
O.color = color
use(R.req_amount * multiplier)
object = new recipe.result_type(get_turf(user))
if(object)
object.setDir(user.dir)
object.color = color
use(recipe.req_amount * multiplier)

if(QDELETED(O))
if(QDELETED(object))
return //It's a stack and has already been merged

if(isitem(O))
user.put_in_hands(O)
if(isitem(object))
if(isitemstack(object))
var/obj/item/stack/merged_item = object
var/obj/item/stack/stacked_item = user.is_holding_item_of_type(merged_item.merge_type)
if(stacked_item && merged_item.merge(stacked_item))
return
user.put_in_hands(object)

//BubbleWrap - so newly formed boxes are empty
if(istype(O, /obj/item/storage))
for(var/obj/item/I in O)
if(istype(object, /obj/item/storage))
for(var/obj/item/I in object)
qdel(I)
//BubbleWrap END

if(istype(O, /obj/structure))
if(istype(object, /obj/structure))
user.record_structures_built()

/obj/item/stack/proc/building_checks(mob/user, datum/stack_recipe/R, multiplier)
if (get_amount() < R.req_amount*multiplier)
if (R.req_amount*multiplier>1)
to_chat(user, span_warning("You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!"))
/obj/item/stack/proc/building_checks(mob/user, datum/stack_recipe/recipe, multiplier)
if(get_amount() < recipe.req_amount*multiplier)
if(recipe.req_amount*multiplier>1)
to_chat(user, span_warning("You haven't got enough [src] to build \the [recipe.req_amount*multiplier] [recipe.title]\s!"))
else
to_chat(user, span_warning("You haven't got enough [src] to build \the [R.title]!"))
to_chat(user, span_warning("You haven't got enough [src] to build \the [recipe.title]!"))
return FALSE
var/turf/T = get_turf(user)

switch(R.max_per_turf)
switch(recipe.max_per_turf)
if(STACK_RECIPE_ONE_PER_TILE)
if(locate(R.result_type) in T)
to_chat(user, span_warning("There is another [R.title] here!"))
if(locate(recipe.result_type) in T)
to_chat(user, span_warning("There is another [recipe.title] here!"))
return FALSE
if(STACK_RECIPE_ONE_DIRECTIONAL_PER_TILE)
for(var/obj/thing in T)
if(!istype(thing, R.result_type))
if(!istype(thing, recipe.result_type))
continue
if(thing.dir != user.dir)
continue
to_chat(user, span_warning("You can't build \the [R.title] on top of another!"))
to_chat(user, span_warning("You can't build \the [recipe.title] on top of another!"))
return FALSE
if(R.on_floor)
if(recipe.on_floor)
if(!isfloorturf(T) && !isbasalt(T) && !islavacatwalk(T) && !isopengroundturf(T))
to_chat(user, span_warning("\The [R.title] must be constructed on the floor!"))
to_chat(user, span_warning("\The [recipe.title] must be constructed on the floor!"))
return FALSE
for(var/obj/AM in T)
if(istype(AM,/obj/structure/grille))
Expand All @@ -279,11 +266,10 @@
continue
else
continue
to_chat(user, span_warning("There is a [AM.name] right where you want to place \the [R.title], blocking the construction."))
to_chat(user, span_warning("There is a [AM.name] right where you want to place \the [recipe.title], blocking the construction."))
return FALSE
return TRUE


/obj/item/stack/use(used)
if(used > amount) //If it's larger than what we have, no go.
return FALSE
Expand All @@ -294,14 +280,12 @@
update_weight()
return TRUE


/obj/item/stack/proc/zero_amount()
if(amount < 1)
qdel(src)
return TRUE
return FALSE


/obj/item/stack/proc/add(extra)
if(amount + extra > max_amount)
return FALSE
Expand All @@ -310,11 +294,9 @@
update_weight()
return TRUE


/obj/item/stack/proc/get_amount()
return amount


/obj/item/stack/proc/add_to_stacks(mob/user)
for(var/obj/item/stack/S in get_turf(user))
if(S.merge_type != merge_type)
Expand All @@ -323,30 +305,28 @@
if(QDELETED(src))
return


/obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible
if(QDELETED(S) || QDELETED(src) || S == src) //amusingly this can cause a stack to consume itself, let's not allow that.
/obj/item/stack/proc/merge(obj/item/stack/stackable) //Merge src into S, as much as possible
if(QDELETED(stackable) || QDELETED(src) || stackable == src) //amusingly this can cause a stack to consume itself, let's not allow that.
return
if(amount == max_amount) // don't do useless swapping
return
var/max_transfer = loc.max_stack_merging(S) //We don't want to bypass the max size the container allows.
var/transfer = min(get_amount(), (max_transfer ? max_transfer : S.max_amount) - S.amount)
S.add(transfer)
var/max_transfer = loc.max_stack_merging(stackable) //We don't want to bypass the max size the container allows.
var/transfer = min(get_amount(), (max_transfer ? max_transfer : stackable.max_amount) - stackable.amount)
stackable.add(transfer)
use(transfer)
return transfer


/obj/item/stack/proc/on_cross(datum/source, obj/item/stack/S, oldloc, oldlocs)
SIGNAL_HANDLER
if(istype(S, merge_type) && !S.throwing)
merge(S)


//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/stack/attack_hand(mob/living/user)
if(user.get_inactive_held_item() == src)
return change_stack(user, 1)
return ..()


/obj/item/stack/AltClick(mob/user)
if(isxeno(user))
return ..()
Expand All @@ -359,7 +339,6 @@
change_stack(user, stackmaterial)
to_chat(user, span_notice("You take [stackmaterial] sheets out of the stack"))


/obj/item/stack/proc/change_stack(mob/user, new_amount)
if(amount < 1 || amount < new_amount)
stack_trace("[src] tried to change_stack() by [new_amount] amount for [user] user, while having [amount] amount itself.")
Expand All @@ -368,7 +347,6 @@
use(new_amount)
user.put_in_hands(S)


/obj/item/stack/attackby(obj/item/I, mob/user)
if(istype(I, merge_type))
var/obj/item/stack/S = I
Expand All @@ -381,6 +359,10 @@
/obj/item/stack/proc/select_radial(mob/user)
return TRUE

/obj/item/stack/dropped(mob/user)
add_to_stacks(user)
Helg2 marked this conversation as resolved.
Show resolved Hide resolved
return ..()

/*
* Recipe datum
*/
Expand Down
Loading