diff --git a/interface/scripted/statWindow/statWindow.config b/interface/scripted/statWindow/statWindow.config index 83898d9d57..fea81c20e2 100644 --- a/interface/scripted/statWindow/statWindow.config +++ b/interface/scripted/statWindow/statWindow.config @@ -299,7 +299,7 @@ }, - "races": [ "apex", "avian", "floran", "glitch", "human", "hylotl", "novakid", "mauskin", "bunnine", "shadow", "elduukhar", "argonian", "avali", "fuslimeperson", "kyani", "slimeperson", "deerfolk", "lastree", "avikan", "bunnykin", "callistan", "calskies","droden", "elunite", "familiar", "felin", "fenerox", "gardevan", "aegi", "greckan", "gyrusen", "calskie", "kazdra", "kemono", "kineptic", "lamia", "mantizi","fumantizi", "mlp", "munari", "neko", "nightar", "ningen", "orcana", "fupeglaci","peglaci", "phox", "ponex", "sergal", "skelekin", "trink", "vespoid", "viera", "moogle", "vulpes", "wasphive", "arachne", "Indix", "skath", "pygs", "kitsune", "indix", "thelusian", "fukirhos", "kirhos", "radien", "woggle", "dragon", "tauren", "lucario", "inkling", "eevee", "elysian", "fennix", "lombax_striped", "lombax_pointed", "saturn", "saturn2", "satkyterran", "saturnmothman", "blattra", "sarasinor", "webber", "candavaswebber", "Zoroark","everis","changenykt", "demon", "shade", "veluu", "cat", "deerkin", "terrakin","merrkin", "spiritguardian", "spirittree", "fragmentedruin", "juux", "fupeglaci", "remorian", "lutrin", "irken", "carakinox", "harpy", "alicorn", "batpony", "changeling", "pony", "pegasus", "hippogriff", "unicorn", "ponex", "attarran", "alrune", "taurikin", "protogenrace1", "shoggoth","mindflayer","zombie","arcanian","squamaeft","scyphojel","vashknaaren","vashknaarenbiped","gic_realisticfloran","gic_realistichuman","gic_realisticglitch","mechineki" ], + "races": [ "apex", "avian", "floran", "glitch", "human", "hylotl", "novakid", "mauskin", "bunnine", "shadow", "elduukhar", "argonian", "avali", "fuslimeperson", "kyani", "slimeperson", "deerfolk", "lastree", "avikan", "bunnykin", "callistan", "calskies","droden", "elunite", "familiar", "felin", "fenerox", "gardevan", "aegi", "greckan", "gyrusen", "calskie", "kazdra", "kemono", "kineptic", "lamia", "mantizi","fumantizi", "mlp", "munari", "neko", "nightar", "ningen", "orcana", "fupeglaci","peglaci", "phox", "ponex", "sergal", "skelekin", "trink", "vespoid", "viera", "moogle", "vulpes", "wasphive", "arachne", "Indix", "skath", "pygs", "kitsune", "indix", "thelusian", "fukirhos", "kirhos", "radien", "woggle", "dragon", "tauren", "lucario", "inkling", "octoling", "eevee", "elysian", "fennix", "lombax_striped", "lombax_pointed", "saturn", "saturn2", "satkyterran", "saturnmothman", "blattra", "sarasinor", "webber", "candavaswebber", "Zoroark","everis","changenykt", "demon", "shade", "veluu", "cat", "deerkin", "terrakin","merrkin", "spiritguardian", "spirittree", "fragmentedruin", "juux", "fupeglaci", "remorian", "lutrin", "irken", "carakinox", "harpy", "alicorn", "batpony", "changeling", "pony", "pegasus", "hippogriff", "unicorn", "ponex", "attarran", "alrune", "taurikin", "protogenrace1", "shoggoth","mindflayer","zombie","arcanian","squamaeft","scyphojel","vashknaaren","vashknaarenbiped","gic_realisticfloran","gic_realistichuman","gic_realisticglitch","mechineki" ], "elements": [ "physical", "fire", "poison", "ice", "electric", "radioactive", "cosmic", "shadow" ], "statuses" : { // Cold diff --git a/species/inkling.raceeffect b/species/inkling.raceeffect index 75fcaf78d5..a8e6a0d201 100644 --- a/species/inkling.raceeffect +++ b/species/inkling.raceeffect @@ -1,205 +1,106 @@ { "stats": [ - { - "stat": "foodDelta", - "baseMultiplier": 1.06 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 1.1 - }, - { - "stat": "maxBreath", - "amount": 220 - }, - { - "stat": "electricResistance", - "amount": -0.2 - }, - { - "stat": "iceResistance", - "amount": -0.2 - }, - { - "stat": "physicalResistance", - "amount": 0.1 - }, - { - "stat": "radioactiveResistance", - "amount": 0.3 - }, - { - "stat": "slimeImmunity", - "amount": 1 - }, - { - "stat": "slimestickImmunity", - "amount": 1 - }, - { - "stat": "wetImmunity", - "amount": 1 - }, - { - "stat": "fallDamageMultiplier", - "effectiveMultiplier": 0.65 - } - ], // The squid kids like to eat fish, obviously + { "stat": "foodDelta", "baseMultiplier": 1.06 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.1 }, + { "stat": "maxBreath", "amount": 220 }, + + { "stat": "fireResistance", "amount": 0.1 }, + { "stat": "radioactiveResistance", "amount": 0.3 }, + { "stat": "electricResistance", "amount": -0.2 }, + { "stat": "iceResistance", "amount": -0.2 }, + + { "stat": "slimeImmunity", "amount": 1 }, + { "stat": "slimestickImmunity", "amount": 1 }, + { "stat": "tarStatusImmunity", "amount" : 1 }, + { "stat": "tarImmunity", "amount" : 1 }, + { "stat": "wetImmunity", "amount": 1 }, + + { "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 }, + { "stat": "pistolMastery", "amount": 0.1 }, + { "stat": "sniperrifleMastery", "amount" : 0.1 } + ], + "diet" : [ { "ORGANIC" : false, "MEAT_RAW" : true, "FISH" : true } ], + "controlModifiers": { "speedModifier": 1.05, "airJumpModifier": 1.2 }, + "envEffects": [{ - "biomes": [ - "ocean", - "oceanfloor", - "flooded", - "floodedoceanfloor" - ], - "stats": [{ - "stat": "maxHealth", - "effectiveMultiplier": 1.15 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 1.15 - }, - { - "stat": "breathProtection", - "amount": 1 - }, - { - "stat": "fallDamageMultiplier", - "effectiveMultiplier": 0 - } + "biomes": [ "ocean", "oceanfloor" ], + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.15 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.15 }, + { "stat": "breathProtection", "amount": 1 }, + { "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 } ], - "controlModifiers": { - "speedModifier": 1.05 - } + "controlModifiers": { "speedModifier": 1.1 } }, { "biomes": "cold", - "stats": [{ - "stat": "maxHealth", - "effectiveMultiplier": 0.9 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 0.9 - }, - { - "stat": "energyRegenPercentageRate", - "baseMultiplier": 0.8 - } + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 0.9 }, + { "stat": "maxEnergy", "effectiveMultiplier": 0.9 }, + { "stat": "energyRegenPercentageRate", "baseMultiplier": 0.8 } ] }, { "biomes": "hot", - "stats": [{ - "stat": "maxHealth", - "effectiveMultiplier": 1.05 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 1.05 - }, - { - "stat": "energyRegenPercentageRate", - "baseMultiplier": 1.3 - } + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.05 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.05 }, + { "stat": "energyRegenPercentageRate", "baseMultiplier": 1.3 } ] } ], "liquidEffects": [{ "liquids": [ - 5, - 6, - 13, - 60 + 5, 6, 13, 60 ], - "stats": [{ - "stat": "maxHealth", - "effectiveMultiplier": 1.1 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 1.1 - }, - { - "stat": "breathProtection", - "amount": 1 - }, - { - "stat": "fallDamageMultiplier", - "effectiveMultiplier": 0 - } + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.1 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.1 }, + { "stat": "breathProtection", "amount": 1 }, + { "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 } ] }, { "liquids": [ - 3, - 12, - 58 + 3, 12, 58, 88 ], - "stats": [{ - "stat": "maxHealth", - "effectiveMultiplier": 0.7 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 0.7 - }, - { - "stat": "maxBreath", - "amount": -100 - } + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 0.7 }, + { "stat": "maxEnergy", "effectiveMultiplier": 0.7 }, + { "stat": "maxBreath", "amount": -100 } ] } ], "weaponEffects": [{ "weapons": [ - "pistol", - "machinepistol" + "pistol", "machinepistol" ], - "stats": [{ - "stat": "powerMultiplier", - "effectiveMultiplier": 1.2 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 1.15 - } + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.2 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.15 } ] }, { "weapons": [ - "sniperrifle", - "rifle", - "grenadelauncher" + "sniperrifle", "rifle", "grenadelauncher" ], - "stats": [{ - "stat": "critChance", - "amount": 2 - }, - { - "stat": "critDamage", - "amount": 0.05 - } + "stats": [ + { "stat": "critChance", "amount": 2 }, + { "stat": "critDamage", "amount": 0.05 } ] }, { "weapons": [ - "energy" + "slime" ], - "stats": [{ - "stat": "powerMultiplier", - "effectiveMultiplier": 1.05 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 1.05 - } + "stats": [ + { "stat": "powerMultiplier","effectiveMultiplier": 1.05 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.05 } ] } ], diff --git a/species/inkling.species.patch b/species/inkling.species.patch index a50844dcad..9e4cf6c403 100644 --- a/species/inkling.species.patch +++ b/species/inkling.species.patch @@ -1,21 +1,16 @@ [ { "op": "replace", "path" : "/charCreationTooltip/description" , - "value" : "" - }, + "value" : "Inklings are a vibrant squid people that evolved to come up on land after the nuclear annihilation of their planet's previous denizens. They're curious, lively and enthusiastic, and easily get into mischief with their ink-dispensing weapons. Many famous musicians or performers are Inklings: they love nothing more than enjoying all the colors of life. - { "op": "replace", - "path" : "/charCreationTooltip/description" , - "value" : "Colorful, chatty squid people. Light on their feet, sensitive to climate and liquids, and quite talented with their energy-based firearms. - - ^orange;Diet^reset;: Omnivore, but can eat raw meat. +^orange;Diet^reset;: Omnivore, but can eat raw fish and meat. ^orange;Perks^reset;: ^green;220^reset;s Breath - ^green;Resist^reset;: +^green;10^reset;% Physical, +^green;30^reset;% Radioactive + ^green;Resist^reset;: +^green;10^reset;% Fire, +^green;30^reset;% Radioactive ^green;20^reset;% Jump Height increase +^green;5^reset;% Movement Speed Fall Damage x^green;0.65^reset;. - ^cyan;Immune^reset;: Slime, Wet + ^cyan;Immune^reset;: Slime, Wet, Tar ^cyan;Swim Boost 1^reset; ^orange;Environment^reset;: @@ -23,15 +18,15 @@ On Warm biomes: Health and Energy x^green;1.05^reset;, +^green;30^reset;% regen rate. On Cold biomes: Health and Energy x^red;0.9^reset;, -^red;20^reset;% regen rate. Oil, Slime, Dark Water, or Healing Water: Health and Energy x^green;1.1^reset;, Inf Breath - Poison, Swamp Water, or Contaminated Water: Health and Energy x^red;0.7^reset;, -100 Breath + Poison, Swamp Water, Contaminated Water, or Strange Ooze: Health and Energy x^red;0.7^reset;, -100 Breath ^orange;Weapons^reset;: - Pistol/Machine Pistol: Damage x^green;1.2^reset;, Energy x^green;1.15^reset; + Pistol, Machine Pistol: Damage x^green;1.2^reset;, Energy x^green;1.15^reset; Sniper Rifle, Grenade Launcher: +^green;2^reset;% Crit Chance, +^green;5^reset;% Crit Damage Energy Weapon: Damage x^green;1.05^reset;, Energy x^green;1.05^reset; increase ^red;Weaknesses^reset;: - ^red;Resist^reset;: -^red;20^reset;% Ice & Electric + ^red;Resist^reset;: -^red;30^reset;% Ice & Electric +^red;6^reset;% Increased Hunger Drain" } ] diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect new file mode 100644 index 0000000000..56abee841c --- /dev/null +++ b/species/octoling.raceeffect @@ -0,0 +1,103 @@ +{ + "stats": [ + { "stat": "maxEnergy", "effectiveMultiplier": 1.1 }, + { "stat": "maxBreath", "amount": 220 }, + + { "stat": "poisonResistance", "amount": 0.3 }, + { "stat": "radioactiveResistance", "amount": 0.3 }, + { "stat": "cosmicResistance", "amount": -0.3 }, + { "stat": "iceResistance", "amount": -0.3 }, + + { "stat": "slimeImmunity", "amount": 1 }, + { "stat": "slimestickImmunity", "amount": 1 }, + { "stat": "tarStatusImmunity", "amount" : 1 }, + { "stat": "tarImmunity", "amount" : 1 }, + { "stat": "wetImmunity", "amount": 1 }, + + { "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 }, + { "stat": "shotgunMastery", "amount": 0.1 }, + { "stat": "fistMastery", "amount": 0.1 } + ], + + "diet" : [ { "ORGANIC" : false, "MEAT_RAW" : true, "FISH" : true } ], + + "controlModifiers": { "airJumpModifier": 1.2 }, + + "envEffects": [ + { "biomes": [ "ocean", "oceanfloor" ], + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.15 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.15 }, + { "stat": "breathProtection", "amount": 1 }, + { "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 } + ], + "controlModifiers": { "speedModifier": 1.2 } + }, + + { "biomes": "cold", + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 0.8 }, + { "stat": "maxEnergy", "effectiveMultiplier": 0.8 }, + { "stat": "energyRegenPercentageRate", "baseMultiplier": 0.8 } + ], + "controlModifiers": { "speedModifier": 0.8 } + }, + + { "biomes": "hot", + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.1 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.1 }, + { "stat": "energyRegenPercentageRate", "baseMultiplier": 1.1 } + ], + "controlModifiers": { "speedModifier": 1.1 } + } + ], + + "liquidEffects": [ + { "liquids": [ 5, 6, 13, 60 ], + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.1 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.1 }, + { "stat": "breathProtection", "amount": 1 }, + { "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 } + ] + }, + + { "liquids": [ 3, 12, 58, 88 ], + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 0.7 }, + { "stat": "maxEnergy", "effectiveMultiplier": 0.7 }, + { "stat": "maxBreath", "amount": -100 } + ] + } + ], + + "weaponEffects": [ + { "weapons": [ "pistol" ], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.2 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.15 } + ] + }, + { "weapons": [ "fist" ], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.2 }, + { "stat": "critChance", "amount": 2 } + ] + }, + { "weapons": [ "shotgun", "broadsword" ], + "stats": [ + { "stat": "critChance", "amount": 2 }, + { "stat": "critDamage", "amount": 0.05 } + ] + }, + { + "weapons": [ "slime" ], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.05 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.05 } + ] + } + ], + "special": [ "swimboost1" ] +} diff --git a/species/octoling.species.patch b/species/octoling.species.patch new file mode 100644 index 0000000000..0856ea2100 --- /dev/null +++ b/species/octoling.species.patch @@ -0,0 +1,31 @@ +[ + { "op": "replace", + "path" : "/charCreationTooltip/description" , + "value" : "The octopus cousins of Inklings, famous for their skills in engineering, hacking and electronic music. They're a bit more shy than their relatives, but often more wily, using their own venom in some weapons. Most of them hail from the militaristic Octarian Shogunate, and continue to seek the peace it provides them. + +^orange;Diet^reset;: Omnivore, but can eat raw fish and meat. + +^orange;Perks^reset;: + ^green;220^reset;s Breath + ^green;Resist^reset;: +^green;30^reset;% Poison, +^green;30^reset;% Radioactive + ^green;20^reset;% Jump Height increase + Fall Damage x^green;0.65^reset;. + ^cyan;Immune^reset;: Slime, Wet, Tar + ^cyan;Swim Boost 1^reset; + +^orange;Environment^reset;: + On Ocean biomes: Health, Energy & Movement Speed x^green;1.15^reset;, Inf Oxygen, Fall Damage Immunity. + On Warm biomes: Health, Energy & Movement Speed x^green;1.1^reset;, +^green;10^reset;% regen rate. + On Cold biomes: Health, Energy & Movement Speed x^red;0.8^reset;, -^red;20^reset;% regen rate. + Oil, Slime, Dark Water, or Healing Water: Health and Energy x^green;1.1^reset;, Inf Breath + Poison, Swamp Water, Contaminated Water, or Strange Ooze: Health and Energy x^red;0.7^reset;, -100 Breath + +^orange;Weapons^reset;: + Pistol: Damage x^green;1.2^reset;, Energy x^green;1.15^reset; + Fist, Shotgun & Broadsword: +^green;2^reset;% Crit Chance, +^green;5^reset;% Crit Damage + Energy Weapon: Damage x^green;1.05^reset;, Energy x^green;1.05^reset; increase + +^red;Weaknesses^reset;: + ^red;Resist^reset;: -^red;20^reset;% Ice & Electric" + } +]