Merge remote-tracking branch 'origin/main' into feature/restore-history

rename instances of gook to goocoo

.github/workflows/go.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.18
+        go-version: '1.21'
 
     - name: Build Linux-amd64
       run: env GOOS=linux GOARCH=amd64 go build -v

.gitignore

@@ -2,12 +2,7 @@
 
 www/jp/
 vendor/
-bin/*.bin
-bin/*.bak
-bin/quests/*.bin
-bin/questlists/*.bin
-bin/scenarios/*.bin
-bin/debug/*.bin
+*.bin
 savedata/*/
 *.exe
 *.lnk

README.md

@@ -1,18 +1,147 @@
-# Erupe Community Edition
+# Erupe
+
+## Client Compatiblity
+### Platforms
+- PC
+- PlayStation 3
+- PlayStation Vita
+- Wii U (Up to Z2)
+### Versions
+- ZZ
+- Z2
+- Z1
+
 ## Setup
-- If you are only looking to install Erupe, please use [a pre-compiled binary](https://github.com/ZeruLight/Erupe/releases/latest).
-- If you want to modify or compile Erupe yourself please read on.
-### Requirements
+
+If you are only looking to install Erupe, please use [a pre-compiled binary](https://github.com/ZeruLight/Erupe/releases/latest).
+
+If you want to modify or compile Erupe yourself, please read on.
+
+## Requirements
+
 - [Go](https://go.dev/dl/)
 - [PostgreSQL](https://www.postgresql.org/download/)
-### Installation
-1. Bring up a fresh database by using the [backup file attached with the latest release](https://github.com/ZeruLight/Erupe/releases/latest/download/Erupe.sql).
+
+## Installation
+
+1. Bring up a fresh database by using the [backup file attached with the latest release](https://github.com/ZeruLight/Erupe/releases/latest/download/SCHEMA.sql).
 2. Run each script under [patch-schema](./patch-schema) as they introduce newer schema.
 3. Edit [config.json](./config.json) such that the database password matches your PostgreSQL setup.
 4. Run `go build` or `go run .` to compile Erupe.
-### Note
-- You will need to acquire and install the client files and quest binaries separately.
-# Resources
-[Community FAQ Pastebin](https://pastebin.com/QqAwZSTC)
 
-[Quests and Scenario Binary Files](https://github.com/xl3lackout/MHFZ-Quest-Files)
+## Resources
+
+- [Quest and Scenario Binary Files](https://files.catbox.moe/xf0l7w.7z)
+- [PewPewDojo Discord](https://discord.gg/CFnzbhQ)
+
+## Configuration
+This portion of the documentation goes over the `config.json` file.
+
+### General Configuration
+
+| Variable               | Description                                                                                                                                           | Default   | Options                         |
+|------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|---------------------------------|
+| Host                   | The IP or host address the server is running from                                                                                                     | 127.0.0.1 |                                 |
+| BinPath                | The bin path folder is where you place files needed for various parts of the game such as scenario and quest files                                    | bin       |                                 |
+| Language               | This is the language the server will run in. Only English `en` and Japanese `ja` are available, if you wish to contribute to tranlation, get in touch | en        | en/jp                           |
+| DisableSoftCrash       |                                                                                                                                                       | false     |                                 |
+| HideLoginNotice        | This hides the notices that appear on login from `LoginNotices`                                                                                       | true      |                                 |
+| LoginNotices           | This is where you place notices for users, you can have multiple notices                                                                              |           |                                 |
+| PatchServerManifest    |                                                                                                                                                       |           |                                 |
+| PatchServerFile        |                                                                                                                                                       |           |                                 |
+| ScreenshotAPIURL       | This is the URL you want user sreenshots to go to                                                                                                     |           |                                 |
+| DeleteOnSaveCorruption | This option deletes a users save from the database if they corrupt it, can be used as punishment for cheaters                                         | false     |                                 |
+| ClientMode             | This tells the server what client version it should target                                                                                            | ZZ        | Check compatible versions above |
+| DevMode                | This enables DevModeOptions to be configured                                                                                                          | true      |                                 |
+
+### `DevModeOptions` Configuraiton
+
+| Variable             | Description                                                                                 | Default  | Options                          |
+|----------------------|---------------------------------------------------------------------------------------------|----------|----------------------------------|
+| AutoCreateAccount    | This allows users that don't exist to auto create there account from initial login          | true     |                                  |
+| CleanDB              | This cleans the database down                                                               | false    |                                  |
+| MaxLauncherHR        | This sets the launcher value to HR7 to allow you to break World HR requirements             | false    |                                  |
+| LogInboundMessages   | This will allow inbound messages to be logged to stdout                                     | false    |                                  |
+| LogOutboundMessages  | This will allow outbound messages to be logged to stdout                                    | false    |                                  |
+| MaxHexdumpLength     | This is the maximum amount of hex bytes that will be dumped to stdout                       | 0        |                                  |
+| DivaEvent            | This overrides the Diva event stage in game                                                 | 2        | 0/1/2/3/-1                       |
+| FestaEvent           | This overrides the Hunter Festival event stage in game                                      | 2        | 0/1/2/3/-1                       |
+| TournamentEvent      | This overrides the Hunter Tournament event stage in game                                    | 2        | 0/1/2/3/-1                       |
+| MezFesEvent          | Enables whether the MezFes event & World are active                                         | true     |                                  |
+| MezFesAlt            | Switches the multiplayer MezFes event                                                       | false    |                                  |
+| DisableTokenCheck    | This disables the random token that is generated at login from being checked, very insecure | false    |                                  |
+| QuestDebugTools      | Enable various quest debug logs                                                             | false    |                                  |
+| EarthStatusOverride  | Enables Pallone Fest, Tower and Conquest War events                                         | 0        | 2=Conquest, 11=Pallone, 21=Tower |
+| EarthIDOverride      | A random event ID                                                                           | 0        |                                  |
+| EarthMonsterOverride | Sets the ID of the monster targeted in the Conquest War                                     | 0        |                                  |
+| SaveDumps.Enables    | Enables save dumps to a folder that is set at `SaveDumps.OutputDir`                         | true     |                                  |
+| SaveDumps.OutputDir  | The folder that save dumps are saved to                                                     | savedata |                                  |
+
+### `GameplayOptions` Configuraiton
+
+| Variable             | Description                                                                 | Default | Options |
+|----------------------|-----------------------------------------------------------------------------|---------|---------|
+| FeaturedWeapons      | Number of Active Feature weapons to generate daily                          | 0       |         |
+| MaximumNP            | Maximum number of NP held by a player                                       | 100000  |         |
+| MaximumRP            | Maximum number of RP held by a player                                       | 100000  |         |
+| DisableLoginBoost    | Disables the Login Boost system                                             | false   |         |
+| DisableBoostTime     | Disables the daily NetCafe Boost Time                                       | false   |         |
+| BoostTimeDuration    | The number of minutes NetCafe Boost Time lasts for                          | 120     |         |
+| GuildMealDuration    | The number of minutes a Guild Meal can be activated for after cooking       | 60      |         |
+| BonusQuestAllowance  | Number of Bonus Point Quests to allow daily                                 | 3       |         |
+| DailyQuestAllowance  | Number of Daily Quests to allow daily                                       | 1       |         |
+| MezfesSoloTickets    | Number of solo tickets given weekly                                         | 10      |         |
+| MezfesGroupTickets   | Number of group tickets given weekly                                        | 4       |         |
+| GUrgentRate          | Adjusts the rate of G Urgent quests spawning                                | 10      |         |
+| GCPMultiplier        | Adjusts the multiplier of GCP rewarded for quest completion                 | 1.00    |         |
+| GRPMultiplier        | Adjusts the multiplier of G Rank Points rewarded for quest completion       | 1.00    |         |
+| GSRPMultiplier       | Adjusts the multiplier of G Skill Rank Points rewarded for quest completion | 1.00    |         |
+| GZennyMultiplier     | Adjusts the multiplier of G Zenny rewarded for quest completion             | 1.00    |         |
+| MaterialMultiplier   | Adjusts the multiplier of Monster Materials rewarded for quest completion   | 1.00    |         |
+| ExtraCarves          | Grant n extra chances to carve ALL carcasses                                | 0       |         |
+| DisableHunterNavi    | Disables the Hunter Navi                                                    | false   |         |
+| EnableHiganjimaEvent | Enables the Higanjima event in the Rasta Bar                                | false   |         |
+| EnableNierEvent      | Enables the Nier event in the Rasta Bar                                     | false   |         |
+| DisableRoad          | Disables the Hunting Road                                                   | false   |         |
+
+### Discord
+There is limited Discord capability in Erupe. The feature allows you to replay messages from your server into a channel.
+This may be either be removed or revamped in a future version.
+
+### Commands
+There are several chat commands that can be turned on and off. Most of them are really for admins or debugging purposes.
+
+| Name     | command        | Description                                | Options             |
+|----------|----------------|--------------------------------------------|---------------------|
+| Rights   | !rights VALUE  | Sets the rights integer for your account   |                     |
+| Teleport | !tele X,Y      | Teleports user to specific x,y coordinate  |                     |
+| Reload   | !reload        | Reloads all users and character objects    |                     |
+| KeyQuest | !kqf FLAGS     | Sets the Key Quest Flag for your character |                     |
+| Course   | !course OPTION | Enables/Disables a course for your account | HL,EX,Premium,Boost |
+| PSN      | !psn  USERNAME | Links the specified PSN to your account    |                     |
+
+### Ravi Sub Commands
+| Name     | command                          | Description                   |
+|----------|----------------------------------|-------------------------------|
+| Raviente | !ravi start                      | Starts Ravi Event             |
+| Raviente | !ravi cm / !ravi checkmultiplier | Checks Ravi Damage Multiplier |
+| Raviente | !ravi ss                         | Send Sedation Support         |
+| Raviente | !ravi sr                         | Send Resurrection Support     |
+| Raviente | !ravi rs                         | Request Sedation Support      |
+
+
+## World `Entries` config
+
+| Config Item | Description      | Options                                                    |
+|-------------|------------------|------------------------------------------------------------|
+| Type        | Server type.     | 1=Normal, 2=Cities, 3=Newbie, 4=Tavern, 5=Return, 6=MezFes |
+| Season      | Server activity. | 0=Green/Breeding, 1=Orange/Warm, 2=Blue/Cold               |
+
+### `Recommend` 
+This sets the types of quest that can be ordered from a world.
+* 0 = All quests
+* 1 = Up to 2 star quests  
+* 2 = Up to 4 star quests 
+* 4 = All Quests in HR (Enables G Experience Tab) 
+* 5 = Only G rank quests 
+* 6 = Mini games world there is no place to order quests 

bin/quests/__PLACE_YOUR_QUEST_.bin_FILES_HERE__.txt

@@ -0,0 +1,2 @@
+place your quest .bin files here
+e.g. 22031d0.bin

bundled-schema/DivaShops.sql

@@ -0,0 +1,45 @@
+BEGIN;
+
+INSERT INTO public.shop_items
+(shop_type, shop_id, item_id, cost, quantity, min_hr, min_sr, min_gr, store_level, max_quantity, road_floors, road_fatalis)
+VALUES
+    (8,5,1,30,10,0,0,0,0,10,0,0),
+    (8,5,2,60,10,0,0,0,0,10,0,0),
+    (8,5,3,60,10,0,0,0,0,10,0,0),
+    (8,5,4,30,10,0,0,0,0,10,0,0),
+    (8,5,5,60,10,0,0,0,0,10,0,0),
+    (8,5,6,80,10,0,0,0,1,10,0,0),
+    (8,5,7,80,10,0,0,0,1,10,0,0),
+    (8,5,8,80,10,0,0,0,1,10,0,0),
+    (8,5,9,100,10,0,0,0,2,10,0,0),
+    (8,5,10,100,10,0,0,0,2,10,0,0),
+    (8,5,11,100,10,0,0,0,2,10,0,0),
+    (8,5,12,100,10,0,0,0,2,10,0,0),
+    (8,5,13,100,10,0,0,0,2,10,0,0),
+    (8,5,14,200,10,0,0,0,2,10,0,0),
+    (8,5,15,500,10,0,0,0,3,10,0,0),
+    (8,5,16,1000,10,0,0,0,3,10,0,0),
+    (8,5,20,30,10,0,0,0,0,10,0,0),
+    (8,5,21,30,10,0,0,0,0,10,0,0),
+    (8,5,22,60,10,0,0,0,0,10,0,0),
+    (8,5,23,60,10,0,0,0,0,10,0,0),
+    (8,5,24,60,10,0,0,0,0,10,0,0),
+    (8,5,25,80,10,0,0,0,1,10,0,0),
+    (8,5,26,80,10,0,0,0,1,10,0,0),
+    (8,5,27,500,10,0,0,1,3,10,0,0),
+    (8,5,28,60,10,0,0,0,0,10,0,0),
+    (8,5,29,60,10,299,0,0,0,10,0,0),
+    (8,5,30,100,10,0,0,1,3,10,0,0),
+    (8,5,31,80,10,299,0,0,1,10,0,0),
+    (8,5,32,80,10,299,0,0,1,10,0,0),
+    (8,5,33,80,10,299,0,0,1,10,0,0),
+    (8,7,2209,400,1,299,0,0,2,5,0,0),
+    (8,7,2208,400,1,299,0,0,2,5,0,0),
+    (8,7,5113,400,1,299,0,0,2,5,0,0),
+    (8,7,3571,400,1,299,0,0,2,5,0,0),
+    (8,7,3572,400,1,299,0,0,2,5,0,0),
+    (8,7,3738,400,1,299,0,0,2,5,0,0),
+    (8,7,3737,400,1,299,0,0,2,5,0,0),
+    (8,7,4399,400,1,299,0,0,2,5,0,0);
+
+END;

bundled-schema/EventQuests.sql

@@ -0,0 +1,292 @@
+BEGIN;
+
+-- Ripped quests
+INSERT INTO public.event_quests (max_players, quest_type, quest_id, mark) VALUES
+    (0,9,40060,0),
+    (0,9,40079,0),
+    (0,9,40080,0),
+    (0,9,40081,0),
+    (0,9,40133,0),
+    (0,9,40134,0),
+    (0,9,40135,0),
+    (0,9,40136,0),
+    (0,9,40137,0),
+    (0,9,40138,0),
+    (0,9,40142,0),
+    (0,9,40143,0),
+    (0,9,40161,0),
+    (0,9,40162,0),
+    (4,9,40173,0),
+    (4,9,40174,0),
+    (0,9,40201,0),
+    (0,9,40218,0),
+    (4,43,40236,1),
+    (4,28,40241,1),
+    (0,8,50534,0),
+    (4,18,50852,1),
+    (4,18,50940,1),
+    (4,18,51024,1),
+    (4,18,51025,1),
+    (4,18,51026,1),
+    (4,18,51027,1),
+    (4,38,51052,9),
+    (4,38,51053,9),
+    (4,18,51059,1),
+    (4,38,51107,9),
+    (4,24,51125,0),
+    (1,24,51126,0),
+    (4,24,51127,0),
+    (4,24,51128,0),
+    (4,24,51129,0),
+    (4,26,53034,1),
+    (4,18,53140,1),
+    (4,18,53187,1),
+    (4,18,53201,1),
+    (1,18,53253,1),
+    (4,26,53307,1),
+    (4,24,53314,0),
+    (4,24,53315,0),
+    (4,24,53316,0),
+    (4,24,53317,0),
+    (4,24,53318,0),
+    (4,24,53319,0),
+    (4,24,53320,0),
+    (4,24,53321,0),
+    (4,24,53324,0),
+    (1,18,53326,2),
+    (4,31,54244,0),
+    (0,8,54425,0),
+    (4,28,54449,1),
+    (4,28,54593,1),
+    (4,28,54594,1),
+    (4,28,54603,1),
+    (4,28,54604,1),
+    (4,28,54605,1),
+    (4,28,54606,1),
+    (1,28,54608,0),
+    (1,28,54609,0),
+    (32,40,54751,0),
+    (32,40,54752,0),
+    (32,40,54753,0),
+    (32,40,54754,0),
+    (32,40,54755,0),
+    (32,40,54756,0),
+    (32,40,54757,0),
+    (32,40,54758,0),
+    (32,40,54759,0),
+    (32,40,54760,0),
+    (32,40,54761,0),
+    (4,28,54801,0),
+    (4,28,55002,1),
+    (4,28,55195,0),
+    (4,28,55202,0),
+    (4,28,55203,0),
+    (4,28,55204,0),
+    (0,8,55369,0),
+    (4,28,55464,1),
+    (4,43,55513,1),
+    (4,28,55529,0),
+    (4,28,55532,0),
+    (1,28,55536,0),
+    (1,28,55537,0),
+    (32,50,55596,0),
+    (32,50,55597,0),
+    (32,50,55598,0),
+    (32,50,55599,0),
+    (32,50,55601,0),
+    (32,50,55602,0),
+    (32,50,55603,0),
+    (32,50,55604,0),
+    (32,50,55605,0),
+    (32,50,55606,0),
+    (32,50,55607,0),
+    (4,28,55619,0),
+    (4,28,55670,1),
+    (4,39,55679,9),
+    (4,39,55680,9),
+    (4,43,55691,1),
+    (4,43,55692,1),
+    (4,43,55693,1),
+    (4,43,55694,1),
+    (4,43,55695,1),
+    (4,43,55696,1),
+    (4,43,55697,1),
+    (4,43,55698,1),
+    (1,43,55728,1),
+    (4,43,55738,1),
+    (0,8,55767,0),
+    (0,8,55768,0),
+    (4,28,55771,1),
+    (4,39,55772,9),
+    (8,51,55796,0),
+    (8,51,55797,0),
+    (8,51,55798,0),
+    (8,51,55799,0),
+    (8,51,55801,0),
+    (8,51,55802,0),
+    (8,51,55803,0),
+    (8,51,55804,0),
+    (8,51,55805,0),
+    (8,51,55806,0),
+    (8,51,55807,0),
+    (1,28,55808,0),
+    (0,8,55870,0),
+    (0,8,55872,0),
+    (0,8,55879,0),
+    (0,8,55880,0),
+    (0,8,55881,0),
+    (0,8,55882,0),
+    (4,28,55896,1),
+    (0,8,55897,0),
+    (0,8,55899,0),
+    (0,8,55901,0),
+    (0,8,55902,0),
+    (0,8,55903,0),
+    (0,8,55904,0),
+    (0,8,55905,0),
+    (0,8,55906,0),
+    (0,8,55907,0),
+    (0,8,55908,0),
+    (0,8,55909,0),
+    (0,8,55910,0),
+    (0,8,55911,0),
+    (0,8,55912,0),
+    (4,39,55916,9),
+    (4,39,55917,9),
+    (4,39,55918,9),
+    (4,39,55919,9),
+    (4,28,55920,0),
+    (4,39,55921,9),
+    (4,39,55922,9),
+    (4,43,55923,1),
+    (4,43,55924,1),
+    (4,43,55925,1),
+    (4,43,55926,1),
+    (4,43,55929,1),
+    (4,43,55930,1),
+    (4,43,55931,1),
+    (4,43,55932,1),
+    (4,28,55935,0),
+    (4,28,55936,0),
+    (4,28,55937,0),
+    (4,28,55938,0),
+    (4,28,55939,0),
+    (4,28,55948,0),
+    (4,28,55949,0),
+    (4,28,55950,0),
+    (4,28,55951,0),
+    (1,28,55963,0),
+    (4,28,55964,1),
+    (4,28,55967,1),
+    (4,43,56042,1),
+    (4,43,56056,1),
+    (4,43,56058,1),
+    (4,43,56059,1),
+    (4,43,56063,1),
+    (4,43,56064,1),
+    (4,43,56076,4),
+    (4,43,56077,4),
+    (4,43,56078,4),
+    (4,43,56079,4),
+    (4,43,56080,4),
+    (4,43,56125,1),
+    (4,24,56134,0),
+    (4,24,56135,0),
+    (4,24,56138,0),
+    (4,24,56139,0),
+    (4,24,56141,0),
+    (4,24,56142,0),
+    (4,28,56143,1),
+    (4,43,56144,1),
+    (4,43,56145,1),
+    (0,8,56146,0),
+    (4,28,56147,1),
+    (4,24,56148,0),
+    (1,24,56149,0),
+    (4,43,56150,1),
+    (4,43,56151,1),
+    (4,43,56154,1),
+    (4,43,56155,1),
+    (4,43,56156,1),
+    (4,28,56157,1),
+    (1,28,56158,1),
+    (4,28,56159,1),
+    (4,48,58043,1),
+    (4,46,58050,0),
+    (4,46,58051,0),
+    (4,46,58052,0),
+    (4,46,58053,0),
+    (4,46,58054,0),
+    (4,46,58055,0),
+    (4,46,58056,0),
+    (4,46,58057,0),
+    (4,46,58058,0),
+    (4,46,58059,0),
+    (4,46,58060,0),
+    (4,46,58061,0),
+    (4,46,58062,0),
+    (4,46,58063,0),
+    (4,46,58064,0),
+    (4,46,58065,0),
+    (4,46,58066,0),
+    (4,46,58067,0),
+    (4,46,58068,0),
+    (4,46,58069,0),
+    (4,46,58070,0),
+    (4,46,58071,0),
+    (4,46,58072,0),
+    (4,46,58074,0),
+    (4,46,58075,0),
+    (4,46,58076,0),
+    (4,46,58077,0),
+    (4,46,58078,0),
+    (4,47,58079,0),
+    (4,47,58080,0),
+    (4,47,58081,0),
+    (4,47,58082,0),
+    (4,47,58083,0),
+    (4,46,58088,0),
+    (4,46,58089,0),
+    (4,46,58090,0),
+    (4,46,58091,0),
+    (4,46,58096,0),
+    (4,46,58097,0),
+    (4,46,58098,0),
+    (4,46,58099,0),
+    (4,46,58101,0),
+    (4,46,58102,1),
+    (4,46,58103,1),
+    (4,46,58104,1),
+    (4,46,58105,1),
+    (4,46,58106,1),
+    (4,46,58107,1),
+    (4,46,58108,1),
+    (4,46,58109,1),
+    (4,46,58112,1),
+    (4,46,58113,1),
+    (4,46,58114,1),
+    (4,46,58115,1),
+    (4,46,58118,0),
+    (4,46,58119,0),
+    (4,46,58120,0),
+    (4,46,58121,0),
+    (4,46,58122,0),
+    (4,46,58123,0),
+    (4,46,58125,1),
+    (4,46,58126,1),
+    (4,46,58127,1),
+    (4,46,58128,1),
+    (4,13,61050,0),
+    (4,13,61051,0),
+    (4,13,61053,0),
+    (4,13,61055,0),
+    (2,13,61067,0),
+    (4,13,61068,0),
+    (2,13,61070,0),
+    (4,13,61071,0),
+    (8,22,62101,0),
+    (8,16,62104,0),
+    (8,16,62105,0),
+    (8,16,62108,0),
+    (1,18,62910,1);
+END;

bundled-schema/FPointItems.sql

@@ -0,0 +1,391 @@
+BEGIN;
+
+INSERT INTO fpoint_items (item_type, item_id, quantity, fpoints, trade_type) VALUES
+(7,8895,1,500,0),
+(7,8891,1,300,0),
+(7,8892,1,300,0),
+(7,8893,1,300,0),
+(7,8894,1,300,0),
+(7,8890,1,10,0),
+(7,10354,1,500,0),
+(7,11983,1,300,0),
+(7,11984,1,300,0),
+(7,11985,1,300,0),
+(7,11986,1,300,0),
+(7,12524,1,500,0),
+(7,12470,1,300,0),
+(7,12471,1,300,0),
+(7,12472,1,300,0),
+(7,12473,1,300,0),
+(7,2158,2,1,0),
+(7,14548,1,500,0),
+(7,9509,1,1,0),
+(7,9510,1,1,0),
+(7,9511,1,1,0),
+(7,9512,1,1,0),
+(7,9513,1,1,0),
+(7,9514,1,1,0),
+(7,9515,1,1,0),
+(7,10753,1,1,0),
+(7,10754,1,1,0),
+(7,10755,1,1,0),
+(7,10756,1,1,0),
+(7,10757,1,1,0),
+(7,10758,1,1,0),
+(7,10759,1,1,0),
+(7,11296,1,1,0),
+(7,11297,1,1,0),
+(7,11298,1,1,0),
+(7,11299,1,1,0),
+(7,11300,1,1,0),
+(7,12386,1,1,0),
+(7,12387,1,1,0),
+(7,12388,1,1,0),
+(7,12389,1,1,0),
+(7,12390,1,1,0),
+(7,13034,1,1,0),
+(7,13035,1,1,0),
+(7,13036,1,1,0),
+(7,13037,1,1,0),
+(7,13038,1,1,0),
+(7,14179,1,1,0),
+(7,14180,1,1,0),
+(7,14181,1,1,0),
+(7,14182,1,1,0),
+(7,14183,1,1,0),
+(7,13422,1,1,0),
+(7,13423,1,1,0),
+(7,13424,1,1,0),
+(7,13425,1,1,0),
+(7,13426,1,1,0),
+(7,13427,1,1,0),
+(7,9796,1,3,0),
+(7,9700,1,3,0),
+(7,10380,1,3,0),
+(7,10810,1,3,0),
+(7,10811,1,3,0),
+(7,11436,1,3,0),
+(7,9509,1,1,0),
+(7,9510,1,1,0),
+(7,9511,1,1,0),
+(7,9512,1,1,0),
+(7,9513,1,1,0),
+(7,9514,1,1,0),
+(7,9515,1,1,0),
+(7,10753,1,1,0),
+(7,10754,1,1,0),
+(7,10755,1,1,0),
+(7,10756,1,1,0),
+(7,10757,1,1,0),
+(7,10758,1,1,0),
+(7,10759,1,1,0),
+(7,11296,1,1,0),
+(7,11297,1,1,0),
+(7,11298,1,1,0),
+(7,11299,1,1,0),
+(7,11300,1,1,0),
+(7,12509,1,3,0),
+(7,12386,1,1,0),
+(7,12387,1,1,0),
+(7,12388,1,1,0),
+(7,12389,1,1,0),
+(7,12390,1,1,0),
+(7,12872,1,3,0),
+(7,12873,1,3,0),
+(7,12840,1,1,0),
+(7,12841,1,1,0),
+(7,12874,1,1,0),
+(7,12875,1,1,0),
+(7,13191,1,3,0),
+(7,13177,1,3,0),
+(7,13326,1,3,0),
+(7,13034,1,1,0),
+(7,13035,1,1,0),
+(7,13036,1,1,0),
+(7,13037,1,1,0),
+(7,13038,1,1,0),
+(7,13178,1,3,0),
+(7,13453,1,3,0),
+(7,13449,1,3,0),
+(7,13450,1,3,0),
+(7,13404,1,3,0),
+(7,13422,1,1,0),
+(7,13423,1,1,0),
+(7,13424,1,1,0),
+(7,13425,1,1,0),
+(7,13426,1,1,0),
+(7,13427,1,1,0),
+(7,13791,1,3,0),
+(7,14006,1,3,0),
+(7,14031,1,3,0),
+(7,14032,1,3,0),
+(7,13960,1,3,0),
+(7,14029,1,3,0),
+(7,13956,1,1,0),
+(7,13958,1,1,0),
+(7,13957,1,1,0),
+(7,13959,1,1,0),
+(7,13790,1,3,0),
+(7,14005,1,3,0),
+(7,14010,1,3,0),
+(7,14009,1,3,0),
+(7,14008,1,3,0),
+(7,13965,1,3,0),
+(7,14028,1,3,0),
+(7,13963,1,3,0),
+(7,14026,1,3,0),
+(7,13964,1,3,0),
+(7,14027,1,3,0),
+(7,14069,1,3,0),
+(7,14124,1,3,0),
+(7,14065,1,1,0),
+(7,14066,1,1,0),
+(7,14067,1,1,0),
+(7,14068,1,1,0),
+(7,13962,1,3,0),
+(7,14125,1,3,0),
+(7,14089,1,3,0),
+(7,14090,1,3,0),
+(7,14091,1,3,0),
+(7,14092,1,3,0),
+(7,14194,1,3,0),
+(7,14191,1,3,0),
+(7,14198,1,3,0),
+(7,14197,1,3,0),
+(7,14179,1,1,0),
+(7,14180,1,1,0),
+(7,14181,1,1,0),
+(7,14182,1,1,0),
+(7,14183,1,1,0),
+(7,14196,1,3,0),
+(7,14195,1,3,0),
+(7,14193,1,3,0),
+(7,14192,1,3,0),
+(7,14407,1,3,0),
+(7,14414,1,3,0),
+(7,14406,1,3,0),
+(7,14413,1,3,0),
+(7,14416,1,3,0),
+(7,14549,1,3,0),
+(7,14550,1,3,0),
+(7,14502,1,3,0),
+(7,14507,1,3,0),
+(7,14501,1,3,0),
+(7,14506,1,3,0),
+(7,14500,1,3,0),
+(7,14505,1,3,0),
+(7,14498,1,3,0),
+(7,14659,1,3,0),
+(7,14660,1,3,0),
+(7,14657,1,1,0),
+(7,14658,1,1,0),
+(7,11420,1,3,0),
+(7,14704,1,3,0),
+(7,11288,1,1,0),
+(7,11289,1,1,0),
+(7,11290,1,1,0),
+(7,11291,1,1,0),
+(7,10750,1,3,0),
+(7,14705,1,3,0),
+(7,10633,1,1,0),
+(7,10634,1,1,0),
+(7,10635,1,1,0),
+(7,10636,1,1,0),
+(7,14662,1,3,0),
+(7,14663,1,3,0),
+(7,14665,1,3,0),
+(7,14666,1,3,0),
+(7,14667,1,3,0),
+(7,14668,1,3,0),
+(7,14669,1,3,0),
+(7,14670,1,3,0),
+(7,14671,1,3,0),
+(7,14672,1,3,0),
+(7,14673,1,3,0),
+(7,14674,1,3,0),
+(7,14675,1,3,0),
+(7,14676,1,3,0),
+(7,14677,1,3,0),
+(7,14678,1,3,0),
+(7,14679,1,3,0),
+(7,14680,1,3,0),
+(7,14681,1,3,0),
+(7,14682,1,3,0),
+(7,14683,1,3,0),
+(7,14684,1,3,0),
+(7,14685,1,3,0),
+(7,14686,1,3,0),
+(7,14687,1,3,0),
+(7,14688,1,3,0),
+(7,14689,1,3,0),
+(7,14690,1,3,0),
+(7,14691,1,3,0),
+(7,14692,1,3,0),
+(7,14693,1,3,0),
+(7,14694,1,3,0),
+(7,14695,1,3,0),
+(7,14696,1,3,0),
+(7,14697,1,3,0),
+(7,14698,1,3,0),
+(7,14699,1,3,0),
+(7,14700,1,3,0),
+(7,14314,1,3,0),
+(7,14503,1,3,0),
+(7,14510,1,3,0),
+(7,14904,1,3,0),
+(7,14906,1,3,0),
+(7,14910,1,1,0),
+(7,14912,1,1,0),
+(7,14905,1,3,0),
+(7,14907,1,3,0),
+(7,14911,1,1,0),
+(7,14909,1,1,0),
+(7,14855,1,3,0),
+(7,14894,1,3,0),
+(7,14913,1,3,0),
+(7,14914,1,3,0),
+(7,14891,1,3,0),
+(7,14895,1,3,0),
+(7,15027,1,3,0),
+(7,15028,1,3,0),
+(7,15026,1,1,0),
+(7,15025,1,1,0),
+(7,15024,1,1,0),
+(7,15023,1,1,0),
+(7,15064,1,3,0),
+(7,15065,1,3,0),
+(7,15030,1,3,0),
+(7,15031,1,3,0),
+(7,15062,1,3,0),
+(7,15063,1,3,0),
+(7,15066,1,3,0),
+(7,15067,1,3,0),
+(7,15061,1,3,0),
+(7,15060,1,3,0),
+(7,1227,1,2,0),
+(7,13176,1,2,0),
+(7,4360,1,2,0),
+(7,4358,1,1,0),
+(7,15118,1,3,0),
+(7,15119,1,3,0),
+(7,15113,1,3,0),
+(7,15114,1,3,0),
+(7,15115,1,3,0),
+(7,15116,1,3,0),
+(7,15220,1,3,0),
+(7,15221,1,3,0),
+(7,14126,1,3,0),
+(7,15222,1,3,0),
+(7,15223,1,3,0),
+(7,15224,1,3,0),
+(7,15225,1,3,0),
+(7,15524,1,3,0),
+(7,15525,1,3,0),
+(7,15507,1,3,0),
+(7,15508,1,3,0),
+(7,15285,1,3,0),
+(7,15286,1,3,0),
+(7,15281,1,1,0),
+(7,15282,1,1,0),
+(7,15283,1,1,0),
+(7,15284,1,1,0),
+(7,15776,1,3,0),
+(7,15777,1,3,0),
+(7,15774,1,3,0),
+(7,15775,1,3,0),
+(7,15823,1,3,0),
+(7,15824,1,3,0),
+(7,15343,1,3,0),
+(7,15342,1,3,0),
+(7,15341,1,3,0),
+(7,15340,1,3,0),
+(7,15339,1,3,0),
+(7,15338,1,3,0),
+(7,15337,1,3,0),
+(7,15336,1,3,0),
+(7,15335,1,3,0),
+(7,15334,1,3,0),
+(7,15333,1,3,0),
+(7,15332,1,3,0),
+(7,15331,1,3,0),
+(7,15330,1,3,0),
+(7,15329,1,3,0),
+(7,15328,1,3,0),
+(7,15327,1,3,0),
+(7,15326,1,3,0),
+(7,15325,1,3,0),
+(7,15324,1,3,0),
+(7,15323,1,3,0),
+(7,15322,1,3,0),
+(7,15321,1,3,0),
+(7,15314,1,3,0),
+(7,15312,1,3,0),
+(7,15311,1,3,0),
+(7,15306,1,3,0),
+(7,15307,1,3,0),
+(7,15308,1,3,0),
+(7,15309,1,3,0),
+(7,15310,1,3,0),
+(7,15305,1,3,0),
+(7,15304,1,3,0),
+(7,15303,1,3,0),
+(7,15302,1,3,0),
+(7,15301,1,3,0),
+(7,15300,1,3,0),
+(7,15299,1,3,0),
+(7,15298,1,3,0),
+(7,15297,1,3,0),
+(7,15296,1,3,0),
+(7,15295,1,3,0),
+(7,15293,1,3,0),
+(7,15294,1,3,0),
+(7,15292,1,3,0),
+(7,15291,1,3,0),
+(7,15290,1,3,0),
+(7,15289,1,3,0),
+(7,15315,1,3,0),
+(7,15316,1,3,0),
+(7,15317,1,3,0),
+(7,15318,1,3,0),
+(7,15319,1,3,0),
+(7,15320,1,3,0),
+(7,15819,1,3,0),
+(7,15820,1,3,0),
+(7,15821,1,3,0),
+(7,15822,1,3,0),
+(7,16450,1,3,0),
+(7,16451,1,3,0),
+(7,16459,1,1,0),
+(7,16460,1,1,0),
+(7,16461,1,1,0),
+(7,16462,1,1,0),
+(7,16463,1,1,0),
+(7,16464,1,1,0),
+(7,16465,1,1,0),
+(7,16466,1,1,0),
+(7,16467,1,1,0),
+(7,16468,1,1,0),
+(7,16469,1,1,0),
+(7,16470,1,1,0),
+(7,16471,1,1,0),
+(7,16472,1,1,0),
+(7,16454,1,3,0),
+(7,16455,1,3,0),
+(7,16442,1,3,0),
+(7,16443,1,3,0),
+(7,16342,1,3,0),
+(7,16343,1,3,0),
+(7,16444,1,3,0),
+(7,16445,1,3,0),
+(7,16344,1,3,0),
+(7,16345,1,3,0),
+(7,16352,1,3,0),
+(7,16353,1,3,0),
+(7,16446,1,3,0),
+(7,16447,1,3,0),
+(7,16448,1,3,0),
+(7,16449,1,3,0),
+(7,16348,1,3,0),
+(7,16349,1,3,0);
+
+END;

bundled-schema/GachaDemo.sql

@@ -0,0 +1,102 @@
+BEGIN;
+
+-- Start Normal Demo
+INSERT INTO gacha_shop (min_gr, min_hr, name, url_banner, url_feature, url_thumbnail, wide, recommended, gacha_type, hidden)
+    VALUES (0, 0, 'Normal Demo',
+    'http://img4.imagetitan.com/img4/QeRWNAviFD8UoTx/26/26_template_innerbanner.png',
+    'http://img4.imagetitan.com/img4/QeRWNAviFD8UoTx/26/26_template_feature.png',
+    'http://img4.imagetitan.com/img4/small/26/26_template_outerbanner.png',
+    false, false, 0, false);
+
+-- Create two different 'rolls', the first rolls once for 1z, the second rolls eleven times for 10z
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+VALUES
+    ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 0, 10, 1, 0, 0, 0, 1, 0, 0),
+    ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 1, 10, 10, 0, 0, 0, 11, 0, 0);
+
+-- Creates a prize of 1z with a weighted chance of 100
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 100, 0, 0, 0, 100, 0, 0, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 1, 0);
+
+-- Creates a prize of 2z with a weighted chance of 70
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 100, 0, 0, 0, 70, 1, 0, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 2, 0);
+
+-- Creates a prize of 3z with a weighted chance of 10
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 100, 0, 0, 0, 10, 2, 0, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 3, 0);
+-- End Normal Demo
+
+-- Start Step-Up Demo
+INSERT INTO gacha_shop (min_gr, min_hr, name, url_banner, url_feature, url_thumbnail, wide, recommended, gacha_type, hidden)
+VALUES (0, 0, 'Step-Up Demo', '', '', '', false, false, 1, false);
+
+-- Create two 'steps', the first costs 1z, the second costs 2z
+-- The first step has zero rolls so it will only give the prizes directly linked to the entry ID, being 1z
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 0, 10, 1, 0, 0, 0, 0, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 1, 0);
+
+-- The second step has one roll on the random prize list as will as the direct prize, being 3z
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 1, 10, 2, 0, 0, 0, 1, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 3, 0);
+
+-- Set up two random prizes, the first gives 1z, the second gives 2z
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 100, 0, 0, 0, 100, 0, 0, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 1, 0);
+
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 100, 0, 0, 0, 90, 1, 0, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 2, 0);
+-- End Step-Up Demo
+
+-- Start Box Demo
+INSERT INTO gacha_shop (min_gr, min_hr, name, url_banner, url_feature, url_thumbnail, wide, recommended, gacha_type, hidden)
+VALUES (0, 0, 'Box Demo', '', '', '', false, false, 4, false);
+
+-- Create two different 'rolls', the first rolls once for 1z, the second rolls twice for 2z
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+VALUES
+    ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 0, 10, 1, 0, 0, 0, 1, 0, 0),
+    ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 1, 10, 2, 0, 0, 0, 2, 0, 0);
+
+-- Create five different 'Box' items, weight is always 0 for these
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 100, 0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 1, 0);
+
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 100, 0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 1, 0);
+
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 100, 0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 1, 0);
+
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 100, 0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 2, 0);
+
+INSERT INTO gacha_entries (gacha_id, entry_type, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points)
+    VALUES ((SELECT id FROM gacha_shop ORDER BY id DESC LIMIT 1), 100, 0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO gacha_items (entry_id, item_type, item_id, quantity)
+    VALUES ((SELECT id FROM gacha_entries ORDER BY id DESC LIMIT 1), 10, 3, 0);
+-- End Box Demo
+
+END;

bundled-schema/OtherShops.sql

@@ -0,0 +1,12 @@
+BEGIN;
+
+INSERT INTO public.shop_items
+(shop_type, shop_id, item_id, cost, quantity, min_hr, min_sr, min_gr, store_level, max_quantity, road_floors, road_fatalis)
+VALUES
+    (5,5,16516,100,1,0,0,1,0,0,0,0),
+    (5,5,16517,100,1,0,0,1,0,0,0,0),
+    (7,0,13190,10,1,0,0,0,0,0,0,0),
+    (7,0,1662,10,1,0,0,0,0,0,0,0),
+    (7,0,10179,100,1,0,0,0,0,0,0,0);
+
+END;

common/byteframe/byteframe.go

@@ -138,6 +138,10 @@ func (b *ByteFrame) DataFromCurrent() []byte {
 	return b.buf[b.index:b.usedSize]
 }
 
+func (b *ByteFrame) Index() uint {
+	return b.index
+}
+
 // SetLE sets the byte order to litte endian.
 func (b *ByteFrame) SetLE() {
 	b.byteOrder = binary.LittleEndian

common/decryption/jpk.go

@@ -0,0 +1,109 @@
+package decryption
+
+/*
+	This code is HEAVILY based from
+	https://github.com/Chakratos/ReFrontier/blob/master/ReFrontier/Unpack.cs
+*/
+
+import (
+	"erupe-ce/common/byteframe"
+	"io"
+)
+
+var mShiftIndex = 0
+var mFlag = byte(0)
+
+func UnpackSimple(data []byte) []byte {
+	mShiftIndex = 0
+	mFlag = byte(0)
+
+	bf := byteframe.NewByteFrameFromBytes(data)
+	bf.SetLE()
+	header := bf.ReadUint32()
+
+	if header == 0x1A524B4A {
+		bf.Seek(0x2, io.SeekCurrent)
+		jpkType := bf.ReadUint16()
+
+		switch jpkType {
+		case 3:
+			startOffset := bf.ReadInt32()
+			outSize := bf.ReadInt32()
+			outBuffer := make([]byte, outSize)
+			bf.Seek(int64(startOffset), io.SeekStart)
+			ProcessDecode(bf, outBuffer)
+
+			return outBuffer
+		}
+	}
+
+	return data
+}
+
+func ProcessDecode(data *byteframe.ByteFrame, outBuffer []byte) {
+	outIndex := 0
+
+	for int(data.Index()) < len(data.Data()) && outIndex < len(outBuffer)-1 {
+		if JPKBitShift(data) == 0 {
+			outBuffer[outIndex] = ReadByte(data)
+			outIndex++
+			continue
+		} else {
+			if JPKBitShift(data) == 0 {
+				length := (JPKBitShift(data) << 1) | JPKBitShift(data)
+				off := ReadByte(data)
+				JPKCopy(outBuffer, int(off), int(length)+3, &outIndex)
+				continue
+			} else {
+				hi := ReadByte(data)
+				lo := ReadByte(data)
+				length := int(hi&0xE0) >> 5
+				off := ((int(hi) & 0x1F) << 8) | int(lo)
+				if length != 0 {
+					JPKCopy(outBuffer, off, length+2, &outIndex)
+					continue
+				} else {
+					if JPKBitShift(data) == 0 {
+						length := (JPKBitShift(data) << 3) | (JPKBitShift(data) << 2) | (JPKBitShift(data) << 1) | JPKBitShift(data)
+						JPKCopy(outBuffer, off, int(length)+2+8, &outIndex)
+						continue
+					} else {
+						temp := ReadByte(data)
+						if temp == 0xFF {
+							for i := 0; i < off+0x1B; i++ {
+								outBuffer[outIndex] = ReadByte(data)
+								outIndex++
+								continue
+							}
+						} else {
+							JPKCopy(outBuffer, off, int(temp)+0x1a, &outIndex)
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+func JPKBitShift(data *byteframe.ByteFrame) byte {
+	mShiftIndex--
+
+	if mShiftIndex < 0 {
+		mShiftIndex = 7
+		mFlag = ReadByte(data)
+	}
+
+	return (byte)((mFlag >> mShiftIndex) & 1)
+}
+
+func JPKCopy(outBuffer []byte, offset int, length int, index *int) {
+	for i := 0; i < length; i++ {
+		outBuffer[*index] = outBuffer[*index-offset-1]
+		*index++
+	}
+}
+
+func ReadByte(bf *byteframe.ByteFrame) byte {
+	value := bf.ReadUint8()
+	return value
+}

common/mhfcourse/mhfcourse.go

@@ -0,0 +1,102 @@
+package mhfcourse
+
+import (
+	"math"
+	"sort"
+	"time"
+)
+
+type Course struct {
+	ID     uint16
+	Expiry time.Time
+}
+
+var aliases = map[uint16][]string{
+	1:  {"Trial", "TL"},
+	2:  {"HunterLife", "HL"},
+	3:  {"Extra", "ExtraA", "EX"},
+	4:  {"ExtraB"},
+	5:  {"Mobile"},
+	6:  {"Premium"},
+	7:  {"Pallone", "ExtraC"},
+	8:  {"Assist", "***ist", "Legend", "Rasta"},
+	9:  {"N"},
+	10: {"Hiden", "Secret"},
+	11: {"HunterSupport", "HunterAid", "Support", "Aid", "Royal"},
+	12: {"NBoost", "NetCafeBoost", "Boost"},
+	// 13-19 show up as (unknown)
+	20: {"DEBUG"},
+	21: {"COG_LINK_EXPIRED"},
+	22: {"360_GOLD"},
+	23: {"PS3_TROP"},
+	24: {"COG"},
+	25: {"CAFE_SP"},
+	26: {"NetCafe", "Cafe", "OfficialCafe", "Official"},
+	27: {"HLRenewing", "HLR", "HLRenewal", "HLRenew", "CardHL"},
+	28: {"EXRenewing", "EXR", "EXRenewal", "EXRenew", "CardEX"},
+	29: {"Free"},
+	// 30 = Real NetCafe course
+}
+
+func (c Course) Aliases() []string {
+	return aliases[c.ID]
+}
+
+func Courses() []Course {
+	courses := make([]Course, 32)
+	for i := range courses {
+		courses[i].ID = uint16(i)
+	}
+	return courses
+}
+
+func (c Course) Value() uint32 {
+	return uint32(math.Pow(2, float64(c.ID)))
+}
+
+// CourseExists returns true if the named course exists in the given slice
+func CourseExists(ID uint16, c []Course) bool {
+	for _, course := range c {
+		if course.ID == ID {
+			return true
+		}
+	}
+	return false
+}
+
+// GetCourseStruct returns a slice of Course(s) from a rights integer
+func GetCourseStruct(rights uint32) ([]Course, uint32) {
+	resp := []Course{{ID: 1}, {ID: 23}, {ID: 24}}
+	s := Courses()
+	sort.Slice(s, func(i, j int) bool {
+		return s[i].ID > s[j].ID
+	})
+	var normalCafeCourseSet, netcafeCourseSet bool
+	for _, course := range s {
+		if rights-course.Value() < 0x80000000 {
+			switch course.ID {
+			case 26:
+				if normalCafeCourseSet {
+					break
+				}
+				normalCafeCourseSet = true
+				resp = append(resp, Course{ID: 25})
+				fallthrough
+			case 9:
+				if netcafeCourseSet {
+					break
+				}
+				netcafeCourseSet = true
+				resp = append(resp, Course{ID: 30})
+			}
+			course.Expiry = time.Date(2030, 1, 1, 0, 0, 0, 0, time.FixedZone("UTC+9", 9*60*60))
+			resp = append(resp, course)
+			rights -= course.Value()
+		}
+	}
+	rights = 0
+	for _, course := range resp {
+		rights += course.Value()
+	}
+	return resp, rights
+}

common/stringsupport/string_convert.go

@@ -2,87 +2,15 @@ package stringsupport
 
 import (
 	"bytes"
-	"io/ioutil"
+	"fmt"
+	"io"
 	"strconv"
 	"strings"
 
-	"golang.org/x/text/encoding"
 	"golang.org/x/text/encoding/japanese"
 	"golang.org/x/text/transform"
 )
 
-// StringConverter is a small helper for encoding/decoding strings.
-type StringConverter struct {
-	Encoding encoding.Encoding
-}
-
-// Decode decodes the given bytes as the set encoding.
-func (sc *StringConverter) Decode(data []byte) (string, error) {
-	decoded, err := ioutil.ReadAll(transform.NewReader(bytes.NewBuffer(data), sc.Encoding.NewDecoder()))
-
-	if err != nil {
-		return "", err
-	}
-
-	return string(decoded), nil
-}
-
-// MustDecode decodes the given bytes as the set encoding. Panics on decode failure.
-func (sc *StringConverter) MustDecode(data []byte) string {
-	decoded, err := sc.Decode(data)
-	if err != nil {
-		panic(err)
-	}
-
-	return decoded
-}
-
-// Encode encodes the given string as the set encoding.
-func (sc *StringConverter) Encode(data string) ([]byte, error) {
-	encoded, err := ioutil.ReadAll(transform.NewReader(bytes.NewBuffer([]byte(data)), sc.Encoding.NewEncoder()))
-
-	if err != nil {
-		return nil, err
-	}
-
-	return encoded, nil
-}
-
-// MustEncode encodes the given string as the set encoding. Panics on encode failure.
-func (sc *StringConverter) MustEncode(data string) []byte {
-	encoded, err := sc.Encode(data)
-	if err != nil {
-		panic(err)
-	}
-
-	return encoded
-}
-
-/*
-func MustConvertShiftJISToUTF8(text string) string {
-	result, err := ConvertShiftJISToUTF8(text)
-	if err != nil {
-		panic(err)
-	}
-	return result
-}
-func MustConvertUTF8ToShiftJIS(text string) string {
-	result, err := ConvertUTF8ToShiftJIS(text)
-	if err != nil {
-		panic(err)
-	}
-	return result
-}
-func ConvertShiftJISToUTF8(text string) (string, error) {
-	r := bytes.NewBuffer([]byte(text))
-	decoded, err := ioutil.ReadAll(transform.NewReader(r, japanese.ShiftJIS.NewDecoder()))
-	if err != nil {
-		return "", err
-	}
-	return string(decoded), nil
-}
-*/
-
 func UTF8ToSJIS(x string) []byte {
 	e := japanese.ShiftJIS.NewEncoder()
 	xt, _, err := transform.String(e, x)
@@ -94,7 +22,7 @@ func UTF8ToSJIS(x string) []byte {
 
 func SJISToUTF8(b []byte) string {
 	d := japanese.ShiftJIS.NewDecoder()
-	result, err := ioutil.ReadAll(transform.NewReader(bytes.NewReader(b), d))
+	result, err := io.ReadAll(transform.NewReader(bytes.NewReader(b), d))
 	if err != nil {
 		panic(err)
 	}
@@ -170,21 +98,22 @@ func CSVElems(csv string) []int {
 	return r
 }
 
-// ConvertUTF8ToShiftJIS converts a UTF8 string to a Shift-JIS []byte.
-func ConvertUTF8ToShiftJIS(text string) ([]byte, error) {
-	r := bytes.NewBuffer([]byte(text))
-	encoded, err := ioutil.ReadAll(transform.NewReader(r, japanese.ShiftJIS.NewEncoder()))
-	if err != nil {
-		return nil, err
+func CSVGetIndex(csv string, i int) int {
+	s := CSVElems(csv)
+	if i < len(s) {
+		return s[i]
 	}
-
-	return encoded, nil
+	return 0
 }
 
-func ConvertUTF8ToSJIS(text string) (string, error) {
-	r, _, err := transform.String(japanese.ShiftJIS.NewEncoder(), text)
-	if err != nil {
-		return "", err
+func CSVSetIndex(csv string, i int, v int) string {
+	s := CSVElems(csv)
+	if i < len(s) {
+		s[i] = v
 	}
-	return r, nil
+	var r []string
+	for j := 0; j < len(s); j++ {
+		r = append(r, fmt.Sprintf(`%d`, s[j]))
+	}
+	return strings.Join(r, ",")
 }

common/token/token.go

@@ -0,0 +1,22 @@
+package token
+
+import (
+	"math/rand"
+	"time"
+)
+
+// Generate returns an alphanumeric token of specified length
+func Generate(length int) string {
+	rng := RNG()
+	var chars = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
+	b := make([]rune, length)
+	for i := range b {
+		b[i] = chars[rng.Intn(len(chars))]
+	}
+	return string(b)
+}
+
+// RNG returns a new RNG generator
+func RNG() *rand.Rand {
+	return rand.New(rand.NewSource(time.Now().UnixNano()))
+}

config.json

@@ -1,34 +1,73 @@
 {
   "Host": "127.0.0.1",
   "BinPath": "bin",
+  "Language": "en",
   "DisableSoftCrash": false,
-  "FeaturedWeapons": 1,
+  "HideLoginNotice": true,
+  "LoginNotices": [
+    "<BODY><CENTER><SIZE_3><C_4>Welcome to Erupe SU9.3!<BR><BODY><LEFT><SIZE_2><C_5>Erupe is experimental software<C_7>, we are not liable for any<BR><BODY>issues caused by installing the software!<BR><BODY><BR><BODY><C_4>■Report bugs on Discord!<C_7><BR><BODY><BR><BODY><C_4>■Test everything!<C_7><BR><BODY><BR><BODY><C_4>■Don't talk to softlocking NPCs!<C_7><BR><BODY><BR><BODY><C_4>■Fork the code on GitHub!<C_7><BR><BODY><BR><BODY>Thank you to all of the contributors,<BR><BODY><BR><BODY>this wouldn't exist without you."
+  ],
+  "PatchServerManifest": "",
+  "PatchServerFile": "",
+  "ScreenshotAPIURL": "",
+  "DeleteOnSaveCorruption": false,
+  "ClientMode": "ZZ",
   "DevMode": true,
   "DevModeOptions": {
-    "PatchServerManifest": "",
-    "PatchServerFile": "",
     "AutoCreateAccount": true,
-    "EnableLauncherServer": false,
-    "HideLoginNotice": false,
-    "LoginNotice": "<BODY><CENTER><SIZE_3><C_4>Welcome to Erupe SU9.1 Beta!<BR><BODY><LEFT><SIZE_2><C_5>Erupe is experimental software<C_7>, we are not liable for any<BR><BODY>issues caused by installing the software!<BR><BODY><BR><BODY><C_4>■Report bugs on Discord!<C_7><BR><BODY><BR><BODY><C_4>■Test everything!<C_7><BR><BODY><BR><BODY><C_4>■Don't talk to softlocking NPCs!<C_7><BR><BODY><BR><BODY><C_4>■Fork the code on GitHub!<C_7><BR><BODY><BR><BODY>Thank you to all of the contributors,<BR><BODY><BR><BODY>this wouldn't exist without you.",
     "CleanDB": false,
     "MaxLauncherHR": false,
-    "LogInboundMessages": false,
-    "LogOutboundMessages": false,
+    "LogInboundMessages": true,
+    "LogOutboundMessages": true,
     "MaxHexdumpLength": 256,
     "DivaEvent": 0,
     "FestaEvent": -1,
     "TournamentEvent": 0,
     "MezFesEvent": true,
     "MezFesAlt": false,
-    "DisableMailItems": true,
     "DisableTokenCheck": false,
     "QuestDebugTools": false,
+    "EarthStatusOverride": 0,
+    "EarthIDOverride": 0,
+    "EarthMonsterOverride": 0,
     "SaveDumps": {
       "Enabled": true,
-      "OutputDir": "savedata"
+      "OutputDir": "save-backups"
     }
   },
+  "GameplayOptions": {
+    "FeaturedWeapons": 1,
+    "MaximumNP": 100000,
+    "MaximumRP": 50000,
+    "MaximumFP": 120000,
+    "DisableLoginBoost": false,
+    "DisableBoostTime": false,
+    "BoostTimeDuration": 120,
+    "GuildMealDuration": 60,
+    "BonusQuestAllowance": 3,
+    "DailyQuestAllowance": 1,
+    "MezfesSoloTickets": 10,
+    "MezfesGroupTickets": 4,
+    "LowLatencyRaviente": false,
+    "RegularRavienteMaxPlayers": 8,
+    "ViolentRavienteMaxPlayers": 8,
+    "BerserkRavienteMaxPlayers": 32,
+    "ExtremeRavienteMaxPlayers": 32,
+    "SmallBerserkRavienteMaxPlayers": 8,
+    "GUrgentRate": 10,
+    "GCPMultiplier": 1.00,
+    "GRPMultiplier": 1.00,
+    "GSRPMultiplier": 1.00,
+    "GZennyMultiplier": 1.00,
+    "MaterialMultiplier": 1.00,
+    "ExtraCarves": 0,
+    "DisableHunterNavi": false,
+    "EnableKaijiEvent": false,
+    "EnableHiganjimaEvent": false,
+    "EnableNierEvent": false,
+    "DisableRoad": false,
+    "SeasonOverride": false
+  },
   "Discord": {
     "Enabled": false,
     "BotToken": "",
@@ -37,26 +76,47 @@
   "Commands": [
     {
       "Name": "Rights",
-      "Enabled": true,
-      "Prefix": "!rights"
+      "Enabled": false,
+      "Prefix": "rights"
     }, {
       "Name": "Raviente",
       "Enabled": true,
-      "Prefix": "!ravi"
+      "Prefix": "ravi"
     }, {
       "Name": "Teleport",
       "Enabled": false,
-      "Prefix": "!tele"
+      "Prefix": "tele"
     }, {
       "Name": "Reload",
       "Enabled": true,
-      "Prefix": "!reload"
+      "Prefix": "reload"
     }, {
       "Name": "KeyQuest",
       "Enabled": false,
-      "Prefix": "!kqf"
+      "Prefix": "kqf"
+    }, {
+      "Name": "Course",
+      "Enabled": true,
+      "Prefix": "course"
+    }, {
+      "Name": "PSN",
+      "Enabled": true,
+      "Prefix": "psn"
     }
   ],
+  "Courses": [
+    {"Name": "HunterLife", "Enabled": true},
+    {"Name": "Extra", "Enabled": true},
+    {"Name": "Premium", "Enabled": true},
+    {"Name": "Assist", "Enabled": false},
+    {"Name": "N", "Enabled": false},
+    {"Name": "Hiden", "Enabled": false},
+    {"Name": "HunterSupport", "Enabled": false},
+    {"Name": "NBoost", "Enabled": false},
+    {"Name": "NetCafe", "Enabled": true},
+    {"Name": "HLRenewing", "Enabled": true},
+    {"Name": "EXRenewing", "Enabled": true}
+  ],
   "Database": {
     "Host": "localhost",
     "Port": 5432,
@@ -64,15 +124,14 @@
     "Password": "",
     "Database": "erupe"
   },
-  "Launcher": {
-    "Enabled": false,
-    "Port": 80,
-    "UseOriginalLauncherFiles": false
-  },
   "Sign": {
     "Enabled": true,
     "Port": 53312
   },
+  "SignV2": {
+    "Enabled": false,
+    "Port": 8080
+  },
   "Channel": {
     "Enabled": true
   },

config/config.go

@@ -1,54 +1,117 @@
-package config
+package _config
 
 import (
 	"fmt"
 	"log"
 	"net"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/spf13/viper"
 )
 
+type Mode int
+
+const (
+	S1 Mode = iota + 1
+	S15
+	S2
+	S25
+	S3
+	S35
+	S4
+	S5
+	S55
+	S6
+	S7
+	S8
+	S85
+	S9
+	S10
+	F1
+	F2
+	F3
+	F4
+	F5
+	G1
+	G2
+	G3
+	G31
+	G32
+	GG
+	G5
+	G51
+	G52
+	G6
+	G61
+	G7
+	G8
+	G81
+	G9
+	G91
+	G10
+	G101
+	Z1
+	Z2
+	ZZ
+)
+
+var versionStrings = []string{"S1.0", "S1.5", "S2.0", "S2.5", "S3.0", "S3.5", "S4.0", "S5.0", "S5.5", "S6.0", "S7.0",
+	"S8.0", "S8.5", "S9", "S10", "FW.1", "FW.2", "FW.3", "FW.4", "FW.5", "G1", "G2", "G3", "G3.1", "G3.2", "GG", "G5",
+	"G5.1", "G5.2", "G6", "G6.1", "G7", "G8", "G8.1", "G9", "G9.1", "G10", "G10.1", "Z1", "Z2", "ZZ"}
+
+func (m Mode) String() string {
+	return versionStrings[m]
+}
+
 // Config holds the global server-wide config.
 type Config struct {
-	Host             string `mapstructure:"Host"`
-	BinPath          string `mapstructure:"BinPath"`
-	DisableSoftCrash bool   // Disables the 'Press Return to exit' dialog allowing scripts to reboot the server automatically
-	FeaturedWeapons  int    // Number of Active Feature weapons to generate daily
-	DevMode          bool
+	Host                   string `mapstructure:"Host"`
+	BinPath                string `mapstructure:"BinPath"`
+	Language               string
+	DisableSoftCrash       bool     // Disables the 'Press Return to exit' dialog allowing scripts to reboot the server automatically
+	HideLoginNotice        bool     // Hide the Erupe notice on login
+	LoginNotices           []string // MHFML string of the login notices displayed
+	PatchServerManifest    string   // Manifest patch server override
+	PatchServerFile        string   // File patch server override
+	ScreenshotAPIURL       string   // Destination for screenshots uploaded to BBS
+	DeleteOnSaveCorruption bool     // Attempts to save corrupted data will flag the save for deletion
+	ClientMode             string
+	RealClientMode         Mode
+	DevMode                bool
 
-	DevModeOptions DevModeOptions
-	Discord        Discord
-	Commands       []Command
-	Database       Database
-	Launcher       Launcher
-	Sign           Sign
-	Channel        Channel
-	Entrance       Entrance
+	DevModeOptions  DevModeOptions
+	GameplayOptions GameplayOptions
+	Discord         Discord
+	Commands        []Command
+	Courses         []Course
+	Database        Database
+	Sign            Sign
+	SignV2          SignV2
+	Channel         Channel
+	Entrance        Entrance
 }
 
 // DevModeOptions holds various debug/temporary options for use while developing Erupe.
 type DevModeOptions struct {
-	PatchServerManifest string // Manifest patch server override
-	PatchServerFile     string // File patch server override
-	AutoCreateAccount   bool   // Automatically create accounts if they don't exist
-	HideLoginNotice     bool   // Hide the Erupe notice on login
-	LoginNotice         string // MHFML string of the login notice displayed
-	CleanDB             bool   // Automatically wipes the DB on server reset.
-	MaxLauncherHR       bool   // Sets the HR returned in the launcher to HR7 so that you can join non-beginner worlds.
-	LogInboundMessages  bool   // Log all messages sent to the server
-	LogOutboundMessages bool   // Log all messages sent to the clients
-	MaxHexdumpLength    int    // Maximum number of bytes printed when logs are enabled
-	DivaEvent           int    // Diva Defense event status
-	FestaEvent          int    // Hunter's Festa event status
-	TournamentEvent     int    // VS Tournament event status
-	MezFesEvent         bool   // MezFes status
-	MezFesAlt           bool   // Swaps out Volpakkun for Tokotoko
-	DisableTokenCheck   bool   // Disables checking login token exists in the DB (security risk!)
-	DisableMailItems    bool   // Hack to prevent english versions of MHF from crashing
-	QuestDebugTools     bool   // Enable various quest debug logs
-	SaveDumps           SaveDumpOptions
+	AutoCreateAccount    bool // Automatically create accounts if they don't exist
+	CleanDB              bool // Automatically wipes the DB on server reset.
+	MaxLauncherHR        bool // Sets the HR returned in the launcher to HR7 so that you can join non-beginner worlds.
+	LogInboundMessages   bool // Log all messages sent to the server
+	LogOutboundMessages  bool // Log all messages sent to the clients
+	MaxHexdumpLength     int  // Maximum number of bytes printed when logs are enabled
+	DivaEvent            int  // Diva Defense event status
+	FestaEvent           int  // Hunter's Festa event status
+	TournamentEvent      int  // VS Tournament event status
+	MezFesEvent          bool // MezFes status
+	MezFesAlt            bool // Swaps out Volpakkun for Tokotoko
+	DisableTokenCheck    bool // Disables checking login token exists in the DB (security risk!)
+	QuestDebugTools      bool // Enable various quest debug logs
+	EarthStatusOverride  int32
+	EarthIDOverride      int32
+	EarthMonsterOverride int32
+	SaveDumps            SaveDumpOptions
 }
 
 type SaveDumpOptions struct {
@@ -56,6 +119,41 @@ type SaveDumpOptions struct {
 	OutputDir string
 }
 
+// GameplayOptions has various gameplay modifiers
+type GameplayOptions struct {
+	FeaturedWeapons                int    // Number of Active Feature weapons to generate daily
+	MaximumNP                      int    // Maximum number of NP held by a player
+	MaximumRP                      uint16 // Maximum number of RP held by a player
+	MaximumFP                      uint32 // Maximum number of FP held by a player
+	DisableLoginBoost              bool   // Disables the Login Boost system
+	DisableBoostTime               bool   // Disables the daily NetCafe Boost Time
+	BoostTimeDuration              int    // The number of minutes NetCafe Boost Time lasts for
+	GuildMealDuration              int    // The number of minutes a Guild Meal can be activated for after cooking
+	BonusQuestAllowance            uint32 // Number of Bonus Point Quests to allow daily
+	DailyQuestAllowance            uint32 // Number of Daily Quests to allow daily
+	MezfesSoloTickets              uint32 // Number of solo tickets given weekly
+	MezfesGroupTickets             uint32 // Number of group tickets given weekly
+	LowLatencyRaviente             bool   // Toggles low latency mode for Raviente, can be network intensive
+	RegularRavienteMaxPlayers      uint8
+	ViolentRavienteMaxPlayers      uint8
+	BerserkRavienteMaxPlayers      uint8
+	ExtremeRavienteMaxPlayers      uint8
+	SmallBerserkRavienteMaxPlayers uint8
+	GUrgentRate                    uint16  // Adjusts the rate of G Urgent quests spawning
+	GCPMultiplier                  float32 // Adjusts the multiplier of GCP rewarded for quest completion
+	GRPMultiplier                  float32 // Adjusts the multiplier of G Rank Points rewarded for quest completion
+	GSRPMultiplier                 float32 // Adjusts the multiplier of G Skill Rank Points rewarded for quest completion
+	GZennyMultiplier               float32 // Adjusts the multiplier of G Zenny rewarded for quest completion
+	MaterialMultiplier             float32 // Adjusts the multiplier of Monster Materials rewarded for quest completion
+	ExtraCarves                    uint16  // Grant n extra chances to carve ALL carcasses
+	DisableHunterNavi              bool    // Disables the Hunter Navi
+	EnableKaijiEvent               bool    // Enables the Kaiji event in the Rasta Bar
+	EnableHiganjimaEvent           bool    // Enables the Higanjima event in the Rasta Bar
+	EnableNierEvent                bool    // Enables the Nier event in the Rasta Bar
+	DisableRoad                    bool    // Disables the Hunting Road
+	SeasonOverride                 bool    // Overrides the Quest Season with the current Mezeporta Season
+}
+
 // Discord holds the discord integration config.
 type Discord struct {
 	Enabled           bool
@@ -70,6 +168,12 @@ type Command struct {
 	Prefix  string
 }
 
+// Course represents a course within MHF
+type Course struct {
+	Name    string
+	Enabled bool
+}
+
 // Database holds the postgres database config.
 type Database struct {
 	Host     string
@@ -79,19 +183,18 @@ type Database struct {
 	Database string
 }
 
-// Launcher holds the launcher server config.
-type Launcher struct {
-	Enabled                  bool
-	Port                     int
-	UseOriginalLauncherFiles bool
-}
-
 // Sign holds the sign server config.
 type Sign struct {
 	Enabled bool
 	Port    int
 }
 
+// SignV2 holds the new sign server config
+type SignV2 struct {
+	Enabled bool
+	Port    int
+}
+
 type Channel struct {
 	Enabled bool
 }
@@ -133,7 +236,6 @@ func init() {
 	if err != nil {
 		preventClose(fmt.Sprintf("Failed to load config: %s", err.Error()))
 	}
-
 }
 
 // getOutboundIP4 gets the preferred outbound ip4 of this machine
@@ -156,8 +258,8 @@ func LoadConfig() (*Config, error) {
 	viper.AddConfigPath(".")
 
 	viper.SetDefault("DevModeOptions.SaveDumps", SaveDumpOptions{
-		Enabled:   false,
-		OutputDir: "savedata",
+		Enabled:   true,
+		OutputDir: "save-backups",
 	})
 
 	err := viper.ReadInConfig()
@@ -175,6 +277,20 @@ func LoadConfig() (*Config, error) {
 		c.Host = getOutboundIP4().To4().String()
 	}
 
+	for i := range versionStrings {
+		if strings.ToUpper(c.ClientMode) == versionStrings[i] {
+			c.RealClientMode = Mode(i + 1)
+			c.ClientMode = strings.ToUpper(c.ClientMode)
+			if c.RealClientMode <= G101 {
+				c.ClientMode += " (Debug only)"
+			}
+		}
+	}
+	if c.RealClientMode == 0 {
+		c.ClientMode = versionStrings[len(versionStrings)-1]
+		c.RealClientMode = ZZ
+	}
+
 	return c, nil
 }
 

go.mod

@@ -1,23 +1,35 @@
 module erupe-ce
 
-go 1.16
+go 1.21
 
 require (
-	github.com/bwmarrin/discordgo v0.23.2
-	github.com/golang/mock v1.6.0 // indirect
+	github.com/bwmarrin/discordgo v0.27.1
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
-	github.com/gorilla/websocket v1.4.2 // indirect
-	github.com/jmoiron/sqlx v1.3.4
-	github.com/lib/pq v1.10.4
-	github.com/mitchellh/mapstructure v1.4.3 // indirect
-	github.com/sachaos/lottery v0.0.0-20180520074626-61949d99bd96
-	github.com/spf13/viper v1.8.1
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.7.0 // indirect
-	go.uber.org/zap v1.18.1
-	golang.org/x/crypto v0.0.0-20211202192323-5770296d904e
-	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
-	golang.org/x/text v0.3.7
-	golang.org/x/tools v0.1.11-0.20220513221640-090b14e8501f // indirect
+	github.com/jmoiron/sqlx v1.3.5
+	github.com/lib/pq v1.10.9
+	github.com/spf13/viper v1.16.0
+	go.uber.org/zap v1.25.0
+	golang.org/x/crypto v0.12.0
+	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
+	golang.org/x/text v0.12.0
+)
+
+require (
+	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.9 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -3,6 +3,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
@@ -15,9 +16,7 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY
 cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
 cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
+cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
@@ -26,7 +25,6 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -36,19 +34,14 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
-github.com/bwmarrin/discordgo v0.23.2 h1:BzrtTktixGHIu9Tt7dEE6diysEF9HWnXeHuoJEt2fH4=
-github.com/bwmarrin/discordgo v0.23.2/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M=
+github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
+github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/bwmarrin/discordgo v0.27.1 h1:ib9AIc/dom1E/fSIulrBwnez0CToJE113ZGt4HoliGY=
+github.com/bwmarrin/discordgo v0.27.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
@@ -57,8 +50,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -67,21 +58,19 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
+github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
+github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
+github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -93,9 +82,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
-github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -110,9 +96,6 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -123,10 +106,9 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -139,161 +121,105 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
 github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
-github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
-github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
-github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/jmoiron/sqlx v1.3.4 h1:wv+0IJZfL5z0uZoUjlpKgHkgaFSYD+r9CfrXjEXsO7w=
-github.com/jmoiron/sqlx v1.3.4/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
+github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
-github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
-github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
+github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
-github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
-github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
-github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
-github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0=
+github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sachaos/lottery v0.0.0-20180520074626-61949d99bd96 h1:BanNeULiV7hOXjHPUQt3tgF6qVHGZ0uLMnCr0WZ5CTk=
-github.com/sachaos/lottery v0.0.0-20180520074626-61949d99bd96/go.mod h1:NuxNqEW5jNyYkZ5WSBB70WQXtRKY1jUPMzX74wr5JFo=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
-github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
-github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
+github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
+github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
+github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44=
-github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
+github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc=
+github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
+github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
-go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
-go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
-go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec=
-go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
-go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-go.uber.org/zap v1.18.1 h1:CSUJ2mjFszzEWt4CdKISEuChVIXGBn3lAPwkRGyVrc4=
-go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
-golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
+go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
+go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211202192323-5770296d904e h1:MUP6MR3rJ7Gk9LEia0LP2ytiH6MuCfs7qYz+47jGdD8=
-golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
+golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -304,6 +230,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
+golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -317,8 +245,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu
 golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
@@ -329,12 +255,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -361,13 +283,9 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -378,9 +296,6 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -391,10 +306,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -404,7 +316,6 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -426,18 +337,13 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211205182925-97ca703d548d h1:FjkYO/PPp4Wi0EAUOVLxePm7qVW4r4ctbWpURyuOD0E=
-golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -445,10 +351,10 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
+golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -458,7 +364,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -468,8 +373,6 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -492,7 +395,6 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
@@ -501,12 +403,8 @@ golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.11-0.20220513221640-090b14e8501f h1:OKYpQQVE3DKSc3r3zHVzq46vq5YH7x8xpR3/k9ixmUg=
-golang.org/x/tools v0.1.11-0.20220513221640-090b14e8501f/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -530,9 +428,6 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
 google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -563,7 +458,6 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
@@ -575,12 +469,8 @@ google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -594,13 +484,9 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -611,22 +497,16 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
-gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

main.go

@@ -1,19 +1,20 @@
 package main
 
 import (
+	_config "erupe-ce/config"
 	"fmt"
 	"net"
 	"os"
 	"os/signal"
+	"runtime/debug"
 	"syscall"
 	"time"
 
-	"erupe-ce/config"
 	"erupe-ce/server/channelserver"
 	"erupe-ce/server/discordbot"
 	"erupe-ce/server/entranceserver"
-	"erupe-ce/server/launcherserver"
 	"erupe-ce/server/signserver"
+	"erupe-ce/server/signv2server"
 
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
@@ -29,27 +30,47 @@ func cleanDB(db *sqlx.DB) {
 	_ = db.MustExec("DELETE FROM users")
 }
 
+var Commit = func() string {
+	if info, ok := debug.ReadBuildInfo(); ok {
+		for _, setting := range info.Settings {
+			if setting.Key == "vcs.revision" {
+				return setting.Value[:7]
+			}
+		}
+	}
+	return "unknown"
+}
+
 func main() {
 	var err error
-	zapLogger, _ := zap.NewDevelopment()
+
+	var zapLogger *zap.Logger
+	config := _config.ErupeConfig
+	if config.DevMode {
+		zapLogger, _ = zap.NewDevelopment()
+	} else {
+		zapLogger, _ = zap.NewProduction()
+	}
+
 	defer zapLogger.Sync()
 	logger := zapLogger.Named("main")
 
-	logger.Info("Starting Erupe (9.1b)")
+	logger.Info(fmt.Sprintf("Starting Erupe (9.3b-%s)", Commit()))
+	logger.Info(fmt.Sprintf("Client Mode: %s (%d)", config.ClientMode, config.RealClientMode))
 
-	if config.ErupeConfig.Database.Password == "" {
+	if config.Database.Password == "" {
 		preventClose("Database password is blank")
 	}
 
-	if net.ParseIP(config.ErupeConfig.Host) == nil {
-		ips, _ := net.LookupIP(config.ErupeConfig.Host)
+	if net.ParseIP(config.Host) == nil {
+		ips, _ := net.LookupIP(config.Host)
 		for _, ip := range ips {
 			if ip != nil {
-				config.ErupeConfig.Host = ip.String()
+				config.Host = ip.String()
 				break
 			}
 		}
-		if net.ParseIP(config.ErupeConfig.Host) == nil {
+		if net.ParseIP(config.Host) == nil {
 			preventClose("Invalid host address")
 		}
 	}
@@ -57,145 +78,153 @@ func main() {
 	// Discord bot
 	var discordBot *discordbot.DiscordBot = nil
 
-	if config.ErupeConfig.Discord.Enabled {
+	if config.Discord.Enabled {
 		bot, err := discordbot.NewDiscordBot(discordbot.Options{
 			Logger: logger,
-			Config: config.ErupeConfig,
+			Config: _config.ErupeConfig,
 		})
 
 		if err != nil {
-			preventClose(fmt.Sprintf("Failed to create Discord bot: %s", err.Error()))
+			preventClose(fmt.Sprintf("Discord: Failed to start, %s", err.Error()))
 		}
 
 		// Discord bot
 		err = bot.Start()
 
 		if err != nil {
-			preventClose(fmt.Sprintf("Failed to start Discord bot: %s", err.Error()))
+			preventClose(fmt.Sprintf("Discord: Failed to start, %s", err.Error()))
 		}
 
 		discordBot = bot
-		logger.Info("Discord bot is enabled")
+		logger.Info("Discord: Started successfully")
 	} else {
-		logger.Info("Discord bot is disabled")
+		logger.Info("Discord: Disabled")
 	}
 
 	// Create the postgres DB pool.
 	connectString := fmt.Sprintf(
-		"host=%s port=%d user=%s password=%s dbname= %s sslmode=disable",
-		config.ErupeConfig.Database.Host,
-		config.ErupeConfig.Database.Port,
-		config.ErupeConfig.Database.User,
-		config.ErupeConfig.Database.Password,
-		config.ErupeConfig.Database.Database,
+		"host='%s' port='%d' user='%s' password='%s' dbname='%s' sslmode=disable",
+		config.Database.Host,
+		config.Database.Port,
+		config.Database.User,
+		config.Database.Password,
+		config.Database.Database,
 	)
 
 	db, err := sqlx.Open("postgres", connectString)
 	if err != nil {
-		preventClose(fmt.Sprintf("Failed to open SQL database: %s", err.Error()))
+		preventClose(fmt.Sprintf("Database: Failed to open, %s", err.Error()))
 	}
 
 	// Test the DB connection.
 	err = db.Ping()
 	if err != nil {
-		preventClose(fmt.Sprintf("Failed to ping database: %s", err.Error()))
+		preventClose(fmt.Sprintf("Database: Failed to ping, %s", err.Error()))
 	}
-	logger.Info("Connected to database")
+	logger.Info("Database: Started successfully")
 
 	// Clear stale data
 	_ = db.MustExec("DELETE FROM sign_sessions")
 	_ = db.MustExec("DELETE FROM servers")
 
 	// Clean the DB if the option is on.
-	if config.ErupeConfig.DevMode && config.ErupeConfig.DevModeOptions.CleanDB {
-		logger.Info("Cleaning DB")
+	if config.DevMode && config.DevModeOptions.CleanDB {
+		logger.Info("Database: Started clearing...")
 		cleanDB(db)
-		logger.Info("Done cleaning DB")
+		logger.Info("Database: Finished clearing")
 	}
 
+	logger.Info(fmt.Sprintf("Server Time: %s", channelserver.TimeAdjusted().String()))
+
 	// Now start our server(s).
 
-	// Launcher HTTP server.
-	var launcherServer *launcherserver.Server
-	if config.ErupeConfig.Launcher.Enabled {
-		launcherServer = launcherserver.NewServer(
-			&launcherserver.Config{
-				Logger:                   logger.Named("launcher"),
-				ErupeConfig:              config.ErupeConfig,
-				DB:                       db,
-				UseOriginalLauncherFiles: config.ErupeConfig.Launcher.UseOriginalLauncherFiles,
-			})
-		err = launcherServer.Start()
-		if err != nil {
-			preventClose(fmt.Sprintf("Failed to start launcher server: %s", err.Error()))
-		}
-		logger.Info("Started launcher server")
-	}
-
 	// Entrance server.
 
 	var entranceServer *entranceserver.Server
-	if config.ErupeConfig.Entrance.Enabled {
+	if config.Entrance.Enabled {
 		entranceServer = entranceserver.NewServer(
 			&entranceserver.Config{
 				Logger:      logger.Named("entrance"),
-				ErupeConfig: config.ErupeConfig,
+				ErupeConfig: _config.ErupeConfig,
 				DB:          db,
 			})
 		err = entranceServer.Start()
 		if err != nil {
-			preventClose(fmt.Sprintf("Failed to start entrance server: %s", err.Error()))
+			preventClose(fmt.Sprintf("Entrance: Failed to start, %s", err.Error()))
 		}
-		logger.Info("Started entrance server")
+		logger.Info("Entrance: Started successfully")
+	} else {
+		logger.Info("Entrance: Disabled")
 	}
 
 	// Sign server.
 
 	var signServer *signserver.Server
-	if config.ErupeConfig.Sign.Enabled {
+	if config.Sign.Enabled {
 		signServer = signserver.NewServer(
 			&signserver.Config{
 				Logger:      logger.Named("sign"),
-				ErupeConfig: config.ErupeConfig,
+				ErupeConfig: _config.ErupeConfig,
 				DB:          db,
 			})
 		err = signServer.Start()
 		if err != nil {
-			preventClose(fmt.Sprintf("Failed to start sign server: %s", err.Error()))
+			preventClose(fmt.Sprintf("Sign: Failed to start, %s", err.Error()))
 		}
-		logger.Info("Started sign server")
+		logger.Info("Sign: Started successfully")
+	} else {
+		logger.Info("Sign: Disabled")
+	}
+
+	// New Sign server
+	var newSignServer *signv2server.Server
+	if config.SignV2.Enabled {
+		newSignServer = signv2server.NewServer(
+			&signv2server.Config{
+				Logger:      logger.Named("sign"),
+				ErupeConfig: _config.ErupeConfig,
+				DB:          db,
+			})
+		err = newSignServer.Start()
+		if err != nil {
+			preventClose(fmt.Sprintf("SignV2: Failed to start, %s", err.Error()))
+		}
+		logger.Info("SignV2: Started successfully")
+	} else {
+		logger.Info("SignV2: Disabled")
 	}
 
 	var channels []*channelserver.Server
 
-	if config.ErupeConfig.Channel.Enabled {
+	if config.Channel.Enabled {
 		channelQuery := ""
 		si := 0
 		ci := 0
 		count := 1
-		for _, ee := range config.ErupeConfig.Entrance.Entries {
+		for j, ee := range config.Entrance.Entries {
 			for i, ce := range ee.Channels {
 				sid := (4096 + si*256) + (16 + ci)
 				c := *channelserver.NewServer(&channelserver.Config{
 					ID:          uint16(sid),
 					Logger:      logger.Named("channel-" + fmt.Sprint(count)),
-					ErupeConfig: config.ErupeConfig,
+					ErupeConfig: _config.ErupeConfig,
 					DB:          db,
 					DiscordBot:  discordBot,
 				})
 				if ee.IP == "" {
-					c.IP = config.ErupeConfig.Host
+					c.IP = config.Host
 				} else {
 					c.IP = ee.IP
 				}
 				c.Port = ce.Port
+				c.GlobalID = fmt.Sprintf("%02d%02d", j+1, i+1)
 				err = c.Start()
 				if err != nil {
-					preventClose(fmt.Sprintf("Failed to start channel server: %s", err.Error()))
+					preventClose(fmt.Sprintf("Channel: Failed to start, %s", err.Error()))
 				} else {
-					channelQuery += fmt.Sprintf(`INSERT INTO servers (server_id, season, current_players, world_name, world_description, land) VALUES (%d, %d, 0, '%s', '%s', %d);`, sid, si%3, ee.Name, ee.Description, i+1)
+					channelQuery += fmt.Sprintf(`INSERT INTO servers (server_id, current_players, world_name, world_description, land) VALUES (%d, 0, '%s', '%s', %d);`, sid, ee.Name, ee.Description, i+1)
 					channels = append(channels, &c)
-					logger.Info(fmt.Sprintf("Started channel server %d on port %d", count, ce.Port))
+					logger.Info(fmt.Sprintf("Channel %d (%d): Started successfully", count, ce.Port))
 					ci++
 					count++
 				}
@@ -212,29 +241,40 @@ func main() {
 		}
 	}
 
+	logger.Info("Finished starting Erupe")
+
 	// Wait for exit or interrupt with ctrl+C.
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 	<-c
 
-	logger.Info("Trying to shutdown gracefully")
+	if !config.DisableSoftCrash {
+		for i := 0; i < 10; i++ {
+			message := fmt.Sprintf("Shutting down in %d...", 10-i)
+			for _, c := range channels {
+				c.BroadcastChatMessage(message)
+			}
+			logger.Info(message)
+			time.Sleep(time.Second)
+		}
+	}
 
-	if config.ErupeConfig.Channel.Enabled {
+	if config.Channel.Enabled {
 		for _, c := range channels {
 			c.Shutdown()
 		}
 	}
 
-	if config.ErupeConfig.Sign.Enabled {
+	if config.Sign.Enabled {
 		signServer.Shutdown()
 	}
 
-	if config.ErupeConfig.Entrance.Enabled {
-		entranceServer.Shutdown()
+	if config.SignV2.Enabled {
+		newSignServer.Shutdown()
 	}
 
-	if config.ErupeConfig.Launcher.Enabled {
-		launcherServer.Shutdown()
+	if config.Entrance.Enabled {
+		entranceServer.Shutdown()
 	}
 
 	time.Sleep(1 * time.Second)
@@ -247,7 +287,7 @@ func wait() {
 }
 
 func preventClose(text string) {
-	if config.ErupeConfig.DisableSoftCrash {
+	if _config.ErupeConfig.DisableSoftCrash {
 		os.Exit(0)
 	}
 	fmt.Println("\nFailed to start Erupe:\n" + text)

migrations/000001_initial_db.down.sql

@@ -0,0 +1,10 @@
+BEGIN;
+
+DROP TABLE IF EXISTS sign_sessions;
+DROP TABLE IF EXISTS characters;
+DROP TABLE IF EXISTS users;
+
+DROP DOMAIN IF EXISTS uint8;
+DROP DOMAIN IF EXISTS uint16;
+
+END;

migrations/000001_initial_db.up.sql

@@ -0,0 +1,36 @@
+BEGIN;
+
+CREATE DOMAIN uint8 AS smallint 
+    CHECK(VALUE >= 0 AND VALUE <= 255);
+
+CREATE DOMAIN uint16 AS integer 
+    CHECK(VALUE >= 0 AND VALUE <= 65536);
+
+CREATE TABLE users (
+   id serial NOT NULL PRIMARY KEY,
+   username text UNIQUE NOT NULL,
+   password text NOT NULL
+);
+
+CREATE TABLE characters (
+  id serial NOT NULL PRIMARY KEY,
+  user_id bigint REFERENCES users(id),
+  is_female boolean,
+  is_new_character boolean,
+  small_gr_level uint8,
+  gr_override_mode boolean,
+  name varchar(15),
+  unk_desc_string varchar(31),
+  gr_override_level uint16,
+  gr_override_unk0 uint8,
+  gr_override_unk1 uint8
+);
+
+CREATE TABLE sign_sessions (
+  id serial NOT NULL PRIMARY KEY,
+  user_id bigint REFERENCES users(id),
+  auth_token_num bigint,
+  auth_token_str text
+);
+
+END;

migrations/000002_alter_characters.down.sql

@@ -0,0 +1,8 @@
+BEGIN;
+
+ALTER TABLE characters
+    DROP COLUMN exp,
+    DROP COLUMN weapon,
+    DROP COLUMN last_login;
+
+END;

migrations/000002_alter_characters.up.sql

@@ -0,0 +1,8 @@
+BEGIN;
+
+ALTER TABLE characters
+    ADD COLUMN exp uint16,
+    ADD COLUMN weapon uint16,
+    ADD COLUMN last_login integer;
+
+END;

migrations/000003_character_savedata.down.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE characters
+    DROP COLUMN savedata;
+
+END;

migrations/000003_character_savedata.up.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE characters
+    ADD COLUMN savedata bytea;
+
+END;

migrations/000004_character_additional.down.sql

@@ -0,0 +1,13 @@
+BEGIN;
+
+ALTER TABLE characters
+    DROP COLUMN decomyset,
+    DROP COLUMN hunternavi,
+    DROP COLUMN otomoairou,
+    DROP COLUMN partner,
+    DROP COLUMN platebox,
+    DROP COLUMN platedata,
+    DROP COLUMN platemyset,
+    DROP COLUMN rengokudata;
+
+END;

migrations/000004_character_additional.up.sql

@@ -0,0 +1,13 @@
+BEGIN;
+
+ALTER TABLE characters
+    ADD COLUMN decomyset bytea,
+    ADD COLUMN hunternavi bytea,
+    ADD COLUMN otomoairou bytea,
+    ADD COLUMN partner bytea,
+    ADD COLUMN platebox bytea,
+    ADD COLUMN platedata bytea,
+    ADD COLUMN platemyset bytea,
+    ADD COLUMN rengokudata bytea;
+
+END;

migrations/000005_quests.down.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+DROP TABLE IF EXISTS questlists;
+
+END;

migrations/000005_quests.up.sql

@@ -0,0 +1,8 @@
+BEGIN;
+
+CREATE TABLE questlists (
+  ind int NOT NULL PRIMARY KEY,
+  questlist bytea
+);
+
+END;	

migrations/000006_mercenary.down.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE characters
+    DROP COLUMN savemercenary;
+
+END;

migrations/000006_mercenary.up.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE characters
+    ADD COLUMN savemercenary bytea;
+
+END;

network/binpacket/msg_cast_bin_private_message.go

@@ -0,0 +1,48 @@
+package binpacket
+
+import (
+	"github.com/Andoryuuta/Erupe/network"
+	"github.com/Andoryuuta/byteframe"
+)
+
+type ChatTargetType uint16
+
+const (
+	CHAT_TARGET_PRIVATE = 0x05
+	CHAT_TARGET_PARTY   = 0x04
+)
+
+type MsgBinTargetedChatMessage struct {
+	// I can't see a reason if this is indeed the number of targets, that
+	// it should use 2 bytes
+	TargetCount    uint16
+	TargetCharIDs  []uint32
+	TargetType     uint16
+	RawDataPayload []byte
+}
+
+// Opcode returns the ID associated with this packet type.
+func (m *MsgBinTargetedChatMessage) Opcode() network.PacketID {
+	return network.MSG_SYS_CAST_BINARY
+}
+
+func (m *MsgBinTargetedChatMessage) Parse(bf *byteframe.ByteFrame) error {
+	m.TargetCount = bf.ReadUint16()
+	i := uint16(0)
+
+	m.TargetCharIDs = make([]uint32, m.TargetCount)
+
+	for ; i < m.TargetCount; i++ {
+		m.TargetCharIDs[i] = bf.ReadUint32()
+	}
+
+	m.TargetType = bf.ReadUint16()
+	m.RawDataPayload = bf.DataFromCurrent()
+
+	return nil
+}
+
+// Build builds a binary packet from the current data.
+func (m *MsgBinTargetedChatMessage) Build(bf *byteframe.ByteFrame) error {
+	panic("Not implemented")
+}

network/clientctx/clientcontext.go

@@ -1,8 +1,4 @@
 package clientctx
 
-import "erupe-ce/common/stringsupport"
-
 // ClientContext holds contextual data required for packet encoding/decoding.
-type ClientContext struct {
-	StrConv *stringsupport.StringConverter
-}
+type ClientContext struct{} // Unused

network/crypt_conn.go

@@ -3,6 +3,7 @@ package network
 import (
 	"encoding/hex"
 	"errors"
+	_config "erupe-ce/config"
 	"fmt"
 	"io"
 	"net"
@@ -48,7 +49,14 @@ func (cc *CryptConn) ReadPacket() ([]byte, error) {
 	}
 
 	// Now read the encrypted packet body after getting its size from the header.
-	encryptedPacketBody := make([]byte, cph.DataSize)
+	var encryptedPacketBody []byte
+
+	// Don't know when support for this was added, works in Forward.4, doesn't work in Season 6.0
+	if _config.ErupeConfig.RealClientMode < _config.F1 {
+		encryptedPacketBody = make([]byte, cph.DataSize)
+	} else {
+		encryptedPacketBody = make([]byte, uint32(cph.DataSize)+(uint32(cph.Pf0-0x03)*0x1000))
+	}
 	_, err = io.ReadFull(cc.conn, encryptedPacketBody)
 	if err != nil {
 		return nil, err
@@ -56,7 +64,7 @@ func (cc *CryptConn) ReadPacket() ([]byte, error) {
 
 	// Update the key rotation before decrypting.
 	if cph.KeyRotDelta != 0 {
-		cc.readKeyRot = (uint32(cph.KeyRotDelta) * (cc.readKeyRot + 1))
+		cc.readKeyRot = uint32(cph.KeyRotDelta) * (cc.readKeyRot + 1)
 	}
 
 	out, combinedCheck, check0, check1, check2 := crypto.Decrypt(encryptedPacketBody, cc.readKeyRot, nil)
@@ -94,7 +102,7 @@ func (cc *CryptConn) SendPacket(data []byte) error {
 	keyRotDelta := byte(3)
 
 	if keyRotDelta != 0 {
-		cc.sendKeyRot = (uint32(keyRotDelta) * (cc.sendKeyRot + 1))
+		cc.sendKeyRot = uint32(keyRotDelta) * (cc.sendKeyRot + 1)
 	}
 
 	// Encrypt the data

network/mhfpacket/msg_head.go

@@ -5,8 +5,8 @@ import (
 
 	"erupe-ce/network/clientctx"
 
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
 )
 
 // MsgHead represents the MSG_HEAD

network/mhfpacket/msg_mhf_accept_read_reward.go

@@ -5,8 +5,8 @@ import (
 
 	"erupe-ce/network/clientctx"
 
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
 )
 
 // MsgMhfAcceptReadReward represents the MSG_MHF_ACCEPT_READ_REWARD

network/mhfpacket/msg_mhf_acquire_cafe_item.go

@@ -2,10 +2,11 @@ package mhfpacket
 
 import (
 	"errors"
+	_config "erupe-ce/config"
 
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfAcquireCafeItem represents the MSG_MHF_ACQUIRE_CAFE_ITEM
@@ -30,7 +31,11 @@ func (m *MsgMhfAcquireCafeItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cl
 	m.ItemType = bf.ReadUint16()
 	m.ItemID = bf.ReadUint16()
 	m.Quant = bf.ReadUint16()
-	m.PointCost = bf.ReadUint32()
+	if _config.ErupeConfig.RealClientMode >= _config.G1 {
+		m.PointCost = bf.ReadUint32()
+	} else {
+		m.PointCost = uint32(bf.ReadUint16())
+	}
 	m.Unk0 = bf.ReadUint16()
 	return nil
 }

network/mhfpacket/msg_mhf_acquire_dist_item.go

@@ -3,16 +3,16 @@ package mhfpacket
 import (
 	"errors"
 
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfAcquireDistItem represents the MSG_MHF_ACQUIRE_DIST_ITEM
 type MsgMhfAcquireDistItem struct {
-	AckHandle uint32
+	AckHandle        uint32
 	DistributionType uint8
-	DistributionID uint32
+	DistributionID   uint32
 }
 
 // Opcode returns the ID associated with this packet type.

network/mhfpacket/msg_mhf_acquire_exchange_shop.go

@@ -1,9 +1,9 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfAcquireExchangeShop represents the MSG_MHF_ACQUIRE_EXCHANGE_SHOP

network/mhfpacket/msg_mhf_acquire_festa.go

@@ -1,19 +1,19 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAcquireFesta represents the MSG_MHF_ACQUIRE_FESTA
 type MsgMhfAcquireFesta struct {
-  AckHandle uint32
-  FestaID uint32
-  GuildID uint32
-  Unk uint16
+	AckHandle uint32
+	FestaID   uint32
+	GuildID   uint32
+	Unk       uint16
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -23,11 +23,11 @@ func (m *MsgMhfAcquireFesta) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfAcquireFesta) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
-  m.FestaID = bf.ReadUint32()
-  m.GuildID = bf.ReadUint32()
-  m.Unk = bf.ReadUint16()
-  return nil
+	m.AckHandle = bf.ReadUint32()
+	m.FestaID = bf.ReadUint32()
+	m.GuildID = bf.ReadUint32()
+	m.Unk = bf.ReadUint16()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_acquire_festa_intermediate_prize.go

@@ -3,15 +3,15 @@ package mhfpacket
 import (
 	"errors"
 
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfAcquireFestaIntermediatePrize represents the MSG_MHF_ACQUIRE_FESTA_INTERMEDIATE_PRIZE
 type MsgMhfAcquireFestaIntermediatePrize struct {
 	AckHandle uint32
-	PrizeID uint32
+	PrizeID   uint32
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -22,7 +22,7 @@ func (m *MsgMhfAcquireFestaIntermediatePrize) Opcode() network.PacketID {
 // Parse parses the packet from binary
 func (m *MsgMhfAcquireFestaIntermediatePrize) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
-  m.PrizeID = bf.ReadUint32()
+	m.PrizeID = bf.ReadUint32()
 	return nil
 }
 

network/mhfpacket/msg_mhf_acquire_festa_personal_prize.go

@@ -1,17 +1,17 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAcquireFestaPersonalPrize represents the MSG_MHF_ACQUIRE_FESTA_PERSONAL_PRIZE
 type MsgMhfAcquireFestaPersonalPrize struct {
-  AckHandle uint32
-  PrizeID uint32
+	AckHandle uint32
+	PrizeID   uint32
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -21,9 +21,9 @@ func (m *MsgMhfAcquireFestaPersonalPrize) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfAcquireFestaPersonalPrize) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
-  m.PrizeID = bf.ReadUint32()
-  return nil
+	m.AckHandle = bf.ReadUint32()
+	m.PrizeID = bf.ReadUint32()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_acquire_guild_adventure.go

@@ -1,17 +1,17 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAcquireGuildAdventure represents the MSG_MHF_ACQUIRE_GUILD_ADVENTURE
 type MsgMhfAcquireGuildAdventure struct {
-  AckHandle uint32
-  ID uint32
+	AckHandle uint32
+	ID        uint32
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -21,9 +21,9 @@ func (m *MsgMhfAcquireGuildAdventure) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfAcquireGuildAdventure) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
-  m.ID = bf.ReadUint32()
-  return nil
+	m.AckHandle = bf.ReadUint32()
+	m.ID = bf.ReadUint32()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_acquire_guild_tresure_souvenir.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAcquireGuildTresureSouvenir represents the MSG_MHF_ACQUIRE_GUILD_TRESURE_SOUVENIR

network/mhfpacket/msg_mhf_acquire_item.go

@@ -1,15 +1,20 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAcquireItem represents the MSG_MHF_ACQUIRE_ITEM
-type MsgMhfAcquireItem struct{}
+type MsgMhfAcquireItem struct {
+	AckHandle uint32
+	Unk0      uint16
+	Length    uint16
+	Unk1      []uint32
+}
 
 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfAcquireItem) Opcode() network.PacketID {
@@ -18,7 +23,13 @@ func (m *MsgMhfAcquireItem) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfAcquireItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.Unk0 = bf.ReadUint16()
+	m.Length = bf.ReadUint16()
+	for i := 0; i < int(m.Length); i++ {
+		m.Unk1 = append(m.Unk1, bf.ReadUint32())
+	}
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_acquire_monthly_reward.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAcquireMonthlyReward represents the MSG_MHF_ACQUIRE_MONTHLY_REWARD

network/mhfpacket/msg_mhf_acquire_tournament.go

@@ -1,15 +1,18 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAcquireTournament represents the MSG_MHF_ACQUIRE_TOURNAMENT
-type MsgMhfAcquireTournament struct{}
+type MsgMhfAcquireTournament struct {
+	AckHandle    uint32
+	TournamentID uint32
+}
 
 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfAcquireTournament) Opcode() network.PacketID {
@@ -18,7 +21,9 @@ func (m *MsgMhfAcquireTournament) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfAcquireTournament) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.TournamentID = bf.ReadUint32()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_acquire_ud_item.go

@@ -1,30 +1,30 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAcquireUdItem represents the MSG_MHF_ACQUIRE_UD_ITEM
 type MsgMhfAcquireUdItem struct {
-  AckHandle uint32
-	Unk0 uint8
-  // from gal
-  // daily = 0
-  // personal = 1
-  // personal rank = 2
-  // guild rank = 3
-  // gcp = 4
-  // from cat
-  // treasure achievement = 5
-  // personal achievement = 6
-  // guild achievement = 7
-  RewardType uint8
-  Unk2 uint8 // Number of uint32s to read?
-	Unk3 []byte
+	AckHandle uint32
+	Unk0      uint8
+	// from gal
+	// daily = 0
+	// personal = 1
+	// personal rank = 2
+	// guild rank = 3
+	// gcp = 4
+	// from cat
+	// treasure achievement = 5
+	// personal achievement = 6
+	// guild achievement = 7
+	RewardType uint8
+	Unk2       uint8 // Number of uint32s to read?
+	Unk3       []byte
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -34,13 +34,13 @@ func (m *MsgMhfAcquireUdItem) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfAcquireUdItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
+	m.AckHandle = bf.ReadUint32()
 	m.Unk0 = bf.ReadUint8()
 	m.RewardType = bf.ReadUint8()
-  m.Unk2 = bf.ReadUint8()
-  for i := uint8(0); i < m.Unk2; i++ {
-    bf.ReadUint32()
-  }
+	m.Unk2 = bf.ReadUint8()
+	for i := uint8(0); i < m.Unk2; i++ {
+		bf.ReadUint32()
+	}
 	return nil
 }
 

network/mhfpacket/msg_mhf_add_guild_mission_count.go

@@ -1,18 +1,18 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAddGuildMissionCount represents the MSG_MHF_ADD_GUILD_MISSION_COUNT
 type MsgMhfAddGuildMissionCount struct {
-  AckHandle uint32
-  MissionID uint32
-  Count uint32
+	AckHandle uint32
+	MissionID uint32
+	Count     uint32
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -22,10 +22,10 @@ func (m *MsgMhfAddGuildMissionCount) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfAddGuildMissionCount) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
-  m.MissionID = bf.ReadUint32()
-  m.Count = bf.ReadUint32()
-  return nil
+	m.AckHandle = bf.ReadUint32()
+	m.MissionID = bf.ReadUint32()
+	m.Count = bf.ReadUint32()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_add_guild_weekly_bonus_exceptional_user.go

@@ -1,17 +1,17 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAddGuildWeeklyBonusExceptionalUser represents the MSG_MHF_ADD_GUILD_WEEKLY_BONUS_EXCEPTIONAL_USER
 type MsgMhfAddGuildWeeklyBonusExceptionalUser struct {
-  AckHandle uint32
-  NumUsers  uint8
+	AckHandle uint32
+	NumUsers  uint8
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -21,9 +21,9 @@ func (m *MsgMhfAddGuildWeeklyBonusExceptionalUser) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfAddGuildWeeklyBonusExceptionalUser) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
-  m.NumUsers = bf.ReadUint8()
-  return nil
+	m.AckHandle = bf.ReadUint32()
+	m.NumUsers = bf.ReadUint8()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_add_kouryou_point.go

@@ -1,9 +1,9 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfAddKouryouPoint represents the MSG_MHF_ADD_KOURYOU_POINT

network/mhfpacket/msg_mhf_add_reward_song_count.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAddRewardSongCount represents the MSG_MHF_ADD_REWARD_SONG_COUNT

network/mhfpacket/msg_mhf_add_ud_point.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAddUdPoint represents the MSG_MHF_ADD_UD_POINT

network/mhfpacket/msg_mhf_add_ud_tactics_point.go

@@ -1,9 +1,9 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfAddUdTacticsPoint represents the MSG_MHF_ADD_UD_TACTICS_POINT

network/mhfpacket/msg_mhf_announce.go

@@ -28,7 +28,8 @@ func (m *MsgMhfAnnounce) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientCon
 	m.IPAddress = bf.ReadUint32()
 	m.Port = bf.ReadUint16()
 	_ = bf.ReadUint8()
-	_ = bf.ReadUint16()
+	_ = bf.ReadUint8()
+	_ = bf.ReadUint8()
 	m.StageID = bf.ReadBytes(32)
 	_ = bf.ReadUint32()
 	m.Type = bf.ReadUint8()

network/mhfpacket/msg_mhf_answer_guild_scout.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfAnswerGuildScout represents the MSG_MHF_ANSWER_GUILD_SCOUT

network/mhfpacket/msg_mhf_apply_bbs_article.go

@@ -1,15 +1,24 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
+	"erupe-ce/common/bfutil"
+	"erupe-ce/common/stringsupport"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfApplyBbsArticle represents the MSG_MHF_APPLY_BBS_ARTICLE
-type MsgMhfApplyBbsArticle struct{}
+type MsgMhfApplyBbsArticle struct {
+	AckHandle   uint32
+	Unk0        uint32
+	Unk1        []byte
+	Name        string
+	Title       string
+	Description string
+}
 
 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfApplyBbsArticle) Opcode() network.PacketID {
@@ -18,7 +27,13 @@ func (m *MsgMhfApplyBbsArticle) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfApplyBbsArticle) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.Unk0 = bf.ReadUint32()
+	m.Unk1 = bf.ReadBytes(16)
+	m.Name = stringsupport.SJISToUTF8(bfutil.UpToNull(bf.ReadBytes(32)))
+	m.Title = stringsupport.SJISToUTF8(bfutil.UpToNull(bf.ReadBytes(128)))
+	m.Description = stringsupport.SJISToUTF8(bfutil.UpToNull(bf.ReadBytes(256)))
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_apply_campaign.go

@@ -1,17 +1,18 @@
 package mhfpacket
 
 import (
+	"errors"
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfApplyCampaign represents the MSG_MHF_APPLY_CAMPAIGN
 type MsgMhfApplyCampaign struct {
 	AckHandle uint32
-	Unk0      uint8
-	Unk1      uint8
-	Unk2      uint16
+	Unk0      uint32
+	Unk1      uint16
+	Unk2      []byte
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -22,17 +23,13 @@ func (m *MsgMhfApplyCampaign) Opcode() network.PacketID {
 // Parse parses the packet from binary
 func (m *MsgMhfApplyCampaign) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
-	m.Unk0 = bf.ReadUint8()
-	m.Unk1 = bf.ReadUint8()
-	m.Unk2 = bf.ReadUint16()
+	m.Unk0 = bf.ReadUint32()
+	m.Unk1 = bf.ReadUint16()
+	m.Unk2 = bf.ReadBytes(16)
 	return nil
 }
 
 // Build builds a binary packet from the current data.
 func (m *MsgMhfApplyCampaign) Build(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	bf.WriteUint32(m.AckHandle)
-	bf.WriteUint8(m.Unk0)
-	bf.WriteUint8(m.Unk1)
-	bf.WriteUint16(m.Unk2)
-	return nil
+	return errors.New("NOT IMPLEMENTED")
 }

network/mhfpacket/msg_mhf_apply_dist_item.go

@@ -1,18 +1,18 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfApplyDistItem represents the MSG_MHF_APPLY_DIST_ITEM
 type MsgMhfApplyDistItem struct {
-	AckHandle   uint32
+	AckHandle        uint32
 	DistributionType uint8
-	DistributionID uint32
-	Unk2        uint32
-	Unk3        uint32
+	DistributionID   uint32
+	Unk2             uint32
+	Unk3             uint32
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -38,4 +38,4 @@ func (m *MsgMhfApplyDistItem) Build(bf *byteframe.ByteFrame, ctx *clientctx.Clie
 	bf.WriteUint32(m.Unk2)
 	bf.WriteUint32(m.Unk3)
 	return nil
-}
+}

network/mhfpacket/msg_mhf_arrange_guild_member.go

@@ -1,9 +1,9 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfArrangeGuildMember represents the MSG_MHF_ARRANGE_GUILD_MEMBER

network/mhfpacket/msg_mhf_cancel_guild_mission_target.go

@@ -1,17 +1,17 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfCancelGuildMissionTarget represents the MSG_MHF_CANCEL_GUILD_MISSION_TARGET
 type MsgMhfCancelGuildMissionTarget struct {
-  AckHandle uint32
-  MissionID uint32
+	AckHandle uint32
+	MissionID uint32
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -21,9 +21,9 @@ func (m *MsgMhfCancelGuildMissionTarget) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfCancelGuildMissionTarget) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
-  m.MissionID = bf.ReadUint32()
-  return nil
+	m.AckHandle = bf.ReadUint32()
+	m.MissionID = bf.ReadUint32()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_cancel_guild_scout.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfCancelGuildScout represents the MSG_MHF_CANCEL_GUILD_SCOUT

network/mhfpacket/msg_mhf_caravan_my_rank.go

@@ -1,15 +1,20 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfCaravanMyRank represents the MSG_MHF_CARAVAN_MY_RANK
-type MsgMhfCaravanMyRank struct{}
+type MsgMhfCaravanMyRank struct {
+	AckHandle uint32
+	Unk0      uint32
+	Unk1      uint32
+	Unk2      uint32
+}
 
 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfCaravanMyRank) Opcode() network.PacketID {
@@ -18,7 +23,11 @@ func (m *MsgMhfCaravanMyRank) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfCaravanMyRank) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.Unk0 = bf.ReadUint32()
+	m.Unk1 = bf.ReadUint32()
+	m.Unk2 = bf.ReadUint32()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_caravan_my_score.go

@@ -1,15 +1,24 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfCaravanMyScore represents the MSG_MHF_CARAVAN_MY_SCORE
-type MsgMhfCaravanMyScore struct{}
+type MsgMhfCaravanMyScore struct {
+	AckHandle uint32
+	Unk0      uint32
+	Unk1      uint32
+	Unk2      int32
+	Unk3      int32
+	Unk4      uint32
+	Unk5      int32
+	Unk6      int32
+}
 
 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfCaravanMyScore) Opcode() network.PacketID {
@@ -18,7 +27,15 @@ func (m *MsgMhfCaravanMyScore) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfCaravanMyScore) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.Unk0 = bf.ReadUint32()
+	m.Unk1 = bf.ReadUint32()
+	m.Unk2 = bf.ReadInt32()
+	m.Unk3 = bf.ReadInt32()
+	m.Unk4 = bf.ReadUint32()
+	m.Unk5 = bf.ReadInt32()
+	m.Unk6 = bf.ReadInt32()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_caravan_ranking.go

@@ -1,15 +1,20 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfCaravanRanking represents the MSG_MHF_CARAVAN_RANKING
-type MsgMhfCaravanRanking struct{}
+type MsgMhfCaravanRanking struct {
+	AckHandle uint32
+	Unk0      uint32
+	Unk1      uint32
+	Unk2      int32
+}
 
 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfCaravanRanking) Opcode() network.PacketID {
@@ -18,7 +23,11 @@ func (m *MsgMhfCaravanRanking) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfCaravanRanking) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.Unk0 = bf.ReadUint32()
+	m.Unk1 = bf.ReadUint32()
+	m.Unk2 = bf.ReadInt32()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_charge_festa.go

@@ -1,19 +1,19 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfChargeFesta represents the MSG_MHF_CHARGE_FESTA
 type MsgMhfChargeFesta struct {
-  AckHandle uint32
-  FestaID uint32
-  GuildID uint32
-  Souls int
+	AckHandle uint32
+	FestaID   uint32
+	GuildID   uint32
+	Souls     int
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -23,15 +23,15 @@ func (m *MsgMhfChargeFesta) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfChargeFesta) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
-  m.FestaID = bf.ReadUint32()
-  m.GuildID = bf.ReadUint32()
-  m.Souls = 0
-  for i := bf.ReadUint16(); i > 0; i-- {
-    m.Souls += int(bf.ReadUint16())
-  }
-  _ = bf.ReadUint8() // Unk
-  return nil
+	m.AckHandle = bf.ReadUint32()
+	m.FestaID = bf.ReadUint32()
+	m.GuildID = bf.ReadUint32()
+	m.Souls = 0
+	for i := bf.ReadUint16(); i > 0; i-- {
+		m.Souls += int(bf.ReadUint16())
+	}
+	_ = bf.ReadUint8() // Unk
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_charge_guild_adventure.go

@@ -1,18 +1,18 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfChargeGuildAdventure represents the MSG_MHF_CHARGE_GUILD_ADVENTURE
 type MsgMhfChargeGuildAdventure struct {
-  AckHandle uint32
-  ID uint32
-  Amount uint32
+	AckHandle uint32
+	ID        uint32
+	Amount    uint32
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -22,10 +22,10 @@ func (m *MsgMhfChargeGuildAdventure) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfChargeGuildAdventure) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
-  m.ID = bf.ReadUint32()
-  m.Amount = bf.ReadUint32()
-  return nil
+	m.AckHandle = bf.ReadUint32()
+	m.ID = bf.ReadUint32()
+	m.Amount = bf.ReadUint32()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_check_daily_cafepoint.go

@@ -1,9 +1,9 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfCheckDailyCafepoint represents the MSG_MHF_CHECK_DAILY_CAFEPOINT

network/mhfpacket/msg_mhf_check_monthly_item.go

@@ -11,7 +11,8 @@ import (
 // MsgMhfCheckMonthlyItem represents the MSG_MHF_CHECK_MONTHLY_ITEM
 type MsgMhfCheckMonthlyItem struct {
 	AckHandle uint32
-	Unk       uint32
+	Type      uint8
+	Unk       []byte
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -22,7 +23,8 @@ func (m *MsgMhfCheckMonthlyItem) Opcode() network.PacketID {
 // Parse parses the packet from binary
 func (m *MsgMhfCheckMonthlyItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
-	m.Unk = bf.ReadUint32()
+	m.Type = bf.ReadUint8()
+	m.Unk = bf.ReadBytes(3)
 	return nil
 }
 

network/mhfpacket/msg_mhf_contract_mercenary.go

@@ -1,15 +1,20 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfContractMercenary represents the MSG_MHF_CONTRACT_MERCENARY
-type MsgMhfContractMercenary struct{}
+type MsgMhfContractMercenary struct {
+	AckHandle  uint32
+	PactMercID uint32
+	CID        uint32
+	Op         uint8
+}
 
 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfContractMercenary) Opcode() network.PacketID {
@@ -18,7 +23,11 @@ func (m *MsgMhfContractMercenary) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfContractMercenary) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.PactMercID = bf.ReadUint32()
+	m.CID = bf.ReadUint32()
+	m.Op = bf.ReadUint8()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_create_joint.go

@@ -1,19 +1,19 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-  "erupe-ce/common/stringsupport"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/common/stringsupport"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfCreateJoint represents the MSG_MHF_CREATE_JOINT
 type MsgMhfCreateJoint struct {
-  AckHandle uint32
-  GuildID uint32
-  Name string
+	AckHandle uint32
+	GuildID   uint32
+	Name      string
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -23,11 +23,11 @@ func (m *MsgMhfCreateJoint) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfCreateJoint) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
-  m.GuildID = bf.ReadUint32()
-  _ = bf.ReadUint32() // len
-  m.Name = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
-  return nil
+	m.AckHandle = bf.ReadUint32()
+	m.GuildID = bf.ReadUint32()
+	_ = bf.ReadUint32() // len
+	m.Name = stringsupport.SJISToUTF8(bf.ReadNullTerminatedBytes())
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_create_mercenary.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfCreateMercenary represents the MSG_MHF_CREATE_MERCENARY

network/mhfpacket/msg_mhf_debug_post_value.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfDebugPostValue represents the MSG_MHF_DEBUG_POST_VALUE

network/mhfpacket/msg_mhf_displayed_achievement.go

@@ -1,9 +1,9 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfDisplayedAchievement represents the MSG_MHF_DISPLAYED_ACHIEVEMENT

network/mhfpacket/msg_mhf_enter_tournament_quest.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnterTournamentQuest represents the MSG_MHF_ENTER_TOURNAMENT_QUEST

network/mhfpacket/msg_mhf_entry_festa.go

@@ -1,18 +1,18 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEntryFesta represents the MSG_MHF_ENTRY_FESTA
 type MsgMhfEntryFesta struct {
-  AckHandle uint32
-  FestaID uint32
-  GuildID uint32
+	AckHandle uint32
+	FestaID   uint32
+	GuildID   uint32
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -22,11 +22,11 @@ func (m *MsgMhfEntryFesta) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfEntryFesta) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
-  m.FestaID = bf.ReadUint32()
-  m.GuildID = bf.ReadUint32()
-  _ = bf.ReadUint16() // Always 0
-  return nil
+	m.AckHandle = bf.ReadUint32()
+	m.FestaID = bf.ReadUint32()
+	m.GuildID = bf.ReadUint32()
+	_ = bf.ReadUint16() // Always 0
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_entry_tournament.go

@@ -1,15 +1,19 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEntryTournament represents the MSG_MHF_ENTRY_TOURNAMENT
-type MsgMhfEntryTournament struct{}
+type MsgMhfEntryTournament struct {
+	AckHandle    uint32
+	TournamentID uint32
+	Unk0         uint8
+}
 
 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfEntryTournament) Opcode() network.PacketID {
@@ -18,7 +22,10 @@ func (m *MsgMhfEntryTournament) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfEntryTournament) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.TournamentID = bf.ReadUint32()
+	m.Unk0 = bf.ReadUint8()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_enumerate_campaign.go

@@ -1,17 +1,16 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfEnumerateCampaign represents the MSG_MHF_ENUMERATE_CAMPAIGN
 type MsgMhfEnumerateCampaign struct {
 	AckHandle uint32
-	Unk0      uint8
-	Unk1      uint8
-	Unk2      uint16
+	Unk0      uint16
+	Unk1      uint16
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -22,17 +21,15 @@ func (m *MsgMhfEnumerateCampaign) Opcode() network.PacketID {
 // Parse parses the packet from binary
 func (m *MsgMhfEnumerateCampaign) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
-	m.Unk0 = bf.ReadUint8()
-	m.Unk1 = bf.ReadUint8()
-	m.Unk2 = bf.ReadUint16()
+	m.Unk0 = bf.ReadUint16()
+	m.Unk1 = bf.ReadUint16()
 	return nil
 }
 
 // Build builds a binary packet from the current data.
 func (m *MsgMhfEnumerateCampaign) Build(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	bf.WriteUint32(m.AckHandle)
-	bf.WriteUint8(m.Unk0)
-	bf.WriteUint8(m.Unk1)
-	bf.WriteUint16(m.Unk2)
+	bf.WriteUint16(m.Unk0)
+	bf.WriteUint16(m.Unk1)
 	return nil
 }

network/mhfpacket/msg_mhf_enumerate_dist_item.go

@@ -1,9 +1,9 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfEnumerateDistItem represents the MSG_MHF_ENUMERATE_DIST_ITEM

network/mhfpacket/msg_mhf_enumerate_event.go

@@ -1,9 +1,9 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfEnumerateEvent represents the MSG_MHF_ENUMERATE_EVENT

network/mhfpacket/msg_mhf_enumerate_festa_intermediate_prize.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumerateFestaIntermediatePrize represents the MSG_MHF_ENUMERATE_FESTA_INTERMEDIATE_PRIZE

network/mhfpacket/msg_mhf_enumerate_festa_member.go

@@ -1,18 +1,18 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumerateFestaMember represents the MSG_MHF_ENUMERATE_FESTA_MEMBER
 type MsgMhfEnumerateFestaMember struct {
-  AckHandle uint32
-  FestaID uint32
-  GuildID uint32
+	AckHandle uint32
+	FestaID   uint32
+	GuildID   uint32
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -22,11 +22,11 @@ func (m *MsgMhfEnumerateFestaMember) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfEnumerateFestaMember) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
+	m.AckHandle = bf.ReadUint32()
 	m.FestaID = bf.ReadUint32()
 	m.GuildID = bf.ReadUint32()
 	_ = bf.ReadUint16() // Hardcoded 0 in the binary.
-  return nil
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_enumerate_festa_personal_prize.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumerateFestaPersonalPrize represents the MSG_MHF_ENUMERATE_FESTA_PERSONAL_PRIZE

network/mhfpacket/msg_mhf_enumerate_guacot.go

@@ -2,7 +2,6 @@ package mhfpacket
 
 import (
 	"errors"
-
 	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
@@ -11,9 +10,8 @@ import (
 // MsgMhfEnumerateGuacot represents the MSG_MHF_ENUMERATE_GUACOT
 type MsgMhfEnumerateGuacot struct {
 	AckHandle uint32
-	Unk0      uint16 // Hardcoded 0 in binary
+	Unk0      uint32 // Hardcoded 0 in binary
 	Unk1      uint16 // Hardcoded 0 in binary
-	Unk2      uint16 // Hardcoded 0 in binary
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -24,9 +22,8 @@ func (m *MsgMhfEnumerateGuacot) Opcode() network.PacketID {
 // Parse parses the packet from binary
 func (m *MsgMhfEnumerateGuacot) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
-	m.Unk0 = bf.ReadUint16()
+	m.Unk0 = bf.ReadUint32()
 	m.Unk1 = bf.ReadUint16()
-	m.Unk2 = bf.ReadUint16()
 	return nil
 }
 

network/mhfpacket/msg_mhf_enumerate_guild.go

@@ -2,9 +2,9 @@ package mhfpacket
 
 import (
 	"errors"
-	"io"
-
+	"erupe-ce/common/bfutil"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/common/stringsupport"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
 )
@@ -12,28 +12,30 @@ import (
 type EnumerateGuildType uint8
 
 const (
-	ENUMERATE_GUILD_TYPE_GUILD_NAME            = 0x01
-	ENUMERATE_GUILD_TYPE_LEADER_NAME           = 0x02
-	ENUMERATE_GUILD_TYPE_LEADER_ID             = 0x03
-	ENUMERATE_GUILD_TYPE_ORDER_MEMBERS         = 0x04
-	ENUMERATE_GUILD_TYPE_ORDER_REGISTRATION    = 0x05
-	ENUMERATE_GUILD_TYPE_ORDER_RANK            = 0x06
-	ENUMERATE_GUILD_TYPE_MOTTO                 = 0x07
-	ENUMERATE_GUILD_TYPE_RECRUITING            = 0x08
-	ENUMERATE_ALLIANCE_TYPE_ALLIANCE_NAME      = 0x09
-	ENUMERATE_ALLIANCE_TYPE_LEADER_NAME        = 0x0A
-	ENUMERATE_ALLIANCE_TYPE_LEADER_ID          = 0x0B
-	ENUMERATE_ALLIANCE_TYPE_ORDER_MEMBERS      = 0x0C
-	ENUMERATE_ALLIANCE_TYPE_ORDER_REGISTRATION = 0x0D
+	ENUMERATE_GUILD_UNKNOWN = iota
+	ENUMERATE_GUILD_TYPE_GUILD_NAME
+	ENUMERATE_GUILD_TYPE_LEADER_NAME
+	ENUMERATE_GUILD_TYPE_LEADER_ID
+	ENUMERATE_GUILD_TYPE_ORDER_MEMBERS
+	ENUMERATE_GUILD_TYPE_ORDER_REGISTRATION
+	ENUMERATE_GUILD_TYPE_ORDER_RANK
+	ENUMERATE_GUILD_TYPE_MOTTO
+	ENUMERATE_GUILD_TYPE_RECRUITING
+	ENUMERATE_ALLIANCE_TYPE_ALLIANCE_NAME
+	ENUMERATE_ALLIANCE_TYPE_LEADER_NAME
+	ENUMERATE_ALLIANCE_TYPE_LEADER_ID
+	ENUMERATE_ALLIANCE_TYPE_ORDER_MEMBERS
+	ENUMERATE_ALLIANCE_TYPE_ORDER_REGISTRATION
 )
 
 // MsgMhfEnumerateGuild represents the MSG_MHF_ENUMERATE_GUILD
 type MsgMhfEnumerateGuild struct {
-	AckHandle      uint32
-	Type           EnumerateGuildType
-	Page           uint8
-	Sorting        bool
-	RawDataPayload []byte
+	AckHandle uint32
+	Type      EnumerateGuildType
+	Page      uint8
+	Sorting   bool
+	Data1     []byte
+	Data2     string
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -47,9 +49,12 @@ func (m *MsgMhfEnumerateGuild) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cli
 	m.Type = EnumerateGuildType(bf.ReadUint8())
 	m.Page = bf.ReadUint8()
 	m.Sorting = bf.ReadBool()
-	_ = bf.ReadUint8()
-	m.RawDataPayload = bf.DataFromCurrent()
-	bf.Seek(-2, io.SeekEnd)
+	_ = bf.ReadBytes(1)
+	m.Data1 = bf.ReadBytes(4)
+	_ = bf.ReadBytes(2)
+	lenData2 := uint(bf.ReadUint8())
+	_ = bf.ReadBytes(1)
+	m.Data2 = stringsupport.SJISToUTF8(bfutil.UpToNull(bf.ReadBytes(lenData2)))
 	return nil
 }
 

network/mhfpacket/msg_mhf_enumerate_guild_item.go

@@ -1,18 +1,18 @@
 package mhfpacket
 
 import (
- "errors"
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumerateGuildItem represents the MSG_MHF_ENUMERATE_GUILD_ITEM
 type MsgMhfEnumerateGuildItem struct {
 	AckHandle uint32
-  GuildId uint32
-  Unk0 uint16
+	GuildId   uint32
+	Unk0      uint16
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -22,9 +22,9 @@ func (m *MsgMhfEnumerateGuildItem) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfEnumerateGuildItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-  m.AckHandle = bf.ReadUint32()
-  m.GuildId = bf.ReadUint32()
-  m.Unk0 = bf.ReadUint16()
+	m.AckHandle = bf.ReadUint32()
+	m.GuildId = bf.ReadUint32()
+	m.Unk0 = bf.ReadUint16()
 	return nil
 }
 

network/mhfpacket/msg_mhf_enumerate_guild_member.go

@@ -1,9 +1,9 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfEnumerateGuildMember represents the MSG_MHF_ENUMERATE_GUILD_MEMBER

network/mhfpacket/msg_mhf_enumerate_item.go

@@ -1,15 +1,20 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumerateItem represents the MSG_MHF_ENUMERATE_ITEM
-type MsgMhfEnumerateItem struct{}
+type MsgMhfEnumerateItem struct {
+	AckHandle  uint32
+	Unk0       uint16
+	Unk1       uint16
+	CampaignID uint32
+}
 
 // Opcode returns the ID associated with this packet type.
 func (m *MsgMhfEnumerateItem) Opcode() network.PacketID {
@@ -18,7 +23,11 @@ func (m *MsgMhfEnumerateItem) Opcode() network.PacketID {
 
 // Parse parses the packet from binary
 func (m *MsgMhfEnumerateItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	return errors.New("NOT IMPLEMENTED")
+	m.AckHandle = bf.ReadUint32()
+	m.Unk0 = bf.ReadUint16()
+	m.Unk1 = bf.ReadUint16()
+	m.CampaignID = bf.ReadUint32()
+	return nil
 }
 
 // Build builds a binary packet from the current data.

network/mhfpacket/msg_mhf_enumerate_mercenary_log.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumerateMercenaryLog represents the MSG_MHF_ENUMERATE_MERCENARY_LOG

network/mhfpacket/msg_mhf_enumerate_order.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumerateOrder represents the MSG_MHF_ENUMERATE_ORDER

network/mhfpacket/msg_mhf_enumerate_price.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumeratePrice represents the MSG_MHF_ENUMERATE_PRICE

network/mhfpacket/msg_mhf_enumerate_quest.go

@@ -1,20 +1,21 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
+	_config "erupe-ce/config"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumerateQuest represents the MSG_MHF_ENUMERATE_QUEST
 type MsgMhfEnumerateQuest struct {
 	AckHandle uint32
 	Unk0      uint8 // Hardcoded 0 in the binary
-	Unk1      uint8
-	Unk2      uint16
-	QuestList uint16 // Increments to request following batches of quests
+	World     uint8
+	Counter   uint16
+	Offset    uint16 // Increments to request following batches of quests
 	Unk4      uint8  // Hardcoded 0 in the binary
 }
 
@@ -27,9 +28,13 @@ func (m *MsgMhfEnumerateQuest) Opcode() network.PacketID {
 func (m *MsgMhfEnumerateQuest) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
 	m.Unk0 = bf.ReadUint8()
-	m.Unk1 = bf.ReadUint8()
-	m.Unk2 = bf.ReadUint16()
-	m.QuestList = bf.ReadUint16()
+	m.World = bf.ReadUint8()
+	m.Counter = bf.ReadUint16()
+	if _config.ErupeConfig.RealClientMode <= _config.Z1 {
+		m.Offset = uint16(bf.ReadUint8())
+	} else {
+		m.Offset = bf.ReadUint16()
+	}
 	m.Unk4 = bf.ReadUint8()
 	return nil
 }

network/mhfpacket/msg_mhf_enumerate_ranking.go

@@ -1,11 +1,11 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumerateRanking represents the MSG_MHF_ENUMERATE_RANKING

network/mhfpacket/msg_mhf_enumerate_shop.go

@@ -1,11 +1,12 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
+	_config "erupe-ce/config"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfEnumerateShop represents the MSG_MHF_ENUMERATE_SHOP
@@ -31,8 +32,10 @@ func (m *MsgMhfEnumerateShop) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clie
 	m.ShopID = bf.ReadUint32()
 	m.Unk2 = bf.ReadUint16()
 	m.Unk3 = bf.ReadUint8()
-	m.Unk4 = bf.ReadUint8()
-	m.Unk5 = bf.ReadUint32()
+	if _config.ErupeConfig.RealClientMode >= _config.G2 {
+		m.Unk4 = bf.ReadUint8()
+		m.Unk5 = bf.ReadUint32()
+	}
 	return nil
 }
 

network/mhfpacket/msg_mhf_exchange_fpoint_2_item.go

@@ -1,20 +1,20 @@
 package mhfpacket
 
-import ( 
- "errors" 
+import (
+	"errors"
 
- 	"erupe-ce/network/clientctx"
-	"erupe-ce/network"
 	"erupe-ce/common/byteframe"
+	"erupe-ce/network"
+	"erupe-ce/network/clientctx"
 )
 
 // MsgMhfExchangeFpoint2Item represents the MSG_MHF_EXCHANGE_FPOINT_2_ITEM
-type MsgMhfExchangeFpoint2Item struct{
+type MsgMhfExchangeFpoint2Item struct {
 	AckHandle uint32
-	ItemHash uint32
-	ItemType uint16
-	ItemId uint16
-	Quantity byte
+	TradeID   uint32
+	ItemType  uint16
+	ItemId    uint16
+	Quantity  byte
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -25,7 +25,7 @@ func (m *MsgMhfExchangeFpoint2Item) Opcode() network.PacketID {
 // Parse parses the packet from binary
 func (m *MsgMhfExchangeFpoint2Item) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
-	m.ItemHash = bf.ReadUint32()
+	m.TradeID = bf.ReadUint32()
 	m.ItemType = bf.ReadUint16()
 	m.ItemId = bf.ReadUint16()
 	m.Quantity = bf.ReadUint8()