Add female white knight version.

miki151 · Nov 5, 2018 · 65de218 · 65de218
1 parent f6fcd77
commit 65de218
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 15 deletions.
diff --git a/creature_factory.cpp b/creature_factory.cpp
@@ -962,6 +962,33 @@ CreatureAttributes CreatureFactory::getAttributesFromId(CreatureId id) {
           c.maxLevelIncrease[ExperienceType::SPELL] = 3;
           c.spells->add(SpellId::HEAL_SELF);
       );
+    case CreatureId::KEEPER_KNIGHT_WHITE:
+      return CATTR(
+          c.viewId = ViewId::DUKE;
+          c.attr = LIST(20_dam, 16_def);
+          c.body = Body::humanoid(Body::Size::LARGE);
+          c.name = "knight";
+          c.name->setFirst(NameGenerator::get(NameGeneratorId::FIRST_MALE)->getNext());
+          c.name->useFullTitle();
+          c.skills.setValue(SkillId::FORGE, 0.2);
+          c.maxLevelIncrease[ExperienceType::MELEE] = 12;
+          c.maxLevelIncrease[ExperienceType::SPELL] = 1;
+          c.hatedByEffect = LastingEffect::HATE_HUMANS;
+      );
+    case CreatureId::KEEPER_KNIGHT_WHITE_F:
+      return CATTR(
+          c.viewId = ViewId::DUKE_F;
+          c.attr = LIST(20_dam, 16_def);
+          c.gender = Gender::female;
+          c.body = Body::humanoid(Body::Size::LARGE);
+          c.name = "knight";
+          c.name->setFirst(NameGenerator::get(NameGeneratorId::FIRST_FEMALE)->getNext());
+          c.name->useFullTitle();
+          c.skills.setValue(SkillId::FORGE, 0.2);
+          c.maxLevelIncrease[ExperienceType::MELEE] = 12;
+          c.maxLevelIncrease[ExperienceType::SPELL] = 1;
+          c.hatedByEffect = LastingEffect::HATE_HUMANS;
+      );
     case CreatureId::ADVENTURER:
       return CATTR(
           c.viewId = ViewId::PLAYER;
@@ -1267,19 +1294,6 @@ CreatureAttributes CreatureFactory::getAttributesFromId(CreatureId id) {
           c.name->setFirst(NameGenerator::get(NameGeneratorId::FIRST_MALE)->getNext());
           c.hatedByEffect = LastingEffect::HATE_HUMANS;
       );
-    case CreatureId::DUKE_PLAYER:
-      return CATTR(
-          c.viewId = ViewId::DUKE;
-          c.attr = LIST(20_dam, 16_def);
-          c.body = Body::humanoid(Body::Size::LARGE);
-          c.name = "knight";
-          c.name->setFirst(NameGenerator::get(NameGeneratorId::FIRST_MALE)->getNext());
-          c.name->useFullTitle();
-          c.skills.setValue(SkillId::FORGE, 0.2);
-          c.maxLevelIncrease[ExperienceType::MELEE] = 12;
-          c.maxLevelIncrease[ExperienceType::SPELL] = 1;
-          c.hatedByEffect = LastingEffect::HATE_HUMANS;
-      );
     case CreatureId::ARCHER_PLAYER:
       return CATTR(
           c.viewId = ViewId::ARCHER;

diff --git a/creature_factory.h b/creature_factory.h
@@ -111,7 +111,8 @@ RICH_ENUM(CreatureId,
     PRIEST_PLAYER,
     KNIGHT_PLAYER,
     JESTER_PLAYER,
-    DUKE_PLAYER,
+    KEEPER_KNIGHT_WHITE,
+    KEEPER_KNIGHT_WHITE_F,
     ARCHER_PLAYER,
     GNOME_PLAYER,
     PESEANT_PLAYER,

diff --git a/data_free/game_config/player_creatures.txt b/data_free/game_config/player_creatures.txt
@@ -35,7 +35,7 @@
     description = "Build and manage your dream dungeon, defend against raids, and attack your enemies!"
   }
   {
-    creatureId = { DUKE_PLAYER }
+    creatureId = { KEEPER_KNIGHT_WHITE KEEPER_KNIGHT_WHITE_F }
     tribeAlignment = LAWFUL
     immigrantGroups = {"peseants" "white_keeper"}
     technology = {

diff --git a/tile.cpp b/tile.cpp
@@ -452,6 +452,7 @@ class TileCoordLookup {
     Tile::addTile(ViewId::WARRIOR, sprite("warrior"));
     Tile::addTile(ViewId::SHAMAN, sprite("shaman"));
     Tile::addTile(ViewId::DUKE, sprite("knightboss"));
+    Tile::addTile(ViewId::DUKE_F, sprite("knightboss_f"));
     Tile::addTile(ViewId::ARCHER, sprite("archer"));
     Tile::addTile(ViewId::PESEANT, sprite("peasant"));
     Tile::addTile(ViewId::PESEANT_WOMAN, sprite("peasantgirl"));
@@ -818,6 +819,7 @@ class TileCoordLookup {
     Tile::addSymbol(ViewId::WARRIOR, symbol(u8"@", Color::DARK_GRAY));
     Tile::addSymbol(ViewId::SHAMAN, symbol(u8"@", Color::YELLOW));
     Tile::addSymbol(ViewId::DUKE, symbol(u8"@", Color::BLUE));
+    Tile::addSymbol(ViewId::DUKE_F, symbol(u8"@", Color::BLUE));
     Tile::addSymbol(ViewId::ARCHER, symbol(u8"@", Color::BROWN));
     Tile::addSymbol(ViewId::PESEANT, symbol(u8"@", Color::GREEN));
     Tile::addSymbol(ViewId::PESEANT_WOMAN, symbol(u8"@", Color::GREEN));

diff --git a/view_id.h b/view_id.h
@@ -52,6 +52,7 @@ RICH_ENUM(
     KNIGHT,
     PRIEST,
     DUKE,
+    DUKE_F,
     JESTER,
     ARCHER,
     PESEANT,