From bc27e10dc9b078c3a689ccac53acfd62b11a096f Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Tue, 25 Dec 2018 12:51:42 +0100 Subject: [PATCH] newlands:: some theming --- classes.cpp | 14 +++++++------- graph.cpp | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/classes.cpp b/classes.cpp index d0a364a1..6ef6f724 100644 --- a/classes.cpp +++ b/classes.cpp @@ -778,9 +778,9 @@ monstertype minf[motypes] = { "for a long time. This attack can destroy other Raiders if it hits them."}, { '@', 0xC00000, "Red Jelly", jellydesc}, { '@', 0x0000C0, "Blue Jelly", jellydesc}, - { 'B', 0xE07000, "Brown Bug", NODESCYET}, + { 'B', 0xE07000, "Bronze Beast", NODESCYET}, { 'B', 0xE07060, "Acid Bird", NODESCYET}, - { 'W', 0xA04060, "Variant Warrior", NODESCYET}, + { 'W', 0xA04060, "Mutant", NODESCYET}, { 'W', 0xC04040, "Falling Dog", NODESCYET}, { 'B', 0x40C040, "Western Hawk", NODESCYET}, @@ -1246,8 +1246,8 @@ itemtype iinf[ittypes] = { { '*', 0x20C0C0, "Brownie", "Tasty cookie." }, - { '*', 0x20C0C0, "West Treasure", NODESCYET}, - { '*', 0xC020C0, "Variant Treasure", NODESCYET}, + { '$', 0xF0C0C0, "Meteorite", NODESCYET}, + { '*', 0x30FF30, "Shining Gem", NODESCYET}, { 'o', 0x703800, "Orb of Intensity", NODESCYET}, { 'o', 0x80D080, "Orb of Gravity", NODESCYET}, @@ -1633,9 +1633,9 @@ const landtype linf[landtypes] = { "somehow. In the meantime, its memory has been cleared, since the 'remove faraway cells from the memory'" " option was on." }, - { 0xA04060, "Brownian", NODESCYET}, - { 0xA04060, "West Wall", NODESCYET}, - { 0xA04060, "Variant", NODESCYET} + { 0x804000, "Brown Islands", NODESCYET}, + { 0xA04060, "Free Fall", NODESCYET}, + { 0x30FF30, "Irradiated Field", NODESCYET} }; vector land_tac = { diff --git a/graph.cpp b/graph.cpp index 72581f8a..3719670e 100644 --- a/graph.cpp +++ b/graph.cpp @@ -1252,11 +1252,11 @@ bool drawMonsterType(eMonster m, cell *where, const transmatrix& V, color_t col, queuepoly(VFISH, shShark, darkena(col, 0, 0xFF)); else if(m == moEagle || m == moParrot || m == moBomberbird || m == moAlbatross || m == moTameBomberbird || m == moWindCrow || m == moTameBomberbirdMoved || - m == moSandBird || m == moAcidBird) { + m == moSandBird) { ShadowV(V, shEagle); queuepoly(VBIRD, shEagle, darkena(col, 0, 0xFF)); } - else if(m == moSparrowhawk || m == moWestHawk) { + else if(among(m, moSparrowhawk, moWestHawk, moAcidBird)) { ShadowV(V, shHawk); queuepoly(VBIRD, shHawk, darkena(col, 0, 0xFF)); }