Skip to content
This repository has been archived by the owner on Oct 15, 2023. It is now read-only.

feat: economy startup pepepizdez #216

Merged
merged 1 commit into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion code/controllers/subsystem/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ SUBSYSTEM_DEF(jobs)


/datum/controller/subsystem/jobs/proc/CreateMoneyAccount(mob/living/H, rank, datum/job/job)
var/datum/money_account/M = create_account(H.real_name, rand(50,500)*10, null)
var/datum/money_account/M = create_account(H.real_name, job.calculate_starting_funds(), null)
var/remembered_info = ""

remembered_info += "<b>Номер вашего аккаунта:</b> #[M.account_number]<br>"
Expand Down
2 changes: 2 additions & 0 deletions code/game/jobs/job/civilian.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
minimal_access = list() //See /datum/job/assistant/get_access()
alt_titles = list("Tourist","Businessman","Trader","Assistant")
outfit = /datum/outfit/job/assistant
min_starting_funds = 400
max_starting_funds = 800

/datum/job/civilian/get_access()
if(config.assistant_maint)
Expand Down
10 changes: 10 additions & 0 deletions code/game/jobs/job/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
exp_requirements = 3000
exp_type = EXP_TYPE_ENGINEERING
outfit = /datum/outfit/job/chief_engineer
min_starting_funds = 2500
max_starting_funds = 3000

/datum/outfit/job/chief_engineer
name = "Chief Engineer"
Expand Down Expand Up @@ -64,6 +66,8 @@
exp_requirements = 600
exp_type = EXP_TYPE_ENGINEERING
outfit = /datum/outfit/job/engineer
min_starting_funds = 1100
max_starting_funds = 1400

/datum/outfit/job/engineer
name = "Station Engineer"
Expand Down Expand Up @@ -99,6 +103,8 @@
exp_type_max = EXP_TYPE_ENGINEERING
is_novice = TRUE
outfit = /datum/outfit/job/engineer/trainee
min_starting_funds = 500
max_starting_funds = 900

/datum/outfit/job/engineer/trainee
name = "Trainee Engineer"
Expand Down Expand Up @@ -147,6 +153,8 @@
exp_requirements = 900
exp_type = EXP_TYPE_ENGINEERING
outfit = /datum/outfit/job/atmos
min_starting_funds = 1200
max_starting_funds = 1500

/datum/outfit/job/atmos
name = "Life Support Specialist"
Expand Down Expand Up @@ -180,6 +188,8 @@
exp_requirements = 900
exp_type = EXP_TYPE_ENGINEERING
outfit = /datum/outfit/job/mechanic
min_starting_funds = 800
max_starting_funds = 1200

/datum/outfit/job/mechanic
name = "Mechanic"
Expand Down
6 changes: 6 additions & 0 deletions code/game/jobs/job/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
var/required_objectives=list() // Objectives that are ALWAYS added.
var/optional_objectives=list() // Objectives that are SOMETIMES added.

var/min_starting_funds = 0
var/max_starting_funds = 0

//Only override this proc
/datum/job/proc/after_spawn(mob/living/carbon/human/H)

Expand Down Expand Up @@ -298,3 +301,6 @@
if(job_exp >= job_requirement)
return FALSE
return TRUE

/datum/job/proc/calculate_starting_funds()
return rand(min_starting_funds, max_starting_funds)
18 changes: 18 additions & 0 deletions code/game/jobs/job/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
exp_requirements = 3000
exp_type = EXP_TYPE_MEDICAL
outfit = /datum/outfit/job/cmo
min_starting_funds = 2000
max_starting_funds = 3000

/datum/outfit/job/cmo
name = "Chief Medical Officer"
Expand Down Expand Up @@ -60,6 +62,8 @@
exp_requirements = 600
exp_type = EXP_TYPE_MEDICAL
outfit = /datum/outfit/job/doctor
min_starting_funds = 1300
max_starting_funds = 1600

/datum/outfit/job/doctor
name = "Medical Doctor"
Expand Down Expand Up @@ -93,6 +97,8 @@
exp_type_max = EXP_TYPE_MEDICAL
is_novice = TRUE
outfit = /datum/outfit/job/doctor/intern
min_starting_funds = 600
max_starting_funds = 900

/datum/outfit/job/doctor/intern
name = "Intern"
Expand Down Expand Up @@ -138,6 +144,8 @@
exp_requirements = 180
exp_type = EXP_TYPE_CREW
outfit = /datum/outfit/job/coroner
min_starting_funds = 700
max_starting_funds = 900

/datum/outfit/job/coroner
name = "Coroner"
Expand Down Expand Up @@ -201,6 +209,8 @@
exp_requirements = 600
exp_type = EXP_TYPE_MEDICAL
outfit = /datum/outfit/job/chemist
min_starting_funds = 1000
max_starting_funds = 1500

/datum/outfit/job/chemist
name = "Chemist"
Expand Down Expand Up @@ -235,6 +245,8 @@
exp_requirements = 900
exp_type = EXP_TYPE_MEDICAL
outfit = /datum/outfit/job/geneticist
min_starting_funds = 1200
max_starting_funds = 1500

/datum/outfit/job/geneticist
name = "Geneticist"
Expand Down Expand Up @@ -270,6 +282,8 @@
exp_requirements = 900
exp_type = EXP_TYPE_MEDICAL
outfit = /datum/outfit/job/virologist
min_starting_funds = 800
max_starting_funds = 1200

/datum/outfit/job/virologist
name = "Virologist"
Expand Down Expand Up @@ -303,6 +317,8 @@
minimal_access = list(ACCESS_MEDICAL, ACCESS_PSYCHIATRIST)
alt_titles = list("Psychologist","Therapist")
outfit = /datum/outfit/job/psychiatrist
min_starting_funds = 600
max_starting_funds = 800

/datum/outfit/job/psychiatrist
name = "Psychiatrist"
Expand Down Expand Up @@ -344,6 +360,8 @@
exp_requirements = 180
exp_type = EXP_TYPE_CREW
outfit = /datum/outfit/job/paramedic
min_starting_funds = 1000
max_starting_funds = 1200

/datum/outfit/job/paramedic
name = "Paramedic"
Expand Down
8 changes: 8 additions & 0 deletions code/game/jobs/job/science.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
)

outfit = /datum/outfit/job/rd
min_starting_funds = 2500
max_starting_funds = 3000


/datum/outfit/job/rd
Expand Down Expand Up @@ -72,6 +74,8 @@
)

outfit = /datum/outfit/job/scientist
min_starting_funds = 2000
max_starting_funds = 2500


/datum/outfit/job/scientist
Expand Down Expand Up @@ -104,6 +108,8 @@
exp_type_max = EXP_TYPE_SCIENCE
is_novice = TRUE
outfit = /datum/outfit/job/scientist/student
min_starting_funds = 1000
max_starting_funds = 1100

/datum/outfit/job/scientist/student
name = "Student Scientist"
Expand Down Expand Up @@ -152,6 +158,8 @@
)

outfit = /datum/outfit/job/roboticist
min_starting_funds = 2000
max_starting_funds = 2200

/datum/outfit/job/roboticist
name = "Roboticist"
Expand Down
14 changes: 14 additions & 0 deletions code/game/jobs/job/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
exp_type = EXP_TYPE_SECURITY
disabilities_allowed = 0
outfit = /datum/outfit/job/hos
min_starting_funds = 3000
max_starting_funds = 3500

/datum/outfit/job/hos
name = "Head of Security"
Expand Down Expand Up @@ -70,6 +72,8 @@
exp_requirements = 2100
exp_type = EXP_TYPE_SECURITY
outfit = /datum/outfit/job/warden
min_starting_funds = 2000
max_starting_funds = 2200

/datum/outfit/job/warden
name = "Warden"
Expand Down Expand Up @@ -116,6 +120,8 @@
exp_requirements = 1200
exp_type = EXP_TYPE_SECURITY
outfit = /datum/outfit/job/detective
min_starting_funds = 1700
max_starting_funds = 2100

/datum/outfit/job/detective
name = "Detective"
Expand Down Expand Up @@ -176,6 +182,8 @@
exp_requirements = 600
exp_type = EXP_TYPE_SECURITY
outfit = /datum/outfit/job/officer
min_starting_funds = 1400
max_starting_funds = 2000

/datum/outfit/job/officer
name = "Security Officer"
Expand Down Expand Up @@ -214,6 +222,8 @@
exp_type_max = EXP_TYPE_SECURITY
is_novice = TRUE
outfit = /datum/outfit/job/officer/cadet
min_starting_funds = 1000
max_starting_funds = 1200

/datum/outfit/job/officer/cadet
name = "Security Cadet"
Expand Down Expand Up @@ -254,6 +264,8 @@
exp_requirements = 1800
exp_type = EXP_TYPE_MEDICAL
outfit = /datum/outfit/job/brigdoc
min_starting_funds = 1300
max_starting_funds = 1600

/datum/outfit/job/brigdoc
name = "Brig Physician"
Expand Down Expand Up @@ -290,6 +302,8 @@
exp_requirements = 1200
exp_type = EXP_TYPE_SECURITY
outfit = /datum/outfit/job/pilot
min_starting_funds = 1800
max_starting_funds = 2100

/datum/outfit/job/pilot
name = "Security Pod Pilot"
Expand Down
12 changes: 12 additions & 0 deletions code/game/jobs/job/supervisor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
exp_type = EXP_TYPE_COMMAND
disabilities_allowed = 0
outfit = /datum/outfit/job/captain
min_starting_funds = 7000
max_starting_funds = 9000

/datum/job/captain/get_access()
return get_all_accesses()
Expand Down Expand Up @@ -85,6 +87,8 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
outfit = /datum/outfit/job/hop
min_starting_funds = 3500
max_starting_funds = 4000

/datum/outfit/job/hop
name = "Head of Personnel"
Expand Down Expand Up @@ -136,6 +140,8 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION,
ACCESS_CLOWN, ACCESS_MIME, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_NTREP)
outfit = /datum/outfit/job/nanotrasenrep
min_starting_funds = 3500
max_starting_funds = 4000

/datum/outfit/job/nanotrasenrep
name = "Nanotrasen Representative"
Expand Down Expand Up @@ -180,6 +186,8 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
minimal_access = list(ACCESS_FORENSICS_LOCKERS, ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINE, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH,
ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_HEADS, ACCESS_BLUESHIELD, ACCESS_WEAPONS)
outfit = /datum/outfit/job/blueshield
min_starting_funds = 2500
max_starting_funds = 3000

/datum/outfit/job/blueshield
name = "Blueshield"
Expand Down Expand Up @@ -226,6 +234,8 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
ACCESS_CLOWN, ACCESS_MIME, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAGISTRATE)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_LAWYER, ACCESS_MAGISTRATE, ACCESS_HEADS)
outfit = /datum/outfit/job/judge
min_starting_funds = 3000
max_starting_funds = 3500

/datum/outfit/job/judge
name = "Magistrate"
Expand Down Expand Up @@ -270,6 +280,8 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
exp_requirements = 3000
exp_type = EXP_TYPE_CREW
outfit = /datum/outfit/job/lawyer
min_starting_funds = 1600
max_starting_funds = 2200

/datum/outfit/job/lawyer
name = "Internal Affairs Agent"
Expand Down
Loading
Loading