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

when loading into a pAI card you can now choose to use a saved name and description #6211

Merged
merged 10 commits into from
Dec 23, 2023
Merged

when loading into a pAI card you can now choose to use a saved name and description #6211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
26cc55e
this does not go here
timothyteakettle Dec 20, 2023
d3fdb9d
move attack_ghost for pai cards to the paicard file and then allow na…
timothyteakettle Dec 20, 2023
fdd95ea
give it a type this isnt python you goobert
timothyteakettle Dec 20, 2023
3d0f6d0
Update paicard.dm
timothyteakettle Dec 20, 2023
8a51239
fix 1: the pref can be null
timothyteakettle Dec 20, 2023
a4b2651
fix 2: stop trying to set desc if option for it isnt chosen
timothyteakettle Dec 20, 2023
642633e
lets see if this appeases linters
timothyteakettle Dec 20, 2023
bf0c23f
Update paicard.dm
timothyteakettle Dec 20, 2023
b158240
Update paicard.dm
timothyteakettle Dec 20, 2023
3c90776
Update paicard.dm
timothyteakettle Dec 20, 2023
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
23 changes: 0 additions & 23 deletions code/game/click/observer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,26 +99,3 @@

*/

//! ## VR FILE MERGE ## !//
/obj/item/paicard/attack_ghost(mob/user)
. = ..()
if(src.pai != null) //Have a person in them already?
user.examinate(src)
return
var/choice = input(user, "You sure you want to inhabit this PAI?") in list("Yes", "No")
var/pai_name = input(user, "Choose your character's name", "Character Name") as text
var/actual_pai_name = sanitize_species_name(pai_name)
var/pai_key
if (isnull(pai_name))
return
if(choice == "Yes")
pai_key = user.key
else
return
var/turf/location = get_turf(src)
var/obj/item/paicard/card = new(location)
var/mob/living/silicon/pai/pai = new(card)
qdel(src)
pai.key = pai_key
card.setPersonality(pai)
pai.SetName(actual_pai_name)
42 changes: 42 additions & 0 deletions code/game/objects/items/devices/paicard.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,3 +383,45 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard)
/obj/item/paicard/proc/stop_displaying_hologram()
displaying_hologram = FALSE
update_icons()

/// Handling for ghosts going into empty pAI cards
/obj/item/paicard/attack_ghost(mob/user)
. = ..()

if(src.pai != null) //Have a person in them already?
user.examinate(src)
return

var/datum/category_item/player_setup_item/player_global/pai/pai_pref = user.client.prefs.preference_by_type[/datum/category_item/player_setup_item/player_global/pai]
var/datum/paiCandidate/prefs = pai_pref?.candidate
var/has_pAI_data = !isnull(prefs) && !isnull(prefs.name)
var/options = (has_pAI_data ? list("Yes (As [prefs.name])") : list()) + list("Yes (Pick Name)", "No")

var/choice = input(user, "Do you wish to inhabit this PAI?") in options
if(choice == "No" || isnull(choice))
return

var/pai_name
var/actual_pai_name

if(choice == "Yes (Pick Name)")
pai_name = input(user, "Choose your character's name", "Character Name") as text
actual_pai_name = sanitize_species_name(pai_name)
else
actual_pai_name = sanitize_species_name(prefs.name)

if(isnull(actual_pai_name))
return

var/pai_key = user.key
var/turf/location = get_turf(src)
var/obj/item/paicard/card = new(location)
var/mob/living/silicon/pai/pai = new(card)
qdel(src)

if(choice != "Yes (Pick Name)")
pai.desc = prefs.description

pai.key = pai_key
card.setPersonality(pai)
pai.SetName(actual_pai_name)
Loading