Release 0.0.1.8.8.7
This commit is contained in:
1 parent
3c8a17aa78
commit
c7beab414c
16283 files changed
+768761
-2
No files matched your search
@@ -0,0 +1,421 @@
|
||||
return unless defined?(WebSocket)
|
||||
|
||||
module WebSocket
|
||||
NET_ANIM_SNAP_DISTANCE = 6
|
||||
NET_ANIM_SPEED_NORMAL = 5
|
||||
NET_ANIM_SPEED_CATCHUP = 6
|
||||
|
||||
@mp_anim_states ||= {}
|
||||
|
||||
class << self
|
||||
alias_method :_mp_anim_v4_old_update, :update unless method_defined?(:_mp_anim_v4_old_update)
|
||||
alias_method :_mp_anim_v4_old_create_remote_player, :create_remote_player unless method_defined?(:_mp_anim_v4_old_create_remote_player)
|
||||
alias_method :_mp_anim_v4_old_remove_remote_player, :remove_remote_player unless method_defined?(:_mp_anim_v4_old_remove_remote_player)
|
||||
alias_method :_mp_anim_v4_old_move_remote_player, :move_remote_player unless method_defined?(:_mp_anim_v4_old_move_remote_player)
|
||||
alias_method :_mp_anim_v4_old_apply_playersync, :apply_playersync unless method_defined?(:_mp_anim_v4_old_apply_playersync)
|
||||
end
|
||||
|
||||
def self.mp_anim_state(id)
|
||||
@mp_anim_states ||= {}
|
||||
@mp_anim_states[id] ||= {
|
||||
:initialized => false,
|
||||
:base_speed => nil,
|
||||
:forced_visual_down => false,
|
||||
:target_x => nil,
|
||||
:target_y => nil
|
||||
}
|
||||
end
|
||||
|
||||
def self.mp_anim_drop_state(id)
|
||||
return unless @mp_anim_states
|
||||
@mp_anim_states.delete(id)
|
||||
end
|
||||
|
||||
def self.mp_anim_remote_player?(obj)
|
||||
return false if obj.nil?
|
||||
begin
|
||||
return !obj.instance_variable_get(:@net_player_id).nil?
|
||||
rescue
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
def self.mp_anim_force_visible(player)
|
||||
begin
|
||||
player.transparent = false
|
||||
rescue
|
||||
begin
|
||||
player.instance_variable_set(:@transparent, false)
|
||||
rescue
|
||||
end
|
||||
end
|
||||
|
||||
begin
|
||||
player.instance_variable_set(:@original_transparent, false)
|
||||
rescue
|
||||
end
|
||||
end
|
||||
|
||||
def self.mp_anim_movement_character_index(movement, fallback=nil)
|
||||
mv = movement.to_s
|
||||
return nil if mv == "" || mv == "normal"
|
||||
|
||||
case mv
|
||||
when "normal_fatigue"
|
||||
2
|
||||
when "normal_overfatigue", "crawl_overfatigue", "crawl_cuffed", "crawl"
|
||||
3
|
||||
when "normal_cuffed", "dash", "dash_fatigue", "dash_cuffed", "dash_overfatigue"
|
||||
4
|
||||
when "sneak", "sneak_cuffed"
|
||||
5
|
||||
when "sneak_overfatigue"
|
||||
3
|
||||
else
|
||||
fallback
|
||||
end
|
||||
end
|
||||
|
||||
def self.mp_anim_movement_opacity(movement, fallback=nil)
|
||||
mv = movement.to_s
|
||||
return 255 if mv == "" || mv == "normal"
|
||||
|
||||
case mv
|
||||
when "sneak", "sneak_overfatigue", "sneak_cuffed"
|
||||
175
|
||||
when "crawl", "crawl_overfatigue", "crawl_cuffed"
|
||||
125
|
||||
else
|
||||
255
|
||||
end
|
||||
end
|
||||
|
||||
def self.mp_anim_apply_remote_movement_visual(player, movement)
|
||||
return if player.nil?
|
||||
mv = movement.to_s
|
||||
return if mv.empty?
|
||||
|
||||
begin
|
||||
player.instance_variable_set(:@net_movement, mv)
|
||||
rescue
|
||||
end
|
||||
|
||||
begin
|
||||
op = mp_anim_movement_opacity(mv, nil)
|
||||
unless op.nil?
|
||||
player.opacity = op.to_i
|
||||
player.instance_variable_set(:@opacity, op.to_i)
|
||||
end
|
||||
rescue
|
||||
end
|
||||
end
|
||||
|
||||
def self.mp_anim_force_direction(player, dir)
|
||||
d = dir.to_i
|
||||
d = 2 unless d == 2 || d == 4 || d == 6 || d == 8
|
||||
|
||||
begin
|
||||
player.direction = d
|
||||
rescue
|
||||
begin
|
||||
player.instance_variable_set(:@direction, d)
|
||||
rescue
|
||||
end
|
||||
end
|
||||
|
||||
begin
|
||||
player.instance_variable_set(:@original_direction, d)
|
||||
rescue
|
||||
end
|
||||
end
|
||||
|
||||
def self.mp_anim_snap(player, st, x, y, d)
|
||||
tx = x.to_i
|
||||
ty = y.to_i
|
||||
|
||||
begin
|
||||
player.moveto(tx, ty)
|
||||
rescue
|
||||
begin
|
||||
player.instance_variable_set(:@x, tx)
|
||||
player.instance_variable_set(:@y, ty)
|
||||
player.instance_variable_set(:@real_x, tx)
|
||||
player.instance_variable_set(:@real_y, ty)
|
||||
rescue
|
||||
end
|
||||
end
|
||||
|
||||
begin
|
||||
if !st[:base_speed].nil? && player.move_speed.to_i != st[:base_speed].to_i
|
||||
player.move_speed = st[:base_speed].to_i
|
||||
end
|
||||
rescue
|
||||
end
|
||||
|
||||
begin
|
||||
player.instance_variable_set(:@stop_count, 0)
|
||||
rescue
|
||||
end
|
||||
|
||||
st[:initialized] = true
|
||||
st[:target_x] = tx
|
||||
st[:target_y] = ty
|
||||
|
||||
mp_anim_force_direction(player, d)
|
||||
mp_anim_force_visible(player)
|
||||
end
|
||||
|
||||
def self.mp_anim_pose_text(cfg)
|
||||
return "" unless cfg.is_a?(Hash)
|
||||
|
||||
pose = nil
|
||||
begin
|
||||
pose = cfg["pose"]
|
||||
pose = cfg[:pose] if pose.nil?
|
||||
rescue
|
||||
pose = nil
|
||||
end
|
||||
|
||||
persona = nil
|
||||
begin
|
||||
persona = cfg["persona"]
|
||||
persona = cfg[:persona] if persona.nil?
|
||||
rescue
|
||||
persona = nil
|
||||
end
|
||||
|
||||
out = ""
|
||||
begin
|
||||
out << pose.to_s.downcase
|
||||
rescue
|
||||
end
|
||||
begin
|
||||
out << " " << persona.to_s.downcase
|
||||
rescue
|
||||
end
|
||||
out
|
||||
end
|
||||
|
||||
def self.mp_anim_down_like_pose?(text)
|
||||
s = text.to_s.downcase
|
||||
return true if s.include?("rest")
|
||||
return true if s.include?("sleep")
|
||||
return true if s.include?("nap")
|
||||
return true if s.include?("lie")
|
||||
return true if s.include?("lay")
|
||||
return true if s.include?("down")
|
||||
return true if s.include?("floor")
|
||||
return true if s.include?("fallen")
|
||||
return true if s.include?("knock")
|
||||
return true if s.include?("hurt")
|
||||
return true if s.include?("injur")
|
||||
return true if s.include?("wound")
|
||||
return true if s.include?("bleed")
|
||||
false
|
||||
end
|
||||
|
||||
def self.mp_anim_force_visual_down(player, st)
|
||||
# ВАЖНО:
|
||||
# Раньше тут подставлялся fake sex_pos=0 для down/rest поз.
|
||||
# Это ломало CHS: не-sex поза внезапно собиралась как sex-sheet (CHSF0),
|
||||
# из-за чего иногда рвало голову/волосы и получался битый спрайт.
|
||||
#
|
||||
# Безопасный вариант: НЕ трогаем sex_pos вообще.
|
||||
# Если хочется визуально "смотреть вниз" — просто форсим направление вниз.
|
||||
begin
|
||||
mp_anim_force_direction(player, 2)
|
||||
rescue
|
||||
end
|
||||
|
||||
begin
|
||||
player.instance_variable_set(:@stop_count, 0)
|
||||
rescue
|
||||
end
|
||||
|
||||
st[:forced_visual_down] = false
|
||||
end
|
||||
|
||||
def self.mp_anim_clear_forced_visual_down(player, st)
|
||||
st[:forced_visual_down] = false
|
||||
end
|
||||
|
||||
def self.create_remote_player(id)
|
||||
_mp_anim_v4_old_create_remote_player(id)
|
||||
return unless @players && @players[id]
|
||||
|
||||
player = @players[id]
|
||||
st = mp_anim_state(id)
|
||||
|
||||
begin
|
||||
st[:base_speed] = player.move_speed.to_i
|
||||
rescue
|
||||
st[:base_speed] = 4
|
||||
end
|
||||
|
||||
st[:initialized] = false
|
||||
st[:forced_visual_down] = false
|
||||
st[:target_x] = nil
|
||||
st[:target_y] = nil
|
||||
|
||||
mp_anim_force_visible(player)
|
||||
end
|
||||
|
||||
def self.remove_remote_player(id)
|
||||
_mp_anim_v4_old_remove_remote_player(id)
|
||||
mp_anim_drop_state(id)
|
||||
end
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
# Вместо moveto: обновляем target tile сразу, а визуал едет родным update_move.
|
||||
# Это убирает телепорт и одновременно не даёт tile-отставания, как у очереди.
|
||||
#--------------------------------------------------------------------------
|
||||
def self.move_remote_player(id, x, y, d, movement=nil)
|
||||
create_remote_player(id) unless (@players && @players[id])
|
||||
return unless @players && @players[id]
|
||||
|
||||
player = @players[id]
|
||||
st = mp_anim_state(id)
|
||||
|
||||
tx = x.to_i
|
||||
ty = y.to_i
|
||||
td = d.to_i
|
||||
td = 2 unless td == 2 || td == 4 || td == 6 || td == 8
|
||||
|
||||
begin
|
||||
st[:base_speed] = player.move_speed.to_i if st[:base_speed].nil?
|
||||
rescue
|
||||
st[:base_speed] = 4 if st[:base_speed].nil?
|
||||
end
|
||||
|
||||
begin
|
||||
mp_anim_apply_remote_movement_visual(player, movement) unless movement.nil? || movement.to_s.empty?
|
||||
rescue
|
||||
end
|
||||
|
||||
mp_anim_force_visible(player)
|
||||
mp_anim_force_direction(player, td)
|
||||
|
||||
if !st[:initialized]
|
||||
mp_anim_snap(player, st, tx, ty, td)
|
||||
return
|
||||
end
|
||||
|
||||
cur_x = nil
|
||||
cur_y = nil
|
||||
cur_real_x = nil
|
||||
cur_real_y = nil
|
||||
|
||||
begin
|
||||
cur_x = player.x.to_f
|
||||
cur_y = player.y.to_f
|
||||
cur_real_x = player.real_x.to_f
|
||||
cur_real_y = player.real_y.to_f
|
||||
rescue
|
||||
cur_x = tx.to_f
|
||||
cur_y = ty.to_f
|
||||
cur_real_x = tx.to_f
|
||||
cur_real_y = ty.to_f
|
||||
end
|
||||
|
||||
tile_dist = (tx - cur_x.to_i).abs + (ty - cur_y.to_i).abs
|
||||
real_dist = (tx.to_f - cur_real_x).abs + (ty.to_f - cur_real_y).abs
|
||||
|
||||
if tile_dist >= NET_ANIM_SNAP_DISTANCE || real_dist >= (NET_ANIM_SNAP_DISTANCE + 1)
|
||||
mp_anim_snap(player, st, tx, ty, td)
|
||||
return
|
||||
end
|
||||
|
||||
# Если наш временный visual-down был включён, а игрок реально пошёл — снимаем его.
|
||||
if cur_x.to_i != tx || cur_y.to_i != ty
|
||||
mp_anim_clear_forced_visual_down(player, st)
|
||||
end
|
||||
|
||||
begin
|
||||
player.instance_variable_set(:@x, tx)
|
||||
player.instance_variable_set(:@y, ty)
|
||||
player.instance_variable_set(:@stop_count, 0)
|
||||
player.instance_variable_set(:@move_succeed, true)
|
||||
rescue
|
||||
begin
|
||||
player.moveto(tx, ty)
|
||||
rescue
|
||||
end
|
||||
end
|
||||
|
||||
begin
|
||||
speed = real_dist >= 2.0 ? NET_ANIM_SPEED_CATCHUP : NET_ANIM_SPEED_NORMAL
|
||||
player.move_speed = speed
|
||||
rescue
|
||||
end
|
||||
|
||||
st[:target_x] = tx
|
||||
st[:target_y] = ty
|
||||
end
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
# Не трогаем character_index и НЕ подставляем fake sex_pos.
|
||||
# Для down/rest-поз без sex_pos допускается только безопасный визуальный
|
||||
# fallback через направление вниз, без переключения CHS в sex-sheet режим.
|
||||
#--------------------------------------------------------------------------
|
||||
def self.apply_playersync(pid, actor_id, level, skills_csv, chs_type, charset_index, chs_name, chs_name_h, stat_pack)
|
||||
_mp_anim_v4_old_apply_playersync(pid, actor_id, level, skills_csv, chs_type, charset_index, chs_name, chs_name_h, stat_pack)
|
||||
|
||||
return unless @players && @players[pid]
|
||||
player = @players[pid]
|
||||
st = mp_anim_state(pid)
|
||||
|
||||
cfg = nil
|
||||
begin
|
||||
cfg = player.instance_variable_get(:@chs_configuration)
|
||||
rescue
|
||||
cfg = nil
|
||||
end
|
||||
return unless cfg.is_a?(Hash)
|
||||
|
||||
sex_pos = -1
|
||||
begin
|
||||
raw = cfg["sex_pos"]
|
||||
raw = cfg["sex_position"] if raw.nil?
|
||||
raw = cfg[:sex_pos] if raw.nil?
|
||||
raw = cfg[:sex_position] if raw.nil?
|
||||
sex_pos = raw.to_i unless raw.nil?
|
||||
rescue
|
||||
sex_pos = -1
|
||||
end
|
||||
|
||||
if sex_pos != -1
|
||||
st[:forced_visual_down] = false
|
||||
return
|
||||
end
|
||||
|
||||
if mp_anim_down_like_pose?(mp_anim_pose_text(cfg))
|
||||
mp_anim_force_visual_down(player, st)
|
||||
else
|
||||
st[:forced_visual_down] = false
|
||||
end
|
||||
end
|
||||
|
||||
def self.mp_anim_tick
|
||||
return unless @connected
|
||||
return unless @players && !@players.empty?
|
||||
|
||||
@players.each do |id, player|
|
||||
next if player.nil?
|
||||
st = mp_anim_state(id)
|
||||
|
||||
begin
|
||||
if !player.moving? && !st[:base_speed].nil? && player.move_speed.to_i != st[:base_speed].to_i
|
||||
player.move_speed = st[:base_speed].to_i
|
||||
end
|
||||
rescue
|
||||
end
|
||||
|
||||
mp_anim_force_visible(player)
|
||||
end
|
||||
end
|
||||
|
||||
def self.update(*args)
|
||||
_mp_anim_v4_old_update(*args)
|
||||
mp_anim_tick
|
||||
end
|
||||
end
|
||||
Reference in new issue
Block a user