remove ijyb

Hellmonk · Mar 18, 2017 · 2e97844 · 2e97844
1 parent 78d8647
commit 2e97844
Show file tree

Hide file tree

Showing 22 changed files with 15 additions and 141 deletions.
diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
@@ -4547,63 +4547,6 @@ _Ignacio_rare_
 @The_monster@ says @to_foe@, "No gallows around, so decapitation it is."
 ## END Ignacio ##
 %%%%
-############ IJYB ### A twisted goblin
-Ijyb
-
-@_Ijyb_common_@
-
-w:5
-@_Ijyb_rare_@
-%%%%
-_Ijyb_common_
-
-VISUAL:@The_monster@ grins evilly.
-
-@The_monster@ screams @at_foe@, "Die!"
-
-@The_monster@ screams @at_foe@, "Me kill you!"
-
-@The_monster@ screams @at_foe@, "Me stronger than you!"
-
-@The_monster@ screams @at_foe@, "It's all mine!"
-
-@The_monster@ screams @at_foe@, "Get away!"
-
-@The_monster@ screams @at_foe@, "Level is mine! All mine!"
-
-@The_monster@ screams @at_foe@, "You nasty! Big nasty!"
-%%%%
-_Ijyb_rare_
-
-@The_monster@ screams @at_foe@, "I cut your head off!"
-
-@The_monster@ screams @at_foe@, "I dance on your bones!"
-
-@The_monster@ screams @at_foe@, "Me very upset!"
-
-@The_monster@ screams @at_foe@, "No! No, no, no, no!"
-
-@The_monster@ screams @at_foe@, "I no like you!"
-%%%%
-confused Ijyb
-
-@The_monster@ cowers and screams, "My head! Aaaah! Get out now!"
-
-@The_monster@ screams @at_foe@, "Me give you whole level! Then you leave me be!"
-
-@The_monster@ screams @at_foe@, "Me still stronger! You very nasty!"
-
-@The_monster@ screams @at_foe@, "Me deserve better than this!"
-
-@The_monster@ screams @at_foe@, "Me be nice to you! Me promise!"
-
-@The_monster@ screams @at_foe@, "Me back to killing you soon!"
-
-@The_monster@ screams @at_foe@, "No nasty magic on me!"
-
-VISUAL:@The_monster@ clutches @possessive@ head and gibbers rapidly, swaying.
-## END Ijyb ##
-%%%%
 ############ ILSUIW ### a powerful merfolk witch
 Ilsuiw
 

diff --git a/crawl-ref/source/dat/database/montitle.txt b/crawl-ref/source/dat/database/montitle.txt
@@ -131,10 +131,6 @@ Ilsuiw title
 
 Ilsuiw, Witch of the Tides
 %%%%
-Ijyb title
-
-Ijyb the Twisted Goblin
-%%%%
 Jessica title
 
 Jessica the Apprentice Sorceress

diff --git a/crawl-ref/source/dat/des/builder/uniques.des b/crawl-ref/source/dat/des/builder/uniques.des
@@ -151,10 +151,6 @@ NAME:   uniq_harold
 DEPTH:  D:10-12, Orc, !Orc:$, Lair:1-4
 : place_unique(_G, "Harold")
 
-NAME:   uniq_iyjb
-DEPTH:  D:2-3
-: place_unique(_G, "Ijyb")
-
 NAME:   uniq_jessica
 DEPTH:  D:2-3
 : place_unique(_G, "Jessica")

diff --git a/crawl-ref/source/dat/des/sprint/arena_sprint.des b/crawl-ref/source/dat/des/sprint/arena_sprint.des
@@ -221,7 +221,7 @@ function arena_sprint_get_monster_set(round, boss)
         elseif round <= 2 then
             mon_set = {
                 "place:D:3 / place:D:5 / w:4 sigmund / w:2 jessica / w:2 terence",
-                "goblin / hobgoblin / kobold / big kobold / ijyb w:6 / pikel w:4",
+                "goblin / hobgoblin / kobold / big kobold / pikel w:4",
                 "rat / quokka / iguana / porcupine / w:2 hell rat / w:6 purgy",
                 "ball python / adder w:15 / water moccasin w:5",
                 "orc w:40 / orc wizard w:8 / orc priest w:5 / w:5 orc warrior / blork the orc",

diff --git a/crawl-ref/source/dat/des/sprint/pitsprint.des b/crawl-ref/source/dat/des/sprint/pitsprint.des
@@ -103,7 +103,7 @@ function base_monster_setup(e)
            orc / worker ant / floating eye / skeleton /\
            zombie / iguana / ufetubus")
   e.kmons("H = Sigmund / Jessica / Blork the orc / Crazy Yiuf / Duvessa band /\
-           Edmund / Ijyb / Grinder / Pikel band / Purgy / Terence / Menkaure /\
+           Edmund / Grinder / Pikel band / Purgy / Terence / Menkaure /\
            Prince Ribbit")
   e.kmons("I = Erica / Erolcha / Eustachio / Gastronok / Grum band / Harold /\
            Joseph / Josephine band / Psyche / Sonja / Urug")

diff --git a/crawl-ref/source/dat/des/sprint/red_sonja.des b/crawl-ref/source/dat/des/sprint/red_sonja.des
@@ -23,7 +23,7 @@ MARKER: H = lua:fog_machine { \
              pow_min = 2, pow_max = 3, delay = 4, \
              size = 10, walk_dist = 6, spread_rate= 4, \
              cloud_type= "foul pestilence" }
-MONS:   Ijyb, ogre, Sigmund, centaur warrior, Sonja, deep troll, wasp
+MONS:   ogre, Sigmund, centaur warrior, Sonja, deep troll, wasp
 SUBST:  r = r.
 SUBST:  r = ~.
 KITEM:  I = potion of curing

diff --git a/crawl-ref/source/dat/des/sprint/zigsprint.des b/crawl-ref/source/dat/des/sprint/zigsprint.des
@@ -191,7 +191,7 @@ function choose_mset_1(e)
   else
     e.kmons("1 = Sigmund, Jessica, Blork the orc, Crazy Yiuf, Dowan, \
                Duvessa, Edmund, Erica, Erolcha, Eustachio, Gastronok, \
-               Grum, Grinder, Harold, Ijyb, Joseph, Josephine, \
+               Grum, Grinder, Harold, Joseph, Josephine, \
                Menkaure, Pikel, Prince Ribbit, Psyche, \
                Purgy, Sonja, Terence, Urug, human")
   end
@@ -286,7 +286,7 @@ function choose_mset_2(e)
   else
     e.kmons("1 = Sigmund, Jessica, Blork the orc, Crazy Yiuf, Dowan, \
                Duvessa, Edmund, Erica, Erolcha, Eustachio, Gastronok, \
-               Grum, Grinder, Harold, Ijyb, Joseph, Josephine, \
+               Grum, Grinder, Harold, Joseph, Josephine, \
                Menkaure, Pikel, Prince Ribbit, Psyche, \
                Purgy, Sonja, Terence, Urug, human")
   end
@@ -408,7 +408,7 @@ function choose_mset_3(e)
 -- Uniques
   elseif rnd < 114 then
     e.kmons("1 = Blork the orc / Crazy Yiuf / Dowan / Duvessa / Edmund / Erica / Erolcha /\
-               Eustachio / Gastronok / Grum / Grinder / Harold / Ijyb / Jessica /\
+               Eustachio / Gastronok / Grum / Grinder / Harold / Jessica /\
                Joseph / Josephine / Menkaure / Pikel /\
                Prince Ribbit / Psyche / Purgy / Sigmund / Sonja / Terence / Urug /\
                Agnes / Aizul / Azrael / Donald / Frances / Kirke / Louise /\

diff --git a/crawl-ref/source/dat/des/variable/float.des b/crawl-ref/source/dat/des/variable/float.des
@@ -1130,7 +1130,7 @@ WEIGHT: 5
 MONS:   jackal / hound, yak, human
 # XXX: Use some function to cover for used uniques,
 # like in kennysheep_goblin_castle.
-MONS:   Edmund / Jessica / Sigmund, Ijyb / Psyche
+MONS:   Edmund / Jessica / Sigmund / Psyche
 SUBST:  1 = 11., 3 = 3., 4 = 34, 5 = 35
 # Guarantee two winding tunnel into the center in this mess.
 SHUFFLE: rR / sS / uU / vV / wW / yY / zZ, uU / nN
@@ -6703,7 +6703,7 @@ NAME:   kennysheep_the_goblin_king
 ORIENT: float
 TAGS:   no_monster_gen no_trap_gen
 DEPTH:  D:2-4
-KMONS:  1 = Ijyb / hobgoblin, hobgoblin
+KMONS:  1 = hobgoblin, hobgoblin
 KMONS:  2 = goblin
 MAP
 xxxxxxxxx

diff --git a/crawl-ref/source/dat/des/variable/large_themed.des b/crawl-ref/source/dat/des/variable/large_themed.des
@@ -1609,19 +1609,16 @@ DEPTH:  D:2-4
 {{
   -- Default for when we're only map validating.
   if not crawl.game_started() then
-    kmons("O = Ijyb / Robin / hobgoblin w:1")
+    kmons("O = Robin / hobgoblin w:1")
     subst("B = 1")
     return
   end
 
   -- possible hobgoblin bosses and their weights
-  bossw = {hobgoblin = 1, Ijyb = 10, Robin = 10}
+  bossw = {hobgoblin = 1, Robin = 10}
   bosses = {hobgoblin = 1}
 
-  -- Find out which hobgoblin uniques we can use
-  if not you.uniques("Ijyb") then
-    bosses["Ijyb"] = bossw["Ijyb"]
-  end
+  -- Find out which hobgoblin unique we can use
   if not you.uniques("Robin") then
     bosses["Robin"] = bossw["Robin"]
   end

diff --git a/crawl-ref/source/dat/descript/da/monsters.txt b/crawl-ref/source/dat/descript/da/monsters.txt
@@ -165,11 +165,6 @@ Selvom hans nye form omfatter en række barberbladsskarpe klinger, som er
 udvokset fra hans dæmoniske lemmer, har Ignacio beholdt sin yndlingsøkse – og
 er ivrig after at teste dens blad på dig.
 %%%%
-Ijyb
-
-En lille, forskruet goblin iklædt grimme, blå laser. Han har herredømmet over
-dette niveau af de underjordiske gange; indtrængende straffes med døden.
-%%%%
 Jessica
 
 En ondsindet troldkvindelærling. Hun er kommet til de underjordiske gange i

diff --git a/crawl-ref/source/dat/descript/es/monsters.txt b/crawl-ref/source/dat/descript/es/monsters.txt
@@ -172,10 +172,6 @@ Aunque su nueva forma tiene varias cuchillas enormes saliendo de sus apéndices
 de demonio, todavía conserva su hacha favorita y está dispuesto a hacerte
 probar su filo.
 %%%%
-Ijyb
-
-Un pequeño y retorcido goblin que viste harapos azules.
-%%%%
 Jessica
 
 Una malvada aprendiz de hechicera. Entró en el calabozo esperando encontrar un

diff --git a/crawl-ref/source/dat/descript/fi/monsters.txt b/crawl-ref/source/dat/descript/fi/monsters.txt
@@ -40,10 +40,6 @@ Harold
 
 Keski-ikäinen palkkionmetsästäjä, palkattu tappamaan sinut. Hänellä on kiire.
 %%%%
-Ijyb
-
-Pieni ja kiero maahinen. Hänellä on vaatteinaan joitakin rumia sinisiä rääsyjä.
-%%%%
 Joseph
 
 Näyttää aivan palkkasotilaalta.

diff --git a/crawl-ref/source/dat/descript/fr/monsters.txt b/crawl-ref/source/dat/descript/fr/monsters.txt
@@ -184,11 +184,6 @@ Même si sa nouvelle forme inclut un certain nombre de grosses lames d'un
 tranchant remarquable venant de ses appendices démoniaques, il garde sa hache
 favorite et il vous laissera volontiers essayer ses tranchants.
 %%%%
-Ijyb
-
-Un gobelin petit et tordu. Il considère que ce niveau du donjon lui appartient,
-et punit de mort tous ceux qui oseraient s'y aventurer sans son consentement.
-%%%%
 Jessica
 
 Une apprenti-sorcière du mal. Elle est entrée dans le donjon en espérant

diff --git a/crawl-ref/source/dat/descript/ko/monsters.txt b/crawl-ref/source/dat/descript/ko/monsters.txt
@@ -177,12 +177,6 @@ Ignacio
 자신의 도끼를 들고 다니며, 당신의 목을 사용해서 도끼날이 살아있는지 확인하고
 싶어한다.
 %%%%
-Ijyb
-
-작은 고블린으로, 어딘가 멀쩡해 보이지 않는다. 뭔지 모를 푸른색 넝마를 걸치고
-있으며, 자신이 바로 이 층의 지배자라고 주장하고 있다. 자신의 땅에 침입한
-대가는... 사형이다.
-%%%%
 Jessica
 
 사악한 여자 수습 마법사다. 그녀는 방해받지 않기 위해, 이 조용하고 한적한 던전에

diff --git a/crawl-ref/source/dat/descript/lt/monsters.txt b/crawl-ref/source/dat/descript/lt/monsters.txt
@@ -113,11 +113,6 @@ Gloorx Vloq
 
 Miglota figūra apsupta glūdžios tamsos
 %%%%
-Ijyb
-
-Mažas ir suktas goblinas, dėvintis keletą mėlynų skudurų. Šį požemio lygį jis
-laiko savo valdomis, į kurias įžengus baudžiama mirtimi.
-%%%%
 Joseph
 
 Atrodo kaip samdomas karys.

diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
@@ -212,11 +212,6 @@ Although his new form includes a number of large razor-sharp blades growing
 from his demonic appendages, he kept his favourite axe and is eager to let you
 test its edge.
 %%%%
-Ijyb
-
-A small and twisted goblin, wearing some ugly blue rags. She claims dominion
-over this level of the dungeon; the punishment for trespassing is death.
-%%%%
 Ilsuiw
 
 A deadly merfolk water-witch, who uses her dominion over the tides to draw

diff --git a/crawl-ref/source/dat/descript/ru/monsters.txt b/crawl-ref/source/dat/descript/ru/monsters.txt
@@ -166,10 +166,6 @@ Ignacio
 демонические конечности, он сохранил свой верный топор, и горит желанием дать
 тебе попробовать его остроту.
 %%%%
-Ijyb
-
-Маленький скрюченный гоблин, одетый в какие-то уродливые синие лохмотья.
-%%%%
 Jessica
 
 Начинающая колдунья-злодейка. Она проникла в Подземелье, надеясь найти тихое и

diff --git a/crawl-ref/source/dat/descript/zh/monsters.txt b/crawl-ref/source/dat/descript/zh/monsters.txt
@@ -163,11 +163,6 @@ Ignacio
 虽然他新形态的手上有好几把锋利的刀刃，他还是留着他以前最喜欢的斧头—
 —而且准备用你来测试一下它的斧刃。
 %%%%
-Ijyb
-
-一个身材矮小、性格扭曲的地精，身穿几块蓝色破布。他自称是这层地城的统治者；
-入侵者要被处以死刑。
-%%%%
 Jessica
 
 一个邪恶的见习女巫。她来地城的目的是想找到一个安静、与世隔绝的地方，

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
@@ -3306,7 +3306,9 @@ MONS_ANTIMATTER_ELF,
     MONS_SERPENT_OF_HELL_TARTARUS,
 #endif
     // Random uniques:
+#if TAG_MAJOR_VERSION == 34
     MONS_IJYB,
+#endif
     MONS_JESSICA,
     MONS_SIGMUND,
     MONS_TERENCE,

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
@@ -304,6 +304,7 @@ static monsterentry mondata[] =
 	AXED_MON(MONS_DRACONIAN_SHIFTER)
 	AXED_MON(MONS_DRACONIAN_STORMCALLER)
 	AXED_MON(MONS_TIAMAT)
+    AXED_MON(MONS_IJYB)
 #endif
 
 // Used for genus monsters (which are used for grouping monsters by how they
@@ -6221,20 +6222,6 @@ DUMMY(MONS_HELL_LORD, '&', COLOUR_UNDEF, "hell lord", TILEP_MONS_PROGRAM_BUG)
     {TILEP_MONS_PRINCE_RIBBIT}, TILE_ERROR
 },
 
-// "g"oblins, gnolls, and dwarves.
-{
-    MONS_IJYB, 'g', BLUE, "Ijyb",
-    M_UNIQUE | M_WARM_BLOOD | M_SPEAKS | M_FEMALE,
-    MR_NO_FLAGS,
-    8, MONS_GOBLIN, MONS_GOBLIN, MH_NATURAL, 10,
-    { {AT_HIT, AF_PLAIN, 4}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
-    3, 240,
-    2, 12, MST_NO_SPELLS, CE_CLEAN, S_SHOUT,
-    I_HUMAN, HT_LAND, 10, DEFAULT_ENERGY,
-    MONUSE_WEAPONS_ARMOUR, SIZE_SMALL, MON_SHAPE_HUMANOID,
-    {TILEP_MONS_IJYB}, TILE_ERROR
-},
-
 {
     MONS_ROBIN, 'g', LIGHTCYAN, "Robin",
     M_UNIQUE | M_WARM_BLOOD | M_SPEAKS | M_FEMALE,

diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
@@ -138,8 +138,7 @@ static void _give_wand(monster* mon, int level)
     // Don't give top-tier wands before 5 HD, except to Ijyb and not in sprint.
     const bool no_high_tier =
             (mon->get_experience_level() < 5
-                || mons_class_flag(mon->type, M_NO_HT_WAND))
-            && (mon->type != MONS_IJYB || crawl_state.game_is_sprint());
+                || mons_class_flag(mon->type, M_NO_HT_WAND));
 
     const int idx = items(false, OBJ_WANDS, OBJ_RANDOM, level);
 
@@ -433,7 +432,6 @@ static void _give_weapon(monster* mon, int level, bool melee_only = false,
         } } },
         { MONS_GOBLIN,                  { GOBLIN_WEAPONS } },
         { MONS_JESSICA,                 { GOBLIN_WEAPONS } },
-        { MONS_IJYB,                    { GOBLIN_WEAPONS } },
         { MONS_WIGHT,
             { { { WPN_MORNINGSTAR,      4 },
                 { WPN_DIRE_FLAIL,       4 },
@@ -1638,7 +1636,6 @@ static void _give_armour(monster* mon, int level, bool spectral_orcs)
         item.sub_type  = ARM_LEATHER_ARMOUR;
         break;
 
-    case MONS_IJYB:
     case MONS_DUVESSA:
     case MONS_DEEP_ELF_ANNIHILATOR:
     case MONS_DEEP_ELF_DEATH_MAGE:

diff --git a/crawl-ref/source/test/stress/qw.rc b/crawl-ref/source/test/stress/qw.rc
@@ -1015,7 +1015,6 @@ local scary_monsters = {
   {3, "Terence"},
 
   {5, "gnoll"},
-  {5, "Ijyb"},
   {5, "ice beast"},
   {5, "iguana"},
   {5, "Natasha"},