mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-10-31 19:36:16 +00:00
adjusted elec to Eclectic City
This commit is contained in:
parent
0dc63ee0ba
commit
8cdb45ec01
@ -137,7 +137,7 @@ void celldrawer::setcolors() {
|
||||
case laDesert: case laKraken: case laDocks: case laCA:
|
||||
case laMotion: case laGraveyard: case laWineyard: case laLivefjord:
|
||||
case laRlyeh: case laHell: case laCrossroads: case laJungle:
|
||||
case laAlchemist:
|
||||
case laAlchemist: case laFrog:
|
||||
fcol = floorcolors[c->land]; break;
|
||||
|
||||
case laWet:
|
||||
@ -385,7 +385,7 @@ void celldrawer::setcolors() {
|
||||
break;
|
||||
}
|
||||
|
||||
case laIce: case laCocytus: case laBlizzard:
|
||||
case laIce: case laCocytus: case laBlizzard: case laEclectic:
|
||||
if(useHeatColoring(c)) {
|
||||
float h = HEAT(c);
|
||||
eLand l = c->land;
|
||||
@ -986,6 +986,13 @@ void celldrawer::set_land_floor(const transmatrix& Vf) {
|
||||
case laWineyard:
|
||||
set_floor(cgi.shFeatherFloor);
|
||||
break;
|
||||
|
||||
case laFrog:
|
||||
if(c->wall == waDeepWater)
|
||||
set_floor(cgi.shFloor);
|
||||
else
|
||||
set_floor(cgi.shFeatherFloor);
|
||||
break;
|
||||
|
||||
case laZebra:
|
||||
set_zebrafloor();
|
||||
@ -1009,6 +1016,7 @@ void celldrawer::set_land_floor(const transmatrix& Vf) {
|
||||
|
||||
case laVolcano:
|
||||
case laVariant:
|
||||
case laEclectic:
|
||||
set_floor(cgi.shLavaFloor);
|
||||
break;
|
||||
|
||||
|
16
complex.cpp
16
complex.cpp
@ -209,6 +209,7 @@ EX namespace elec {
|
||||
if(c->wall == waSea || c->wall == waGrounded) return ecGrounded;
|
||||
if(c->wall == waSandstone || c->wall == waDeadTroll ||
|
||||
c->wall == waDeadTroll2 ||
|
||||
among(c->wall, waBigTree, waSmallTree, waExplosiveBarrel, waRed1, waRed2, waRed3) ||
|
||||
c->wall == waVinePlant ||
|
||||
c->wall == waMetal || isAlchAny(c))
|
||||
return isElectricLand(c) ? ecConductor : ecGrounded;
|
||||
@ -341,10 +342,19 @@ EX namespace elec {
|
||||
if(isPlayerOn(c)) {
|
||||
killThePlayerAt(moLightningBolt, c, 0);
|
||||
}
|
||||
if(c->wall == waSandstone)
|
||||
c->wall = waNone, c->item = itFulgurite,
|
||||
drawParticles(c, winf[waSandstone].color, 16);
|
||||
if(c->wall == waSandstone) {
|
||||
c->wall = waNone, drawParticles(c, winf[waSandstone].color, 16);
|
||||
if(c->land == laStorms)
|
||||
c->item = itFulgurite;
|
||||
}
|
||||
if(c->wall == waRed1) c->wall = waNone;
|
||||
if(c->wall == waRed2) c->wall = waRed1;
|
||||
if(c->wall == waRed3) c->wall = waRed2;
|
||||
if(c->wall == waDeadTroll) c->wall = waCavefloor;
|
||||
if(c->wall == waBigTree || c->wall == waSmallTree)
|
||||
makeflame(c, 10, false);
|
||||
if(c->wall == waExplosiveBarrel)
|
||||
explodeBarrel(c);
|
||||
if(c->wall == waDeadTroll2 || isAlchAny(c) || c->wall == waVinePlant)
|
||||
drawParticles(c, winf[c->wall].color, 16),
|
||||
c->wall = waNone;
|
||||
|
Loading…
Reference in New Issue
Block a user