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.

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

Ship vs ship revival #4326

Closed
wants to merge 7 commits into from
Closed

Conversation

Tsunamico
Copy link
Contributor

@Tsunamico Tsunamico commented Sep 3, 2023

About the pull request

This mnay not be Creedence Clearwater, but I'm damn sure it's a revival!

Starts a bit more of work into the Ship vs Ship systems already implemented!

Explain why it's good for the game

Ship vs Ship makes Shipside people go yay.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Added 3 new weapons to smack the ship with.
del: Nuked the Red Alert restriction that was on the General Quarters code for good.
refactor: Made the General Quarters call itself a standalone proc.
admin: Adds a panel to check the ship's health for Staff.
/:cl:

@github-actions github-actions bot added Feature Feature coder badge Removal snap Refactor Make the code harder to read labels Sep 3, 2023
Comment on lines +19 to +30
GLOBAL_LIST_INIT(ship_hits_tally, list(
"times_hit_missile" = 0,
"times_hit_railgun" = 0,
"times_hit_odc" = 0,
"times_hit_aaboiler" = 0,
))

//Ship's HP! ShipvsShip baybeee
GLOBAL_LIST_INIT(ship_health_vars, list(
"ship_hull_health" = 100,
"ship_systems_health" = 100,
))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i feel like the ship being a datum is better

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An example of this specific code being datumized was here (but unfinished) #3355 / #3647

@@ -97,6 +97,66 @@
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(weaponhits), 2, picked_atom, point_defense), hiteta SECONDS)
message_admins("[key_name_admin(src)] Fired a single Railgun Slug at the Almayer at a random location, [picked_atom], with the possibility of missing as [point_defense]")

if("Orb. Def. Cannon")
if(exactplace == TRUE)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can just do if(exactplace) for truthy and if(!exactplace) for falsey

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:true:

if("Orb. Def. Cannon")
if(exactplace == TRUE)
shipwide_ai_announcement("DANGER: ORBITAL DEFENSES ENGAGING, INCOMING SHOT. BRACE, BRACE, BRACE. ESTIMATED TIME: [hiteta] SECONDS." , MAIN_AI_SYSTEM, 'sound/effects/missile_warning.ogg')
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(weaponhits), 3, mob.loc, point_defense), hiteta SECONDS)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you know that the mob's loc will always be a turf?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be misuse if it wasn't, it's for an admin to aim it at somewhere in a ship (Which kinda most certainly gonna be a turf) and then firin' it

@@ -16,6 +22,7 @@
* * salvo - identifies it as a salvo or not.
*/
/proc/weaponhits(weaponused, location, point_defense = FALSE, salvo = FALSE)
var/logtotalhits


switch(weaponused)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

everything in this file (weapons, what they do for damage, etc.) should 100% be datums

@morrowwolf
Copy link
Member

Staled, re-open when review is complete.

@morrowwolf morrowwolf closed this Sep 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Refactor Make the code harder to read Removal snap
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants