Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/Localization/Game.de.resx
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
<value>F4 : Größe des Chatfensters anpassen</value>
<comment>legacy_id=124</comment>
</data>
<data name="F8 - Toggle Monster HP Bar" xml:space="preserve">
<value>F8 - Monster-HP-Balken ein/aus</value>
</data>
<data name="F9 - Toggle 3D Camera" xml:space="preserve">
<value>F9 - 3D-Kamera umschalten</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions src/Localization/Game.en.resx
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
<value>F4 : Adjust Chat Window size</value>
<comment>legacy_id=124</comment>
</data>
<data name="F8 - Toggle Monster HP Bar" xml:space="preserve">
<value>F8 - Toggle Monster HP Bar</value>
</data>
<data name="F9 - Toggle 3D Camera" xml:space="preserve">
<value>F9 - Toggle 3D Camera</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions src/Localization/Game.es.resx
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
<value>F4: Ajustar el tamaño de la ventana de chat</value>
<comment>legacy_id=124</comment>
</data>
<data name="F8 - Toggle Monster HP Bar" xml:space="preserve">
<value>F8 - Mostrar/ocultar barra de HP de monstruos</value>
</data>
<data name="F9 - Toggle 3D Camera" xml:space="preserve">
<value>F9 - Alternar cámara 3D</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions src/Localization/Game.id.resx
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
<value>F4 : Sesuaikan ukuran Jendela Obrolan</value>
<comment>legacy_id=124</comment>
</data>
<data name="F8 - Toggle Monster HP Bar" xml:space="preserve">
<value>F8 - Aktifkan/Nonaktifkan Bar HP Monster</value>
</data>
<data name="F9 - Toggle 3D Camera" xml:space="preserve">
<value>F9 - Alihkan Kamera 3D</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions src/Localization/Game.ja.resx
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
<value>F4:チャットウィンドウのサイズ調整</value>
<comment>legacy_id=124</comment>
</data>
<data name="F8 - Toggle Monster HP Bar" xml:space="preserve">
<value>F8 - モンスター体力バー表示切替</value>
</data>
<data name="Enter: Chatting Mode" xml:space="preserve">
<value>Enter:チャットウィンドウ On/Off</value>
<comment>legacy_id=125</comment>
Expand Down
3 changes: 3 additions & 0 deletions src/Localization/Game.pl.resx
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
<value>F4: Dostosuj rozmiar okna czatu</value>
<comment>legacy_id=124</comment>
</data>
<data name="F8 - Toggle Monster HP Bar" xml:space="preserve">
<value>F8 - Włącz/wyłącz pasek życia potworów</value>
</data>
<data name="F9 - Toggle 3D Camera" xml:space="preserve">
<value>F9 - Przełącz kamerę 3D</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions src/Localization/Game.pt.resx
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
<value>F4: Ajustar o tamanho da janela de bate-papo</value>
<comment>legacy_id=124</comment>
</data>
<data name="F8 - Toggle Monster HP Bar" xml:space="preserve">
<value>F8 - Ativar/desativar barra de HP dos monstros</value>
</data>
<data name="F9 - Toggle 3D Camera" xml:space="preserve">
<value>F9 - Alternar câmera 3D</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions src/Localization/Game.ru.resx
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
<value>F4: настроить размер окна чата.</value>
<comment>legacy_id=124</comment>
</data>
<data name="F8 - Toggle Monster HP Bar" xml:space="preserve">
<value>F8 - Включить/выключить полосу HP монстров</value>
</data>
<data name="F9 - Toggle 3D Camera" xml:space="preserve">
<value>F9 - Переключить 3D-камеру</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions src/Localization/Game.tl.resx
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
<value>F4 : Ayusin ang laki ng Chat Window</value>
<comment>legacy_id=124</comment>
</data>
<data name="F8 - Toggle Monster HP Bar" xml:space="preserve">
<value>F8 - I-on/I-off ang HP Bar ng Monster</value>
</data>
<data name="F9 - Toggle 3D Camera" xml:space="preserve">
<value>F9 - I-toggle ang 3D Camera</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions src/Localization/Game.uk.resx
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
<value>F4 : Налаштувати розмір вікна чату</value>
<comment>legacy_id=124</comment>
</data>
<data name="F8 - Toggle Monster HP Bar" xml:space="preserve">
<value>F8 - Увімкнути/вимкнути смужку HP монстрів</value>
</data>
<data name="F9 - Toggle 3D Camera" xml:space="preserve">
<value>F9 - Перемкнути 3D-камеру</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions src/Localization/Game.zh-TW.resx
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,9 @@
<value>F4 : 調整聊天視窗大小</value>
<comment>legacy_id=124</comment>
</data>
<data name="F8 - Toggle Monster HP Bar" xml:space="preserve">
<value>F8 - 開啟/關閉怪物血條</value>
</data>
<data name="F9 - Toggle 3D Camera" xml:space="preserve">
<value>F9 - 切換 3D 攝影機</value>
</data>
Expand Down
84 changes: 83 additions & 1 deletion src/source/UI/NewUI/Character/NewUINameWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include "GameLogic/Items/PersonalShopTitleImp.h"
#include "GameLogic/Events/MatchEvent.h"
#include "World/MapInfra/MapManager.h"
#include "Camera/CameraProjection.h"
#include "Camera/CameraState.h"

// DevEditor forward declarations (must be at global scope)
#ifdef _EDITOR
Expand All @@ -25,6 +27,8 @@ using namespace SEASON3B;
namespace
{
constexpr int GROUND_ITEM_LABEL_BUILD_BUDGET_PER_FRAME = 32;

bool s_bF8KeyPressed = false;
}

//////////////////////////////////////////////////////////////////////
Expand All @@ -37,6 +41,7 @@ SEASON3B::CNewUINameWindow::CNewUINameWindow()
m_Pos.x = m_Pos.y = 0;

m_bShowItemName = false;
m_bShowMonsterHealthBar = false;
}

SEASON3B::CNewUINameWindow::~CNewUINameWindow()
Expand Down Expand Up @@ -91,6 +96,13 @@ bool SEASON3B::CNewUINameWindow::UpdateKeyEvent()

bool SEASON3B::CNewUINameWindow::Update()
{
const bool bF8Down = (GetAsyncKeyState(VK_F8) & 0x8000) != 0;
if (bF8Down && !s_bF8KeyPressed)
{
m_bShowMonsterHealthBar = !m_bShowMonsterHealthBar;
}
s_bF8KeyPressed = bF8Down;

return true;
}
Comment thread
nolt marked this conversation as resolved.

Expand All @@ -102,6 +114,7 @@ bool SEASON3B::CNewUINameWindow::Render()
RenderTimes();
matchEvent::RenderMatchTimes();
RenderBooleans();
RenderMonsterHealthBars();
DrawPersonalShopTitleImp();
DisableAlphaBlend();
return true;
Expand Down Expand Up @@ -175,7 +188,9 @@ void SEASON3B::CNewUINameWindow::RenderName()
glColor3f(50.f / 255.f, 10 / 255.f, 0.f);
RenderColor((float)(ScreenX + borderWidth), (float)(ScreenY + borderWidth), stepsWidth, 1.f);

int stepHP = (int)(c->HealthStatus * steps);
float health = c->HealthStatus;
if (health < 0.0f) health = 1.0f;
int stepHP = (int)(health * steps);

glColor3f(250.f / 255.f, 10 / 255.f, 0.f);
for (int k = 0; k < stepHP; ++k)
Expand Down Expand Up @@ -238,6 +253,73 @@ void SEASON3B::CNewUINameWindow::RenderName()
}
}

void SEASON3B::CNewUINameWindow::RenderMonsterHealthBars()
{
if (!m_bShowMonsterHealthBar)
return;

for (int i = 0; i < MAX_CHARACTERS_CLIENT; i++)
{
CHARACTER* c = &CharactersClient[i];
OBJECT* o = &c->Object;

if (!o->Live || !o->Visible || o->Alpha <= 0.f || c->Dead > 0 || o->Kind != KIND_MONSTER)
continue;

vec3_t Position;
Vector(o->Position[0], o->Position[1], o->Position[2] + o->BoundingBoxMax[2] + 60.f, Position);

int ScreenX, ScreenY;
vec3_t transformPos;
VectorTransform(Position, g_Camera.Matrix, transformPos);
if (transformPos[2] >= 0)
continue;

CameraProjection::WorldToScreen(g_Camera, Position, &ScreenX, &ScreenY);

if (ScreenX < -100 || ScreenY < -100
|| ScreenX > (REFERENCE_WIDTH + 100)
|| ScreenY > (REFERENCE_HEIGHT + 100))
continue;

const auto steps = 20;
const auto borderWidth = 2.f;
const auto widthPerStep = 4;
const auto stepSeparatorWidth = 1;
const auto stepsWidth = steps * widthPerStep - 2 * stepSeparatorWidth;
const auto totalWidth = stepsWidth + borderWidth * 2;

auto hpBarX = ScreenX - (int)(totalWidth / 2);
auto hpBarY = ScreenY;

EnableAlphaTest();
glColor4f(0.f, 0.f, 0.f, 0.5f);
RenderColor((float)(hpBarX + 1), (float)(hpBarY + 1), totalWidth, 5.f);

EnableAlphaBlend();
glColor3f(0.2f, 0.0f, 0.0f);
RenderColor((float)hpBarX, (float)hpBarY, totalWidth, 5.f);

glColor3f(50.f / 255.f, 10 / 255.f, 0.f);
RenderColor((float)(hpBarX + borderWidth), (float)(hpBarY + borderWidth), stepsWidth, 1.f);

float health = c->HealthStatus;
if (health < 0.0f) health = 1.0f;

float fillWidth = stepsWidth * health;
if (fillWidth > 0.f)
{
glColor3f(250.f / 255.f, 10.f / 255.f, 0.f);
RenderColor(
(float)(hpBarX + borderWidth),
(float)(hpBarY + borderWidth),
fillWidth,
2.f);
}
DisableAlphaBlend();
}
}
Comment thread
nolt marked this conversation as resolved.

float SEASON3B::CNewUINameWindow::GetLayerDepth()
{
return 1.0f;
Expand Down
9 changes: 6 additions & 3 deletions src/source/UI/NewUI/Character/NewUINameWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace SEASON3B
{
// ¾ÆÀÌÅÛ À̸§
// ������ �̸�
class CNewUINameWindow : public CNewUIObj
{
public:
Expand All @@ -33,10 +33,13 @@ namespace SEASON3B
private:
void RenderName();

CNewUIManager* m_pNewUIMng; // UI ¸Å´ÏÀú.
POINT m_Pos; // âÀÇ À§Ä¡.
CNewUIManager* m_pNewUIMng; // UI �Ŵ���.
POINT m_Pos; // â�� ��ġ.

bool m_bShowItemName;
bool m_bShowMonsterHealthBar;

void RenderMonsterHealthBars();
};
}

Expand Down
1 change: 1 addition & 0 deletions src/source/UI/NewUI/Dialogs/NewUIHelpWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ bool SEASON3B::CNewUIHelpWindow::Render()
// Insert engine-added camera and MU Helper hotkey entries between F4
// and the rest of the shipped entries.
const wchar_t* const extraHelpLines[] = {
I18N::Game::F8ToggleMonsterHPBar,
I18N::Game::F9Toggle3DCamera,
I18N::Game::F10LockUnlockCameraZoom,
I18N::Game::F11ResetCameraView,
Expand Down
Loading