diff --git a/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Domain/Usecases/ParseItemFilterResultUseCaseImpl.swift b/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Domain/Usecases/ParseItemFilterResultUseCaseImpl.swift index c80fe5f7..19ae7fd9 100644 --- a/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Domain/Usecases/ParseItemFilterResultUseCaseImpl.swift +++ b/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Domain/Usecases/ParseItemFilterResultUseCaseImpl.swift @@ -3,19 +3,19 @@ import MLSDictionaryFeatureInterface public final class ParseItemFilterResultUseCaseImpl: ParseItemFilterResultUseCase { private let jobIdMap: [String: Int] = [ - "전사": 100, "마법사": 200, "도적": 400, "궁수": 300 + "전사": 100, "마법사": 200, "도적": 400, "궁수": 300, "해적": 500 ] private let categoryIdMap: [String: Int] = [ "한손검": 7, "한손도끼": 8, "한손둔기": 9, "단검": 10, "완드": 12, "스태프": 13, "두손검": 14, "두손도끼": 15, "두손둔기": 16, "창": 17, - "폴암": 18, "활": 19, "석궁": 20, "아대": 21, "모자": 24, "상의": 25, + "폴암": 18, "활": 19, "석궁": 20, "아대": 21, "너클": 22, "건": 23, "모자": 24, "상의": 25, "하의": 26, "전신갑옷": 27, "신발": 28, "장갑": 29, "방패": 31, "망토": 30, "얼굴장식": 32, "눈장식": 33, "귀고리": 34, "반지": 35, "펜던트": 36, "벨트": 37, "어깨장식": 38, "화살": 81, "표창": 83, "한손검주문서": 50, "한손도끼주문서": 51, "한손둔기주문서": 52, "단검주문서": 53, "완드주문서": 55, "스태프주문서": 56, "두손검주문서": 57, "두손도끼주문서": 58, "두손둔기주문서": 59, "창주문서": 60, "폴암주문서": 61, - "활주문서": 62, "석궁주문서": 63, "아대주문서": 64, "투구주문서": 67, "상의주문서": 68, "하의주문서": 69, "전신갑옷주문서": 70, "신발주문서": 71, "장갑주문서": 72, "망토주문서": 73, "방패주문서": 74, + "활주문서": 62, "석궁주문서": 63, "아대주문서": 64, "너클주문서": 65, "건주문서": 66, "투구주문서": 67, "상의주문서": 68, "하의주문서": 69, "전신갑옷주문서": 70, "신발주문서": 71, "장갑주문서": 72, "망토주문서": 73, "방패주문서": 74, "귀장식주문서": 78, "펫장비주문서": 75, "연성서주문서": 76, "귀환주문서": 77, "마스터리북": 42, "스킬북": 43, "소비": 44, "설치": 45, "이동수단": 46 ] diff --git a/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Presentation/ItemFilterBottomSheet/ItemFilterBottomSheetReactor.swift b/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Presentation/ItemFilterBottomSheet/ItemFilterBottomSheetReactor.swift index 7882922b..34596850 100644 --- a/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Presentation/ItemFilterBottomSheet/ItemFilterBottomSheetReactor.swift +++ b/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Presentation/ItemFilterBottomSheet/ItemFilterBottomSheetReactor.swift @@ -32,13 +32,13 @@ public final class ItemFilterBottomSheetReactor: Reactor { public struct State { var sections: [String] = ["직업/레벨", "무기", "발사체", "방어구", "장신구", "주문서", "기타"] - var jobs: [String] = ["없음", "공용", "마법사", "전사", "궁수", "도적"] - var weapons: [String] = ["한손검", "한손도끼", "한손둔기", "창", "단검", "두손검", "두손도끼", "두손둔기", "폴암", "활", "석궁", "완드", "스태프", "아대"] + var jobs: [String] = ["없음", "공용", "마법사", "전사", "궁수", "도적", "해적"] + var weapons: [String] = ["한손검", "한손도끼", "한손둔기", "창", "단검", "두손검", "두손도끼", "두손둔기", "폴암", "활", "석궁", "완드", "스태프", "아대", "건", "너클"] var projectiles: [String] = ["화살", "표창"] // 불렛은 제거 var armors: [String] = ["모자", "상의", "하의", "장갑", "신발", "방패", "전신갑옷"] // 전신 = 전신갑옷? var accessories: [String] = ["귀고리", "망토", "훈장", "눈장식", "얼굴장식", "팬던트", "벨트", "반지", "어깨장식"] // 귀장식 데이터 안줌 -> 귀장식 = 귀고리, 훈장은 서버에서 데이터 안줌. @Pulse var scrollCategories: [String] = ["무기 주문서", "방어구 주문서", "기타 주문서"] - var originWeaponScrolls: [String] = ["한손검", "한손도끼", "한손둔기", "단검", "완드", "스태프", "두손검", "두손도끼", "두손둔기", "창", "폴암", "활", "석궁", "아대"] + var originWeaponScrolls: [String] = ["한손검", "한손도끼", "한손둔기", "단검", "완드", "스태프", "두손검", "두손도끼", "두손둔기", "창", "폴암", "활", "석궁", "아대", "건", "너클"] var originArmorScrolls: [String] = ["투구", "상의", "하의", "전신갑옷", "신발", "장갑", "망토", "방패", "귀장식"] var originEtcScrolls: [String] = ["펫장비", "연성서", "귀환주문서"] @Pulse var weaponScrolls: [String] = [] diff --git a/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Presentation/ItemFilterBottomSheet/ItemFilterBottomSheetViewController.swift b/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Presentation/ItemFilterBottomSheet/ItemFilterBottomSheetViewController.swift index 7b6a0273..dd5d097d 100644 --- a/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Presentation/ItemFilterBottomSheet/ItemFilterBottomSheetViewController.swift +++ b/MLS/MLSDictionaryFeature/Sources/MLSDictionaryFeature/Presentation/ItemFilterBottomSheet/ItemFilterBottomSheetViewController.swift @@ -445,7 +445,7 @@ extension ItemFilterBottomSheetViewController { switch section { case .level: - selectedItems.append(("레벨", "레벨 \(state.levelRange.low) ~ \(state.levelRange.high)")) + selectedItems.append(("레벨", "레벨 \(state.levelRange.low ?? 0) ~ \(state.levelRange.high ?? 200)")) case .job: selectedItems.append(("직업", state.jobs[indexPath.row])) case .weapons: diff --git a/MLS/MLSDictionaryFeature/Tests/MLSDictionaryFeatureTests/ParseItemFilterResultUseCaseTests.swift b/MLS/MLSDictionaryFeature/Tests/MLSDictionaryFeatureTests/ParseItemFilterResultUseCaseTests.swift index 57beb5fe..8b86c845 100644 --- a/MLS/MLSDictionaryFeature/Tests/MLSDictionaryFeatureTests/ParseItemFilterResultUseCaseTests.swift +++ b/MLS/MLSDictionaryFeature/Tests/MLSDictionaryFeatureTests/ParseItemFilterResultUseCaseTests.swift @@ -91,7 +91,7 @@ struct ParseItemFilterResultUseCaseTests { func test_ignoreInvalidValues() { let result = sut.execute( results: [ - ("직업", "해적"), + ("직업", "해직"), ("무기", "레이저건") ] )