Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minotaur/Scroll fx guis #672

Merged
merged 14 commits into from
Sep 20, 2022
Merged

Minotaur/Scroll fx guis #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3b7890a
* minotaurs break chests on touch
Sep 15, 2022
f450198
* hide old mino icon
Sep 15, 2022
8e0a99b
* shapeshift fix icon when dead
Sep 15, 2022
6eb2143
* create RNG engine to immediately seed feather list consistently wit…
Sep 15, 2022
cdd17e4
Merge branch 'dev-20-followers'
Sep 15, 2022
cd3b67a
* generic scroll/spell gui effects
Sep 20, 2022
ff62181
* generic scroll fixes
Sep 20, 2022
b141588
* fix spell effects
Sep 20, 2022
2ef1fa6
* merge develop
Sep 20, 2022
84fd725
* merge conflict fix
Sep 20, 2022
279fcbc
* fix savegame missing constructor to compile
Sep 20, 2022
79880ec
* lang update
Sep 20, 2022
0532023
* fix oob in fp->read
Sep 20, 2022
341a025
* net_handler nullptr if free'd in handlePacket()
Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions lang/en.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4327,7 +4327,7 @@ Legendary:

3285 The ZAP Brigade has arrived!
"The minotaur is coming! Let us slay any other foul beasts here as well!"#
3286 Repair Item#
3286 #
3287 This %s
is unable to be repaired.#
3288 You have no items able to be repaired!#
Expand Down Expand Up @@ -5032,7 +5032,7 @@ any gyrobot findings.#
3729 Your %s begins to fade.#
3730 Your %s gets charged up!#
3731 You have no items able to be charged!#
3732 Charge Item#
3732 #
3733 Your shot glances off the %s!#
3734 Your shot glances off %s!#
3735 The %s's demons have already been exorcised!#
Expand Down Expand Up @@ -6170,5 +6170,17 @@ Combination!#
4199 Blueprints#
4200 Command %s to...#
4201 (All) #
4202 Repair#
4203 Select#
4204 Uncurse#
4205 Select an item to uncurse:#
4206 Charge#
4207 Select an item to recharge:#
4208 Identify#
4209 Select an item to identify:#
4210 Effect has no use#
4211 This is already fully charged#
4212 This is already identified#
4213 This is already uncursed#

4249 end#
8 changes: 8 additions & 0 deletions src/actmonster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4233,6 +4233,10 @@ void actMonster(Entity* my)
playSoundEntity(hit.entity, 28, 64);
}
}
else if ( hit.entity->behavior == &actChest && myStats->type == MINOTAUR )
{
hit.entity->skill[3] = 0; // chestHealth
}
else if ( hit.entity->behavior == &actBoulder && !hit.entity->flags[PASSABLE] && myStats->type == MINOTAUR )
{
// asplode the rock
Expand Down Expand Up @@ -5298,6 +5302,10 @@ void actMonster(Entity* my)
playSoundEntity(hit.entity, 28, 64);
}
}
else if ( hit.entity->behavior == &actChest && myStats->type == MINOTAUR )
{
hit.entity->skill[3] = 0; // chestHealth
}
else if ( hit.entity->behavior == &actBoulder && !hit.entity->flags[PASSABLE] && myStats->type == MINOTAUR )
{
// asplode the rock
Expand Down
3 changes: 2 additions & 1 deletion src/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4989,6 +4989,7 @@ void ingameHud()
GenericGUI[player].tinkerGUI.updateTinkerMenu();
GenericGUI[player].alchemyGUI.updateAlchemyMenu();
GenericGUI[player].featherGUI.updateFeatherMenu();
GenericGUI[player].itemfxGUI.updateItemEffectMenu();
players[player]->GUI.dropdownMenu.process();
players[player]->characterSheet.processCharacterSheet();
players[player]->skillSheet.processSkillSheet();
Expand All @@ -4999,6 +5000,7 @@ void ingameHud()
players[player]->inventoryUI.updateCursor();
players[player]->hotbar.updateCursor();
players[player]->hud.updateCursor();
players[player]->hud.updateMinotaurWarning();
if ( !players[player]->isLocalPlayer() )
{
continue;
Expand Down Expand Up @@ -5039,7 +5041,6 @@ void ingameHud()
//}
}


static ConsoleVariable<bool> cvar_debugmouse("/debugmouse", false);
if ( *cvar_debugmouse )
{
Expand Down
18 changes: 9 additions & 9 deletions src/interface/drawstatus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2362,15 +2362,15 @@ void drawStatusNew(const int player)
//}

// minotaur icon
if ( minotaurlevel && (ticks % 50) - (ticks % 25) )
{
SDL_Rect pos;
pos.x = /*xoffset*/ +playerStatusBarWidth + 10 - 64 + 43 + 64; // was pos.x = 128;
pos.y = y2 - 160 + 64 + 2 - 82 + 4;
pos.w = 64;
pos.h = 64;
drawImageScaled(minotaur_bmp, nullptr, &pos);
}
//if ( minotaurlevel && (ticks % 50) - (ticks % 25) )
//{
// SDL_Rect pos;
// pos.x = /*xoffset*/ +playerStatusBarWidth + 10 - 64 + 43 + 64; // was pos.x = 128;
// pos.y = y2 - 160 + 64 + 2 - 82 + 4;
// pos.w = 64;
// pos.h = 64;
// drawImageScaled(minotaur_bmp, nullptr, &pos);
//}


if ( players[player]->hotbar.useHotbarFaceMenu )
Expand Down
Loading