Rename Palentonga to Armataur

The name 'palentonga' was intended to be a bit more subtle than 'felid', 'octopode' or even 'barachian' - to be an 'animal-person' species name that merely hinted toward the species (pangolin), rather than shouting it from the rooftops. But of course, they weren't exactly pangolins - they were giant, and had four legs plus two arms... This was too many things at once! If the concept was simple and familiar, we could have used a more exotic name, and the rest of the flavour would have put players on the right path. But as it was, players were lost. There was no resonance. So, let's rename em. 'Armataur' is a simple 'armadillo' + 'centaur' combination. (Yes, I know that properly they should be 'cenadillos'...) The abbreviation is At, to avoid ambiguity with the Artificer start. It's exciting, it's hip, it's fun. Let's try it out.
crawl · Oct 3, 2022 · ba81c32 · ba81c32
1 parent 4db885d
commit ba81c32
Show file tree

Hide file tree

Showing 42 changed files with 91 additions and 91 deletions.
diff --git a/crawl-ref/docs/crawl_manual.rst b/crawl-ref/docs/crawl_manual.rst
@@ -269,7 +269,7 @@ Willpower
 
 Size
   Different species have different sizes: Spriggans and Felids are very small;
-  Kobolds are small; Ogres and Trolls are large; Nagas and Palentongas are large
+  Kobolds are small; Ogres and Trolls are large; Nagas and Armataurs are large
   with a medium torso; all other species are medium-sized. Many transmutations
   will change your size. Size affects your evasion: the smaller your character,
   the more evasive it is. On the other hand, characters of larger than medium
@@ -1564,12 +1564,12 @@ Merfolk (Mf)
   still remains. The instability of their own morphogenic matrix has made them
   very accomplished transmuters, but most other magic seems foreign to them.
 
-Palentongas (Pa)
-  The Palentongas are a large, scaled mammalian species, walking on four feet
+Armataurs (AT)
+  The Armataurs are a large, scaled mammalian species, walking on four feet
   and swinging a powerful tail behind them. Their elephant-back armies
   terrorize the lands outside the Dungeon.
 
-  Palentongas are best known for their powerful roll attack, curling up and
+  Armataurs are best known for their powerful roll attack, curling up and
   rolling into a crashing melee attack against nearby foes. They're well suited
   to melee combat and to casting supportive spells, but they're significantly
   worse at other forms of combat and advance quite slowly in experience levels.
@@ -1827,7 +1827,7 @@ Nagas (Na)
   invisible creatures, and have tough skin, but their tails are relatively slow
   and cannot move them around as quickly as can other creatures' legs (this only
   affects their movement rate; all other actions are at normal speed). Like
-  Palentongas, their body shape also prevents them from gaining full protection
+  Armataurs, their body shape also prevents them from gaining full protection
   from body armour. A Naga's biggest forte is stealth: Nagas are very good at
   moving unnoticed. Their tails eventually grow strong enough to constrict
   their foes in combat.
@@ -2183,7 +2183,7 @@ powerful attack when unarmed and also to punch with the off hand as an
 additional melee attack. The Unarmed Combat skill continues to increase your
 attack speed while unarmed until it can be raised no more.
 
-Note that auxiliary attacks (such as a Palentonga's tail-slap or a Minotaur's
+Note that auxiliary attacks (such as a Armataur's tail-slap or a Minotaur's
 headbutt) are not affected by the Unarmed Combat skill.
 
 Ranged combat skills

diff --git a/crawl-ref/source/ability-type.h b/crawl-ref/source/ability-type.h
@@ -54,7 +54,7 @@ enum ability_type
     ABIL_SHAFT_SELF,
     // Barachim
     ABIL_HOP,
-    // Palentongas
+    // Armataurs
     ABIL_ROLLING_CHARGE,
     // Air Walk
     ABIL_BLINKBOLT,

diff --git a/crawl-ref/source/ability.cc b/crawl-ref/source/ability.cc
@@ -706,7 +706,7 @@ int ability_range(ability_type abil)
             range = frog_hop_range();
             break;
         case ABIL_ROLLING_CHARGE:
-            range = palentonga_charge_range();
+            range = armataur_charge_range();
             break;
         case ABIL_DITHMENOS_SHADOW_STEP:
             range = you.umbra_radius();
@@ -1886,7 +1886,7 @@ static bool _check_ability_possible(const ability_def& abil, bool quiet = false)
 
     case ABIL_ROLLING_CHARGE:
         return _can_movement_ability(quiet) &&
-                                palentonga_charge_possible(quiet, true);
+                                armataur_charge_possible(quiet, true);
 
     case ABIL_WORD_OF_CHAOS:
         if (you.duration[DUR_WORD_OF_CHAOS_COOLDOWN])
@@ -2539,7 +2539,7 @@ static spret _do_ability(const ability_def& abil, bool fail, dist *target,
 
     case ABIL_ROLLING_CHARGE:
         if (_can_movement_ability(false))
-            return palentonga_charge(fail, target);
+            return armataur_charge(fail, target);
         else
             return spret::abort;
 

diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc
@@ -120,7 +120,7 @@ M filtered_vector_select(vector<pair<M, int>> weights, function<bool(M)> filter)
  * For most races, even odds for all armour slots when acquiring, or 50-50
  * split between body armour/aux armour when getting god gifts.
  *
- * Nagas and Palentongas get a high extra chance for bardings, especially if they haven't
+ * Nagas and Armataurs get a high extra chance for bardings, especially if they haven't
  * seen any yet.
  *
  * Guaranteed to be wearable, in principle.

diff --git a/crawl-ref/source/dat/clua/autofight.lua b/crawl-ref/source/dat/clua/autofight.lua
@@ -105,7 +105,7 @@ end
 local function have_quiver_action(no_move)
   return ((AUTOFIGHT_THROW or no_move and AUTOFIGHT_THROW_NOMOVE)
           and you.quiver_valid(1) and you.quiver_enabled(1)
-          -- TODO: palentonga roll passes the following check, which may be
+          -- TODO: armataur roll passes the following check, which may be
           -- counterintuitive for the nomove case
           and you.quiver_allows_autofight()
           and (not you.quiver_uses_mp() or not AUTOMAGIC_FIGHT or not af_mp_is_low()))

diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
@@ -154,7 +154,7 @@ function species_mock(e)
     return "tentacled monstrosity"
   elseif you.race() == "Ogre" then
     return "ettin skeleton"
-  elseif you.race() == "Palentonga" then
+  elseif you.race() == "Armataur" then
     return "rat"
   elseif you.race() == "Spriggan" then
     return "unseen horror"

diff --git a/crawl-ref/source/dat/des/arrival/small.des b/crawl-ref/source/dat/des/arrival/small.des
@@ -3624,7 +3624,7 @@ WEIGHT:  5
 TILE:    G = dngn_statue_sigmund
 : set_feature_name("granite_statue", "a statue of a dreadful foe")
 # Bunch of player species
-KITEM:   ? = palentonga skeleton / deep elf skeleton / demigod skeleton / \
+KITEM:   ? = armataur skeleton / deep elf skeleton / demigod skeleton / \
              demonspawn skeleton / draconian skeleton / felid skeleton / \
              formicid skeleton / ghoul skeleton / gnoll skeleton / \
              orc skeleton / human skeleton / kobold skeleton / \

diff --git a/crawl-ref/source/dat/des/arrival/twisted.des b/crawl-ref/source/dat/des/arrival/twisted.des
@@ -108,7 +108,7 @@ KMONS:   P = demigod ; nothing
 KMONS:   Q = octopode ; nothing
 KMONS:   R = formicid ; nothing
 KMONS:   S = gargoyle ; nothing
-KMONS:   T = palentonga ; nothing
+KMONS:   T = armataur ; nothing
 KMONS:   Z = vine stalker ; nothing
 MAP
  ccccc

diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
@@ -61,7 +61,7 @@ A long pole with an enormous, cleaving blade on one end.
 %%%%
 barding
 
-Armour for the scaly midsections of nagas and palentongas.
+Armour for the scaly midsections of nagas and armataurs.
 %%%%
 battleaxe
 

diff --git a/crawl-ref/source/dat/descript/species.txt b/crawl-ref/source/dat/descript/species.txt
@@ -102,10 +102,9 @@ Ogre
 Large, strong, and extremely robust, Ogres are competent at all forms of melee.
 Not merely brutes, they are also quite capable spellcasters.
 %%%%
-Palentonga
+Armataur
 
-Scaled mammals the size of horses, Palentongas are able to launch powerful
-rolling charges.
+Scaled mammals the size of horses, Armataurs can launch powerful rolling charges.
 %%%%
 Spriggan
 

diff --git a/crawl-ref/source/dat/species/palentonga.yaml → crawl-ref/source/dat/species/armataur.yaml b/crawl-ref/source/dat/species/palentonga.yaml → crawl-ref/source/dat/species/armataur.yaml
@@ -1,6 +1,7 @@
-enum: SP_PALENTONGA
-monster: MONS_PALENTONGA
-name: "Palentonga"
+enum: SP_ARMATAUR
+monster: MONS_ARMATAUR
+name: "Armataur"
+short_name: "AT"
 difficulty: Simple
 difficulty_priority: 60
 species_flags:
@@ -36,7 +37,7 @@ aptitudes:
   earth_magic: -1
   poison_magic: -2
   invocations: 1
-  evocations: -1
+  evocations: 0
 size: large
 str: 13
 int: 8

diff --git a/crawl-ref/source/hints.cc b/crawl-ref/source/hints.cc
@@ -2187,7 +2187,7 @@ string hints_describe_item(const item_def &item)
             }
             else if (item.sub_type == ARM_BARDING)
             {
-                ostr << "Only nagas and palentongas can wear barding.";
+                ostr << "Only nagas and armataurs can wear barding.";
                 wearable = false;
             }
             else

diff --git a/crawl-ref/source/item-use.cc b/crawl-ref/source/item-use.cc
@@ -1386,7 +1386,7 @@ bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary)
                 if (you.has_mutation(MUT_CONSTRICTING_TAIL))
                     mpr("You have no legs!");
                 else
-                    mpr("Boots don't fit your feet!"); // palentonga
+                    mpr("Boots don't fit your feet!"); // armataur
             }
             return false;
         }

diff --git a/crawl-ref/source/job-data.h b/crawl-ref/source/job-data.h
@@ -68,7 +68,7 @@ static const map<job_type, job_def> job_data =
 { JOB_BERSERKER, {
     "Be", "Berserker",
     9, -1, 4,
-    { SP_HILL_ORC, SP_OGRE, SP_MERFOLK, SP_MINOTAUR, SP_GARGOYLE, SP_PALENTONGA, },
+    { SP_HILL_ORC, SP_OGRE, SP_MERFOLK, SP_MINOTAUR, SP_GARGOYLE, SP_ARMATAUR, },
     { },
     { "animal skin" },
     WCHOICE_PLAIN,
@@ -164,7 +164,7 @@ static const map<job_type, job_def> job_data =
     "Fi", "Fighter",
     8, 0, 4,
     { SP_METEORAN, SP_HILL_ORC, SP_TROLL, SP_MINOTAUR, SP_GARGOYLE,
-      SP_PALENTONGA, },
+      SP_ARMATAUR, },
     { },
     { "scale mail", "buckler", "potion of might" },
     WCHOICE_GOOD,
@@ -259,7 +259,7 @@ static const map<job_type, job_def> job_data =
 { JOB_MONK, {
     "Mo", "Monk",
     3, 2, 7,
-    { SP_METEORAN, SP_HILL_ORC, SP_TROLL, SP_PALENTONGA, SP_MERFOLK,
+    { SP_METEORAN, SP_HILL_ORC, SP_TROLL, SP_ARMATAUR, SP_MERFOLK,
       SP_GARGOYLE, SP_DEMONSPAWN, },
     { },
     { "robe", "potion of ambrosia" },
@@ -367,7 +367,7 @@ static const map<job_type, job_def> job_data =
 { JOB_WARPER, {
     "Wr", "Warper",
     3, 5, 4,
-    { SP_FELID, SP_METEORAN, SP_SPRIGGAN, SP_PALENTONGA, SP_BASE_DRACONIAN, },
+    { SP_FELID, SP_METEORAN, SP_SPRIGGAN, SP_ARMATAUR, SP_BASE_DRACONIAN, },
     {
         SPELL_BLINK,
         SPELL_BECKONING,

diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
@@ -2799,12 +2799,12 @@ static void _do_wait_spells()
     handle_flame_wave();
 }
 
-// palentongas uncurl at the start of the turn
+// armataurs uncurl at the start of the turn
 static void _uncurl()
 {
-    if (you.props[PALENTONGA_CURL_KEY].get_bool())
+    if (you.props[ARMATAUR_CURL_KEY].get_bool())
     {
-        you.props[PALENTONGA_CURL_KEY] = false;
+        you.props[ARMATAUR_CURL_KEY] = false;
         you.redraw_armour_class = true;
     }
 }

diff --git a/crawl-ref/source/melee-attack.cc b/crawl-ref/source/melee-attack.cc
@@ -1449,7 +1449,7 @@ int melee_attack::player_apply_final_multipliers(int damage, bool aux)
     // martial damage modifier (wu jian)
     damage = martial_damage_mod(damage);
 
-    // Palentonga rolling charge bonus
+    // Armataur rolling charge bonus
     if (roll_dist > 0)
     {
         // + 1/3rd base per distance rolled, up to double at dist 3.

diff --git a/crawl-ref/source/melee-attack.h b/crawl-ref/source/melee-attack.h
@@ -38,7 +38,7 @@ class melee_attack : public attack
     bool         cleaving;        // additional attack from cleaving
     bool         is_riposte;      // long blade retaliation attack
     bool         is_projected;    // projected weapon spell attack
-    int          roll_dist;       // palentonga rolling charge distance
+    int          roll_dist;       // armataur rolling charge distance
     wu_jian_attack_type wu_jian_attack;
     int wu_jian_number_of_targets;
     coord_def attack_position;

diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc
@@ -2417,8 +2417,8 @@ bool PlayerMenuEntry::get_tiles(vector<tile_def>& tileset) const
         flags[TILEP_PART_BOOTS] = is_naga ? TILEP_FLAG_NORMAL : TILEP_FLAG_HIDE;
     }
 
-    bool is_ptng = (equip_doll.parts[TILEP_PART_BASE] == TILEP_BASE_PALENTONGA
-                    || equip_doll.parts[TILEP_PART_BASE] == TILEP_BASE_PALENTONGA + 1);
+    bool is_ptng = (equip_doll.parts[TILEP_PART_BASE] == TILEP_BASE_ARMATAUR
+                    || equip_doll.parts[TILEP_PART_BASE] == TILEP_BASE_ARMATAUR + 1);
     if (equip_doll.parts[TILEP_PART_BOOTS] >= TILEP_BOOTS_CENTAUR_BARDING
         && equip_doll.parts[TILEP_PART_BOOTS] <= TILEP_BOOTS_CENTAUR_BARDING_RED)
     {

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
@@ -3577,17 +3577,17 @@ DUMMY(MONS_FROG, 'F', LIGHTGREEN, "giant frog", TILEP_MONS_BULLFROG)
 
 // dummy, though it's rude to say so
 {
-    MONS_PALENTONGA, 'H', YELLOW, "palentonga",
+    MONS_ARMATAUR, 'H', YELLOW, "armataur",
     M_SPEAKS | M_NO_POLY_TO | M_NO_GEN_DERIVED,
     MR_NO_FLAGS,
-    10, MONS_PALENTONGA, MONS_PALENTONGA, MH_NATURAL, 10,
+    10, MONS_ARMATAUR, MONS_ARMATAUR, MH_NATURAL, 10,
     { {AT_HIT, AF_PLAIN, 18}, {AT_TAIL_SLAP, AF_PLAIN, 12}, AT_NO_ATK,
         AT_NO_ATK },
     8, 450,
     15, 5, MST_NO_SPELLS, true, S_SHOUT,
     I_HUMAN, HT_LAND, 10, DEFAULT_ENERGY,
     MONUSE_WEAPONS_ARMOUR, SIZE_LARGE, MON_SHAPE_HUMANOID,
-    {TILEP_MONS_PALENTONGA}, TILE_CORPSE_PALENTONGA
+    {TILEP_MONS_ARMATAUR}, TILE_CORPSE_ARMATAUR
 },
 
 // Mutant beasts - variable traits

diff --git a/crawl-ref/source/monster-type.h b/crawl-ref/source/monster-type.h
@@ -48,7 +48,7 @@ enum monster_type                      // env.mons[].type
 #endif
 #if TAG_MAJOR_VERSION > 34
     MONS_CRYSTAL_ECHIDNA,
-    MONS_PALENTONGA,
+    MONS_ARMATAUR,
 #endif
     MONS_JACKAL,
     MONS_HOUND,
@@ -1123,7 +1123,7 @@ enum monster_type                      // env.mons[].type
     MONS_FOXFIRE,
     MONS_MAGGIE,
     MONS_NAMELESS,
-    MONS_PALENTONGA,
+    MONS_ARMATAUR,
     MONS_BLOATED_HUSK,
     MONS_BUNYIP,
     MONS_GOLIATH_FROG,

diff --git a/crawl-ref/source/mutation-data.h b/crawl-ref/source/mutation-data.h
@@ -940,7 +940,7 @@ static const mutation_def mut_data[] =
   {"", "", ""},
 },
 
-// Palentonga only
+// Armataur only
 { MUT_ROLL, 8, 3, mutflag::good, true,
   "roll",
 

diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
@@ -1769,7 +1769,7 @@ bool physiology_mutation_conflict(mutation_type mutat)
     if (!you.has_innate_mutation(MUT_SPIT_POISON) && mutat == MUT_SPIT_POISON)
         return true;
 
-    // Only Palentonga can go on a roll.
+    // Only Armataur can go on a roll.
     if (!you.has_innate_mutation(MUT_ROLL) && mutat == MUT_ROLL)
         return true;
 

diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
@@ -823,11 +823,11 @@ static bool _is_damage_threatening (int damage_fraction_of_hp, int mut_level)
                 || random2(100) > hp_fraction);
 }
 
-// Palentongas curl up after the first time they've been hit in a round.
+// Armataurs curl up after the first time they've been hit in a round.
 static void _consider_curling(kill_method_type death_type)
 {
     if (!you.has_mutation(MUT_CURL)
-        || you.props[PALENTONGA_CURL_KEY].get_bool())
+        || you.props[ARMATAUR_CURL_KEY].get_bool())
     {
         return;
     }
@@ -851,7 +851,7 @@ static void _consider_curling(kill_method_type death_type)
             return;
     }
 
-    you.props[PALENTONGA_CURL_KEY] = true;
+    you.props[ARMATAUR_CURL_KEY] = true;
     you.redraw_armour_class = true;
 }
 

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
@@ -5785,7 +5785,7 @@ int player::base_ac_from(const item_def &armour, int scale) const
     const int AC = base * (440 + skill(SK_ARMOUR, 20)) / 440;
 
     // The deformed don't fit into body armour very well.
-    // (This includes nagas and palentongas.)
+    // (This includes nagas and armataurs.)
     if (get_armour_slot(armour) == EQ_BODY_ARMOUR
             && (get_mutation_level(MUT_DEFORMED)
                 || get_mutation_level(MUT_PSEUDOPODS)))
@@ -6119,7 +6119,7 @@ int player::armour_class_with_specific_items(vector<const item_def *> items) con
     AC += sanguine_armour_bonus();
 
     if (you.has_mutation(MUT_CURL)
-        && you.props[PALENTONGA_CURL_KEY].get_bool())
+        && you.props[ARMATAUR_CURL_KEY].get_bool())
     {
         AC += 7 * scale;
     }

diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
@@ -52,7 +52,7 @@
 #define PARALYSED_BY_KEY "paralysed_by"
 #define PETRIFIED_BY_KEY "petrified_by"
 #define FROZEN_RAMPARTS_KEY "frozen_ramparts_position"
-#define PALENTONGA_CURL_KEY "palentonga_curl"
+#define ARMATAUR_CURL_KEY "palentonga_curl"
 
 // display/messaging breakpoints for penalties from Ru's MUT_HORROR
 #define HORROR_LVL_EXTREME  3

diff --git a/crawl-ref/source/quiver.cc b/crawl-ref/source/quiver.cc
@@ -1384,10 +1384,10 @@ namespace quiver
 
         if (abil == ABIL_ROLLING_CHARGE)
         {
-            // Use a version of the palentonga charge range check that
+            // Use a version of the armataur charge range check that
             // ignores things like butterflies, so that autofight doesn't get
             // tripped up.
-            return palentonga_charge_possible(quiet, false);
+            return armataur_charge_possible(quiet, false);
         }
 
         if (get_dist_to_nearest_monster() > ability_range(abil)

diff --git a/crawl-ref/source/rltiles/dc-corpse.txt b/crawl-ref/source/rltiles/dc-corpse.txt
@@ -273,7 +273,7 @@ fenstrider_witch CORPSE_FENSTRIDER_WITCH
 sphinx CORPSE_SPHINX
 tengu CORPSE_TENGU
 jorogumo CORPSE_JOROGUMO
-palentonga CORPSE_PALENTONGA
+armataur CORPSE_ARMATAUR
 mon/unique/arachne_staveless CORPSE_ARACHNE
 %sdir mon/mutantbeast
 base3 CORPSE_MUTANT_BEAST