Initial v1.8.0 Support (#452)

No savefile changes apparently, just adding in new items & handling for them.
Probably didn't need to duplicate the Main/Personal offset classes, but whatever.
This commit is contained in:
Kurt
2021-02-24 18:44:11 -08:00
committed by GitHub
parent 72b6944a82
commit 9eda5f2c10
47 changed files with 3072 additions and 2291 deletions

View File

@@ -7,6 +7,8 @@ public sealed class FileHashInfo
{
private readonly IReadOnlyDictionary<uint, FileHashDetails> List;
public FileHashInfo(FileHashInfo dupe) : this(dupe.List.Values) { }
public FileHashInfo(IEnumerable<FileHashDetails> hashSets)
{
var list = new Dictionary<uint, FileHashDetails>();

View File

@@ -434,5 +434,17 @@ public static class FileHashRevision
});
#endregion
#region REVISION 1.8.0 // Same as 1.7.0
internal const int REV_180_MAIN = REV_170_MAIN;
internal const int REV_180_PERSONAL = REV_170_PERSONAL;
internal const int REV_180_POSTBOX = REV_170_POSTBOX;
internal const int REV_180_PHOTO = REV_120_PHOTO;
internal const int REV_180_PROFILE = REV_110_PROFILE;
public static readonly FileHashInfo REV_180 = new(REV_170);
#endregion
}
}

View File

@@ -3402,6 +3402,14 @@
13819_1 Frühlingserwachen
13820_0 Herbstlaune
13820_1 Frühlingserwachen
13829_0 Grün
13829_1 Rot
13831_0 Rot
13831_1 Blau
13831_2 Grün
13832_0 Gelb
13832_1 Rosa
13832_2 Grün
13930_0 Bunt
13930_1 Süß
13930_2 Cool

View File

@@ -332,5 +332,8 @@
13818 Design
13819 Design
13820 Design
13829 Variante
13831 Farbe
13832 Farbe
13930 Design
14029 Variante

File diff suppressed because it is too large Load Diff

View File

@@ -3402,6 +3402,14 @@
13819_1 Spring blooming
13820_0 Fall harvest
13820_1 Spring blooming
13829_0 Green
13829_1 Red
13831_0 Red
13831_1 Blue
13831_2 Green
13832_0 Yellow
13832_1 Pink
13832_2 Green
13930_0 Colorful
13930_1 Cute
13930_2 Cool

View File

@@ -332,5 +332,8 @@
13818 Design
13819 Design
13820 Design
13829 Variation
13831 Color
13832 Color
13930 Design
14029 Variation

View File

@@ -865,7 +865,7 @@ billiard table
bingo wheel
birdcage
blossom lantern
book stands
@@ -986,7 +986,7 @@ go board
harp
hinaningyo
@@ -7545,7 +7545,7 @@ simple small black mat
festive rug
spooky rug
Bunny Day rug
shamrock rug
school jacket (Berry red)
school jacket (Green)
school jacket (White)
@@ -7728,7 +7728,7 @@ yodel sweater (Off-white)
coin
Bell coin
Bell bag
bivalve
spiral shell
@@ -13544,25 +13544,25 @@ Turkey Day rug
2021 celebratory arch
Mario hat (Red)
Luigi hat (Green)
Wario hat (Yellow)
Mario outfit (Blue)
Luigi outfit (Navy blue)
Wario outfit (Purple)
Mario 'stache (Black)
Luigi 'stache (Black)
Wario 'stache (Black)
Mario shoes (Brown)
Wario shoes (Green)
Princess Peach crown (Gold)
Princess Peach dress (Pink)
@@ -13600,7 +13600,7 @@ sunflower rug
Princess Peach shoes (Red)
falling-snow wall
@@ -13802,8 +13802,8 @@ Olivier salad
パンプキンパイHaPu
サカナのムニエルHaPu
グラタンHaPu
block flooring
mushroom mural
@@ -13819,19 +13819,19 @@ Olivier salad
Turkey Day casserole
Turkey Day wheat decor
Turkey Day table setting
? Block
block
pipe
Goal Pole
Super Star
Fire Flower
Super Mushroom
1-Up Mushroom
Shell
coin
large Mushroom Platform
small Mushroom Platform
Thwomp
sparkling cider
magic bag
@@ -13870,8 +13870,8 @@ Resetti model
someone's gift
Yoshi's Egg rug
Lakitu's Cloud rug
@@ -14026,10 +14026,10 @@ Festivale costume (Blue)
shamrock soda
heart-shaped bouquet
Viva Festivale Reaction Set
shamrock doorplate
Lunar New Year decoration
@@ -14233,14 +14233,15 @@ sebaetdon
shamrock hat (Green)
shamrock suit (Green)
shamrock shoes (Green)
shamrock sunglasses (Green)
shamrock wand
Festivale costume (Red)
Festivale costume (Purple)
Festivale costume (Green)
Luigi shoes (Brown)
@@ -14263,8 +14264,7 @@ Festivale costume (Green)
floating block
@@ -14277,3 +14277,64 @@ Festivale costume (Green)
mermaid fence
きゅうりのうま
つきみだんご
なすびのうし

View File

@@ -3402,6 +3402,14 @@
13819_1 Primaveral
13820_0 Otoñal
13820_1 Primaveral
13829_0 Verde
13829_1 Rojo
13831_0 Rojo
13831_1 Azul
13831_2 Verde
13832_0 Amarillo
13832_1 Rosa
13832_2 Verde
13930_0 Multicolor
13930_1 Adorable
13930_2 Moderno

View File

@@ -332,5 +332,8 @@
13818 Diseño
13819 Diseño
13820 Diseño
13829 Variación
13831 Color
13832 Color
13930 Diseño
14029 Variación

View File

@@ -865,7 +865,7 @@ mesa de billar
bombo de bingo
jaula de pájaros
lámpara bonbori
sujetalibros
@@ -986,7 +986,7 @@ tablero de go
arpa
hinaningyo
@@ -7545,7 +7545,7 @@ alfombra sencilla negra P
alfombra festiva
alfombra calabaza
alfombra Caza del Huevo
alfombra trébol
chaqueta escolar (Burdeos)
chaqueta escolar (Verde)
chaqueta escolar (Blanco)
@@ -7728,7 +7728,7 @@ jersey nórdico (Blanco crudo)
moneda
moneda baya
bolsa de bayas
bivalvo
concha en espiral
@@ -13544,25 +13544,25 @@ alfombra Día del Pavo
arco de bienvenida al 2021
gorra de Mario (Rojo)
gorra de Luigi (Verde)
gorra de Wario (Amarillo)
traje de Mario (Azul)
traje de Luigi (Azul marino)
traje de Wario (Púrpura)
bigote de Mario (Negro)
bigote de Luigi (Negro)
bigote de Wario (Negro)
zapato de Mario (Marrón)
zapato de Wario (Verde)
corona de Peach (Dorado)
vestido de Peach (Rosa)
@@ -13600,7 +13600,7 @@ alfombra girasol
zapato de Peach (Rojo)
pared noche nevada
@@ -13802,8 +13802,8 @@ ensalada Olivier
パンプキンパイHaPu
サカナのムニエルHaPu
グラタンHaPu
suelo bloques
pared champiñón
@@ -13819,19 +13819,19 @@ ensalada Olivier
cazuela Día del Pavo
adorno trigo Día del Pavo
servicio mesa Día del Pavo
bloque ?
bloque
tubería
banderín
superestrella
flor de fuego
superchampiñón
champiñón vida extra
caparazón
moneda
plataforma champiñón XL
plataforma champiñón
Roca Picuda
zumo de manzana
saco de regalos
@@ -13870,8 +13870,8 @@ mini Rese T. Ado
regalo de alguien
alfombra huevo de Yoshi
alfombra nube de Lakitu
@@ -14018,6 +14018,7 @@ traje de Carnaval (Azul)
pastel de
@@ -14025,11 +14026,10 @@ traje de Carnaval (Azul)
refresco trébol
ramo de flores Enamorados
Set de emociones Carnaval
placa trébol
adorno Año Nuevo Lunar
@@ -14233,14 +14233,15 @@ aguinaldo de Seollal
sombrero trébol (Verde)
traje trébol (Verde)
botín trébol (Verde)
gafa de sol trébol (Verde)
varita trébol
traje de Carnaval (Rojo)
traje de Carnaval (Púrpura)
traje de Carnaval (Verde)
zapato de Luigi (Marrón)
@@ -14263,8 +14264,7 @@ traje de Carnaval (Verde)
bloque elevado
@@ -14277,3 +14277,64 @@ traje de Carnaval (Verde)
valla sirena
きゅうりのうま
つきみだんご
なすびのうし

View File

@@ -3402,6 +3402,14 @@
13819_1 Floraison printanière
13820_0 Récolte d'automne
13820_1 Floraison printanière
13829_0 Vert
13829_1 Rouge
13831_0 Rouge
13831_1 Bleu
13831_2 Vert
13832_0 Jaune
13832_1 Rose
13832_2 Vert
13930_0 Multicolore
13930_1 Adorable
13930_2 Cool

View File

@@ -332,5 +332,8 @@
13818 Modèle
13819 Modèle
13820 Modèle
13829 Variation
13831 Couleur
13832 Couleur
13930 Modèle
14029 Variation

View File

@@ -865,7 +865,7 @@ billard
sphère pour tirage
cage à oiseau
lampe fleurie
serre-livres
@@ -986,7 +986,7 @@ table de go
harpe
hinaningyo
@@ -7545,7 +7545,7 @@ tapis simple noir S
tapis de fêtes
tapis Halloween
tapis fête des œufs
tapis trèfle
veste d'écolier (Bordeaux)
veste d'écolier (Vert)
veste d'écolier (Blanc)
@@ -7728,7 +7728,7 @@ chandail nordique (Blanc cassé)
pièce
pièce de clochettes
sac de clochettes
coquillage bivalve
coquillage spiralé
@@ -13544,25 +13544,25 @@ tapis fête du partage
arche nouvel an 2021
casquette de Mario (Rouge)
casquette de Luigi (Vert)
casquette de Wario (Jaune)
tenue de Mario (Bleu)
tenue de Luigi (Bleu marine)
tenue de Wario (Violet)
moustache de Mario (Noir)
moustache de Luigi (Noir)
moustache de Wario (Noir)
p. de chaussures de Mario (Brun)
p. de chaussures de Wario (Vert)
couronne Princesse Peach (Or)
robe de Princesse Peach (Rose)
@@ -13600,7 +13600,7 @@ tapis tournesol
p. chauss. Princesse Peach (Rouge)
mur chute de neige
@@ -13802,8 +13802,8 @@ salade Olivier
パンプキンパイHaPu
サカナのムニエルHaPu
グラタンHaPu
revêtement blocs
mur Mario
@@ -13819,19 +13819,19 @@ salade Olivier
plat à gratin fête du partage
décor de blé du partage
service fête du partage
bloc ?
bloc
tuyau
drapeau Mario
super étoile
fleur de feu
super champignon
champignon 1UP
carapace
pièce
plateforme champignon XL
plateforme champignon
Thwomp
boisson pétillante festive
sac à cadeaux
@@ -13870,8 +13870,8 @@ figurine de Resetti
cadeau de quelqu'un
tapis œuf de Yoshi
tapis nuage de Lakitu
@@ -14018,6 +14018,7 @@ costume de carnaval (Bleu)
tarte
@@ -14025,11 +14026,10 @@ costume de carnaval (Bleu)
soda trèfle
bouquet en forme de cœur
lot de mimiques de carnaval
plaque trèfle
déco de nouvel an lunaire
@@ -14233,14 +14233,15 @@ sebaetdon
chapeau trèfle (Vert)
costume trèfle (Vert)
paire de chaussures trèfle (Vert)
monture solaire trèfle (Vert)
baguette trèfle
costume de carnaval (Rouge)
costume de carnaval (Violet)
costume de carnaval (Vert)
p. de chaussures de Luigi (Brun)
@@ -14263,8 +14264,7 @@ costume de carnaval (Vert)
bloc flottant
@@ -14277,3 +14277,64 @@ costume de carnaval (Vert)
clôture sirène
きゅうりのうま
つきみだんご
なすびのうし

View File

@@ -3402,6 +3402,14 @@
13819_1 Fioritura primaverile
13820_0 Raccolto autunnale
13820_1 Fioritura primaverile
13829_0 Verde
13829_1 Rosso
13831_0 Rosso
13831_1 Blu
13831_2 Verde
13832_0 Giallo
13832_1 Rosa
13832_2 Verde
13930_0 Variopinto
13930_1 Grazioso
13930_2 Spavaldo

View File

@@ -332,5 +332,8 @@
13818 Design
13819 Design
13820 Design
13829 Colore
13831 Colore
13832 Colore
13930 Design
14029 Colore

View File

@@ -865,7 +865,7 @@ tavolo da biliardo
urna per estrazioni
gabbia
lanterna floreale
coppia di fermalibri
@@ -986,7 +986,7 @@ tavola da go
arpa
hinaningyo
@@ -7545,7 +7545,7 @@ tappetino nero S
tappeto festivo
tappeto brividi
tappeto caccia all'uovo
tappeto trifoglio
giacca da scolaro (Rosso lampone)
giacca da scolaro (Verde)
giacca da scolaro (Bianco)
@@ -7728,7 +7728,7 @@ maglione yodel (Bianco panna)
moneta
stellina (moneta)
sacco di stelline
conchiglia bivalve
conchiglia a spirale
@@ -13544,25 +13544,25 @@ tappeto primizie
arco buon anno 2021
cappello di Mario (Rosso)
cappello di Luigi (Verde)
cappello di Wario (Giallo)
tuta di Mario (Blu)
tuta di Luigi (Blu marino)
tuta di Wario (Viola)
baffo di Mario (Nero)
baffo di Luigi (Nero)
baffo di Wario (Nero)
paio di scarpe di Mario (Marrone)
paio di scarpe di Wario (Verde)
corona di Peach (Dorato)
vestito di Peach (Rosa)
@@ -13600,7 +13600,7 @@ tappeto girasole
paio di scarpe di Peach (Rosso)
muro nevicata
@@ -13802,8 +13802,8 @@ insalata russa
パンプキンパイHaPu
サカナのムニエルHaPu
グラタンHaPu
pavimento mattoni
muro dei funghi
@@ -13819,19 +13819,19 @@ insalata russa
casseruola primizie
ornamento primizie
set da tavola primizie
blocco ?
blocco
tubo
asta della bandiera
super stella
fiore di fuoco
super fungo
fungo 1-UP
guscio
moneta
piattaforma fungo grande
piattaforma fungo piccola
Twomp
cocktail alla frutta
sacco dei regali
@@ -13870,8 +13870,8 @@ modellino di Resetti
regalo da qualcuno
tappeto uovo di Yoshi
tappeto nuvola di Lakitu
@@ -14018,6 +14018,7 @@ costume Carnevale (Blu)
torta del Pi greco
@@ -14025,11 +14026,10 @@ costume Carnevale (Blu)
succo di trifoglio
bouquet a cuore
Set di emozioni Carnevale
targa da porta trifoglio
decoraz. Capodanno lunare
@@ -14233,14 +14233,15 @@ sebaetdon
cappello trifoglio (Verde)
vestito trifoglio (Verde)
paio di scarpe trifoglio (Verde)
montatura trifoglio (Verde)
bacchetta trifoglio
costume Carnevale (Rosso)
costume Carnevale (Viola)
costume Carnevale (Verde)
paio di scarpe di Luigi (Marrone)
@@ -14263,8 +14264,7 @@ costume Carnevale (Verde)
blocco fluttuante
@@ -14277,3 +14277,64 @@ costume Carnevale (Verde)
recinzione sirena
きゅうりのうま
つきみだんご
なすびのうし

View File

@@ -3402,6 +3402,14 @@
13819_1 はる春の
13820_0 みの実りの
13820_1 はる春の
13829_0 みどり
13829_1 あか
13831_0 レッド
13831_1 ブルー
13831_2 グリーン
13832_0 イエロー
13832_1 ピンク
13832_2 グリーン
13930_0 カラフル
13930_1 キュート
13930_2 クール

View File

@@ -332,5 +332,8 @@
13818 デザイン
13819 デザイン
13820 デザイン
13829 バリエーション
13831 カラー
13832 カラー
13930 デザイン
14029 バリエーション

View File

@@ -865,7 +865,7 @@ Tレックスのしっぽ
ビンゴマシン
とりかご
ぼんぼり
ブックスタンド
@@ -986,7 +986,7 @@ DJブース
ハープ
ひなにんぎょう
@@ -7545,7 +7545,7 @@ No.1のふく (レッド)
クリスマスなラグ
ハロウィンなラグ
イースターなラグ
シャムロックのラグ
がくせいふく (ワインレッド)
がくせいふく (グリーン)
がくせいふく (ホワイト)
@@ -7728,7 +7728,7 @@ No.1のふく (レッド)
コイン
ベル(コイン)
ベルぶくろ
にまいがい
まきがい
@@ -13544,25 +13544,25 @@ Nintendo Switch
2021ねんのアーチ
マリオのぼうし (レッド)
ルイージのぼうし (グリーン)
ワリオのぼうし (イエロー)
マリオのふく (ブルー)
ルイージのふく (ネイビー)
ワリオのふく (パープル)
マリオのひげ (ブラック)
ルイージのひげ (ブラック)
ワリオのひげ (ブラック)
マリオのくつ (ブラウン)
ワリオのくつ (グリーン)
ピーチひめのかんむり (ゴールド)
ピーチひめのドレス (ピンク)
@@ -13600,7 +13600,7 @@ Nintendo Switch
ピーチひめのくつ (レッド)
ゆきのふるかべ
@@ -13802,8 +13802,8 @@ Nintendo Switch
パンプキンパイHaPu
サカナのムニエルHaPu
グラタンHaPu
スーパーマリオのゆか
スーパーマリオのかべ
@@ -13819,19 +13819,19 @@ Nintendo Switch
サンクスギビングなキャセロール
サンクスギビングなむぎかざり
サンクスギビングテーブルウェア
ハテナブロック
レンガブロック
どかん
ゴールポール
スーパースター
ファイアフラワー
スーパーキノコ
1UPキノコ
こうら
コイン
キノコちけいL
キノコちけいS
ドッスン
スパークリングサイダー
プレゼントぶくろ
@@ -13870,8 +13870,8 @@ Nintendo Switch
だれかのプレゼント
ヨッシーのタマゴのラグ
ジュゲムのくものラグ
@@ -14018,6 +14018,7 @@ Nintendo Switch
πパイ
@@ -14025,11 +14026,10 @@ Nintendo Switch
シャムロックソーダ
ハートのバラブーケ
ビバ!カーニバルリアクション
シャムロックのドアプレート
しゅんせつのドアかざり
@@ -14233,14 +14233,15 @@ Nintendo Switch
シャムロックハット (グリーン)
シャムロックスーツ (グリーン)
シャムロックシューズ (グリーン)
シャムロックサングラス (グリーン)
シャムロックステッキ
カーニバルなコスチューム (レッド)
カーニバルなコスチューム (パープル)
カーニバルなコスチューム (グリーン)
ルイージのくつ (ブラウン)
@@ -14263,8 +14264,7 @@ Nintendo Switch
くうちゅうのレンガブロック
@@ -14277,3 +14277,64 @@ Nintendo Switch
マーメイドなさく
きゅうりのうま
つきみだんご
なすびのうし

View File

@@ -3402,6 +3402,14 @@
13819_1 봄의 축복
13820_0 가을의 결실
13820_1 봄의 축복
13829_0 초록색
13829_1 빨간색
13831_0 레드
13831_1 블루
13831_2 그린
13832_0 옐로
13832_1 핑크
13832_2 그린
13930_0 컬러풀
13930_1 큐트
13930_2 쿨

View File

@@ -332,5 +332,8 @@
13818 디자인
13819 디자인
13820 디자인
13829 변형
13831 컬러
13832 컬러
13930 디자인
14029 변형

View File

@@ -865,7 +865,7 @@
빙고 머신
새장
꽃그림 육면등
북엔드
@@ -986,7 +986,7 @@ DJ 테이블
하프
인형 장식
@@ -7545,7 +7545,7 @@ Nook Inc. 러그
크리스마스 러그
할로윈 러그
이스터 러그
성 패트릭 러그
학생복 (와인 레드)
학생복 (그린)
학생복 (화이트)
@@ -13544,25 +13544,25 @@ RC 헬리콥터
2021년 아치
마리오 모자 (레드)
루이지 모자 (그린)
와리오 모자 (옐로)
마리오 옷 (블루)
루이지 옷 (네이비)
와리오 옷 (퍼플)
마리오 수염 (블랙)
루이지 수염 (블랙)
와리오 수염 (블랙)
마리오 신발 (브라운)
와리오 신발 (그린)
피치공주 왕관 (골드)
피치공주 드레스 (핑크)
@@ -13600,7 +13600,7 @@ RC 헬리콥터
피치공주 구두 (레드)
눈 내리는 벽
@@ -13802,8 +13802,8 @@ RC 헬리콥터
パンプキンパイHaPu
サカナのムニエルHaPu
グラタンHaPu
슈퍼 마리오 바닥
슈퍼 마리오 벽
@@ -13819,19 +13819,19 @@ RC 헬리콥터
하베스트 캐서롤
하베스트 밀 장식
하베스트 테이블 세팅
?블록
블록
토관
골깃대
슈퍼스타
파이어플라워
슈퍼버섯
1UP버섯
등껍질
코인
버섯 지형 L
버섯 지형 S
쿵쿵
스파클링 사이다
선물 보따리
@@ -13870,8 +13870,8 @@ RC 헬리콥터
누군가의 선물
요시의 알 러그
김수한무 구름 러그
@@ -14018,6 +14018,7 @@ RC 헬리콥터
π 파이
@@ -14025,11 +14026,10 @@ RC 헬리콥터
성 패트릭 소다
하트 장미 꽃다발
비바! 카니발 리액션
성 패트릭 문패
춘절 복 장식
@@ -14233,14 +14233,15 @@ RC 헬리콥터
성 패트릭 모자 (그린)
성 패트릭 의상 (그린)
성 패트릭 슈즈 (그린)
성 패트릭 선글라스 (그린)
성 패트릭 지팡이
카니발 의상 (레드)
카니발 의상 (퍼플)
카니발 의상 (그린)
루이지 신발 (브라운)
@@ -14263,8 +14264,7 @@ RC 헬리콥터
떠 있는 블록
@@ -14277,3 +14277,64 @@ RC 헬리콥터
머메이드 울타리
きゅうりのうま
つきみだんご
なすびのうし

View File

@@ -3402,6 +3402,14 @@
13819_1 春之恩惠
13820_0 硕果之秋
13820_1 春之恩惠
13829_0 绿色
13829_1 红色
13831_0 红色
13831_1 蓝色
13831_2 绿色
13832_0 黄色
13832_1 粉红
13832_2 绿色
13930_0 彩色
13930_1 可爱色
13930_2 酷感色

View File

@@ -332,5 +332,8 @@
13818 设计
13819 设计
13820 设计
13829 种类
13831 颜色
13832 颜色
13930 设计
14029 种类

View File

@@ -865,7 +865,7 @@
摇奖机
鸟笼
纸灯笼
书挡
@@ -986,7 +986,7 @@ DJ台
竖琴
女儿节娃娃
@@ -7545,7 +7545,7 @@ Nook Inc.地毯
圣诞节地毯
万圣节地毯
复活节地毯
三叶草地毯
学生服 (酒红色)
学生服 (绿色)
学生服 (白色)
@@ -7728,7 +7728,7 @@ Nook Inc.地毯
金币
铃钱(金币)
铃钱袋
双壳贝
螺
@@ -13544,25 +13544,25 @@ Ring-Con
2021年拱门
马力欧帽子 (红色)
路易吉帽子 (绿色)
瓦力欧帽子 (黄色)
马力欧服 (蓝色)
路易吉服 (海军蓝)
瓦力欧服 (紫色)
马力欧胡子 (黑色)
路易吉胡子 (黑色)
瓦力欧胡子 (黑色)
马力欧鞋 (棕色)
瓦力欧鞋 (绿色)
桃花公主王冠 (金色)
桃花公主洋装 (粉红)
@@ -13600,7 +13600,7 @@ Ring-Con
桃花公主鞋 (红色)
下雪墙
@@ -13802,8 +13802,8 @@ Ring-Con
パンプキンパイHaPu
サカナのムニエルHaPu
グラタンHaPu
超级马力欧地板
超级马力欧墙
@@ -13819,19 +13819,19 @@ Ring-Con
感恩节砂锅炖菜
感恩节麦子装饰
感恩节桌上布置
?砖块
砖块
水管
终点旗杆
无敌星
火之花
超级蘑菇
1UP蘑菇
龟壳
金币
蘑菇地形L
蘑菇地形S
咚咚
气泡饮料
礼物袋
@@ -13870,8 +13870,8 @@ Ring-Con
某人的礼物
耀西蛋地毯
球盖姆的云地毯
@@ -14018,6 +14018,7 @@ Ring-Con
圆周率派
@@ -14025,11 +14026,10 @@ Ring-Con
三叶草苏打水
心形玫瑰花束
欢乐!狂欢节反应
三叶草门牌
春节门饰
@@ -14233,14 +14233,15 @@ Ring-Con
三叶草帽 (绿色)
三叶草装 (绿色)
三叶草鞋 (绿色)
三叶草墨镜 (绿色)
三叶草棒
狂欢节服装 (红色)
狂欢节服装 (紫色)
狂欢节服装 (绿色)
路易吉鞋 (棕色)
@@ -14263,8 +14264,7 @@ Ring-Con
空中砖块
@@ -14277,3 +14277,64 @@ Ring-Con
人鱼栅栏
きゅうりのうま
つきみだんご
なすびのうし

View File

@@ -3402,6 +3402,14 @@
13819_1 春之恩惠
13820_0 豐收之秋
13820_1 春之恩惠
13829_0 綠色
13829_1 紅色
13831_0 紅色
13831_1 藍色
13831_2 綠色
13832_0 黃色
13832_1 粉紅色
13832_2 綠色
13930_0 彩色
13930_1 可愛色
13930_2 酷感色

View File

@@ -332,5 +332,8 @@
13818 設計
13819 設計
13820 設計
13829 種類
13831 顏色
13832 顏色
13930 設計
14029 種類

View File

@@ -865,7 +865,7 @@
搖獎機
鳥籠
紙燈籠
書擋
@@ -986,7 +986,7 @@ DJ台
豎琴
女兒節娃娃
@@ -7545,7 +7545,7 @@ Nook Inc.地毯
聖誕節地毯
萬聖節地毯
復活節地毯
三葉草地毯
學生服 (酒紅色)
學生服 (綠色)
學生服 (白色)
@@ -7728,7 +7728,7 @@ Nook Inc.地毯
金幣
鈴錢(金幣)
鈴錢袋
雙殼貝
螺
@@ -13544,25 +13544,25 @@ Ring-Con
2021年拱門
瑪利歐帽子 (紅色)
路易吉帽子 (綠色)
瓦利歐帽子 (黃色)
瑪利歐服 (藍色)
路易吉服 (海軍藍)
瓦利歐服 (紫色)
瑪利歐鬍子 (黑色)
路易吉鬍子 (黑色)
瓦利歐鬍子 (黑色)
瑪利歐鞋 (棕色)
瓦利歐鞋 (綠色)
碧姬公主王冠 (金色)
碧姬公主洋裝 (粉紅色)
@@ -13600,7 +13600,7 @@ Ring-Con
碧姬公主鞋 (紅色)
下雪牆
@@ -13802,8 +13802,8 @@ Ring-Con
パンプキンパイHaPu
サカナのムニエルHaPu
グラタンHaPu
超級瑪利歐地板
超級瑪利歐牆
@@ -13819,19 +13819,19 @@ Ring-Con
感恩節砂鍋燉菜
感恩節麥子裝飾
感恩節桌上布置
?磚塊
磚塊
水管
終點旗桿
無敵星
火之花
超級蘑菇
1UP蘑菇
龜殼
金幣
蘑菇地形L
蘑菇地形S
咚咚
氣泡飲料
禮物袋
@@ -13870,8 +13870,8 @@ Ring-Con
某人的禮物
耀西蛋地毯
球蓋姆的雲地毯
@@ -14018,6 +14018,7 @@ Ring-Con
圓周率派
@@ -14025,11 +14026,10 @@ Ring-Con
三葉草汽水
愛心玫瑰花束
歡樂!狂歡節表情
三葉草門牌
春節門飾
@@ -14233,14 +14233,15 @@ Ring-Con
三葉草帽 (綠色)
三葉草裝 (綠色)
三葉草鞋 (綠色)
三葉草墨鏡 (綠色)
三葉草棒
狂歡節服裝 (紅色)
狂歡節服裝 (紫色)
狂歡節服裝 (綠色)
路易吉鞋 (棕色)
@@ -14263,8 +14264,7 @@ Ring-Con
空中磚塊
@@ -14277,3 +14277,64 @@ Ring-Con
人魚柵欄
きゅうりのうま
つきみだんご
なすびのうし

View File

@@ -22,6 +22,7 @@ public static class RevisionChecker
new(REV_150_MAIN, REV_150_PERSONAL, REV_150_PHOTO, REV_150_POSTBOX, REV_150_PROFILE), // 1.5.0
new(REV_160_MAIN, REV_160_PERSONAL, REV_160_PHOTO, REV_160_POSTBOX, REV_160_PROFILE), // 1.6.0
new(REV_170_MAIN, REV_170_PERSONAL, REV_170_PHOTO, REV_170_POSTBOX, REV_170_PROFILE), // 1.7.0
new(REV_180_MAIN, REV_180_PERSONAL, REV_180_PHOTO, REV_180_POSTBOX, REV_180_PROFILE), // 1.8.0
};
private static readonly FileHeaderInfo[] RevisionInfo =
@@ -43,6 +44,7 @@ public static class RevisionChecker
new() { Major = 0x60001, Minor = 0x6000C, HeaderRevision = 0, Unk1 = 2, SaveRevision = 14, Unk2 = 2 }, // 1.5.1
new() { Major = 0x70001, Minor = 0x70006, HeaderRevision = 0, Unk1 = 2, SaveRevision = 15, Unk2 = 2 }, // 1.6.0
new() { Major = 0x74001, Minor = 0x74005, HeaderRevision = 0, Unk1 = 2, SaveRevision = 16, Unk2 = 2 }, // 1.7.0
new() { Major = 0x78001, Minor = 0x78001, HeaderRevision = 0, Unk1 = 2, SaveRevision = 17, Unk2 = 2 }, // 1.8.0
};
public static readonly IReadOnlyList<SaveFileSizes> SizeInfo = new[]
@@ -64,6 +66,7 @@ public static class RevisionChecker
SizesByRevision[5], // 1.5.1
SizesByRevision[6], // 1.6.0
SizesByRevision[7], // 1.7.0
SizesByRevision[8], // 1.8.0
};
public static readonly IReadOnlyList<FileHashInfo> HashInfo = new[]
@@ -85,6 +88,7 @@ public static class RevisionChecker
REV_150, // 1.5.1
REV_160, // 1.6.0
REV_170, // 1.7.0
REV_180, // 1.7.0
};
public static bool IsRevisionKnown(this FileHeaderInfo info) => info.GetKnownRevisionIndex() >= 0;

View File

@@ -69,6 +69,7 @@ public static MainSaveOffsets GetOffsets(FileHeaderInfo Info)
14 => new MainSaveOffsets15(),
15 => new MainSaveOffsets16(),
16 => new MainSaveOffsets17(),
17 => new MainSaveOffsets18(),
_ => throw new IndexOutOfRangeException("Unknown revision!" + Environment.NewLine + Info),
};
}

View File

@@ -0,0 +1,54 @@
namespace NHSE.Core
{
/// <summary>
/// <inheritdoc cref="MainSaveOffsets"/>
/// </summary>
/// <remarks>Same as <see cref="MainSaveOffsets17"/></remarks>.
public class MainSaveOffsets18 : MainSaveOffsets
{
#region GSaveLand
public const int GSaveLandStart = 0x110;
public override int Animal => GSaveLandStart + 0x10;
public override int LandMyDesign => GSaveLandStart + 0x1e2600;
public override int PatternsPRO => LandMyDesign + (PatternCount * DesignPattern.SIZE);
public override int PatternFlag => PatternsPRO + (PatternCount * DesignPatternPRO.SIZE);
public override int PatternTailor => PatternFlag + DesignPattern.SIZE;
public const int GSaveWeather = GSaveLandStart + 0x1e23B0;
public override int WeatherArea => GSaveWeather + 0x14; // Hemisphere
public override int WeatherRandSeed => GSaveWeather + 0x18;
public override int EventFlagLand => GSaveLandStart + 0x20a408;
// GSaveMainField
public const int GSaveMainFieldStart = GSaveLandStart + 0x20ac08;
public override int FieldItem => GSaveMainFieldStart + 0x00000;
public override int LandMakingMap => GSaveMainFieldStart + 0xAAA00;
public override int MainFieldStructure => GSaveMainFieldStart + 0xCF600;
public override int OutsideField => GSaveMainFieldStart + 0xCF998;
public override int MyDesignMap => GSaveMainFieldStart + 0xCFA34;
public override int PlayerHouseList => GSaveLandStart + 0x2e5634;
public override int NpcHouseList => GSaveLandStart + 0x417634;
public const int GSaveShop = GSaveLandStart + 0x41887c;
public override int ShopKabu => GSaveShop + 0x2cb0; // part of shop; tailor increased size
public override int Museum => GSaveLandStart + 0x41bba0;
public override int Visitor => GSaveLandStart + 0x41efa4;
public override int SaveFg => GSaveLandStart + 0x41f1d4;
public override int BulletinBoard => GSaveLandStart + 0x41fb18;
public override int AirportThemeColor => GSaveLandStart + 0x500720;
#endregion
#region GSaveLandOther
public const int GSaveLandOtherStart = 0x504470;
public override int LostItemBox => GSaveLandOtherStart + 0x340680;
public override int LastSavedTime => GSaveLandOtherStart + 0x344f18;
#endregion
public override int VillagerSize => Villager2.SIZE;
public override IVillager ReadVillager(byte[] data) => new Villager2(data);
}
}

View File

@@ -61,6 +61,7 @@ public static PersonalOffsets GetOffsets(FileHeaderInfo Info)
14 => new PersonalOffsets15(),
15 => new PersonalOffsets16(),
16 => new PersonalOffsets17(),
17 => new PersonalOffsets18(),
_ => throw new IndexOutOfRangeException("Unknown revision!" + Environment.NewLine + Info),
};
}

View File

@@ -0,0 +1,48 @@
namespace NHSE.Core
{
/// <summary>
/// <inheritdoc cref="PersonalOffsets"/>
/// </summary>
/// <remarks>Same as <see cref="PersonalOffsets17"/>.</remarks>
public sealed class PersonalOffsets18 : PersonalOffsets
{
private const int Player = 0x110;
public override int PersonalId => Player + 0xAFA8;
public override int EventFlagsPlayer => Player + 0xAFE0;
private const int GSaveLifeSupport = Player + 0xBFE0;
public override int CountAchievement => GSaveLifeSupport + 0xE98; // CountAchievement
public override int NowPoint => GSaveLifeSupport + 0x5498; // Nook Miles
public override int TotalPoint => NowPoint + 8; // Total Nook Miles Earned
public override int Birthday => Player + 0x1228c;
public override int ProfileMain => Player + 0x122a0;
public override int ProfilePhoto => ProfileMain + 0x14;
public override int ProfileBirthday => ProfileMain + 0x23058;
public override int ProfileFruit => ProfileMain + 0x2305C;
public override int ProfileTimestamp => ProfileMain + 0x230CC;
public override int ProfileIsMakeVillage => ProfileMain + 0x230D0;
// end player
private const int PlayerOther = 0x36a50;
public override int Pockets1 => PlayerOther + 0x10;
public override int Pockets2 => Pockets1 + (8 * Pockets1Count) + 0x18;
public override int Wallet => Pockets2 + (8 * Pockets2Count) + 0x18;
public override int ItemChest => PlayerOther + 0x18C;
public override int ItemCollectBit => PlayerOther + 0xA058;
public override int ItemRemakeCollectBit => PlayerOther + 0xA7AC;
public override int Manpu => PlayerOther + 0xAF7C;
public override int Bank => PlayerOther + 0x22594;
public override int Recipes => Bank + 0x10;
public override int MaxRecipeID => 0x308;
public override int MaxRemakeBitFlag => 0x7D0 * 32;
public override IReactionStore ReadReactions(byte[] data) => data.Slice(Manpu, GSavePlayerManpu15.SIZE).ToStructure<GSavePlayerManpu15>();
public override void SetReactions(byte[] data, IReactionStore value) => ((GSavePlayerManpu15)value).ToBytes().CopyTo(data, Manpu);
}
}

View File

@@ -423,12 +423,10 @@ public static ItemKind GetFieldItemKind(ushort id)
{0xED06, new FieldItemDefinition(60678, 12489, 65534, "PltBushCamellia4Red" , FieldItemKind.PltBushCamellia )}, // ツバキ赤(成木花)
{0xED07, new FieldItemDefinition(60679, 12489, 65534, "PltBushCamellia5Red" , FieldItemKind.PltBushCamellia )}, // ツバキ赤(成木花なし)
{0xED08, new FieldItemDefinition(60680, 65534, 12758, "FenceIkegaki" , FieldItemKind.FenceIkegaki )}, // いけがきの柵
{0xED0B, new FieldItemDefinition(60683, 65534, 2213 , "FenceJuneBride3" , FieldItemKind.FenceJuneBride )}, // ジューンブライドな柵緑
{0xED0C, new FieldItemDefinition(60684, 65534, 12630, "FenceEasterEgg" , FieldItemKind.FenceEasterEgg )}, // イースターの柵
{0xED0D, new FieldItemDefinition(60685, 65534, 12894, "FenceJuneBride" , FieldItemKind.FenceJuneBride )}, // ジューンブライドな柵
{0xED0E, new FieldItemDefinition(60686, 65534, 2213 , "FenceJuneBride1" , FieldItemKind.FenceJuneBride )}, // ジューンブライドな柵ピンク
{0xED16, new FieldItemDefinition(60694, 2799 , 65534, "PltTreeEasterEgg" , FieldItemKind.PltTreeOak )}, // イースターのタマゴの木
{0xED21, new FieldItemDefinition(60705, 65534, 2213 , "FenceMermaid" , FieldItemKind.FenceMermaid )}, // マーメイドな柵
{0xED21, new FieldItemDefinition(60705, 65534, 14278, "FenceMermaid" , FieldItemKind.FenceMermaid )}, // マーメイドな柵
{0xED25, new FieldItemDefinition(60709, 65534, 13275, "FenceHalloween" , FieldItemKind.FenceHalloween )}, // ハロウィンのさく
{0xED3F, new FieldItemDefinition(60735, 3052 , 65534, "PltVgtSquash0" , FieldItemKind.PltVgtPumpkin )}, // カボチャ(苗)
{0xED40, new FieldItemDefinition(60736, 3053 , 65534, "PltVgtSquash1" , FieldItemKind.PltVgtPumpkin )}, // カボチャ(成長1)

View File

@@ -128,6 +128,7 @@ public enum ItemKind : byte
Kind_SequenceOnly,
Kind_ShellDrift,
Kind_ShellFish,
Kind_Shoes,
Kind_Shovel,
Kind_Slingshot,
Kind_SlopeItem,

View File

@@ -5,6 +5,7 @@ namespace NHSE.Core
/// </summary>
public enum ItemMenuIconType : ushort
{
_0xE40569D4,
Akoyagai,
Amaebi,
Anemone0,

View File

@@ -717,7 +717,10 @@ public static class ItemRemakeInfoData
{1508, new ItemRemakeInfo(1508, 13820, 1, new byte[] {00, 06, 14, 14, 14, 14, 14, 14}, new byte[] {12, 12, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // Turkey Day table setting
{1509, new ItemRemakeInfo(1509, 13818, 1, new byte[] {12, 06, 14, 14, 14, 14, 14, 14}, new byte[] {00, 06, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // Turkey Day casserole
{1510, new ItemRemakeInfo(1510, 13819, 1, new byte[] {09, 07, 14, 14, 14, 14, 14, 14}, new byte[] {08, 06, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // Turkey Day wheat decor
{1511, new ItemRemakeInfo(1511, 13829, 1, new byte[] {06, 01, 14, 14, 14, 14, 14, 14}, new byte[] {08, 08, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // Shell
{1516, new ItemRemakeInfo(1516, 13488, 3, new byte[] {09, 10, 12, 02, 14, 14, 14, 14}, new byte[] {01, 07, 04, 05, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // chocolate heart
{1522, new ItemRemakeInfo(1522, 13831, 2, new byte[] {01, 04, 06, 14, 14, 14, 14, 14}, new byte[] {08, 08, 08, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // large Mushroom Platform
{1523, new ItemRemakeInfo(1523, 13832, 2, new byte[] {07, 02, 06, 14, 14, 14, 14, 14}, new byte[] {08, 08, 08, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // small Mushroom Platform
{1524, new ItemRemakeInfo(1524, 13930, 5, new byte[] {13, 02, 04, 11, 01, 11, 14, 14}, new byte[] {13, 12, 05, 04, 12, 08, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // set of stockings
{1546, new ItemRemakeInfo(1546, 14029, 5, new byte[] {01, 02, 07, 03, 12, 10, 14, 14}, new byte[] {12, 12, 00, 12, 06, 11, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, new byte[] {14, 14, 14, 14, 14, 14, 14, 14}, false)}, // heart-shaped bouquet
};

View File

@@ -1122,6 +1122,9 @@ public static class ItemRemakeUtil
{13818, 1509}, // Turkey Day casserole
{13819, 1510}, // Turkey Day wheat decor
{13820, 1508}, // Turkey Day table setting
{13829, 1511}, // Shell
{13831, 1522}, // large Mushroom Platform
{13832, 1523}, // small Mushroom Platform
{13862, 0652}, // Jingle's photo
{13930, 1524}, // set of stockings
{14029, 1546}, // heart-shaped bouquet

View File

@@ -644,6 +644,7 @@ public static class RecipeList
{0x2F0, 13603}, // falling-snow wall
{0x2F3, 03548}, // rainbow feather
{0x2F5, 12217}, // summer-shell rug
{0x306, 14239}, // shamrock wand
{0x308, 14278}, // mermaid fence
};
}

View File

@@ -369,8 +369,11 @@ public EventFlagLand(short init, short max, ushort index, string name)
{0x198, new EventFlagLand(0 , -1 , 0408, "ShopHeartFlowerSelect" )}, // ハートのバラブーケ抽選済みカラバリ
{0x199, new EventFlagLand(0 , -1 , 0409, "RandomKey6" )}, // ランダムキーf
{0x19A, new EventFlagLand(0 , -1 , 0410, "RandomKey7" )}, // ランダムキーg
{0x19B, new EventFlagLand(0 , -1 , 0411, "RandomKey8" )}, // ランダムキーh
{0x19C, new EventFlagLand(0 , 1 , 0412, "BCAT_EventFlag_006" )}, // クリスマスイブ解禁
{0x19D, new EventFlagLand(0 , 1 , 0413, "BCAT_EventFlag_007" )}, // カーニバル本番、バレンタイン本番解禁
{0x19E, new EventFlagLand(0 , 1 , 0414, "BCAT_EventFlag_008" )}, // マリオコラボ解禁
{0x19F, new EventFlagLand(0 , 1 , 0415, "GrowUpAfterPatch1_8" )}, // 1.8適用して成長処理をした
{0x1A3, new EventFlagLand(0 , 9999 , 0419, "ValentineAddBbsYear" )}, // バレンタイン予告の掲示板書き込みをした年
{0x1A4, new EventFlagLand(0 , 9999 , 0420, "CarnivalAddBbsYear" )}, // カーニバル予告の掲示板書き込みをした年
{0x1A5, new EventFlagLand(0 , 1 , 0421, "CarnivalNpcFeatherColorDecided" )}, // カーニバル|NPCが欲しがる羽の色決定済み

View File

@@ -1090,6 +1090,7 @@ public EventFlagPlayer(short init, short max, ushort index, string name)
{0x537, new EventFlagPlayer(0 , 1 , 1335, "RcmChkReactionBook" )}, // カーニバル用リアクション本をチェックした
{0x538, new EventFlagPlayer(0 , 1 , 1336, "RcmChkCarnivalFtr" )}, // まめきち|カーニバル家具チェックした?
{0x539, new EventFlagPlayer(0 , 1 , 1337, "AnnounceCarnival" )}, // カーニバル|当日に島内放送で告知した?
{0x53A, new EventFlagPlayer(0 , 1 , 1338, "ShootDownShamrockRecipeBalloon" )}, // シャムロックデー|今日、シャムロックステッキのレシピ風船を撃ち落としたか
};
private const string Unknown = "???";

View File

@@ -7,7 +7,7 @@ public static class DumpTests
{
private const string RepoPath = @"C:\Users\Kurt\Documents\GitHub";
private const string PatchDumpPath = @"D:\Kurt\Desktop\" + PatchFolderName;
private const string PatchFolderName = "v17";
private const string PatchFolderName = "v18";
private const string MessageDumpFormat = @"Message\String_{0}";
[Fact]

View File

@@ -73,7 +73,7 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("2906423256")]
[global::System.Configuration.DefaultSettingValueAttribute("0")]
public uint SysBotPouchOffset {
get {
return ((uint)(this["SysBotPouchOffset"]));
@@ -85,7 +85,7 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("2906423256")]
[global::System.Configuration.DefaultSettingValueAttribute("0")]
public uint SysBotGenericOffset {
get {
return ((uint)(this["SysBotGenericOffset"]));