Merge branch 'Akebi-Group:master' into master

This commit is contained in:
hellomykami 2022-07-25 18:09:26 +08:00 committed by GitHub
commit 33a86ad833
72 changed files with 357 additions and 15 deletions

View File

@ -226,9 +226,12 @@
<Image Include="res\iconsHD\Eel.png" />
<Image Include="res\iconsHD\ElectroAbyssLector.png" />
<Image Include="res\iconsHD\ElectroRegisvine.png" />
<Image Include="res\iconsHD\Eremite.png" />
<Image Include="res\iconsHD\Falcon.png" />
<Image Include="res\iconsHD\Finch.png" />
<Image Include="res\iconsHD\Fox.png" />
<Image Include="res\iconsHD\GroundedShroom.png" />
<Image Include="res\iconsHD\HarraFruit.png" />
<Image Include="res\iconsHD\HydroAbyssHerald.png" />
<Image Include="res\iconsHD\AbyssMage.png" />
<Image Include="res\iconsHD\AdornedUnagi.png" />
@ -357,8 +360,10 @@
<Image Include="res\iconsHD\Inu.png" />
<Image Include="res\iconsHD\IronChunk.png" />
<Image Include="res\iconsHD\JadeChamber.png" />
<Image Include="res\iconsHD\JadeplumeTerrorshroom.png" />
<Image Include="res\iconsHD\JueyunChili.png" />
<Image Include="res\iconsHD\Kairagi.png" />
<Image Include="res\iconsHD\KalpalataLotus.png" />
<Image Include="res\iconsHD\KeySigil.png" />
<Image Include="res\iconsHD\KeySigilI.png" />
<Image Include="res\iconsHD\KeySigilII.png" />
@ -401,13 +406,16 @@
<Image Include="res\iconsHD\Mushroom.png" />
<Image Include="res\iconsHD\MysteriousCarvings.png" />
<Image Include="res\iconsHD\NakuWeed.png" />
<Image Include="res\iconsHD\NilotpalaLotus.png" />
<Image Include="res\iconsHD\Nobushi.png" />
<Image Include="res\iconsHD\NoctilucousJade.png" />
<Image Include="res\iconsHD\OceanCrab.png" />
<Image Include="res\iconsHD\Oceanid.png" />
<Image Include="res\iconsHD\OceanidSummons.png" />
<Image Include="res\iconsHD\Onikabuto.png" />
<Image Include="res\iconsHD\Ores.png" />
<Image Include="res\iconsHD\OtogiWood.png" />
<Image Include="res\iconsHD\Padisarah.png" />
<Image Include="res\iconsHD\PaleRedCrab.png" />
<Image Include="res\iconsHD\PerpetualMechanicalArray.png" />
<Image Include="res\iconsHD\PhaseGate.png" />
@ -437,6 +445,7 @@
<Image Include="res\iconsHD\RemarkableChest.png" />
<Image Include="res\iconsHD\Rifthound.png" />
<Image Include="res\iconsHD\RifthoundWhelp.png" />
<Image Include="res\iconsHD\RishbolandTiger.png" />
<Image Include="res\iconsHD\RockPile.png" />
<Image Include="res\iconsHD\RuinBrazier.png" />
<Image Include="res\iconsHD\RuinGrader.png" />
@ -444,6 +453,7 @@
<Image Include="res\iconsHD\RuinHunter.png" />
<Image Include="res\iconsHD\RuinSentinel.png" />
<Image Include="res\iconsHD\RuinSerpent.png" />
<Image Include="res\iconsHD\RukkhashavaMushrooms.png" />
<Image Include="res\iconsHD\RustyKoi.png" />
<Image Include="res\iconsHD\SacredSakura.png" />
<Image Include="res\iconsHD\SakuraBloom.png" />
@ -465,6 +475,7 @@
<Image Include="res\iconsHD\Seelie.png" />
<Image Include="res\iconsHD\SeelieCourt.png" />
<Image Include="res\iconsHD\ShadowyHusk.png" />
<Image Include="res\iconsHD\ShaggySumpterBeast.png" />
<Image Include="res\iconsHD\Shogun.png" />
<Image Include="res\iconsHD\ShogunateInfantry.png" />
<Image Include="res\iconsHD\ShrineOfDepth.png" />
@ -481,6 +492,7 @@
<Image Include="res\iconsHD\Snowstrider.png" />
<Image Include="res\iconsHD\SnowWeasel.png" />
<Image Include="res\iconsHD\Specter.png" />
<Image Include="res\iconsHD\Spincrocodile.png" />
<Image Include="res\iconsHD\Squirrel.png" />
<Image Include="res\iconsHD\Starconch.png" />
<Image Include="res\iconsHD\Starshroom.png" />
@ -489,6 +501,8 @@
<Image Include="res\iconsHD\StormBarrier.png" />
<Image Include="res\iconsHD\Stormstone.png" />
<Image Include="res\iconsHD\StrangeTooth.png" />
<Image Include="res\iconsHD\StretchyFungus.png" />
<Image Include="res\iconsHD\SumeruRose.png" />
<Image Include="res\iconsHD\SunCrab.png" />
<Image Include="res\iconsHD\SunnyLoach.png" />
<Image Include="res\iconsHD\SunsetLoach.png" />
@ -507,6 +521,7 @@
<Image Include="res\iconsHD\TorchPuzzle.png" />
<Image Include="res\iconsHD\TreasureHoarder.png" />
<Image Include="res\iconsHD\TriangularMechanism.png" />
<Image Include="res\iconsHD\Tukan.png" />
<Image Include="res\iconsHD\UnagiMeat.png" />
<Image Include="res\iconsHD\UniqueRocks.png" />
<Image Include="res\iconsHD\UnusualHilichurl.png" />
@ -515,21 +530,25 @@
<Image Include="res\iconsHD\Viewpoint.png" />
<Image Include="res\iconsHD\Violetgrass.png" />
<Image Include="res\iconsHD\VioletIbis.png" />
<Image Include="res\iconsHD\Viparyas.png" />
<Image Include="res\iconsHD\WarmingSeelie.png" />
<Image Include="res\iconsHD\WaveriderWaypointCannotTeleport.png" />
<Image Include="res\iconsHD\Weapon.png" />
<Image Include="res\iconsHD\Weasel.png" />
<Image Include="res\iconsHD\WhirlingFungus.png" />
<Image Include="res\iconsHD\WhiteIronChunk.png" />
<Image Include="res\iconsHD\WhitePigeon.png" />
<Image Include="res\iconsHD\Whopperflower.png" />
<Image Include="res\iconsHD\Wigeon.png" />
<Image Include="res\iconsHD\WindmillMechanism.png" />
<Image Include="res\iconsHD\WindwheelAster.png" />
<Image Include="res\iconsHD\WingedShroom.png" />
<Image Include="res\iconsHD\Wolfhook.png" />
<Image Include="res\iconsHD\WolvesoftheRift.png" />
<Image Include="res\iconsHD\WoodenCrate.png" />
<Image Include="res\iconsHD\WorldQuests.png" />
<Image Include="res\iconsHD\YumemiruWood.png" />
<Image Include="res\iconsHD\ZaytunPeach.png" />
<Image Include="res\icons\AbidingAngelfish.png" />
<Image Include="res\icons\Andrius.png" />
<Image Include="res\icons\Azhdaha.png" />
@ -545,9 +564,12 @@
<Image Include="res\icons\Eel.png" />
<Image Include="res\icons\ElectroAbyssLector.png" />
<Image Include="res\icons\ElectroRegisvine.png" />
<Image Include="res\icons\Eremite.png" />
<Image Include="res\icons\Falcon.png" />
<Image Include="res\icons\Finch.png" />
<Image Include="res\icons\Fox.png" />
<Image Include="res\icons\GroundedShroom.png" />
<Image Include="res\icons\HarraFruit.png" />
<Image Include="res\icons\HydroAbyssHerald.png" />
<Image Include="res\icons\AbyssMage.png" />
<Image Include="res\icons\AdornedUnagi.png" />
@ -676,8 +698,10 @@
<Image Include="res\icons\Inu.png" />
<Image Include="res\icons\IronChunk.png" />
<Image Include="res\icons\JadeChamber.png" />
<Image Include="res\icons\JadeplumeTerrorshroom.png" />
<Image Include="res\icons\JueyunChili.png" />
<Image Include="res\icons\Kairagi.png" />
<Image Include="res\icons\KalpalataLotus.png" />
<Image Include="res\icons\KeySigil.png" />
<Image Include="res\icons\KeySigilI.png" />
<Image Include="res\icons\KeySigilII.png" />
@ -720,13 +744,16 @@
<Image Include="res\icons\Mushroom.png" />
<Image Include="res\icons\MysteriousCarvings.png" />
<Image Include="res\icons\NakuWeed.png" />
<Image Include="res\icons\NilotpalaLotus.png" />
<Image Include="res\icons\Nobushi.png" />
<Image Include="res\icons\NoctilucousJade.png" />
<Image Include="res\icons\OceanCrab.png" />
<Image Include="res\icons\Oceanid.png" />
<Image Include="res\icons\OceanidSummons.png" />
<Image Include="res\icons\Onikabuto.png" />
<Image Include="res\icons\Ores.png" />
<Image Include="res\icons\OtogiWood.png" />
<Image Include="res\icons\Padisarah.png" />
<Image Include="res\icons\PaleRedCrab.png" />
<Image Include="res\icons\PerpetualMechanicalArray.png" />
<Image Include="res\icons\PhaseGate.png" />
@ -756,6 +783,7 @@
<Image Include="res\icons\RemarkableChest.png" />
<Image Include="res\icons\Rifthound.png" />
<Image Include="res\icons\RifthoundWhelp.png" />
<Image Include="res\icons\RishbolandTiger.png" />
<Image Include="res\icons\RockPile.png" />
<Image Include="res\icons\RuinBrazier.png" />
<Image Include="res\icons\RuinGrader.png" />
@ -763,6 +791,7 @@
<Image Include="res\icons\RuinHunter.png" />
<Image Include="res\icons\RuinSentinel.png" />
<Image Include="res\icons\RuinSerpent.png" />
<Image Include="res\icons\RukkhashavaMushrooms.png" />
<Image Include="res\icons\RustyKoi.png" />
<Image Include="res\icons\SacredSakura.png" />
<Image Include="res\icons\SakuraBloom.png" />
@ -784,6 +813,7 @@
<Image Include="res\icons\Seelie.png" />
<Image Include="res\icons\SeelieCourt.png" />
<Image Include="res\icons\ShadowyHusk.png" />
<Image Include="res\icons\ShaggySumpterBeast.png" />
<Image Include="res\icons\Shogun.png" />
<Image Include="res\icons\ShogunateInfantry.png" />
<Image Include="res\icons\ShrineOfDepth.png" />
@ -800,6 +830,7 @@
<Image Include="res\icons\Snowstrider.png" />
<Image Include="res\icons\SnowWeasel.png" />
<Image Include="res\icons\Specter.png" />
<Image Include="res\icons\Spincrocodile.png" />
<Image Include="res\icons\Squirrel.png" />
<Image Include="res\icons\Starconch.png" />
<Image Include="res\icons\Starshroom.png" />
@ -808,6 +839,8 @@
<Image Include="res\icons\StormBarrier.png" />
<Image Include="res\icons\Stormstone.png" />
<Image Include="res\icons\StrangeTooth.png" />
<Image Include="res\icons\StretchyFungus.png" />
<Image Include="res\icons\SumeruRose.png" />
<Image Include="res\icons\SunCrab.png" />
<Image Include="res\icons\SunnyLoach.png" />
<Image Include="res\icons\SunsetLoach.png" />
@ -826,6 +859,7 @@
<Image Include="res\icons\TorchPuzzle.png" />
<Image Include="res\icons\TreasureHoarder.png" />
<Image Include="res\icons\TriangularMechanism.png" />
<Image Include="res\icons\Tukan.png" />
<Image Include="res\icons\UnagiMeat.png" />
<Image Include="res\icons\UniqueRocks.png" />
<Image Include="res\icons\UnusualHilichurl.png" />
@ -834,21 +868,25 @@
<Image Include="res\icons\Viewpoint.png" />
<Image Include="res\icons\Violetgrass.png" />
<Image Include="res\icons\VioletIbis.png" />
<Image Include="res\icons\Viparyas.png" />
<Image Include="res\icons\WarmingSeelie.png" />
<Image Include="res\icons\WaveriderWaypointCannotTeleport.png" />
<Image Include="res\icons\Weapon.png" />
<Image Include="res\icons\Weasel.png" />
<Image Include="res\icons\WhirlingFungus.png" />
<Image Include="res\icons\WhiteIronChunk.png" />
<Image Include="res\icons\WhitePigeon.png" />
<Image Include="res\icons\Whopperflower.png" />
<Image Include="res\icons\Wigeon.png" />
<Image Include="res\icons\WindmillMechanism.png" />
<Image Include="res\icons\WindwheelAster.png" />
<Image Include="res\icons\WingedShroom.png" />
<Image Include="res\icons\Wolfhook.png" />
<Image Include="res\icons\WolvesoftheRift.png" />
<Image Include="res\icons\WoodenCrate.png" />
<Image Include="res\icons\WorldQuests.png" />
<Image Include="res\icons\YumemiruWood.png" />
<Image Include="res\icons\ZaytunPeach.png" />
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
@ -1036,4 +1074,4 @@ powershell -nop -c "&amp; {sleep 15}"</Command>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

View File

@ -2382,5 +2382,119 @@
<Image Include="res\icons\SangonomiyaCohort.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\SumeruRose.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\Tukan.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\Viparyas.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\ZaytunPeach.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\Eremite.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\HarraFruit.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\JadeplumeTerrorshroom.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\KalpalataLotus.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\NilotpalaLotus.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\Padisarah.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\RukkhashavaMushrooms.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\Tukan.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\Viparyas.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\ZaytunPeach.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\Eremite.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\HarraFruit.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\JadeplumeTerrorshroom.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\KalpalataLotus.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\NilotpalaLotus.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\Padisarah.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\RukkhashavaMushrooms.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\SumeruRose.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\WhirlingFungus.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\WingedShroom.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\GroundedShroom.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\StretchyFungus.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\WhirlingFungus.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\WingedShroom.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\GroundedShroom.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\StretchyFungus.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\OceanidSummons.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\RishbolandTiger.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\ShaggySumpterBeast.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\iconsHD\Spincrocodile.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\OceanidSummons.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\RishbolandTiger.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\ShaggySumpterBeast.png">
<Filter>Resource Files</Filter>
</Image>
<Image Include="res\icons\Spincrocodile.png">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
</Project>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 868 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 267 KiB

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 103 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 112 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

View File

@ -126,6 +126,8 @@ HDBITTERPUFFERFISH PNG "iconsHD\\BitterPufferfish.png"
HDBLACKKINGPIGEON PNG "iconsHD\\BlackKingPigeon.png"
HDBLACKSERPENTKNIGHT PNG "iconsHD\\BlackSerpentKnight.png"
HDBLOATTYFLOATTY PNG "iconsHD\\BloattyFloatty.png"
HDBLUEFROG PNG "iconsHD\\BlueFrog.png"
@ -160,7 +162,7 @@ HDCECILIA PNG "iconsHD\\Cecilia.png"
HDCHILLEDMEAT PNG "iconsHD\\ChilledMeat.png"
HDCICIN PNG "iconsHD\\Cicin.png"
HDCICIN PNG "iconsHD\\Cicin.png"
HDCOMMONCHEST PNG "iconsHD\\CommonChest.png"
@ -260,6 +262,8 @@ HDENEMIESFIRSTTIMEVICTORY PNG "iconsHD\\EnemiesFirstTimeVict
HDENKANOMIYAPHASEGATE PNG "iconsHD\\EnkanomiyaPhaseGate.png"
HDEREMITE PNG "iconsHD\\Eremite.png"
HDEXQUISITECHEST PNG "iconsHD\\ExquisiteChest.png"
HDEYEOFTHESTORM PNG "iconsHD\\EyeoftheStorm.png"
@ -338,6 +342,10 @@ HDGRAYWINGPIGEON PNG "iconsHD\\GraywingPigeon.png"
HDGREENHORNEDLIZARD PNG "iconsHD\\GreenHornedLizard.png"
HDGROUNDEDSHROOM PNG "iconsHD\\GroundedShroom.png"
HDHARRAFRUIT PNG "iconsHD\\HarraFruit.png"
HDHARVESTABLEPLANT PNG "iconsHD\\HarvestablePlant.png"
HDHILICHURL PNG "iconsHD\\Hilichurl.png"
@ -364,10 +372,14 @@ HDIRONCHUNK PNG "iconsHD\\IronChunk.png"
HDJADECHAMBER PNG "iconsHD\\JadeChamber.png"
HDJADEPLUMETERRORSHROOM PNG "iconsHD\\JadeplumeTerrorshroom.png"
HDJUEYUNCHILI PNG "iconsHD\\JueyunChili.png"
HDKAIRAGI PNG "iconsHD\\Kairagi.png"
HDKALPALATALOTUS PNG "iconsHD\\KalpalataLotus.png"
HDKEYSIGIL PNG "iconsHD\\KeySigil.png"
HDKEYSIGILI PNG "iconsHD\\KeySigilI.png"
@ -452,6 +464,8 @@ HDMYSTERIOUSCARVINGS PNG "iconsHD\\MysteriousCarvings.png
HDNAKUWEED PNG "iconsHD\\NakuWeed.png"
HDNILOTPALALOTUS PNG "iconsHD\\NilotpalaLotus.png"
HDNOBUSHI PNG "iconsHD\\Nobushi.png"
HDNOCTILUCOUSJADE PNG "iconsHD\\NoctilucousJade.png"
@ -460,15 +474,33 @@ HDOCEANCRAB PNG "iconsHD\\OceanCrab.png"
HDOCEANID PNG "iconsHD\\Oceanid.png"
HDOCEANIDBOAR PNG "iconsHD\\OceanidSummons.png"
HDOCEANIDCRAB PNG "iconsHD\\OceanidSummons.png"
HDOCEANIDCRANE PNG "iconsHD\\OceanidSummons.png"
HDOCEANIDFALCON PNG "iconsHD\\OceanidSummons.png"
HDOCEANIDFINCH PNG "iconsHD\\OceanidSummons.png"
HDOCEANIDFROG PNG "iconsHD\\OceanidSummons.png"
HDOCEANIDSQUIRREL PNG "iconsHD\\OceanidSummons.png"
HDOCEANIDWIGEON PNG "iconsHD\\OceanidSummons.png"
HDONIKABUTO PNG "iconsHD\\Onikabuto.png"
HDORES PNG "iconsHD\\Ores.png"
HDOTOGIWOOD PNG "iconsHD\\OtogiWood.png"
HDPADISARAH PNG "iconsHD\\Padisarah.png"
HDPALEREDCRAB PNG "iconsHD\\PaleRedCrab.png"
HDPERPETUALMECHANICALARRAY PNG "iconsHD\\PerpetualMechanicalArray.png"
HDPERPETUALMECHANICALARRAY PNG "iconsHD\\PerpetualMechanicalArray.png"
HDPHASEGATE PNG "iconsHD\\PhaseGate.png"
@ -480,7 +512,7 @@ HDPINECONE PNG "iconsHD\\Pinecone.png"
HDPINEWOOD PNG "iconsHD\\PineWood.png"
HDPLACESOFESSENCEWORSHIP PNG "iconsHD\\PlacesofEssenceWorship.png"
HDPLACESOFESSENCEWORSHIP PNG "iconsHD\\PlacesofEssenceWorship.png"
HDPOT PNG "iconsHD\\Pot.png"
@ -524,10 +556,14 @@ HDRIFTHOUND PNG "iconsHD\\Rifthound.png"
HDRIFTHOUNDWHELP PNG "iconsHD\\RifthoundWhelp.png"
HDRISHBOLANDTIGER PNG "iconsHD\\RishbolandTiger.png"
HDROCKPILE PNG "iconsHD\\RockPile.png"
HDRUINBRAZIER PNG "iconsHD\\RuinBrazier.png"
HDRUINDRAKE PNG "iconsHD\\RuinDrake.png"
HDRUINGRADER PNG "iconsHD\\RuinGrader.png"
HDRUINGUARD PNG "iconsHD\\RuinGuard.png"
@ -538,6 +574,8 @@ HDRUINSENTINEL PNG "iconsHD\\RuinSentinel.png"
HDRUINSERPENT PNG "iconsHD\\RuinSerpent.png"
HDRUKKHASHAVAMUSHROOMS PNG "iconsHD\\RukkhashavaMushrooms.png"
HDRUSTYKOI PNG "iconsHD\\RustyKoi.png"
HDSACREDSAKURA PNG "iconsHD\\SacredSakura.png"
@ -564,6 +602,8 @@ HDSEAGRASS PNG "iconsHD\\Seagrass.png"
HDSEALEDCHEST PNG "iconsHD\\SealedChest.png"
HDSEALLOCATIONS PNG "iconsHD\\SealLocationI.png"
HDSEALLOCATIONI PNG "iconsHD\\SealLocationI.png"
HDSEALLOCATIONII PNG "iconsHD\\SealLocationII.png"
@ -580,6 +620,8 @@ HDSEELIECOURT PNG "iconsHD\\SeelieCourt.png"
HDSHADOWYHUSK PNG "iconsHD\\ShadowyHusk.png"
HDSHAGGYSUMPTERBEAST PNG "iconsHD\\ShaggySumpterBeast.png"
HDSHOGUN PNG "iconsHD\\Shogun.png"
HDSHOGUNATEINFANTRY PNG "iconsHD\\ShogunateInfantry.png"
@ -612,6 +654,8 @@ HDSNOWWEASEL PNG "iconsHD\\SnowWeasel.png"
HDSPECTER PNG "iconsHD\\Specter.png"
HDSPINCROCODILE PNG "iconsHD\\Spincrocodile.png"
HDSQUIRREL PNG "iconsHD\\Squirrel.png"
HDSTARCONCH PNG "iconsHD\\Starconch.png"
@ -628,6 +672,10 @@ HDSTORMSTONE PNG "iconsHD\\Stormstone.png"
HDSTRANGETOOTH PNG "iconsHD\\StrangeTooth.png"
HDSTRETCHYFUNGUS PNG "iconsHD\\StretchyFungus.png"
HDSUMERUROSE PNG "iconsHD\\SumeruRose.png"
HDSUNCRAB PNG "iconsHD\\SunCrab.png"
HDSUNNYLOACH PNG "iconsHD\\SunnyLoach.png"
@ -664,6 +712,8 @@ HDTREASUREHOARDER PNG "iconsHD\\TreasureHoarder.png"
HDTRIANGULARMECHANISM PNG "iconsHD\\TriangularMechanism.png"
HDTUKAN PNG "iconsHD\\Tukan.png"
HDUNAGIMEAT PNG "iconsHD\\UnagiMeat.png"
HDUNIQUEROCKS PNG "iconsHD\\UniqueRocks.png"
@ -680,14 +730,18 @@ HDVIOLETGRASS PNG "iconsHD\\Violetgrass.png"
HDVIOLETIBIS PNG "iconsHD\\VioletIbis.png"
HDVIPARYAS PNG "iconsHD\\Viparyas.png"
HDWARMINGSEELIE PNG "iconsHD\\WarmingSeelie.png"
HDWAVERIDERWAYPOINTCANNOTTELEPORT PNG "iconsHD\\WaveriderWaypointCannotTeleport.png"
HDWAVERIDERWAYPOINTCANNOTTELEPORT PNG "iconsHD\\WaveriderWaypointCannotTeleport.png"
HDWEAPON PNG "iconsHD\\Weapon.png"
HDWEASEL PNG "iconsHD\\Weasel.png"
HDWHIRLINGFUNGUS PNG "iconsHD\\WhirlingFungus.png"
HDWHITEIRONCHUNK PNG "iconsHD\\WhiteIronChunk.png"
HDWHITEPIGEON PNG "iconsHD\\WhitePigeon.png"
@ -700,6 +754,8 @@ HDWINDMILLMECHANISM PNG "iconsHD\\WindmillMechanism.png"
HDWINDWHEELASTER PNG "iconsHD\\WindwheelAster.png"
HDWINGEDSHROOM PNG "iconsHD\\WingedShroom.png"
HDWOLFHOOK PNG "iconsHD\\Wolfhook.png"
HDWOLVESOFTHERIFT PNG "iconsHD\\WolvesoftheRift.png"
@ -710,6 +766,8 @@ HDWORLDQUESTS PNG "iconsHD\\WorldQuests.png"
HDYUMEMIRUWOOD PNG "iconsHD\\YumemiruWood.png"
HDZAYTUNPEACH PNG "iconsHD\\ZaytunPeach.png"
ABIDINGANGELFISH PNG "icons\\AbidingAngelfish.png"
ABYSSMAGE PNG "icons\\AbyssMage.png"
@ -768,6 +826,8 @@ BITTERPUFFERFISH PNG "icons\\BitterPufferfish.png"
BLACKKINGPIGEON PNG "icons\\BlackKingPigeon.png"
BLACKSERPENTKNIGHT PNG "icons\\BlackSerpentKnight.png"
BLOATTYFLOATTY PNG "icons\\BloattyFloatty.png"
BLUEFROG PNG "icons\\BlueFrog.png"
@ -850,7 +910,7 @@ DANDY PNG "icons\\Dandy.png"
DAWNCATCHER PNG "icons\\Dawncatcher.png"
DAYNIGHTSWITCHINGMECHANISM PNG "icons\\DayNightSwitchingMechanism.png"
DAYNIGHTSWITCHINGMECHANISM PNG "icons\\DayNightSwitchingMechanism.png"
DEEPSEAUNAGI PNG "icons\\DeepSeaUnagi.png"
@ -902,6 +962,8 @@ ENEMIESFIRSTTIMEVICTORY PNG "icons\\EnemiesFirstTimeVictory.
ENKANOMIYAPHASEGATE PNG "icons\\EnkanomiyaPhaseGate.png"
EREMITE PNG "icons\\Eremite.png"
EXQUISITECHEST PNG "icons\\ExquisiteChest.png"
EYEOFTHESTORM PNG "icons\\EyeoftheStorm.png"
@ -980,6 +1042,10 @@ GRAYWINGPIGEON PNG "icons\\GraywingPigeon.png"
GREENHORNEDLIZARD PNG "icons\\GreenHornedLizard.png"
GROUNDEDSHROOM PNG "icons\\GroundedShroom.png"
HARRAFRUIT PNG "icons\\HarraFruit.png"
HARVESTABLEPLANT PNG "icons\\HarvestablePlant.png"
HILICHURL PNG "icons\\Hilichurl.png"
@ -1006,10 +1072,14 @@ IRONCHUNK PNG "icons\\IronChunk.png"
JADECHAMBER PNG "icons\\JadeChamber.png"
JADEPLUMETERRORSHROOM PNG "icons\\JadeplumeTerrorshroom.png"
JUEYUNCHILI PNG "icons\\JueyunChili.png"
KAIRAGI PNG "icons\\Kairagi.png"
KALPALATALOTUS PNG "icons\\KalpalataLotus.png"
KEYSIGIL PNG "icons\\KeySigil.png"
KEYSIGILI PNG "icons\\KeySigilI.png"
@ -1094,6 +1164,8 @@ MYSTERIOUSCARVINGS PNG "icons\\MysteriousCarvings.png"
NAKUWEED PNG "icons\\NakuWeed.png"
NILOTPALALOTUS PNG "icons\\NilotpalaLotus.png"
NOBUSHI PNG "icons\\Nobushi.png"
NOCTILUCOUSJADE PNG "icons\\NoctilucousJade.png"
@ -1104,12 +1176,30 @@ OCEANCRAB PNG "icons\\OceanCrab.png"
OCEANID PNG "icons\\Oceanid.png"
OCEANIDBOAR PNG "icons\\OceanidSummons.png"
OCEANIDCRAB PNG "icons\\OceanidSummons.png"
OCEANIDCRANE PNG "icons\\OceanidSummons.png"
OCEANIDFALCON PNG "icons\\OceanidSummons.png"
OCEANIDFINCH PNG "icons\\OceanidSummons.png"
OCEANIDFROG PNG "icons\\OceanidSummons.png"
OCEANIDSQUIRREL PNG "icons\\OceanidSummons.png"
OCEANIDWIGEON PNG "icons\\OceanidSummons.png"
ONIKABUTO PNG "icons\\Onikabuto.png"
ORES PNG "icons\\Ores.png"
OTOGIWOOD PNG "icons\\OtogiWood.png"
PADISARAH PNG "icons\\Padisarah.png"
PALEREDCRAB PNG "icons\\PaleRedCrab.png"
PERPETUALMECHANICALARRAY PNG "icons\\PerpetualMechanicalArray.png"
@ -1168,10 +1258,14 @@ RIFTHOUND PNG "icons\\Rifthound.png"
RIFTHOUNDWHELP PNG "icons\\RifthoundWhelp.png"
RISHBOLANDTIGER PNG "icons\\RishbolandTiger.png"
ROCKPILE PNG "icons\\RockPile.png"
RUINBRAZIER PNG "icons\\RuinBrazier.png"
RUINDRAKE PNG "icons\\RuinDrake.png"
RUINGRADER PNG "icons\\RuinGrader.png"
RUINGUARD PNG "icons\\RuinGuard.png"
@ -1182,6 +1276,8 @@ RUINSENTINEL PNG "icons\\RuinSentinel.png"
RUINSERPENT PNG "icons\\RuinSerpent.png"
RUKKHASHAVAMUSHROOMS PNG "icons\\RukkhashavaMushrooms.png"
RUSTYKOI PNG "icons\\RustyKoi.png"
SACREDSAKURA PNG "icons\\SacredSakura.png"
@ -1208,6 +1304,8 @@ SEAGRASS PNG "icons\\Seagrass.png"
SEALEDCHEST PNG "icons\\SealedChest.png"
SEALLOCATIONS PNG "icons\\SealLocationI.png"
SEALLOCATIONI PNG "icons\\SealLocationI.png"
SEALLOCATIONII PNG "icons\\SealLocationII.png"
@ -1224,6 +1322,8 @@ SEELIECOURT PNG "icons\\SeelieCourt.png"
SHADOWYHUSK PNG "icons\\ShadowyHusk.png"
SHAGGYSUMPTERBEAST PNG "icons\\ShaggySumpterBeast.png"
SHOGUN PNG "icons\\Shogun.png"
SHOGUNATEINFANTRY PNG "icons\\ShogunateInfantry.png"
@ -1256,6 +1356,8 @@ SNOWWEASEL PNG "icons\\SnowWeasel.png"
SPECTER PNG "icons\\Specter.png"
SPINCROCODILE PNG "icons\\Spincrocodile.png"
SQUIRREL PNG "icons\\Squirrel.png"
STARCONCH PNG "icons\\Starconch.png"
@ -1272,6 +1374,10 @@ STORMSTONE PNG "icons\\Stormstone.png"
STRANGETOOTH PNG "icons\\StrangeTooth.png"
STRETCHYFUNGUS PNG "icons\\StretchyFungus.png"
SUMERUROSE PNG "icons\\SumeruRose.png"
SUNCRAB PNG "icons\\SunCrab.png"
SUNNYLOACH PNG "icons\\SunnyLoach.png"
@ -1308,6 +1414,8 @@ TREASUREHOARDER PNG "icons\\TreasureHoarder.png"
TRIANGULARMECHANISM PNG "icons\\TriangularMechanism.png"
TUKAN PNG "icons\\Tukan.png"
UNAGIMEAT PNG "icons\\UnagiMeat.png"
UNIQUEROCKS PNG "icons\\UniqueRocks.png"
@ -1324,13 +1432,17 @@ VIOLETGRASS PNG "icons\\Violetgrass.png"
VIOLETIBIS PNG "icons\\VioletIbis.png"
VIPARYAS PNG "icons\\Viparyas.png"
WARMINGSEELIE PNG "icons\\WarmingSeelie.png"
WAVERIDERWAYPOINTCANNOTTELEPORT PNG "icons\\WaveriderWaypointCannotTeleport.png"
WAVERIDERWAYPOINTCANNOTTELEPORT PNG "icons\\WaveriderWaypointCannotTeleport.png"
WEAPON PNG "icons\\Weapon.png"
WEASEL PNG "icons\\Weasel.png"
WEASEL PNG "icons\\Weasel.png"
WHIRLINGFUNGUS PNG "icons\\WhirlingFungus.png"
WHITEIRONCHUNK PNG "icons\\WhiteIronChunk.png"
@ -1344,6 +1456,8 @@ WINDMILLMECHANISM PNG "icons\\WindmillMechanism.png"
WINDWHEELASTER PNG "icons\\WindwheelAster.png"
WINGEDSHROOM PNG "icons\\WingedShroom.png"
WOLFHOOK PNG "icons\\Wolfhook.png"
WOLVESOFTHERIFT PNG "icons\\WolvesoftheRift.png"
@ -1354,6 +1468,8 @@ WORLDQUESTS PNG "icons\\WorldQuests.png"
YUMEMIRUWOOD PNG "icons\\YumemiruWood.png"
ZAYTUNPEACH PNG "icons\\ZaytunPeach.png"
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////

View File

@ -176,7 +176,7 @@ namespace cheat::feature
else if (name.find("Animal") != std::string::npos)
{
int count = 0;
int j = 0;
int j = 0;
int pos1 = 0;
int pos2 = 0;
for (int i = 0; i < name.length(); i++)
@ -636,6 +636,7 @@ namespace cheat::feature
ADD_FILTER_FIELD(living, Salamander);
ADD_FILTER_FIELD(living, Squirrel);
ADD_FILTER_FIELD(living, Starconch);
ADD_FILTER_FIELD(living, Tukan);
ADD_FILTER_FIELD(living, Weasel);
ADD_FILTER_FIELD(living, Wigeon);
@ -685,11 +686,14 @@ namespace cheat::feature
// Others.
ADD_FILTER_FIELD(monster, GoldenWolflord);
ADD_FILTER_FIELD(monster, MaguuKenki);
// Sumeru
ADD_FILTER_FIELD(monster, JadeplumeTerrorshroom);
// Regular. Alphabetical.
ADD_FILTER_FIELD(monster, AbyssMage);
ADD_FILTER_FIELD(monster, BlackSerpentKnight);
ADD_FILTER_FIELD(monster, Cicin);
ADD_FILTER_FIELD(monster, ElectroAbyssLector);
ADD_FILTER_FIELD(monster, Eremite);
ADD_FILTER_FIELD(monster, EyeOfTheStorm);
ADD_FILTER_FIELD(monster, FatuiAgent);
ADD_FILTER_FIELD(monster, FatuiCicinMage);
@ -698,8 +702,10 @@ namespace cheat::feature
ADD_FILTER_FIELD(monster, FloatingFungus);
ADD_FILTER_FIELD(monster, Geovishap);
ADD_FILTER_FIELD(monster, GeovishapHatchling);
ADD_FILTER_FIELD(monster, GroundedShroom);
ADD_FILTER_FIELD(monster, Hilichurl);
ADD_FILTER_FIELD(monster, HydroAbyssHerald);
ADD_FILTER_FIELD(monster, HydroBathysmalVishap);
ADD_FILTER_FIELD(monster, HydroHypostasisSummon);
ADD_FILTER_FIELD(monster, Kairagi);
ADD_FILTER_FIELD(monster, Millelith);
@ -716,18 +722,26 @@ namespace cheat::feature
ADD_FILTER_FIELD(monster, PyroAbyssLector);
ADD_FILTER_FIELD(monster, Rifthound);
ADD_FILTER_FIELD(monster, RifthoundWhelp);
ADD_FILTER_FIELD(monster, RishbolandTiger);
ADD_FILTER_FIELD(monster, RuinDrake);
ADD_FILTER_FIELD(monster, RuinGrader);
ADD_FILTER_FIELD(monster, RuinGuard);
ADD_FILTER_FIELD(monster, RuinHunter);
ADD_FILTER_FIELD(monster, RuinSentinel);
ADD_FILTER_FIELD(monster, Samachurl);
ADD_FILTER_FIELD(monster, SangonomiyaCohort);
ADD_FILTER_FIELD(monster, ShadowyHusk);
ADD_FILTER_FIELD(monster, ShaggySumpterBeast);
ADD_FILTER_FIELD(monster, ShogunateInfantry);
ADD_FILTER_FIELD(monster, Slime);
ADD_FILTER_FIELD(monster, Specter);
ADD_FILTER_FIELD(monster, Spincrocodile);
ADD_FILTER_FIELD(monster, StretchyFungus);
ADD_FILTER_FIELD(monster, TreasureHoarder);
ADD_FILTER_FIELD(monster, UnusualHilichurl);
ADD_FILTER_FIELD(monster, WhirlingFungus);
ADD_FILTER_FIELD(monster, Whopperflower);
ADD_FILTER_FIELD(monster, WingedShroom);
ADD_FILTER_FIELD(plant, AmakumoFruit);
ADD_FILTER_FIELD(plant, Apple);
@ -741,8 +755,10 @@ namespace cheat::feature
ADD_FILTER_FIELD(plant, FlamingFlowerStamen);
ADD_FILTER_FIELD(plant, FluorescentFungus);
ADD_FILTER_FIELD(plant, GlazeLily);
ADD_FILTER_FIELD(plant, HarraFruit);
ADD_FILTER_FIELD(plant, Horsetail);
ADD_FILTER_FIELD(plant, JueyunChili);
ADD_FILTER_FIELD(plant, KalpalataLotus);
ADD_FILTER_FIELD(plant, LavenderMelon);
ADD_FILTER_FIELD(plant, LotusHead);
ADD_FILTER_FIELD(plant, Matsutake);
@ -750,10 +766,13 @@ namespace cheat::feature
ADD_FILTER_FIELD(plant, MistFlowerCorolla);
ADD_FILTER_FIELD(plant, Mushroom);
ADD_FILTER_FIELD(plant, NakuWeed);
ADD_FILTER_FIELD(plant, NilotpalaLotus);
ADD_FILTER_FIELD(plant, Padisarah);
ADD_FILTER_FIELD(plant, PhilanemoMushroom);
ADD_FILTER_FIELD(plant, Pinecone);
ADD_FILTER_FIELD(plant, Qingxin);
ADD_FILTER_FIELD(plant, Radish);
ADD_FILTER_FIELD(plant, RukkhashavaMushrooms);
ADD_FILTER_FIELD(plant, SakuraBloom);
ADD_FILTER_FIELD(plant, SangoPearl);
ADD_FILTER_FIELD(plant, SeaGanoderma);
@ -761,12 +780,15 @@ namespace cheat::feature
ADD_FILTER_FIELD(plant, SilkFlower);
ADD_FILTER_FIELD(plant, SmallLampGrass);
ADD_FILTER_FIELD(plant, Snapdragon);
ADD_FILTER_FIELD(plant, SumeruRose);
ADD_FILTER_FIELD(plant, Sunsettia);
ADD_FILTER_FIELD(plant, SweetFlower);
ADD_FILTER_FIELD(plant, Valberry);
ADD_FILTER_FIELD(plant, Violetgrass);
//ADD_FILTER_FIELD(plant, Viparyas);
ADD_FILTER_FIELD(plant, WindwheelAster);
ADD_FILTER_FIELD(plant, Wolfhook);
ADD_FILTER_FIELD(plant, ZaytunPeach);
ADD_FILTER_FIELD(puzzle, AncientRime);
ADD_FILTER_FIELD(puzzle, BakeDanuki);

View File

@ -95,12 +95,13 @@ namespace cheat::game::filters
SimpleFilter Boar = { EntityType__Enum_1::Monster, "Boar" };
SimpleFilter Fox = { EntityType__Enum_1::Monster, "Fox" };
SimpleFilter Squirrel = { EntityType__Enum_1::Monster, "Squirrel" };
SimpleFilter Npc = { EntityType__Enum_1::NPC, { "_Liyue", "_Mengde", "_Inazuma", "_Coop", "_Quest", "_Enkanomiya", "_Animal", "_Guide", "_Homeworld", "_Monster"}};
SimpleFilter Npc = { EntityType__Enum_1::NPC, { "_Liyue", "_Mengde", "_Inazuma", "_Enkanomiya", "_Sumeru", "_Fontaine", "_Natlan", "_Snezhnaya", "_Coop", "_Quest", "_Animal", "_Guide", "_Homeworld", "_Avatar", "_Kanban", "_Monster"} };
SimpleFilter Crane = { EntityType__Enum_1::Monster, "Crane" };
SimpleFilter Falcon = { EntityType__Enum_1::Monster, "Falcon" };
SimpleFilter LucklightFly = { EntityType__Enum_1::EnvAnimal, "Boltbug_" };
SimpleFilter Salamander = { EntityType__Enum_1::EnvAnimal, "Salamander" };
SimpleFilter Pigeon = { EntityType__Enum_1::Monster, "Pigeon" };
SimpleFilter Tukan = { EntityType__Enum_1::Monster, "Pigeon_Beak" };
SimpleFilter Pigeon = { EntityType__Enum_1::Monster, "Pigeon_0" };
SimpleFilter Crow = { EntityType__Enum_1::Monster, "Crow" };
SimpleFilter Finch = { EntityType__Enum_1::Monster, "Tit" };
SimpleFilter Wigeon = { EntityType__Enum_1::Monster, "Wigeon" };
@ -143,6 +144,7 @@ namespace cheat::game::filters
namespace monster
{
SimpleFilter AbyssMage = { EntityType__Enum_1::Monster, "_Abyss" };
SimpleFilter Eremite = { EntityType__Enum_1::Monster, "_Eremite" };
SimpleFilter FatuiAgent = { EntityType__Enum_1::Monster, "_Fatuus" };
SimpleFilter FatuiCicinMage = { EntityType__Enum_1::Monster, "_Fatuus_Summoner" };
SimpleFilter FatuiMirrorMaiden = { EntityType__Enum_1::Monster, "_Fatuus_Maiden" };
@ -153,6 +155,7 @@ namespace cheat::game::filters
SimpleFilter Mitachurl = { EntityType__Enum_1::Monster, "_Brute" };
SimpleFilter Nobushi = { EntityType__Enum_1::Monster, "_Ronin" };
SimpleFilter Kairagi = { EntityType__Enum_1::Monster, "_Kairagi" };
SimpleFilter RuinDrake = { EntityType__Enum_1::Monster, "_Gargoyle" };
SimpleFilter RuinGuard = { EntityType__Enum_1::Monster, "_Defender" };
SimpleFilter RuinHunter = { EntityType__Enum_1::Monster, "_Formathr" };
SimpleFilter RuinGrader = { EntityType__Enum_1::Monster, "_Konungmathr" };
@ -160,7 +163,11 @@ namespace cheat::game::filters
SimpleFilter Samachurl = { EntityType__Enum_1::Monster, "_Shaman" };
SimpleFilter ShadowyHusk = { EntityType__Enum_1::Monster, "ForlornVessel_Strong" };
SimpleFilter Slime = { EntityType__Enum_1::Monster, "_Slime" };
SimpleFilter FloatingFungus = { EntityType__Enum_1::Monster, { "Fungus_Un_", "Fungus_Deux_", "Fungus_Trois_", "Fungus_Amanita_"} };
SimpleFilter FloatingFungus = { EntityType__Enum_1::Monster, "Fungus_Un_" };
SimpleFilter StretchyFungus = { EntityType__Enum_1::Monster, "Fungus_Deux_" };
SimpleFilter WhirlingFungus = { EntityType__Enum_1::Monster, "Fungus_Trois_" };
SimpleFilter WingedShroom = { EntityType__Enum_1::Monster, "Fungus_Amanita_Unu" };
SimpleFilter GroundedShroom = { EntityType__Enum_1::Monster, "Fungus_Amanita_Du" };
SimpleFilter Specter = { EntityType__Enum_1::Monster, "_Sylph" };
SimpleFilter TreasureHoarder = { EntityType__Enum_1::Monster, "_Thoarder" };
SimpleFilter UnusualHilichurl = { EntityType__Enum_1::Monster, "_Hili_Wei" };
@ -211,6 +218,10 @@ namespace cheat::game::filters
SimpleFilter MaguuKenki = { EntityType__Enum_1::Monster, "_Ningyo" };
SimpleFilter Cicin = { EntityType__Enum_1::Monster, "_Cicin" };
SimpleFilter Beisht = { EntityType__Enum_1::Monster, "_Eldritch" };
SimpleFilter JadeplumeTerrorshroom = { EntityType__Enum_1::Monster, "Fungus_Raptor" };
SimpleFilter RishbolandTiger = { EntityType__Enum_1::Monster, "_Megamoth_" };
SimpleFilter ShaggySumpterBeast = { EntityType__Enum_1::Monster, "_Panther" };
SimpleFilter Spincrocodile = { EntityType__Enum_1::Monster, "_Gator" };
}
namespace plant
@ -258,6 +269,14 @@ namespace cheat::game::filters
SimpleFilter Wolfhook = { EntityType__Enum_1::GatherObject, "_GogoFruit" };
SimpleFilter RadishDrop = { EntityType__Enum_1::GatherObject, "_Plant_Carrot02_Clear" };
SimpleFilter CarrotDrop = { EntityType__Enum_1::GatherObject, "_Plant_Radish02_Clear" };
SimpleFilter HarraFruit = { EntityType__Enum_1::GatherObject, "_Ligusticum" };
SimpleFilter KalpalataLotus = { EntityType__Enum_1::GatherObject, "_Kalpalata" };
SimpleFilter NilotpalaLotus = { EntityType__Enum_1::GatherObject, "_MoonLotus" };
SimpleFilter Padisarah = { EntityType__Enum_1::GatherObject, "_Pasusalan" };
SimpleFilter RukkhashavaMushrooms = { EntityType__Enum_1::GatherObject, "_HolyMushroom" };
SimpleFilter SumeruRose = { EntityType__Enum_1::GatherObject, "_XumiRose" };
//SimpleFilter Viparyas = { EntityType__Enum_1::GatherObject, "_" };
SimpleFilter ZaytunPeach = { EntityType__Enum_1::GatherObject, "_Olea" };
}
namespace puzzle
@ -359,7 +378,8 @@ namespace cheat::game::filters
living::Fox,
living::Squirrel,
living::Boar,
living::Weasel
living::Weasel,
living::Tukan
};
SimpleFilter AnimalPickUp = {
living::CrystalCore,
@ -398,7 +418,15 @@ namespace cheat::game::filters
monster::Kairagi,
monster::Millelith,
monster::ShogunateInfantry,
monster::SangonomiyaCohort
monster::SangonomiyaCohort,
monster::Eremite,
monster::StretchyFungus,
monster::WhirlingFungus,
monster::WingedShroom,
monster::GroundedShroom,
monster::ShaggySumpterBeast,
monster::RishbolandTiger,
monster::Spincrocodile
};
SimpleFilter MonsterElites = {
monster::Mitachurl,
@ -409,6 +437,7 @@ namespace cheat::game::filters
monster::RifthoundWhelp,
monster::Rifthound,
monster::ShadowyHusk,
monster::RuinDrake,
monster::RuinGuard,
monster::RuinHunter,
monster::RuinGrader,
@ -461,8 +490,10 @@ namespace cheat::game::filters
monster::HydroHypostasis,
monster::HydroHypostasisSummon,
monster::CryoBathysmalVishap,
monster::ElectroBathysmalVishap
monster::ElectroBathysmalVishap,
// Sumeru
monster::ElectroRegisvine,
monster::JadeplumeTerrorshroom
};
SimpleFilter MonsterShielded = {

View File

@ -100,6 +100,7 @@ namespace cheat::game::filters
extern SimpleFilter LucklightFly;
extern SimpleFilter Npc;
extern SimpleFilter Salamander;
extern SimpleFilter Tukan;
extern SimpleFilter Pigeon;
extern SimpleFilter Crow;
extern SimpleFilter Finch;
@ -142,6 +143,7 @@ namespace cheat::game::filters
namespace monster
{
extern SimpleFilter AbyssMage;
extern SimpleFilter Eremite;
extern SimpleFilter FatuiAgent;
extern SimpleFilter FatuiCicinMage;
extern SimpleFilter FatuiMirrorMaiden;
@ -149,16 +151,23 @@ namespace cheat::game::filters
extern SimpleFilter Geovishap;
extern SimpleFilter GeovishapHatchling;
extern SimpleFilter Hilichurl;
extern SimpleFilter JadeplumeTerrorshroom;
extern SimpleFilter Mitachurl;
extern SimpleFilter Nobushi;
extern SimpleFilter Kairagi;
extern SimpleFilter RuinDrake;
extern SimpleFilter RuinGuard;
extern SimpleFilter RuinGrader;
extern SimpleFilter RuinHunter;
extern SimpleFilter RuinSentinel;
extern SimpleFilter Samachurl;
extern SimpleFilter ShadowyHusk;
extern SimpleFilter Slime;
extern SimpleFilter FloatingFungus;
extern SimpleFilter StretchyFungus;
extern SimpleFilter WhirlingFungus;
extern SimpleFilter WingedShroom;
extern SimpleFilter GroundedShroom;
extern SimpleFilter Specter;
extern SimpleFilter TreasureHoarder;
extern SimpleFilter UnusualHilichurl;
@ -190,6 +199,7 @@ namespace cheat::game::filters
extern SimpleFilter OceanidFalcon;
extern SimpleFilter PerpetualMechanicalArray;
extern SimpleFilter PrimoGeovishap;
extern SimpleFilter HydroBathysmalVishap;
extern SimpleFilter CryoBathysmalVishap;
extern SimpleFilter ElectroBathysmalVishap;
extern SimpleFilter ThunderManifestation;
@ -208,6 +218,9 @@ namespace cheat::game::filters
extern SimpleFilter MaguuKenki;
extern SimpleFilter Cicin;
extern SimpleFilter Beisht;
extern SimpleFilter RishbolandTiger;
extern SimpleFilter ShaggySumpterBeast;
extern SimpleFilter Spincrocodile;
}
namespace plant
@ -255,6 +268,14 @@ namespace cheat::game::filters
extern SimpleFilter Wolfhook;
extern SimpleFilter RadishDrop;
extern SimpleFilter CarrotDrop;
extern SimpleFilter HarraFruit;
extern SimpleFilter KalpalataLotus;
extern SimpleFilter NilotpalaLotus;
extern SimpleFilter Padisarah;
extern SimpleFilter RukkhashavaMushrooms;
extern SimpleFilter SumeruRose;
//extern SimpleFilter Viparyas;
extern SimpleFilter ZaytunPeach;
}
namespace puzzle