mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Orb of Winter and Orb of Luck.

This commit is contained in:
Jacob Mandelson 2022-08-28 10:25:42 -07:00
parent 0ebee6a1a3
commit 20a6876763
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
geometry.cpp
View File

@ -260,7 +260,7 @@ hpcshape
shHeptaRing, shSpearRing, shLoveRing, shFrogRing,
shPowerGearRing, shProtectiveRing, shTerraRing, shMoveRing,
shReserved4, shMoonDisk,
shDaisy, shTriangle, shNecro, shStatue, shKey, shWindArrow,
shDaisy, shSnowflake, shTriangle, shNecro, shStatue, shKey, shWindArrow,
shGun,
shFigurine, shTreat,
shElementalShard,
@ -339,7 +339,7 @@ hpcshape
shPBodyOnly, shPBodyArm, shPBodyHand, shPHeadOnly,
shDodeca;
shDodeca, shSmallerDodeca;
hpcshape shFrogRearFoot, shFrogFrontFoot, shFrogRearLeg, shFrogFrontLeg, shFrogRearLeg2, shFrogBody, shFrogEye, shFrogStripe, shFrogJumpFoot, shFrogJumpLeg, shSmallFrogRearFoot, shSmallFrogFrontFoot, shSmallFrogRearLeg, shSmallFrogFrontLeg, shSmallFrogRearLeg2, shSmallFrogBody;

12
graph.cpp
View File

@ -1098,6 +1098,12 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
queuepolyat(Vit, cgi.shSmallFlailTrunk, dark, prio);
queuepolyat(Vit, cgi.shSmallHammerHead, col, prio);
}
/*else if (it == itOrbNature) {
//queuepolyat(Vit, cgi.shILeaf[0], dark, prio);
//queuepolyat(Vit, cgi.shILeaf[0], dark, prio);
//queuepolyat(Vit, cgi.shILeaf[2], dark, prio);
queuepolyat(Vit, cgi.shIBranch, dark, prio);
}*/
else if (it == itOrbSpeed)
drawSpeed(Vit, 0.4);
else {
@ -1111,10 +1117,12 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
(it == itOrbMorph) ? cgi.shDiskS :
(it == itOrbMatter || it == itOrbStone) ? cgi.shDiskSq :
(it == itOrbEnergy) ? cgi.shHalfDisk :
(it == itOrbChoice) ? cgi.shEccentricDisk :
(it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism) ? cgi.shEccentricDisk :
(it == itOrbWinter) ? cgi.shSnowflake :
(it == itOrbLuck) ? cgi.shSmallerDodeca :
cgi.shDisk;
queuepolyat(Vit, shape, dark, prio);
if (it == itOrbSide1 || it == itOrbChoice)
if (it == itOrbSide1 || it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism)
queuepolyat(Vit*Mirror, shape, dark, prio);
if (it == itOrbEnergy)
queuepolyat(Vit*Mirror, shape, col, prio);

7
mymake.cpp
View File

@ -69,12 +69,14 @@ void set_linux() {
linker = "g++ -rdynamic";
default_exec_name = "hyper";
if(sdlver == 2) {
opts = "-DFHS -DLINUX -I/usr/include/SDL2";
opts = "-DFHS -DLINUX -I/usr/include/SDL2 -DCAP_GLEW=0";
libs = " -lSDL2 -lSDL2_ttf -lSDL2_mixer -lSDL2_gfx -lGLEW -lGL -lpng -rdynamic -lpthread -lz";
libs = " -lSDL2 -lSDL2_ttf -lSDL2_mixer -lSDL2_gfx -lGL -lpng -rdynamic -lpthread -lz";
}
else if(sdlver == 1) {
opts = "-DFHS -DLINUX -I/usr/include/SDL";
opts = "-DFHS -DLINUX -I/usr/include/SDL -DCAP_GLEW=0";
libs = " -lSDL -lSDL_ttf -lSDL_mixer -lSDL_gfx -lGLEW -lGL -lpng -rdynamic -lpthread -lz";
libs = " -lSDL -lSDL_ttf -lSDL_mixer -lSDL_gfx -lGL -lpng -rdynamic -lpthread -lz";
}
else {
opts = "-DFHS -DLINUX";
@ -98,6 +100,7 @@ void set_mingw64() {
linker = "g++";
default_exec_name = "hyper";
opts = "-DWINDOWS -DCAP_GLEW=1 -DCAP_PNG=1";
opts = "-DWINDOWS -DCAP_GLEW=0 -DCAP_PNG=1";
libs = " hyper.res -lopengl32 -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz -lglew32 -lpng";
setvbuf(stdout, NULL, _IONBF, 0); // MinGW is quirky with output buffering
}

9
polygons.cpp
View File

@ -558,6 +558,14 @@ void geometry_information::procedural_shapes() {
}
hpcpush(ddi(0, zhexf*.6) * C0);
bshape(shSnowflake, PPR::ITEM);
for(int t=0; t<=SD6; t++) {
hpcpush(ddi(t*S14, zhexf*.7*.8*3/4) * C0);
if(t != SD6) hpcpush(ddi(t*S14+SD7, zhexf*.7*-.5*3/4) * C0);
}
hpcpush(ddi(0, zhexf*.7*.6) * C0);
//copyshape(shSnowflake, shDaisy, PPR::ITEM);
bshape(shTriangle, PPR::ITEM);
for(int t=0; t<=SD3; t++) {
hpcpush(ddi(t*S28, zhexf*.5) * C0);
@ -1341,6 +1349,7 @@ void geometry_information::prepare_shapes() {
bshape(shReptileTail, PPR::MONSTER_BODY, scalefactor, 303);
bshape(shReptileEye, PPR::MONSTER_EYE0, scalefactor, 304);
bshape(shDodeca, PPR::ITEM, scalefactor, 305);
bshape(shSmallerDodeca, PPR::ITEM, scalefactor*.8, 305);
bshape(shTerraArmor1, PPR::MONSTER_BODY, scalefactor, 349);
bshape(shTerraArmor2, PPR::MONSTER_BODY, scalefactor, 350);