cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #3965 from jack-fractal/dev"

Browse Source 
This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>
This commit is contained in:
Mloc
2013-11-25 11:59:57 +00:00
parent fa57b76f25
commit d8683f2d39
58 changed files with 1590 additions and 2616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
code/WorkInProgress/AI_Visibility/_old_AI_Visibility.dm
View File

@@ -16,15 +16,15 @@
var/image/dim
/turf/proc/visibilityChanged()
cameraNetwork.updateVisibility(src)
cameranet.updateVisibility(src)
/turf/New()
..()
cameraNetwork.updateVisibility(src)
cameranet.updateVisibility(src)
/*
/turf/Del()
..()
cameraNetwork.updateVisibility(src)
cameranet.updateVisibility(src)
*/
/datum/camerachunk
var/list/obscuredTurfs = list()
@@ -73,7 +73,7 @@
var/mob/living/silicon/ai/ai = usr
ai.freelook()
ai.eyeobj.loc = locate(max(1, x - 1), max(1, y - 1), ai.eyeobj.z)
cameraNetwork.visibility(ai.eyeobj)
cameranet.visibility(ai.eyeobj)
else
usr.loc = locate(max(1, x - 1), max(1, y - 1), usr.z)
@@ -81,26 +81,26 @@
/mob/dead/verb/Open_Minimap()
set category = "Ghost"
winshow(src, "minimapwindow", 1)
client.screen |= cameraNetwork.minimap
client.screen |= cameranet.minimap
if(cameraNetwork.generating_minimap)
cameraNetwork.minimap_viewers += src
if(cameranet.generating_minimap)
cameranet.minimap_viewers += src
/mob/living/silicon/ai/verb/Open_Minimap()
set category = "AI Commands"
winshow(src, "minimapwindow", 1)
client.screen |= cameraNetwork.minimap
client.screen |= cameranet.minimap
if(cameraNetwork.generating_minimap)
cameraNetwork.minimap_viewers += src
if(cameranet.generating_minimap)
cameranet.minimap_viewers += src
/client/proc/Open_Minimap()
set category = "Admin"
winshow(src, "minimapwindow", 1)
screen |= cameraNetwork.minimap
screen |= cameranet.minimap
if(cameraNetwork.generating_minimap)
cameraNetwork.minimap_viewers += src.mob
if(cameranet.generating_minimap)
cameranet.minimap_viewers += src.mob
/datum/camerachunk/proc/update_minimap()
if(changed && !updating)
@@ -325,11 +325,11 @@
dim += t.dim
cameraNetwork.minimap += minimap_obj
cameranet.minimap += minimap_obj
var/datum/cameraNetwork/cameraNetwork = new()
var/datum/cameranet/cameranet = new()
/datum/cameraNetwork
/datum/cameranet
var/list/cameras = list()
var/list/chunks = list()
var/network = "net1"
@@ -340,7 +340,7 @@ var/datum/cameraNetwork/cameraNetwork = new()
var/generating_minimap = TRUE
var/list/minimap_viewers = list()
/datum/cameraNetwork/New()
/datum/cameranet/New()
..()
spawn(200)
@@ -356,11 +356,11 @@ var/datum/cameraNetwork/cameraNetwork = new()
generating_minimap = FALSE
minimap_viewers = list()
/datum/cameraNetwork/proc/chunkGenerated(x, y, z)
/datum/cameranet/proc/chunkGenerated(x, y, z)
var/key = "[x],[y],[z]"
return key in chunks
/datum/cameraNetwork/proc/getCameraChunk(x, y, z)
/datum/cameranet/proc/getCameraChunk(x, y, z)
var/key = "[x],[y],[z]"
if(!(key in chunks))
@@ -368,7 +368,7 @@ var/datum/cameraNetwork/cameraNetwork = new()
return chunks[key]
/datum/cameraNetwork/proc/visibility(mob/aiEye/ai)
/datum/cameranet/proc/visibility(mob/aiEye/ai)
var/x1 = max(0, ai.x - 16) & ~0xf
var/y1 = max(0, ai.y - 16) & ~0xf
var/x2 = min(world.maxx, ai.x + 16) & ~0xf
@@ -389,14 +389,14 @@ var/datum/cameraNetwork/cameraNetwork = new()
for(var/datum/camerachunk/c in add)
c.add(ai)
/datum/cameraNetwork/proc/updateVisibility(turf/loc)
/datum/cameranet/proc/updateVisibility(turf/loc)
if(!chunkGenerated(loc.x & ~0xf, loc.y & ~0xf, loc.z))
return
var/datum/camerachunk/chunk = getCameraChunk(loc.x & ~0xf, loc.y & ~0xf, loc.z)
chunk.visibilityChanged(loc)
/datum/cameraNetwork/proc/addCamera(obj/machinery/camera/c)
/datum/cameranet/proc/addCamera(obj/machinery/camera/c)
var/x1 = max(0, c.x - 16) & ~0xf
var/y1 = max(0, c.y - 16) & ~0xf
var/x2 = min(world.maxx, c.x + 16) & ~0xf
@@ -410,7 +410,7 @@ var/datum/cameraNetwork/cameraNetwork = new()
chunk.cameras += c
chunk.hasChanged()
/datum/cameraNetwork/proc/removeCamera(obj/machinery/camera/c)
/datum/cameranet/proc/removeCamera(obj/machinery/camera/c)
var/x1 = max(0, c.x - 16) & ~0xf
var/y1 = max(0, c.y - 16) & ~0xf
var/x2 = min(world.maxx, c.x + 16) & ~0xf
@@ -452,18 +452,18 @@ var/datum/cameraNetwork/cameraNetwork = new()
eyeobj.ai = src
client.eye = eyeobj
eyeobj.loc = loc
cameraNetwork.visibility(eyeobj)
cameranet.visibility(eyeobj)
cameraFollow = null
/mob/aiEye/Move()
. = ..()
if(.)
cameraNetwork.visibility(src)
cameranet.visibility(src)
/client/AIMove(n, direct, var/mob/living/silicon/ai/user)
if(eye == user.eyeobj)
user.eyeobj.loc = get_step(user.eyeobj, direct)
cameraNetwork.visibility(user.eyeobj)
cameranet.visibility(user.eyeobj)
else
return ..()
@@ -477,7 +477,7 @@ var/datum/cameraNetwork/cameraNetwork = new()
else if(direct == DOWN && user.eyeobj.z < 4)
dif = 1
user.eyeobj.loc = locate(user.eyeobj.x, user.eyeobj.y, user.eyeobj.z + dif)
cameraNetwork.visibility(user.eyeobj)
cameranet.visibility(user.eyeobj)
else
return ..()
*/
@@ -492,23 +492,23 @@ var/datum/cameraNetwork/cameraNetwork = new()
/obj/machinery/door/update_nearby_tiles(need_rebuild)
. = ..(need_rebuild)
cameraNetwork.updateVisibility(loc)
cameranet.updateVisibility(loc)
/obj/machinery/camera/New()
..()
cameraNetwork.addViewpoint(src)
cameranet.addCamera(src)
/obj/machinery/camera/Del()
cameraNetwork.removeViewpoint(src)
cameranet.removeCamera(src)
..()
/obj/machinery/camera/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
. = ..(W, user)
if(istype(W, /obj/item/weapon/wirecutters))
if(status)
cameraNetwork.addViewpoint(src)
cameranet.addCamera(src)
else
cameraNetwork.removeViewpoint(src)
cameranet.removeCamera(src)
/proc/checkcameravis(atom/A)
for(var/obj/machinery/camera/C in view(A,7))
@@ -545,7 +545,7 @@ var/datum/cameraNetwork/cameraNetwork = new()
var/obj/machinery/camera/C = D[t]
eyeobj.loc = C.loc
cameraNetwork.visibility(eyeobj)
cameranet.visibility(eyeobj)
return
@@ -570,4 +570,4 @@ var/datum/cameraNetwork/cameraNetwork = new()
else
eyeobj.loc = locate(src.x, src.y, src.z)
cameraNetwork.visibility(eyeobj)
cameranet.visibility(eyeobj)

10
code/WorkInProgress/AI_Visibility/ai.dm
View File

@@ -29,17 +29,17 @@
eyeobj.ai = src
client.eye = eyeobj
eyeobj.loc = loc
cameraNetwork.visibility(eyeobj)
cameranet.visibility(eyeobj)
/mob/aiEye/Move()
. = ..()
if(.)
cameraNetwork.visibility(src)
cameranet.visibility(src)
/client/AIMove(n, direct, var/mob/living/silicon/ai/user)
if(eye == user.eyeobj)
user.eyeobj.loc = get_step(user.eyeobj, direct)
cameraNetwork.visibility(user.eyeobj)
cameranet.visibility(user.eyeobj)
else
return ..()
@@ -79,7 +79,7 @@
var/obj/machinery/camera/C = D[t]
eyeobj.loc = C.loc
cameraNetwork.visibility(eyeobj)
cameranet.visibility(eyeobj)
return
@@ -104,4 +104,4 @@
else
eyeobj.loc = locate(src.x, src.y, src.z)
cameraNetwork.visibility(eyeobj)
cameranet.visibility(eyeobj)

24
code/WorkInProgress/AI_Visibility/cameranet.dm
View File

@@ -1,14 +1,14 @@
//------------------------------------------------------------
//
// The cameraNetwork
// The Cameranet
//
// The cameraNetwork is a single global instance of a unique
// The cameranet is a single global instance of a unique
// datum, which contains logic for managing the individual
// chunks.
//
//------------------------------------------------------------
/datum/cameraNetwork
/datum/cameranet
var/list/cameras = list()
var/list/chunks = list()
var/network = "net1"
@@ -18,18 +18,18 @@
var/generating_minimap = TRUE
var/datum/cameraNetwork/cameraNetwork = new()
var/datum/cameranet/cameranet = new()
/datum/cameraNetwork/New()
/datum/cameranet/New()
..()
spawn(100)
init_minimap()
/datum/cameraNetwork/proc/init_minimap()
/datum/cameranet/proc/init_minimap()
for(var/x = 0, x <= world.maxx, x += 16)
for(var/y = 0, y <= world.maxy, y += 16)
sleep(1)
@@ -39,12 +39,12 @@ var/datum/cameraNetwork/cameraNetwork = new()
generating_minimap = FALSE
/datum/cameraNetwork/proc/chunkGenerated(x, y, z)
/datum/cameranet/proc/chunkGenerated(x, y, z)
var/key = "[x],[y],[z]"
return key in chunks
/datum/cameraNetwork/proc/getCameraChunk(x, y, z)
/datum/cameranet/proc/getCameraChunk(x, y, z)
var/key = "[x],[y],[z]"
if(!(key in chunks))
@@ -71,7 +71,7 @@ var/datum/cameraNetwork/cameraNetwork = new()
// have a proc called automatically every time an
// object's loc changes.
/datum/cameraNetwork/proc/visibility(mob/aiEye/ai)
/datum/cameranet/proc/visibility(mob/aiEye/ai)
var/x1 = max(0, ai.x - 16) & ~0xf
var/y1 = max(0, ai.y - 16) & ~0xf
var/x2 = min(world.maxx, ai.x + 16) & ~0xf
@@ -101,7 +101,7 @@ var/datum/cameraNetwork/cameraNetwork = new()
// anything else that would alter line of sight in the
// general area.
/datum/cameraNetwork/proc/updateVisibility(turf/loc)
/datum/cameranet/proc/updateVisibility(turf/loc)
if(!chunkGenerated(loc.x & ~0xf, loc.y & ~0xf, loc.z))
return
@@ -115,7 +115,7 @@ var/datum/cameraNetwork/cameraNetwork = new()
// creating a camera, allowing freelook and the minimap to
// respond correctly.
/datum/cameraNetwork/proc/addCamera(obj/machinery/camera/c)
/datum/cameranet/proc/addCamera(obj/machinery/camera/c)
var/x1 = max(0, c.x - 16) & ~0xf
var/y1 = max(0, c.y - 16) & ~0xf
var/x2 = min(world.maxx, c.x + 16) & ~0xf
@@ -137,7 +137,7 @@ var/datum/cameraNetwork/cameraNetwork = new()
// deleting a camera, allowing freelook and the minimap to
// respond correctly.
/datum/cameraNetwork/proc/removeCamera(obj/machinery/camera/c)
/datum/cameranet/proc/removeCamera(obj/machinery/camera/c)
var/x1 = max(0, c.x - 16) & ~0xf
var/y1 = max(0, c.y - 16) & ~0xf
var/x2 = min(world.maxx, c.x + 16) & ~0xf

2
code/WorkInProgress/AI_Visibility/chunk.dm
View File

@@ -88,7 +88,7 @@
dim += t.dim
cameraNetwork.minimap |= minimap_obj
cameranet.minimap |= minimap_obj
for(var/mob/aiEye/eye in seenby)
if(eye.ai.client)

24
code/WorkInProgress/AI_Visibility/minimap.dm
View File

@@ -28,24 +28,24 @@
var/mob/living/silicon/ai/ai = usr
ai.freelook()
ai.eyeobj.loc = locate(max(1, x - 1), max(1, y - 1), usr.client.minimap_view_z)
cameraNetwork.visibility(ai.eyeobj)
cameranet.visibility(ai.eyeobj)
else
usr.loc = locate(max(1, x - 1), max(1, y - 1), usr.client.minimap_view_z)
/mob/dead/verb/Open_Minimap()
set category = "Ghost"
cameraNetwork.show_minimap(client)
cameranet.show_minimap(client)
/mob/living/silicon/ai/verb/Open_Minimap()
set category = "AI Commands"
cameraNetwork.show_minimap(client)
cameranet.show_minimap(client)
/client/proc/Open_Minimap()
set category = "Admin"
cameraNetwork.show_minimap(src)
cameranet.show_minimap(src)
/mob/verb/Open_Minimap_Z()
@@ -54,26 +54,26 @@
if(!istype(src, /mob/dead) && !istype(src, /mob/living/silicon/ai) && !(client && client.holder && client.holder.level >= 4))
return
var/level = input("Select a Z level", "Z select", null) as null | anything in cameraNetwork.minimap
var/level = input("Select a Z level", "Z select", null) as null | anything in cameranet.minimap
if(level != null)
cameraNetwork.show_minimap(client, level)
cameranet.show_minimap(client, level)
/datum/cameraNetwork/proc/show_minimap(client/client, z_level = "z-1")
/datum/cameranet/proc/show_minimap(client/client, z_level = "z-1")
if(!istype(client.mob, /mob/dead) && !istype(client.mob, /mob/living/silicon/ai) && !(client.holder && client.holder.level >= 4))
return
if(z_level in cameraNetwork.minimap)
if(z_level in cameranet.minimap)
winshow(client, "minimapwindow", 1)
for(var/key in cameraNetwork.minimap)
client.screen -= cameraNetwork.minimap[key]
for(var/key in cameranet.minimap)
client.screen -= cameranet.minimap[key]
client.screen |= cameraNetwork.minimap[z_level]
client.screen |= cameranet.minimap[z_level]
if(cameraNetwork.generating_minimap)
if(cameranet.generating_minimap)
spawn(50)
show_minimap(client, z_level)

14
code/WorkInProgress/AI_Visibility/util.dm
View File

@@ -4,31 +4,31 @@
var/image/dim
/turf/proc/visibilityChanged()
cameraNetwork.updateVisibility(src)
cameranet.updateVisibility(src)
/turf/New()
..()
cameraNetwork.updateVisibility(src)
cameranet.updateVisibility(src)
/obj/machinery/door/update_nearby_tiles(need_rebuild)
. = ..(need_rebuild)
cameraNetwork.updateVisibility(loc)
cameranet.updateVisibility(loc)
/obj/machinery/camera/New()
..()
cameraNetwork.addViewpoint(src)
cameranet.addCamera(src)
/obj/machinery/camera/Del()
cameraNetwork.removeViewpoint(src)
cameranet.removeCamera(src)
..()
/obj/machinery/camera/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
. = ..(W, user)
if(istype(W, /obj/item/weapon/wirecutters))
if(status)
cameraNetwork.addViewpoint(src)
cameranet.addCamera(src)
else
cameraNetwork.removeViewpoint(src)
cameranet.removeCamera(src)
/proc/checkcameravis(atom/A)
for(var/obj/machinery/camera/C in view(A,7))