From abe222afdee211bfb311e3f7239127ad2530b52d Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 19 Jun 2012 20:52:01 -0700 Subject: [PATCH] Fixed botpathing. Some fixes/changes to glows. Made lights less piss yellow. --- code/WorkInProgress/SkyMarshal/Ultralight.dm | 7 ++- code/ZAS/Fire.dm | 12 +++--- code/datums/helper_datums/teleport.dm | 2 +- code/defines/obj/hydro.dm | 6 +-- code/game/machinery/flasher.dm | 4 +- code/game/machinery/hologram.dm | 2 +- code/game/machinery/igniter.dm | 4 +- code/game/machinery/shieldgen.dm | 2 +- code/game/mecha/mecha.dm | 4 +- code/game/objects/blood.dm | 2 +- code/game/objects/devices/flashlight.dm | 4 +- code/game/objects/devices/powersink.dm | 2 +- .../objects/items/weapons/cigs_lighters.dm | 2 +- code/game/objects/mineral_doors.dm | 4 +- code/game/objects/sign_decals.dm | 2 +- code/game/objects/stacks/metal.dm | 2 +- code/game/turf.dm | 43 ++++++++----------- code/modules/power/lighting.dm | 2 +- 18 files changed, 49 insertions(+), 57 deletions(-) diff --git a/code/WorkInProgress/SkyMarshal/Ultralight.dm b/code/WorkInProgress/SkyMarshal/Ultralight.dm index 81c2867f17f..84c690bb764 100644 --- a/code/WorkInProgress/SkyMarshal/Ultralight.dm +++ b/code/WorkInProgress/SkyMarshal/Ultralight.dm @@ -267,20 +267,19 @@ atom/proc/ul_LightLevelChanged() return atom/New() - ..() + . = ..() if(ul_IsLuminous()) spawn(1) ul_Illuminate() - return atom/Del() if(ul_IsLuminous()) ul_Extinguish() - ..() + . = ..() atom/movable/Move() ul_Extinguish() - ..() + . = ..() ul_Illuminate() diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index e68324a4aba..801f6ee6c33 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -127,16 +127,16 @@ obj //Change icon depending on the fuel, and thus temperature. if(firelevel > 6) icon_state = "3" - if(LuminosityRed != 7) - ul_SetLuminosity(7,5,0) + if(LuminosityRed != 11) + ul_SetLuminosity(11,9,0) else if(firelevel > 2.5) icon_state = "2" - if(LuminosityRed != 5) - ul_SetLuminosity(5,4,0) + if(LuminosityRed != 8) + ul_SetLuminosity(8,7,0) else icon_state = "1" - if(LuminosityRed != 3) - ul_SetLuminosity(3,2,0) + if(LuminosityRed != 5) + ul_SetLuminosity(5,4,0) //Ensure flow temperature is higher than minimum fire temperatures. flow.temperature = max(PLASMA_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index e4aa79dbb0b..b6aecf27c81 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -114,7 +114,7 @@ // Remove any luminosity etc. var/prevlum = teleatom.luminosity - teleatom.luminosity = 0 + teleatom.ul_SetLuminosity(0) if(force_teleport) teleatom.forceMove(destturf) diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index efb3da713da..9cd72847727 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -1153,12 +1153,12 @@ ..() /obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/pickup(mob/user) - src.ul_SetLuminosity(0) + ul_SetLuminosity(0) user.ul_SetLuminosity(user.LuminosityRed + potency/5, user.LuminosityGreen + potency/5, user.LuminosityBlue + potency/5) /obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/dropped(mob/user) user.ul_SetLuminosity(user.LuminosityRed - potency/5, user.LuminosityGreen - potency/5, user.LuminosityBlue - potency/5) - src.ul_SetLuminosity(potency/5) + ul_SetLuminosity(potency/5) /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod seed = "/obj/item/seeds/cocoapodseed" @@ -1621,7 +1621,7 @@ if(istype(src.loc,/mob)) pickup(src.loc) else - src.ul_SetLuminosity(potency/10) + ul_SetLuminosity(potency/10) lifespan = 120 //ten times that is the delay endurance = 30 maturation = 15 diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 86fd9a7cf90..81c585a445b 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -24,13 +24,13 @@ /obj/machinery/flasher/New() sleep(4) - src.ul_SetLuminosity(2) + ul_SetLuminosity(0,2,0) /obj/machinery/flasher/power_change() if ( powered() ) stat &= ~NOPOWER icon_state = "[base_state]1" - src.ul_SetLuminosity(2) + src.ul_SetLuminosity(0,2,0) else stat |= ~NOPOWER icon_state = "[base_state]1-p" diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 2f85c5db954..7c45c65b4fb 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -72,7 +72,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ hologram.icon = A.holo_icon hologram.mouse_opacity = 0//So you can't click on it. hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them. - hologram.ul_SetLuminosity(1)//To make it glowy. + hologram.ul_SetLuminosity(0,0,2)//To make it glowy. hologram.anchored = 1//So space wind cannot drag it. hologram.name = "AI hologram"//If someone decides to right click. ul_SetLuminosity(0,0,1)//To make the pad glowy. diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 35f94eff582..2f1cb2c338b 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -53,11 +53,11 @@ if ( powered() && disable == 0 ) stat &= ~NOPOWER icon_state = "[base_state]" - src.ul_SetLuminosity(2) + ul_SetLuminosity(2,0,0) else stat |= ~NOPOWER icon_state = "[base_state]-p" - src.ul_SetLuminosity(0) + ul_SetLuminosity(0) /obj/machinery/sparker/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/device/detective_scanner)) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index d334b02f9f7..5e2632c83bd 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -427,7 +427,7 @@ if(A && B) needs_power = 1 spawn(1) - src.ul_SetLuminosity(3) + src.ul_SetLuminosity(0,0,4) /* for(var/mob/M as mob in src.loc) //does not work for some reason. if(istype(M,/mob/living/carbon)) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index d1c9c000be0..c793fba9bb5 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -942,9 +942,9 @@ return lights = !lights if(lights) - src.ul_SetLuminosity(src.luminosity + src.lights_power) + ul_SetLuminosity(luminosity + lights_power, luminosity + lights_power, luminosity) else - src.ul_SetLuminosity(src.luminosity - src.lights_power) + ul_SetLuminosity(luminosity - lights_power, luminosity - lights_power, luminosity) src.log_message("Toggled lights.") return diff --git a/code/game/objects/blood.dm b/code/game/objects/blood.dm index 389802bd9aa..9445346349c 100644 --- a/code/game/objects/blood.dm +++ b/code/game/objects/blood.dm @@ -63,7 +63,7 @@ New() ..() - ul_SetLuminosity(1) + ul_SetLuminosity(0,3,0) spawn(1200) // 2 minutes del(src) \ No newline at end of file diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm index 503e624bfe3..33956b55d68 100644 --- a/code/game/objects/devices/flashlight.dm +++ b/code/game/objects/devices/flashlight.dm @@ -28,14 +28,14 @@ if(src.loc == user) user.ul_SetLuminosity(user.LuminosityRed + brightness_on, user.LuminosityGreen + brightness_on, user.LuminosityBlue) else if (isturf(src.loc)) - src.ul_SetLuminosity(brightness_on, brightness_on, 0) + ul_SetLuminosity(brightness_on, brightness_on, 0) else icon_state = icon_off if(src.loc == user) user.ul_SetLuminosity(user.LuminosityRed - brightness_on, user.LuminosityGreen - brightness_on, user.LuminosityBlue) else if (isturf(src.loc)) - src.ul_SetLuminosity(0) + ul_SetLuminosity(0) /obj/item/device/flashlight/attack_self(mob/user) // if(!isturf(user.loc)) diff --git a/code/game/objects/devices/powersink.dm b/code/game/objects/devices/powersink.dm index ea45398d5c9..2b0c32a0d15 100644 --- a/code/game/objects/devices/powersink.dm +++ b/code/game/objects/devices/powersink.dm @@ -94,7 +94,7 @@ var/datum/powernet/PN = attached.get_powernet() if(PN) if(!luminosity) - ul_SetLuminosity(12) + ul_SetLuminosity(12,3,0) // found a powernet, so drain up to max power from it diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index fe196918547..0d2cebe65c7 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -491,5 +491,5 @@ ZIPPO dropped(mob/user) if(lit) user.ul_SetLuminosity(user.LuminosityRed - 2, user.LuminosityGreen - 1, user.LuminosityBlue) - ul_SetLuminosity(2) + ul_SetLuminosity(2,1,0) return diff --git a/code/game/objects/mineral_doors.dm b/code/game/objects/mineral_doors.dm index 8132dc9aaf7..5b0edaf2e73 100644 --- a/code/game/objects/mineral_doors.dm +++ b/code/game/objects/mineral_doors.dm @@ -174,7 +174,7 @@ New() ..() - ul_SetLuminosity(3) + ul_SetLuminosity(0,3,0) /obj/structure/mineral_door/sandstone mineralType = "sandstone" @@ -281,4 +281,4 @@ isSwitchingStates = 0 Dismantle(devastated = 0) - del(src) + del(src) diff --git a/code/game/objects/sign_decals.dm b/code/game/objects/sign_decals.dm index 77a3cb1217c..6df8acf3f46 100644 --- a/code/game/objects/sign_decals.dm +++ b/code/game/objects/sign_decals.dm @@ -7,7 +7,7 @@ return proc/ChangeSign(var/Text) src.icon_state = "[Text]" - //ul_SetLuminosity(4) + ul_SetLuminosity(3,0,0) return /obj/effect/sign/securearea/ex_act(severity) diff --git a/code/game/objects/stacks/metal.dm b/code/game/objects/stacks/metal.dm index 43adb62632c..ae212a1e280 100644 --- a/code/game/objects/stacks/metal.dm +++ b/code/game/objects/stacks/metal.dm @@ -142,7 +142,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ return /obj/item/stack/tile/plasteel/proc/build(turf/S as turf) - S.ReplaceWithAirlessPlating() + S.ReplaceWithPlating() // var/turf/simulated/floor/W = S.ReplaceWithFloor() // W.make_plating() return diff --git a/code/game/turf.dm b/code/game/turf.dm index 87384f50d1a..7c4240df7ca 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -193,34 +193,27 @@ W.opacity = 1 W.ul_SetOpacity(0) W.levelupdate() - air_master.tiles_to_update |= W - var/turf/simulated/north = get_step(W,NORTH) - var/turf/simulated/south = get_step(W,SOUTH) - var/turf/simulated/east = get_step(W,EAST) - var/turf/simulated/west = get_step(W,WEST) + if(W && W.air) + var/new_ox = 0 + var/new_n2 = 0 + var/new_co2 = 0 + var/new_tx = 0 + for(var/direction in cardinal) + var/turf/T = get_step(src, direction) + if(istype(T)) + var/datum/gas_mixture/G = T.return_air() + new_ox += G.oxygen + new_n2 += G.nitrogen + new_co2 += G.carbon_dioxide + new_tx += G.toxins - if(istype(north)) air_master.tiles_to_update |= north - if(istype(south)) air_master.tiles_to_update |= south - if(istype(east)) air_master.tiles_to_update |= east - if(istype(west)) air_master.tiles_to_update |= west - return W + W.air.nitrogen = new_n2/4 + W.air.oxygen = new_ox/4 + W.air.carbon_dioxide = new_co2/4 + W.air.toxins = new_tx/4 + W.air.update_values() -/turf/proc/ReplaceWithAirlessPlating() - var/prior_icon = icon_old - var/old_dir = dir - - for(var/obj/structure/lattice/L in locate(src.x, src.y, src.z)) - del(L) - var/turf/simulated/floor/plating/airless/W = new /turf/simulated/floor/plating/airless( locate(src.x, src.y, src.z) ) - - W.RemoveLattice() - W.dir = old_dir - if(prior_icon) W.icon_state = prior_icon - else W.icon_state = "plating" - W.opacity = 1 - W.ul_SetOpacity(0) - W.levelupdate() air_master.tiles_to_update |= W var/turf/simulated/north = get_step(W,NORTH) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 4f4b4878f69..e9e899a90d5 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -123,7 +123,7 @@ var/oldlum = luminosity //luminosity = on * brightness - ul_SetLuminosity(on * brightness, on * brightness, ( fitting != "bulb" ? on * brightness : round(on*brightness/2) ) ) // *DAL* + ul_SetLuminosity(on * brightness, on * brightness, ( fitting != "bulb" ? on * brightness : round(on*brightness/2 + 1) ) ) // *DAL* // if the state changed, inc the switching counter if(oldlum != luminosity)