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.

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

Slides and Emote Specific Blips (2.11) #162

Open
wants to merge 1 commit 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
1 commit
Select commit
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
30 changes: 19 additions & 11 deletions server/area.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,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 @@ -1201,6 +1203,8 @@ def send_ic(self,
frames_sfx,
additive,
effect,
blipname,
slide,
third_charid,
third_folder,
third_emote,
Expand Down Expand Up @@ -1255,11 +1259,13 @@ 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
blipname, #30
slide, #31
third_charid, # 32
third_folder, # 33
third_emote, # 34
third_offset, # 35
third_flip, # 36
)
self.last_ic_message = args

Expand Down Expand Up @@ -1314,11 +1320,13 @@ 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
blipname, #30
slide, #31
third_charid, # 32
third_folder, # 33
third_emote, # 34
third_offset, # 35
third_flip, # 36
)
if idx == -1:
# Add one statement at the very end.
Expand Down
84 changes: 84 additions & 0 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
if self.validate_net_cmd(
args,
self.ArgType.STR, # msg_type
Expand Down Expand Up @@ -565,6 +567,77 @@ def net_cmd_ms(self, args):
self.client.send_ooc(
"Something went wrong! Please report the issue to the developers.")
return
elif self.validate_net_cmd(
args,
self.ArgType.STR, # 0 # msg_type
self.ArgType.STR_OR_EMPTY, # 1 # pre
self.ArgType.STR, # 2 # folder
self.ArgType.STR_OR_EMPTY, # 3 # anim
self.ArgType.STR_OR_EMPTY, # 4 # text
self.ArgType.STR, # 5 # pos
self.ArgType.STR, # 6 # sfx
self.ArgType.INT, # 7 # emote_mod
self.ArgType.INT, # 8 # cid
self.ArgType.INT, # 9 # sfx_delay
self.ArgType.INT_OR_STR, # 10 # button
self.ArgType.INT, # 11 # evidence
self.ArgType.INT, # 12 # flip
self.ArgType.INT, # 13 # ding
self.ArgType.INT, # 14 # color
self.ArgType.STR_OR_EMPTY, # 15 # showname
self.ArgType.STR, # 16 # charid_pair
self.ArgType.STR, # 17 # offset_pair
self.ArgType.INT, # 18 # nonint_pre
self.ArgType.STR, # 19 # sfx_looping
self.ArgType.INT, # 20 # screenshake
self.ArgType.STR, # 21 # frames_shake
self.ArgType.STR, # 22 # frames_realization
self.ArgType.STR, # 23 # frames_sfx
self.ArgType.INT, # 24 # additive
self.ArgType.STR, # 25 # effect
self.ArgType.STR, # 26 # blipname
self.ArgType.INT, # 27 # slide
):
# 2.11 validation monstrosity. (Woe, pain be upon ye)
(
msg_type,
pre,
folder,
anim,
text,
pos,
sfx,
emote_mod,
cid,
sfx_delay,
button,
evidence,
flip,
ding,
color,
showname,
charid_pair,
offset_pair,
nonint_pre,
sfx_looping,
screenshake,
frames_shake,
frames_realization,
frames_sfx,
additive,
effect,
blipname,
slide,
) = args
try:
pair_args = charid_pair.split("^")
charid_pair = int(pair_args[0])
if len(pair_args) > 1:
pair_order = pair_args[1]
except ValueError:
self.client.send_ooc(
"Something went wrong! Please report the issue to the developers.")
return
else:
return

Expand Down Expand Up @@ -612,6 +685,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 @@ -1125,6 +1199,8 @@ def net_cmd_ms(self, args):
third_emote, # 32
third_offset, # 33
third_flip, # 33
blipname, #34
slide, #35
)
a_list = ", ".join([str(a.id) for a in target_area])
if not (self.client.area in target_area):
Expand Down Expand Up @@ -1167,6 +1243,8 @@ def net_cmd_ms(self, args):
third_emote,
third_offset,
third_flip,
blipname,
slide,
)
self.client.send_ooc(f"Broadcasting to areas {a_list}")
except (AreaError, ValueError):
Expand Down Expand Up @@ -1294,6 +1372,8 @@ def net_cmd_ms(self, args):
third_emote,
third_offset,
third_flip,
blipname,
slide,
)

return
Expand Down Expand Up @@ -1341,6 +1421,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 @@ -1386,6 +1468,8 @@ def net_cmd_ms(self, args):
third_emote,
third_offset,
third_flip,
blipname,
slide,
)

# DRO client support
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",
]
self.command_aliases = {}

Expand Down
Loading