Skills #85

Rohesie · 2018-08-10T01:16:13Z

Remove the majority of the skill locks, substituting them for ID locks , fumbling time or other penalties.
Tank access made. Tank is ID locked.
Dropship had spaghetti locks. Now they are only locked by ID, while lack of pilot skill forbids from optimizing the route and makes operating it slower.
Riot grenade launchers are ID locked to MPs and Spec weapons to specs. Those with a mind skill can use them without an ID, for Wey-Yu PMCs and other non-marine humans' access is unfinished.
Smartguns have no locks, but the non-trained user will suffer heavy recoil and accuracy penalties.
Scouts can use shotguns again.

Rohesie · 2018-08-13T00:04:39Z

Everyone can use medevac stretchers and medical HUDs, or see medical reports.
Everyone can use defibs but at different speeds. Non-trained defibs don't heal (but still revive if the patient is under 200 non-oxy damage), low-skill heals 4 of each damage type per defib, medics heal 8 and doctors 12.
Everyone can use the autodoc, but they fumble if not trained in surgery.
Syringes are available to everyone, skill-based speeds unchanged.
Surgery is noticeably faster for all doctors. Medics take 10 seconds of fumbling on each step, those with basic first-aid and biology knowledge (like SLs, SOs, XOs, COs) take 15, and PFCs 20. Besides being one-second-per-skill-gap slower while actually performing the surgery.

CosmicScientist

Don't worry about keeping the code. There's no reason to if it's going to sit unused in comments.

CosmicScientist · 2018-08-13T22:00:38Z

code/game/machinery/autodoc.dm

+			var/fumbling_time = SKILL_TASK_TOUGH - ( SKILL_TASK_EASY * ( SKILL_SURGERY_PROFESSIONAL - user.mind.cm_skills.surgery ) ) // 8 secs non-trained, 5 amateur, 2 trained
+			if(!do_after(user, fumbling_time, TRUE, 5, BUSY_ICON_BUILD)) return
+			/*user << "<span class='warning'>You have no idea how to put someone into \the [src]!</span>"
+			return*/


Remove unused code, don't comment it out. The history of these files are tracked/deleted code can be recovered.

CosmicScientist · 2018-08-13T22:01:01Z

code/game/machinery/computer/dropship_weapons.dm

+			var/fumbling_time = 100 - 20 * usr.mind.cm_skills.pilot
+			if(!do_after(usr, fumbling_time, TRUE, 5, BUSY_ICON_BUILD)) return
+			/*usr << "<span class='warning'>A screen with graphics and walls of physics and engineering values open, you immediately force it closed.</span>"
+			return*/


CosmicScientist · 2018-08-13T22:01:18Z

code/game/machinery/groundmap_geothermal.dm

 		user << "<span class='warning'>You have no clue how this thing works...</span>"
-		return 0
+		return 0*/


CosmicScientist · 2018-08-13T22:01:55Z

code/game/objects/items/bodybag.dm

 				usr << "<span class='warning'>You're not trained to use this.</span>"
-				return
+				return*/


CosmicScientist · 2018-08-13T22:02:32Z

code/game/objects/items/reagent_containers/autoinjectors.dm

 /obj/item/reagent_container/hypospray/autoinjector/tricord/skillless
 	name = "\improper First-aid autoinjector"
 	desc = "An autoinjector loaded with a small dose of medicine for marines to treat themselves with."
 	skilllock = 0
-
+*/


CosmicScientist · 2018-08-13T22:07:28Z

code/modules/projectiles/updated_projectiles/guns/specialist.dm

 		/*var/turf/current_turf = get_turf(user)
 		if (current_turf.z == 3 || current_turf.z == 4) //Can't fire on the Almayer, bub.
 			click_empty(user)
 			user << "<span class='warning'>You can't fire that here!</span>"
 			return 0*/
 		if(user.mind && user.mind.cm_skills && user.mind.cm_skills.spec_weapons < SKILL_SPEC_TRAINED && user.mind.cm_skills.spec_weapons != SKILL_SPEC_ROCKET)
 			user << "<span class='warning'>You don't seem to know how to use [src]...</span>"
-			return 0
+			return 0*/ //GUN_SPECIALIST does the job


CosmicScientist · 2018-08-13T22:07:37Z

code/modules/shuttles/shuttle_console.dm

+				var/fumbling_time = 100 - 20 * usr.mind.cm_skills.pilot
+				if(!do_after(usr, fumbling_time, TRUE, 5, BUSY_ICON_BUILD)) return
+				/*usr << "<span class='warning'>A screen with graphics and walls of physics and engineering values open, you immediately force it closed.</span>"
+				return*/


CosmicScientist · 2018-08-13T22:07:44Z

code/modules/surgery/surgery.dm

+		var/fumbling_time = SKILL_TASK_FORMIDABLE - ( SKILL_TASK_AVERAGE * user.mind.cm_skills.surgery ) // 20 secs non-trained, 15 amateur, 10 semi-prof
+		if(!do_after(user, fumbling_time, TRUE, 5, BUSY_ICON_BUILD)) return
+		/*user << "<span class='warning'>You have no idea how to do surgery...</span>"
+		return 1*/


CosmicScientist · 2018-08-13T22:08:03Z

code/modules/vehicles/powerloader.dm

 		H << "<span class='warning'>You don't seem to know how to operate [src].</span>"
-		return
+		return*/


CosmicScientist · 2018-08-13T22:08:17Z

code/modules/vehicles/tank.dm

+		var/fumbling_time = 100 - 20 * M.mind.cm_skills.large_vehicle
+		if(!do_after(M, fumbling_time, TRUE, 5, BUSY_ICON_BUILD)) return
+		/*M << "<span class='notice'>You have no idea how to operate this thing.</span>"
+		return*/


and that should be all of them.

ninjanomnom · 2018-08-14T03:01:50Z

What cosmic said, also this is the sort of thing I'd want to testmerge before we fully merge. Seems mostly fine though.

CosmicScientist · 2018-08-15T02:18:11Z

👍

ninjanomnom · 2018-08-16T15:15:04Z

code/game/machinery/computer/dropship_weapons.dm

@@ -144,13 +146,14 @@

 /obj/machinery/computer/dropship_weapons/dropship1
 	name = "\improper 'Alamo' weapons controls"
+	req_access = list(ACCESS_MARINE_DROPSHIP)
 	New()


Oh god relative pathing, could you fix these wherever you see them if you touch on stuff nearby.

Just switch this to

/obj/machinery/computer/dropship_weapons/dropship1/New()

Iatots · 2018-08-18T11:30:35Z

How do you fumble on the autodoc console? Do you add unnecessary surgeries to the queue? Remove previously entered surgeries?

Speaking of, maybe it's OOS but could you add removing queued up surgeries from autodoc?

Rohesie · 2018-08-18T11:49:22Z

You simply take long to put someone into the autodoc. Could be added that you also fumble while using it, but it wouldn't make sense for the machine to work slower because you are not skilled. Your use of it is the part that is impaired, only.

You can remove queued up surgeries. What do you mean?

Rohesie · 2018-08-19T07:08:51Z

Any further issues with this?

Iatots · 2018-08-19T18:43:13Z

Please give tanker boys lv2 engineering so they can take care of the best themselves.

ninjanomnom

I dislike how much duplicated code exists here but there isn't an easy way to just turn it in to a proc without giving it tons of args. Skill checks should get refactored eventually but this is fine for now.

ninjanomnom · 2018-08-20T02:31:39Z

code/__DEFINES/access.dm

@@ -31,6 +31,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 #define ACCESS_MARINE_PILOT 		23
 #define ACCESS_MARINE_WO			24
 #define ACCESS_MARINE_RO			26
+#define ACCESS_MARINE_TANK			30


…ire without an ID. Scouts can fire shotguns again.

…ts and descriptions.

…tched skill locks to fumble times except for dropship flight optimization.

…can reports and medevac stretchers available for everyone. Defib, syringes, autodoc and surgery without hard locks, but with skill-related delays (and sometimes effectiveness variation).

…. First Aid Pouch now has regular tricord and tramadol autoinjectors, same for wall-mounted nanomeds.

…ed advanced kits heal 6 instead of 3. Trained kits unchanged, healing 12.

From 30 to 27.

…ire without an ID. Scouts can fire shotguns again.

…ts and descriptions.

…tched skill locks to fumble times except for dropship flight optimization.

…can reports and medevac stretchers available for everyone. Defib, syringes, autodoc and surgery without hard locks, but with skill-related delays (and sometimes effectiveness variation).

CosmicScientist suggested changes Aug 13, 2018

View reviewed changes

ninjanomnom suggested changes Aug 16, 2018

View reviewed changes

ninjanomnom added the Feature Broadens the scope of the game label Aug 16, 2018

Rohesie mentioned this pull request Aug 16, 2018

Remove scout spec shotgun lock #97

Closed

ninjanomnom approved these changes Aug 20, 2018

View reviewed changes

Rohesie mentioned this pull request Aug 21, 2018

Big Weapons Rebalance #146

Merged

Rohesie added 17 commits August 21, 2018 02:44

Resolved a small conflict.

eab70d5

Substitute mind restrictions for ID checks. MPs and specs can still f…

d947a0d

…ire without an ID. Scouts can fire shotguns again.

Substitute skill locks for fumbling time. Fix minor misleading commen…

e46abd6

…ts and descriptions.

Added Tank-level access. Locked dropships and tank with ID locks. Swi…

e31ada9

…tched skill locks to fumble times except for dropship flight optimization.

Surgery skills made broader. Task-length defines made. Medical HUD, s…

17aeccd

…can reports and medevac stretchers available for everyone. Defib, syringes, autodoc and surgery without hard locks, but with skill-related delays (and sometimes effectiveness variation).

Removed skill lock for autoinjectors, and removed skilless references…

fd3bcfa

…. First Aid Pouch now has regular tricord and tramadol autoinjectors, same for wall-mounted nanomeds.

Ointments heal 3 instead of 1, to make them actually useful. Nontrain…

cce7673

…ed advanced kits heal 6 instead of 3. Trained kits unchanged, healing 12.

Removed unused commented-out code.

e5455cd

Fixin' relative pathin'

d8e6cf2

Trivial define ACCESS_MARINE_TANK change

a7c07d1

From 30 to 27.

Removes the skill check to use the smartgun

490e2e7

Substitute mind restrictions for ID checks. MPs and specs can still f…

f396e76

…ire without an ID. Scouts can fire shotguns again.

Substitute skill locks for fumbling time. Fix minor misleading commen…

aadfccc

…ts and descriptions.

Added Tank-level access. Locked dropships and tank with ID locks. Swi…

c601d0f

…tched skill locks to fumble times except for dropship flight optimization.

Surgery skills made broader. Task-length defines made. Medical HUD, s…

5a3d766

…can reports and medevac stretchers available for everyone. Defib, syringes, autodoc and surgery without hard locks, but with skill-related delays (and sometimes effectiveness variation).

Removed unused commented-out code.

659d7bc

Post-rebase little details.

219fb3e

ninjanomnom merged commit b482bcc into ColonialMarines-Mirror:master Aug 21, 2018

MoXuT0 mentioned this pull request Aug 30, 2018

Реворк скиллов FighterX2500/DMCAMarines#33

Closed

Rohesie deleted the Skills branch September 5, 2018 23:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Skills #85

Skills #85

Rohesie commented Aug 10, 2018

Rohesie commented Aug 13, 2018 •

edited

CosmicScientist left a comment

CosmicScientist Aug 13, 2018

CosmicScientist Aug 13, 2018

CosmicScientist Aug 13, 2018

CosmicScientist Aug 13, 2018

CosmicScientist Aug 13, 2018

CosmicScientist Aug 13, 2018

CosmicScientist Aug 13, 2018

CosmicScientist Aug 13, 2018

CosmicScientist Aug 13, 2018

CosmicScientist Aug 13, 2018

ninjanomnom commented Aug 14, 2018

CosmicScientist commented Aug 15, 2018

ninjanomnom Aug 16, 2018

Iatots commented Aug 18, 2018

Rohesie commented Aug 18, 2018

Rohesie commented Aug 19, 2018

Iatots commented Aug 19, 2018

ninjanomnom left a comment

ninjanomnom Aug 20, 2018

Skills #85

Skills #85

Conversation

Rohesie commented Aug 10, 2018

Rohesie commented Aug 13, 2018 • edited

CosmicScientist left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ninjanomnom commented Aug 14, 2018

CosmicScientist commented Aug 15, 2018

Choose a reason for hiding this comment

Iatots commented Aug 18, 2018

Rohesie commented Aug 18, 2018

Rohesie commented Aug 19, 2018

Iatots commented Aug 19, 2018

ninjanomnom left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Rohesie commented Aug 13, 2018 •

edited