More TODOs done.

This commit is contained in:
Kiri 2023-03-22 23:10:37 -07:00
parent 694cdf5f70
commit 36ce85d5b9
2 changed files with 27 additions and 5 deletions

10
TODO.md
View File

@ -6,6 +6,10 @@ n Deployed sprites for every angle (ceiling)
n - Showing charge level n - Showing charge level
x flat sprite? Advantages: One direction, can probably be used on ceiling and wall. x flat sprite? Advantages: One direction, can probably be used on ceiling and wall.
x - Showing charge level x - Showing charge level
x Sparks
x Debris when destroyed
x Show remaining batteries as ammo
x Switching to mag manager goes to batteries screen
- Pickup sprites for every angle - Pickup sprites for every angle
- Spool of wire, a tool, and some electical tape - Spool of wire, a tool, and some electical tape
@ -13,9 +17,7 @@ x - Showing charge level
- 1st-person sprites - 1st-person sprites
- Wire cutters and electrical tape - Wire cutters and electrical tape
x Sparks - Help screen
x Debris when destroyed
- Switching to mag manager goes to batteries screen - Add (or make sure) loadout code in loadout editor
- Show remaining batteries as ammo

View File

@ -263,7 +263,7 @@ class JumperCablesUsable : HDWeapon
if(PressingFire()) { if(PressingFire()) {
SetWeaponState("deploy"); SetWeaponState("deploy");
} }
A_WeaponReady(WRF_NOFIRE | WRF_ALLOWRELOAD | WRF_ALLOWUSER4); A_WeaponReady(WRF_NOFIRE | WRF_ALLOWUSER3); // USER3 = MagManager.
FLineTraceData linetraceData; FLineTraceData linetraceData;
DoLineTrace(HDPlayerPawn(invoker.owner), linetraceData); DoLineTrace(HDPlayerPawn(invoker.owner), linetraceData);
@ -293,6 +293,10 @@ class JumperCablesUsable : HDWeapon
} }
goto ready; goto ready;
user3:
#### A 0 A_MagManager("HDBattery");
goto ready;
} }
action void SpawnParticleForLineTrace(HDPlayerPawn pawn, FLineTraceData linetraceData) action void SpawnParticleForLineTrace(HDPlayerPawn pawn, FLineTraceData linetraceData)
@ -501,5 +505,21 @@ class JumperCablesUsable : HDWeapon
} }
} }
} }
override void DrawHUDStuff(HDStatusBar statusBar, HDWeapon weapon, HDPlayerPawn pawn)
{
// Copied and modified from ThunderBuster display.
if(statusBar.hudlevel == 1) {
statusBar.DrawBattery(
-54, -4,
statusBar.DI_SCREEN_CENTER_BOTTOM,
reloadorder : true);
statusBar.DrawNum(
pawn.CountInv("HDBattery"),
-46, -8,
statusBar.DI_SCREEN_CENTER_BOTTOM);
}
}
} }