diff --git a/ASM/beta/en-US.xaml b/ASM/beta/en-US.xaml index 0cbd5a1a..426d3216 100644 --- a/ASM/beta/en-US.xaml +++ b/ASM/beta/en-US.xaml @@ -23,8 +23,9 @@ Ragnarok Aberration Extinction - Genesis + Genesis: Part 1 Crystal Isles + Genesis: Part 2 PGM @@ -1281,16 +1282,25 @@ Limit Non Player Dropped Items Count Limit the number of droppeditems in an area (together with LimitNonPlayerDroppedItemsRange). - Allow TekSuit Powers - If enabled, will allow the player to use TekSuit Powers on the Genesis map. + Allow TEK Suit Powers + If enabled, will allow the player to use TEK Suit Powers on the Genesis map. Disable Missions if enabled, will disable all missions on the Genesis map. + Disable TEK Suit on Spawn + If enabled, will prevent the player spawning with the TEK Suit. + Hexagons + Disable Hexagon Store + Is enabled, the hexagon store will be disabled. + Allow Only Engram Points Trade + Is enabled, only engram points can be sold on the Hexagon store. Max Hexagons per Character Specifies the maximum number of hexagons that each player can have. Hexagon Reward Multiplier Specifies the multiplier for the hexagons rewards. + Hexagon Cost Multiplier + Specifies the multiplier for the hexagon cost of items. Enable Cryopod Nerf If enabled, will adjust the amount of damage a creature does, for a period of time, after it has been released from a cryopod. @@ -1440,6 +1450,8 @@ If enabled, allows Flyers into caves. Allow Flying Stamina Recovery If enabled, recovers stamina while standing on a flyer. + Allow Flyer Speed Leveling + If enabled, allows the leveling of flyer movement speed. Prevent Dino Mate Boost If enabled, the dino mate boost will be disabled. Disable Force Ground Flyer with Explosives @@ -2421,7 +2433,9 @@ Aberration Extinction Valguero - Genesis + Genesis: Part 1 + Crystal Isles + Genesis: Part 2 @@ -2577,17 +2591,11 @@ Broodmother Lysrix (Easy Variant) Broodmother Lysrix (Medium Variant) Broodmother Lysrix (Hard Variant) - Broodmother Lysrix (Easy Variant) - Broodmother Lysrix (Medium Variant) - Broodmother Lysrix (Hard Variant) Megapithecus Megapithecus (Easy Variant) Megapithecus (Medium Variant) Megapithecus (Hard Variant) - Megapithecus (Easy Variant) - Megapithecus (Medium Variant) - Megapithecus (Hard Variant) Dragon Dragon (Easy Variant) @@ -2655,6 +2663,7 @@ Griffin Polar Bear Ice Wyvern + Iceworm @@ -2670,6 +2679,23 @@ Manticore (Hard Variant) + + Broodmother Lysrix (Easy Variant) + Broodmother Lysrix (Medium Variant) + Broodmother Lysrix (Hard Variant) + + Megapithecus (Easy Variant) + Megapithecus (Medium Variant) + Megapithecus (Hard Variant) + + + + Deinonychus + Ice Golem + Chalk Golem + Broodmother (Lysrix) + + Aberrant Achatina Aberrant Anglerfish @@ -2798,6 +2824,55 @@ King Titan (Alpha) King Titan (Beta) + + + Astrocetus + Bloodstalker + Magmasaur + Megachelon + Ferox Small + Ferox Large + Insect Swarm + Parakeet Fish School + Tek Hover Skiff + Tek Triceratops + Tek Giganotosaurus + X-Allosaur + X-Ankylosaur + X-Argentavis + X-Basilosaurus + X-Dunkleosteus + X-Ichthyosaurus + X-Megalodon + X-Mosasaur + X-Otter + X-Parasaur + X-Raptor + X-Rex + X-Rock Elemental + X-Sabertooth + X-Sabertooth Salmon + X-Sabertooth Salmon (Rare) + X-Spinosaur + X-Tapejara + X-Triceratops + X-Woolly Rhino + X-Yutyrannus + + + + Moeder, Master of the Ocean (Easy Variant) + Moeder, Master of the Ocean (Medium Variant) + Moeder, Master of the Ocean (Hard Variant) + + Eel Minion (Gamma) + Eel Minion (Beta) + Eel Minion (Alpha) + + Corrupted Master Controller (Easy Variant) + Corrupted Master Controller (Medium Variant) + Corrupted Master Controller (Hard Variant) + @@ -3516,6 +3591,27 @@ Tek Bridge Tek Gravity Grenade + + + Magmasaur Saddle + Megachelon Platform Saddle + Fishing Net + Wood Ocean Platform + Metal Ocean Platform + Pressure Plate + Mining Drill + + + + Astrocetus Tek Saddle + Tek Shoulder Cannon + Tek Cruise Missile + Tek Grenade Launcher + Tek Hover Skiff + Tek Jump Pad + Tek Sensor + Tek Shoulder Cannon + @@ -4896,6 +4992,50 @@ King Titan Trophy (Gamma) + + Tek Claws + Tek Grenade Launcher + Fish Net + Cruise Missile + Mining Drill + Tek Shoulder Cannon + Astrocetus Tek Saddle + Magmasaur Saddle (Genesis) + Megachelon Platform Saddle (Genesis) + Tier 1 Lootcrate (Genesis) + Tier 2 Lootcrate (Genesis) + Tier 3 Lootcrate (Genesis) + Bloodstalker Egg (Genesis) + Magmasaur Egg (Genesis) + Megachelon Egg (Genesis) + Tek Trike Egg (Genesis) + Ambergris + Turtle Shell + High Quality Pollen + Golden Nugget + Reaper King Pheromone Gland (Genesis) + Alpha X-Triceratops Skull + Golden Striped Megalodon Tooth + Master Controller Helmet + Corrupted Avatar Helmet Skin + Corrupted Avatar Shirt Skin + Corrupted Avatar Pants Skin + Corrupted Avatar Gloves Skin + Corrupted Avatar Boots Skin + Unassembled TEK Hover Skiff + Moeder Flag + VR Boss Flag + Metal Ocean Platform + Pressure Plate + Tek Sensor + Tek Jump Pad + Wood Ocean Platform + Gamma Moeder Trophy (Гамма) + Beta Moeder Trophy (Бета) + Alpha Moeder Trophy (Альфа) + Master Controller Trophy + + @@ -5235,6 +5375,10 @@ Boss Inventory - Desert Titan Boss Inventory - Forest Titan Boss Inventory - Ice Titan + + Boss Inventory - Crystal Wyvern Queen (Gamma) + Boss Inventory - Crystal Wyvern Queen (Beta) + Boss Inventory - Crystal Wyvern Queen (Alpha) diff --git a/ASM/beta/latest.txt b/ASM/beta/latest.txt index d9a90e67..5834849f 100644 --- a/ASM/beta/latest.txt +++ b/ASM/beta/latest.txt @@ -1 +1 @@ -1.1.394.2 +1.1.395.1 diff --git a/ASM/beta/latest.zip b/ASM/beta/latest.zip index 0ab14465..625499b6 100644 Binary files a/ASM/beta/latest.zip and b/ASM/beta/latest.zip differ diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj index 6865627f..332263ec 100644 --- a/src/ARKServerManager/ARKServerManager.csproj +++ b/src/ARKServerManager/ARKServerManager.csproj @@ -36,7 +36,7 @@ Bletch1971 Server Managers false - 1 + 2 1.1.395.%2a false true @@ -301,6 +301,9 @@ SettingsWindow.xaml + + Always + @@ -428,7 +431,6 @@ Always - Designer PreserveNewest @@ -540,24 +542,9 @@ Always - - - - - - - - - - - Always - - - - diff --git a/src/ARKServerManager/GameData/CrystalIsles.gamedata b/src/ARKServerManager/GameData/CrystalIsles.gamedata index f38346d5..3c8bf288 100644 --- a/src/ARKServerManager/GameData/CrystalIsles.gamedata +++ b/src/ARKServerManager/GameData/CrystalIsles.gamedata @@ -2,22 +2,12 @@ "Application": "ark", "Version": "1.0.0", "Created": "2020-06-11T00:00:00.0000000Z", - "Creatures": [ - ], - "Engrams": [ - ], - "Items": [ - ], - "MapSpawners": [ - ], - "SupplyCrates": [ - ], - "GameMaps": [ - { - "IsSotF": false, - "ClassName": "CrystalIsles", - "Description": "Crystal Isles", - "Mod": "CrystalIsles" - } + "GameMaps": [ + { + "IsSotF": false, + "ClassName": "CrystalIsles", + "Description": "Crystal Isles", + "Mod": "CrystalIsles" + } ] } \ No newline at end of file diff --git a/src/ARKServerManager/GameData/Genesis.gamedata b/src/ARKServerManager/GameData/Genesis.gamedata index de6f36cf..48a83e3a 100644 --- a/src/ARKServerManager/GameData/Genesis.gamedata +++ b/src/ARKServerManager/GameData/Genesis.gamedata @@ -2,22 +2,12 @@ "Application": "ark", "Version": "1.1.0", "Created": "2020-02-25T00:00:00.0000000Z", - "Creatures": [ - ], - "Engrams": [ - ], - "Items": [ - ], - "MapSpawners": [ - ], - "SupplyCrates": [ - ], "GameMaps": [ - { + { "IsSotF": false, "ClassName": "Genesis", - "Description": "Genesis", + "Description": "Genesis: Part 1", "Mod": "Genesis" - } + } ] } \ No newline at end of file diff --git a/src/ARKServerManager/GameData/Genesis2.gamedata b/src/ARKServerManager/GameData/Genesis2.gamedata new file mode 100644 index 00000000..6877676b --- /dev/null +++ b/src/ARKServerManager/GameData/Genesis2.gamedata @@ -0,0 +1,13 @@ +{ + "Application": "ark", + "Version": "1.0.0", + "Created": "2021-06-04T00:00:00.0000000Z", + "GameMaps": [ + { + "IsSotF": false, + "ClassName": "Gen2", + "Description": "Genesis: Part 2", + "Mod": "Genesis2" + } + ] +} \ No newline at end of file diff --git a/src/ARKServerManager/GameData/SurvivalEvolved.gamedata b/src/ARKServerManager/GameData/SurvivalEvolved.gamedata index 8a085914..09725617 100644 --- a/src/ARKServerManager/GameData/SurvivalEvolved.gamedata +++ b/src/ARKServerManager/GameData/SurvivalEvolved.gamedata @@ -12913,9 +12913,109 @@ { "XPRequired": 354747104, "EngramPoints": 1 + }, + { + "XPRequired": 380747100, + "EngramPoints": 1 + }, + { + "XPRequired": 407747100, + "EngramPoints": 1 + }, + { + "XPRequired": 435747100, + "EngramPoints": 1 + }, + { + "XPRequired": 464747100, + "EngramPoints": 1 + }, + { + "XPRequired": 494747100, + "EngramPoints": 1 + }, + { + "XPRequired": 525747100, + "EngramPoints": 1 + }, + { + "XPRequired": 557747100, + "EngramPoints": 1 + }, + { + "XPRequired": 590747100, + "EngramPoints": 1 + }, + { + "XPRequired": 624747100, + "EngramPoints": 1 + }, + { + "XPRequired": 659747100, + "EngramPoints": 1 + }, + { + "XPRequired": 695747100, + "EngramPoints": 1 + }, + { + "XPRequired": 732747100, + "EngramPoints": 1 + }, + { + "XPRequired": 770747100, + "EngramPoints": 1 + }, + { + "XPRequired": 809747100, + "EngramPoints": 1 + }, + { + "XPRequired": 849747100, + "EngramPoints": 1 + }, + { + "XPRequired": 892234400, + "EngramPoints": 1 + }, + { + "XPRequired": 934721900, + "EngramPoints": 1 + }, + { + "XPRequired": 977209200, + "EngramPoints": 1 + }, + { + "XPRequired": 1019697000, + "EngramPoints": 1 + }, + { + "XPRequired": 1104671000, + "EngramPoints": 1 + }, + { + "XPRequired": 1189646000, + "EngramPoints": 1 + }, + { + "XPRequired": 1274621000, + "EngramPoints": 1 + }, + { + "XPRequired": 1359595000, + "EngramPoints": 1 + }, + { + "XPRequired": 1444570000, + "EngramPoints": 1 + }, + { + "XPRequired": 1529545000, + "EngramPoints": 1 } ], - "PlayerAdditionalLevels": "50", + "PlayerAdditionalLevels": "75", "CreatureLevels": [ { "XPRequired": 10 diff --git a/src/ARKServerManager/Globalization/de-DE/de-DE.xaml b/src/ARKServerManager/Globalization/de-DE/de-DE.xaml index 87b50ddc..e31fd211 100644 --- a/src/ARKServerManager/Globalization/de-DE/de-DE.xaml +++ b/src/ARKServerManager/Globalization/de-DE/de-DE.xaml @@ -3761,328 +3761,328 @@ Artefakt der Klippe Artefakt des Zerstörers C4 Ladung - Beer Jar - Beer Jar (alt) - Amarberry - Azulberry - Mejoberry - Narcoberry - Stimberry - Tintoberry - Blood Pack - Bug Repellant - Cactus Broth - Canteen (Empty) - Canteen (Full) - Cooked Lamb Chop - Cooked Meat - Cooked Fish Meat - Cooked Meat Jerky - Cooked Prime Meat - Cooked Prime Fish Meat - Prime Meat Jerky - Lesser Antidote - Large Animal Feces - Massive Animal Feces - Medium Animal Feces - Small Animal Feces - Allosaurus Egg - Ankylo Egg - Archaeopteryx Egg - Argentavis Egg - Baryonyx Egg - Titanboa Egg - Bronto Egg - Carno Egg - Compy Egg - Dilo Egg - Dimetrodon Egg - Dimorph Egg - Diplo Egg - Dodo Egg - Gallimimus Egg - Giganotosaurus Egg - Hesperonis Egg - Golden Egg - Ichthyornis Egg - Iguanodon Egg - Kairuku Egg - Kaprosuchus Egg - Kentrosaurus Egg - Lystro Egg - Megalania Egg - Megalosaurus Egg - Microraptor Egg - Moschops Egg - Oviraptor Egg - Pachycephalosaurus Egg - Pachyrhinosaurus Egg - Parasaur Egg - Tek Parasaur Egg - Pegomastax Egg - Pelagornis Egg - Pteranodon Egg - Quetzal Egg - Tek Quetzal Egg - Raptor Egg - Tek Raptor Egg - Rex Egg - Tek Rex Egg - Sarco Egg - Pulmonoscorpius Egg - Araneo Egg - Spino Egg - Stego Egg - Tek Stego Egg - Tapejara Egg - Terror Bird Egg - Therizino Egg - Trike Egg - Troodon Egg - Turtle Egg - Yutyrannus Egg - Fertilizer - Medical Brew - Honey - Human Feces - Iced Canteen (Empty) - Iced Canteen (Full) - Iced Water Jar (Empty) - Iced Water Jar (Full) + Bierkrug + Bierkrug (alt) + Amarbeeren + Azulbeeren + Mejobeeren + Narcobeeren + Stimbeeren + Tintobeeren + Blutpackung + Insektenschutzmittel + Kaktusbrühe + Kantine (Leer) + Kantine (Voll) + Gekochtes Lammkotelett + Gekochtes Fleisch + Gekochtes Fischfleisch + Gekochtes Fleisch Jerky + Gekochtes Prime Fleisch + Gekochtes Prime Fischfleisch + Prime Fleisch Jerky + Kleines Gegenmittel + Großtierkot + Massiver Tierkot + Mittlerer tierischer Kot + Kleintierkot + Allosaurus Ei + Ankylo Ei + Archaeopteryx Ei + Argentavis Ei + Baryonyx Ei + Titanboa Ei + Bronto Ei + Carno Ei + Compy Ei + Dilo Ei + Dimetrodon Ei + Dimorph Ei + Diplo Ei + Dodo Ei + Gallimimus Ei + Giganotosaurus Ei + Hesperonis Ei + Golden Ei + Ichthyornis Ei + Iguanodon Ei + Kairuku Ei + Kaprosuchus Ei + Kentrosaurus Ei + Lystro Ei + Megalania Ei + Megalosaurus Ei + Microraptor Ei + Moschops Ei + Oviraptor Ei + Pachycephalosaurus Ei + Pachyrhinosaurus Ei + Parasaur Ei + Tek Parasaur Ei + Pegomastax Ei + Pelagornis Ei + Pteranodon Ei + Quetzal Ei + Tek Quetzal Ei + Raptor Ei + Tek Raptor Ei + Rex Ei + Tek Rex Ei + Sarco Ei + Pulmonoscorpius Ei + Araneo Ei + Spino Ei + Stego Ei + Tek Stego Ei + Tapejara Ei + Terror Bird Ei + Therizino Ei + Trike Ei + Troodon Ei + Turtle Ei + Yutyrannus Ei + Dünger + Medizinisches Gebräu + Honig + Menschlichet Kot + Vereist Kantine (Leer) + Vereist Kantine (Voll) + Eiswasserglas (Leer) + Eiswasserglas (Voll) Bio Toxin - Kibble (Allosaurus Egg) - Kibble (Ankylo Egg) - Kibble (Archaeopteryx Egg) - Kibble (Argentavis Egg) - Kibble (Baryonyx Egg) - Kibble (Titanboa Egg) - Kibble (Carno Egg) - Kibble (Compy Egg) - Kibble (Dilo Egg) - Kibble (Dimetrodon Egg) - Kibble (Dimorph Egg) - Kibble (Diplo Egg) - Kibble (Dodo Egg) - Kibble (Gallimimus Egg) - Kibble (Kairuku Egg) - Kibble (Kaprosuchus Egg) - Kibble (Kentrosaurus Egg) - Kibble (Lystrosaurus Egg) - Kibble (Megalania Egg) - Kibble (Megalosaurus Egg) - Kibble (Microraptor Egg) - Kibble (Moschops Egg) - Kibble (Oviraptor Egg) - Kibble (Pachy Egg) - Kibble (Pachyrhino Egg) - Kibble (Parasaur Egg) - Kibble (Pegomastax Egg) - Kibble (Pelagornis Egg) - Kibble (Pteranodon Egg) - Kibble (Quetzal Egg) - Kibble (Raptor Egg) - Kibble (Rex Egg) - Kibble (Sarco Egg) - Kibble (Bronto Egg) - Kibble (Pulmonoscorpius Egg) - Kibble (Araneo Egg) - Kibble (Spino Egg) - Kibble (Stego Egg) - Kibble (Tapejara Egg) - Kibble (Terror Bird Egg) - Kibble (Therizinosaurus Egg) - Kibble (Trike Egg) - Kibble (Troodon Egg) - Kibble (Carbonemys Egg) - Narcotic - Raw Meat - Raw Fish Meat - Raw Mutton - Raw Prime Meat - Raw Prime Fish Meat - Amarberry Seed - Azulberry Seed - Citronal Seed - Plant Species X Seed - Longrass Seed - Mejoberry Seed - Narcoberry Seed - Rockarrot Seed - Savoroot Seed - Stimberry Seed - Tintoberry Seed - Battle Tartare - Calien Soup - Enduro Stew - Focal Chili + Kibble (Allosaurus Ei) + Kibble (Ankylo Ei) + Kibble (Archaeopteryx Ei) + Kibble (Argentavis Ei) + Kibble (Baryonyx Ei) + Kibble (Titanboa Ei) + Kibble (Carno Ei) + Kibble (Compy Ei) + Kibble (Dilo Ei) + Kibble (Dimetrodon Ei) + Kibble (Dimorph Ei) + Kibble (Diplo Ei) + Kibble (Dodo Ei) + Kibble (Gallimimus Ei) + Kibble (Kairuku Ei) + Kibble (Kaprosuchus Ei) + Kibble (Kentrosaurus Ei) + Kibble (Lystrosaurus Ei) + Kibble (Megalania Ei) + Kibble (Megalosaurus Ei) + Kibble (Microraptor Ei) + Kibble (Moschops Ei) + Kibble (Oviraptor Ei) + Kibble (Pachy Ei) + Kibble (Pachyrhino Ei) + Kibble (Parasaur Ei) + Kibble (Pegomastax Ei) + Kibble (Pelagornis Ei) + Kibble (Pteranodon Ei) + Kibble (Quetzal Ei) + Kibble (Raptor Ei) + Kibble (Rex Ei) + Kibble (Sarco Ei) + Kibble (Bronto Ei) + Kibble (Pulmonoscorpius Ei) + Kibble (Araneo Ei) + Kibble (Spino Ei) + Kibble (Stego Ei) + Kibble (Tapejara Ei) + Kibble (Terror Bird Ei) + Kibble (Therizinosaurus Ei) + Kibble (Trike Ei) + Kibble (Troodon Ei) + Kibble (Carbonemys Ei) + Betäubungsmittel + Rohes Fleisch + Rohes Fischfleisch + Rohes Hammelfleisch + Rohes Prime Fleisch + Rohes Prime Fischfleisch + Amarberry Samen + Azulberry Samen + Citronal Samen + Plant Species X Samen + Longrass Samen + Mejoberry Samen + Narcoberry Samen + Rockarrot Samen + Savoroot Samen + Stimberry Samen + Tintoberry Samen + Schlachttartar + Calien Suppe + Enduro Eintopf + Fokus Chili Fria Curry - Lazarus Chowder - Shadow Steak Saute - Spoiled Meat - Energy Brew - Stimulant - Sweet Vegetable Cake - Broth of Enlightenment - Emote - Evil - Emote Unlock - Heart - Emote Unlock - Snowball - Emote Unlock - Turkey - Facial Unlock - Curly Beard - Facial Unlock - Dread beard - Facial Unlock - Goatee - Facial Unlock - Moustache - Facial Unlock - Mutton Chops - Facial Unlock - Viking Beard - Hair Unlock - Afro - Hair Unlock - Braids - Hair Unlock - Dreadlocks - Hair Unlock - Mohawk - Hair Unlock - Ponytail - Hair Unlock - Viking - Emote Unlock - Turkey - Hair Unlock - Romantic + Lazarus Fischsuppe + Angebratenes Schattensteak + Verdorbenes Fleisch + Energiegebräu + Stimulans + Süßer Gemüsekuchen + Brühe der Erleuchtung + Emote - Böse + Emote Entsperrt - Herz + Emote Entsperrt - Schneeball + Emote Entsperrt - Truthahn + Gesicht Entsperrt - Lockiger Bart + Gesicht Entsperrt - Schreckensbart + Gesicht Entsperrt - Spitzbart + Gesicht Entsperrt - Schnurrbart + Gesicht Entsperrt - Hammelkoteletten + Gesicht Entsperrt - Wikinger Bart + Haar Entsperrt - Afro + Haar Entsperrt - Zöpfe + Haar Entsperrt - Dreadlocks + Haar Entsperrt - Mohawk + Haar Entsperrt - Pferdeschwanz + Haar Entsperrt - Wikinger + Emote Entsperrt - Truthahn + Haar Entsperrt - Romantisch Citronal Longrass Rockarrot Savoroot - Water Jar (Empty) - Water Jar (Full) - Waterskin (Empty) - Waterskin (Filled) - Wyvern Milk - Parachute - Re-Fertilizer - Mindwipe Tonic - Soap - Giga Bionic Costume - Rex Bionic Costume - Brachiosaurus Costume - Carno Bone Costume - Giganotosaurus Bone Costume - Jerboa Bone Costume - Quetzalcoatlus Bone Costume - Raptor Bone Costume - Rex Bone Costume - Bronto Bone Costume - Stego Bone Costume - Trike Bone Costume - Wyvern Bone Costume - Procoptodon Bunny Costume - Megaloceros Reindeer Costume - Stygimoloch Costume - Styracosaurus Costume - Magenta Coloring - Black Coloring - Blue Coloring - Brick Coloring - Brown Coloring - Cantaloupe Coloring - Cyan Coloring - Forest Coloring - Green Coloring - Magenta Coloring - Mud Coloring - Navy Coloring - Olive Coloring - Orange Coloring - Parchment Coloring - Pink Coloring - Purple Coloring - Red Coloring - Royalty Coloring - Silver Coloring - Sky Coloring - Slate Coloring - Tan Coloring - Tangerine Coloring - White Coloring - Yellow Coloring - Motorboat + Wasserkrug (Leer) + Wasserkrug (Voll) + Wasserschlauch (Leer) + Wasserschlauch (Gefüllt) + Wyvern Milch + Fallschirm + Nachdünger + Vergessen Trank + Seife + Giga Bionic Kostüm + Rex Bionic Kostüm + Brachiosaurus Kostüm + Carno Knochen Kostüm + Giganotosaurus Knochen Kostüm + Jerboa Knochen Kostüm + Quetzalcoatlus Knochen Kostüm + Raptor Knochen Kostüm + Rex Knochen Kostüm + Bronto Knochen Kostüm + Stego Knochen Kostüm + Trike Knochen Kostüm + Wyvern Knochen Kostüm + Procoptodon Hasen Kostüm + Megaloceros Rentier Kostüm + Stygimoloch Kostüm + Styracosaurus Kostüm + Magenta Färbung + Schwarz Färbung + Blau Färbung + Ziegelstein Färbung + Braun Färbung + Melone Färbung + Cyan Färbung + Wald Färbung + Grün Färbung + Magenta Färbung + Schlamm Färbung + Marine Färbung + Oliv Färbung + Orange Färbung + Pergament Färbung + Rosa Färbung + Lila Färbung + Rot Färbung + Königliche Färbung + Silber Färbung + Himmel Färbung + Schiefer Färbung + Bräunliche Färbung + Mandarine Färbung + White Färbung + Gelb Färbung + Motorboot Radio - Wooden Raft - Ammonite Bile + Holzfloß + Ammonitengalle Angler Gel - Allosaurus Brain + Allosaurus Gehirn Alpha Carnotaurus Arm - Alpha Leedsichthys Blubber - Alpha Megalodon Fin - Alpha Mosasaur Tooth - Alpha Raptor Claw - Alpha Tyrannosaur Tooth - Alpha Tusoteuthis Eye - Argentavis Talon - Basilosaurus Blubber - Titanoboa Venom - Giganotosaurus Heart + Alpha Leedsichthys Speck + Alpha Megalodon Flosse + Alpha Mosasaur Zahn + Alpha Raptor Klaue + Alpha Tyrannosaur Zahn + Alpha Tusoteuthis Auge + Argentavis Kralle + Basilosaurus Speck + Titanoboa Gift + Giganotosaurus Herz Megalania Toxin - Megalodon Tooth + Megalodon Zahn Tyrannosaurus Arm - Sarcosuchus Skin - Sauropod Vertebra - Spinosaurus Sail - Therizino Claws - Thylacoleo Hook-Claw - Tusoteuthis Tentacle - Yutyrannus Lungs - Dinosaur Bone - Beer Liquid - Black Pearl - Charcoal + Sarcosuchus Haut + Sauropod Wirbel + Spinosaurus Segel + Therizino Krallen + Thylacoleo Hackenklaue + Tusoteuthis Tentakel + Yutyrannus Lunge + Dinosaur Kochen + Beer Flüssigkeit + Schwarze Perle + Holzkohle Chitin - Chitin or Keratin - Cementing Paste - Crystal - Electronics + Chitin oder Keratin + Zementpaste + Kristall + Elektronik Element - Element (Crafted) - Element Shard - Fiber - Flint - Gasoline - Gasoline (Gas-Crafted) - Gunpowder - Human Hair - Hide + Element (Hergestellt) + Element Fragment + Faser + Feuerstein + Benzin + Benzin (Benzin-Hergestellt) + Schießpulver + Menschliches Haar + Leder Woolly Rhino Horn Keratin - Leech Blood - Metal - Metal Ingot + Blutegelblut + Metall + Metallbarren Obsidian - Oil - Pelt - Pelt or Hair + Öl + Fell + Fell or Haar Polymer - Organic Polymer - Rare Flower - Rare Mushroom - Sap - Silica Pearls + Organisches Polymer + Seltene Blume + Seltener Pilz + Saft + Silica Perlen Achatina Paste - Sparkpowder - Oil (Tusoteuthis) - Stone - Absorbent Substrate - Thatch - Wood - Wool - Leech Blood or Horns - Aberrant Helmet Skin - Aberrant Sword Skin - Birthday Suit Pants Skin - Birthday Suit Shirt Skin - Rex Bone Helmet - Bunny Ears Skin - Candy Cane Club Skin - Captains Hat - Chili Helmet Skin - Clown Mask Skin - Corrupted Boots - Corrupted Gloves - Corrupted Helmet - Corrupted Pants - Corrupted Chestpiece - Dilo Mask + Funkenpulver + Öl (Tusoteuthis) + Stein + Saugfähiges Substrat + Stroh + Holz + Wolle + Blutegelblut oder Hörner + Anormaler Helm Skin + Anormaler Schwert Skin + Geburtstagsanzug Hose Skin + Geburtstagsanzug Shirt Skin + Rex Knochenhelm + Hasenohren Skin + Zuckerstangenclub Skin + Kapitänshut + Chili Helm Skin + Clownsmaske Skin + Beschädigte Stiefel + Beschädigte Handschuhe + Beschädigter Helm + Beschädigte Hose + Beschädigtes Brustteil + Dilo Maske Dino Bunny Ears Skin Dino Easter Chick Hat Cute Dino Helmet Skin diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml index f87bb80c..33695cc3 100644 --- a/src/ARKServerManager/Globalization/en-US/en-US.xaml +++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml @@ -23,8 +23,9 @@ Ragnarok Aberration Extinction - Genesis + Genesis: Part 1 Crystal Isles + Genesis: Part 2 PGM @@ -1281,16 +1282,25 @@ Limit Non Player Dropped Items Count Limit the number of droppeditems in an area (together with LimitNonPlayerDroppedItemsRange). - Allow TekSuit Powers - If enabled, will allow the player to use TekSuit Powers on the Genesis map. + Allow TEK Suit Powers + If enabled, will allow the player to use TEK Suit Powers on the Genesis map. Disable Missions if enabled, will disable all missions on the Genesis map. + Disable TEK Suit on Spawn + If enabled, will prevent the player spawning with the TEK Suit. + Hexagons + Disable Hexagon Store + Is enabled, the hexagon store will be disabled. + Allow Only Engram Points Trade + Is enabled, only engram points can be sold on the Hexagon store. Max Hexagons per Character Specifies the maximum number of hexagons that each player can have. Hexagon Reward Multiplier Specifies the multiplier for the hexagons rewards. + Hexagon Cost Multiplier + Specifies the multiplier for the hexagon cost of items. Enable Cryopod Nerf If enabled, will adjust the amount of damage a creature does, for a period of time, after it has been released from a cryopod. @@ -1440,6 +1450,8 @@ If enabled, allows Flyers into caves. Allow Flying Stamina Recovery If enabled, recovers stamina while standing on a flyer. + Allow Flyer Speed Leveling + If enabled, allows the leveling of flyer movement speed. Prevent Dino Mate Boost If enabled, the dino mate boost will be disabled. Disable Force Ground Flyer with Explosives @@ -2421,8 +2433,9 @@ Aberration Extinction Valguero - Genesis + Genesis: Part 1 Crystal Isles + Genesis: Part 2 diff --git a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml index 2ba53c2c..dd7f1671 100644 --- a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml +++ b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml @@ -422,6 +422,7 @@ Ativar e executar como Prompt de Administrador na Inicialização Minimizar para a bandeja Gerenciar configurações de firewall automaticamente + Gerenciar IP público automaticamente Diretório de dados: Diretório de Backup: Steam WebApi Key: @@ -735,7 +736,7 @@ % segundos minutos - houras + horas dias dinos items @@ -898,7 +899,9 @@ Networking Porta Servidor: Os usuários da porta usarão para se conectar ao seu servidor. O padrão é 7777. Altere isto e Query Port se você deseja hospedar vários servidores em uma máquina. - Porta Query: + Porta Par: + Porta Par usada para determinar a disponibilidade do servidor. O padrão é 7778. + Porta Query: A porta Steam usa para se comunicar com seu servidor. O padrão é 27015. Altere this e Server Port se você deseja hospedar vários servidores em uma máquina. Local IP: Define o IP local (privado) que o servidor irá escutar. Essa deve ser sua placa de rede principal, que direciona para a Internet pública. @@ -1133,7 +1136,7 @@ Pontos de Supply Crate Fornecido Aleatório Se habilitado, fará os Supply Crates aleatórias. Impedir construção em áreas ricas em recursos - Se habilitado, desabilita completamente a construção em áreas específicas e ricas em recursos, em particular a instalação no TheIsland ao redor das principais montanhas. + Se habilitado, desabilita completamente a construção em áreas específicas e ricas em recursos, em particular construções do próprio jogo... Desativar Fogo Amigável PvP Se habilitado, os jogadores são incapazes de causar dano ou matar outros membros da tribo, dinossauros e estruturas quando o modo PvP estiver habilitado. Use o Localizador de Corpos @@ -1283,6 +1286,12 @@ Desativar missões se ativado, desabilitará todas as missões no mapa do Genesis. + Hexagons + Máximo de Hexagons por personagem + Especifica o número máximo de hexagons que cada jogador pode ter. + Multiplicador de recompensa Hexagons + Especifica o multiplicador para as recompensas dos Hexagons. + Habilitar Cryopod Nerf Se ativado, ajustará a quantidade de dano que uma criatura causa, por um período de tempo, após ter sido liberada de um criópode. Duração de Cryopod Nerf @@ -5235,6 +5244,7 @@ Foram encontrados os seguintes problemas de validação.\R\n\r\n{validateMessage}\r\n\r\n Deseja continuar com a inicialização do servidor, isso pode causar problemas? A porta do servidor está fora do intervalo válido ({PortMinimum}-{PortMaximum}). + A porta do par de servidor está fora do intervalo válido ({PortMinimum}-{PortMaximum}). A porta de consulta está fora do intervalo válido ({PortMinimum}-{PortMaximum}). A porta rcon está fora do intervalo válido ({PortMinimum}-{PortMaximum}). diff --git a/src/ARKServerManager/Lib/ServerProfile.cs b/src/ARKServerManager/Lib/ServerProfile.cs index a22d7caa..c8e4525f 100644 --- a/src/ARKServerManager/Lib/ServerProfile.cs +++ b/src/ARKServerManager/Lib/ServerProfile.cs @@ -1579,6 +1579,14 @@ namespace ServerManagerTool.Lib set { SetValue(DisableGenesisMissionsProperty, value); } } + public static readonly DependencyProperty DisableDefaultMapItemSetsProperty = DependencyProperty.Register(nameof(DisableDefaultMapItemSets), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false)); + [IniFileEntry(IniFiles.Game, IniSections.Game_ShooterGameMode, ServerProfileCategory.Rules, "bDisableDefaultMapItemSets")] + public bool DisableDefaultMapItemSets + { + get { return (bool)GetValue(DisableDefaultMapItemSetsProperty); } + set { SetValue(DisableDefaultMapItemSetsProperty, value); } + } + public static readonly DependencyProperty EnableCryoSicknessPVEProperty = DependencyProperty.Register(nameof(EnableCryoSicknessPVE), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false)); [IniFileEntry(IniFiles.GameUserSettings, IniSections.GUS_ServerSettings, ServerProfileCategory.Rules)] public bool EnableCryoSicknessPVE @@ -1627,13 +1635,37 @@ namespace ServerManagerTool.Lib set { SetValue(MaxHexagonsPerCharacterProperty, value); } } + public static readonly DependencyProperty DisableHexagonStoreProperty = DependencyProperty.Register(nameof(DisableHexagonStore), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false)); + [IniFileEntry(IniFiles.Game, IniSections.Game_ShooterGameMode, ServerProfileCategory.Rules, "bDisableHexagonStore", ConditionedOn = nameof(DisableHexagonStore))] + public bool DisableHexagonStore + { + get { return (bool)GetValue(DisableHexagonStoreProperty); } + set { SetValue(DisableHexagonStoreProperty, value); } + } + + public static readonly DependencyProperty HexStoreAllowOnlyEngramTradeOptionProperty = DependencyProperty.Register(nameof(HexStoreAllowOnlyEngramTradeOption), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false)); + [IniFileEntry(IniFiles.Game, IniSections.Game_ShooterGameMode, ServerProfileCategory.Rules, "bHexStoreAllowOnlyEngramTradeOption", ConditionedOn = nameof(HexStoreAllowOnlyEngramTradeOption))] + public bool HexStoreAllowOnlyEngramTradeOption + { + get { return (bool)GetValue(HexStoreAllowOnlyEngramTradeOptionProperty); } + set { SetValue(HexStoreAllowOnlyEngramTradeOptionProperty, value); } + } + public static readonly DependencyProperty HexagonRewardMultiplierProperty = DependencyProperty.Register(nameof(HexagonRewardMultiplier), typeof(float), typeof(ServerProfile), new PropertyMetadata(1.0f)); - [IniFileEntry(IniFiles.Game, IniSections.Game_ShooterGameMode, ServerProfileCategory.Rules)] + [IniFileEntry(IniFiles.Game, IniSections.Game_ShooterGameMode, ServerProfileCategory.Rules, "BaseHexagonRewardMultiplier")] public float HexagonRewardMultiplier { get { return (float)GetValue(HexagonRewardMultiplierProperty); } set { SetValue(HexagonRewardMultiplierProperty, value); } } + + public static readonly DependencyProperty HexagonCostMultiplierProperty = DependencyProperty.Register(nameof(HexagonCostMultiplier), typeof(float), typeof(ServerProfile), new PropertyMetadata(1.0f)); + [IniFileEntry(IniFiles.Game, IniSections.Game_ShooterGameMode, ServerProfileCategory.Rules)] + public float HexagonCostMultiplier + { + get { return (float)GetValue(HexagonCostMultiplierProperty); } + set { SetValue(HexagonCostMultiplierProperty, value); } + } #endregion #region Chat and Notifications @@ -1949,6 +1981,14 @@ namespace ServerManagerTool.Lib set { SetValue(AllowFlyingStaminaRecoveryProperty, value); } } + public static readonly DependencyProperty AllowFlyerSpeedLevelingProperty = DependencyProperty.Register(nameof(AllowFlyerSpeedLeveling), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false)); + [IniFileEntry(IniFiles.Game, IniSections.Game_ShooterGameMode, ServerProfileCategory.Dinos, "bAllowFlyerSpeedLeveling", ConditionedOn = nameof(AllowFlyerSpeedLeveling))] + public bool AllowFlyerSpeedLeveling + { + get { return (bool)GetValue(AllowFlyerSpeedLevelingProperty); } + set { SetValue(AllowFlyerSpeedLevelingProperty, value); } + } + public static readonly DependencyProperty PreventMateBoostProperty = DependencyProperty.Register(nameof(PreventMateBoost), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false)); [IniFileEntry(IniFiles.GameUserSettings, IniSections.GUS_ServerSettings, ServerProfileCategory.Dinos, ConditionedOn = nameof(PreventMateBoost))] public bool PreventMateBoost diff --git a/src/ARKServerManager/Windows/ServerSettingsControl.xaml b/src/ARKServerManager/Windows/ServerSettingsControl.xaml index 31fabff6..b98b40a6 100644 --- a/src/ARKServerManager/Windows/ServerSettingsControl.xaml +++ b/src/ARKServerManager/Windows/ServerSettingsControl.xaml @@ -2320,18 +2320,41 @@ + + + + + + + + + + + + + + + + + + + - - + + + + + + @@ -2625,6 +2648,7 @@ + @@ -4660,22 +4684,34 @@ - - + - + - + - + + + + + + + + + + + + + + + - @@ -4737,11 +4773,17 @@ - - + - + + + + + + + diff --git a/src/ConanServerManager/ConanServerManager.csproj b/src/ConanServerManager/ConanServerManager.csproj index c1cb091f..a3204a3e 100644 --- a/src/ConanServerManager/ConanServerManager.csproj +++ b/src/ConanServerManager/ConanServerManager.csproj @@ -268,7 +268,6 @@ - Designer PreserveNewest @@ -406,10 +405,6 @@ Always - - - -