From d44a11b73999b43e9036a6d7207e13e40bb93340 Mon Sep 17 00:00:00 2001 From: mel-byond <75690100+mel-byond@users.noreply.github.com> Date: Thu, 7 Jan 2021 21:35:19 +0200 Subject: [PATCH 1/5] Add HUD icons for people in Soulcatchers --- icons/mob/screen_nifsc.dmi | Bin 0 -> 13878 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/mob/screen_nifsc.dmi diff --git a/icons/mob/screen_nifsc.dmi b/icons/mob/screen_nifsc.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ec94dbb8e9b5c98f028a4d65ec7949157e234acf GIT binary patch literal 13878 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 Z)+r)lm)Na=e*^>FSJzg{yYtfb{{V&ZP$d8W literal 0 HcmV?d00001 From 5e2253ee457eaac3865b49685da0a941a55e7995 Mon Sep 17 00:00:00 2001 From: mel-byond <75690100+mel-byond@users.noreply.github.com> Date: Thu, 7 Jan 2021 22:42:02 +0200 Subject: [PATCH 2/5] Attempt at making a new HUD for Soulcatcher guests --- code/_onclick/hud/_defines.dm | 7 ++ code/_onclick/hud/soulcatcher_guest.dm | 92 ++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 code/_onclick/hud/soulcatcher_guest.dm diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index d31a64dcda6..247d1d3f8bf 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -161,6 +161,13 @@ #define ui_ghost_pai "SOUTH: 6,CENTER+2:24" #define ui_ghost_updown "SOUTH: 6,CENTER+3:24" +// NIF Soulcatcher guest ones +#define ui_nifsc_reenter "SOUTH:6,CENTER-3:24" +#define ui_nifsc_arproj "SOUTH:6,CENTER-2:24" +#define ui_nifsc_jumptoowner "SOUTH:6,CENTER-1:24" +#define ui_nifsc_nme "SOUTH:6,CENTER:24" +#define ui_nifsc_nsay "SOUTH:6,CENTER+1:24" + // Rig panel #define ui_rig_deco1 "WEST:-7, SOUTH+5" #define ui_rig_deco2 "WEST:-7, SOUTH+6" diff --git a/code/_onclick/hud/soulcatcher_guest.dm b/code/_onclick/hud/soulcatcher_guest.dm new file mode 100644 index 00000000000..b21b473779f --- /dev/null +++ b/code/_onclick/hud/soulcatcher_guest.dm @@ -0,0 +1,92 @@ +/obj/screen/nifsc + icon = 'icons/mob/screen_nifsc.dmi' + +/obj/screen/nifsc/MouseEntered(location,control,params) + flick(icon_state + "_anim", src) + openToolTip(usr, src, params, title = name, content = desc) + +/obj/screen/nifsc/MouseExited() + closeToolTip(usr) + +/obj/screen/nifsc/Click() + closeToolTip(usr) + +/obj/screen/nifsc/reenter + name = "Re-enter NIF" + desc = "Return into the NIF" + icon_state = "reenter" + +/obj/screen/nifsc/reenter/Click() + reenter_soulcatcher() + +/obj/screen/nifsc/arproj + name = "AR project" + desc = "Project your form into Augmented Reality for those around your predator with the appearance of your loaded character." + icon_state = "arproj" + +/obj/screen/nifsc/arproj/Click() + ar_project() + +/obj/screen/nifsc/jumptoowner + name = "Jump back to host" + desc = "Jumb back to the Soulcather host" + icon_state = "jump" + +/obj/screen/nifsc/jumptoowner/Click() + jump_to_owner() + +/obj/screen/nifsc/nme + name = "Emote into Soulcatcher" + desc = "Emote into the NIF's Soulcatcher (circumventing AR emoting)" + icon_state = "nme" + +/obj/screen/nifsc/nme/Click() + nme() + +/obj/screen/nifsc/nsay + name = "Speak into Soulcatcher" + desc = "Speak into the NIF's Soulcatcher (circumventing AR speaking)" + icon_state = "nsay" + +/obj/screen/nifsc/nsay/Click() + nsay() + + +/mob/living/carbon/brain/caught_soul/create_mob_hud(datum/hud/HUD, apply_to_client = TRUE) + ..() + + var/list/adding = list() + HUD.adding = adding + + var/obj/screen/using + + using = new /obj/screen/nifsc/reenter() + using.screen_loc = ui_nifsc_reenter + using.hud = src + adding += using + + using = new /obj/screen/nifsc/arproj() + using.screen_loc = ui_nifsc_arproj + using.hud = src + adding += using + + using = new /obj/screen/nifsc/jumptoowner() + using.screen_loc = ui_nifsc_jumptoowner + using.hud = src + adding += using + + using = new /obj/screen/nifsc/nme() + using.screen_loc = ui_nifsc_nme + using.hud = src + adding += using + + using = new /obj/screen/nifsc/nsay() + using.screen_loc = ui_nifsc_nsay + using.hud = src + adding += using + + + if(client && apply_to_client) + client.screen = list() + client.screen += HUD.adding + client.screen += client.void From a74b621feaf46282b3f9d04010ebb336ac49c731 Mon Sep 17 00:00:00 2001 From: mel-byond <75690100+mel-byond@users.noreply.github.com> Date: Thu, 7 Jan 2021 23:30:07 +0200 Subject: [PATCH 3/5] Testing if changing it to caught_soul/brainmob works --- code/_onclick/hud/soulcatcher_guest.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/hud/soulcatcher_guest.dm b/code/_onclick/hud/soulcatcher_guest.dm index b21b473779f..27c0d6151f2 100644 --- a/code/_onclick/hud/soulcatcher_guest.dm +++ b/code/_onclick/hud/soulcatcher_guest.dm @@ -52,7 +52,7 @@ nsay() -/mob/living/carbon/brain/caught_soul/create_mob_hud(datum/hud/HUD, apply_to_client = TRUE) +/mob/living/carbon/brain/caught_soul/brainmob/create_mob_hud(datum/hud/HUD, apply_to_client = TRUE) ..() var/list/adding = list() From 7133e7b53a8a15a86c81bf1a55a6adfd53bb7bef Mon Sep 17 00:00:00 2001 From: Melli <75690100+mel-byond@users.noreply.github.com> Date: Sat, 9 Jan 2021 17:18:12 +0200 Subject: [PATCH 4/5] Fixing create_mob_hud(), apparently forgot about something that was copied over --- code/_onclick/hud/soulcatcher_guest.dm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/code/_onclick/hud/soulcatcher_guest.dm b/code/_onclick/hud/soulcatcher_guest.dm index 27c0d6151f2..555bcb8ebaf 100644 --- a/code/_onclick/hud/soulcatcher_guest.dm +++ b/code/_onclick/hud/soulcatcher_guest.dm @@ -17,7 +17,9 @@ icon_state = "reenter" /obj/screen/nifsc/reenter/Click() - reenter_soulcatcher() + ..() + var/mob/living/carbon/brain/caught_soul/CS = usr + CS.reenter_soulcatcher() /obj/screen/nifsc/arproj name = "AR project" @@ -25,7 +27,9 @@ icon_state = "arproj" /obj/screen/nifsc/arproj/Click() - ar_project() + ..() + var/mob/living/carbon/brain/caught_soul/CS = usr + CS.ar_project() /obj/screen/nifsc/jumptoowner name = "Jump back to host" @@ -33,7 +37,9 @@ icon_state = "jump" /obj/screen/nifsc/jumptoowner/Click() - jump_to_owner() + ..() + var/mob/living/carbon/brain/caught_soul/CS = usr + CS.jump_to_owner() /obj/screen/nifsc/nme name = "Emote into Soulcatcher" @@ -41,7 +47,9 @@ icon_state = "nme" /obj/screen/nifsc/nme/Click() - nme() + ..() + var/mob/living/carbon/brain/caught_soul/CS = usr + CS.nme() /obj/screen/nifsc/nsay name = "Speak into Soulcatcher" @@ -49,10 +57,12 @@ icon_state = "nsay" /obj/screen/nifsc/nsay/Click() - nsay() + ..() + var/mob/living/carbon/brain/caught_soul/CS = usr + CS.nsay() -/mob/living/carbon/brain/caught_soul/brainmob/create_mob_hud(datum/hud/HUD, apply_to_client = TRUE) +/mob/living/carbon/brain/caught_soul/create_mob_hud(datum/hud/HUD, apply_to_client = TRUE) ..() var/list/adding = list() From 158f065db7ee0c246340cbbc4611f99a201a9678 Mon Sep 17 00:00:00 2001 From: Melli <75690100+mel-byond@users.noreply.github.com> Date: Sat, 9 Jan 2021 17:20:43 +0200 Subject: [PATCH 5/5] Update vorestation.dme to include soulcatcher_guest.dm --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index effeef8fc06..bf6933aa44a 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -179,6 +179,7 @@ #include "code\_onclick\hud\screen_objects.dm" #include "code\_onclick\hud\screen_objects_vr.dm" #include "code\_onclick\hud\skybox.dm" +#include "code\_onclick\hud\soulcatcher_guest.dm" #include "code\_onclick\hud\spell_screen_objects.dm" #include "code\ATMOSPHERICS\_atmos_setup.dm" #include "code\ATMOSPHERICS\_atmospherics_helpers.dm"