Skip to content

Commit

Permalink
Ouroboros and Voidraptor (#2439)
Browse files Browse the repository at this point in the history
* voidraptor initial save

* blacksmith

* prison

* voidraptor config

* ouroboros

* moon turfs

* adds lunar decal

* new xeno

* lights

* Update VoidRaptor.dmm

* adds chicken and botany books

* blueshift pen fix

* pool fix

* shuttles

* Revert "lights"

This reverts commit 33affc3.

* Reapply "lights"

This reverts commit f3ccc31.

* fixes

* new chem synths aswell

* fixes

* Update VoidRaptor.dmm

* fixes

* Update Ouroboros.dmm

* Update Ouroboros.dmm

* Update VoidRaptor.dmm

* Update VoidRaptor.dmm

* fuckin hate fake stairs

* bloop

* Bumps rust-g to `3.3.0` (tgstation#83635)

## About The Pull Request
Release notes: https://github.com/tgstation/rust-g/releases/tag/3.3.0

Mainly bumping in order to use a feature of it in tgstation#83138, to optimize
the system a little better.

## Why It's Good For The Game
Faster init when that system will be more widely used is a good thing.
Also keeps us up to date and enables more tools to be available to
coders.

* Adds Biomes to the Cave Generator, for all of your procedurally-placed cave biome needs! (tgstation#83138)

Implements biomes into the Cave Generator, using some adapted code from
the biomes feature of the Jungle Generator. It's there as a tool for
whomever would want to implement it on /tg/, I simply don't have the
sprites, mobs and motivation to add biomes to anything at this current
point in time, even though I'm fully open to helping anyone that would
be interested in doing so.

Here's how it works:
You supply a 2D list of biomes based on the two arbitrary criteria
'heat' and 'humidity', you can treat these as simply two independent
variables that would affect your biome distribution. There's three
levels of each, `LOW`, `MEDIUM` and `HIGH`, take a look at
`possible_biomes` for a good example of it. Here's what it looks like by
default (yes, that's the default on the jungle generator as well, except
here we use 3x3 instead of 4x4):

![image](https://github.com/tgstation/tgstation/assets/58045821/2c53b46b-f4f9-497f-9647-efc2cc118805)

On the `/datum/biome`, you have three important stats, split into two
each: flora, features and fauna. They are evaluated in this order, so if
a flora spawns, no feature nor fauna will spawn. If a feature spawns, no
fauna will spawn, and if fauna spawns, then that's cool. Each of these
stats have a corresponding `density` (i.e. `flora_density`), which is
simply the probability for that thing to be spawned if it's eligible,
and a `types` list (i.e. `flora_types`), which is a weighted list that
then gets expanded at runtime in order to make the `pick()` operation
faster.

The areas you want to have the biomes in also need to have their
`area_flags` set up to include `FLORA_ALLOWED` for both flora and
features, and `MOB_SPAWN_ALLOWED` for fauna to spawn.

The fauna currently does just about every check that is done in
`cave_generator`'s `populate_terrain()`, except for handling megafauna
differently, or taking megafauna into account. If that's desired, it can
be added easily, I simply chose not to add it because it felt like
wasted processor time over something that would probably not be
pertinent in the majority of cases.

I've run a few tests, and keeping in mind that I've got a high-specs
computer, generating the caves with biomes takes about 1 second for an
entire z-level covered in biomes. For comparison, I compile the repo in
about 36 seconds. ~~It may increase the amount of time spent
initializing the atoms subsystem, however, I'll need to compare that,
I'd really appreciate some help optimizing that if anyone knows how
to.~~ It didn't seem to have an effect, I just had seen things a bit
weird. I optimized things by moving rust-g calls outside of the for
loop, and we gained about 0.3-0.4 seconds, which is pretty nice.

Biomes are cool, and since we use mainly cave generators for z-level
generation, I decided to add biomes to that, so that the biome code
added by floyd lives on.

Here's an example of ice box with jungle caves, just as a proof of
concept, to prove that it works:

![image](https://github.com/tgstation/tgstation/assets/58045821/33b348db-513b-4a2e-b11f-907e80b65177)

:cl: GoldenAlpharex
add: Added Biomes capabilities to the Cave Generator, to allow for
procedurally-placed biomes to be introduced in cave generation. This
feature is not currently used on any map, but the tools are all there
for anyone with the motivation to add biomes to any cave-generating
area, like Lavaland and Ice Box.
code: Biomes can now affect features (which are usually structures), on
top of flora and fauna.
/:cl:

* adds in base forest and mushroom forest generation

* makes it work

* Update Ouroboros.dmm

* Update Ouroboros.dmm

* Update signals_atom.dm

* Update signals_atom.dm

* :)

* spawnable colony kit, atmospherics changes for forest, eclipse? new map eclipse base

* Update particle_weather.dm

* fixes

* Update misc_procs.dm

* Delete wolf.dm

* fixes grass dug

* guh

* Update eclipse.dmm

* Update frontier.dm

* Update frontier.dm

* Update new_turfs.dm

* -2 for eclipse

* eclipse is halved

* fixes bulk splits breaking liquids for the rest of the round

* more colony stuff

* Update new_turfs.dm

* Update food_or_drink.dm

* Update all_nodes.dm

* Update all_nodes.dm

* misc fixes

* fixes rain sounds on eclipse

* adds seedmesh design to organic printer

* removes some plushies

* removes another plush

* fixes

* better sounds for eclipse

* Update areas.dm

* adds a way to have mobs temporarily target objects until hit

* restart spawner signal

* Update new_turfs.dm

* fixes bloom

* removes bb block

* Update VoidRaptor.dmm

* fixes maps

* adds wall lockers and shelf recipes

* base of the extractor

* new icons

* fixes

* Update armament.dm

* alot of new stuff all at once

* whoops

* whoops

* Update AntagInfoAssaultops.tsx

* more stuff

* Update CentCom.dmm

* Update goldeneye_cruiser.dmm

* more fixes

* Update _base_event.dm

* whoops

* stamps

* voidraptor and blueshift maint access cleanup

* Update Ouroboros.dmm

* Update Ouroboros.dmm

* changes

* access fixes pinpointers

* Update goldeneye_cruiser.dmm

* removes the forced event after run

* reruns update_icon_state to force the empty mags to be empty

* Portal To Hell

* fixes

* Update rust_g.dll

* admin retirement home

* Revert "admin retirement home"

This reverts commit 42588d3.

* Update misc_pets.dm

* Update machinery.dm

* missing icons

* Update new_turfs.dm

* fixes

* more stuff

* changes

* Update shuttle.dm

* Update shuttle.dm

* Update VoidRaptor.dmm

* fixes

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
  • Loading branch information
dwasint and GoldenAlpharex committed Jul 26, 2024
1 parent fc87de8 commit ff1faff
Show file tree
Hide file tree
Showing 206 changed files with 478,079 additions and 68,011 deletions.
129 changes: 26 additions & 103 deletions _maps/map_files/Blueshift/Blueshift.dmm

Large diffs are not rendered by default.

212,916 changes: 212,916 additions & 0 deletions _maps/map_files/Ouroboros/Ouroboros.dmm

Large diffs are not rendered by default.

152,413 changes: 152,413 additions & 0 deletions _maps/map_files/Voidraptor/VoidRaptor.dmm

Large diffs are not rendered by default.

136,930 changes: 69,322 additions & 67,608 deletions _maps/map_files/generic/CentCom.dmm

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions _maps/ouroboros.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"map_name": "Ouroboros",
"map_path": "map_files/Ouroboros",
"map_file": "Ouroboros.dmm",
"shuttles": {
"emergency": "emergency_nova",
"ferry": "ferry_fancy",
"mining": "mining_nova_large",
"cargo": "cargo_ouroboros",
"whiteship": "whiteship_ouroboros"
},
"traits": [
{
"Up": true,
"Baseturf": "/turf/open/misc/asteroid/moon/airless",
"Linkage": "Cross"
},
{
"Down": true,
"Baseturf": "/turf/open/openspace",
"Linkage": "Cross"
}
],
"job_changes": {
"Captain": {
"special_charter": "asteroid field"
}
}
}
337 changes: 337 additions & 0 deletions _maps/shuttles/nova/cargo_nova_delta.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,337 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aK" = (
/obj/structure/marker_beacon/burgundy,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/supply)
"bh" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/supply)
"dO" = (
/obj/structure/marker_beacon/burgundy,
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"fh" = (
/obj/structure/fluff/metalpole/end{
dir = 1;
pixel_y = 32
},
/turf/closed/wall/mineral/titanium/spaceship/nodiagonal,
/area/shuttle/supply)
"hv" = (
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/west,
/turf/open/floor/iron/dark/diagonal,
/area/shuttle/supply)
"hC" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
/turf/open/floor/iron/dark/diagonal,
/area/shuttle/supply)
"hV" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/caution/white{
dir = 4
},
/turf/open/floor/iron/shuttle/cargo{
dir = 1
},
/area/shuttle/supply)
"kh" = (
/turf/closed/wall/mineral/titanium/spaceship,
/area/shuttle/supply)
"lb" = (
/obj/docking_port/mobile/supply{
dir = 4
},
/obj/machinery/door/airlock/grunge{
name = "Supply Shuttle Airlock";
req_access = list("cargo")
},
/obj/effect/turf_decal/delivery/white,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/supply)
"oU" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
/obj/effect/turf_decal/box/white/corners{
dir = 8
},
/turf/open/floor/iron/dark/diagonal,
/area/shuttle/supply)
"pD" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark/diagonal,
/area/shuttle/supply)
"sN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
/obj/effect/turf_decal/box/white/corners,
/turf/open/floor/iron/dark/diagonal,
/area/shuttle/supply)
"sR" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/shuttle/cargo{
dir = 1
},
/area/shuttle/supply)
"uB" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
/obj/effect/turf_decal/box/white/corners,
/obj/effect/turf_decal/box/white/corners{
dir = 8
},
/turf/open/floor/iron/dark/diagonal,
/area/shuttle/supply)
"vd" = (
/obj/machinery/conveyor{
dir = 8;
id = "cargounload"
},
/obj/machinery/door/poddoor{
id = "cargounload";
name = "Supply Dock Unloading Door"
},
/turf/open/floor/plating,
/area/shuttle/supply)
"wI" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/loading_area/white{
dir = 4
},
/turf/open/floor/iron/shuttle/cargo{
dir = 1
},
/area/shuttle/supply)
"zx" = (
/turf/closed/wall/mineral/titanium/spaceship/nodiagonal,
/area/shuttle/supply)
"zP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
/obj/effect/turf_decal/box/white/corners{
dir = 1
},
/obj/effect/turf_decal/box/white/corners{
dir = 4
},
/obj/structure/sign/warning/directional/west,
/turf/open/floor/iron/dark/diagonal,
/area/shuttle/supply)
"CR" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/power/shuttle_engine/propulsion{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/supply)
"Gf" = (
/obj/machinery/door/poddoor{
id = "cargoload";
name = "Supply Dock Loading Door"
},
/obj/machinery/conveyor{
dir = 4;
id = "cargoload"
},
/turf/open/floor/plating,
/area/shuttle/supply)
"Ow" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
/obj/effect/turf_decal/box/white/corners{
dir = 4
},
/turf/open/floor/iron/dark/diagonal,
/area/shuttle/supply)
"PH" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
/obj/structure/sign/warning/no_smoking/circle/directional/east,
/turf/open/floor/iron/dark/diagonal,
/area/shuttle/supply)
"SL" = (
/obj/structure/marker_beacon/olive,
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"Uj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/loading_area/white{
dir = 8
},
/turf/open/floor/iron/shuttle/cargo{
dir = 1
},
/area/shuttle/supply)
"UC" = (
/obj/machinery/button/door/directional/west{
id = "cargoload";
name = "Loading Doors";
pixel_y = -8
},
/obj/machinery/button/door/directional/west{
id = "cargounload";
name = "Loading Doors";
pixel_y = 8
},
/obj/machinery/light/directional/west,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/shuttle/cargo{
dir = 1
},
/area/shuttle/supply)
"UX" = (
/obj/structure/marker_beacon/olive,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/supply)
"VP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/diagonal_edge,
/obj/effect/turf_decal/tile/neutral/diagonal_centre,
/obj/effect/turf_decal/box/white/corners{
dir = 1
},
/turf/open/floor/iron/dark/diagonal,
/area/shuttle/supply)
"Xb" = (
/obj/machinery/door/airlock/grunge{
name = "Supply Shuttle Airlock";
req_access = list("cargo")
},
/obj/effect/turf_decal/delivery/white,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/supply)
"Xe" = (
/obj/structure/window/reinforced/plasma/spawner/directional/south,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/power/shuttle_engine/heater{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/supply)
"Zh" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/power/shuttle_engine/propulsion{
dir = 1
},
/obj/structure/fluff/metalpole/end{
dir = 1;
pixel_y = 32
},
/turf/open/floor/plating/airless,
/area/shuttle/supply)

(1,1,1) = {"
kh
zx
UX
vd
lb
bh
Xb
Gf
bh
bh
bh
SL
"}
(2,1,1) = {"
Zh
Xe
sR
Uj
hV
UC
hV
wI
zP
hv
uB
bh
"}
(3,1,1) = {"
CR
Xe
sR
sR
sR
sR
sR
sR
sR
sR
sR
bh
"}
(4,1,1) = {"
fh
zx
VP
hC
hC
oU
sR
VP
hC
hC
oU
bh
"}
(5,1,1) = {"
CR
Xe
hC
hC
hC
hC
sR
hC
hC
hC
hC
bh
"}
(6,1,1) = {"
Zh
Xe
Ow
pD
hC
sN
sR
Ow
PH
pD
sN
bh
"}
(7,1,1) = {"
kh
zx
aK
bh
bh
bh
bh
bh
bh
bh
bh
dO
"}
Loading

0 comments on commit ff1faff

Please sign in to comment.