From 089d548825b5e5f9daf25918cfcc337f2f99ac12 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Mon, 19 Sep 2011 04:56:49 +0000 Subject: [PATCH] - Small lights (Bulbs) now emit a constant 3 units of luminosity instead of the rand(3,6). Tube's luminosity is still random: rand(6,9). Screenshot: http://www.kamletos.si/ss13-dim%20lights.PNG (Note that in this screenshot, tubes were set to a flat 6, this is not the case in the commit tho. So only look at lights with bulbs, most of which are in maintenance shafts) - Space kudzu added (Original code and sprites donated by I Said No). Currently admin-only. Spawn the spacevine_controller to start the spreading of kudzu Screenshot: http://www.kamletos.si/kudzu2.png (This was after 15 minutes of unattended growth.) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2226 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/atom_procs.dm | 3 +- code/game/gamemodes/events/kudzu.dm | 176 ++++++++++++++++++++++++++++ code/modules/power/lighting.dm | 4 +- icons/changelog.html | 1 + icons/effects/kudzu.dmi | Bin 0 -> 4210 bytes tgstation.dme | 2 + 6 files changed, 183 insertions(+), 3 deletions(-) create mode 100644 code/game/gamemodes/events/kudzu.dm create mode 100644 icons/effects/kudzu.dmi diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index 4b54cf898bb..de23cf3099f 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -550,6 +550,7 @@ //Could not find object proc defines and this could almost be an atom level one. + /obj/proc/process() processing_objects.Remove(src) - return 0 \ No newline at end of file + return 0 diff --git a/code/game/gamemodes/events/kudzu.dm b/code/game/gamemodes/events/kudzu.dm new file mode 100644 index 00000000000..ded78ba503a --- /dev/null +++ b/code/game/gamemodes/events/kudzu.dm @@ -0,0 +1,176 @@ +// SPACE VINE OR KUDZU + +/obj/spacevine + name = "Space Kudzu" + desc = "An extremely expansionistic species of vine." + icon = 'kudzu.dmi' + icon_state = "Light1" + anchored = 1 + density = 0 + var/energy = 0 //Energy sounds like an arbitrary-enough variable name. + var/obj/spacevine_controller/master = null + + New() + if(istype(src.loc, /turf/space)) + del(src) + return + + Del() + if(master) + master.vines -= src + master.growth_queue -= src + ..() + + attackby(obj/item/weapon/W as obj, mob/user as mob) + if (!W) return + if (!user) return + if (istype(W, /obj/item/weapon/circular_saw)) del src + if (istype(W, /obj/item/weapon/kitchen/utensil/knife)) del src + if (istype(W, /obj/item/weapon/scalpel)) del src + if (istype(W, /obj/item/weapon/screwdriver)) del src + if (istype(W, /obj/item/weapon/shard)) del src + if (istype(W, /obj/item/weapon/weldingtool)) del src + if (istype(W, /obj/item/weapon/wirecutters)) del src + ..() + +/obj/spacevine_controller + var/list/obj/spacevine/vines = list() + var/list/growth_queue = list() + var/reached_collapse_size + var/reached_slowdown_size + //What this does is that instead of having the grow minimum of 1, required to start growing, the minimum will be 0, + //meaning if you get the kudzu's size to something less than 20 plots, it won't grow anymore. + + New() + if(!istype(src.loc,/turf/simulated/floor)) + del(src) + + spawn_kudzu_piece(src.loc) + processing_objects.Add(src) + + Del() + processing_objects.Remove(src) + ..() + + proc/spawn_kudzu_piece(var/turf/location) + var/obj/spacevine/SV = new(location) + growth_queue += SV + vines += SV + SV.master = src + + process() + if(!vines) + del(src) //Kudzu exterminated + return + if(!growth_queue) + del(src) //Sanity check + return + if(vines.len >= 250 && !reached_collapse_size) + reached_collapse_size = 1 + if(vines.len >= 30 && !reached_slowdown_size ) + reached_slowdown_size = 1 + + var/length = 0 + if(reached_collapse_size) + length = 0 + else if(reached_slowdown_size) + if(prob(25)) + length = 1 + else + length = 0 + else + length = 1 + length = min( 30 , max( length , vines.len / 5 ) ) + var/i = 0 + var/list/obj/spacevine/queue_end = list() + + for( var/obj/spacevine/SV in growth_queue ) + i++ + queue_end += SV + growth_queue -= SV + if(SV.energy < 2) + if(prob(10)) + SV.grow() + //if(prob(25)) + SV.spread() + if(i >= length) + break + + growth_queue = growth_queue + queue_end + + //sleep(5) + //src.process() + +/obj/spacevine/proc/grow() + switch(energy) + if (0) + src.icon_state = pick("Med1", "Med2", "Med3") + energy = 1 + src.opacity = 1 + if (1) + src.icon_state = pick("Hvy1", "Hvy2", "Hvy3") + energy = 2 + src.density = 1 + +/obj/spacevine/proc/spread() + var/direction = pick(cardinal) + if(istype(get_step(src,direction),/turf/simulated/floor)) + var/turf/simulated/floor/F = get_step(src,direction) + if(!locate(/obj/spacevine,F)) + if(F.Enter(src)) + if(master) + master.spawn_kudzu_piece( F ) + + +/* +/obj/spacevine/proc/Life() + if (!src) return + var/Vspread + if (prob(50)) Vspread = locate(src.x + rand(-1,1),src.y,src.z) + else Vspread = locate(src.x,src.y + rand(-1, 1),src.z) + var/dogrowth = 1 + if (!istype(Vspread, /turf/simulated/floor)) dogrowth = 0 + for(var/obj/O in Vspread) + if (istype(O, /obj/window) || istype(O, /obj/forcefield) || istype(O, /obj/blob) || istype(O, /obj/alien/weeds) || istype(O, /obj/spacevine)) dogrowth = 0 + if (istype(O, /obj/machinery/door/)) + if(O:p_open == 0 && prob(50)) O:open() + else dogrowth = 0 + if (dogrowth == 1) + var/obj/spacevine/B = new /obj/spacevine(Vspread) + B.icon_state = pick("vine-light1", "vine-light2", "vine-light3") + spawn(20) + if(B) + B.Life() + src.growth += 1 + if (src.growth == 10) + src.name = "Thick Space Kudzu" + src.icon_state = pick("vine-med1", "vine-med2", "vine-med3") + src.opacity = 1 + src.waittime = 80 + if (src.growth == 20) + src.name = "Dense Space Kudzu" + src.icon_state = pick("vine-hvy1", "vine-hvy2", "vine-hvy3") + src.density = 1 + spawn(src.waittime) + if (src.growth < 20) src.Life() + +*/ + +/obj/spacevine/ex_act(severity) + switch(severity) + if(1.0) + del(src) + return + if(2.0) + if (prob(90)) + del(src) + return + if(3.0) + if (prob(50)) + del(src) + return + else + return + +/obj/spacevine/temperature_expose(null, temp, volume) + del src \ No newline at end of file diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index ccb7827d4cd..81f1aadf063 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -41,7 +41,7 @@ icon_state = "bulb1" base_state = "bulb" fitting = "bulb" - brightness = 5 + brightness = 3 desc = "A small lighting fixture." light_type = /obj/item/weapon/light/bulb @@ -78,7 +78,7 @@ if("tube") brightness = rand(6,9) if("bulb") - brightness = rand(3,6) + brightness = 3 spawn(1) update() diff --git a/icons/changelog.html b/icons/changelog.html index ec446abd47f..36e239d3f41 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -63,6 +63,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • Some religions (currently Islam, Scientology and Atheism) set your chapel's symbols to the symbols of that religion.
  • A new old-style cabinet's been added to the detective's office. (Sprite by Hempuli)
  • Runtime the cat ran away!! And it gets even worse! Mr. Deempisi met a premature end during an excursion to the kitchen's freezer! -- I was ORDERED to do this... don't kill me! :(
    • +
  • Kudzu can now be spawned (Currently admin-only. Will test a bit, balance it properly and add it as a random event) (Original code and sprites donated by I Said No)
  • Kor updated: diff --git a/icons/effects/kudzu.dmi b/icons/effects/kudzu.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5d00a913f38d818d299fb8d9674617cfea57763b GIT binary patch literal 4210 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