mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-06-14 04:14:06 +00:00
Code Issues Releases Wiki Activity

Sword shape for Orb of the Sword I & II.

Browse Source
This commit is contained in:
Jacob Mandelson 2022-08-26 21:58:48 -07:00
parent 3521ee917c
commit 1561d84f1b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geometry.cpp
View File

@ -279,7 +279,7 @@ hpcshape
shPBody, shSmallPBody, shPSword, shSmallPSword, shPKnife, shPBody, shSmallPBody, shPSword, shSmallPSword, shPKnife,
shFerocityM, shFerocityF, shFerocityM, shFerocityF,
shHumanFoot, shHumanLeg, shHumanGroin, shHumanNeck, shSkeletalFoot, shYetiFoot, shHumanFoot, shHumanLeg, shHumanGroin, shHumanNeck, shSkeletalFoot, shYetiFoot,
shMagicSword, shMagicShovel, shSeaTentacle, shKrakenHead, shKrakenEye, shKrakenEye2, shMagicSword, shSmallSword, shMagicShovel, shSeaTentacle, shKrakenHead, shKrakenEye, shKrakenEye2,
shArrow, shArrow,
shPHead, shPFace, shGolemhead, shHood, shArmor, shPHead, shPFace, shGolemhead, shHood, shArmor,
shAztecHead, shAztecCap, shAztecHead, shAztecCap,

4
graph.cpp
View File

@ -764,11 +764,10 @@ EX hpcshape& orbshape(eOrbshape s) {
switch(s) { switch(s) {
case osLove: return cgi.shLoveRing; case osLove: return cgi.shLoveRing;
case osRanged: return cgi.shTargetRing; case osRanged: return cgi.shTargetRing;
case osOffensive: return cgi.shSawRing; case osOffensive: case osDirectional: return cgi.shSawRing;
case osFriend: return cgi.shPeaceRing; case osFriend: return cgi.shPeaceRing;
case osUtility: return cgi.shGearRing; case osUtility: return cgi.shGearRing;
case osPowerUtility: return cgi.shPowerGearRing; case osPowerUtility: return cgi.shPowerGearRing;
case osDirectional: return cgi.shSpearRing;
case osWarping: return cgi.shHeptaRing; case osWarping: return cgi.shHeptaRing;
case osFrog: return cgi.shFrogRing; case osFrog: return cgi.shFrogRing;
case osProtective: return cgi.shProtectiveRing; case osProtective: return cgi.shProtectiveRing;
@ -1090,6 +1089,7 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
auto shape = (it == itOrbFriend) ? cgi.shTinyBird : auto shape = (it == itOrbFriend) ? cgi.shTinyBird :
(it == itOrbSide1) ? cgi.shSmallPSword : (it == itOrbSide1) ? cgi.shSmallPSword :
(it == itOrbDigging) ? cgi.shSmallPickAxe : (it == itOrbDigging) ? cgi.shSmallPickAxe :
(it == itOrbSword || it == itOrbSword2) ? cgi.shSmallSword :
cgi.shDisk; cgi.shDisk;
queuepolyat(Vit, shape, dark, prio); queuepolyat(Vit, shape, dark, prio);
if (it == itOrbSide1) if (it == itOrbSide1)

3
polygons.cpp
View File

@ -1546,6 +1546,7 @@ void geometry_information::prepare_shapes() {
if(scalefactor > 1.5) bshape(shMagicSword, PPR::MAGICSWORD, scalefactor / 1.7570466583108084, 243); if(scalefactor > 1.5) bshape(shMagicSword, PPR::MAGICSWORD, scalefactor / 1.7570466583108084, 243);
else bshape(shMagicSword, PPR::MAGICSWORD, scalefactor, 244); else bshape(shMagicSword, PPR::MAGICSWORD, scalefactor, 244);
bshape(shSmallSword, PPR::MAGICSWORD, scalefactor/2, 405);
sword_size = 0; sword_size = 0;
for(int i=shMagicSword.s; i<shMagicSword.e; i++) for(int i=shMagicSword.s; i<shMagicSword.e; i++)
@ -2342,6 +2343,8 @@ NEWSHAPE, 402, 1, 2, 0.350118, -0.00051488, 0.337085, 0.0154155, 0.321993, 0.0
NEWSHAPE, 403, 1, 1, 0.26453, 0.0305227, 0.274541, 0.0290331, 0.280348, 0.0265056, 0.271875, 0.0213835, NEWSHAPE, 403, 1, 1, 0.26453, 0.0305227, 0.274541, 0.0290331, 0.280348, 0.0265056, 0.271875, 0.0213835,
// FrogJumpLeg // FrogJumpLeg
NEWSHAPE, 404, 1, 1, -0.157104, 0.037552, -0.119742, 0.0232719, -0.0800179, 0.03, -0.0600636, 0.0582003, -0.0695215, 0.0851648, -0.0941826, 0.112117, -0.124214, 0.117626, -0.162927, 0.123278, -0.20065, 0.122779, -0.220489, 0.12271, -0.294104, 0.0895822, -0.341594, 0.0607798, -0.344169, 0.0476839, -0.336604, 0.0182726, -0.31669, 0.0111505, -0.296371, 0.0199419, -0.257868, 0.0376895, -0.219528, 0.0568778, -0.198186, 0.0609263, NEWSHAPE, 404, 1, 1, -0.157104, 0.037552, -0.119742, 0.0232719, -0.0800179, 0.03, -0.0600636, 0.0582003, -0.0695215, 0.0851648, -0.0941826, 0.112117, -0.124214, 0.117626, -0.162927, 0.123278, -0.20065, 0.122779, -0.220489, 0.12271, -0.294104, 0.0895822, -0.341594, 0.0607798, -0.344169, 0.0476839, -0.336604, 0.0182726, -0.31669, 0.0111505, -0.296371, 0.0199419, -0.257868, 0.0376895, -0.219528, 0.0568778, -0.198186, 0.0609263,
// shSmallSword (1x2)
NEWSHAPE, 405,1,2, -0.226885,0.018516, -0.212399,0.032471, -0.193062,0.020928, -0.185621,0.046575, -0.192539,0.086182, -0.199612,0.102458, -0.167905,0.095887, -0.15358,0.056176, -0.148822,0.028094, 0.252221,0.023027, 0.294417,0.005175,
NEWSHAPE, NEWSHAPE NEWSHAPE, NEWSHAPE
}; };