Skip to content

Commit

Permalink
edit.
Browse files Browse the repository at this point in the history
  • Loading branch information
ririnto committed Jun 13, 2020
1 parent eb461e6 commit 2f0d43f
Show file tree
Hide file tree
Showing 26 changed files with 228 additions and 232 deletions.
4 changes: 2 additions & 2 deletions module/additional_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def additional_options1(msg, weapon):
for k in range(1, len(row_list) - 3):
data += "☆" * (len(row_list) - 4 - k) + "★" * \
k + " : " + row_list[k + 2] + "\n"
image = "http://" + server_url + "/image/weapon/%s/%s.png" % (
image = server_url + "/image/weapon/%s/%s.png" % (
weapon, row_list[len(row_list) - 1])
if not title:
output = discord.Embed(
Expand All @@ -52,7 +52,7 @@ def additional_options1(msg, weapon):
for k in range(1, len(row_list) - 3):
data += "☆" * (len(row_list) - 4 - k) + \
"★" * k + " : " + row_list[k + 2] + "\n"
image = "http://" + server_url + "/image/weapon/%s/%s.png" % (
image = server_url + "/image/weapon/%s/%s.png" % (
weapon, row_list[len(row_list) - 1])
if title:
output = discord.Embed(
Expand Down
1 change: 1 addition & 0 deletions module/database/additional_options/absolab.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ ESP리미터,앱솔랩스 ESP리미터,241,37,54,73,97,124,1262017
건틀렛리볼버,앱솔랩스 파일 갓,154,24,34,47,62,79,1582017
건,앱솔랩스 포인팅건,150,23,33,46,60,77,1492231
아대,앱솔랩스 리벤지가즈,103,16,23,32,42,53,1472261
튜너,앱솔랩스 튜너,205,31,46,63,82,106,1213017
1 change: 1 addition & 0 deletions module/database/additional_options/arcane_umbra.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ ESP리미터,아케인셰이드 ESP리미터,347,63,92,126,167,214,1262039
너클,아케인셰이드 클로,221,40,59,81,106,136,1482221
건,아케인셰이드 피스톨,216,39,58,79,104,133,1492235
아대,아케인셰이드 가즈,149,27,40,55,72,92,1472265
튜너,아케인셰이드 튜너,295,54,78,108,142,182,1213018
1 change: 1 addition & 0 deletions module/database/additional_options/cygnus.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ ESP리미터,드래곤테일 ESP리미터,161,20,29,39,52,67,1262015
너클,샤크투스 와일드탈론,102,13,18,25,33,42,1482084
건,샤크투스 샤프슈터,100,12,18,25,32,41,1492085
아대,레이븐혼 메탈피스트,69,9,13,17,23,29,1472122
튜너,라이온하트 리스트레인트,137,17,25,34,44,57,1213015
1 change: 1 addition & 0 deletions module/database/additional_options/fafnir.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ ESP리미터,파프니르 ESP리미터,201,25,36,49,65,83,1262016
너클,파프니르 펜리르탈론,128,16,23,31,41,53,1482168
건,파프니르 첼리스카,125,15,22,31,40,52,1492179
아대,파프니르 리스크홀더,86,11,16,21,28,36,1472214
튜너,파프니르 포기브니스,171,21,31,42,55,71,1213016
1 change: 1 addition & 0 deletions module/database/additional_options/genesis.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ ESP리미터,제네시스 ESP리미터,400,72,106,146,192,246,1262051
너클,제네시스 클로,255,46,68,93,123,157,1482232
건,제네시스 피스톨,249,45,66,91,120,154,1492245
아대,제네시스 가즈,172,31,46,63,83,106,1472275
튜너,제네시스 튜너,340,62,90,124,164,210,1213022
1 change: 1 addition & 0 deletions module/database/additional_options/jaihin.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ ESP리미터,쟈이힌 ESP리미터,140,6,13,21,30,41,50,58,1262010
너클,쟈이힌 클로,86,4,8,13,19,26,31,36,1482201
건,쟈이힌 피스톨,86,4,8,13,19,26,31,36,1492211
아대,쟈이힌 가즈,57,3,6,9,13,17,20,24,1472246
튜너,쟈이힌 로열티,116,5,11,17,25,35,41,48,1213012
1 change: 1 addition & 0 deletions module/database/additional_options/necro.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ ESP리미터,네크로 ESP리미터,133,16,24,33,43,55,1262013
건,네크로 이글,82,10,15,20,27,34,1492136
소울슈터,네크로 퍼플드래곤,82,10,15,20,27,34,1222035
아대,네크로 블러디미스트,54,7,10,14,18,23,1472175
튜너,네크로 트러스트,110,14,20,27,36,46,1213011
1 change: 1 addition & 0 deletions module/database/additional_options/royal_von_leon.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ ESP리미터,로얄 반 레온 ESP리미터,144,18,26,35,47,60,1262014
건,로얄 반 레온 피스톨,90,11,16,22,29,37,1492213
소울슈터,로얄 반 레온 화이트웜,90,11,16,22,29,37,1222096
아대,로얄 반 레온 가즈,59,8,11,15,19,25,1472248
튜너,로얄 반 레온 로열티,120,15,22,30,39,50,1213013
1 change: 1 addition & 0 deletions module/database/additional_options/utgard.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ ESP리미터,우트가르드 ESP리미터,153,7,14,23,33,45,54,63,1262011
건틀렛리볼버,우트가르드 흐림두르스,90,4,8,14,20,27,32,37,1582011
건,우트가르드 피스톨,90,4,8,14,20,27,32,37,1492212
아대,우트가르드 가즈,62,3,6,10,14,19,22,26,1472247
튜너,우트가르드 리스트레인트,122,5,11,18,27,36,43,51,1213014
1 change: 1 addition & 0 deletions module/database/additional_options/zakum's_poisonic.csv
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ ESP리미터,자쿰의 ESP리미터,128,12,17,24,31,40,1262012
소울슈터,자쿰의 포이즈닉 소울슈터,80,8,11,15,20,25,1222092
에너지소드,자쿰의 포이즈닉 에너지소드,80,8,11,15,20,25,1242099
아대,자쿰의 포이즈닉 가즈,52,5,7,10,13,16,1472244
튜너,자쿰의 포이즈닉 리가드,107,10,15,20,26,33,1213009
253 changes: 122 additions & 131 deletions module/database/gambling/GoldApple.csv

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions module/database/gambling/LunaCrystalDream.csv
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
아이템명,획득확률,처음,끝
펭펭이,8.40%,0.0000000 ,0.0840000
핑핑이,8.40%,0.0840000 ,0.1680000
퐁퐁이,8.40%,0.1680000 ,0.2520000
세레나,8.40%,0.2520000 ,0.3360000
코스모빗,8.40%,0.3360000 ,0.4200000
아메시스트,8.40%,0.4200000 ,0.5040000
리스,8.40%,0.5040000 ,0.5880000
하스,8.40%,0.5880000 ,0.6720000
닉스,8.40%,0.6720000 ,0.7560000
빅토리,6.80%,0.7560000 ,0.8240000
글로리,6.80%,0.8240000 ,0.8920000
쁘띠 포니,6.80%,0.8920000 ,0.9600000
루나 크리스탈 키,4.00%,0.9600000 ,1.0000000
[루나 드림 펫] 블랑,8.40%,0,0.084
[루나 드림 펫] 프림,8.40%,0.084,0.168
[루나 드림 펫] 눈동,8.40%,0.168,0.252
[루나 드림 펫] 리스,8.40%,0.252,0.336
[루나 드림 펫] 하스,8.40%,0.336,0.42
[루나 드림 펫] 닉스,8.40%,0.42,0.504
[루나 드림 펫] 금금이,8.40%,0.504,0.588
[루나 드림 펫] 은은이,8.40%,0.588,0.672
[루나 드림 펫] 동동이,8.40%,0.672,0.756
[루나 쁘띠 펫] 빅토리,6.80%,0.756,0.824
[루나 쁘띠 펫] 글로리,6.80%,0.824,0.892
[루나 쁘띠 펫] 쁘띠 포니,6.80%,0.892,0.96
[루나 쁘띠 공용 펫장비] 루나 크리스탈 키,4.00%,0.96,1
26 changes: 13 additions & 13 deletions module/database/gambling/LunaCrystalSweet.csv
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
아이템명,획득확률,처음,끝
펭펭이,9.60%,0.0000000 ,0.0960000
핑핑이,9.60%,0.0960000 ,0.1920000
퐁퐁이,9.60%,0.1920000 ,0.2880000
세레나,9.60%,0.2880000 ,0.3840000
코스모빗,9.60%,0.3840000 ,0.4800000
아메시스트,9.60%,0.4800000 ,0.5760000
리스,9.60%,0.5760000 ,0.6720000
하스,9.60%,0.6720000 ,0.7680000
닉스,9.60%,0.7680000 ,0.8640000
빅토리,3.88%,0.8640000 ,0.9028000
글로리,3.88%,0.9028000 ,0.9416000
쁘띠 포니,3.88%,0.9416000 ,0.9804000
루나 크리스탈 키,1.96%,0.9804000 ,1.0000000
[루나 스윗 펫] 블랑,9.60%,0,0.096
[루나 스윗 펫] 프림,9.60%,0.096,0.192
[루나 스윗 펫] 눈동,9.60%,0.192,0.288
[루나 스윗 펫] 리스,9.60%,0.288,0.384
[루나 스윗 펫] 하스,9.60%,0.384,0.48
[루나 스윗 펫] 닉스,9.60%,0.48,0.576
[루나 스윗 펫] 금금이,9.60%,0.576,0.672
[루나 스윗 펫] 은은이,9.60%,0.672,0.768
[루나 스윗 펫] 동동이,9.60%,0.768,0.864
[루나 쁘띠 펫] 빅토리,3.88%,0.864,0.9028
[루나 쁘띠 펫] 글로리,3.88%,0.9028,0.9416
[루나 쁘띠 펫] 쁘띠 포니,3.88%,0.9416,0.9804
[루나 쁘띠 공용 펫장비] 루나 크리스탈 키,1.96%,0.9804,1
12 changes: 6 additions & 6 deletions module/database/gambling/RoyalHairCouponMan.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
아이템명,획득확률,처음,끝
테디 헤어,0.10 ,0.00 ,0.10
라온 헤어,0.15 ,0.10 ,0.25
파이 헤어,0.15 ,0.25 ,0.40
숲의 요정,0.20 ,0.40 ,0.60
아티스트 헤어,0.20 ,0.60 ,0.80
바람바람 헤어,0.20 ,0.80 ,1.00
온유 헤어,10%,0.0000000 ,0.1000000
금비 헤어,15%,0.1000000 ,0.2500000
포도맛 헤어,15%,0.2500000 ,0.4000000
빅 포인트 헤어,20%,0.4000000 ,0.6000000
도토리 헤어,20%,0.6000000 ,0.8000000
팝콘 헤어,20%,0.8000000 ,1.0000000
14 changes: 7 additions & 7 deletions module/database/gambling/RoyalHairCouponWoman.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
아이템명,획득확률,처음,끝,
이슬꽃 헤어,0.10 ,0.00 ,0.10 ,
설탕소녀 헤어,0.15 ,0.10 ,0.25 ,
세란 헤어,0.15 ,0.25 ,0.40 ,
숲의 요정,0.20 ,0.40 ,0.60 ,
도나도나 헤어,0.20 ,0.60 ,0.80 ,
탱글 헤어,0.20 ,0.80 ,1.00 ,
아이템명,획득확률,처음,끝
온화 헤어,10%,0.0000000 ,0.1000000
은비 헤어,15%,0.1000000 ,0.2500000
다슬 헤어,15%,0.2500000 ,0.4000000
슈가봉봉 헤어,20%,0.4000000 ,0.6000000
보헤미안 헤어,20%,0.6000000 ,0.8000000
풀잎여신 헤어,20%,0.8000000 ,1.0000000
12 changes: 6 additions & 6 deletions module/database/gambling/RoyalPlasticSurgeryCouponMan.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
아이템명,획득확률,처음,끝
새초롬 얼굴,0.17 ,0,0.17
순둥이 얼굴,0.17 ,0.17,0.34
깨랑깨랑 얼굴,0.17 ,0.34,0.51
믿음 얼굴,0.17 ,0.51,0.68
미래적인 얼굴,0.17 ,0.68,0.85
안보여요 얼굴,0.17 ,0.85,1.02
알사탕 얼굴,17%,0,0.17
새초롬 얼굴,17%,0.17,0.34
숲의 요정 얼굴,17%,0.34,0.51
헤헤 얼굴,17%,0.51,0.68
자두 얼굴,17%,0.68,0.85
신상발견 얼굴,17%,0.85,1.02
12 changes: 6 additions & 6 deletions module/database/gambling/RoyalPlasticSurgeryCouponWoman.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
아이템명,획득확률,처음,끝
새초롬 얼굴,0.17 ,0,0.17
순둥이 얼굴,0.17 ,0.17,0.34
깨랑깨랑 얼굴,0.17 ,0.34,0.51
믿음 얼굴,0.17 ,0.51,0.68
미래적인 얼굴,0.17 ,0.68,0.85
안보여요 얼굴,0.17 ,0.85,1.02
알사탕 얼굴,17%,0,0.17
새초롬 얼굴,17%,0.17,0.34
숲의 요정 얼굴,17%,0.34,0.51
헤헤 얼굴,17%,0.51,0.68
자두 얼굴,17%,0.68,0.85
신상발견 얼굴,17%,0.85,1.02
50 changes: 25 additions & 25 deletions module/database/gambling/RoyalStyle.csv
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
아이템명,획득확률,처음,끝
[스페셜 라벨] 체스퀸 하트,0.025 ,0.000 ,0.025
[스페셜 라벨] 타임 아웃,0.030 ,0.025 ,0.055
[스페셜 라벨] 체크메이트 슈즈,0.032 ,0.055 ,0.087
[스페셜 라벨] 체크메이트 킹 (남) / 체크메이트 퀸 (여),0.032 ,0.087 ,0.119
[스페셜 라벨] 체크메이트 캡 (남자만 획득가능) / 체크메이트 쥬얼 (여자만 획득가능),0.031 ,0.119 ,0.150
홍옥 눈모자 (남자만 획득가능) / 녹옥 눈모자 (여자만 획득가능),0.040 ,0.150 ,0.190
홍옥 눈수정 (남자만 획득가능) / 녹옥 눈수정 (여자만 획득가능),0.035 ,0.190 ,0.225
눈수정 지팡이,0.015 ,0.225 ,0.240
홍옥 눈구두 (남자만 획득가능) / 녹옥 눈구두 (여자만 획득가능),0.045 ,0.240 ,0.285
눈부심,0.035 ,0.285 ,0.320
아이 추워,0.015 ,0.320 ,0.335
곰순돌 후디 (남자만 획득가능) / 핑순돌 후디 (여자만 획득가능),0.040 ,0.335 ,0.375
곰순돌 패딩 (남자만 획득가능) / 핑순돌 패딩 (여자만 획득가능),0.035 ,0.375 ,0.410
곰순돌 어그 (남자만 획득가능) / 핑순돌 어그 (여자만 획득가능),0.045 ,0.410 ,0.455
눈동구리,0.045 ,0.455 ,0.500
오로라 엔젤,0.050 ,0.500 ,0.550
개인정보 보호막대,0.050 ,0.550 ,0.600
골드 무스탕 코트,0.050 ,0.600 ,0.650
화이트 레인보우 레깅스,0.050 ,0.650 ,0.700
그린 수염 모자,0.050 ,0.700 ,0.750
꼬마 눈사람,0.050 ,0.750 ,0.800
[30일]꿈속의 설경 말풍선반지 교환권,0.050 ,0.800 ,0.850
[30일]꿈속의 설경 명찰반지 교환권,0.050 ,0.850 ,0.900
눈수정 마을,0.050 ,0.900 ,0.950
스카우터,0.050 ,0.950 ,1.000
[스페셜 라벨] 반짝이는 마음,3.10%,0.0000000 ,0.0310000
[스페셜 라벨] 꿈의 유랑 (남) / 꿈의 여행 (여),3.20%,0.0310000 ,0.0630000
[스페셜 라벨] 쏟아지는 햇살,3.00%,0.0630000 ,0.0930000
[스페셜 라벨] 경쾌한 스텝,3.20%,0.0930000 ,0.1250000
[스페셜 라벨] 꿈꾸는 여행가,2.50%,0.1250000 ,0.1500000
포도알 캡,5.00%,0.1500000 ,0.2000000
포도알 반바지 (남) / 포도알 원피스 (여),3.50%,0.2000000 ,0.2350000
포도알 구두,5.00%,0.2350000 ,0.2850000
포도가 좋아,5.00%,0.2850000 ,0.3350000
포도알의 마법,4.50%,0.3350000 ,0.3800000
너무해 얼굴,3.50%,0.3800000 ,0.4150000
치어링 블루,2.00%,0.4150000 ,0.4350000
아가뽀뽀 보넷,5.00%,0.4350000 ,0.4850000
아가뽀뽀 우주복,2.00%,0.4850000 ,0.5050000
아가뽀뽀 장난감,1.50%,0.5050000 ,0.5200000
아가뽀뽀,3.50%,0.5200000 ,0.5550000
짝짝이 반바지,5.00%,0.5550000 ,0.6050000
두근두근 후디,5.00%,0.6050000 ,0.6550000
개구리 빗방울,5.00%,0.6550000 ,0.7050000
아임 프리티 테디,5.00%,0.7050000 ,0.7550000
New 모자 속 토끼,4.50%,0.7550000 ,0.8000000
[30일] 포도알 말풍선반지 교환권,5.00%,0.8000000 ,0.8500000
[30일] 포도알 명찰반지 교환권,5.00%,0.8500000 ,0.9000000
다 내거야 의자,5.00%,0.9000000 ,0.9500000
스카우터,5.00%,0.9500000 ,1.0000000
20 changes: 10 additions & 10 deletions module/database/gambling/WispsWonderBerry.csv
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
아이템명,획득확률,처음,끝
오가닉 원더 쿠키(10개),0.156,0,0.156
고농축 프리미엄 생명의물,0.1444,0.156,0.3004
쿠키베어,0.108,0.3004,0.4084
코기라이스,0.108,0.4084,0.5164
예티 빠방,0.108,0.5164,0.6244
슬라임 빠방,0.138,0.6244,0.7624
핑크빈 빠방,0.138,0.7624,0.9004
동동이,0.0332,0.9004,0.9336
은은이,0.0332,0.9336,0.9668
금금이,0.0332,0.9668,1
[원더 블랙 펫] 초용,3.32%,0,0.0332
[원더 블랙 펫] 뽀용,3.32%,0.0332,0.0664
[원더 블랙 펫] 파용,3.32%,0.0664,0.0996
[멀티펫] 잔다,12.00%,0.0996,0.2196
[멀티펫] 문문어,12.00%,0.2196,0.3396
[달걀 삼남매 세트] 반숙이,12.00%,0.3396,0.4596
[달걀 삼남매 세트] 완숙이,12.00%,0.4596,0.5796
[달걀 삼남매 세트] 맥반이,12.00%,0.5796,0.6996
[소비성 아이템] 고농축 프리미엄 생명의 물,15.02%,0.6996,0.8498
[소비성 아이템] 오가닉 원더 쿠키,15.02%,0.8498,1
3 changes: 3 additions & 0 deletions module/database/linknunion/linkskill.csv
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ HP가 100%인 몬스터 공격 시 데미지 9 / 14 % 증가",skill_80000609
섀도어
듀얼블레이드",시프 커닝,"적에게 상태이상을 적용시키면 10초 동안 데미지 3 / 6 / 9 / 12 / 15 / 18 % 증가
재발동 대기시간 20초",skill_80002770
아델,노블레스,"보스 몬스터 공격 시 데미지 2 / 4 % 증가
같은 맵에 있는 자신을 포함한 파티원 1명 당 데미지 2 / 4 % 증가, 최대 4 / 8 % 까지 증가
파티를 하지 않았을 때는 자신만 파티한 것으로 취급",skill_150020241
1 change: 1 addition & 0 deletions module/database/linknunion/union.csv
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@
아크,STR 증가 ( 10 / 20 / 40 / 80 / 100)
패스파인더,DEX 증가 ( 10 / 20 / 40 / 80 / 100)
호영,LUK 증가 ( 10 / 20 / 40 / 80 / 100)
아델,STR 증가 ( 10 / 20 / 40 / 80 / 100)
2 changes: 1 addition & 1 deletion module/hidden.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
def server_url():
server_url = "ec2-52-79-237-159.ap-northeast-2.compute.amazonaws.com"
server_url = "https://ririnto.github.io"
return server_url
4 changes: 2 additions & 2 deletions module/information.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def achievement(msg, data, i): # 업적
description='%s\n%s\n%s\n%s' % (result[0], result[1], result[2], result[3]),
color=0x0000ff)
output.set_thumbnail(
url="http://" + server_url + "/image/achievement/%s.png" % rank)
url=server_url + "/image/achievement/%s.png" % rank)
output.set_footer(text="https://maple.gg/u/%s" % msg[1])

return output,
Expand Down Expand Up @@ -79,7 +79,7 @@ def union(msg, data, i): # 유니온
result[1], result[0], format(int(result[2]), ','), result[3], num),
color=0x0000ff)
output.set_thumbnail(
url="http://" + server_url + "/image/union/%s/%s.png" % (rank1, rank2))
url=server_url + "/image/union/%s/%s.png" % (rank1, rank2))
output.set_footer(text="https://maple.gg/u/%s" % msg[1])

return output,
Expand Down
2 changes: 1 addition & 1 deletion module/linknunion.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def linknunion1(msg):
if name.replace(" ", "") in row_list[0].replace(" ", ""):
subtitle = row_list[1]
value2 = row_list[2]
image = "http://" + server_url + "/image/linkskill/%s.png" % \
image = server_url + "/image/linkskill/%s.png" % \
row_list[3]

with open(unionfile, newline='', encoding='UTF-8') as database:
Expand Down
9 changes: 0 additions & 9 deletions module/timer.py

This file was deleted.

0 comments on commit 2f0d43f

Please sign in to comment.