From c8cf5b3061f82e46d4aa617b1678605b28ce5b94 Mon Sep 17 00:00:00 2001 From: ike709 Date: Tue, 15 Jun 2021 11:23:26 -0400 Subject: [PATCH 1/2] Placeholder var/sight and var/see_in_dark --- DMCompiler/DMStandard/Defines.dm | 13 ++++++++++++- DMCompiler/DMStandard/Types/Atoms/Mob.dm | 8 ++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/DMCompiler/DMStandard/Defines.dm b/DMCompiler/DMStandard/Defines.dm index 90b8a9005e..6b3cda89c0 100644 --- a/DMCompiler/DMStandard/Defines.dm +++ b/DMCompiler/DMStandard/Defines.dm @@ -50,4 +50,15 @@ #define ICON_OVERLAY 3 #define ICON_AND 4 #define ICON_OR 5 -#define ICON_UNDERLAY 6 \ No newline at end of file +#define ICON_UNDERLAY 6 + +//mob.sight +#define SEE_INFRA (1<<0) // can see infra-red objects +#define SEE_SELF (1<<1) // can see self, no matter what +#define SEE_MOBS (1<<2) // can see all mobs, no matter what +#define SEE_OBJS (1<<3) // can see all objs, no matter what +#define SEE_TURF (1<<4) // can see all turfs (and areas), no matter what +#define SEE_PIXEL (1<<5) // if an object is located on an unlit area, but some of its pixels are in a lit area (via pixel_x,y or smooth movement), can see those pixels +#define SEE_THRU (1<<6) // can see through opaque objects +#define SEE_BLACKNESS (1<<7) // render dark tiles as blackness +#define BLIND (1<<8) // can't see anything diff --git a/DMCompiler/DMStandard/Types/Atoms/Mob.dm b/DMCompiler/DMStandard/Types/Atoms/Mob.dm index 4e5ce9bcd7..bc1d20d04d 100644 --- a/DMCompiler/DMStandard/Types/Atoms/Mob.dm +++ b/DMCompiler/DMStandard/Types/Atoms/Mob.dm @@ -1,15 +1,19 @@ /mob parent_type = /atom/movable - + var/client/client var/key var/ckey + + //TODO Actually implement these vars var/see_invisible = 0 + var/sight = 0 + var/see_in_dark = 2 layer = MOB_LAYER proc/Login() client.statobj = src - proc/Logout() \ No newline at end of file + proc/Logout() From a744781c3a7bb48c991ff591e3cc2f30c0cbd574 Mon Sep 17 00:00:00 2001 From: ike709 Date: Tue, 15 Jun 2021 15:12:22 -0400 Subject: [PATCH 2/2] Update DMCompiler/DMStandard/Defines.dm --- DMCompiler/DMStandard/Defines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DMCompiler/DMStandard/Defines.dm b/DMCompiler/DMStandard/Defines.dm index 6b3cda89c0..4113fe31f4 100644 --- a/DMCompiler/DMStandard/Defines.dm +++ b/DMCompiler/DMStandard/Defines.dm @@ -57,7 +57,7 @@ #define SEE_SELF (1<<1) // can see self, no matter what #define SEE_MOBS (1<<2) // can see all mobs, no matter what #define SEE_OBJS (1<<3) // can see all objs, no matter what -#define SEE_TURF (1<<4) // can see all turfs (and areas), no matter what +#define SEE_TURFS (1<<4) // can see all turfs (and areas), no matter what #define SEE_PIXEL (1<<5) // if an object is located on an unlit area, but some of its pixels are in a lit area (via pixel_x,y or smooth movement), can see those pixels #define SEE_THRU (1<<6) // can see through opaque objects #define SEE_BLACKNESS (1<<7) // render dark tiles as blackness