Skip to content

Commit

Permalink
Removes Xeno PVTs, removes timelocks for prefixes. (#39)
Browse files Browse the repository at this point in the history
Co-authored-by: Morrow <[email protected]>
  • Loading branch information
private-tristan and morrowwolf authored Nov 2, 2023
1 parent af4fb30 commit 201dbc6
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 33 deletions.
11 changes: 5 additions & 6 deletions code/__DEFINES/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -358,12 +358,11 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_PLAYTIME_TIER_4 (175 HOURS)

#define XENO_NO_AGE -1
#define XENO_YOUNG 0
#define XENO_NORMAL 1
#define XENO_MATURE 2
#define XENO_ELDER 3
#define XENO_ANCIENT 4
#define XENO_PRIME 5
#define XENO_NORMAL 0
#define XENO_MATURE 1
#define XENO_ELDER 2
#define XENO_ANCIENT 3
#define XENO_PRIME 4

/// For monthly time tracking
#define JOB_OBSERVER "Observer"
Expand Down
8 changes: 4 additions & 4 deletions code/modules/asset_cache/asset_list_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@

/datum/asset/spritesheet/playtime_rank/register()
var/icon_file = 'icons/mob/hud/hud.dmi'
var/tier1_state = "hudxenoupgrade2"
var/tier2_state = "hudxenoupgrade3"
var/tier3_state = "hudxenoupgrade4"
var/tier4_state = "hudxenoupgrade5"
var/tier1_state = "hudxenoupgrade1"
var/tier2_state = "hudxenoupgrade2"
var/tier3_state = "hudxenoupgrade3"
var/tier4_state = "hudxenoupgrade4"

var/icon/tier1_icon = icon(icon_file, tier1_state, SOUTH)
var/icon/tier2_icon = icon(icon_file, tier2_state, SOUTH)
Expand Down
21 changes: 6 additions & 15 deletions code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1394,15 +1394,11 @@ var/const/MAX_SAVE_SLOTS = 10

var/prefix_length = length(new_xeno_prefix)

if(prefix_length>3)
if(prefix_length > 3)
to_chat(user, SPAN_WARNING(FONT_SIZE_BIG("Invalid Xeno Prefix. Your Prefix can only be up to 3 letters long.")))
return

if(prefix_length==3)
var/playtime = user.client.get_total_xeno_playtime()
if(playtime < 124 HOURS)
to_chat(user, SPAN_WARNING(FONT_SIZE_BIG("You need to play [time_left_until(124 HOURS, playtime, 1 HOURS)] more hours to unlock xeno three letter prefix.")))
return
if(prefix_length == 3)
if(xeno_postfix)
to_chat(user, SPAN_WARNING(FONT_SIZE_BIG("You can't use three letter prefix with any postfix.")))
return
Expand All @@ -1427,12 +1423,8 @@ var/const/MAX_SAVE_SLOTS = 10
to_chat(user, SPAN_WARNING(FONT_SIZE_BIG("You are banned from xeno name picking.")))
xeno_postfix = ""
return
var/playtime = user.client.get_total_xeno_playtime()
if(playtime < 24 HOURS)
to_chat(user, SPAN_WARNING(FONT_SIZE_BIG("You need to play [time_left_until(24 HOURS, playtime, 1 HOURS)] more hours to unlock xeno postfix.")))
return

if(length(xeno_prefix)==3)
if(length(xeno_prefix) == 3)
to_chat(user, SPAN_WARNING(FONT_SIZE_BIG("You can't use three letter prefix with any postfix.")))
return

Expand All @@ -1449,23 +1441,22 @@ var/const/MAX_SAVE_SLOTS = 10
var/first_char = TRUE
for(var/i=1, i<=length(new_xeno_postfix), i++)
var/ascii_char = text2ascii(new_xeno_postfix,i)

switch(ascii_char)
// A .. Z
if(65 to 90) //Uppercase Letters will work on first char

if(length(xeno_prefix)!=2)
to_chat(user, SPAN_WARNING(FONT_SIZE_BIG("You can't use three letter prefix with any postfix.")))
return

if(!first_char && playtime < 300 HOURS)
to_chat(user, SPAN_WARNING(FONT_SIZE_BIG("You need to play [time_left_until(300 HOURS, playtime, 1 HOURS)] more hours to unlock double letter xeno postfix.")))
all_ok = FALSE
// 0 .. 9
if(48 to 57) //Numbers will work if not the first char
if(first_char)
all_ok = FALSE

else
all_ok = FALSE //everything else - won't

first_char = FALSE
if(all_ok)
xeno_postfix = new_xeno_postfix
Expand Down
6 changes: 0 additions & 6 deletions code/modules/mob/living/carbon/xenomorph/XenoUpgrade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
return

age = XENO_NORMAL
var/hours_as_xeno = client.get_total_xeno_playtime()
var/hours_as_caste = get_job_playtime(client, caste.caste_type)

switch(hours_as_caste)
Expand All @@ -16,16 +15,11 @@
if(JOB_PLAYTIME_TIER_4 to INFINITY)
age = XENO_PRIME

if(hours_as_xeno < JOB_PLAYTIME_TIER_1)
age = XENO_YOUNG

// For people who wish to remain anonymous
if(!client.prefs.playtime_perks)
age = XENO_NORMAL

switch(age)
if(XENO_YOUNG)
age_prefix = "Young "
if(XENO_NORMAL)
age_prefix = ""
if(XENO_MATURE)
Expand Down
2 changes: 0 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -414,8 +414,6 @@
if(queen_aged)
age_xeno()
switch(age)
if(XENO_YOUNG)
name = "[name_prefix]Young Queen" //Young
if(XENO_NORMAL)
name = "[name_prefix]Queen" //Regular
if(XENO_MATURE)
Expand Down
Binary file modified icons/mob/hud/hud.dmi
Binary file not shown.

0 comments on commit 201dbc6

Please sign in to comment.