Skip to content

Slides and Emote Specific Blips (2.11) #162

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.

Sign up for GitHub

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

Open
yemta wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Slides and Emote Specific Blips (2.11) #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e87416
Slides and Emote-Blips (2.11)
yemta Aug 4, 2024
bfb00f0
Merge branch 'master' into Base-KFO-Server
yemta Dec 31, 2024
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
34 changes: 21 additions & 13 deletions server/area.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,9 @@ def send_ic(self,
frames_realization="",
frames_sfx="",
additive=0,
effect="",
effect="",
blipname="",
slide=0,
targets=None,
third_charid=-1,
third_folder="",
Expand Down Expand Up @@ -1213,6 +1215,8 @@ def send_ic(self,
frames_sfx,
additive,
effect,
blipname,
slide,
third_charid,
third_folder,
third_emote,
Expand Down Expand Up @@ -1268,12 +1272,14 @@ def send_ic(self,
frames_sfx, # 27
additive, # 28
effect, # 29
third_charid, # 30
third_folder, # 31
third_emote, # 32
third_offset, # 33
third_flip, # 34
video, #35
blipname, #30
slide, #31
third_charid, # 32
third_folder, # 33
third_emote, # 34
third_offset, # 35
third_flip, # 36
video, #37
)
self.last_ic_message = args

Expand Down Expand Up @@ -1328,12 +1334,14 @@ def send_ic(self,
frames_sfx, # 27
additive, # 28
effect, # 29
third_charid, # 30
third_folder, # 31
third_emote, # 32
third_offset, # 33
third_flip, # 34
video, # 35
blipname, #30
slide, #31
third_charid, # 32
third_folder, # 33
third_emote, # 34
third_offset, # 35
third_flip, # 36
video, # 37
)
if idx == -1:
# Add one statement at the very end.
Expand Down
25 changes: 23 additions & 2 deletions server/network/aoprotocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,8 @@ def net_cmd_ms(self, args):
effect = ""
pair_order = 0
third_charid = -1
blipname = ""
slide = 0
video = ""
if self.validate_net_cmd(
args,
Expand Down Expand Up @@ -595,6 +597,8 @@ def net_cmd_ms(self, args):
self.ArgType.INT, # 24 # additive
self.ArgType.STR, # 25 # effect
self.ArgType.INT, # 26 # third_charid
self.ArgType.STR, # 27 # blipname
self.ArgType.INT, # 28 # slide
):
# AO Golden validation monstrosity
(
Expand Down Expand Up @@ -625,6 +629,8 @@ def net_cmd_ms(self, args):
additive,
effect,
third_charid,
blipname,
slide,
) = args
try:
pair_args = charid_pair.split("^")
Expand Down Expand Up @@ -664,7 +670,9 @@ def net_cmd_ms(self, args):
self.ArgType.INT, # 24 # additive
self.ArgType.STR, # 25 # effect
self.ArgType.INT, # 26 # third_charid
self.ArgType.STR_OR_EMPTY, # 27 # video
self.ArgType.STR, # 27 # blipname
self.ArgType.INT, # 28 # slide
self.ArgType.STR_OR_EMPTY, # 29 # video
Comment on lines +673 to +675
Copy link
Copy Markdown
Owner

@Crystalwarrior Crystalwarrior Apr 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will actually break validation cuz Video HAS to be on position 27 :(
The validation monstrosity has caught up with us making this a difficult PR to merge

):
# KFO Client validation monstrosity
(
Expand Down Expand Up @@ -695,6 +703,8 @@ def net_cmd_ms(self, args):
additive,
effect,
third_charid,
blipname,
slide,
video,
) = args
try:
Expand Down Expand Up @@ -754,6 +764,7 @@ def net_cmd_ms(self, args):
frames_realization = derelative(frames_realization)
frames_sfx = derelative(frames_sfx)
effect = derelative(effect)
blipname = derelative(blipname)

if not self.client.is_mod and not (self.client in self.client.area.owners):
if not self.client.area.blankposting_allowed:
Expand Down Expand Up @@ -1285,7 +1296,9 @@ def net_cmd_ms(self, args):
third_emote, # 32
third_offset, # 33
third_flip, # 33
video, # 34
blipname, #34
slide, #35
video, # 36
)
a_list = ", ".join([str(a.id) for a in target_area])
if not (self.client.area in target_area):
Expand Down Expand Up @@ -1328,6 +1341,8 @@ def net_cmd_ms(self, args):
third_emote,
third_offset,
third_flip,
blipname,
slide,
video,
)
self.client.send_ooc(f"Broadcasting to areas {a_list}")
Expand Down Expand Up @@ -1456,6 +1471,8 @@ def net_cmd_ms(self, args):
third_emote,
third_offset,
third_flip,
blipname,
slide,
video,
)

Expand Down Expand Up @@ -1504,6 +1521,8 @@ def net_cmd_ms(self, args):
frames_sfx=frames_sfx,
additive=additive,
effect=effect,
blipname=blipname,
slide=slide,
targets=whisper_clients,
third_charid=third_charid,
third_folder=third_folder,
Expand Down Expand Up @@ -1550,6 +1569,8 @@ def net_cmd_ms(self, args):
third_emote,
third_offset,
third_flip,
blipname,
slide,
video,
)

Expand Down
1 change: 1 addition & 0 deletions server/tsuserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def __init__(self):
"effects",
"expanded_desk_mods",
"y_offset",
"custom_blips",
"triplex",
"typing_timer",
"video_support",
Expand Down