Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Overmap 4.6: Anomalous Activity #1991

Merged
merged 51 commits into from
Jun 30, 2023
Merged

Overmap 4.6: Anomalous Activity #1991

Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
6b84413
Does The Thing
Erikafox May 29, 2023
a323f49
linterinos?
Erikafox May 29, 2023
02ed49e
update
Erikafox May 29, 2023
3be7a7a
Update RockGenerator.dm
Erikafox May 29, 2023
f434ea5
Update anomalies_bioscrambler.dm
Erikafox May 30, 2023
cc89df8
Update anomalies.dm
Erikafox May 30, 2023
eff8f8b
workworkwork
Erikafox Jun 2, 2023
d4b84eb
bhhhhhh
Erikafox Jun 2, 2023
6f7a84d
h
Erikafox Jun 2, 2023
68a3cfd
d
Erikafox Jun 2, 2023
83cb4d6
as
Erikafox Jun 2, 2023
fef0f00
Update anomalies_static.dm
Erikafox Jun 4, 2023
864c1dc
Update anomalies_static.dm
Erikafox Jun 4, 2023
066f9cc
Update anomalies_static.dm
Erikafox Jun 4, 2023
58a7c86
Finishes the PR for real this time
Erikafox Jun 6, 2023
9813241
Merge branch 'master' into planetary-anomalies
Erikafox Jun 7, 2023
239938f
I could have sworn I removed this.
Erikafox Jun 8, 2023
01f17bb
Merge remote-tracking branch 'upstream/master' into planetary-anomalies
Erikafox Jun 9, 2023
96ea168
Merge branch 'master' into planetary-anomalies
Erikafox Jun 9, 2023
9b302e5
Update WasteGenerator.dm
Erikafox Jun 9, 2023
aa18542
Update WasteGenerator.dm
Erikafox Jun 9, 2023
3397ec7
Merge remote-tracking branch 'upstream/master' into planetary-anomalies
Erikafox Jun 9, 2023
f3519ec
Update SnowGenerator.dm
Erikafox Jun 9, 2023
229a97f
unthrongles for the fourth time
Erikafox Jun 9, 2023
d706e14
balance changes from tm
Erikafox Jun 9, 2023
a722c41
more improvements
Erikafox Jun 9, 2023
b75e9bb
Update anomalies_plasmasoul.dm
Erikafox Jun 9, 2023
bf3b334
Update anomalies_melter.dm
Erikafox Jun 10, 2023
72e49c9
update
Erikafox Jun 10, 2023
eaaa271
Merge remote-tracking branch 'upstream/master' into planetary-anomalies
Erikafox Jun 16, 2023
ba5a305
Merge remote-tracking branch 'upstream/master' into planetary-anomalies
Erikafox Jun 16, 2023
6c5e712
Update curse.dm
Erikafox Jun 16, 2023
ce9e5bf
update
Erikafox Jun 17, 2023
6559138
reduces spawn chances More
Erikafox Jun 18, 2023
4d07c56
Update SandGenerator.dm
Erikafox Jun 18, 2023
88d18e3
Update lootdrop.dm
Erikafox Jun 18, 2023
369e168
Update lootdrop.dm
Erikafox Jun 19, 2023
8c91617
more updates
Erikafox Jun 20, 2023
0ac3f04
trying more changes
Erikafox Jun 21, 2023
8e8a8fc
cleans the code up more
Erikafox Jun 25, 2023
a5bbb38
final adjustment
Erikafox Jun 25, 2023
9acc158
Apply suggestions from code review
Erikafox Jun 27, 2023
a9f17f1
Update code/modules/mob/living/carbon/status_procs.dm
Erikafox Jun 27, 2023
1c22c7d
Update code/game/objects/effects/anomalies/anomalies_bluespace.dm
Erikafox Jun 27, 2023
938e7e6
Update code/game/objects/effects/anomalies/anomalies_vortex.dm
Erikafox Jun 27, 2023
142ffb8
Update anomalies_hallucination.dm
Erikafox Jun 27, 2023
0fc9b30
changes
Erikafox Jun 27, 2023
fcd169e
Merge branch 'planetary-anomalies' of https://github.com/Bjarl/Shipte…
Erikafox Jun 27, 2023
394bc4f
Merge remote-tracking branch 'upstream/master' into planetary-anomalies
Erikafox Jun 27, 2023
2cbc9be
Update anomalies_hallucination.dm
Erikafox Jun 27, 2023
6b03aab
Update _anomalies.dm
Erikafox Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions code/__DEFINES/anomalies.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
///Defines for the different types of explosion a flux anomaly can have
#define FLUX_NO_EXPLOSION 0
#define FLUX_EXPLOSIVE 1
#define FLUX_LOW_EXPLOSIVE 2

/// Chance of anomalies moving every process tick
#define ANOMALY_MOVECHANCE 45
11 changes: 11 additions & 0 deletions code/__DEFINES/maths.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,3 +272,14 @@
. += 180
else if(dx < 0)
. += 360


/// Converts a probability/second chance to probability/seconds_per_tick chance
/// For example, if you want an event to happen with a 10% per second chance, but your proc only runs every 5 seconds, do `if(prob(100*SPT_PROB_RATE(0.1, 5)))`
#define SPT_PROB_RATE(prob_per_second, seconds_per_tick) (1 - (1 - (prob_per_second)) ** (seconds_per_tick))

//make spawners use this -Erika

/// Like SPT_PROB_RATE but easier to use, simply put `if(SPT_PROB(10, 5))`
#define SPT_PROB(prob_per_second_percent, seconds_per_tick) (prob(100*SPT_PROB_RATE((prob_per_second_percent)/100, (seconds_per_tick))))
// )
3 changes: 2 additions & 1 deletion code/datums/mapgen/planetary/JungleGenerator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@
feature_spawn_chance = 0.5
feature_spawn_list = list(
/obj/item/pickaxe/rusted = 1,
/obj/structure/spawner/ice_moon = 1
/obj/structure/spawner/ice_moon = 1,
/obj/effect/spawner/lootdrop/anomaly/jungle = 1
)

/datum/biome/cave/jungle/dirt
Expand Down
9 changes: 6 additions & 3 deletions code/datums/mapgen/planetary/LavaGenerator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@
feature_spawn_list = list(
/obj/structure/flora/rock/hell = 5,
/obj/structure/elite_tumor = 1,
/obj/structure/geyser/random = 1
/obj/structure/geyser/random = 1,
/obj/effect/spawner/lootdrop/anomaly/lava = 0.5

)
mob_spawn_chance = 4
mob_spawn_list = list(
Expand Down Expand Up @@ -157,8 +159,9 @@
)
feature_spawn_chance = 5
feature_spawn_list = list(
/obj/structure/flora/tree/dead/barren = 1,
/obj/structure/flora/tree/dead/tall/grey = 1,
/obj/structure/flora/tree/dead/barren = 50,
/obj/structure/flora/tree/dead/tall/grey = 45,
/obj/effect/spawner/lootdrop/anomaly/lava = 5
)

/datum/biome/lavaland/plains/dense/mixed
Expand Down
22 changes: 17 additions & 5 deletions code/datums/mapgen/planetary/RockGenerator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,13 @@
/datum/biome/rock
open_turf_types = list(/turf/open/floor/plating/asteroid/rockplanet/lit = 1)

feature_spawn_chance = 0.1
feature_spawn_list = list(/obj/structure/geyser/random = 1, /obj/structure/elite_tumor = 2)
feature_spawn_chance = 0.25
feature_spawn_list = list(
/obj/structure/geyser/random = 8,
/obj/structure/elite_tumor = 4,
/obj/effect/spawner/lootdrop/anomaly/rock = 1,
/obj/effect/spawner/lootdrop/anomaly/big = 0.1 //get out of here stalker
)

flora_spawn_chance = 5
mob_spawn_chance = 3
Expand All @@ -105,7 +110,9 @@
)

/datum/biome/rock/icecap
open_turf_types = list(/turf/open/floor/plating/asteroid/snow/lit/rockplanet = 1, /turf/open/floor/plating/asteroid/snow/lit/rockplanet = 5)
open_turf_types = list(
/turf/open/floor/plating/asteroid/snow/lit/rockplanet = 1,
/turf/open/floor/plating/asteroid/snow/lit/rockplanet = 5)
flora_spawn_chance = 1
mob_spawn_chance = 2

Expand Down Expand Up @@ -138,8 +145,13 @@
/obj/structure/flora/ash/fern = 2,
/obj/structure/flora/ash/puce = 1,
)
feature_spawn_chance = 0.3
feature_spawn_list = list(/obj/structure/geyser/random = 1, /obj/structure/elite_tumor = 2, /obj/structure/spawner/ice_moon/rockplanet = 4)
feature_spawn_chance = 0.5
feature_spawn_list = list(
/obj/structure/geyser/random = 2,
/obj/structure/elite_tumor = 1,
/obj/structure/spawner/ice_moon/rockplanet = 4,
/obj/effect/spawner/lootdrop/anomaly/rock/cave = 1,
)
mob_spawn_chance = 6
mob_spawn_list = list(
/mob/living/simple_animal/hostile/netherworld/asteroid = 20,
Expand Down
25 changes: 21 additions & 4 deletions code/datums/mapgen/planetary/SandGenerator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,11 @@
/obj/structure/flora/ash/stem_shroom = 4 ,
)
feature_spawn_chance = 0.1
feature_spawn_list = list(/obj/structure/geyser/random = 1, /obj/structure/elite_tumor = 2)
feature_spawn_list = list(
/obj/structure/geyser/random = 8,
/obj/structure/elite_tumor = 4,
/obj/effect/spawner/lootdrop/anomaly/sand = 1,
)
mob_spawn_chance = 4
mob_spawn_list = list(
/mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50,
Expand All @@ -100,7 +104,13 @@
)

/datum/biome/sand/wasteland
open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands/lit = 50, /turf/open/floor/plating/asteroid/whitesands/dried/lit = 40, /turf/closed/mineral/random/whitesands = 20, /turf/closed/wall/mineral/titanium/survival/pod = 1, /turf/closed/wall/rust = 1)
open_turf_types = list(
/turf/open/floor/plating/asteroid/whitesands/lit = 50,
/turf/open/floor/plating/asteroid/whitesands/dried/lit = 40,
/turf/closed/mineral/random/whitesands = 20,
/turf/closed/wall/mineral/titanium/survival/pod = 1,
/turf/closed/wall/rust = 1
)
flora_spawn_chance = 20
flora_spawn_list = list(
/obj/structure/flora/ash/leaf_shroom = 4,
Expand Down Expand Up @@ -170,15 +180,22 @@

/datum/biome/cave/sand
closed_turf_types = list(/turf/closed/mineral/random/whitesands = 1)
open_turf_types = list(/turf/open/floor/plating/asteroid/whitesands = 5, /turf/open/floor/plating/asteroid/whitesands/dried = 1)
open_turf_types = list(
/turf/open/floor/plating/asteroid/whitesands = 5,
/turf/open/floor/plating/asteroid/whitesands/dried = 1
)
flora_spawn_chance = 4
flora_spawn_list = list(
/obj/structure/flora/rock = 4,
/obj/structure/flora/rock/pile = 4,
/obj/structure/flora/ash/fern = 2,
/obj/structure/flora/ash/puce = 1,
)
feature_spawn_list = list(/obj/structure/geyser/random = 1, /obj/structure/elite_tumor = 2)
feature_spawn_list = list(
/obj/structure/geyser/random = 4,
/obj/structure/elite_tumor = 4,
/obj/effect/spawner/lootdrop/anomaly/sand/cave = 1
)
mob_spawn_chance = 4
mob_spawn_list = list(
/mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50,
Expand Down
37 changes: 18 additions & 19 deletions code/datums/mapgen/planetary/SnowGenerator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,11 @@
)
feature_spawn_chance = 0.1
feature_spawn_list = list(
/obj/structure/spawner/ice_moon/demonic_portal = 1,
/obj/structure/spawner/ice_moon/demonic_portal/ice_whelp = 1,
/obj/structure/spawner/ice_moon/demonic_portal/snowlegion = 1
/obj/effect/spawner/lootdrop/anomaly/ice = 12,
/obj/effect/spawner/lootdrop/anomaly/big = 1,
/obj/structure/spawner/ice_moon/demonic_portal/low_threat = 25,
/obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 50,
/obj/structure/spawner/ice_moon/demonic_portal/high_threat = 13
)

/datum/biome/snow/lush
Expand Down Expand Up @@ -205,10 +207,12 @@
)
feature_spawn_chance = 0.3
feature_spawn_list = list(
/obj/structure/spawner/ice_moon/demonic_portal/low_threat = 25,
/obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 50,
/obj/structure/spawner/ice_moon/demonic_portal/high_threat = 13,
/obj/structure/spawner/ice_moon/demonic_portal/extreme_threat = 12
/obj/effect/spawner/lootdrop/anomaly/ice = 1,
/obj/effect/spawner/lootdrop/anomaly/big = 0.01,
/obj/structure/spawner/ice_moon/demonic_portal/low_threat = 3,
/obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 5,
/obj/structure/spawner/ice_moon/demonic_portal/high_threat = 0.5,
/obj/structure/spawner/ice_moon/demonic_portal/extreme_threat = 0.01
)


Expand Down Expand Up @@ -256,11 +260,13 @@
)
feature_spawn_chance = 0.2
feature_spawn_list = list(
/obj/structure/spawner/ice_moon/demonic_portal = 1,
/obj/structure/spawner/ice_moon/demonic_portal/ice_whelp = 1,
/obj/structure/spawner/ice_moon/demonic_portal/snowlegion = 1,
/obj/structure/spawner/ice_moon = 1,
/obj/structure/spawner/ice_moon/polarbear = 1
/obj/structure/spawner/ice_moon/demonic_portal/low_threat = 3,
/obj/structure/spawner/ice_moon/demonic_portal/medium_threat = 5,
/obj/structure/spawner/ice_moon/demonic_portal/high_threat = 0.6,
/obj/structure/spawner/ice_moon/demonic_portal/extreme_threat = 0.2,
/obj/structure/spawner/ice_moon = 3,
/obj/structure/spawner/ice_moon/polarbear = 3,
/obj/effect/spawner/lootdrop/anomaly/ice/cave = 1
)

/datum/biome/cave/snow/thawed
Expand Down Expand Up @@ -304,13 +310,6 @@
/obj/structure/flora/ash/stem_shroom = 1,
)
feature_spawn_chance = 0.2
feature_spawn_list = list(
/obj/structure/spawner/ice_moon/demonic_portal = 1,
/obj/structure/spawner/ice_moon/demonic_portal/ice_whelp = 1,
/obj/structure/spawner/ice_moon/demonic_portal/snowlegion = 1,
/obj/structure/spawner/ice_moon = 3,
/obj/structure/spawner/ice_moon/polarbear = 3,
)

/datum/biome/cave/volcanic/lava
open_turf_types = list(
Expand Down
10 changes: 5 additions & 5 deletions code/datums/mapgen/planetary/WasteGenerator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@
feature_spawn_list = list(
/obj/effect/radiation/waste = 30,
/obj/effect/radiation/waste/intense = 10,
/obj/structure/geyser/random = 1
/obj/structure/geyser/random = 1,
/obj/effect/spawner/lootdrop/anomaly/waste = 1
)

mob_spawn_list = list(
Expand Down Expand Up @@ -313,7 +314,8 @@
feature_spawn_list = list(
/obj/effect/radiation/waste = 30,
/obj/effect/radiation/waste/intense = 10,
/obj/structure/geyser/random = 1
/obj/structure/geyser/random = 1,
/obj/effect/spawner/lootdrop/anomaly/waste/cave = 1
)
mob_spawn_list = list(
/mob/living/simple_animal/hostile/hivebot/strong/rockplanet = 70,
Expand All @@ -324,9 +326,7 @@
/mob/living/simple_animal/hostile/abandoned_minebot = 15,
/mob/living/simple_animal/bot/floorbot/rockplanet = 15,
)
feature_spawn_list = list(
/obj/effect/radiation = 30,
)

flora_spawn_chance = 30
feature_spawn_chance = 4
mob_spawn_chance = 5
Expand Down
Loading