mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-22 08:08:53 -05:00
Code Issues Projects Releases Wiki Activity

add bottles and greg to sparkle list (#4720)

Browse Source
This commit is contained in:
Eric Hoey 2024-12-18 17:54:13 -05:00 committed by GitHub
parent 3419928f5d
commit 380d4c66f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
soh/src/code/z_en_item00.c
View File

@ -1214,6 +1214,11 @@ void EnItem00_CustomItemsParticles(Actor* Parent, PlayState* play, GetItemEntry
case ITEM_NUT_UPGRADE_40: case ITEM_NUT_UPGRADE_40:
color_slot = 7; color_slot = 7;
break; break;
case ITEM_BOTTLE:
case ITEM_MILK_BOTTLE:
case ITEM_LETTER_RUTO:
color_slot = 8;
break;
default: default:
return; return;
} }
@ -1223,14 +1228,36 @@ void EnItem00_CustomItemsParticles(Actor* Parent, PlayState* play, GetItemEntry
case RG_MAGIC_SINGLE: case RG_MAGIC_SINGLE:
case RG_MAGIC_DOUBLE: case RG_MAGIC_DOUBLE:
case RG_MAGIC_BEAN_PACK: case RG_MAGIC_BEAN_PACK:
case RG_BOTTLE_WITH_GREEN_POTION:
case RG_BOTTLE_WITH_BUGS:
case RG_GREG_RUPEE:
color_slot = 0; color_slot = 0;
break; break;
case RG_BOTTLE_WITH_FISH:
color_slot = 2;
break;
case RG_BOTTLE_WITH_POE:
color_slot = 4;
break;
case RG_BOTTLE_WITH_BIG_POE:
color_slot = 5;
break;
case RG_DOUBLE_DEFENSE: case RG_DOUBLE_DEFENSE:
color_slot = 8; color_slot = 8;
break; break;
case RG_PROGRESSIVE_BOMBCHUS: case RG_PROGRESSIVE_BOMBCHUS:
color_slot = 9; color_slot = 9;
break; break;
case RG_BOTTLE_WITH_FAIRY:
color_slot = 10;
break;
case RG_BOTTLE_WITH_RED_POTION:
color_slot = 11;
break;
case RG_BOTTLE_WITH_BLUE_FIRE:
case RG_BOTTLE_WITH_BLUE_POTION:
color_slot = 12;
break;
default: default:
return; return;
} }
@ -1240,31 +1267,37 @@ void EnItem00_CustomItemsParticles(Actor* Parent, PlayState* play, GetItemEntry
} }
// Color of the circle for the particles // Color of the circle for the particles
static Color_RGBA8 mainColors[10][3] = { static Color_RGBA8 mainColors[13][3] = {
{ 34, 255, 76 }, // Minuet, Bean Pack, and Magic Upgrades { 34, 255, 76 }, // Minuet, Bean Pack, and Magic Upgrades, Bottle with Green Potion, Bottle with Bugs, and Greg
{ 177, 35, 35 }, // Bolero { 177, 35, 35 }, // Bolero
{ 115, 251, 253 }, // Serenade { 115, 251, 253 }, // Serenade and Bottle with Fish
{ 177, 122, 35 }, // Requiem { 177, 122, 35 }, // Requiem
{ 177, 28, 212 }, // Nocturne { 177, 28, 212 }, // Nocturne and Bottle with Poe
{ 255, 255, 92 }, // Prelude { 255, 255, 92 }, // Prelude and Bottle with Big Poe
{ 31, 152, 49 }, // Stick Upgrade { 31, 152, 49 }, // Stick Upgrade
{ 222, 182, 20 }, // Nut Upgrade { 222, 182, 20 }, // Nut Upgrade
{ 255, 255, 255 }, // Double Defense { 255, 255, 255 }, // Double Defense, Empty Bottle, Bottle with Milk, and Bottle with Ruto's Letter
{ 19, 120, 182 } // Progressive Bombchu { 19, 120, 182 }, // Progressive Bombchu
{ 255, 205, 255 }, // Bottle with Fairy
{ 255, 118, 118 }, // Bottle with Red Potion
{ 154, 204, 255 } // Bottle with Blue Fire and Bottle with Blue Potion
}; };
// Color of the faded flares stretching off the particles // Color of the faded flares stretching off the particles
static Color_RGBA8 flareColors[10][3] = { static Color_RGBA8 flareColors[13][3] = {
{ 30, 110, 30 }, // Minuet, Bean Pack, and Magic Upgrades { 30, 110, 30 }, // Minuet, Bean Pack, Magic Upgrades, Bottle with Green Potion, Bottle with Bugs, and Greg
{ 90, 10, 10 }, // Bolero { 90, 10, 10 }, // Bolero
{ 35, 35, 177 }, // Serenade { 35, 35, 177 }, // Serenade and Bottle with Fish
{ 70, 20, 10 }, // Requiem { 70, 20, 10 }, // Requiem
{ 100, 20, 140 }, // Nocturne { 100, 20, 140 }, // Nocturne and Bottle with Poe
{ 100, 100, 10 }, // Prelude { 100, 100, 10 }, // Prelude and Bottle with Big Poe
{ 5, 50, 10 }, // Stick Upgrade { 5, 50, 10 }, // Stick Upgrade
{ 150, 100, 5 }, // Nut Upgrade { 150, 100, 5 }, // Nut Upgrade
{ 154, 154, 154 }, // Double Defense { 154, 154, 154 }, // Double Defense, Empty Bottle, Bottle with Milk, and Bottle with Ruto's Letter
{ 204, 102, 0 } // Progressive Bombchu { 204, 102, 0 }, // Progressive Bombchu
{ 216, 70, 216 }, // Bottle with Fairy
{ 90, 10, 10 }, // Bottle with Red Potion
{ 35, 35, 177 } // Bottle with Blue Fire
}; };
static Vec3f velocity = { 0.0f, 0.0f, 0.0f }; static Vec3f velocity = { 0.0f, 0.0f, 0.0f };