feat: economy startup pepepizdez (#216)

ss220club · Jul 18, 2023 · bc3aa28 · bc3aa28
1 parent f53c3b9
commit bc3aa28
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 5 deletions.
diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm
@@ -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>"

diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
@@ -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)

diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"

diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
@@ -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)
 
@@ -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)
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"

diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm
@@ -27,6 +27,8 @@
 	)
 
 	outfit = /datum/outfit/job/rd
+	min_starting_funds = 2500
+	max_starting_funds = 3000
 
 
 /datum/outfit/job/rd
@@ -72,6 +74,8 @@
 	)
 
 	outfit = /datum/outfit/job/scientist
+	min_starting_funds = 2000
+	max_starting_funds = 2500
 
 
 /datum/outfit/job/scientist
@@ -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"
@@ -152,6 +158,8 @@
 	)
 
 	outfit = /datum/outfit/job/roboticist
+	min_starting_funds = 2000
+	max_starting_funds = 2200
 
 /datum/outfit/job/roboticist
 	name = "Roboticist"

diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"

diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
@@ -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()
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"