Merge pull request #48616 from cacogen/wayfindingpinpointers

Fixes wayfinder dispenser sprite/lowers amount of pinpointers from it/adds pinpointer recycling
This commit is contained in:
skoglol
2020-01-17 10:58:27 +01:00
committed by GitHub
4 changed files with 124 additions and 17 deletions
@@ -1,3 +1,4 @@
#define EXP_ASSIGN_WAYFINDER 1200
//Used to process and handle roundstart quirks
// - Quirk strings are used for faster checking in code
// - Quirk datums are stored and hold different effects, as well as being a vector for applying trait string
@@ -43,5 +44,5 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
cli.prefs.save_character()
// Assign wayfinding pinpointer granting quirk if they're new
if(cli.get_exp_living(TRUE) < 1200 && !user.has_quirk(/datum/quirk/needswayfinder))
if(cli.get_exp_living(TRUE) < EXP_ASSIGN_WAYFINDER && !user.has_quirk(/datum/quirk/needswayfinder))
user.add_quirk(/datum/quirk/needswayfinder, TRUE)
+3
View File
@@ -150,6 +150,9 @@
var/mob/living/carbon/human/H = quirk_holder
wayfinder = new /obj/item/pinpointer/wayfinding
wayfinder.owner = H.real_name
wayfinder.roundstart = TRUE
var/list/slots = list(
"in your left pocket" = ITEM_SLOT_LPOCKET,
"in your right pocket" = ITEM_SLOT_RPOCKET,
+119 -16
View File
@@ -1,32 +1,135 @@
/obj/machinery/pinpointer_dispenser
name = "wayfinding pinpointer dispenser"
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "ticketmachine"
desc = "Having trouble finding your way? This machine dispenses pinpointers that point to common locations."
name = "wayfinding pinpointer synthesizer"
icon = 'icons/obj/machines/wayfinding.dmi'
icon_state = "pinpointersynth"
desc = "Having trouble finding your way? This machine synthesizes pinpointers that point to common locations."
density = FALSE
layer = HIGH_OBJ_LAYER
var/list/obj/item/pinpointer/wayfinding/pinpointers = list()
var/spawn_cooldown = 1200 //deciseconds per person to spawn another pinpointer
var/list/user_spawn_cooldowns = list()
var/list/user_interact_cooldowns = list()
var/spawn_cooldown = 5 MINUTES //time per person to spawn another pinpointer
var/interact_cooldown = 20 SECONDS //time per person for subsequent interactions
var/start_bal = 200 //how much money it starts with to cover wayfinder refunds
var/refund_amt = 40 //how much money recycling a pinpointer rewards you
var/datum/bank_account/synth_acc = new /datum/bank_account/remote
var/ppt_cost = 65 //Jan 6 '20: Assistant can buy one roundstart (125 cr starting)
var/expression_timer
/obj/machinery/pinpointer_dispenser/Initialize(mapload)
..()
var/datum/bank_account/civ_acc = SSeconomy.get_dep_account(ACCOUNT_CIV)
if(civ_acc)
synth_acc.transfer_money(civ_acc, start_bal) //float has to come from somewhere, right?
synth_acc.account_holder = name
desc += " Only [ppt_cost] credits! It also likes making costumes..."
set_expression("neutral")
/obj/machinery/pinpointer_dispenser/attack_hand(mob/living/carbon/user)
if(world.time < pinpointers[user.real_name])
var/secsleft = (pinpointers[user.real_name] - world.time) / 10
to_chat(user, "<span class='warning'>You need to wait [secsleft/60 > 1 ? "[round(secsleft/60)] minute\s" : "[round(secsleft)] second\s"].</span>")
if(world.time < user_interact_cooldowns[user.real_name])
to_chat(user, "<span class='warning'>It doesn't respond.</span>")
return
to_chat(user, "<span class='notice'>You take a pinpointer from [src].</span>")
user_interact_cooldowns[user.real_name] = world.time + interact_cooldown
var/obj/item/pinpointer/wayfinding/P = new /obj/item/pinpointer/wayfinding(get_turf(src))
user.put_in_hands(P)
P.owner = user.real_name
pinpointers[user.real_name] = world.time + spawn_cooldown
for(var/obj/item/pinpointer/wayfinding/WP in user.GetAllContents())
set_expression("unsure", 2 SECONDS)
say("<span class='robot'>I can detect the pinpointer on you, [user.first_name()].</span>")
user_spawn_cooldowns[user.real_name] = world.time + spawn_cooldown //spawn timer resets for trickers
return
/obj/item/pinpointer/wayfinding //For new players or new stations to help players find their way around
var/msg
var/dispense = TRUE
var/obj/item/pinpointer/wayfinding/pointat
for(var/obj/item/pinpointer/wayfinding/WP in range(7, user))
if(WP.Adjacent(user))
set_expression("facepalm", 2 SECONDS)
say("<span class='robot'>[WP.owner == user.real_name ? "Your" : "A"] pinpointer is right there.</span>")
pointat(WP)
user_spawn_cooldowns[user.real_name] = world.time + spawn_cooldown
return
else if(WP in oview(7, user))
pointat = WP
break
if(world.time < user_spawn_cooldowns[user.real_name])
var/secsleft = (user_spawn_cooldowns[user.real_name] - world.time) / 10
msg += "to wait another [secsleft/60 > 1 ? "[round(secsleft/60,1)] minute\s" : "[round(secsleft)] second\s"]"
dispense = FALSE
var/datum/bank_account/cust_acc = null
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.get_bank_account())
cust_acc = H.get_bank_account()
if(cust_acc)
if(!cust_acc.has_money(ppt_cost))
msg += "[!msg ? "to find [ppt_cost-cust_acc.account_balance] more credit\s" : " and find [ppt_cost-cust_acc.account_balance] more credit\s"]"
dispense = FALSE
if(!dispense)
set_expression("sad", 2 SECONDS)
if(pointat)
msg += ". I suggest you get [pointat.owner == user.real_name ? "your" : "that"] pinpointer over there instead"
pointat(pointat)
say("<span class='robot'>You will need [msg], [user.first_name()].</span>")
return
if(synth_acc.transfer_money(cust_acc, ppt_cost))
set_expression("veryhappy", 2 SECONDS)
say("<span class='robot'>That is [ppt_cost] credits. Here is your pinpointer.</span>")
var/obj/item/pinpointer/wayfinding/P = new /obj/item/pinpointer/wayfinding(get_turf(src))
user_spawn_cooldowns[user.real_name] = world.time + spawn_cooldown
user.put_in_hands(P)
P.owner = user.real_name
/obj/machinery/pinpointer_dispenser/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/pinpointer/wayfinding))
var/obj/item/pinpointer/wayfinding/WP = I
to_chat(user, "<span class='notice'>You put \the [WP] in the return slot.</span>")
var/rfnd_amt
if((!WP.roundstart || WP.owner != user.real_name) && synth_acc.has_money(TRUE)) //can't recycle own pinpointer for money if not bought; given by a neutral quirk
if(synth_acc.has_money(refund_amt))
rfnd_amt = refund_amt
else
rfnd_amt = synth_acc.account_balance
synth_acc._adjust_money(-rfnd_amt)
var/obj/item/holochip/HC = new /obj/item/holochip(user.loc)
HC.credits = rfnd_amt
HC.name = "[HC.credits] credit holochip"
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
H.put_in_hands(HC)
else
var/crap = pick(subtypesof(/obj/effect/spawner/bundle/costume)) //harmless garbage some people may appreciate
new crap(user.loc)
qdel(WP)
set_expression("happy", 2 SECONDS)
say("<span class='robot'>Thank you for recycling, [user.first_name()]! Here is [rfnd_amt ? "[rfnd_amt] credits." : "a freshly synthesized costume!"]</span>")
/obj/machinery/pinpointer_dispenser/proc/set_expression(type, duration)
cut_overlays()
deltimer(expression_timer)
add_overlay(type)
if(duration)
expression_timer = addtimer(CALLBACK(src, .proc/set_expression, "neutral"), duration, TIMER_STOPPABLE)
/obj/machinery/pinpointer_dispenser/proc/pointat(atom)
visible_message("<span class='name'>[src]</span> points at [atom].")
new /obj/effect/temp_visual/point(atom,invisibility)
//Pinpointer itself
/obj/item/pinpointer/wayfinding //Help players new to a station find their way around
name = "wayfinding pinpointer"
desc = "A handheld tracking device that points to useful places."
icon_state = "pinpointer_crew"
resistance_flags = NONE
var/owner = null
var/list/beacons = list()
var/roundstart = FALSE
/obj/item/pinpointer/wayfinding/attack_self(mob/living/user)
if(active)
@@ -70,6 +173,6 @@
if(!target) //target can be set to null from above code, or elsewhere
active = FALSE
//Navbeacon that initialises with wayfinding codes
/obj/machinery/navbeacon/wayfinding
wayfinding = TRUE
Binary file not shown.

After

Width:  |  Height:  |  Size: 982 B