From 54da8c9bc43824634c3b9f5a4dcc79153a45091a Mon Sep 17 00:00:00 2001 From: John Doe Date: Tue, 1 Aug 2023 16:09:15 -0700 Subject: [PATCH 1/3] fixes pred minimap --- code/__DEFINES/minimap.dm | 3 ++- code/modules/cm_preds/yaut_bracers.dm | 15 +++++++++++++++ icons/ui_icons/map_blips.dmi | Bin 2672 -> 2849 bytes 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm index 9069ed323357..ca6d9718cd0c 100644 --- a/code/__DEFINES/minimap.dm +++ b/code/__DEFINES/minimap.dm @@ -4,7 +4,8 @@ #define MINIMAP_FLAG_PMC (1<<2) #define MINIMAP_FLAG_UPP (1<<3) #define MINIMAP_FLAG_CLF (1<<4) -#define MINIMAP_FLAG_ALL (1<<5) - 1 +#define MINIMAP_FLAG_YAUTJA (1<<5) +#define MINIMAP_FLAG_ALL (1<<6) - 1 ///Converts the overworld x and y to minimap x and y values #define MINIMAP_SCALE 2 diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index f33d5f9a5554..dd68dd74cd21 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -46,6 +46,8 @@ var/mob/living/carbon/human/owner //Pred spawned on, or thrall given to. var/obj/item/clothing/gloves/yautja/linked_bracer //Bracer linked to this one (thrall or mentor). COOLDOWN_DECLARE(bracer_recharge) + /// What minimap icon this bracer should have + var/minimap_icon = "predator" /obj/item/clothing/gloves/yautja/equipped(mob/user, slot) . = ..() @@ -54,6 +56,8 @@ if(!owner) owner = user toggle_lock_internal(user, TRUE) + RegisterSignal(user, list(COMSIG_MOB_STAT_SET_ALIVE, COMSIG_MOB_DEATH), PROC_REF(update_minimap_icon)) + INVOKE_NEXT_TICK(src, PROC_REF(update_minimap_icon), user) /obj/item/clothing/gloves/yautja/Destroy() STOP_PROCESSING(SSobj, src) @@ -65,6 +69,8 @@ /obj/item/clothing/gloves/yautja/dropped(mob/user) STOP_PROCESSING(SSobj, src) flags_item = initial(flags_item) + UnregisterSignal(user, list(COMSIG_MOB_STAT_SET_ALIVE, COMSIG_MOB_DEATH)) + SSminimaps.remove_marker(user) ..() /obj/item/clothing/gloves/yautja/pickup(mob/living/user) @@ -102,6 +108,14 @@ /obj/item/clothing/gloves/yautja/proc/decloak() return +/// Called to update the minimap icon of the predator +/obj/item/clothing/gloves/yautja/proc/update_minimap_icon() + var/turf/wearer_turf = get_turf(owner) + SSminimaps.remove_marker(owner) + if(owner?.stat >= DEAD) + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) //defib/undefib status doesn't really matter because they're gonna explode in the end regardless + else + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi') /* *This is the main proc for checking AND draining the bracer energy. It must have human passed as an argument. *It can take a negative value in amount to restore energy. @@ -193,6 +207,7 @@ desc = "A pair of strange alien bracers, adapted for human biology." color = "#b85440" + minimap_icon = "thrall" /obj/item/clothing/gloves/yautja/hunter diff --git a/icons/ui_icons/map_blips.dmi b/icons/ui_icons/map_blips.dmi index 829d9b8a43b09a6bab06c96c8145c04426b97288..24bc26e8201f6a67a8da34ccf53602cb3959d43b 100644 GIT binary patch delta 2846 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 delta 2668 zcmV-y3X}Dr7Vs26iBL{Q4GJ0x0000DNk~Le0000#0000#2nGNE09RiS-v9ssw0cxn zbVOxyV{&P5bZKvH004NLm6X43+%OErkw77T$&!+R7Y{%2-$#D8?&tHb)2lnaoZ1y7 zQ)1V-hy9PX*(j9Bb?&KcCZusHu5(XqE>O^Q?xqKS86{N?H*FJ0vg_Pk+YACT{{4SP zD_=Nmta6^b%H%7TNv9B0W}%phN(HaiwCV^Y6+s?Jg$xzXi;8R@0d+kB4%GM1M>I%( z{0(@{dKX?t1T%v82}RdhXoaFz77>CWT#5PyE@)Wh8KjJr*^qO_U^ow-L@+Oj1F}BB zTxHcm>dn3(>-!x+R{bgm@Ho|RG)yF7&M4;~iFIXdl-RTgI3QaVrLQ7sGk_Vn5Tico ziB^nBbkp@9LWay6h)^<2yUNAV$U>!m7&w6yEFycU*>>T8B?*CUYki_Z4)rU)phP}_pR?E0W1bXLoRYXFOV~>`nmnX2NL4( zi_$+Tzu(<|wytG~SM|+d|F}EsA3t@GC7Z@xD*xvmZ{73j(H&n-?H?Alq11|hB&FB@ z00?(UL_t(&f$dvgXdB5L{$?emR$?qH;hd?ceT4YM4~OVekJ?$4*g6hOA1-}5g_e6b zxc1fI!lf-H9OvSYP(q&12VHnVLodZBFm&3}+3QW^PG#X_%C)EX%Icn@n=kFqm6_k&zKj#0Lil`QYGxpu;{fG2uu> ztgo;0R4T=;UcK7p6!j|;wOlUqa=F}AuIoCd87w2dva-V5{b{*ePF5eAo11ptGz{q@ zu)4a+DwPTAeXd zrfD+HIcJP9H*pnV5vf#)-M@doO#pJ#-5+6SXo!i#0U)2xn}B3;{lXu)x>!k6_V zzpS@*4l(~K@$CG0P8XHgV2trdBm&bk(cj99XLf1dZu&9SeONk0B!?Fs_Gi4!MKuh;SP=~IM%!(lvr{Mc?-sZ`KxHkqbr z8~{Y(Kx=Es=kuu7>yGkVF2~B{GN&zz>|(^JF5PFYsHnGK7zR(L(^BF1a070=)qtRd#VFHnLlLlH*S2^MZQ2@6PesIqo5z%NA+v1js$M8ff$X0zE>LPi|NYm8Vd#*4+`j(pJkDkKsK?k4DVD4WePa%iWk zF!igdFB`K^D4E(ED|A)&`n>;zR8%IbK*)~>xC={@~yo_u%%a)gyrR_tZ5GO*S zA4E(PEt}1qq(lOSPjgTlVmCA9%~q$v55NB@ z_excm)_b{E+HFkFtB<>%-F%O$?7q|9kN6+|)%x0jQrn>}6Zax`#S%PR&jv`>c310ZYg3_-b&`wGfUAL_h>^DI# z?E6;t`B(4rK=`@T;n}4W@03U)n z<|lu5_$Jzanfi-V$mi7ne*L3=ze&ZMT}p9wdM3=hD(q(@RPfpbKD+rIcMC)KV&MZW z69#w@*jMo^bsH+;08p!KE8CgnEu~GXhoSwi5bP9t5#~_;lH(`Ln-`n^SG*xF!|YP( zm46j^&`^?pUJa;BhejABd95B+HaaZAD9QUB5L9@bgi(^;%gITFgAm4l>-PiYml>U$ zoTlfKT=u?BOavwdB91OOP13_J2-yH9?R#+SdpA?@>% zS^-}k8ECW3+|)ZNI(QRyK2M z0X}WUcaUih=7WS*W=)2lSRE#Ts*UAN4ywJXJ From efe042100b00dae463bd796df69073f9430aa379 Mon Sep 17 00:00:00 2001 From: John Doe Date: Tue, 1 Aug 2023 16:25:47 -0700 Subject: [PATCH 2/3] thief changes --- code/modules/cm_preds/yaut_bracers.dm | 33 +++++++++++++++++++++++--- icons/ui_icons/map_blips.dmi | Bin 2849 -> 2845 bytes 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index dd68dd74cd21..6c2f7cf13feb 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -110,12 +110,25 @@ /// Called to update the minimap icon of the predator /obj/item/clothing/gloves/yautja/proc/update_minimap_icon() + if(!ishuman(owner)) + return + + var/mob/living/carbon/human/human_owner = owner var/turf/wearer_turf = get_turf(owner) SSminimaps.remove_marker(owner) - if(owner?.stat >= DEAD) - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) //defib/undefib status doesn't really matter because they're gonna explode in the end regardless + if(!isyautja(owner)) + if(owner.stat >= DEAD) + if(human_owner.undefibbable) + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) + else + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("defibbable")) + else + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi') else - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi') + if(owner?.stat >= DEAD) + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) //defib/undefib status doesn't really matter because they're gonna explode in the end regardless + else + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi') /* *This is the main proc for checking AND draining the bracer energy. It must have human passed as an argument. *It can take a negative value in amount to restore energy. @@ -210,6 +223,20 @@ minimap_icon = "thrall" +/obj/item/clothing/gloves/yautja/thrall/update_minimap_icon() + if(!ishuman(owner)) + return + + var/mob/living/carbon/human/human_owner = owner + var/turf/wearer_turf = get_turf(owner) + if(owner.stat >= DEAD) + if(human_owner.undefibbable) + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) + else + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("defibbable")) + else + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi') + /obj/item/clothing/gloves/yautja/hunter name = "clan bracers" desc = "An extremely complex, yet simple-to-operate set of armored bracers worn by the Yautja. It has many functions, activate them to use some." diff --git a/icons/ui_icons/map_blips.dmi b/icons/ui_icons/map_blips.dmi index 24bc26e8201f6a67a8da34ccf53602cb3959d43b..180e5d05f52eb5a3a7f5b03f43ea68d38f47c039 100644 GIT binary patch delta 2669 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 bk^=t)nyrb+G&9BK00000NkvXXu0mjf5&IVi delta 2673 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 Date: Wed, 2 Aug 2023 00:38:23 -0700 Subject: [PATCH 3/3] increased contrast --- code/modules/cm_preds/yaut_bracers.dm | 6 +++--- icons/ui_icons/map_blips.dmi | Bin 2845 -> 2840 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index 6c2f7cf13feb..c506d3a47c5b 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -231,11 +231,11 @@ var/turf/wearer_turf = get_turf(owner) if(owner.stat >= DEAD) if(human_owner.undefibbable) - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, overlay_iconstates = list("undefibbable")) else - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("defibbable")) + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, overlay_iconstates = list("defibbable")) else - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi') + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon) /obj/item/clothing/gloves/yautja/hunter name = "clan bracers" diff --git a/icons/ui_icons/map_blips.dmi b/icons/ui_icons/map_blips.dmi index 180e5d05f52eb5a3a7f5b03f43ea68d38f47c039..0034b4fd6ff7df582f6698f428dc90da42f53d63 100644 GIT binary patch delta 2294 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 Qy8r+H07*qoM6N<$g7s@~&;S4c delta 2300 zcmVTsC!s2hib5(>Se_i#`e7s{m%CE=(^$O_Y(^KvXl ztWfL=i5uaZWYJhsR<Bwc6MehD^}u*`-A11op0vb`F?-;X1>{3L=3}#uIm&4 zQmGV@$s`Je0@~Z#3AQmbUDs(opGUD+M0l@XrH1zmKl2F1wyhpSig?sXa#Wu3fvRWm&e(0|ySETrT6ulP3rU zgLw4l5di`Kf0OeAB^dYa-E)z{oDl6XbaizRo)iE`r_5iaU6dQq=sF}~bPET2A2*;Q|!Xf#Tr(WtAv1^_HYg+d`m zF6W`zAINY~kI_>JgPckjL@d`kV8bx#ejdZl@o~aS5i$Y*Ad|_s>in#rX&PmVkEUs~ zTCLi~bzP@(b8|?i(~f`6ot>TZ_U+panM$P`gF2OPu1or`nw-R?T3f>~=;-JuSo-C0 z=gu8EJw1&`B!UwsPB`?-r%%(JrYwU=drOeTX&CZo&} zj1;!!)q~|LS?Ygvzfsux7@iQ*Gzpt?%yAh3Y^66%lcZ89vXS(fPN${h@R3rjR>{)R z(%SQ0{STE%21dqakfZ@?d0e(?XEGVg%*?KtiDqu`CPS-Q5HL z?q99FIg64x$H>?@6eeC#!s}H1?8TSuRTyN>%E0%N^{Hn=6$k_7-g4Ce{}ztXT3`A1+kBV7$ae9>d`!(zb=l*CT|N z%t@KujYN_kSR=vEV_Ga>RK-C8H3!9kdO5Kkc*0b6#X2wNd7?zp>IL8anNRS%z?}1P zTt(>mlB1BHjH+}cr8wVceKcKtd0>Pwqf=45(cc1AiL+uQjsfS zctX9vJJuK#DUCRhy>^Z8{bYUXvBysf-eG^92nJqP&lq>?_?A-Vm`YxoBNbHBh+(5T z(P33oh`L75()x;0x2@Cl2e;m!zThfGj!e1;Zg}w>o`}&)gYwPUuRi?&EtOUv)Bk4j zN3@W83Yq?cTW?UU9E40iHXWy{MIWA*-jf(F=e_1zt!r>E5|;)IqHR~_*Mqj5o%e#aot^iB zww;~#f@>ecr>(PbcZOj4_m6)jC2edvPG1H>UB?b1M<&Vp$3G*5+*4_Xkt35tD+iSZ zSBpNSZfrW<^t0d1g7Q43R9aDXQjvcK051z^N@7$SJ79Z|*3b#wb|7ujk2YTx(w^%l z+D1qlo`_M|?wr+&8&tl&8t^IVi(qfns`{oJJLKPem!8>k$W?!S@h$-1%$`H=z4jBV z{_8KcJimAsvOWyfSM!@b&Q9`grLHLvb7s#Wm!tgs`Ng|9`WpfA+zC^u~?shndvpCIc6a|n*NjC$An| zU#Qz5foCAb>l}xzB>-I0iPy>cu=b+l;T0*3>ew`5@Fb?uLo604JXqxLI$rW?j7%~x z=TuJ0BBCB0A1wetzV~xT(-nVEJG+(D1GTeTSv>&!^4EW)yu-5TBxa@c@Vv7U`A&E5 zrtchIO@CXdyH)(_H{#9P53Ggd+rJpXM}N2iz@6&eE@kl1j=e73=+(79gq}Nj!`2P{ z`Dd<&O}zO@Q=Di99Ba&hZuh@wZQbuab=8et?MJv$BQjjM;vi|_%}-ElBKYz*1vW8_ zrn;