Skip to content

Commit

Permalink
Mark allied airpad's unusable (#4136)
Browse files Browse the repository at this point in the history
* Add bomber commands.

Add a (for now) empty command to all airplanes that need refueling/rearming.

* More work on functionality.

Working towards getting this functional.

* Small fixes

Small fixes and changes to the unit_bomber_command.

* More logic work

More work on getting this to work.

* Preparing for code refactor.

Commiting now so I can go back when I inevitably ruin everything.

* Switching computers.

Commiting now so I can move to my laptop - minor work on code refactor.

* Refactor complete.

Finished code refactor.

* Switching computers

* Functionally complete.

Removal of comments and Spring.Echos as well as some unused code.

* Bringing in suggestions (BROKEN)

Working on integrating the suggestions from GF - have broken a few things, so don't try this code.

* Fixing the broken things

Fixed unit grabbing.
Fixed texture error.

* Removal of widget and work on overhead icons

Removed the widget as it was not needed and did a little work towards getting an overhead 'airpad excluded' icon displaying.

* Rename command

Renaming the exclude airpad command. and fixing whitespace (?)

* Overhead Icons

Overhead Icon is displaying now.

* Icon offset changes

Make icon's draw higher up or lower down depending on what model it's above.

* (BROKEN) Switching Computers

Commiting some WIP stuff that completely breaks the branch so that I can switch over to a different computer.

* Needs testing

WIP team based exclusions, needs testing

* Incorporate Sprunks change to use allyTeam rather than just teamid.

Co-authored-by: sprunk <[email protected]>

* Implement in integral_menu_culling.lua

There was a nasty typo - thanks to Shaman for catching that one!

* Removing a few comments

Cleaning up a few things that are no longer needed.

* Sprunk: Make icons show only for specific teams

Co-authored-by: sprunk <[email protected]>

* Allow icons to be removed.

* Styling and make command not interrupt current qeue

Attempt at fixing the syling (?) And also making the command not cancel the current qeue, makes it so that issuing an exclude command from an airplane on an airpad no longer excludes it even when the plane has left the pad. Which I don't think is a bad thing honestly.

Co-authored-by: sprunk <[email protected]>
  • Loading branch information
Sharkgamedev and sprunk authored Nov 10, 2020
1 parent 5d2cd4c commit c3d9a6f
Show file tree
Hide file tree
Showing 10 changed files with 813 additions and 724 deletions.
2 changes: 2 additions & 0 deletions Anims/cursorairpadexclude.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
hotspot topleft
frame cursorairpadexclude_0.png 5
Binary file added Anims/cursorairpadexclude_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions LuaRules/Configs/customcmds.lua
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ local cmds = {
REARM = 33410, -- bomber control
FIND_PAD = 33411, -- bomber control
UNIT_FLOAT_STATE = 33412,
EXCLUDEAIRPAD = 33413,
PRIORITY = 34220,
MISC_PRIORITY = 34221,
RETREAT = 34223,
Expand Down
Loading

0 comments on commit c3d9a6f

Please sign in to comment.