Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds drawing to tacmaps #4475

Merged
merged 204 commits into from Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
204 commits
Select commit Hold shift + click to select a range
98fd3a2
added drawing functionality to tactical maps
May 19, 2023
b5b8683
removed redundant check
May 19, 2023
f458c8f
linter
May 19, 2023
eaeca24
more linter
May 19, 2023
be6d103
l-i-n-t-e-r
May 19, 2023
2a18885
prettier format
May 19, 2023
8cdfbeb
Merge branch 'master' into tacmap-refactor
Jun 28, 2023
c102fdc
progress
Jun 28, 2023
07d60ca
progress
Jun 30, 2023
a4cc32f
spaghet
Jun 30, 2023
a2de250
guh
Jun 30, 2023
9dd32dc
hacky, fix later.
Jun 30, 2023
8ed8d6d
fix
Jun 30, 2023
87d1c5b
Merge branch 'master' into tacmap-refactor
Jun 30, 2023
28e9a67
flaticon
Jul 1, 2023
108acb6
Merge branch 'tacmap-refactor' of github.com:Cthulhu80/cmss13 into ta…
Jul 1, 2023
03951dc
more more
Jul 1, 2023
6d6fe45
fix
Jul 1, 2023
efeabb8
bug fix
Jul 1, 2023
13037ba
fix
Jul 1, 2023
5ef3526
prettier
Jul 2, 2023
3d22bbd
fix
Jul 2, 2023
362df62
LINTER
Jul 2, 2023
d87da9e
fix
Jul 2, 2023
cf1cc1c
...
Jul 2, 2023
bdfadb9
fix
Jul 2, 2023
e21b083
Merge branch 'master' into tacmap-refactor
Jul 2, 2023
4cf8abf
typo
Jul 3, 2023
5d8784f
var refactor
Jul 3, 2023
3781a37
less shit code
Jul 4, 2023
22dbf83
fix
Jul 4, 2023
9757437
too much python lol
Jul 4, 2023
396ce26
fox
Jul 4, 2023
13151cb
fix
Jul 4, 2023
dcd697c
fix
Jul 17, 2023
be1cef3
hacky svg implementation
Jul 17, 2023
f923e09
fix
Jul 17, 2023
945df1c
fix
Jul 17, 2023
8c59c07
Merge branch 'tacmap-refactor' of github.com:Cthulhu80/cmss13 into ta…
Jul 17, 2023
97c7616
fuck yeah
Jul 17, 2023
4b27583
svg
Jul 17, 2023
18f1080
prettier
Jul 18, 2023
f54cb6e
Merge branch 'master' into tacmap-refactor
Jul 20, 2023
543667c
Merge branch 'master' of github.com:Cthulhu80/cmss13 into tacmap-refa…
Sep 18, 2023
5507258
tacmap ref
Sep 22, 2023
379a91c
Merge branch 'master' into tac-refactor
Sep 22, 2023
1d3ec40
fix
Sep 22, 2023
6855036
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Sep 22, 2023
d6ab427
general improvements
Sep 23, 2023
645b766
...
Sep 23, 2023
90b1afa
Merge branch 'master' into tac-refactor
Sep 23, 2023
5c75609
action button
Sep 23, 2023
a535920
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Sep 23, 2023
f0f4e89
Merge branch 'master' into tac-refactor
Sep 23, 2023
371a673
...
Sep 23, 2023
79c97e1
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Sep 23, 2023
e5a53d0
Merge branch 'master' into tac-refactor
Sep 23, 2023
3b8f2e7
...
Sep 23, 2023
6721bf1
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Sep 23, 2023
ace9fda
...
Sep 23, 2023
1f71369
...
Sep 23, 2023
86eef8a
...
Sep 23, 2023
2c6b294
...
Sep 23, 2023
d23a6ad
copy pasta
Sep 23, 2023
5dbff93
...
Sep 23, 2023
3e9b000
Merge branch 'master' into tac-refactor
Sep 23, 2023
7bd02a9
general improvements
Sep 24, 2023
b7f70f6
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Sep 24, 2023
c63bce4
Merge branch 'master' into tac-refactor
Sep 24, 2023
b00c407
...
Sep 24, 2023
677cfac
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Sep 24, 2023
1385d3d
...
Sep 25, 2023
93108a7
...
Sep 25, 2023
ae8151e
...
Sep 25, 2023
3be6e25
...
Sep 25, 2023
b4b2294
...
Sep 25, 2023
48616ae
patch
Sep 25, 2023
b52ef71
...
Sep 26, 2023
46957f8
...
Sep 26, 2023
fb1511a
progress
Sep 26, 2023
a8487fa
...
Sep 26, 2023
c75b1e5
tacmap
Sep 26, 2023
68c2d98
Merge branch 'master' into tac-refactor
Sep 26, 2023
60c6bac
...
Sep 26, 2023
68a5ce1
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Sep 26, 2023
d9ebaa7
...
Sep 26, 2023
91271b9
...
Sep 26, 2023
1013ad8
...
Sep 26, 2023
9553df4
...
Sep 26, 2023
7f04a69
Merge branch 'master' into tac-refactor
Sep 27, 2023
9753e3b
Merge branch 'master' of github.com:Cthulhu80/cmss13 into tac-refactor
Sep 27, 2023
37a4b6d
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Sep 27, 2023
2329406
fixed visor
Sep 27, 2023
79d20d2
such immense suffering.
Sep 27, 2023
7319fa6
...
Sep 27, 2023
d896e40
Merge branch 'master' into tac-refactor
Sep 27, 2023
47241c9
...
Sep 27, 2023
aeb2b87
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Sep 27, 2023
62865c5
...
Sep 27, 2023
63e4a82
refactor
Sep 28, 2023
29420bf
...
Sep 28, 2023
d79fc0a
...
Sep 28, 2023
7fbad62
changes
Sep 28, 2023
15abb6d
...
Sep 28, 2023
072377d
tacmap announcement refactor
Sep 29, 2023
2c63acc
...
Sep 29, 2023
53ef9b7
Merge branch 'master' into tac-refactor
Sep 29, 2023
2d178ca
...
Sep 29, 2023
4835d0b
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Sep 29, 2023
5469348
...
Sep 29, 2023
849f8fc
...
Sep 29, 2023
6c72375
...
Sep 29, 2023
0f85e1c
...
Sep 29, 2023
dc1091a
...
Sep 29, 2023
6e0f7b2
...
Sep 29, 2023
5ada289
...
Sep 29, 2023
d3c811d
...
Sep 29, 2023
ab197b5
...
Sep 29, 2023
424b23d
...
Sep 29, 2023
a747b62
...
Sep 29, 2023
55fbb82
...
Sep 29, 2023
bb7726e
...
Sep 29, 2023
355e0f3
Merge branch 'master' into tac-refactor
Sep 29, 2023
3ac897d
...
Sep 29, 2023
6d1f6d3
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Sep 29, 2023
1321b62
...
Sep 29, 2023
80fbcaf
...
Sep 29, 2023
4d72293
...
Sep 30, 2023
c802b38
Merge branch 'master' of github.com:Cthulhu80/cmss13 into tac-refactor
Oct 2, 2023
5618b2d
...
Oct 2, 2023
937e7c8
...
Oct 2, 2023
689d2a4
bug fix
Oct 2, 2023
3c5d5b4
bug fix
Oct 2, 2023
293c147
...
Oct 2, 2023
03765e3
bug fix
Oct 2, 2023
8938278
...
Oct 2, 2023
abbff0d
...
Oct 3, 2023
fbe471b
...
Oct 3, 2023
3c9bad6
...
Oct 3, 2023
66ffbc9
Merge branch 'master' into tac-refactor
Oct 3, 2023
e1ae272
Merge branch 'master' into tac-refactor
Oct 4, 2023
0e4cf9b
...
Oct 4, 2023
ba3da54
...
Oct 4, 2023
476620d
Merge branch 'master' into tac-refactor
Oct 4, 2023
2035db7
Update tgui/packages/tgui/interfaces/CanvasLayer.js
Oct 5, 2023
0d02230
Update code/controllers/subsystem/minimap.dm
Oct 5, 2023
e20cebc
Update code/controllers/subsystem/minimap.dm
Oct 5, 2023
491fc7d
....
Oct 6, 2023
b7e1096
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Oct 6, 2023
6e194e4
Merge branch 'master' into tac-refactor
Oct 6, 2023
b8f48d9
...
Oct 9, 2023
5dd3940
...
Oct 9, 2023
af44982
...
Oct 9, 2023
90b6351
...
Oct 9, 2023
45fc8ec
Merge branch 'master' into tac-refactor
Oct 9, 2023
b95cb40
guh
Oct 9, 2023
ba59cd4
Merge branch 'tac-refactor' of github.com:Cthulhu80/cmss13 into tac-r…
Oct 9, 2023
7af8d72
bug fix
Oct 9, 2023
1f93b3f
Merge branch 'master' into tac-refactor
Oct 10, 2023
c4e6028
Merge branch 'master' into tac-refactor
Oct 10, 2023
07c80b3
Merge branch 'master' into tac-refactor
Oct 10, 2023
22dd87e
Refactoring, polish, and ghost verbs
Drulikar Oct 13, 2023
911ded7
Remove a testing var
Drulikar Oct 13, 2023
5fe3f35
bug fix
Oct 13, 2023
ae229e4
ui bug fix
Oct 13, 2023
cf29618
ce
Oct 13, 2023
6ab67cd
bug fix
Oct 13, 2023
c55d307
bug fix
Oct 13, 2023
33a747a
bug fix
Oct 13, 2023
c45d786
Moar polish: I wish I didn't have to be so specific about pixel heigh…
Drulikar Oct 14, 2023
64bb5ad
Resizeable old canvas view
Drulikar Oct 14, 2023
f37968a
mouseUp will now reset the update canvas button (I could draw, update…
Drulikar Oct 14, 2023
f1844f0
Possible fix for 0x2f78 error: suspected issue with addEventListeners…
Drulikar Oct 14, 2023
f6c1eae
Hives now each have their own live tacmaps (only normal can draw)
Drulikar Oct 14, 2023
0a651ba
Simply frequency of drawn nodes and warn when approaching an estimate…
Drulikar Oct 14, 2023
38aae86
Ghost alerts!
Drulikar Oct 14, 2023
1061a0b
Add ghost alert sfx
Drulikar Oct 14, 2023
1242b40
Return to automatic map flattening on initial load but now only after…
Drulikar Oct 14, 2023
0a3b2d8
...
Oct 14, 2023
2924cab
typo
Oct 14, 2023
de70ffb
Cleanup
Drulikar Oct 15, 2023
c9a1c45
Admin panel and some refactoring to accommodate the new recorded data
Drulikar Oct 16, 2023
d47dd5d
Fix edgecase should a wrong faction somehow manage to get to drawing …
Drulikar Oct 16, 2023
d91f171
Fix timer for delayed tacmap flattening
Drulikar Oct 16, 2023
5eba2d3
Drawing subtypes to give legacy usage to other faction tacmaps like p…
Drulikar Oct 16, 2023
079ec46
Restore tactical map button to overwatch consoles (only drawing capab…
Drulikar Oct 16, 2023
c2fbee7
Check faction instead where possible to determine if it should be dra…
Drulikar Oct 16, 2023
8a6df56
Improve cooldown bar visibility
Drulikar Oct 16, 2023
7aa9c98
Cleanup extra tacmap qdels
Drulikar Oct 16, 2023
69544f0
Ensure ghosts receive flattened maps (somehow this seemed to be worki…
Drulikar Oct 16, 2023
644a988
Tweak minimum distance for a path
Drulikar Oct 16, 2023
942ae03
Fix deleting xeno tacmaps
Drulikar Oct 16, 2023
57fce31
Latejoin asset sending for tacmaps
Drulikar Oct 16, 2023
cdca403
Flattened
Drulikar Oct 24, 2023
9d55769
Global var instead
Drulikar Oct 24, 2023
e9bb91c
Global procs
Drulikar Oct 24, 2023
dea773f
Wording
Drulikar Oct 24, 2023
790358a
Update comment
Drulikar Oct 24, 2023
84ae52d
Remove unneeded fragment
Drulikar Nov 6, 2023
1a02644
Refactor ternary
Drulikar Nov 6, 2023
b2c1041
Merge branch 'master' into tac-refactor
Drulikar Nov 7, 2023
ed05083
Define -1
Drulikar Nov 11, 2023
43b4ecc
Merge remote-tracking branch 'upstream/master' into tac-refactor
Drulikar Nov 11, 2023
3067be6
Resend maps every ui open
Drulikar Nov 12, 2023
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
2 changes: 2 additions & 0 deletions code/__DEFINES/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@
#define NOTIFY_ATTACK "attack"
#define NOTIFY_ORBIT "orbit"
#define NOTIFY_JOIN_XENO "join_xeno"
#define NOTIFY_XENO_TACMAP "xeno_tacmap"
#define NOTIFY_USCM_TACMAP "uscm_tacmap"
18 changes: 11 additions & 7 deletions code/__DEFINES/minimap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,17 @@
#define MINIMAP_FLAG_UPP (1<<3)
#define MINIMAP_FLAG_CLF (1<<4)
#define MINIMAP_FLAG_YAUTJA (1<<5)
#define MINIMAP_FLAG_ALL (1<<6) - 1
#define MINIMAP_FLAG_XENO_CORRUPTED (1<<6)
#define MINIMAP_FLAG_XENO_ALPHA (1<<7)
#define MINIMAP_FLAG_XENO_BRAVO (1<<8)
#define MINIMAP_FLAG_XENO_CHARLIE (1<<9)
#define MINIMAP_FLAG_XENO_DELTA (1<<10)
#define MINIMAP_FLAG_XENO_FERAL (1<<11)
#define MINIMAP_FLAG_XENO_TAMED (1<<12)
#define MINIMAP_FLAG_XENO_MUTATED (1<<13)
#define MINIMAP_FLAG_XENO_FORSAKEN (1<<14)
#define MINIMAP_FLAG_XENO_RENEGADE (1<<15)
#define MINIMAP_FLAG_ALL (1<<16) - 1

///Converts the overworld x and y to minimap x and y values
#define MINIMAP_SCALE 2
Expand Down Expand Up @@ -77,9 +87,3 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))

#define TACMAP_BASE_OCCLUDED "Occluded"
#define TACMAP_BASE_OPEN "Open"

#define TACMAP_DEFAULT "Default"
#define TACMAP_XENO "Xeno"
#define TACMAP_YAUTJA "Yautja"
#define TACMAP_FACTION "Faction"

7 changes: 6 additions & 1 deletion code/__HELPERS/icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -682,8 +682,9 @@ world
* * moving - whether or not to use a moving state for the given icon
* * sourceonly - if TRUE, only generate the asset and send back the asset url, instead of tags that display the icon to players
* * extra_clases - string of extra css classes to use when returning the icon string
* * keyonly - if TRUE, only returns the asset key to use get_asset_url manually. Overrides sourceonly.
*/
/proc/icon2html(atom/thing, client/target, icon_state, dir = SOUTH, frame = 1, moving = FALSE, sourceonly = FALSE, extra_classes = null)
/proc/icon2html(atom/thing, client/target, icon_state, dir = SOUTH, frame = 1, moving = FALSE, sourceonly = FALSE, extra_classes = null, keyonly = FALSE)
if (!thing)
return

Expand Down Expand Up @@ -714,6 +715,8 @@ world
SSassets.transport.register_asset(name, thing)
for (var/thing2 in targets)
SSassets.transport.send_assets(thing2, name)
if(keyonly)
return name
if(sourceonly)
return SSassets.transport.get_asset_url(name)
return "<img class='[extra_classes] icon icon-misc' src='[SSassets.transport.get_asset_url(name)]'>"
Expand Down Expand Up @@ -756,6 +759,8 @@ world
SSassets.transport.register_asset(key, rsc_ref, file_hash, icon_path)
for (var/client_target in targets)
SSassets.transport.send_assets(client_target, key)
if(keyonly)
return key
if(sourceonly)
return SSassets.transport.get_asset_url(key)
return "<img class='[extra_classes] icon icon-[icon_state]' src='[SSassets.transport.get_asset_url(key)]'>"
Expand Down
8 changes: 8 additions & 0 deletions code/_globalvars/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ GLOBAL_LIST_EMPTY(CMBFaxes)
GLOBAL_LIST_EMPTY(GeneralFaxes) //Inter-machine faxes
GLOBAL_LIST_EMPTY(fax_contents) //List of fax contents to maintain it even if source paper is deleted

//datum containing a reference to the flattend map png url, the actual png is stored in the user's cache.
GLOBAL_LIST_EMPTY(uscm_flat_tacmap_data)
GLOBAL_LIST_EMPTY(xeno_flat_tacmap_data)

//datum containing the svg overlay coords in array format.
GLOBAL_LIST_EMPTY(uscm_svg_tacmap_data)
GLOBAL_LIST_EMPTY(xeno_svg_tacmap_data)

GLOBAL_LIST_EMPTY(failed_fultons) //A list of fultoned items which weren't collected and fell back down
GLOBAL_LIST_EMPTY(larva_burst_by_hive)

Expand Down
16 changes: 16 additions & 0 deletions code/_globalvars/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,22 @@ GLOBAL_LIST_INIT(pill_icon_mappings, map_pill_icons())
/// In-round override to default OOC color
GLOBAL_VAR(ooc_color_override)

// tacmap cooldown for xenos and marines
GLOBAL_VAR_INIT(uscm_canvas_cooldown, 0)
GLOBAL_VAR_INIT(xeno_canvas_cooldown, 0)

// getFlatIcon cooldown for xenos and marines
GLOBAL_VAR_INIT(uscm_flatten_map_icon_cooldown, 0)
GLOBAL_VAR_INIT(xeno_flatten_map_icon_cooldown, 0)

// latest unannounced flat tacmap for xenos and marines
GLOBAL_VAR(uscm_unannounced_map)
GLOBAL_VAR(xeno_unannounced_map)

//global tacmaps for action button access
GLOBAL_DATUM_INIT(uscm_tacmap_status, /datum/tacmap/drawing/status_tab_view, new)
GLOBAL_DATUM_INIT(xeno_tacmap_status, /datum/tacmap/drawing/status_tab_view/xeno, new)

/// List of roles that can be setup for each gamemode
GLOBAL_LIST_INIT(gamemode_roles, list())

Expand Down
Loading