diff --git a/server/channelserver/handlers_diva.go b/server/channelserver/handlers_diva.go index 3bae00d95..ad785ff33 100644 --- a/server/channelserver/handlers_diva.go +++ b/server/channelserver/handlers_diva.go @@ -5,6 +5,7 @@ import ( "encoding/hex" "encoding/json" "erupe-ce/common/stringsupport" + "fmt" "go.uber.org/zap" "golang.org/x/exp/slices" "math/rand" @@ -117,50 +118,6 @@ func handleMsgMhfGetUdInfo(s *Session, p mhfpacket.MHFPacket) { doAckBufSucceed(s, pkt.AckHandle, resp.Data()) } -func getKijuStrings(effectID uint8) (string, string) { - switch effectID { - case 1: - return "暴風の祈珠", "ーあらしまかぜのきじゅー\n暴風とは猛る思い。\n聞く者に勇気を与える。" - case 3: - return "断力の祈珠", "ーだんりきのきじゅー\n断力とは断ち切る思い。\n聴く者に新たな利からを授ける。" - case 4: - return "風韻の祈珠", "ーふういんのきじゅー\n風韻とは歌姫の艶。\n時々で異なる趣を醸し出す。" - case 8: - return "斬刃の祈珠", "ーざんばのきじゅー\n斬刃とはすべてを切り裂く力。\n集めるほどに声の透明感は増す。" - case 9: - return "打明の祈珠", "ーうちあかりのきじゅー\n打明とは熱い力。\n聴く者に活力を与える。" - case 10: - return "弾起の祈珠", "ーたまおこしのきじゅー\n弾起とは悠遠の記憶。\n聴く者に更なる力を授ける。" - case 11: - return "変続の祈珠", "ーへんぞくのきじゅー\n変続とは永久の言葉。\n聴く者に継続力を授ける。" - case 14: - return "万雷の祈珠", "ーばんらいのきじゅー\n万雷とは歌姫に集う民の意識。\n歌姫の声を伝播させる。" - case 15: - return "不動の祈珠", "ーうごかずのきじゅー\n不動とは圧力。聞く者に圧倒する力を与える。" - case 16: - return "鏗鏗の祈珠", "ーこうこうのきじゅー\n鏗鏗とは歌姫の声。\n集めるほどに歌姫の声量は増す。" - case 17: - return "結集の祈珠", "ーけっしゅうのきじゅー\n結集とは確固たる信頼。\n集めるほどに狩人たちの精神力となる。" - case 18: - return "歌護の祈珠", "ーうたまもりのきじゅー\n歌護とは歌姫の護り。\n集めるほどに狩人たちの支えとなる。" - case 19: - return "強撃の祈珠", "ーきょうげきのきじゅー\n強撃とは強い声色。\n聞く者の力を研ぎ澄ます。" - case 20: - return "封火の祈珠", "ーふうかのきじゅー" - case 21: - return "封水の祈珠", "ーふうすいのきじゅー" - case 22: - return "封氷の祈珠", "ーふうひょうのきじゅー" - case 23: - return "封龍の祈珠", "ーふうりゅうのきじゅー" - case 24: - return "封雷の祈珠", "ーふうらいのきじゅー" - case 25: - return "封属の祈珠", "ーふうぞくのきじゅー" - } - return "Unknown", "" -} - func handleMsgMhfGetKijuInfo(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfGetKijuInfo) kijuInfo := []struct { @@ -175,9 +132,8 @@ func handleMsgMhfGetKijuInfo(s *Session, p mhfpacket.MHFPacket) { bf := byteframe.NewByteFrame() bf.WriteUint8(uint8(len(kijuInfo))) for _, kiju := range kijuInfo { - name, description := getKijuStrings(kiju.Effect) - bf.WriteBytes(stringsupport.PaddedString(name, 32, true)) - bf.WriteBytes(stringsupport.PaddedString(description, 512, true)) + bf.WriteBytes(stringsupport.PaddedString(s.server.dict[fmt.Sprintf(`prayerBead%dName`, kiju.Effect)], 32, true)) + bf.WriteBytes(stringsupport.PaddedString(s.server.dict[fmt.Sprintf(`prayerBead%dDescription`, kiju.Effect)], 512, true)) bf.WriteUint8(kiju.Color) bf.WriteUint8(kiju.Effect) } diff --git a/server/channelserver/sys_language.go b/server/channelserver/sys_language.go index b7bf57b4f..a1dc1835c 100644 --- a/server/channelserver/sys_language.go +++ b/server/channelserver/sys_language.go @@ -7,6 +7,45 @@ func getLangStrings(s *Server) map[string]string { strings["language"] = "日本語" strings["cafeReset"] = "%d/%dにリセット" + strings["prayerBead1Name"] = "暴風の祈珠" + strings["prayerBead1Description"] = "ーあらしまかぜのきじゅー\n暴風とは猛る思い。\n聞く者に勇気を与える。" + strings["prayerBead3Name"] = "断力の祈珠" + strings["prayerBead3Description"] = "ーだんりきのきじゅー\n断力とは断ち切る思い。\n聴く者に新たな利からを授ける。" + strings["prayerBead4Name"] = "風韻の祈珠" + strings["prayerBead4Description"] = "ーふういんのきじゅー\n風韻とは歌姫の艶。\n時々で異なる趣を醸し出す。" + strings["prayerBead8Name"] = "斬刃の祈珠" + strings["prayerBead8Description"] = "ーざんばのきじゅー\n斬刃とはすべてを切り裂く力。\n集めるほどに声の透明感は増す。" + strings["prayerBead9Name"] = "打明の祈珠" + strings["prayerBead9Description"] = "ーうちあかりのきじゅー\n打明とは熱い力。\n聴く者に活力を与える。" + strings["prayerBead10Name"] = "弾起の祈珠" + strings["prayerBead10Description"] = "ーたまおこしのきじゅー\n弾起とは悠遠の記憶。\n聴く者に更なる力を授ける。" + strings["prayerBead11Name"] = "変続の祈珠" + strings["prayerBead11Description"] = "ーへんぞくのきじゅー\n変続とは永久の言葉。\n聴く者に継続力を授ける。" + strings["prayerBead14Name"] = "万雷の祈珠" + strings["prayerBead14Description"] = "ーばんらいのきじゅー\n万雷とは歌姫に集う民の意識。\n歌姫の声を伝播させる。" + strings["prayerBead15Name"] = "不動の祈珠" + strings["prayerBead15Description"] = "ーうごかずのきじゅー\n不動とは圧力。聞く者に圧倒する力を与える。" + strings["prayerBead16Name"] = "鏗鏗の祈珠" + strings["prayerBead16Description"] = "ーこうこうのきじゅー\n鏗鏗とは歌姫の声。\n集めるほどに歌姫の声量は増す。" + strings["prayerBead17Name"] = "結集の祈珠" + strings["prayerBead17Description"] = "ーけっしゅうのきじゅー\n結集とは確固たる信頼。\n集めるほどに狩人たちの精神力となる。" + strings["prayerBead18Name"] = "歌護の祈珠" + strings["prayerBead18Description"] = "ーうたまもりのきじゅー\n歌護とは歌姫の護り。\n集めるほどに狩人たちの支えとなる。" + strings["prayerBead19Name"] = "強撃の祈珠" + strings["prayerBead19Description"] = "ーきょうげきのきじゅー\n強撃とは強い声色。\n聞く者の力を研ぎ澄ます。" + strings["prayerBead20Name"] = "封火の祈珠" + strings["prayerBead20Description"] = "ーふうかのきじゅー" + strings["prayerBead21Name"] = "封水の祈珠" + strings["prayerBead21Description"] = "ーふうすいのきじゅー" + strings["prayerBead22Name"] = "封氷の祈珠" + strings["prayerBead22Description"] = "ーふうひょうのきじゅー" + strings["prayerBead23Name"] = "封龍の祈珠" + strings["prayerBead23Description"] = "ーふうりゅうのきじゅー" + strings["prayerBead24Name"] = "封雷の祈珠" + strings["prayerBead24Description"] = "ーふうらいのきじゅー" + strings["prayerBead25Name"] = "封属の祈珠" + strings["prayerBead25Description"] = "ーふうぞくのきじゅー" + strings["commandDisabled"] = "%sのコマンドは無効です" strings["commandReload"] = "リロードします" strings["commandKqfGet"] = "現在のキークエストフラグ：%x" @@ -55,6 +94,45 @@ func getLangStrings(s *Server) map[string]string { strings["language"] = "English" strings["cafeReset"] = "Resets on %d/%d" + strings["prayerBead1Name"] = "Bead of Storms" + strings["prayerBead1Description"] = "ーあらしまかぜのきじゅー\n暴風とは猛る思い。\n聞く者に勇気を与える。" + strings["prayerBead3Name"] = "Bead of Severing" + strings["prayerBead3Description"] = "All damage types can sever tails\nPower to sever, inspire with might.\nEmpower those who hear, in new light." + strings["prayerBead4Name"] = "Bead of Vitality" + strings["prayerBead4Description"] = "Increased red health recovery speed\nDiva's allure, a soothing balm.\nRenews one's vigor, with vitality and calm." + strings["prayerBead8Name"] = "Bead of Slashing" + strings["prayerBead8Description"] = "Damage up for slashing weapons\nWith every slash, its voice rings out.\nGrowing ever sharper, without a doubt." + strings["prayerBead9Name"] = "Bead of Striking" + strings["prayerBead9Description"] = "Damage up for striking weapons\nWith every blow, you strike with force.\nLet the power guide your course." + strings["prayerBead10Name"] = "Bead of Firing" + strings["prayerBead10Description"] = "Damage up for shooting weapons\nA memory of might, empowering those who hear.\nBullet and body, soaring without fear." + strings["prayerBead11Name"] = "Bead of Tenacity" + strings["prayerBead11Description"] = "ーへんぞくのきじゅー\n変続とは永久の言葉。\n聴く者に継続力を授ける。" + strings["prayerBead14Name"] = "Bead of Elements" + strings["prayerBead14Description"] = "ーばんらいのきじゅー\n万雷とは歌姫に集う民の意識。\n歌姫の声を伝播させる。" + strings["prayerBead15Name"] = "Bead of Restraint" + strings["prayerBead15Description"] = "ーうごかずのきじゅー\n不動とは圧力。聞く者に圧倒する力を与える。" + strings["prayerBead16Name"] = "鏗鏗の祈珠" + strings["prayerBead16Description"] = "ーこうこうのきじゅー\n鏗鏗とは歌姫の声。\n集めるほどに歌姫の声量は増す。" + strings["prayerBead17Name"] = "Bead of Unity" + strings["prayerBead17Description"] = "ーけっしゅうのきじゅー\n結集とは確固たる信頼。\n集めるほどに狩人たちの精神力となる。" + strings["prayerBead18Name"] = "Bead of Warding" + strings["prayerBead18Description"] = "ーうたまもりのきじゅー\n歌護とは歌姫の護り。\n集めるほどに狩人たちの支えとなる。" + strings["prayerBead19Name"] = "Bead of Fury" + strings["prayerBead19Description"] = "ーきょうげきのきじゅー\n強撃とは強い声色。\n聞く者の力を研ぎ澄ます。" + strings["prayerBead20Name"] = "Bead of Fireproof" + strings["prayerBead20Description"] = "ーふうかのきじゅー" + strings["prayerBead21Name"] = "Bead of Waterproof" + strings["prayerBead21Description"] = "ーふうすいのきじゅー" + strings["prayerBead22Name"] = "Bead of Iceproof" + strings["prayerBead22Description"] = "ーふうひょうのきじゅー" + strings["prayerBead23Name"] = "Bead of Dragonproof" + strings["prayerBead23Description"] = "ーふうりゅうのきじゅー" + strings["prayerBead24Name"] = "Bead of Thunderproof" + strings["prayerBead24Description"] = "ーふうらいのきじゅー" + strings["prayerBead25Name"] = "Bead of Immunity" + strings["prayerBead25Description"] = "ーふうぞくのきじゅー" + strings["commandDisabled"] = "%s command is disabled" strings["commandReload"] = "Reloading players..." strings["commandKqfGet"] = "KQF: %x"