Increase Ogre spellcasting apts, decrease M&F apt

As an alternative to the proposal of Basajaunak as a large caster race, instead
let Ogres take more advantage of their Ogre Mage heritage, with -1 spell school
apts across the board. Also give them more starting int but less str/dex, and
significantly decrease their M&F apt - they're still uniquely able to make the
most of GSCs but now require more of an investment to do so (and might feasibly
consider other weapon types too), and the extra XP cost for GSC usage is likely
more than made up for by the XP saved on spell schools.

crawl-ref/docs/crawl_manual.rst

@@ -1508,20 +1508,16 @@ Centaurs
   receive reduced protection from the body armour they wear.
 
 Ogres
-  Ogres are huge, chunky creatures who typically are strong rather than smart,
-  and not nimble at all. Ogres mature almost as quickly as Humans.
+  Ogres are huge, chunky creatures who are very strong and robust, but are not
+  nimble at all. Ogres mature almost as quickly as Humans. They possess a raw
+  talent for magic, but are poor at making use of magical devices.
 
   Their preferred methods of avoiding beatings are dodging and the use of
   shields. Many Ogres find it natural to wield some large and blunt weapon.
   (Countless lethal incidents have taught them to leave most edged weapons be.)
   While all sophisticated forms of missile combat are too awkward for them, they
   are good at throwing things, in particular boulders.
 
-  Contrary to expectations, Ogres are not reduced to mindless brutes. They
-  possess a raw talent for witchcraft, letting them pick up the basics of
-  spellcasting at an amazing speed. However, the more arcane schools of magic
-  are foreign to them and are only learned at poor rates.
-
 Trolls
   Trolls are like Ogres, but even nastier. They have thick, knobbly skins of any
   colour from putrid green to mucky brown, which are covered in patches of thick

crawl-ref/source/aptitudes.h

@@ -363,12 +363,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_OGRE
     APT(SP_OGRE,            SK_FIGHTING,        3),
-    APT(SP_OGRE,            SK_SHORT_BLADES,   -4),
+    APT(SP_OGRE,            SK_SHORT_BLADES,   -3),
     APT(SP_OGRE,            SK_LONG_BLADES,    -3),
     APT(SP_OGRE,            SK_AXES,           -3),
-    APT(SP_OGRE,            SK_MACES_FLAILS,    3),
+    APT(SP_OGRE,            SK_MACES_FLAILS,   -1),
     APT(SP_OGRE,            SK_POLEARMS,        0),
-    APT(SP_OGRE,            SK_STAVES,         -1),
+    APT(SP_OGRE,            SK_STAVES,          0),
     APT(SP_OGRE,            SK_SLINGS,         -3),
     APT(SP_OGRE,            SK_BOWS,           -3),
     APT(SP_OGRE,            SK_CROSSBOWS,      -3),
@@ -385,18 +385,18 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 #endif
     APT(SP_OGRE,            SK_UNARMED_COMBAT, -1),
     APT(SP_OGRE,            SK_SPELLCASTING,    1),
-    APT(SP_OGRE,            SK_CONJURATIONS,   -3),
-    APT(SP_OGRE,            SK_HEXES,          -3),
-    APT(SP_OGRE,            SK_CHARMS,         -3),
-    APT(SP_OGRE,            SK_SUMMONINGS,     -3),
-    APT(SP_OGRE,            SK_NECROMANCY,     -3),
-    APT(SP_OGRE,            SK_TRANSLOCATIONS, -3),
-    APT(SP_OGRE,            SK_TRANSMUTATIONS, -3),
-    APT(SP_OGRE,            SK_FIRE_MAGIC,     -3),
-    APT(SP_OGRE,            SK_ICE_MAGIC,      -3),
-    APT(SP_OGRE,            SK_AIR_MAGIC,      -3),
-    APT(SP_OGRE,            SK_EARTH_MAGIC,    -3),
-    APT(SP_OGRE,            SK_POISON_MAGIC,   -3),
+    APT(SP_OGRE,            SK_CONJURATIONS,   -1),
+    APT(SP_OGRE,            SK_HEXES,          -1),
+    APT(SP_OGRE,            SK_CHARMS,         -1),
+    APT(SP_OGRE,            SK_SUMMONINGS,     -1),
+    APT(SP_OGRE,            SK_NECROMANCY,     -1),
+    APT(SP_OGRE,            SK_TRANSLOCATIONS, -1),
+    APT(SP_OGRE,            SK_TRANSMUTATIONS, -1),
+    APT(SP_OGRE,            SK_FIRE_MAGIC,     -1),
+    APT(SP_OGRE,            SK_ICE_MAGIC,      -1),
+    APT(SP_OGRE,            SK_AIR_MAGIC,      -1),
+    APT(SP_OGRE,            SK_EARTH_MAGIC,    -1),
+    APT(SP_OGRE,            SK_POISON_MAGIC,   -1),
     APT(SP_OGRE,            SK_INVOCATIONS,     1),
     APT(SP_OGRE,            SK_EVOCATIONS,     -2),
 

crawl-ref/source/dat/descript/species.txt

@@ -98,13 +98,13 @@ trailing off like that of a snake. They move slowly but are naturally resilient.
 %%%%
 Octopode
 
-A species of amphibious cephalopods. They can wear eight rings, but almost no
-armour fits them.
+Octopodes are a species of amphibious cephalopods. They can wear eight rings,
+but almost no armour fits them.
 %%%%
 Ogre
 
-Large and strong, Ogres are mostly seen as brutes. They are very comfortable
-with the basics of magic, however.
+Large and strong, Ogres are mostly seen as brutes. They are extremely robust,
+and have an excellent grasp of magic.
 %%%%
 Spriggan
 

crawl-ref/source/species-data.h

@@ -561,14 +561,14 @@ static const map<species_type, species_def> species_data =
     0, 3, 0, 4,
     MONS_OGRE,
     HT_LAND, US_ALIVE, SIZE_LARGE,
-    12, 7, 5, // 24
+    11, 9, 4, // 24
     { STAT_STR }, 3,
     { { MUT_TOUGH_SKIN, 1, 1 }, },
     {},
     {},
     { JOB_HUNTER, JOB_BERSERKER, JOB_ARCANE_MARKSMAN, JOB_WIZARD,
       JOB_FIRE_ELEMENTALIST },
-    { SK_MACES_FLAILS },
+    { SK_MACES_FLAILS, SK_POLEARMS, SK_STAVES },
 } },
 
 { SP_OCTOPODE, {