diff --git a/server/channelserver/handlers_register.go b/server/channelserver/handlers_register.go index 301c192b0..efe9dc1b1 100644 --- a/server/channelserver/handlers_register.go +++ b/server/channelserver/handlers_register.go @@ -36,8 +36,9 @@ func handleMsgSysOperateRegister(s *Session, p mhfpacket.MHFPacket) { resp.WriteUint32(*ref) } } else { - resp.WriteUint32(*ref + data*damageMultiplier) - *ref += data * damageMultiplier + data = uint32(float64(data) * damageMultiplier) + resp.WriteUint32(*ref + data) + *ref += data } case 13: fallthrough diff --git a/server/channelserver/sys_channel_server.go b/server/channelserver/sys_channel_server.go index 9bce6e936..309ed1af8 100644 --- a/server/channelserver/sys_channel_server.go +++ b/server/channelserver/sys_channel_server.go @@ -125,19 +125,19 @@ func NewRaviente() *Raviente { return raviente } -func (r *Raviente) GetRaviMultiplier(s *Server) uint32 { +func (r *Raviente) GetRaviMultiplier(s *Server) float64 { raviSema := getRaviSemaphore(s) if raviSema != nil { - var minPlayers uint32 + var minPlayers int if r.register.maxPlayers > 8 { minPlayers = 24 } else { minPlayers = 4 } - if uint32(len(raviSema.clients)) > minPlayers { + if len(raviSema.clients) > minPlayers { return 1 } - return minPlayers / uint32(len(raviSema.clients)) + return float64(minPlayers / len(raviSema.clients)) } return 0 } diff --git a/server/channelserver/sys_language.go b/server/channelserver/sys_language.go index b7bf57b4f..5de05923f 100644 --- a/server/channelserver/sys_language.go +++ b/server/channelserver/sys_language.go @@ -24,7 +24,7 @@ func getLangStrings(s *Server) map[string]string { strings["commandRaviNoCommand"] = "ラヴィコマンドが指定されていません" strings["commandRaviStartSuccess"] = "大討伐を開始します" strings["commandRaviStartError"] = "大討伐は既に開催されています" - strings["commandRaviMultiplier"] = "ラヴィダメージ倍率:x%d" + strings["commandRaviMultiplier"] = "ラヴィダメージ倍率:x%.2f" strings["commandRaviResSuccess"] = "復活支援を実行します" strings["commandRaviResError"] = "復活支援は実行されませんでした" strings["commandRaviSedSuccess"] = "鎮静支援を実行します" @@ -72,7 +72,7 @@ func getLangStrings(s *Server) map[string]string { strings["commandRaviNoCommand"] = "No Raviente command specified!" strings["commandRaviStartSuccess"] = "The Great Slaying will begin in a moment" strings["commandRaviStartError"] = "The Great Slaying has already begun!" - strings["commandRaviMultiplier"] = "Raviente multiplier is currently %dx" + strings["commandRaviMultiplier"] = "Raviente multiplier is currently %.2fx" strings["commandRaviResSuccess"] = "Sending resurrection support!" strings["commandRaviResError"] = "Resurrection support has not been requested!" strings["commandRaviSedSuccess"] = "Sending sedation support if requested!"