Exclusive SuperWeapon Sidebar #1384

NetsuNegi · 2024-09-18T17:02:22Z

It is possible to put sw cameos on the left of screen like C&C3 when ExclusiveSuperWeaponSidebar is true.
In theory, it should be compatible with Ares
Cameos arranged in a pyramid shape.
ExclusiveSWSidebar.Interval specific how many leptons between two columns.
ExclusiveSuperWeaponSidebar.Max controls the maximum number of icons on the leftmost side, which also depends on the current game resolution.
ExclusiveSWSidebar.MaxColumn controls that maximum count of columns.
You can also launch first 10 SW by hotkey.

In uimd.ini:

[Sidebar]
ExclusiveSWSidebar=false            ; boolean
ExclusiveSWSidebar.Interval=0       ; integer
ExclusiveSWSidebar.Max=0            ; integer
ExclusiveSWSidebar.MaxColumn=       ; integer

In rulesmd.ini

[SOMESIDE]
ExclusiveSWSidebar.TopPCX=          ; filename - including the .pcx extension
ExclusiveSWSidebar.CenterPCX=       ; filename - including the .pcx extension
ExclusiveSWSidebar.BottomPCX=       ; filename - including the .pcx extension
ExclusiveSWSidebar.ToggleShape=     ; filename - including the .shp extension

[SOMESW]
AllowInExclusiveSidebar=true        ; boolean
ExclusiveSidebar.PriorityHouses=    ; list of house types
ExclusiveSidebar.RequiredHouses=    ; list of house types

github-actions · 2024-09-19T00:19:03Z

Nightly build for this pull request:

compiled-dll-a73485b57568d411cea0e4d1561ff4f209210194.zip
These artifacts will expire in 90 days and will not be available for download after that time.

This comment is automatic and is meant to allow guests to get latest nightly builds for this pull request without registering. It is updated on every successful build.

NetsuNegi · 2024-09-20T09:34:14Z

looks like nobody interested for this, so it won't change again until somebody notice it.

FS-21 · 2024-09-20T10:11:23Z

Looks nice but due to the large list of SW that can stack in that side of the screen can be added a button for show/hide this SuperWeapon Sidebar ?

Metadorius · 2024-09-20T10:12:24Z

looks like nobody interested for this, so it won't change again until somebody notice it.

That's not really true, we're just yet to give feedback, and the situation with you and @CrimRecya working on the same feature is a bit... odd

Maybe you and @CrimRecya could cooperate and implement a unified way which includes best of both worlds? Your implementation looks better in terms of internal, but his is more feature-full.
Is there a reason you don't inherit from ControlClass? Per @ZivDero ToggleClass has different functionality that is not useful to your implementation.

Starkku · 2024-09-20T10:33:10Z

As useful as this may seem to some I still think both this and #1379 are infinitely less desirable than an additional sidebar tab for superweapons. I know there are some potential challenges in trying to implement that but maybe there's some sort of shortcut to 'fake it' rather than trying to plug it into the existing tab system e.g a button that changes the tab display to something that looks like it but isn't and only display's SW's. If I had more time and energy I would help you guys in the research but alas no can do.

Metadorius · 2024-09-20T11:07:24Z

I think that a separate sidebar can also be an alternative option, doesn't have to choose either or.

NetsuNegi · 2024-09-20T12:39:39Z

看起来不错，但由于屏幕那一侧可以堆叠的大量软件可以添加一个按钮来显示/隐藏这个 SuperWeapon 侧边栏？

of course

NetsuNegi · 2024-09-20T12:40:39Z

looks like nobody interested for this, so it won't change again until somebody notice it.

That's not really true, we're just yet to give feedback, and the situation with you and @CrimRecya working on the same feature is a bit... odd

Maybe you and @CrimRecya could cooperate and implement a unified way which includes best of both worlds? Your implementation looks better in terms of internal, but his is more feature-full.

Is there a reason you don't inherit from ControlClass? Per @ZivDero ToggleClass has different functionality that is not useful to your implementation.

There's no special reason, it's just because I don't know it well enough

ZivDero

Overall, I am happy with this implementation. Looking at the new button, it looks well implemented to me. Kudos.

It's a shame we have to reimplement all this Ares crap, but eh, not much that can be done.

ZivDero · 2024-09-25T14:51:29Z

src/Ext/Sidebar/TacticalButtonClass.cpp

+
+ if ((int)flags & (int)GadgetFlag::LeftRelease && this->IsPressed)
+ {
+ this->IsPressed = false;


IIRC when you handle an input, you should exlude it before passing it on.
So flags &= ~GadgetFlag::LeftRelease or smth.

ZivDero

If you wanna make it even better, maybe take out the static stuff outside of TacticalButtonClass, and into some new "SWSidebarClass". It's a bit weird to have it in the button itself, even if this is the only purpose of the button.
Just don't forget to resolve conflics and update docs.

NetsuNegi · 2024-09-25T14:59:35Z

If you wanna make it even better, maybe take out the static stuff outside of TacticalButtonClass, and into some new "SWSidebarClass". It's a bit weird to have it in the button itself, even if this is the only purpose of the button. Just don't forget to resolve conflics and update docs.

Actually, I don't know how to handle conflicts outside of the browser

ZivDero · 2024-09-25T15:02:08Z

If you wanna make it even better, maybe take out the static stuff outside of TacticalButtonClass, and into some new "SWSidebarClass". It's a bit weird to have it in the button itself, even if this is the only purpose of the button. Just don't forget to resolve conflics and update docs.

Actually, I don't know how to handle conflicts outside of the browser

You need to rebase your branch onto the latest develop. Then you'll get conflicts inside the files, and you can resolve them in VS/VS Code/other diff program.

NetsuNegi · 2024-09-25T15:06:16Z

If you wanna make it even better, maybe take out the static stuff outside of TacticalButtonClass, and into some new "SWSidebarClass". It's a bit weird to have it in the button itself, even if this is the only purpose of the button. Just don't forget to resolve conflics and update docs.

Actually, I don't know how to handle conflicts outside of the browser

You need to rebase your branch onto the latest develop. Then you'll get conflicts inside the files, and you can resolve them in VS/VS Code/other diff program.

idk how to do it :(

…om/NetsuNegi/Phobos into origin/branch/exclusive-sw-sidebar

NetsuNegi · 2024-09-27T15:54:22Z

TODO:
Make the keys directly display on the cameo to replace "ready" text when the SW is ready.
Add a button that can be clicked besides the shortcut key switch.

NetsuNegi · 2024-09-28T01:16:47Z

It's too hard for me to deal with S/L...
Completely I didn'y know how to do it.

Metadorius · 2024-09-28T09:57:11Z

I don't think you ever need to save/load anything in the sidebar. The game just recreates the sidebar on each load, so you could do the same.

NetsuNegi · 2024-09-28T15:16:36Z

TODO: Make the keys directly display on the cameo to replace "ready" text when the SW is ready. Add a button that can be clicked besides the shortcut key switch.

I will do that in next 2 days.

NetsuNegi · 2024-09-28T15:17:34Z

I don't think you ever need to save/load anything in the sidebar. The game just recreates the sidebar on each load, so you could do the same.

But I still need to save/load the superIndex per buttons I think.

Metadorius · 2024-09-28T15:32:39Z

But I still need to save/load the superIndex per buttons I think.

I don't think you need to. Just treat loading as you will treat starting a new game.

I haven't looked in depth at how you implemented it, but what I would do is add the superweapon to the SuperWeapon Sidebar when the same superweapon is added to the main sidebar, so you will automatically keep them in sync.

Keep in mind that I didn't check in depth how it works, so this is only in theory.

NetsuNegi · 2024-09-28T16:05:23Z

But I still need to save/load the superIndex per buttons I think.

I don't think you need to. Just treat loading as you will treat starting a new game.

I haven't looked in depth at how you implemented it, but what I would do is add the superweapon to the SuperWeapon Sidebar when the same superweapon is added to the main sidebar, so you will automatically keep them in sync.

Keep in mind that I didn't check in depth how it works, so this is only in theory.

It seems that the game did not re add cameos after reading the save file.
Or I just didn't find it.

NetsuNegi · 2024-09-29T02:21:01Z

Thank you very much for your creation and for putting in so much effort to improve this implement. Since I am currently unable to conduct direct testing, I plan to ask you a few questions based on my previous PR #1379 :

Can the mouse operations on the background be blocked, not responded to by various other operations.

Can the keys directly display on the cameo to replace "ready" text when the SW is ready.

Is there an another button that can be clicked besides the shortcut key switch.

Can the SW be released directly at the mouse position by pressing the shortcut key (may not need to be directly included in this feature, but is indeed related)

Praise You!

I see that you are also a Chinese contributor, so I directly write the original Chinese version for your understanding :

非常感谢你的创作，并花费如此精力改进这个功能。由于我现在没有办法直接进行测试，所以我想基于 pr #1379 的已有功能，询问几个问题：

1、对于图标后的背景，鼠标在其之上进行的操作是否能够被屏蔽，也就是说不会被各种其他操作所响应。 2、在超级武器准备完毕的时候，也就是图标上会显示“就绪”文本的时候，能否将这个文本改成其快捷键的键位。 3、除了快捷键开关之外，是否能有一个可以点击的图标开关。 4、（可能并不需要直接包含在这个功能里，但确实相关的功能）能否通过直接按下快捷键，让超级武器直接在鼠标所在的位置释放

称赞.gif

It should be finished now.
应该都完成了。

Metadorius

Not full review, just randomly stumbled upon something to change.

src/Commands/FireTacticalSW.h

CrimRecya

I took a brief look and haven't test yet.
我简单看了下，还没测试。

CrimRecya · 2024-09-30T09:21:12Z

src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp

+
+ for (int idx = 1; idx <= 10; idx++)
+ {
+ sprintf_s(buffer, "SW Sidebar Shortcuts Num %02d", idx);


I think you forgot to change this to the shortcut key name you defined.
我想你应该是忘记把这里改成你所定义的快捷键名称了。

I'm not 100% on what's up here, please verify if the string you make is what you intended.

I'm not 100% on what's up here, please verify if the string you make is what you intended.

This should be the Name of the command class.
This is when loading/saving shortcut keys. Finding the newly added SW shortcut keys by comparing the names, extract their shortcut key codes and translate to text through that huge map. Finally display them conveniently on the screen for players.
However, the game originally had a function to display shortcut key text in the settings interface, but I couldn't find it, so this became a form of separate recording and self translation.

I'm not 100% on what's up here, please verify if the string you make is what you intended.

This should be the Name of the command class. This is when loading/saving shortcut keys. Finding the newly added SW shortcut keys by comparing the names, extract their shortcut key codes and translate to text through that huge map. Finally display them conveniently on the screen for players. However, the game originally had a function to display shortcut key text in the settings interface, but I couldn't find it, so this became a form of separate recording and self translation.

61EF70 is the function.
void WWUI::Get_Keyboard_Key_String(int key, wchar_t *buffer)

CrimRecya · 2024-09-30T09:23:34Z

src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp

+
+ for (int idx = 1; idx <= 10; idx++)
+ {
+ sprintf_s(buffer, "SW Sidebar Shortcuts Num %02d", idx);


The same.
同上。

src/Ext/Side/Body.h

docs/User-Interface.md

ZivDero · 2024-09-30T16:53:45Z

src/Ext/Sidebar/SWSidebar/SWColumnClass.cpp

+ if (!pSWExt->SW_ShowCameo)
+ return true;
+
+ if (!Phobos::UI::ExclusiveSWSidebar || Unsorted::ArmageddonMode)


What is ArmageddonMode and how is it relevant?

ZivDero · 2024-09-30T16:55:05Z

src/Ext/Sidebar/SWSidebar/SWColumnClass.cpp

+bool SWColumnClass::Clicked(DWORD* pKey, GadgetFlag flags, int x, int y, KeyModifier modifier)
+{
+ for (const auto button : this->Buttons)
+ {
+ if (button->Clicked(pKey, flags, x, y, modifier))
+ return true;
+ }
+
+ return false;
+}


Is there a reason why a column is a ControlClass, and manually fires the Clicked function for buttons?
Why not just have the buttons fire it themselves?

Because I want it to block mouse action.

And buttons click has been blocked by Column's, so I manually check it.

ZivDero · 2024-09-30T16:56:59Z

src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp

+void SWSidebarClass::RecordHotkey(int buttonIndex, int key)
+{
+ const int index = buttonIndex - 1;
+
+ if (this->KeyCodeData[index] == key)
+ return;
+
+ this->KeyCodeData[index] = key;
+ std::wostringstream oss;
+
+ if (key & static_cast<int>(WWKey::Shift))
+ oss << KeyboardCodeTextMap[static_cast<int>(WWKey::Shift)] << L"+";
+
+ if (key & static_cast<int>(WWKey::Ctrl))
+ oss << KeyboardCodeTextMap[static_cast<int>(WWKey::Ctrl)] << L"+";
+
+ if (key & static_cast<int>(WWKey::Alt))
+ oss << KeyboardCodeTextMap[static_cast<int>(WWKey::Alt)] << L"+";
+
+ const int pureKey = key & 0xFF;
+
+ if (KeyboardCodeTextMap.contains(pureKey))
+ oss << KeyboardCodeTextMap[pureKey];
+ else
+ oss << L"Unknown";
+
+ this->KeyCodeText[index] = oss.str();
+}


What is the purpose of this, as well as the huge map above? Why did vanilla settings not suit you?

This just copy from PR#1379.

ZivDero · 2024-09-30T16:57:28Z

src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp

+// I cannot add it into YRppp :(
+// It always failed, help me
+static void __fastcall HouseClass_UpdateSuperWeaponsUnavailable(HouseClass* pHouse)
+{
+ JMP_STD(0x50B1D0);
+}


Please ask in the chat

I added HouseClass::AISupers() for you.

Please utilize HouseClass::AISuper()

src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp

ZivDero · 2024-09-30T16:59:22Z

src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp

+DEFINE_HOOK(0x533E69, UnknownClass_sub_533D20_LoadKeyboardCodeFromINI, 0x6)
+{
+ GET(CommandClass*, pCommand, ESI);
+ GET(int, key, EDI);
+
+ const char* name = pCommand->GetName();
+ char buffer[29];
+
+ for (int idx = 1; idx <= 10; idx++)
+ {
+ sprintf_s(buffer, "SW Sidebar Shortcuts Num %02d", idx);
+
+ if (!_strcmpi(name, buffer))
+ SWSidebarClass::Global()->RecordHotkey(idx, key);
+ }
+
+ return 0;
+}


What why? The game will load keyboard commands by itself as long as you add them to the Commands vector.

How can I get the hotkey of the command?

You shouldn't need to get the hotkey of the command, the command is self-sufficientr (just does everything in ::Execute)

You shouldn't need to get the hotkey of the command, the command is self-sufficientr (just does everything in ::Execute)

This is not for us to execute, this is for players to see.

This is not for us to execute, this is for players to see.

Alright, we see now.

I have not looked in depth at the algorithm you do, but what I know is that in the hotkey configuration window the game already writes the key combination like Alt+A for example. What I think we should do: when writing the label at the cameo of superweapon, see the order of it in the sidebar, look up the corresponding hotkey from the global array of registered hotkeys (by type) and transform the key combination that is used for that hotkey into a string, then print it.

This is not for us to execute, this is for players to see.

Alright, we see now.

I have not looked in depth at the algorithm you do, but what I know is that in the hotkey configuration window the game already writes the key combination like Alt+A for example. What I think we should do: when writing the label at the cameo of superweapon, see the order of it in the sidebar, look up the corresponding hotkey from the global array of registered hotkeys (by type) and transform the key combination that is used for that hotkey into a string, then print it.

So how can I do that?

So how can I do that?

@ZivDero is currently in process of adding stuff to YRpp so you can accomplish that, please wait a bit.

So how can I do that?

@ZivDero is currently in process of adding stuff to YRpp so you can accomplish that, please wait a bit.

Alright

ZivDero · 2024-09-30T17:01:41Z

src/Misc/PhobosToolTip.cpp

+{
+ if (SWSidebarClass::IsEnabled())
+ {
+ if (const auto button = SWSidebarClass::Global()->CurrentButton)


Questionable syntax, avoid assignments inside if blocks (aside from dynamic_cast, perhaps)

It's a shorthand for a null check and is actually quite convenient. There is no risk here because you assign a variable and not compare. We do that often in Phobos.

I would prefer not doing this since it's not transformative (a dynamic_cast would at least give you something else, in this case you can just repeat this thing 3 times inside which is fine IMO, or declare a variable inside the block. Unjustified use.

Well either way my point is that it's not necessarily bad. This is a personal preferences territory in this case IMO.

ZivDero · 2024-09-30T17:02:31Z

src/Commands/ToggleSWSidebar.cpp

+const wchar_t* ToggleSWSidebar::GetUIName() const
+{
+ return GeneralUtils::LoadStringUnlessMissing("TXT_TOGGLE_SW_SIDEBAR", L"Toggle SuperWeapon Sidebar");
+}
+
+const wchar_t* ToggleSWSidebar::GetUICategory() const
+{
+ return CATEGORY_INTERFACE;
+}
+
+const wchar_t* ToggleSWSidebar::GetUIDescription() const
+{
+ return GeneralUtils::LoadStringUnlessMissing("TXT_TOGGLE_SW_SIDEBAR_DESC", L"Toggle SuperWeapon Sidebar.");
+}
+
+void ToggleSWSidebar::Execute(WWKey eInput) const
+{
+ ToggleSWButtonClass::SwitchSidebar();
+
+ if (SidebarExt::Global()->SWSidebar_Enable)
+ MessageListClass::Instance->PrintMessage(GeneralUtils::LoadStringUnlessMissing("TXT_EX_SW_BAR_VISIBLE", L"Set exclusive SW sidebar visible."), RulesClass::Instance->MessageDelay, HouseClass::CurrentPlayer->ColorSchemeIndex, true);
+ else
+ MessageListClass::Instance->PrintMessage(GeneralUtils::LoadStringUnlessMissing("TXT_EX_SW_BAR_INVISIBLE", L"Set exclusive SW sidebar invisible."), RulesClass::Instance->MessageDelay, HouseClass::CurrentPlayer->ColorSchemeIndex, true);


Please have someone proofread your default strings.

That's kinda what we are for :P

ZivDero · 2024-09-30T17:03:14Z

src/Commands/Commands.cpp

+ MakeCommand<ToggleSWSidebar>();
+
+ MakeCommand<FireTacticalSWCommandClass<0>>();
+ MakeCommand<FireTacticalSWCommandClass<1>>();
+ MakeCommand<FireTacticalSWCommandClass<2>>();
+ MakeCommand<FireTacticalSWCommandClass<3>>();
+ MakeCommand<FireTacticalSWCommandClass<4>>();
+ MakeCommand<FireTacticalSWCommandClass<5>>();
+ MakeCommand<FireTacticalSWCommandClass<6>>();
+ MakeCommand<FireTacticalSWCommandClass<7>>();
+ MakeCommand<FireTacticalSWCommandClass<8>>();
+ MakeCommand<FireTacticalSWCommandClass<9>>();


This should be enough for commands to appear in the settings and save/load in/from keyboard.ini. Why the other fluff?

src/Commands/FireTacticalSW.h

src/Commands/ToggleSWSidebar.cpp

ZivDero

Almost there

ZivDero · 2024-10-22T20:29:41Z

src/Ext/Sidebar/SWSidebar/SWColumnClass.cpp

+ const auto it = std::find_if(buttons.begin(), buttons.end(), [superIdx](TacticalButtonClass* const button) { return button->SuperIndex == superIdx; });
+
+ if (it == buttons.end())
+ return false;
+
+ AnnounceInvalidPointer(SWSidebarClass::Global()->CurrentButton, *it);


it is a weird choice. Maybe button?

ZivDero · 2024-10-22T20:32:19Z

src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp

+ Code2Text[0x28] = L"Down";
+ Code2Text[0x29] = L"Select";
+ Code2Text[0x2A] = L"Print";
+ Code2Text[0x2B] = L"Execute";
+ Code2Text[0x2C] = L"PrintScreen";
+ Code2Text[0x2D] = L"Insert";
+ Code2Text[0x2E] = L"Delete";
+ Code2Text[0x2F] = L"Help";
+ Code2Text[0x30] = L"0";
+ Code2Text[0x31] = L"1";
+ Code2Text[0x32] = L"2";
+ Code2Text[0x33] = L"3";
+ Code2Text[0x34] = L"4";
+ Code2Text[0x35] = L"5";
+ Code2Text[0x36] = L"6";
+ Code2Text[0x37] = L"7";
+ Code2Text[0x38] = L"8";
+ Code2Text[0x39] = L"9";
+
+ Code2Text[0x41] = L"A";
+ Code2Text[0x42] = L"B";
+ Code2Text[0x43] = L"C";
+ Code2Text[0x44] = L"D";
+ Code2Text[0x45] = L"E";
+ Code2Text[0x46] = L"F";
+ Code2Text[0x47] = L"G";
+ Code2Text[0x48] = L"H";
+ Code2Text[0x49] = L"I";
+ Code2Text[0x4A] = L"J";
+ Code2Text[0x4B] = L"K";
+ Code2Text[0x4C] = L"L";
+ Code2Text[0x4D] = L"M";
+ Code2Text[0x4E] = L"N";
+ Code2Text[0x4F] = L"O";
+ Code2Text[0x50] = L"P";
+ Code2Text[0x51] = L"Q";
+ Code2Text[0x52] = L"R";
+ Code2Text[0x53] = L"S";
+ Code2Text[0x54] = L"T";
+ Code2Text[0x55] = L"U";
+ Code2Text[0x56] = L"V";
+ Code2Text[0x57] = L"W";
+ Code2Text[0x58] = L"X";
+ Code2Text[0x59] = L"Y";
+ Code2Text[0x5A] = L"Z";
+ Code2Text[0x5B] = L"LWin";
+ Code2Text[0x5C] = L"RWin";
+ Code2Text[0x5D] = L"Menu";
+
+ Code2Text[0x60] = L"Num0";
+ Code2Text[0x61] = L"Num1";
+ Code2Text[0x62] = L"Num2";
+ Code2Text[0x63] = L"Num3";
+ Code2Text[0x64] = L"Num4";
+ Code2Text[0x65] = L"Num5";
+ Code2Text[0x66] = L"Num6";
+ Code2Text[0x67] = L"Num7";
+ Code2Text[0x68] = L"Num8";
+ Code2Text[0x69] = L"Num9";
+ Code2Text[0x6A] = L"Num*";
+ Code2Text[0x6B] = L"Num+";
+ Code2Text[0x6C] = L"Separator";
+ Code2Text[0x6D] = L"Num-";
+ Code2Text[0x6E] = L"Num.";
+ Code2Text[0x6F] = L"Num/";
+ Code2Text[0x70] = L"F1";
+ Code2Text[0x71] = L"F2";
+ Code2Text[0x72] = L"F3";
+ Code2Text[0x73] = L"F4";
+ Code2Text[0x74] = L"F5";
+ Code2Text[0x75] = L"F6";
+ Code2Text[0x76] = L"F7";
+ Code2Text[0x77] = L"F8";
+ Code2Text[0x78] = L"F9";
+ Code2Text[0x79] = L"F10";
+ Code2Text[0x7A] = L"F11";
+ Code2Text[0x7B] = L"F12";
+
+ Code2Text[0x90] = L"NumLock";
+ Code2Text[0x91] = L"ScrollLock";
+
+ Code2Text[0xBA] = L";";
+ Code2Text[0xBB] = L"=";
+ Code2Text[0xBC] = L",";
+ Code2Text[0xBD] = L"-";
+ Code2Text[0xBE] = L".";
+ Code2Text[0xBF] = L"/";
+ Code2Text[0xC0] = L"`";
+
+ Code2Text[0xDB] = L"[";
+ Code2Text[0xDC] = L"\\";
+ Code2Text[0xDD] = L"]";
+ Code2Text[0xDE] = L"'";
+
+ Code2Text[static_cast<int>(WWKey::Shift)] = L"Shift";
+ Code2Text[static_cast<int>(WWKey::Ctrl)] = L"Ctrl";
+ Code2Text[static_cast<int>(WWKey::Alt)] = L"Alt";
+
+ return Code2Text;
+}


This could use the vanilla functions that provide the name of the key, but one would need to add it it YRpp first. For now I guess it's not a big deal, although perhaps maybe it could be taken out of here and into some place as a util?

but one would need to add it it YRpp first

@ZivDero didn't you already do exactly that?

but one would need to add it it YRpp first

@ZivDero didn't you already do exactly that?

I encountered some issues the details of which I don't recall and I don't think it ever got to completion, no.

ZivDero · 2024-10-22T20:33:25Z

src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp

+// I cannot add it into YRppp :(
+// It always failed, help me
+static void __fastcall HouseClass_UpdateSuperWeaponsUnavailable(HouseClass* pHouse)
+{
+ JMP_STD(0x50B1D0);
+}


Please utilize HouseClass::AISuper()

ZivDero · 2024-10-22T20:33:56Z

src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp

+ return false;
+}
+
+void SWSidebarClass::Init_Clear()


Suggested change

void SWSidebarClass::Init_Clear()

void SWSidebarClass::InitClear()

ZivDero · 2024-10-22T20:34:57Z

src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp

+
+ for (int idx = 1; idx <= 10; idx++)
+ {
+ sprintf_s(buffer, "SW Sidebar Shortcuts Num %02d", idx);


I'm not 100% on what's up here, please verify if the string you make is what you intended.

NetsuNegi marked this pull request as draft September 22, 2024 00:09

Metadorius mentioned this pull request Sep 25, 2024

Exclusive Sidebar for Superweapons #1379

Closed

ZivDero reviewed Sep 25, 2024

View reviewed changes

ZivDero approved these changes Sep 25, 2024

View reviewed changes

NetsuNegi and others added 2 commits September 25, 2024 18:32

first commit

99358b3

Rebase

54ec5e9

ZivDero force-pushed the origin/branch/exclusive-sw-sidebar branch from e4c0b68 to 54ec5e9 Compare September 25, 2024 15:40

NetsuNegi marked this pull request as ready for review September 25, 2024 15:41

NetsuNegi and others added 11 commits September 26, 2024 09:15

Add SWSidebarClass

070450d

what

d2cb60d

Update SWSidebarClass.cpp

6de7e13

Add tags

137cb4b

Move some hooks

f065885

implement draw background and single column

fee49a9

Add hotkey to fire SW

be3ad52

Update FireTacticalSW.h

263b2ef

Merge branch 'develop' into origin/branch/exclusive-sw-sidebar

4a21edc

Update docs

57aa56a

Merge branch 'origin/branch/exclusive-sw-sidebar' of https://github.c…

e25a370

…om/NetsuNegi/Phobos into origin/branch/exclusive-sw-sidebar

NetsuNegi added 3 commits September 27, 2024 22:54

Remove ExclusiveSWSidebarBackground

ba5a4da

Update SWSidebarClass.cpp

8504b2f

Update SWSidebarClass.cpp

18be905

NetsuNegi closed this Sep 28, 2024

NetsuNegi reopened this Sep 28, 2024

it should can S/L now

70173ca

NetsuNegi added 2 commits September 29, 2024 09:39

Add toggle button

aa807d7

finish

6a5f2b9

NetsuNegi added 4 commits September 29, 2024 10:23

Update SWSidebarClass.cpp

72f9223

Adjust SW cameo draw sequence

80553b2

finish toggle SW sidebar button

f7a9937

update docs

436dad6

Metadorius requested a review from ZivDero September 29, 2024 22:16

Metadorius assigned ZivDero Sep 29, 2024

Metadorius reviewed Sep 29, 2024

View reviewed changes

src/Commands/FireTacticalSW.h Outdated Show resolved Hide resolved

Update FireTacticalSW.h

617692c

CrimRecya reviewed Sep 30, 2024

View reviewed changes

ZivDero requested changes Sep 30, 2024

View reviewed changes

NetsuNegi and others added 2 commits October 1, 2024 11:18

Update User-Interface.md

4e53ca8

fixes

a21cf0a

ZivDero requested changes Oct 22, 2024

View reviewed changes

	void SWSidebarClass::Init_Clear()
	void SWSidebarClass::InitClear()

Exclusive SuperWeapon Sidebar #1384

Are you sure you want to change the base?

Exclusive SuperWeapon Sidebar #1384

Conversation

NetsuNegi commented Sep 18, 2024 • edited Loading

github-actions bot commented Sep 19, 2024 • edited Loading

NetsuNegi commented Sep 20, 2024

FS-21 commented Sep 20, 2024 • edited Loading

Metadorius commented Sep 20, 2024

Starkku commented Sep 20, 2024

Metadorius commented Sep 20, 2024

NetsuNegi commented Sep 20, 2024

NetsuNegi commented Sep 20, 2024

ZivDero left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ZivDero left a comment • edited Loading

Choose a reason for hiding this comment

NetsuNegi commented Sep 25, 2024

ZivDero commented Sep 25, 2024

NetsuNegi commented Sep 25, 2024

NetsuNegi commented Sep 27, 2024

NetsuNegi commented Sep 28, 2024 • edited Loading

Metadorius commented Sep 28, 2024 • edited Loading

NetsuNegi commented Sep 28, 2024

NetsuNegi commented Sep 28, 2024

Metadorius commented Sep 28, 2024

NetsuNegi commented Sep 28, 2024

NetsuNegi commented Sep 29, 2024

Metadorius left a comment

Choose a reason for hiding this comment

CrimRecya left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ZivDero Sep 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NetsuNegi Oct 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NetsuNegi Oct 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NetsuNegi Oct 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ZivDero left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NetsuNegi commented Sep 18, 2024 •

edited

Loading

github-actions bot commented Sep 19, 2024 •

edited

Loading

FS-21 commented Sep 20, 2024 •

edited

Loading

ZivDero left a comment •

edited

Loading

NetsuNegi commented Sep 28, 2024 •

edited

Loading

Metadorius commented Sep 28, 2024 •

edited

Loading

ZivDero Sep 30, 2024 •

edited

Loading

NetsuNegi Oct 1, 2024 •

edited

Loading

NetsuNegi Oct 1, 2024 •

edited

Loading

NetsuNegi Oct 1, 2024 •

edited

Loading