Quality of Life Improvements: Bomb Info + Misc #64

RemainingToast · 2023-10-11T02:42:03Z

I couldn't even see it before because of chat being in the way + now its draggable to any place you want.

WolverinDEV · 2023-10-11T12:04:15Z

Hey,
the bomb info should be rendered after all players in the top right corner.
This should have fixed the chat overlay issue.

I like the idea, to make the bomb info draggable, but I don't like to have it rendered as window contently.
Especially as InGui windows always have this black background. I'm not sure, how a better alternative would look like tough.

RemainingToast · 2023-10-11T12:54:42Z

the bomb info should be rendered after all players in the top right corner.

I didn't experience that.

As for the background is it possible to change the imgui style background to a higher opacity. (I'm not really experienced in ImGui to know how)

RemainingToast · 2023-10-12T00:13:23Z

@WolverinDEV what changes should I make?

WolverinDEV · 2023-10-12T00:27:46Z

@WolverinDEV what changes should I make?

I'm not 100 % sure if the best solution is to make the bomb info moveable or just to fix #70.
As of right now, I think it's preferable to just fix #70 :)

RemainingToast · 2023-10-12T00:46:12Z

Alright, well personally I prefer the window- also I believe the ability it adds to move it around will fix any issues that arise from having a fixed position...

I will make my pr have more substance though and work on adding whether the bomb was dropped to the bomb info.

RemainingToast · 2023-10-12T00:53:14Z

Maybe some more people can give their feedback?

👍 ImGui Window preview
👎 Regular Implementation

user-420 · 2023-10-12T00:56:57Z

moveable but transparent background and no bar at the top of it when the menu is closed would be sick

RemainingToast · 2023-10-12T01:11:55Z

moveable but transparent background and no bar at the top of it when the menu is closed would be sick

I was thinking this also- best case. Will check out ImGui source and see if its possible or not...

…ose UI.

RemainingToast · 2023-10-12T14:02:45Z

2023-10-12.23-24-37.1.mp4

Summary

Added RenderContext
Added Bomb Info Colors
Added Show Background Setting
Added Show Colors Setting
Changed Bomb Info to ImGui Window
[QOL] Added 'Escape to Close UI'
Added Spectator(s): X Header to Spectator List

LDzik · 2023-10-12T14:31:30Z

Would be nice to have info while bomb is being planted. So i guess you could react faster or expect fake plants.

RemainingToast · 2023-10-12T14:53:50Z

Perhaps

RemainingToast · 2023-10-13T03:33:11Z

Fixed Conflicts can I please get a review @WolverinDEV

WolverinDEV

Hey,
thanks for your PR.

In regards to your code, I've left a few comments about stuff I noticed.
I also got some a some general questions:

Why bomb dropped state?
Why a defuse kit count?
What is the benefit over individually showing for each player if he has a defuse kit?

I also think, I would just make "Escape Closes UI" always on without any settings option

WolverinDEV · 2023-10-14T10:44:31Z

controller/src/enhancements/bomb.rs

+ let game_rules = rules_proxy.m_pGameRules()?.read_schema().unwrap();
+
+ if game_rules.m_bBombDropped().unwrap_or_default() {
+ return Ok(Some(C4Info {


What does ensure, that C_CSGameRulesProxy always comes before a potential C_PlantedC4 entity? I'm not sure if or under what circumstances but this may lead to unexpected results.

If the bomb is dropped it can't be planted.

What should I do?

You first have to loop trough all entities in order to find the C_CSGameRulesProxy entity.
If found & bomb is dropped, then return C4Info with the dropped state.

If not, try to find the bomb entity and get a state from that :)

Thats what Im already doing tho? @WolverinDEV

for entity_identity in entities.iter() { let class_name = ctx .class_name_cache .lookup(&entity_identity.entity_class_info()?) .context("class name")?; // Check if bomb is dropped if class_name .map(|name| name == "C_CSGameRulesProxy") .unwrap_or(false) { /* The bomb is dropped. */ let rules_proxy = entity_identity .entity_ptr::<C_CSGameRulesProxy>()? .reference_schema() .context("rules proxy missing")?; let game_rules = rules_proxy .m_pGameRules()? .reference_schema() .context("game rules missing")?; (); if game_rules.m_bBombDropped().unwrap_or_default() { return Ok(Some(C4Info { bomb_site: 0, state: C4State::Dropped, })); } } .....

controller/src/enhancements/bomb.rs

controller/src/main.rs

RemainingToast · 2023-10-14T14:12:50Z

Why bomb dropped state?

You can't see if the bomb is dropped if you're ct and not close to it, I thought its nice to have

Why a defuse kit count?

Its only used for selecting appropriate color for bomb timer if no kits then its safe after 10 seconds but if theres kits its not safe till 5 seconds

WolverinDEV · 2023-10-15T16:36:01Z

Its only used for selecting appropriate color for bomb timer if no kits then its safe after 10 seconds but if theres kits its not safe till 5 seconds

Ahh I missed that one.
I like the idea, but you don't have to loop trough all player controllers and count them.
Instead you can just bail out as soon you've found one with a defuse kit and rename the variable to something like "ct_have_defuse_kit".
You also have to ensure, that the entity which has a defuse kit is still alive. I'm not sure, if a player dies the flag for defuse kit will get cleared instantly :)

RemainingToast · 2023-10-16T04:37:53Z

You also have to ensure, that the entity which has a defuse kit is still alive. I'm not sure, if a player dies the flag for defuse kit will get cleared instantly :)

No it didn't I noticed that, is this gonna work: ?

if player_pawn.m_iHealth().unwrap_or(0) != 0 && player_has_defuser {
                self.any_kit = true;
                break;
}

WolverinDEV · 2023-10-18T12:47:31Z

No it didn't I noticed that, is this gonna work: ?

if player_pawn.m_iHealth().unwrap_or(0) != 0 && player_has_defuser {
                self.any_kit = true;
                break;
}

You can use m_lifeState on the player pawn (https://www.unknowncheats.me/forum/1265472-post4.html)

WolverinDEV · 2023-10-15T16:41:17Z

controller/src/enhancements/bomb.rs

 }

 pub struct BombInfo {
+ /// Number of Counter-Terrorists with kit
+ num_kit: u8,


As discussed earlier: ct_has_defuse_kit

WolverinDEV · 2023-10-15T16:43:18Z

controller/src/enhancements/bomb.rs

- defuse.time_remaining, defuse.player_name
- ),
+ // Helper Function
+ fn helper_text_color(


This function is not needed. You can use:

let text_color = if self.local_team == 2 { color_t } else { color_ct };

and instead use ctx.ui.text_colored(text_color, "My lovely text")

Still pending

WolverinDEV · 2023-10-18T12:48:12Z

controller/src/enhancements/mod.rs

@@ -10,7 +10,7 @@ pub trait Enhancement {
 Ok(false)
 }

- fn render(&self, settings: &AppSettings, ui: &imgui::Ui, view: &ViewController);
+ fn render(&self, ctx: RenderContext);


Still: Please pass RenderContext as reference: &RenderContext

WolverinDEV · 2023-10-18T12:49:20Z

controller/src/main.rs

@@ -124,6 +125,14 @@ pub struct UpdateContext<'a> {
 pub globals: Globals,
 }

+#[derive(Clone, Copy)]


You can remove the Copy derive when you pass RenderContext as reference.

RemainingToast · 2023-10-19T07:56:45Z

I'll work on this soon.

RemainingToast added 3 commits October 11, 2023 11:05

Update .gitignore for RustRover

31f9a28

Merge branch 'master' of https://github.com/Valthrun/Valthrun

617ddcc

Made Bomb Info ImGui Window

59f33c3

Merge branch 'master' into master

05c3df6

RemainingToast changed the title ~~Made Bomb Info ImGui Window~~ Add More Bomb Info + ImGui Window Oct 12, 2023

RemainingToast and others added 2 commits October 12, 2023 23:51

Merge branch 'Valthrun:master' into master

666448f

RenderContext + Bomb Info; Colors, Background Settings & Escape-to-Cl…

13583b2

…ose UI.

RemainingToast changed the title ~~Add More Bomb Info + ImGui Window~~ Quality of Life Improvements: Bomb Info + Misc Oct 12, 2023

Update Setting Names

880bf5f

Fix Conflict(s)

0d076f8

RemainingToast force-pushed the master branch from 268e5a7 to 0d076f8 Compare October 13, 2023 05:04

RemainingToast and others added 2 commits October 13, 2023 17:27

Cargo Formatting

133a0af

Merge branch 'master' into master

07e64d2

WolverinDEV requested changes Oct 14, 2023

View reviewed changes

RemainingToast requested a review from WolverinDEV October 14, 2023 14:27

RemainingToast force-pushed the master branch from 3293088 to 356fa65 Compare October 14, 2023 14:29

Requested Changes

e2d09a5

RemainingToast force-pushed the master branch from 356fa65 to e2d09a5 Compare October 14, 2023 14:43

RemainingToast added 2 commits October 16, 2023 14:38

Remove Context from Loop + num_kit -> any_kit

f631f0a

Clean Up + Disable Dragging Bomb UI In-Game

6087aaf

WolverinDEV requested changes Oct 18, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Quality of Life Improvements: Bomb Info + Misc #64

Quality of Life Improvements: Bomb Info + Misc #64

RemainingToast commented Oct 11, 2023

WolverinDEV commented Oct 11, 2023

RemainingToast commented Oct 11, 2023

RemainingToast commented Oct 12, 2023

WolverinDEV commented Oct 12, 2023

RemainingToast commented Oct 12, 2023

RemainingToast commented Oct 12, 2023

user-420 commented Oct 12, 2023

RemainingToast commented Oct 12, 2023

RemainingToast commented Oct 12, 2023

LDzik commented Oct 12, 2023

RemainingToast commented Oct 12, 2023

RemainingToast commented Oct 13, 2023

WolverinDEV left a comment

WolverinDEV Oct 14, 2023

RemainingToast Oct 14, 2023

RemainingToast Oct 14, 2023

WolverinDEV Oct 15, 2023

RemainingToast Oct 16, 2023

RemainingToast Oct 16, 2023

RemainingToast commented Oct 14, 2023 •

edited

WolverinDEV commented Oct 15, 2023

RemainingToast commented Oct 16, 2023

WolverinDEV commented Oct 18, 2023

WolverinDEV Oct 15, 2023

WolverinDEV Oct 15, 2023

WolverinDEV Oct 18, 2023

WolverinDEV Oct 18, 2023

WolverinDEV Oct 18, 2023

RemainingToast commented Oct 19, 2023

Quality of Life Improvements: Bomb Info + Misc #64

Are you sure you want to change the base?

Quality of Life Improvements: Bomb Info + Misc #64

Conversation

RemainingToast commented Oct 11, 2023

WolverinDEV commented Oct 11, 2023

RemainingToast commented Oct 11, 2023

RemainingToast commented Oct 12, 2023

WolverinDEV commented Oct 12, 2023

RemainingToast commented Oct 12, 2023

RemainingToast commented Oct 12, 2023

user-420 commented Oct 12, 2023

RemainingToast commented Oct 12, 2023

RemainingToast commented Oct 12, 2023

Summary

LDzik commented Oct 12, 2023

RemainingToast commented Oct 12, 2023

RemainingToast commented Oct 13, 2023

WolverinDEV 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

RemainingToast commented Oct 14, 2023 • edited

WolverinDEV commented Oct 15, 2023

RemainingToast commented Oct 16, 2023

WolverinDEV commented Oct 18, 2023

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

RemainingToast commented Oct 19, 2023

RemainingToast commented Oct 14, 2023 •

edited