Skip to content

Commit

Permalink
Adds Sprites for Overmap Storm Severities (#3578)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Gives storms some visual differentiation from the minor/moderate/major
versions, adding some visual flavor and readability.


![image](https://github.com/user-attachments/assets/9d4ec565-d207-4a2b-9644-b4861788452f)

### Meteors:

![image](https://github.com/user-attachments/assets/9a10bb88-9908-4535-b9cb-b927ea4d0ab4)

### Electrical Storms:

![image](https://github.com/user-attachments/assets/0dabba78-eab6-4d86-bf01-7e59f055eda5)

### Carp Storms:

![image](https://github.com/user-attachments/assets/4f7cd59d-a934-4637-902f-f68a4ffc6a9c)


## Why It's Good For The Game

A ton of people have complained about not being able to pick apart
various storm severities, and this makes it pretty obvious which ones
will MURDER YOU AND YOUR CREW and which ones will pleasantly tickle your
hull

## Changelog

:cl:
fix: fallback sprite for dust storms was set to the carp sprite for some
reason.
imageadd: fancy new carp, meteor, and electrical storm
imagedel: old carp, meteor, and electrical storm sprites
/:cl:
(soul: taken out back and shot)

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Orchidthederg authored Oct 18, 2024
1 parent 751f286 commit 9d27e3b
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 9 deletions.
44 changes: 35 additions & 9 deletions code/modules/overmap/objects/event_datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
/datum/overmap/event/meteor
name = "asteroid field (moderate)"
desc = "An area of space rich with asteroids, going fast through here could prove dangerous"
token_icon_state = "meteor1"
token_icon_state = "meteor_moderate1"
chance_to_affect = 15
spread_chance = 50
chain_rate = 4
Expand All @@ -55,7 +55,15 @@

/datum/overmap/event/meteor/Initialize(position, ...)
. = ..()
token.icon_state = "meteor[rand(1, 4)]"
switch(type) //woop! this picks one of two icon states for the severity of the storm in overmap.dmi
if(/datum/overmap/event/meteor/minor)
token.icon_state = "meteor_minor[rand(1, 2)]"
if(/datum/overmap/event/meteor)
token.icon_state = "meteor_moderate[rand(1, 2)]"
if(/datum/overmap/event/meteor/major)
token.icon_state = "meteor_major[rand(1, 2)]"
else
token.icon_state = "meteor_moderate1"
token.color = "#a08444"
token.light_color = "#a08444"
token.update_appearance()
Expand Down Expand Up @@ -133,7 +141,7 @@
/datum/overmap/event/electric
name = "electrical storm (moderate)"
desc = "A spatial anomaly, an unfortunately common sight on the frontier. Disturbing it tends to lead to intense electrical discharges"
token_icon_state = "electrical1"
token_icon_state = "electrical_moderate1"
chance_to_affect = 15
spread_chance = 30
chain_rate = 3
Expand All @@ -143,7 +151,16 @@

/datum/overmap/event/electric/Initialize(position, ...)
. = ..()
token.icon_state = "electrical[rand(1, 4)]"
switch(type) //woop! this picks one of two icon states for the severity of the storm in overmap.dmi
if(/datum/overmap/event/electric/minor)
token.icon_state = "electrical_minor[rand(1, 2)]"
if(/datum/overmap/event/electric)
token.icon_state = "electrical_moderate[rand(1, 2)]"
if(/datum/overmap/event/electric/major)
token.icon_state = "electrical_major[rand(1, 2)]"
else
token.icon_state = "electrical_moderate1"

token.color = "#e8e85c"
token.light_color = "#e8e85c"
token.update_appearance()
Expand Down Expand Up @@ -218,7 +235,7 @@
/datum/overmap/event/meteor/carp
name = "carp migration (moderate)"
desc = "A migratory school of space carp. They travel at high speeds, and flying through them may cause them to impact your ship"
token_icon_state = "carp1"
token_icon_state = "carp_moderate1"
chance_to_affect = 15
spread_chance = 50
chain_rate = 4
Expand All @@ -230,15 +247,24 @@

/datum/overmap/event/meteor/carp/Initialize(position, ...)
. = ..()
token.icon_state = "carp[rand(1, 4)]"
switch(type) //woop! this picks one of two icon states for the severity of the storm in overmap.dmi
if(/datum/overmap/event/meteor/carp/minor)
token.icon_state = "carp_minor[rand(1, 2)]"
if(/datum/overmap/event/meteor/carp)
token.icon_state = "carp_moderate[rand(1, 2)]"
if(/datum/overmap/event/meteor/carp/major)
token.icon_state = "carp_major[rand(1, 2)]"
else
token.icon_state = "carp_moderate1"

token.color = "#7b1ca8"
token.light_color = "#7b1ca8"
token.update_icon()


/datum/overmap/event/meteor/carp/minor
name = "carp migration (minor)"
token_icon_state = "carp1"
token_icon_state = "carp_moderate1"
chance_to_affect = 5
spread_chance = 25
chain_rate = 4
Expand All @@ -249,7 +275,7 @@

/datum/overmap/event/meteor/carp/major
name = "carp migration (major)"
token_icon_state = "carp1"
token_icon_state = "carp_moderate1"
chance_to_affect = 25
spread_chance = 25
chain_rate = 4
Expand All @@ -263,7 +289,7 @@
/datum/overmap/event/meteor/dust
name = "dust cloud"
desc = "A cloud of spaceborne dust. Relatively harmless, unless you're travelling at relative speeds"
token_icon_state = "carp1"
token_icon_state = "dust1"
chance_to_affect = 30
spread_chance = 50
chain_rate = 4
Expand Down
Binary file modified icons/misc/overmap.dmi
Binary file not shown.

0 comments on commit 9d27e3b

Please sign in to comment.