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

Jump to bottom

Thour tiny tutorial tweaks (and a unit test) #5695

Merged
merged 6 commits into from
Feb 12, 2024
Merged

Thour tiny tutorial tweaks (and a unit test) #5695

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5014927
Autoclose UI on tutorial start
SabreML Feb 7, 2024
b10974c
Basic xeno tutorial ID
SabreML Feb 7, 2024
38c03c9
Tutorial xeno no age prefix
SabreML Feb 7, 2024
a595b97
Tutorial unit test (Failure check)
SabreML Feb 11, 2024
27e38e6
Uncommenting (Success check)
SabreML Feb 11, 2024
4632c9a
`return TRUE`
SabreML Feb 12, 2024
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
1 change: 1 addition & 0 deletions code/datums/tutorial/_tutorial.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ GLOBAL_LIST_EMPTY_TYPED(ongoing_tutorials, /datum/tutorial)

reservation = SSmapping.RequestBlockReservation(initial(tutorial_template.width), initial(tutorial_template.height))
if(!reservation)
abort_tutorial()
return FALSE

var/turf/bottom_left_corner_reservation = locate(reservation.bottom_left_coords[1], reservation.bottom_left_coords[2], reservation.bottom_left_coords[3])
Expand Down
4 changes: 2 additions & 2 deletions code/datums/tutorial/_tutorial_menu.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@
return

path = new path
path.start_tutorial(usr)
return TRUE
SabreML marked this conversation as resolved.
Show resolved Hide resolved
if(path.start_tutorial(usr))
ui.close()
4 changes: 4 additions & 0 deletions code/datums/tutorial/xenomorph/_xenomorph.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@

// We don't want people talking to other xenomorphs across tutorials
new_character.can_hivemind_speak = FALSE
// No age prefix or HUD element
new_character.age = XENO_NO_AGE
new_character.show_age_prefix = FALSE
new_character.generate_name()

tutorial_mob = new_character
xeno = new_character
Expand Down
5 changes: 4 additions & 1 deletion code/datums/tutorial/xenomorph/xenomorph_basic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
name = "Xenomorph - Basic"
desc = "A tutorial to get you acquainted with the very basics of how to play a xenomorph."
icon_state = "xeno"
tutorial_id = "xeno_basic_1"
SabreML marked this conversation as resolved.
Show resolved Hide resolved
tutorial_template = /datum/map_template/tutorial/s12x12
starting_xenomorph_type = /mob/living/carbon/xenomorph/drone

Expand Down Expand Up @@ -105,7 +106,7 @@

UnregisterSignal(human_dummy, COMSIG_MOB_DEATH)
message_to_player("Well done. Killing humans is one of many ways to help the hive.")
message_to_player("Another way is to <b>capture</b> them. This will grow a new xenomorph inside them which will eventually burst into a new playable xenomorph!")
message_to_player("Another way is to <b>capture</b> them. This will grow a new xenomorph inside them which will eventually burst into a new playable xenomorph!")
addtimer(CALLBACK(human_dummy, TYPE_PROC_REF(/mob/living, rejuvenate)), 8 SECONDS)
addtimer(CALLBACK(src, PROC_REF(proceed_to_tackle_phase)), 10 SECONDS)

Expand Down Expand Up @@ -227,3 +228,5 @@

/datum/tutorial/xenomorph/basic/init_map()
loc_from_corner(9,0).ChangeTurf(/turf/closed/wall/resin/tutorial)

#undef WAITING_HEALTH_THRESHOLD
Loading