cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improves faction selection screen (#14300)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2022-06-18 13:16:00 +02:00
committed by GitHub
parent 10ef5bc782
commit 09f188c495
46 changed files with 134 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/asset_cache.dm
+19 -18
View File
@@ -358,16 +358,16 @@ var/list/asset_datums = list()
/datum/asset/simple/faction_icons
assets = list(
"faction_EPMC.png" = 'icons/misc/factions/ECFlogo.png',
"faction_Zeng.png" = 'icons/misc/factions/ZhenHulogo.png',
"faction_Zavod.png" = 'icons/misc/factions/Zavodlogo.png',
"faction_NT.png" = 'icons/misc/factions/NanoTrasenlogo.png',
"faction_Idris.png" = 'icons/misc/factions/Idrislogo.png',
"faction_Hepht.png" = 'icons/misc/factions/Hephaestuslogo.png',
"faction_unaffiliated.png" = 'icons/misc/factions/Unaffiliatedlogo.png',
"faction_PMCG.png" = 'icons/misc/factions/pmcglogo.png',
"faction_Orion.png" = 'icons/misc/factions/Orionlogo.png',
"faction_SCC.png" = 'icons/misc/factions/SCClogo.png'
"faction_EPMC.png" = 'html/images/factions/ECFlogo.png',
"faction_Zeng.png" = 'html/images/factions/zenghulogo.png',
"faction_Zavod.png" = 'html/images/factions/zavodlogo.png',
"faction_NT.png" = 'html/images/factions/nanotrasenlogo.png',
"faction_Idris.png" = 'html/images/factions/idrislogo.png',
"faction_Hepht.png" = 'html/images/factions/hephlogo.png',
"faction_INDEP.png" = 'html/images/factions/unaffiliatedlogo.png',
"faction_PMCG.png" = 'html/images/factions/pmcglogo.png',
"faction_Orion.png" = 'html/images/factions/orionlogo.png',
"faction_SCC.png" = 'html/images/factions/scclogo.png'
)
/datum/asset/simple/jquery
@@ -413,16 +413,17 @@ var/list/asset_datums = list()
"barcode1.png" = 'html/images/barcode1.png',
"barcode2.png" = 'html/images/barcode2.png',
"barcode3.png" = 'html/images/barcode3.png',
"scclogo.png" = 'html/images/scclogo.png',
"scclogo.png" = 'html/images/factions/scclogo.png',
"ntlogo.png" = 'html/images/ntlogo.png',
"ntlogo_small.png" = 'html/images/ntlogo_small.png',
"zhlogo.png" = 'html/images/zhlogo.png',
"idrislogo.png" = 'html/images/idrislogo.png',
"eridanilogo.png" = 'html/images/eridanilogo.png',
"pmcglogo.png" = 'html/images/pmcglogo.png',
"zavodlogo.png" = 'html/images/zavodlogo.png',
"orionlogo.png" = 'html/images/orionlogo.png',
"hplogo.png" = 'html/images/hplogo.png',
"zhlogo.png" = 'html/images/factions/zenghulogo.png',
"idrislogo.png" = 'html/images/factions/idrislogo.png',
"eridanilogo.png" = 'html/images/factions/ECFlogo.png',
"pmcglogo.png" = 'html/images/factions/pmcglogo.png',
"zavodlogo.png" = 'html/images/factions/zavodlogo.png',
"orionlogo.png" = 'html/images/factions/orionlogo.png',
"hplogolarge.png" = 'html/images/hplogolarge.png',
"hplogo.png" = 'html/images/factions/hephlogo.png',
"beflag.png" = 'html/images/beflag.png',
"elyraflag.png" = 'html/images/elyraflag.png',
"solflag.png" = 'html/images/solflag.png',
code/modules/client/preference_setup/occupation/occupation.dm
+27 -17
View File
@@ -144,7 +144,7 @@
var/list/dat = list(
"<style>span.none{color: black} span.low{color: #DDD} span.med{color: yellow} span.high{color: lime} a:hover span{color: #40628a !important}</style>",
"<center><b>Character faction</b><br>",
"<center><b>Character Faction</b><br>",
"<small>This will influence the jobs you can select from, and the starting equipment.</small><br>",
"<b><a href='?src=\ref[src];faction_preview=[html_encode(pref.faction)]'>[pref.faction]</a></b></center><br><hr>"
)
@@ -158,7 +158,7 @@
var/index = -1
var/datum/faction/faction = SSjobs.name_factions[pref.faction] || SSjobs.default_faction
for(var/datum/job/job in faction.get_occupations())
for(var/datum/job/job in SSjobs.occupations)
index += 1
if((index >= limit) || (job.title in splitJobs))
dat += "</table></td><td width='20%'><table width='100%' cellpadding='1' cellspacing='0'>"
@@ -181,6 +181,9 @@
else if(!LAZYLEN(pref.GetValidTitles(job))) // we have no available jobs the character is old enough for
dat += "<del>[dispRank]</del></td><td> \[MINIMUM AGE: [LAZYLEN(job.alt_ages) ? min(job.get_alt_character_age(), job.get_minimum_character_age(user.get_species())) : job.get_minimum_character_age(user.get_species())]]</td></tr>"
continue
if(!(job in faction.get_occupations()))
dat += "<del>[dispRank]</del></td><td><b> \[FACTION RESTRICTED]</b></td></tr>"
continue
else if (ban_reason)
dat += "<del>[dispRank]</del></td><td><b> \[<a href='?src=\ref[user.client];view_jobban=[rank];'>BANNED</a>]</b></td></tr>"
continue
@@ -407,10 +410,10 @@
pref.player_alt_titles.Cut()
/datum/category_item/player_setup_item/occupation/proc/show_faction_menu(mob/user, selected_faction)
/datum/category_item/player_setup_item/occupation/proc/show_faction_menu(mob/user, selected_faction) //note : selected faction is what you choose to see, pref.faction is the actual chosen faction
simple_asset_ensure_is_sent(user, /datum/asset/simple/faction_icons)
var/list/dat = list("<center><b>")
var/list/dat = list("<center><h2>")
var/list/factions = list()
for (var/datum/faction/faction in SSjobs.factions)
@@ -419,30 +422,37 @@
else
factions += "<a href='?src=\ref[src];faction_preview=[html_encode(faction.name)]'>[faction.name]</a>"
dat += factions.Join(" | ") + "</b>"
dat += factions.Join(" ")
var/datum/faction/faction = SSjobs.name_factions[selected_faction]
if(!istype(faction))
to_client_chat(SPAN_DANGER("Invalid faction chosen. Resetting to default."))
selected_faction = SSjobs.default_faction.name
dat += "</h2></center><hr/>"
dat += "<table padding='8px'>"
dat += "<tr>"
dat += "<td width = 500>[faction.description]</td>"
dat += "<td width = 200 align='center'>"
dat += {"<img style="height:132px;" src="[faction.get_logo_name()]">"}
dat += "<br/><b>Departments:</br></b>"
dat += "<small><b>[faction.departments]</b></small>"
dat += "</td>"
dat += "</tr>"
dat += "</table><center><hr/>"
dat += "You can learn more about this faction on <a href='?src=\ref[user.client];JSlink=wiki;wiki_page=[replacetext(faction.name, " ", "_")]'>the wiki</a>.</center>"
if (selected_faction == pref.faction)
dat += "<br>\[Faction already selected\]"
dat += "<br>\[selected\]"
else if (faction.can_select(pref))
dat += "<br>\[<a href='?src=\ref[src];faction_select=[html_encode(selected_faction)]'>Select faction</a>\]"
dat += "<br>\[<a href='?src=\ref[src];faction_select=[html_encode(selected_faction)]'>select</a>\]"
else
dat += "<br><span class='warning'>[faction.get_selection_error(pref)]</span>"
dat += "</center><hr><center><large><u>[faction.name]</u></large>"
dat += {"<br><img style="height:100px;" src="[faction.get_logo_name()]"></center>"}
if (faction.is_default)
dat += "<br><center><small>This faction is the default faction aboard this installation.</small></center>"
dat += "<br><br><center><a href='?src=\ref[user.client];JSlink=wiki;wiki_page=[replacetext(faction.name, " ", "_")]'>Read the Wiki</a></center>"
dat += "<br>[faction.description]"
show_browser(user, dat.Join(), "window=factionpreview;size=400x600")
send_theme_resources(user)
user << browse(enable_ui_theme(user, dat.Join()), "window=factionpreview;size=750x450")
/datum/category_item/player_setup_item/occupation/proc/validate_and_set_faction(selected_faction)
var/datum/faction/faction = SSjobs.name_factions[selected_faction]
code/modules/client/preferences.dm
+1 -1
View File
@@ -289,7 +289,7 @@ datum/preferences
dat += player_setup.content(user)
send_theme_resources(user)
winshow(user, "preferences_window", TRUE)
var/datum/browser/popup = new(user, "preferences_browser", "Character Setup", 1000, 1000)
var/datum/browser/popup = new(user, "preferences_browser", "Character Setup", 1400, 1000)
popup.set_content(dat)
popup.open(FALSE) // Skip registering onclose on the browser pane
onclose(user, "preferences_window", src) // We want to register on the window itself