mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Code Issues Releases Wiki Activity

Graphical effects for the side-orbs.

Browse Source
This commit is contained in:
Zeno Rogue 2017-10-12 12:05:12 +02:00
parent 39021f2b7f
commit 5c3d89e4b5
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
graph.cpp
View File

@ -760,11 +760,18 @@ bool drawMonsterType(eMonster m, cell *where, const transmatrix& V, int col, dou
if(cs.charid == 3) if(cs.charid == 3)
queuepoly(VBODY, shPrincessDress, fc(400, cs.dresscolor2, 5)); queuepoly(VBODY, shPrincessDress, fc(400, cs.dresscolor2, 5));
if(items[itOrbSide3])
queuepoly(VBODY, (cs.charid&1) ? shFerocityF : shFerocityM, fc(0, cs.skincolor, 0));
if(items[itOrbHorns]) { if(items[itOrbHorns]) {
queuepoly(VBODY, shBullHead, items[itOrbDiscord] ? watercolor(0) : 0xFF000030); queuepoly(VBODY, shBullHead, items[itOrbDiscord] ? watercolor(0) : 0xFF000030);
queuepoly(VBODY, shBullHorn, items[itOrbDiscord] ? watercolor(0) : 0xFF000040); queuepoly(VBODY, shBullHorn, items[itOrbDiscord] ? watercolor(0) : 0xFF000040);
queuepoly(VBODY * Mirror, shBullHorn, items[itOrbDiscord] ? watercolor(0) : 0xFF000040); queuepoly(VBODY * Mirror, shBullHorn, items[itOrbDiscord] ? watercolor(0) : 0xFF000040);
} }
if(items[itOrbSide1] && !shmup::on)
queuepoly(VBODY * spin(-M_PI/24), cs.charid >= 2 ? shSabre : shPSword, fc(314, cs.swordcolor, 3)); // 3 not colored
if(peace::on) ; if(peace::on) ;
else if(items[itOrbThorns]) else if(items[itOrbThorns])
queuepoly(VBODY, shHedgehogBladePlayer, items[itOrbDiscord] ? watercolor(0) : 0x00FF00FF); queuepoly(VBODY, shHedgehogBladePlayer, items[itOrbDiscord] ? watercolor(0) : 0x00FF00FF);
@ -859,6 +866,11 @@ bool drawMonsterType(eMonster m, cell *where, const transmatrix& V, int col, dou
if(!shmup::on) { if(!shmup::on) {
if(items[itOrbThorns] && items[itOrbEmpathy]) if(items[itOrbThorns] && items[itOrbEmpathy])
queuepoly(VBODY, shHedgehogBladePlayer, darkena(col, 0, 0x40)); queuepoly(VBODY, shHedgehogBladePlayer, darkena(col, 0, 0x40));
if(items[itOrbSide1] && !shmup::on)
queuepoly(VBODY * spin(-M_PI/24), cs.charid >= 2 ? shSabre : shPSword, darkena(col, 0, 0x40));
if(items[itOrbSide3] && items[itOrbEmpathy])
queuepoly(VBODY, (cs.charid&1) ? shFerocityF : shFerocityM, darkena(col, 0, 0x40));
queuepoly(VBODY, (cs.charid >= 2 ? shSabre : shPSword), darkena(col, 0, 0XC0)); queuepoly(VBODY, (cs.charid >= 2 ? shSabre : shPSword), darkena(col, 0, 0XC0));
} }
else if(!where || shmup::curtime >= shmup::getPlayer()->nextshot) else if(!where || shmup::curtime >= shmup::getPlayer()->nextshot)

6
polygons.cpp
View File

@ -665,6 +665,7 @@ hpcshape
shWolf1, shWolf2, shWolf3, shWolf1, shWolf2, shWolf3,
shDogStripes, shDogStripes,
shPBody, shPSword, shPKnife, shPBody, shPSword, shPKnife,
shFerocityM, shFerocityF,
shHumanFoot, shHumanLeg, shHumanGroin, shHumanNeck, shSkeletalFoot, shYetiFoot, shHumanFoot, shHumanLeg, shHumanGroin, shHumanNeck, shSkeletalFoot, shYetiFoot,
shMagicSword, shMagicShovel, shSeaTentacle, shKrakenHead, shKrakenEye, shKrakenEye2, shMagicSword, shMagicShovel, shSeaTentacle, shKrakenHead, shKrakenEye, shKrakenEye2,
shArrow, shArrow,
@ -1507,6 +1508,8 @@ void buildpolys() {
bshape(shPBody, PPR_MONSTER_BODY, scalef, 85); bshape(shPBody, PPR_MONSTER_BODY, scalef, 85);
bshape(shYeti, PPR_MONSTER_BODY, scalef, 86); bshape(shYeti, PPR_MONSTER_BODY, scalef, 86);
bshape(shPSword, PPR_MONSTER_WPN, scalef, 90); bshape(shPSword, PPR_MONSTER_WPN, scalef, 90);
bshape(shFerocityM, PPR_MONSTER_WPN, scalef, 361);
bshape(shFerocityF, PPR_MONSTER_WPN, scalef, 362);
bshape(shPKnife, PPR_MONSTER_WPN, scalef, 91); bshape(shPKnife, PPR_MONSTER_WPN, scalef, 91);
bshape(shPirateHook, PPR_MONSTER_WPN, scalef, 92); bshape(shPirateHook, PPR_MONSTER_WPN, scalef, 92);
bshape(shSabre, PPR_MONSTER_WPN, scalef, 93); bshape(shSabre, PPR_MONSTER_WPN, scalef, 93);
@ -2837,7 +2840,8 @@ NEWSHAPE, 358, 1, 2, -0.045357,0.025586, -0.031505,0.043770, 0.005524,0.044623,
NEWSHAPE, 359, 3, 1, -0.266809,0.074675, -0.122340,0.044980, -0.116509,0.053995, -0.263332,0.086012, -0.243276,0.226327, -0.046949,0.233904, -0.045697,0.176132, 0.043359,0.148557, 0.174518,-0.035928, 0.185648,-0.026857, 0.048860,0.153622, -0.026215,0.175210, -0.030599,0.236932, 0.114203,0.249675, NEWSHAPE, 359, 3, 1, -0.266809,0.074675, -0.122340,0.044980, -0.116509,0.053995, -0.263332,0.086012, -0.243276,0.226327, -0.046949,0.233904, -0.045697,0.176132, 0.043359,0.148557, 0.174518,-0.035928, 0.185648,-0.026857, 0.048860,0.153622, -0.026215,0.175210, -0.030599,0.236932, 0.114203,0.249675,
NEWSHAPE, 360, 7, 1, -0.118455,0.162875, -0.179457,0.274805, -0.139062,0.404961, -0.014470,0.358081, 0.088081,0.314743, 0.043390,0.203194, -0.025414,0.211780, -0.019156,0.324240, -0.044420,0.213922, -0.097269,0.172336, -0.097226,0.166975, -0.013745,0.197716, NEWSHAPE, 360, 7, 1, -0.118455,0.162875, -0.179457,0.274805, -0.139062,0.404961, -0.014470,0.358081, 0.088081,0.314743, 0.043390,0.203194, -0.025414,0.211780, -0.019156,0.324240, -0.044420,0.213922, -0.097269,0.172336, -0.097226,0.166975, -0.013745,0.197716,
NEWSHAPE, 361, 1, 2, -0.077784,0.096705, -0.112723,0.108509, -0.096729,0.084112, -0.130665,0.091676, -0.112529,0.069411, -0.150758,0.068526, -0.119865,0.047315, -0.151705,0.038980, -0.116648,0.028374, -0.149534,0.021061, -0.119798,0.000000,
NEWSHAPE, 362, 1, 1, -0.098710,-0.040954, -0.120861,-0.011561, -0.169793,0.001055, -0.213918,-0.011649, -0.244439,-0.030821, -0.257630,-0.038325, -0.286489,-0.056656, -0.321137,-0.048332, -0.347048,-0.011856, -0.316514,-0.028969, -0.296328,-0.024605, -0.263040,0.006390, -0.210822,0.055089, -0.164571,0.054857, -0.130462,0.046293, -0.098742,0.054623, -0.091289,-0.004197,
NEWSHAPE NEWSHAPE
}; };