Expanded chargen. Added NERP trainer.

lib/world/mob/605.mob

@@ -196,7 +196,7 @@ DefaultPos:	Standing
 	Cash:	1000
 	Bank:	5000
 [SKILLS]
-	
Brawling:	10
+	
:	10
 	Armed Combat:	10
 	Stealth:	10
 	Leadership:	10
@@ -236,7 +236,7 @@ DefaultPos:	Standing
 	Cash:	1000
 	Bank:	5000
 [SKILLS]
-	
Brawling:	10
+	
:	10
 	Firearms:	10
 	Leadership:	10
 	Armed Combat:	10
@@ -274,7 +274,7 @@ DefaultPos:	Standing
 	Ballistic:	15
 	Impact:	15
 [SKILLS]
-	
Brawling:	10
+	
:	10
 	Leadership:	10
 	Stealth:	10
 	Athletics:	10
@@ -317,8 +317,8 @@ DefaultPos:	Standing
 	Bank:	6000
 [SKILLS]
 	Sorcery:	10
-	
Brawling:	10
-	
Brawling:	10
+	
:	10
+	
:	10
 	Conjuring:	10
 	Stealth:	10
 BREAK
@@ -357,10 +357,10 @@ DefaultPos:	Standing
 	Cash:	2000
 	Bank:	6000
 [SKILLS]
-	
Brawling:	10
+	
:	10
 	Sorcery:	10
 	Conjuring:	10
-	
Brawling:	10
+	
:	10
 	Throwing Weapons:	10
 BREAK
 #60510
@@ -1320,7 +1320,88 @@ DefaultPos:	Standing
 	Cash:	1000
 	Bank:	5000
 [SKILLS]
-	
Brawling:	10
+	
:	10
+	Armed Combat:	10
+	Stealth:	10
+	Leadership:	10
+	Athletics:	10
+BREAK
+#60540
+Keywords:	jean samuel pauly
+Name:	Jean Samuel Pauly
+RoomDesc:$
+A spry Swede sits at a workbench here, pressing primers into cartridges. 
+
+~
+LookDesc:$
+Wearing clothes that could have come straight from the 1800s, this clean-cut
+Swede is pressing cartridges together with such speed and dexterity, it's like
+he invented the technology. 
+~
+ArriveMsg:	
+LeaveMsg:	
+MobFlags:	10000000001011
+AffFlags:	0
+Race:	Human
+Gender:	Male
+DefaultPos:	Standing
+[ATTRIBUTES]
+	Bod:	40
+	Qui:	40
+	Str:	40
+	Cha:	40
+	Int:	40
+	Wil:	40
+	Mag:	6
+[POINTS]
+	Height:	0
+	Weight:	0
+	Ballistic:	15
+	Impact:	15
+	Cash:	1000
+	Bank:	5000
+[SKILLS]
+	
:	10
+	Armed Combat:	10
+	Stealth:	10
+	Leadership:	10
+	Athletics:	10
+BREAK
+#60541
+Keywords:	swarm spiraling mass incoherent ideas
+Name:	a spiraling mass of incoherent ideas
+RoomDesc:$
+A swarm of incoherent ideas swirls through here, lacking any ability to affect
+its world. 
+
+~
+LookDesc:$
+It's comprised of all the things that showed up in the source books and looked
+~
+ArriveMsg:	
+LeaveMsg:	
+MobFlags:	10000000001011
+AffFlags:	0
+Race:	Human
+Gender:	Male
+DefaultPos:	Standing
+[ATTRIBUTES]
+	Bod:	40
+	Qui:	40
+	Str:	40
+	Cha:	40
+	Int:	40
+	Wil:	40
+	Mag:	6
+[POINTS]
+	Height:	0
+	Weight:	0
+	Ballistic:	15
+	Impact:	15
+	Cash:	1000
+	Bank:	5000
+[SKILLS]
+	
:	10
 	Armed Combat:	10
 	Stealth:	10
 	Leadership:	10

lib/world/wld/605.wld

@@ -99,11 +99,11 @@ yourself. First, take a moment to look at your character's scorecard with
 interpreting it, ^WHELP SCORE^n is a great resource. Other useful commands are
 ^WINVENTORY^n (or ^WI^n), ^WEQUIPMENT^n (or ^WEQ^n), and ^WSKILLS^n (or ^WSK^n). These will tell you
 about what you're carrying, what you're wearing, and what you're good at.
- ^n  It's also handy to know how to interact with the things you find in the
+   It's also handy to know how to interact with the things you find in the
 world. You can pick up items you see on the ground with ^WGET (item)^n, or get
-them from containers with ^WGET (item) (container)^n. Take a look at the hopper on
-the wall (^WLOOK HOPPER^n)-- there's something in there for you.
- ^n  Go ahead and give those commands a try. Once you're ready, you can continue on
+them from containers with ^WGET (item) (container)^n. Take a look in the hopper on
+the wall (^WLOOK IN HOPPER^n)-- there's something in there for you.
+   Go ahead and give those commands a try. Once you're ready, you can continue on
 to the north. 
 ~
 Flags:	1000000000000011000
@@ -335,6 +335,12 @@ RoomType:	0
 	Material:	brick
 	Barrier:	4
 	KeyVnum:	0
+[EXIT up]
+	ToVnum:	60628
+	Flags:	0
+	Material:	brick
+	Barrier:	4
+	KeyVnum:	0
 [EXIT down]
 	ToVnum:	60593
 	Flags:	0
@@ -5157,12 +5163,13 @@ BREAK
 #60626
 Name:	Exotic Melee Skill Training
 Desc:$
-   The skills offered in this room are of an exotic and niche nature, and are
-^yless likely to be useful to you^n than the skills offered below. Please be sure
-that you want them before learning them.
- ^n  ^gPROJECTILES^n is the skill related to bow and crossbow-type weapons, exotic
+   The skills offered in this room are of an exotic and niche nature, and ^Yare
+less likely to be useful to you than the skills offered below^n. They deal less
+damage than normal weapons and are harder to find ammunition for. Please be
+sure that you want them before learning them.
+   ^gPROJECTILES^n is the skill related to bow and crossbow-type weapons, exotic
 in the world of 2060.
- ^g  THROWING WEAPONS^n is the skill that is required for those that wish to be
+   ^gTHROWING WEAPONS^n is the skill that is required for those that wish to be
 able to use throwing knives or shuriken. 
 ~
 Flags:	1000000000000011000
@@ -5221,4 +5228,35 @@ RoomType:	0
 	Barrier:	4
 	KeyVnum:	0
 BREAK
+#60628
+Name:	Non-Essential Role Playing (NERP) Skills
+Desc:$
+   Non-Essential Role Playing (NERP) is a blanket term used to describe
+everything that exists in the game but does not have any coded effects. You
+are free to learn these skills if you wish to, but ^Rthese skills are only
+useful in roleplay scenarios and have no in-game coded effects.^n 
+~
+Flags:	1000000000000011000
+SecType:	Inside
+MatrixExit:	0
+Crowd:	0
+Cover:	0
+X:	20
+Y:	20
+Z:	2.50
+RoomType:	0
+[POINTS]
+	SpecIdx:	0
+	Rating:	0
+	Light:	0
+	Smoke:	0
+	Background:	0
+	BackgroundType:	0
+[EXIT down]
+	ToVnum:	60506
+	Flags:	0
+	Material:	brick
+	Barrier:	4
+	KeyVnum:	0
+BREAK
 END

lib/world/zon/605.zon

@@ -62,4 +62,6 @@ D 0 60501 2 1
 O 0 60500 0 60502
 O 0 60502 0 60501
 M 0 60539 0 60626
+M 0 60540 0 60627
+M 0 60541 0 60628
 $

src/awake.h

@@ -764,7 +764,7 @@ enum {
 #define SKILL_TRACK                 58
 #define SKILL_CLIMBING            59 
 #define SKILL_PILOT_BIKE    60
-#define SKILL_PILOT_FIXED_WING   61
+#define SKILL_UNUSED_WAS_PILOT_FIXED_WING   61
 #define SKILL_PILOT_CAR     62
 #define SKILL_PILOT_TRUCK   63
 #define SKILL_BR_BIKE     64

src/spec_assign.cpp

@@ -448,6 +448,7 @@ void assign_mobiles(void)
   SPECIAL(matchsticks);
   SPECIAL(painter);
   SPECIAL(multnomah_guard);
+  SPECIAL(nerp_skills_teacher);
 
   /* trainers */
   for (i = 0; trainers[i].vnum != 0; i++)
@@ -456,6 +457,8 @@ void assign_mobiles(void)
   /* teachers */
   for (i = 0; teachers[i].vnum != 0; i++)
     ASSIGNMOB(teachers[i].vnum, teacher);
+
+  ASSIGNMOB(60541, nerp_skills_teacher);
 
   /* metamagic trainers */
   for (i = 0; metamagict[i].vnum != 0; i++)
@@ -739,6 +742,9 @@ void assign_rooms(void)
   ASSIGNROOM(60591, chargen_unpractice_skill);
   ASSIGNROOM(60592, chargen_unpractice_skill);
   ASSIGNROOM(60593, chargen_unpractice_skill);
+  ASSIGNROOM(60626, chargen_unpractice_skill);
+  ASSIGNROOM(60627, chargen_unpractice_skill);
+  ASSIGNROOM(60628, chargen_unpractice_skill);
 
   /* Neophyte Guild */
   ASSIGNROOM(60585, neophyte_entrance);