mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 22:17:32 +01:00
The Ending of an Era. The Turning of the Page (#12342)
This commit is contained in:
Fox McCloud
committed by
variableundefined
variableundefined
parent
fe540d6308
commit
bd4bd1a366
@@ -21,7 +21,6 @@ z7 = empty
|
||||
#include "map_files\cyberiad\z6.dmm"
|
||||
#include "map_files\generic\z7.dmm"
|
||||
|
||||
#define MINETYPE "lavaland"
|
||||
#define MAP_TRANSITION_CONFIG list(\
|
||||
DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
|
||||
DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\
|
||||
|
||||
+1
-2
@@ -20,13 +20,12 @@ Lovingly ported by Purpose2 to Paradise
|
||||
#include "map_files\cyberiad\z2.dmm"
|
||||
#include "map_files\cyberiad\z3.dmm"
|
||||
#include "map_files\cyberiad\z4.dmm"
|
||||
#include "map_files\generic\z5.dmm"
|
||||
#include "map_files\generic\Lavaland.dmm"
|
||||
#include "map_files\cyberiad\z6.dmm"
|
||||
#include "map_files\generic\z7.dmm"
|
||||
|
||||
#define MAP_FILE "delta.dmm"
|
||||
#define MAP_NAME "Kerberos"
|
||||
#define MINETYPE "lavaland"
|
||||
#define MAP_TRANSITION_CONFIG list(\
|
||||
DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
|
||||
DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -18,19 +18,18 @@ z7 = empty space
|
||||
#include "map_files\MetaStation\z2.dmm"
|
||||
#include "map_files\MetaStation\z3.dmm"
|
||||
#include "map_files\MetaStation\z4.dmm"
|
||||
#include "map_files\generic\z5.dmm"
|
||||
#include "map_files\generic\Lavaland.dmm"
|
||||
#include "map_files\generic\z6.dmm"
|
||||
#include "map_files\generic\z7.dmm"
|
||||
|
||||
#define MAP_FILE "MetaStation.v41A.II.dmm"
|
||||
#define MAP_NAME "MetaStation"
|
||||
#define MINETYPE "lavaland"
|
||||
#define MAP_TRANSITION_CONFIG list(\
|
||||
DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
|
||||
DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\
|
||||
DECLARE_LEVEL(TELECOMMS, CROSSLINKED, list(REACHABLE, BOOSTS_SIGNAL, AI_OK)),\
|
||||
DECLARE_LEVEL(DERELICT, CROSSLINKED, list(REACHABLE)),\
|
||||
DECLARE_LEVEL(MINING, SELFLOOPING, list(REACHABLE, STATION_CONTACT, AI_OK, ORE_LEVEL, HAS_WEATHER)),\
|
||||
DECLARE_LEVEL(MINING, SELFLOOPING, list(REACHABLE, STATION_CONTACT, HAS_WEATHER, ORE_LEVEL, AI_OK)),\
|
||||
DECLARE_LEVEL(EMPTY_AREA, CROSSLINKED, list(REACHABLE)),\
|
||||
DECLARE_LEVEL(EMPTY_AREA_2, CROSSLINKED, list(REACHABLE)))
|
||||
|
||||
|
||||
@@ -26,16 +26,10 @@ SUBSYSTEM_DEF(mapping)
|
||||
// Setup the Z-level linkage
|
||||
space_manager.do_transition_setup()
|
||||
|
||||
// Handle the mining z-level ruins or secrets.
|
||||
var/mining_type = MINETYPE
|
||||
if (mining_type == "lavaland")
|
||||
// Spawn Lavaland ruins and rivers.
|
||||
seedRuins(list(level_name_to_num(MINING)), config.lavaland_budget, /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates)
|
||||
spawn_rivers(list(level_name_to_num(MINING)))
|
||||
else
|
||||
// Populate mining Z-level hidden rooms
|
||||
for(var/i = 0, i < max_secret_rooms, i++)
|
||||
make_mining_asteroid_secret()
|
||||
// Spawn Lavaland ruins and rivers.
|
||||
seedRuins(list(level_name_to_num(MINING)), config.lavaland_budget, /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates)
|
||||
spawn_rivers(list(level_name_to_num(MINING)))
|
||||
|
||||
return ..()
|
||||
|
||||
/datum/controller/subsystem/mapping/Recover()
|
||||
|
||||
@@ -1,209 +0,0 @@
|
||||
var/global/list/possiblethemes = list("organharvest","cult","wizden","cavein","xenoden","hitech","speakeasy","plantlab")
|
||||
|
||||
var/global/max_secret_rooms = 6
|
||||
|
||||
/proc/spawn_room(var/atom/start_loc, var/x_size, var/y_size, var/list/walltypes, var/floor, var/name)
|
||||
var/list/room_turfs = list("walls"=list(),"floors"=list())
|
||||
|
||||
for(var/x = 0, x < x_size, x++) //sets the size of the room on the x axis
|
||||
for(var/y = 0, y < y_size, y++) //sets it on y axis.
|
||||
var/turf/T
|
||||
var/cur_loc = locate(start_loc.x + x, start_loc.y + y, start_loc.z)
|
||||
|
||||
|
||||
var/area/asteroid/artifactroom/A = new
|
||||
if(name)
|
||||
A.name = name
|
||||
else
|
||||
A.name = "Artifact Room #[start_loc.x]-[start_loc.y]-[start_loc.z]"
|
||||
|
||||
|
||||
if(x == 0 || x == x_size-1 || y == 0 || y == y_size-1)
|
||||
var/wall = pickweight(walltypes)//totally-solid walls are pretty boring.
|
||||
T = cur_loc
|
||||
T.ChangeTurf(wall)
|
||||
room_turfs["walls"] += T
|
||||
|
||||
|
||||
else
|
||||
T = cur_loc
|
||||
T.ChangeTurf(floor)
|
||||
room_turfs["floors"] += T
|
||||
|
||||
var/old_area = T.loc
|
||||
A.contents += T
|
||||
T.change_area(old_area, A)
|
||||
|
||||
return room_turfs
|
||||
|
||||
//////////////
|
||||
|
||||
/proc/make_mining_asteroid_secret()
|
||||
var/valid = 0
|
||||
var/turf/T = null
|
||||
var/sanity = 0
|
||||
var/list/room = null
|
||||
var/list/turfs = null
|
||||
var/x_size = 5
|
||||
var/y_size = 5
|
||||
|
||||
var/areapoints = 0
|
||||
var/theme = "organharvest"
|
||||
var/list/walltypes = list(/turf/simulated/wall=3, /turf/simulated/mineral/random=1)
|
||||
var/list/floortypes = list(/turf/simulated/floor)
|
||||
var/list/treasureitems = list()//good stuff. only 1 is created per room.
|
||||
var/list/fluffitems = list()//lesser items, to help fill out the room and enhance the theme.
|
||||
|
||||
x_size = rand(3,7)
|
||||
y_size = rand(3,7)
|
||||
areapoints = x_size * y_size
|
||||
|
||||
switch(pick(possiblethemes))//what kind of room is this gonna be?
|
||||
if("organharvest")
|
||||
walltypes = list(/turf/simulated/wall/r_wall=2,/turf/simulated/wall=2,/turf/simulated/mineral/random/high_chance=1)
|
||||
floortypes = list(/turf/simulated/floor,/turf/simulated/floor/engine)
|
||||
treasureitems = list(/mob/living/simple_animal/bot/medbot/mysterious=1, /obj/item/circular_saw=1, /obj/structure/closet/critter/cat=2)
|
||||
fluffitems = list(/obj/effect/decal/cleanable/blood=5,/obj/item/organ/internal/appendix=2,/obj/structure/closet/crate/freezer=2,
|
||||
/obj/machinery/optable=1,/obj/item/scalpel=1,/obj/item/storage/firstaid/regular=3,
|
||||
/obj/item/tank/anesthetic=1, /obj/item/surgical_drapes=2, /obj/item/reagent_scanner/adv=1,/obj/item/clothing/glasses/hud/health=1)
|
||||
|
||||
if("cult")
|
||||
theme = "cult"
|
||||
walltypes = list(/turf/simulated/wall/cult=3,/turf/simulated/mineral/random/high_chance=1)
|
||||
floortypes = list(/turf/simulated/floor/engine/cult)
|
||||
treasureitems = list(/obj/item/soulstone=1, /obj/item/clothing/suit/space/cult=1, /obj/item/bedsheet/cult=2,
|
||||
/obj/item/clothing/suit/hooded/cultrobes=2, /mob/living/simple_animal/hostile/creature=3)
|
||||
fluffitems = list(/obj/effect/gateway=1,/obj/effect/gibspawner=1,/obj/structure/cult/talisman=1,/obj/item/toy/crayon/red=2,
|
||||
/obj/item/organ/internal/heart=2, /obj/effect/decal/cleanable/blood=4,/obj/structure/table/wood=2,/obj/item/reagent_containers/food/snacks/ectoplasm=3,
|
||||
/obj/item/clothing/head/helmet/space/cult=1, /obj/item/clothing/shoes/cult=1)
|
||||
|
||||
if("wizden")
|
||||
theme = "wizden"
|
||||
walltypes = list(/turf/simulated/wall/mineral/plasma=3,/turf/simulated/mineral/random/high_chance=1)
|
||||
floortypes = list(/turf/simulated/floor/wood)
|
||||
treasureitems = list(/obj/item/veilrender/vealrender=2, /obj/item/spellbook/oneuse/blind=1,/obj/item/clothing/head/wizard/red=2,
|
||||
/obj/item/spellbook/oneuse/forcewall=1, /obj/item/spellbook/oneuse/smoke=1, /obj/structure/constructshell = 1, /obj/item/toy/katana=3,/obj/item/voodoo=3)
|
||||
fluffitems = list(/obj/structure/safe/floor=1,/obj/structure/dresser=1,/obj/item/storage/belt/soulstone=1,/obj/item/trash/candle=3,
|
||||
/obj/item/dice=3,/obj/item/twohanded/staff=2,/obj/effect/decal/cleanable/dirt=3,/obj/item/coin/mythril=3)
|
||||
|
||||
if("cavein")
|
||||
theme = "cavein"
|
||||
walltypes = list(/turf/simulated/mineral/random/high_chance=1)
|
||||
floortypes = list(/turf/simulated/floor/plating/asteroid/airless, /turf/simulated/floor/beach/sand)
|
||||
treasureitems = list(/obj/mecha/working/ripley/mining=1, /obj/item/pickaxe/drill/diamonddrill=2,
|
||||
/obj/item/resonator/upgraded=1, /obj/item/pickaxe/drill/jackhammer=5)
|
||||
fluffitems = list(/obj/effect/decal/cleanable/blood=3,/obj/effect/decal/remains/human=1,/obj/item/clothing/under/overalls=1,
|
||||
/obj/item/reagent_containers/food/snacks/grown/chili=1,/obj/item/tank/oxygen/red=2)
|
||||
|
||||
if("xenoden")
|
||||
theme = "xenoden"
|
||||
walltypes = list(/turf/simulated/mineral/random/high_chance=1)
|
||||
floortypes = list(/turf/simulated/floor/plating/asteroid/airless, /turf/simulated/floor/beach/sand)
|
||||
treasureitems = list(/obj/item/clothing/mask/facehugger=1,/obj/item/stack/sheet/animalhide/xeno=2,/obj/item/clothing/suit/xenos=2,/obj/item/clothing/head/xenos=2,/obj/item/guardiancreator/biological/choose=1)
|
||||
fluffitems = list(/obj/effect/decal/remains/human=1,/obj/effect/decal/cleanable/blood/xeno=5)
|
||||
|
||||
if("hitech")
|
||||
theme = "hitech"
|
||||
walltypes = list(/turf/simulated/wall/r_wall=5,/turf/simulated/mineral/random=1)
|
||||
floortypes = list(/turf/simulated/floor/greengrid,/turf/simulated/floor/bluegrid)
|
||||
treasureitems = list(/obj/item/stock_parts/cell/hyper=1, /obj/item/circuitboard/chem_dispenser=1,/obj/machinery/computer/telescience=1, /obj/machinery/r_n_d/protolathe=1,
|
||||
/obj/machinery/biogenerator=1)
|
||||
fluffitems = list(/obj/structure/table/reinforced=2,/obj/item/stock_parts/scanning_module/phasic=3,
|
||||
/obj/item/stock_parts/matter_bin/super=3,/obj/item/stock_parts/manipulator/pico=3,
|
||||
/obj/item/stock_parts/capacitor/super=3,/obj/item/pda/clear=1, /obj/effect/decal/mecha_wreckage/phazon=1)
|
||||
|
||||
if("speakeasy")
|
||||
theme = "speakeasy"
|
||||
floortypes = list(/turf/simulated/floor,/turf/simulated/floor/wood)
|
||||
treasureitems = list(/obj/item/melee/energy/sword/pirate=1,/obj/item/gun/projectile/revolver/doublebarrel=1,/obj/item/storage/backpack/satchel_flat=1,
|
||||
/obj/machinery/reagentgrinder=2, /obj/machinery/computer/security/wooden_tv=4, /obj/machinery/vending/coffee=3)
|
||||
fluffitems = list(/obj/structure/table/wood=2,/obj/structure/reagent_dispensers/beerkeg=1,/obj/item/stack/spacecash/c500=4,
|
||||
/obj/item/reagent_containers/food/drinks/shaker=1,/obj/item/reagent_containers/food/drinks/bottle/wine=3,
|
||||
/obj/item/reagent_containers/food/drinks/bottle/whiskey=3,/obj/item/clothing/shoes/laceup=2)
|
||||
|
||||
if("plantlab")
|
||||
theme = "plantlab"
|
||||
treasureitems = list(/obj/item/gun/energy/floragun=1,/obj/item/seeds/ambrosia/deus=2,/obj/item/seeds/tomato/blue/bluespace=2,/obj/item/seeds/tomato/blue=2,
|
||||
/obj/item/seeds/coffee/robusta=2, /obj/item/seeds/tobacco/space=2)
|
||||
fluffitems = list(/obj/item/twohanded/required/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics=1,
|
||||
/obj/structure/glowshroom/single=2,/obj/item/reagent_containers/syringe/charcoal=2,
|
||||
/obj/item/reagent_containers/glass/bottle/diethylamine=3,/obj/item/reagent_containers/glass/bottle/ammonia=3)
|
||||
|
||||
/*if("poly")
|
||||
theme = "poly"
|
||||
x_size = 5
|
||||
y_size = 5
|
||||
walltypes = list(/turf/simulated/wall/mineral/clown)
|
||||
floortypes= list(/turf/simulated/floor/engine)
|
||||
treasureitems = list(/obj/item/spellbook=1,/obj/mecha/combat/marauder=1,/obj/machinery/wish_granter=1)
|
||||
fluffitems = list(/obj/item/melee/energy/axe)*/
|
||||
|
||||
possiblethemes -= theme //once a theme is selected, it's out of the running!
|
||||
var/floor = pick(floortypes)
|
||||
|
||||
turfs = get_area_turfs(/area/mine/unexplored)
|
||||
|
||||
if(!turfs.len)
|
||||
return 0
|
||||
|
||||
while(!valid)//Finds some spots to place these rooms at, where they won't be spotted immediately.
|
||||
valid = 1
|
||||
sanity++
|
||||
if(sanity > 100)
|
||||
return 0
|
||||
|
||||
T=pick(turfs)
|
||||
if(!T)
|
||||
return 0
|
||||
|
||||
var/list/surroundings = list()
|
||||
|
||||
surroundings += range(7, locate(T.x,T.y,T.z))
|
||||
surroundings += range(7, locate(T.x+x_size,T.y,T.z))
|
||||
surroundings += range(7, locate(T.x,T.y+y_size,T.z))
|
||||
surroundings += range(7, locate(T.x+x_size,T.y+y_size,T.z))
|
||||
|
||||
if(locate(/area/mine/dangerous/explored) in surroundings)
|
||||
valid = 0
|
||||
continue
|
||||
|
||||
if(locate(/area/mine/abandoned) in surroundings)
|
||||
valid = 0
|
||||
continue
|
||||
|
||||
if(locate(/turf/space) in surroundings)
|
||||
valid = 0
|
||||
continue
|
||||
|
||||
if(locate(/area/asteroid/artifactroom) in surroundings)
|
||||
valid = 0
|
||||
continue
|
||||
|
||||
if(locate(/turf/simulated/floor/plating/asteroid/airless) in range(5,T))//A little less strict than the other checks due to tunnels
|
||||
valid = 0
|
||||
continue
|
||||
|
||||
if(!T)
|
||||
return 0
|
||||
|
||||
room = spawn_room(T,x_size,y_size,walltypes,floor,) //WE'RE FINALLY CREATING THE ROOM
|
||||
|
||||
if(room)//time to fill it with stuff
|
||||
var/list/emptyturfs = room["floors"]
|
||||
T = pick(emptyturfs)
|
||||
if(T)
|
||||
new /obj/structure/glowshroom/single(T) //Just to make it a little more visible
|
||||
var/surprise = null
|
||||
surprise = pickweight(treasureitems)
|
||||
new surprise(T)//here's the prize
|
||||
emptyturfs -= T
|
||||
|
||||
while(areapoints >= 10)//lets throw in the fluff items
|
||||
T = pick(emptyturfs)
|
||||
var/garbage = null
|
||||
garbage = pickweight(fluffitems)
|
||||
new garbage(T)
|
||||
areapoints -= 5
|
||||
emptyturfs -= T
|
||||
|
||||
return 1
|
||||
@@ -433,7 +433,6 @@
|
||||
#include "code\defines\procs\records.dm"
|
||||
#include "code\defines\procs\statistics.dm"
|
||||
#include "code\game\alternate_appearance.dm"
|
||||
#include "code\game\asteroid.dm"
|
||||
#include "code\game\atoms.dm"
|
||||
#include "code\game\atoms_movable.dm"
|
||||
#include "code\game\data_huds.dm"
|
||||
|
||||
Reference in New Issue
Block a user