diff --git a/items/generic/food/tier3/desertsalsa.consumable.patch b/items/generic/food/tier3/desertsalsa.consumable.patch index a449dc71..244ec191 100644 --- a/items/generic/food/tier3/desertsalsa.consumable.patch +++ b/items/generic/food/tier3/desertsalsa.consumable.patch @@ -9,6 +9,6 @@ { "op": "replace", "path": "/description", - "value": "A refreshing salsa made from desert fruits. The taste is amazing. ^yellow;Type: Robot^reset;" + "value": "A refreshing salsa made from desert fruits. The taste is amazing. ^yellow;Type: Robot, Plant^reset;" } ] diff --git a/items/generic/food/tier4/oceanrisotto.consumable.patch b/items/generic/food/tier4/oceanrisotto.consumable.patch index d7442a35..4a122929 100644 --- a/items/generic/food/tier4/oceanrisotto.consumable.patch +++ b/items/generic/food/tier4/oceanrisotto.consumable.patch @@ -9,6 +9,6 @@ { "op": "replace", "path": "/description", - "value": "A salty and aromatic rice dish. ^orange;Type: Cooked Meat^reset;" + "value": "A salty and aromatic rice dish. ^orange;Type: Fish, Plant^reset;" } ] diff --git a/items/generic/food/tier4/oceansurprise.consumable.patch b/items/generic/food/tier4/oceansurprise.consumable.patch index ca431633..87593327 100644 --- a/items/generic/food/tier4/oceansurprise.consumable.patch +++ b/items/generic/food/tier4/oceansurprise.consumable.patch @@ -9,6 +9,6 @@ { "op": "replace", "path": "/description", - "value": "A Hylotl dish, overloaded with ingredients of questionable oceanic origin. ^orange;Type: Cooked Meat^reset;" + "value": "A Hylotl dish, overloaded with ingredients of questionable oceanic origin. ^orange;Type: Fish, Plant^reset;" } ] diff --git a/items/generic/food/tier4/oculemonstew.consumable.patch b/items/generic/food/tier4/oculemonstew.consumable.patch index 2b1863fe..94b44d82 100644 --- a/items/generic/food/tier4/oculemonstew.consumable.patch +++ b/items/generic/food/tier4/oculemonstew.consumable.patch @@ -9,6 +9,6 @@ { "op": "replace", "path": "/description", - "value": "A tangy, somewhat slimy stew made of oculemon and meat scraps. ^orange;Type: Cooked Meat^reset;" + "value": "A tangy, somewhat slimy stew made of oculemon and meat scraps. ^orange;Type: Cooked Meat, Plant^reset;" } ] diff --git a/items/generic/food/tier4/seafoodgratin.consumable.patch b/items/generic/food/tier4/seafoodgratin.consumable.patch index b97682dc..1971cc6e 100644 --- a/items/generic/food/tier4/seafoodgratin.consumable.patch +++ b/items/generic/food/tier4/seafoodgratin.consumable.patch @@ -9,6 +9,6 @@ { "op": "replace", "path": "/description", - "value": "Fish baked with fish-like fruit. A fishy dish! ^orange;Type: Cooked Meat^reset;" + "value": "Fish baked with fish-like fruit. A fishy dish! ^orange;Type: Fish, Plant^reset;" } ] diff --git a/items/generic/food/tier4/sushi.consumable.patch b/items/generic/food/tier4/sushi.consumable.patch index 0e5ceb06..798c88c6 100644 --- a/items/generic/food/tier4/sushi.consumable.patch +++ b/items/generic/food/tier4/sushi.consumable.patch @@ -9,6 +9,6 @@ { "op": "replace", "path": "/description", - "value": "Delicious rolls of rice and seaweed. A Hylotl favourite. ^orange;Type: Cooked Meat^reset;" + "value": "Delicious rolls of rice and seaweed. A Hylotl favourite. ^orange;Type: Fish, Plant^reset;" } ] diff --git a/scripts/fr_scripts/auraWhenLow.lua b/scripts/fr_scripts/auraWhenLow.lua new file mode 100644 index 00000000..88da3a0e --- /dev/null +++ b/scripts/fr_scripts/auraWhenLow.lua @@ -0,0 +1,15 @@ + + +function FRHelper:call(args, main, dt) + self.auraReload = (self.auraReload or args.auraReload) - dt + local res + if not status.isResource(args.resource) then + res = args.resourceDefault + else + res = status.resourcePercentage(args.resource) + end + if self.auraReload <= 0 and res < args.threshold then + world.spawnProjectile(args.projType, mcontroller.position(), entity.id(), args.projVelocity or {0, 0}, args.track, args.projParameters) + self.auraReload = args.auraReload + end +end diff --git a/scripts/fr_scripts/feneroxStuff.lua b/scripts/fr_scripts/feneroxStuff.lua new file mode 100644 index 00000000..60506881 --- /dev/null +++ b/scripts/fr_scripts/feneroxStuff.lua @@ -0,0 +1,19 @@ +function FRHelper:call(args, main, dt, ...) + local nighttime = world.timeOfDay() > 0.5 + local underground = world.underground(mcontroller.position()) + + local foodValue + if status.isResource("food") then + foodValue = status.resourcePercentage("food") + else + foodValue = args.foodDefault + end + + if nighttime or underground and (foodValue >= args.foodThreshold) then + status.modifyResourcePercentage("health", args.healingRate * dt) + + self:applyStats(args, args.name or "FR_feneroxNightBonus", main, dt, ...) + else + self:clearPersistent(args.name or "FR_feneroxNightBonus") + end +end diff --git a/scripts/fr_scripts/foodRush.lua b/scripts/fr_scripts/foodRush.lua new file mode 100644 index 00000000..a0a819fc --- /dev/null +++ b/scripts/fr_scripts/foodRush.lua @@ -0,0 +1,26 @@ +--[[ +Provides a speed bonus that increases when you're well fed. + +Arguments: + { + "foodDefault" : 0.5, -- What food % to use on NPCs and casual mode players + "speedFactor" : 4.25, -- Changes how much speed you get per % of food bar + "minSpeed" : 1.0, -- Minimum amount of speed bonus + "maxSpeed" : 1.2 -- Maximum amount of speed bonus + } + +The above default arguments show an effect that caps at +20% speed at 85% food. +]] + + +function FRHelper:call(args) + local foodValue + if status.isResource("food") then + foodValue = status.resourcePercentage("food") + else + foodValue = args.foodDefault + end + + foodValue = foodValue / args.speedFactor + mcontroller.controlModifiers({ util.lerp(foodValue, args.minSpeed, args.maxSpeed) }) +end diff --git a/scripts/fr_scripts/healthRegen.lua b/scripts/fr_scripts/healthRegen.lua index 50723c32..5aaf8d83 100644 --- a/scripts/fr_scripts/healthRegen.lua +++ b/scripts/fr_scripts/healthRegen.lua @@ -2,13 +2,12 @@ Simple HP regeneration effect. Restores the given % of HP every second this is active. Arguments: - + "args" : { "healingRate" = 0.015 } ]] function FRHelper:call(args, main, dt, ...) - sb.logInfo(tostring(args.healingRate).." "..tostring(dt)) status.modifyResourcePercentage("health", args.healingRate * dt) end diff --git a/scripts/fr_weaponscripts/perfectblockbonus.lua b/scripts/fr_weaponscripts/perfectblockbonus.lua index ace7bde6..ae9a7192 100644 --- a/scripts/fr_weaponscripts/perfectblockbonus.lua +++ b/scripts/fr_weaponscripts/perfectblockbonus.lua @@ -49,7 +49,7 @@ function FRHelper:call(args, main, ...) local newargs = {stats={}} for _,stuff in ipairs(args.stats or {}) do - local newStat = {stat=stuff.stat, baseMultiplier=stuff.baseMultiplier or nil, amount=stuff.amount or nil} + local newStat = {stat=stuff.stat, baseMultiplier=stuff.baseMultiplier or nil, amount=stuff.amount or nil, effectiveMultiplier=stuff.effectiveMultiplier or nil} if args.statCombos[stuff.stat] then local data = args.statCombos[stuff.stat] if newStat.amount then @@ -57,11 +57,16 @@ function FRHelper:call(args, main, ...) if data.max then newStat.amount = math.min(newStat.amount, data.max) end - else + elseif newStat.baseMultiplier then newStat.baseMultiplier = newStat.baseMultiplier + data.comboBase * (data.comboMult or 1) * main.blockCountShield if data.max then newStat.baseMultiplier = math.min(newStat.baseMultiplier, data.max) end + else + newStat.baseMultiplier = newStat.effectiveMultiplier + data.comboBase * (data.comboMult or 1) * main.blockCountShield + if data.max then + newStat.effectiveMultiplier = math.min(newStat.effectiveMultiplier, data.max) + end end end table.insert(newargs.stats, newStat) diff --git a/species/akkimari.raceeffect b/species/akkimari.raceeffect index bb8a4cd5..021ccdb6 100644 --- a/species/akkimari.raceeffect +++ b/species/akkimari.raceeffect @@ -39,5 +39,12 @@ ] } ], - "special" : [ "argonianRegen" ] -} \ No newline at end of file + "scripts" : [ + { + "script" : "/scripts/fr_scripts/healthRegen.lua", + "args" : { + "healingRate" : 0.0001 + } + } + ] +} diff --git a/species/argonian.raceeffect b/species/argonian.raceeffect index 0c477231..5dd8769f 100644 --- a/species/argonian.raceeffect +++ b/species/argonian.raceeffect @@ -24,6 +24,18 @@ } } ], + "liquidEffects" : [ + { + "controlModifiers" : { + "liquidImpedance" : 0.4, + "liquidForce" : 90, + "liquidJumpProfile" : { + "jumpSpeed" : 60.0 + }, + "speedModifier" : 1.37 + } + } + ], "weaponEffects" : [ { "weapons" : [ "spear" ], @@ -47,5 +59,12 @@ ] } ], - "special" : [ "argonianRegen", "swimboost1" ] -} \ No newline at end of file + "scripts" : [ + { + "script" : "/scripts/fr_scripts/healthRegen.lua", + "args" : { + "healingRate" : 0.0001 + } + } + ] +} diff --git a/species/argonian.species.patch b/species/argonian.species.patch index c1757f74..d1acb503 100644 --- a/species/argonian.species.patch +++ b/species/argonian.species.patch @@ -13,6 +13,7 @@ ^green;+40%^reset; Max Food, ^green;+6% Speed^reset;, ^green;+11% Jump^reset; ^green;+40%^reset; Poison, ^green;+10%^reset; Cosmic and ^green;+10%^reset; Radioactive Resist ^green;+1100^reset; oxygen, Swim Boost. + ^green;Slowly regenerate HP^reset; Immunity: Poison ^orange;Environment^reset;: diff --git a/species/avian.raceeffect b/species/avian.raceeffect index 4afbf797..ae2fcf37 100644 --- a/species/avian.raceeffect +++ b/species/avian.raceeffect @@ -1,8 +1,8 @@ { "stats" : [ - { "stat" : "maxHealth", "baseMultiplier" : 0.85 }, - { "stat" : "maxEnergy", "baseMultiplier" : 1.1 }, - { "stat" : "powerMultiplier", "baseMultiplier" : 1.05 }, + { "stat" : "maxHealth", "effectiveMultiplier" : 0.85 }, + { "stat" : "maxEnergy", "effectiveMultiplier" : 1.1 }, + { "stat" : "powerMultiplier", "effectiveMultiplier" : 1.05 }, { "stat" : "fallDamageMultiplier", "baseMultiplier" : 0.65 }, { "stat" : "physicalResistance", "amount" : -0.05 }, { "stat" : "electricResistance", "amount" : 0.25 }, @@ -24,14 +24,14 @@ { "weapons" : [ "shortspear" ], "stats" : [ - { "stat" : "powerMultiplier", "baseMultiplier" : 1.06 }, + { "stat" : "powerMultiplier", "effectiveMultiplier" : 1.06 }, { "stat" : "critChance", "amount" : 1 } ] }, { "weapons" : [ "machinepistol" ], "stats" : [ - { "stat" : "critChance", "baseMultiplier" : 1 } + { "stat" : "critChance", "amount" : 1 } ] } ], @@ -39,16 +39,14 @@ { "script" : "/scripts/fr_weaponscripts/aviancombo.lua", "weapons" : [ "dagger" ], - "contexts" : [ - "meleeslash-fire" - ] + "contexts" : [ "meleeslash-fire" ] }, { "script" : "/scripts/fr_weaponscripts/freebonus.lua", "contexts" : [ "staff-init" ], "args" : { "stats" : [ - { "stat" : "powerMultiplier", "baseMultiplier" : 1.2 } + { "stat" : "powerMultiplier", "effectiveMultiplier" : 1.2 } ], "scripts" : [ { @@ -64,7 +62,7 @@ "aerialEffect" : { "airStats" : { "stats" : [ - { "stat" : "powerMultiplier", "baseMultiplier" : 1.12 } + { "stat" : "powerMultiplier", "effectiveMultiplier" : 1.12 } ] }, @@ -75,8 +73,8 @@ "windLow" : { "speed" : 5, "stats" : [ - { "stat" : "maxHealth", "baseMultiplier" : 1.15 }, - { "stat" : "protection", "baseMultiplier" : 1.1 } + { "stat" : "maxHealth", "effectiveMultiplier" : 1.15 }, + { "stat" : "protection", "effectiveMultiplier" : 1.1 } ], "controlModifiers" : { "speedModifier" : 1.19, @@ -87,4 +85,4 @@ } }, "tech" : [ "flight_avian" ] -} \ No newline at end of file +} diff --git a/species/callistan.raceeffect b/species/callistan.raceeffect index 8a48b026..1c3cded3 100644 --- a/species/callistan.raceeffect +++ b/species/callistan.raceeffect @@ -18,38 +18,33 @@ { "stat" : "slushslowImmunity", "amount" : 1 } ], "diet" : "carnivore", - "envEffects" : [{ - "biomes" : [ - "garden", - "forest", - "tundra", - "snow" - ], - "stats" : [{ - "stat" : "maxHealth", - "baseMultiplier" : 1.15 - }, - { - "stat" : "powerMultiplier", - "baseMultiplier" : 1.1 - } - ] - }], - "weaponEffects" : [{ - "weapons" : [ - "energy" - ], - "stats" : [{ - "stat" : "energyRegenPercentageRate", - "baseMultiplier" : 1.25 - }, - { - "stat" : "critChance", - "amount" : 3 + "envEffects" : [ + { + "biomes" : [ "garden", "forest", "tundra", "snow" ], + "stats" : [ + { "stat" : "maxHealth", "baseMultiplier" : 1.15 }, + { "stat" : "powerMultiplier", "baseMultiplier" : 1.1 } + ] + } + ], + "weaponEffects" : [ + { + "weapons" : [ "energy" ], + "stats" : [ + { "stat" : "energyRegenPercentageRate", "baseMultiplier" : 1.25 }, + { "stat" : "critChance", "amount" : 3 } + ] + } + ], + "scripts" : [ + { + "script" : "/scripts/fr_scripts/foodRush.lua", + "args" : { + "foodDefault" : 0.5, + "speedFactor" : 4.25, + "minSpeed" : 0.0, + "maxSpeed" : 0.2 } - ] - }], - "special" : [ - "callistanFoodRush" + } ] -} \ No newline at end of file +} diff --git a/species/calskies.raceeffect b/species/calskies.raceeffect index abc3b922..1c3cded3 100644 --- a/species/calskies.raceeffect +++ b/species/calskies.raceeffect @@ -1,104 +1,50 @@ { - "stats": [ - { - "stat": "maxFood", - "effectiveMultiplier": 0.6 - }, - - { - "stat": "maxEnergy", - "baseMultiplier": 1.12 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.05 - }, - { - "stat": "electricResistance", - "amount": -0.3 - }, - { - "stat": "fireResistance", - "amount": 0.2 - }, - { - "stat": "iceResistance", - "amount": 0.3 - }, - { - "stat": "poisonResistance", - "amount": -0.2 - }, - { - "stat": "shadowResistance", - "amount": 0.2 - }, - { - "stat": "cosmicResistance", - "amount": -0.2 - }, - { - "stat": "radioactiveResistance", - "amount": 0.2 - }, - { - "stat": "fumudslowImmunity", - "amount": 1 - }, - { - "stat": "jungleslowImmunity", - "amount": 1 - }, - { - "stat": "webstickImmunity", - "amount": 1 - }, - { - "stat": "sandstormImmunity", - "amount": 1 - }, + "stats" : [ + { "stat" : "maxFood", "effectiveMultiplier" : 0.6 }, + { "stat" : "maxEnergy", "baseMultiplier" : 1.12 }, + { "stat" : "powerMultiplier", "baseMultiplier" : 1.05 }, + { "stat" : "electricResistance", "amount" : -0.3 }, + { "stat" : "fireResistance", "amount" : 0.2 }, + { "stat" : "iceResistance", "amount" : 0.3 }, + { "stat" : "poisonResistance", "amount" : -0.2 }, + { "stat" : "shadowResistance", "amount" : 0.2 }, + { "stat" : "cosmicResistance", "amount" : -0.2 }, + { "stat" : "radioactiveResistance", "amount" : 0.2 }, + { "stat" : "fumudslowImmunity", "amount" : 1 }, + { "stat" : "jungleslowImmunity", "amount" : 1 }, + { "stat" : "webstickImmunity", "amount" : 1 }, + { "stat" : "sandstormImmunity", "amount" : 1 }, + { "stat" : "snowslowImmunity", "amount" : 1 }, + { "stat" : "slushslowImmunity", "amount" : 1 } + ], + "diet" : "carnivore", + "envEffects" : [ { - "stat": "snowslowImmunity", - "amount": 1 - }, + "biomes" : [ "garden", "forest", "tundra", "snow" ], + "stats" : [ + { "stat" : "maxHealth", "baseMultiplier" : 1.15 }, + { "stat" : "powerMultiplier", "baseMultiplier" : 1.1 } + ] + } + ], + "weaponEffects" : [ { - "stat": "slushslowImmunity", - "amount": 1 + "weapons" : [ "energy" ], + "stats" : [ + { "stat" : "energyRegenPercentageRate", "baseMultiplier" : 1.25 }, + { "stat" : "critChance", "amount" : 3 } + ] } ], - "diet" : "carnivore", - "envEffects": [{ - "biomes": [ - "garden", - "forest", - "tundra", - "snow" - ], - "stats": [{ - "stat": "maxHealth", - "baseMultiplier": 1.15 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.1 + "scripts" : [ + { + "script" : "/scripts/fr_scripts/foodRush.lua", + "args" : { + "foodDefault" : 0.5, + "speedFactor" : 4.25, + "minSpeed" : 0.0, + "maxSpeed" : 0.2 } - ] - }], - "weaponEffects": [{ - "weapons": [ - "energy" - ], - "stats": [{ - "stat": "energyRegenPercentageRate", - "baseMultiplier": 1.25 - }, - { - "stat": "critChance", - "amount": 3 - } - ] - }], - "special": [ - "callistanFoodRush" + } ] -} \ No newline at end of file +} diff --git a/species/candavaswebber.raceeffect b/species/candavaswebber.raceeffect index a5fb49ca..d24860a0 100644 --- a/species/candavaswebber.raceeffect +++ b/species/candavaswebber.raceeffect @@ -1,89 +1,50 @@ { - "stats": [ - { - "stat" : "maxHealth", - "baseMultiplier": 1.1 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.2 - }, - - { - "stat": "radioactiveResistance", - "amount": -0.2 - }, - { - "stat": "poisonResistance", - "amount": -0.3 - }, - { - "stat": "fireResistance", - "amount": -0.4 - }, - { - "stat": "shadowResistance", - "amount": 0.3 - }, - { - "stat": "cosmicResistance", - "amount": 0.4 - }, - { - "stat": "webstickImmunity", - "amount": 1 - } + "stats" : [ + { "stat" : "maxHealth", "baseMultiplier" : 1.1 }, + { "stat" : "maxEnergy", "baseMultiplier" : 1.2 }, + { "stat" : "radioactiveResistance", "amount" : -0.2 }, + { "stat" : "poisonResistance", "amount" : -0.3 }, + { "stat" : "fireResistance", "amount" : -0.4 }, + { "stat" : "shadowResistance", "amount" : 0.3 }, + { "stat" : "cosmicResistance", "amount" : 0.4 }, + { "stat" : "webstickImmunity", "amount" : 1 } ], "diet" : [ { "HIGH_GLUCOSE" : true, "FRUIT" : true } ], - "controlModifiers": { - "speedModifier": 0.9 + "controlModifiers" : { + "speedModifier" : 0.9 }, - "envEffects": [{ - "biomes": [ - "cold" + "envEffects" : [ + { + "biomes" : [ "cold" ], + "stats" : [ + { "stat" : "physicalResistance", "baseMultiplier" : 1.2 } ], - "stats": [{ - "stat": "physicalResistance", - "baseMultiplier": 1.2 - }, - { - "controlModifiers": { - "speedModifier": 1.1 - } - } - ] + "controlModifiers" : { + "speedModifier" : 1.1 + } }, { - "biomes": [ - "aethersea" - ], - "stats": [{ - "stat": "maxHealth", - "baseMultiplier": 1.05 - }] + "biomes" : [ "aethersea" ], + "stats" : [ + { "stat" : "maxHealth", "baseMultiplier" : 1.05 } + ] } ], - "special": [ + "special" : [ "candavaswebberglow" ], - "weaponEffects": [{ - "weapons": [ - "staff" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.05 - }] + "weaponEffects" : [ + { + "weapons" : [ "staff" ], + "stats" : [ + { "stat" : "powerMultiplier", "baseMultiplier" : 1.05 } + ] }, { - "weapons": [ - "quarterstaff", - "energy" - ], - "stats": [{ - "stat": "critChance", - "amount": 3 - }] + "weapons" : [ "quarterstaff", "energy" ], + "stats" : [ + { "stat" : "critChance", "amount" : 3 } + ] } ] -} \ No newline at end of file +} diff --git a/species/cat.raceeffect b/species/cat.raceeffect index e0709d23..be235908 100644 --- a/species/cat.raceeffect +++ b/species/cat.raceeffect @@ -1,103 +1,54 @@ { - "stats": [ - { - "stat": "iceResistance", - "amount": 0.20 - }, - { - "stat": "electricResistance", - "amount": -0.20 - }, - { - "stat": "cosmicResistance", - "amount": -0.20 - }, - { - "stat": "fumudslowImmunity", - "amount": 1 - }, - { - "stat": "fallDamageMultiplier", - "baseMultiplier": 0.2 - }, - { - "stat": "fujungleslowImmunity", - "amount": 1 - }, - { - "stat": "jungleslowImmunity", - "amount": 1 - } + "stats" : [ + { "stat" : "iceResistance", "amount" : 0.20 }, + { "stat" : "electricResistance", "amount" : -0.20 }, + { "stat" : "cosmicResistance", "amount" : -0.20 }, + { "stat" : "fumudslowImmunity", "amount" : 1 }, + { "stat" : "fallDamageMultiplier", "baseMultiplier" : 0.2 }, + { "stat" : "fujungleslowImmunity", "amount" : 1 }, + { "stat" : "jungleslowImmunity", "amount" : 1 } ], "diet" : "carnivore", - "controlModifiers": { - "speedModifier": 1.08, - "airJumpModifier": 1.20 + "controlModifiers" : { + "speedModifier" : 1.08, + "airJumpModifier" : 1.20 }, - "envEffects": [ + "envEffects" : [ { - "biomes": [ - "jungle", - "thickjungle", - "forest", - "desert", - "arboreal", - "arborealdark" - ], - "stats": [ - { - "stat": "maxHealth", - "effectiveMultiplier": 1.1 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 1.15 - } - ] + "biomes" : [ "jungle", "thickjungle", "forest", "desert", "arboreal", "arborealdark" ], + "stats" : [ + { "stat" : "maxHealth", "effectiveMultiplier" : 1.1 }, + { "stat" : "maxEnergy", "effectiveMultiplier" : 1.15 } + ] } ], - "weaponEffects": [ + "weaponEffects" : [ { - "weapons": [ "fist","dagger","shortsword" ], - "stats": [ - { - "stat": "critChance", - "amount": 1 - } + "weapons" : [ "fist", "dagger", "shortsword" ], + "stats" : [ + { "stat" : "critChance", "amount" : 1 } ] }, { - "weapons": [ "thrown","thrown_grenade" ], - "stats": [ - { - "stat": "powerMultiplier", - "effectiveMultiplier": 1.25 - } + "weapons" : [ "thrown", "thrown_grenade" ], + "stats" : [ + { "stat" : "powerMultiplier", "effectiveMultiplier" : 1.25 } ] }, { - "weapons": [ "armcannon" ], - "stats": [ - { - "stat": "powerMultiplier", - "effectiveMultiplier": 1.15 - }, - { - "stat": "protection", - "effectiveMultiplier": 1.15 - } + "weapons" : [ "armcannon" ], + "stats" : [ + { "stat" : "powerMultiplier", "effectiveMultiplier" : 1.15 }, + { "stat" : "protection", "effectiveMultiplier" : 1.15 } ] }, { - "weapons": [ "magnorb" ], - "stats": [ - { - "stat": "critChance", - "amount": 2 - } + "weapons" : [ "magnorb" ], + "stats" : [ + { "stat" : "critChance", "amount" : 2 } ] - } + } ], - "special": [ "headlampcat" ], + "special" : [ "headlampcat" ], "tech" : [ "veluuclaw" ] -} \ No newline at end of file +} diff --git a/species/changenykt.raceeffect b/species/changenykt.raceeffect index 76984120..2f04d572 100644 --- a/species/changenykt.raceeffect +++ b/species/changenykt.raceeffect @@ -1,26 +1,26 @@ { - "stats": [ - { "stat": "maxEnergy", "baseMultiplier": 0.9 }, - { "stat": "poisonResistance", "amount": 0.1 }, - { "stat": "cosmicResistance", "amount": 0.1 }, - { "stat": "electricResistance", "amount": 0.1 }, - { "stat": "physicalResistance", "amount": 0.1 }, - { "stat": "shadowResistance", "amount": 0.1 }, - { "stat": "radioactiveResistance", "amount": 0.1 }, - { "stat": "iceResistance", "amount": 0.3 }, - { "stat": "fireResistance", "amount": -0.4 }, - { "stat": "maxHealth", "baseMultiplier": 1.1 }, - { "stat": "powerMultiplier", "baseMultiplier": 1.1 } + "stats" : [ + { "stat" : "maxEnergy", "baseMultiplier" : 0.9 }, + { "stat" : "poisonResistance", "amount" : 0.1 }, + { "stat" : "cosmicResistance", "amount" : 0.1 }, + { "stat" : "electricResistance", "amount" : 0.1 }, + { "stat" : "physicalResistance", "amount" : 0.1 }, + { "stat" : "shadowResistance", "amount" : 0.1 }, + { "stat" : "radioactiveResistance", "amount" : 0.1 }, + { "stat" : "iceResistance", "amount" : 0.3 }, + { "stat" : "fireResistance", "amount" : -0.4 }, + { "stat" : "maxHealth", "baseMultiplier" : 1.1 }, + { "stat" : "powerMultiplier", "baseMultiplier" : 1.1 } ], "diet" : "omnivore", - "envEffects": [ + "envEffects" : [ { - "biomes": ["garden","forest","jungle","thickjungle","snow","snowdark","tundra","arctic","arcticdark"], - "controlModifiers": { "speedModifier": 1.1, "airJumpModifier": 1.1 } + "biomes" : [ "garden", "forest", "jungle", "thickjungle", "snow", "snowdark", "tundra", "arctic", "arcticdark" ], + "controlModifiers" : { "speedModifier" : 1.1, "airJumpModifier" : 1.1 } }, { - "biomes": ["bog","ocean","magma","magmadark","volcanic","volcanicdark","oceanfloor"], - "controlModifiers": { "speedModifier": 0.9, "airJumpModifier": 0.9 } - } + "biomes" : [ "bog", "ocean", "magma", "magmadark", "volcanic", "volcanicdark", "oceanfloor" ], + "controlModifiers" : { "speedModifier" : 0.9, "airJumpModifier" : 0.9 } + } ] -} \ No newline at end of file +} diff --git a/species/deerfolk.raceeffect b/species/deerfolk.raceeffect index af5bd77b..182e48ed 100644 --- a/species/deerfolk.raceeffect +++ b/species/deerfolk.raceeffect @@ -1,113 +1,66 @@ { - "stats": [ - { - "stat": "fuCharisma", - "amount": 0.15 - }, - { - "stat": "physicalResistance", - "amount": -0.2 - }, - { - "stat": "shadowResistance", - "amount": -0.2 - }, - { - "stat": "poisonResistance", - "amount": -0.2 - }, - { - "stat": "electricResistance", - "amount": 0.2 - }, - { - "stat": "iceResistance", - "amount": 0.3 - } + "stats" : [ + { "stat" : "fuCharisma", "amount" : 0.15 }, + { "stat" : "physicalResistance", "amount" : -0.2 }, + { "stat" : "shadowResistance", "amount" : -0.2 }, + { "stat" : "poisonResistance", "amount" : -0.2 }, + { "stat" : "electricResistance", "amount" : 0.2 }, + { "stat" : "iceResistance", "amount" : 0.3 } ], "diet" : "herbivore", - "controlModifiers": { "speedModifier": 1.15 }, + "controlModifiers" : { "speedModifier" : 1.15 }, - "envEffects": [ + "envEffects" : [ { - "biomes": [ - "arboreal", - "savannah", - "garden", - "forest", - "tundra", - "snow", - "thickjungle" - ], - "stats": [ - { "stat": "protection", "effectiveMultiplier": 1.15 }, - { "stat": "physicalResistance", "amount": 0.10 } + "biomes" : [ "arboreal", "savannah", "garden", "forest", "tundra", "snow", "thickjungle" ], + "stats" : [ + { "stat" : "protection", "effectiveMultiplier" : 1.15 }, + { "stat" : "physicalResistance", "amount" : 0.10 } ] } ], - "weaponEffects": [ + "weaponEffects" : [ { - "weapons": [ "greataxe" ], - "stats": [ - { - "stat": "powerMultiplier", - "effectiveMultiplier": 1.2 - } + "weapons" : [ "greataxe" ], + "stats" : [ + { "stat" : "powerMultiplier", "effectiveMultiplier" : 1.2 } ] }, { - "weapons": [ "chakram", "boomerang" ], - "stats": [ - { - "stat": "critChance", - "amount": 1.5 - }, - { - "stat": "critBonus", - "amount": 5 - } + "weapons" : [ "chakram", "boomerang" ], + "stats" : [ + { "stat" : "critChance", "amount" : 1.5 }, + { "stat" : "critBonus", "amount" : 5 } ] }, { - "weapons": [ "axe", "spear" ], - "stats": [ - { - "stat": "grit", - "effectiveMultiplier": 1.25 - }, - { - "stat": "maxHealth", - "effectiveMultiplier": 1.05 - } + "weapons" : [ "axe", "spear" ], + "stats" : [ + { "stat" : "grit", "effectiveMultiplier" : 1.25 }, + { "stat" : "maxHealth", "effectiveMultiplier" : 1.05 } ] }, { - "weapons": [ "bow" ], - "stats": [ - { - "stat": "protection", - "effectiveMultiplier": 1.18 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.15 - } + "weapons" : [ "bow" ], + "stats" : [ + { "stat" : "protection", "effectiveMultiplier" : 1.18 }, + { "stat" : "powerMultiplier", "baseMultiplier" : 1.15 } ] } ], - "weaponScripts": [ + "weaponScripts" : [ { - "script": "/scripts/fr_weaponscripts/randprojectile.lua", - "weapons": [ "spear" ], - "contexts": [ "meleeslash-fire" ], - "args": { - "projectile": "icethrower", - "chance": 3, - "params": { - "hungermod": 12, - "damageKind": "ice" + "script" : "/scripts/fr_weaponscripts/randprojectile.lua", + "weapons" : [ "spear" ], + "contexts" : [ "meleeslash-fire" ], + "args" : { + "projectile" : "icethrower", + "chance" : 3, + "params" : { + "hungermod" : 12, + "damageKind" : "ice" } } } ] -} \ No newline at end of file +} diff --git a/species/deerkin.raceeffect b/species/deerkin.raceeffect index 7d4cbee4..ac75cb83 100644 --- a/species/deerkin.raceeffect +++ b/species/deerkin.raceeffect @@ -1,87 +1,49 @@ { - "stats": [ - { - "stat": "fuCharisma", - "amount": 35 - }, - { - "stat": "fireResistance", - "amount": -0.2 - }, - { - "stat": "radioactiveResistance", - "amount": -0.2 - }, - { - "stat": "shadowResistance", - "amount": 0.2 - }, - { - "stat": "cosmicResistance", - "amount": 0.2 - } + "stats" : [ + { "stat" : "fuCharisma", "amount" : 35 }, + { "stat" : "fireResistance", "amount" : -0.2 }, + { "stat" : "radioactiveResistance", "amount" : -0.2 }, + { "stat" : "shadowResistance", "amount" : 0.2 }, + { "stat" : "cosmicResistance", "amount" : 0.2 } ], "diet" : "herbivore", - "controlModifiers": { - "speedModifier": 1.08 + "controlModifiers" : { + "speedModifier" : 1.08 }, - "envEffects": [{ - "biomes": [ - "lush", - "forest", - "arboreal", - "arborealdark" - ], - "stats": [{ - "stat": "maxHealth", - "baseMultiplier": 1.2 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.25 - } - ] - }], - "weaponEffects": [{ - "weapons": [ - "scythe" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.1 - }] + "envEffects" : [ + { + "biomes" : [ "lush", "forest", "arboreal", "arborealdark" ], + "stats" : [ + { "stat" : "maxHealth", "baseMultiplier" : 1.2 }, + { "stat" : "maxEnergy", "baseMultiplier" : 1.25 } + ] + } + ], + "weaponEffects" : [ + { + "weapons" : [ "scythe" ], + "stats" : [ + { "stat" : "powerMultiplier", "baseMultiplier" : 1.1 } + ] }, { - "weapons": [ - "dagger" - ], - "stats": [{ - "stat": "protection", - "effectiveMultiplier": 1.15 - }] + "weapons" : [ "dagger" ], + "stats" : [ + { "stat" : "protection", "effectiveMultiplier" : 1.15 } + ] }, { - "weapons": [ - "sniperrifle" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.12 - }] + "weapons" : [ "sniperrifle" ], + "stats" : [ + { "stat" : "powerMultiplier", "baseMultiplier" : 1.12 } + ] }, { - "weapons": [ - "grenadelauncher" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.15 - }, - { - "stat": "protection", - "effectiveMultiplier": 1.18 - } + "weapons" : [ "grenadelauncher" ], + "stats" : [ + { "stat" : "powerMultiplier", "baseMultiplier" : 1.15 }, + { "stat" : "protection", "effectiveMultiplier" : 1.18 } ] } ] -} \ No newline at end of file +} diff --git a/species/demon.raceeffect b/species/demon.raceeffect index 001fedac..b790e6ec 100644 --- a/species/demon.raceeffect +++ b/species/demon.raceeffect @@ -1,94 +1,65 @@ { - "stats": [ - { - "stat": "fireResistance", - "amount": 0.4 - }, - { - "stat": "shadowResistance", - "baseMultiplier": 0.4 - }, - { - "stat": "iceResistance", - "amount": -0.4 - }, - { - "stat": "maxHealth", - "baseMultiplier": 1.15 - }, - { - "stat": "cosmicResistance", - "amount": -0.4 - }, - { - "stat": "protection", - "baseMultiplier": 1.1 - }, - { - "stat": "fireStatusImmunity", - "amount": 1 - } + "stats" : [ + { "stat" : "fireResistance", "amount" : 0.4 }, + { "stat" : "shadowResistance", "baseMultiplier" : 0.4 }, + { "stat" : "iceResistance", "amount" : -0.4 }, + { "stat" : "maxHealth", "baseMultiplier" : 1.15 }, + { "stat" : "cosmicResistance", "amount" : -0.4 }, + { "stat" : "protection", "baseMultiplier" : 1.1 }, + { "stat" : "fireStatusImmunity", "amount" : 1 } ], "diet" : "omnivore", - "envEffects": [{ - "biomes": "hot", - "stats": [{ - "stat": "powerMultiplier","effectiveMultiplier": 1.1 - }], - "controlModifiers": { - "speedModifier": 1.15 + "envEffects" : [ + { + "biomes" : "hot", + "stats" : [ + { "stat" : "powerMultiplier", "effectiveMultiplier" : 1.1 } + ], + "controlModifiers" : { + "speedModifier" : 1.15 } }, { - "biomes": "cold", - "stats": [ - { - "stat": "maxHealth", - "baseMultiplier": 0.85 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 0.9 - }] + "biomes" : "cold", + "stats" : [ + { "stat" : "maxHealth", "baseMultiplier" : 0.85 }, + { "stat" : "maxEnergy", "baseMultiplier" : 0.9 } + ] } ], - "weaponEffects": [ + "weaponEffects" : [ { - "weapons": [ + "weapons" : [ "shortsword, dagger" ], - "stats": [{ - "stat": "critDamage", - "baseMultiplier": 1.1 - }] + "stats" : [ + { "stat" : "critDamage", "baseMultiplier" : 1.1 } + ] }, { - "weapons": [ - "longsword", "katana", "broadsword" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.1 - }] + "weapons" : [ "longsword", "katana", "broadsword" ], + "stats" : [ + { "stat" : "powerMultiplier", "baseMultiplier" : 1.1 } + ] }, { - "weapons": [ - "spear" - ], - "stats": [{ - "stat": "critChance", - "amount": 1.5 - }, - { - "stat": "critDamage", - "baseMultiplier": 1.15 - } + "weapons" : [ "spear" ], + "stats" : [ + { "stat" : "critChance", "amount" : 1.5 }, + { "stat" : "critDamage", "baseMultiplier" : 1.15 } ] }, { - "combos": [ ["shortsword","shortsword"],["shortsword","dagger"],["dagger","dagger"],["katana","dagger"],["rapier","dagger"] ], - "stats": [ {"stat": "protection","effectiveMultiplier": 1.12} ], - "controlModifiers": {"speedModifier": 1.05} + "combos" : [ + [ "shortsword", "shortsword" ], + [ "shortsword", "dagger" ], + [ "dagger", "dagger" ], + [ "katana", "dagger"], + [ "rapier", "dagger"] ], + "stats" : [ + { "stat" : "protection", "effectiveMultiplier" : 1.12 } + ], + "controlModifiers" : {"speedModifier" : 1.05} } ] -} \ No newline at end of file +} diff --git a/species/dragon.raceeffect b/species/dragon.raceeffect index 2692f81b..069255a3 100644 --- a/species/dragon.raceeffect +++ b/species/dragon.raceeffect @@ -1,84 +1,53 @@ { "stats": [ - { - "stat": "fireResistance", - "amount": 0.4 - }, - { - "stat": "iceResistance", - "amount": -0.4 - }, - { - "stat": "physicalResistance", - "amount": 0.2 - }, - { - "stat": "poisonResistance", - "amount": -0.4 - }, - { - "stat": "biomeheatImmunity", - "amount": 1 - }, - { - "stat": "fallDamageMultiplier", - "baseMultiplier": 0.5 - }, - { - "stat": "fireStatusImmunity", - "amount": 1 - } + { "stat": "fireResistance", "amount": 0.4 }, + { "stat": "iceResistance", "amount": -0.4 }, + { "stat": "physicalResistance", "amount": 0.2 }, + { "stat": "poisonResistance", "amount": -0.4 }, + { "stat": "biomeheatImmunity", "amount": 1 }, + { "stat": "fallDamageMultiplier", "baseMultiplier": 0.5 }, + { "stat": "fireStatusImmunity", "amount": 1 } ], "diet" : "carnivore", - "envEffects": [{ + "envEffects": [ + { "biomes": "hot", - "stats": [{ - "stat": "maxHealth", - "baseMultiplier": 1.15 - }], + "stats": [ + { "stat": "maxHealth", "baseMultiplier": 1.15 } + ], "controlModifiers": { "speedModifier": 1.15 } }, { "biomes": "cold", - "stats": [{ - "stat": "maxHealth", - "baseMultiplier": 0.75 - }], + "stats": [ + { "stat": "maxHealth", "baseMultiplier": 0.75 } + ], "controlModifiers": { "speedModifier": 0.9 } } ], - "weaponEffects": [{ - "weapons": [ - "mace", - "hammer" - ], - "stats": [{ - "stat": "critChance", - "amount": 2 - }] + "weaponEffects": [ + { + "weapons": [ "mace", "hammer" ], + "stats": [ + { "stat": "critChance", "amount": 2 } + ] }, { - "weapons": [ - "wand", - "staff" + "weapons": [ "wand", "staff" ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.12 - }] + "stats": [ + { "stat": "powerMultiplier", "baseMultiplier": 1.12 } + ] }, { - "weapons": [ - "dagger" - ], - "stats": [{ - "stat": "critDamage", - "amount": 0.2 - }] + "weapons": [ "dagger" ], + "stats": [ + { "stat": "critDamage", "amount": 0.2 } + ] } ], "aerialEffect": { @@ -91,4 +60,4 @@ "maxFallSpeed": -39 } } -} \ No newline at end of file +} diff --git a/species/droden.raceeffect b/species/droden.raceeffect index d3c21349..3293be76 100644 --- a/species/droden.raceeffect +++ b/species/droden.raceeffect @@ -1,64 +1,31 @@ { "stats": [ - { - "stat": "maxFood", - "effectiveMultiplier": 2.5 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.15 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.1 - }, - { - "stat": "physicalResistance", - "amount": -0.25 - }, - { - "stat": "electricResistance", - "amount": -0.4 - }, - { - "stat": "poisonResistance", - "amount": 0.4 - }, - { - "stat": "radioactiveResistance", - "amount": 0.4 - }, - { - "stat": "breathProtection", - "amount": 1 - }, - { - "stat": "poisonStatusImmunity", - "amount": 1 - } + { "stat": "maxFood", "effectiveMultiplier": 2.5 }, + { "stat": "maxEnergy", "baseMultiplier": 1.15 }, + { "stat": "powerMultiplier", "baseMultiplier": 1.1 }, + { "stat": "physicalResistance", "amount": -0.25 }, + { "stat": "electricResistance", "amount": -0.4 }, + { "stat": "poisonResistance", "amount": 0.4 }, + { "stat": "radioactiveResistance", "amount": 0.4 }, + { "stat": "breathProtection", "amount": 1 }, + { "stat": "poisonStatusImmunity", "amount": 1 } ], "diet" : "robot", "controlModifiers": { "speedModifier": 1.1 }, - "weaponEffects": [{ - "weapons": [ - "shortsword", - "broadsword" - ], - "stats": [{ - "stat": "critChance", - "amount": 2 - }] + "weaponEffects": [ + { + "weapons": [ "shortsword", "broadsword" ], + "stats": [ + { "stat": "critChance", "amount": 2 } + ] }, { - "weapons": [ - "assaultrifle" - ], - "stats": [{ - "stat": "critDamage", - "amount": 0.25 - }] + "weapons": [ "assaultrifle" ], + "stats": [ + { "stat": "critDamage", "amount": 0.25 } + ] } ] -} \ No newline at end of file +} diff --git a/species/eevee.raceeffect b/species/eevee.raceeffect index 4ba9e02a..f6900fae 100644 --- a/species/eevee.raceeffect +++ b/species/eevee.raceeffect @@ -1,88 +1,45 @@ { "stats": [ - { - "stat": "maxHealth", - "baseMultiplier": 1 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.15 - }, - { - "stat": "protection", - "effectiveMultiplier": 0.95 - }, - { - "stat": "physicalResistance", - "amount": -0.2 - }, - { - "stat": "poisonResistance", - "amount": -0.1 - }, - { - "stat": "shadowResistance", - "amount": -0.05 - }, - { - "stat": "cosmicResistance", - "amount": 0.05 - }, - { - "stat": "radioactiveResistance", - "amount": 0.1 - }, - { - "stat": "biomeradiationImmunity", - "amount": 1 - } + { "stat": "maxHealth", "baseMultiplier": 1 }, + { "stat": "maxEnergy", "baseMultiplier": 1.15 }, + { "stat": "protection", "effectiveMultiplier": 0.95 }, + { "stat": "physicalResistance", "amount": -0.2 }, + { "stat": "poisonResistance", "amount": -0.1 }, + { "stat": "shadowResistance", "amount": -0.05 }, + { "stat": "cosmicResistance", "amount": 0.05 }, + { "stat": "radioactiveResistance", "amount": 0.1 }, + { "stat": "biomeradiationImmunity", "amount": 1 } ], "diet" : "omnivore", "controlModifiers": { "speedModifier": 1.1, "airJumpModifier": 1.1 }, - "envEffects": [{ - "biomes": [ - "lush", - "forest", - "jungle" - ], + "envEffects": [ + { + "biomes": [ "lush", "forest", "jungle" ], "controlModifiers": { "speedModifier": 1.05, "airJumpModifier": 1.05 } }, { - "biomes": [ - "hot" - ], - "stats": [{ - "stat": "fireResistance", - "amount": 0.1 - }, - { - "stat": "iceResistance", - "amount": -0.1 - } + "biomes": [ "hot" ], + "stats": [ + { "stat": "fireResistance", "amount": 0.1 }, + { "stat": "iceResistance", "amount": -0.1 } ] }, { - "biomes": [ - "cold" - ], - "stats": [{ - "stat": "fireResistance", - "amount": -0.1 - }, - { - "stat": "iceResistance", - "amount": 0.1 - } + "biomes": [ "cold" ], + "stats": [ + { "stat": "fireResistance", "amount": -0.1 }, + { "stat": "iceResistance", "amount": 0.1 } ] } ], - "weaponEffects": [{ + "weaponEffects": [ + { "weapons": [ "broadsword", "shortsword", @@ -92,10 +49,9 @@ "rapier", "dagger" ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.2 - }] + "stats": [ + { "stat": "powerMultiplier", "baseMultiplier": 1.2 } + ] }, { "weapons": [ @@ -106,30 +62,27 @@ "boomerang", "yoyo" ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 0.85 - }] + "stats": [ + { "stat": "powerMultiplier", "baseMultiplier": 0.85 } + ] } ], - "weaponScripts": [{ - "script": "/scripts/fr_weaponscripts/perfectblockbonus.lua", - "contexts": [ - "shield-perfectblock" - ], - "args": { - "stats": [{ - "stat": "protection", - "amount": 0 - }], - "statCombos": { - "powerMultiplier": { - "comboBase": 2, - "max": 16 - } - }, - "particles": "bonusBlock4" + "weaponScripts": [ + { + "script": "/scripts/fr_weaponscripts/perfectblockbonus.lua", + "contexts": [ "shield-perfectblock" ], + "args": { + "stats": [ + { "stat": "protection", "amount": 0 } + ], + "statCombos": { + "powerMultiplier": { + "comboBase": 2, + "max": 16 + } + }, + "particles": "bonusBlock4" + } } - }], - "special": [] + ] } diff --git a/species/elduukhar.raceeffect b/species/elduukhar.raceeffect index e85ec58b..c4bdcfd4 100644 --- a/species/elduukhar.raceeffect +++ b/species/elduukhar.raceeffect @@ -1,37 +1,13 @@ { "stats": [ - { - "stat": "protection", - "amount": 2 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 1.10 - }, - { - "stat": "maxFood", - "effectiveMultiplier": 1.30 - }, - { - "stat": "poisonResistance", - "amount": -0.2 - }, - { - "stat": "electricResistance", - "amount": -0.2 - }, - { - "stat": "shadowResistance", - "amount": 0.2 - }, - { - "stat": "fireResistance", - "amount": 0.2 - }, - { - "stat": "iceResistance", - "amount": 0.2 - } + { "stat": "protection", "amount": 2 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.10 }, + { "stat": "maxFood", "effectiveMultiplier": 1.30 }, + { "stat": "poisonResistance", "amount": -0.2 }, + { "stat": "electricResistance", "amount": -0.2 }, + { "stat": "shadowResistance", "amount": 0.2 }, + { "stat": "fireResistance", "amount": 0.2 }, + { "stat": "iceResistance", "amount": 0.2 } ], "diet" : "entity", "envEffects": [ @@ -49,40 +25,22 @@ "crystalswampaether" ], "stats": [ - { - "stat": "maxHealth", - "effectiveMultiplier": 1.25 - }, - { - "stat": "critBonus", - "amount": 10 - } + { "stat": "maxHealth", "effectiveMultiplier": 1.25 }, + { "stat": "critBonus", "amount": 10 } ] }, { "biomes": "hot", "stats": [ - { - "stat": "maxHealth", - "effectiveMultiplier": 1.25 - }, - { - "stat": "protection", - "effectiveMultiplier": 1.15 - } + { "stat": "maxHealth", "effectiveMultiplier": 1.25 }, + { "stat": "protection", "effectiveMultiplier": 1.15 } ] }, { "biomes": "cold", "stats": [ - { - "stat": "maxHealth", - "effectiveMultiplier": 0.75 - }, - { - "stat": "protection", - "effectiveMultiplier": 0.85 - } + { "stat": "maxHealth", "effectiveMultiplier": 0.75 }, + { "stat": "protection", "effectiveMultiplier": 0.85 } ] } ], @@ -90,45 +48,37 @@ { "weapons": [ "longsword", "axe", "greataxe" ], "stats": [ - { - "stat": "maxHealth", - "effectiveMultiplier": 1.15 - }, - { - "stat": "protection", - "effectiveMultiplier": 1.15 - } + { "stat": "maxHealth", "effectiveMultiplier": 1.15 }, + { "stat": "protection", "effectiveMultiplier": 1.15 } ] }, { "weapons": [ "whip", "chakram", "boomerang" ], "stats": [ - { - "stat": "powerMultiplier", - "effectiveMultiplier": 1.20 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 1.15 - } + { "stat": "powerMultiplier", "effectiveMultiplier": 1.20 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.15 } ] }, { - "weapons": ["lunari"], + "weapons": [ "lunari" ], "stats": [ - { - "stat": "powerMultiplier", - "effectiveMultiplier": 1.12 - }, - { - "stat": "maxEnergy", - "effectiveMultiplier": 1.25 - } + { "stat": "powerMultiplier", "effectiveMultiplier": 1.12 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.25 } ] } ], - "special": [ - "elduukharBonus" + "scripts" : [ + { + "script" : "/scripts/fr_scripts/auraWhenLow.lua", + "args" : { + "resource" : "health", + "auraReload" : 0.5, + "threshold" : 0.5, + "projType" : "icecloud", + "projParameters" : { "power" : 3 }, + "track" : "false" + } + } ], "tech" : [ "elduukharburst" ] -} \ No newline at end of file +} diff --git a/species/elunite.raceeffect b/species/elunite.raceeffect index 9b725782..2f3f0470 100644 --- a/species/elunite.raceeffect +++ b/species/elunite.raceeffect @@ -1,25 +1,10 @@ { "stats": [ - { - "stat": "maxHealth", - "baseMultiplier": 0.85 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.2 - }, - { - "stat": "electricResistance", - "amount": 0.4 - }, - { - "stat": "shadowResistance", - "amount": -0.5 - }, - { - "stat": "electricStatusImmunity", - "amount": 1 - } + { "stat": "maxHealth", "baseMultiplier": 0.85 }, + { "stat": "maxEnergy", "baseMultiplier": 1.2 }, + { "stat": "electricResistance", "amount": 0.4 }, + { "stat": "shadowResistance", "amount": -0.5 }, + { "stat": "electricStatusImmunity", "amount": 1 } ], "diet" : "robot", "controlModifiers": { @@ -30,56 +15,31 @@ "liquidForce": 25, "groundForce": 115 }, - "weaponEffects": [{ - "weapons": [ - "dagger", - "shortsword", - "broadsword" + "weaponEffects": [ + { + "weapons": [ "dagger", "shortsword", "broadsword" ], - "stats": [{ - "stat": "protection", - "amount": 2 - }, - { - "stat": "energyRegenPercentageRate", - "amount": 0.48 - } + "stats": [ + { "stat": "protection", "amount": 2 }, + { "stat": "energyRegenPercentageRate", "amount": 0.48 } ] }, { - "weapons": [ - "boomerang", - "chakram" - ], - "stats": [{ - "stat": "protection", - "amount": 2 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.125 - } + "weapons": [ "boomerang", "chakram" ], + "stats": [ + { "stat": "protection", "amount": 2 }, + { "stat": "powerMultiplier", "baseMultiplier": 1.125 } ] }, { "combos": [ - [ - "boomerang", - "boomerang" - ], - [ - "boomerang", - "chakram" - ], - [ - "chakram", - "chakram" - ] + [ "boomerang", "boomerang" ], + [ "boomerang", "chakram" ], + [ "chakram", "chakram" ] ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.125 - }] + "stats": [ + { "stat": "powerMultiplier", "baseMultiplier": 1.125 } + ] } ] -} \ No newline at end of file +} diff --git a/species/elysian.raceeffect b/species/elysian.raceeffect index a1434a0c..4a347c5a 100644 --- a/species/elysian.raceeffect +++ b/species/elysian.raceeffect @@ -1,98 +1,46 @@ { "stats": [ - { - "stat": "foodDelta", - "baseMultiplier": 0.85 - }, - { - "stat": "maxHealth", - "baseMultiplier": 1.05 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.25 - }, - { - "stat": "protection", - "effectiveMultiplier": 0.9 - }, - { - "stat": "fallDamageMultiplier", - "baseMultiplier": 0.75 - }, - { - "stat": "physicalResistance", - "amount": 0.1 - }, - { - "stat": "electricResistance", - "amount": 0.25 - }, - { - "stat": "iceResistance", - "amount": -0.15 - }, - { - "stat": "cosmicResistance", - "amount": 0.05 - }, - { - "stat": "radioactiveResistance", - "amount": -0.15 - }, - { - "stat": "electricStatusImmunity", - "amount": 1 - } + { "stat": "foodDelta", "baseMultiplier": 0.85 }, + { "stat": "maxHealth", "baseMultiplier": 1.05 }, + { "stat": "maxEnergy", "baseMultiplier": 1.25 }, + { "stat": "protection", "effectiveMultiplier": 0.9 }, + { "stat": "fallDamageMultiplier", "baseMultiplier": 0.75 }, + { "stat": "physicalResistance", "amount": 0.1 }, + { "stat": "electricResistance", "amount": 0.25 }, + { "stat": "iceResistance", "amount": -0.15 }, + { "stat": "cosmicResistance", "amount": 0.05 }, + { "stat": "radioactiveResistance", "amount": -0.15 }, + { "stat": "electricStatusImmunity", "amount": 1 } ], "diet" : "carnivore", "controlModifiers": { "speedModifier": 1.1, "airJumpModifier": 1.05 }, - "envEffects": [{ - "biomes": [ - "lush", - "forest", - "jungle" + "envEffects": [ + { + "biomes": [ "lush", "forest", "jungle" ], - "stats": [{ - "stat": "maxHealth", - "baseMultiplier": 1.2 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.2 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.2 - } + "stats": [ + { "stat": "maxHealth", "baseMultiplier": 1.2 }, + { "stat": "maxEnergy", "baseMultiplier": 1.2 }, + { "stat": "powerMultiplier", "baseMultiplier": 1.2 } ] }, { - "biomes": [ - "irradiated" - ], - "stats": [{ - "stat": "maxEnergy", - "baseMultiplier": 0.75 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 0.85 - } + "biomes": [ "irradiated" ], + "stats": [ + { "stat": "maxEnergy", "baseMultiplier": 0.75 }, + { "stat": "powerMultiplier", "baseMultiplier": 0.85 } ] } ], - "weaponEffects": [{ - "weapons": [ - "bow" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.1 - }] + "weaponEffects": [ + { + "weapons": [ "bow" ], + "stats": [ + { "stat": "powerMultiplier", "baseMultiplier": 1.1 } + ] }, { "weapons": [ @@ -102,29 +50,27 @@ "spear", "chakram" ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.1 - }] + "stats": [ + { "stat": "powerMultiplier", "baseMultiplier": 1.1 } + ] } ], - "weaponScripts": [{ - "script": "/scripts/fr_weaponscripts/perfectblockbonus.lua", - "contexts": [ - "shield-perfectblock" - ], - "args": { - "stats": [{ - "stat": "protection", - "amount": 0 - }], - "statCombos": { - "powerMultiplier": { - "comboBase": 2, - "max": 16 - } - }, - "particles": "bonusBlock4" + "weaponScripts": [ + { + "script": "/scripts/fr_weaponscripts/perfectblockbonus.lua", + "contexts": [ "shield-perfectblock" ], + "args": { + "stats": [ + { "stat": "protection", "amount": 0 } + ], + "statCombos": { + "powerMultiplier": { + "comboBase": 2, + "max": 16 + } + }, + "particles": "bonusBlock4" + } } - }] + ] } diff --git a/species/everis.raceeffect b/species/everis.raceeffect index 9d8bb919..090345c2 100644 --- a/species/everis.raceeffect +++ b/species/everis.raceeffect @@ -1,49 +1,16 @@ { "stats":[ - { - "stat":"maxHealth", - "baseMultiplier":0.85 - }, - { - "stat":"maxEnergy", - "baseMultiplier":1.15 - }, - { - "stat":"fireResistance", - "amount":-0.4 - }, - { - "stat":"iceResistance", - "amount":0.3 - }, - { - "stat":"poisonResistance", - "amount":-0.1 - }, - { - "stat":"electricResistance", - "amount":0.2 - }, - { - "stat":"slushslowimmunity", - "amount":1 - }, - { - "stat":"snowslowimmunity", - "amount":1 - }, - { - "stat":"iceslipimmunity", - "amount":1 - }, - { - "stat":"coldimmunity", - "amount":1 - }, - { - "stat":"biomecoldImmunity", - "amount":1 - } + { "stat":"maxHealth", "baseMultiplier":0.85 }, + { "stat":"maxEnergy", "baseMultiplier":1.15 }, + { "stat":"fireResistance", "amount":-0.4 }, + { "stat":"iceResistance", "amount":0.3 }, + { "stat":"poisonResistance", "amount":-0.1 }, + { "stat":"electricResistance", "amount":0.2 }, + { "stat":"slushslowimmunity", "amount":1 }, + { "stat":"snowslowimmunity", "amount":1 }, + { "stat":"iceslipimmunity", "amount":1 }, + { "stat":"coldimmunity", "amount":1 }, + { "stat":"biomecoldImmunity", "amount":1 } ], "diet" : "omnivore", "controlModifiers":{ @@ -51,33 +18,31 @@ "airJumpModifier":1.1 }, "weaponEffects" : [ - { - "weapons" : [ "assaultrifle", "sniperrifle" ], - "stats" : [ - { "stat" : "powerMultiplier", "baseMultiplier" : 1.10 } - ] - }, - { - "weapons" : [ "machinepistol", "pistol" ], - "stats" : [ - { "stat" : "energyRegenPercentageRate", "amount" : 0.25 } - ] }, - { "weapons" : [ "shield" ], - "stats" : [ - { "stat" : "protection", "amount" : 15 }, - { "stat" : "healthRegen", "amount" : 0.35 } - ] + { + "weapons" : [ "assaultrifle", "sniperrifle" ], + "stats" : [ + { "stat" : "powerMultiplier", "baseMultiplier" : 1.10 } + ] + }, + { + "weapons" : [ "machinepistol", "pistol" ], + "stats" : [ + { "stat" : "energyRegenPercentageRate", "amount" : 0.25 } + ] + }, + { + "weapons" : [ "shield" ], + "stats" : [ + { "stat" : "protection", "amount" : 15 }, + { "stat" : "healthRegen", "amount" : 0.35 } + ] } - ], + ], "envEffects":[ { - "biomes":[ - "cold", "arctic", "snow", "arcticoceanfloor", "tundra", "space", "moon", "asteroids", "barrenasteroids" - ], + "biomes":[ "cold", "arctic", "snow", "arcticoceanfloor", "tundra", "space", "moon", "asteroids", "barrenasteroids" ], "stats":[ - { - "stat":"protection", - "amount" : 10 }, + { "stat":"protection", "amount" : 10 }, { "stat" : "energyRegenPercentageRate", "amount" : 0.25 } ], "controlModifiers":{ @@ -86,4 +51,4 @@ } } ] -} \ No newline at end of file +} diff --git a/species/familiar.raceeffect b/species/familiar.raceeffect index 936ac78f..e69af7bf 100644 --- a/species/familiar.raceeffect +++ b/species/familiar.raceeffect @@ -1,96 +1,39 @@ { "stats": [ - { - "stat": "foodDelta", - "baseMultiplier": 1.3 - }, - { - "stat": "maxHealth", - "baseMultiplier": 0.8 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.4 - }, - { - "stat": "maxBreath", - "amount": 200 - }, - { - "stat": "physicalResistance", - "amount": -0.2 - }, - { - "stat": "electricResistance", - "amount": -0.5 - }, - { - "stat": "fireResistance", - "amount": 0.2 - }, - { - "stat": "iceResistance", - "amount": 0.2 - }, - { - "stat": "poisonResistance", - "amount": 0.2 - }, - { - "stat": "shadowResistance", - "amount": 0.2 - }, - { - "stat": "cosmicResistance", - "amount": 0.4 - }, - { - "stat": "radioactiveResistance", - "amount": 0.2 - }, - { - "stat": "webstickImmunity", - "amount": 1 - }, - { - "stat": "blacktarImmunity", - "amount": 1 - } + { "stat": "foodDelta", "baseMultiplier": 1.3 }, + { "stat": "maxHealth", "baseMultiplier": 0.8 }, + { "stat": "maxEnergy", "baseMultiplier": 1.4 }, + { "stat": "maxBreath", "amount": 200 }, + { "stat": "physicalResistance", "amount": -0.2 }, + { "stat": "electricResistance", "amount": -0.5 }, + { "stat": "fireResistance", "amount": 0.2 }, + { "stat": "iceResistance", "amount": 0.2 }, + { "stat": "poisonResistance", "amount": 0.2 }, + { "stat": "shadowResistance", "amount": 0.2 }, + { "stat": "cosmicResistance", "amount": 0.4 }, + { "stat": "radioactiveResistance", "amount": 0.2 }, + { "stat": "webstickImmunity", "amount": 1 }, + { "stat": "blacktarImmunity", "amount": 1 } ], "diet" : "omnivore", "controlModifiers": { "speedModifier": 1.05 }, - "special": [ - "familiarglow" - ], - "weaponEffects": [{ - "weapons": [ - "wand" - ], - "stats": [{ - "stat": "protection", - "effectiveMultiplier": 1.05 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.1 - } + "special": [ "familiarglow" ], + "weaponEffects": [ + { + "weapons": [ "wand" ], + "stats": [ + { "stat": "protection", "effectiveMultiplier": 1.05 }, + { "stat": "powerMultiplier", "baseMultiplier": 1.1 } ] }, { - "weapons": [ - "staff" - ], - "stats": [{ - "stat": "protection", - "effectiveMultiplier": 1.15 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.15 - } + "weapons": [ "staff" ], + "stats": [ + { "stat": "protection", "effectiveMultiplier": 1.15 }, + { "stat": "powerMultiplier", "baseMultiplier": 1.15 } ] } ] -} \ No newline at end of file +} diff --git a/species/felin.raceeffect b/species/felin.raceeffect index 4f1e2c38..9c75aaf1 100644 --- a/species/felin.raceeffect +++ b/species/felin.raceeffect @@ -1,94 +1,49 @@ { "stats": [ - { - "stat": "maxHealth", - "baseMultiplier": 0.88 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 0.95 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.05 - }, - { - "stat": "poisonResistance", - "amount": -0.4 - }, - { - "stat": "shadowResistance", - "amount": 0.4 - } + { "stat": "maxHealth", "baseMultiplier": 0.88 }, + { "stat": "maxEnergy", "baseMultiplier": 0.95 }, + { "stat": "powerMultiplier", "baseMultiplier": 1.05 }, + { "stat": "poisonResistance", "amount": -0.4 }, + { "stat": "shadowResistance", "amount": 0.4 } ], "diet" : "carnivore", "controlModifiers": { "speedModifier": 1.06 }, - "envEffects": [{ - "biomes": [ - "jungle", - "thickjungle", - "alien", - "protoworld", - "arboreal", - "arborealdark" - ], - "stats": [{ - "stat": "maxEnergy", - "baseMultiplier": 1.1 - }, - { - "stat": "protection", - "effectiveMultiplier": 1.05 - } - ] - }], + "envEffects": [ + { + "biomes": [ "jungle", "thickjungle", "alien", "protoworld", "arboreal", "arborealdark" ], + "stats": [ + { "stat": "maxEnergy", "baseMultiplier": 1.1 }, + { "stat": "protection", "effectiveMultiplier": 1.05 } + ] + } + ], "weaponEffects": [{ - "weapons": [ - "fist" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.12 - }] + "weapons": [ "fist" ], + "stats": [ + { "stat": "powerMultiplier", "baseMultiplier": 1.12 } + ] }, { - "weapons": [ - "dagger" - ], - "stats": [{ - "stat": "critChance", - "amount": 1 - }] + "weapons": [ "dagger" ], + "stats": [ + { "stat": "critChance", "amount": 1 } + ] }, { "combos": [ - [ - "fist", - "fist" - ], - [ - "dagger", - "dagger" - ] + [ "fist", "fist" ], + [ "dagger", "dagger" ] ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.03 - }, - { - "stat": "critDamage", - "amount": 0.1 - } + "stats": [ + { "stat": "powerMultiplier", "baseMultiplier": 1.03 }, + { "stat": "critDamage", "amount": 0.1 } ] }, { "combos": [ - [ - "fist", - "fist" - ] + [ "fist", "fist" ] ], "controlModifiers": { "speedModifier": 1.08, @@ -96,20 +51,12 @@ } }, { - "weapons": [ - "pistol", - "machinepistol" - ], - "stats": [{ - "stat": "critDamage", - "baseMultiplier": 1.2 - }, - { - "stat": "critChance", - "amount": 1 - } + "weapons": [ "pistol", "machinepistol" ], + "stats": [ + { "stat": "critDamage", "baseMultiplier": 1.2 }, + { "stat": "critChance", "amount": 1 } ] } ], "tech" : [ "huntersclaw" ] -} \ No newline at end of file +} diff --git a/species/fenerox.raceeffect b/species/fenerox.raceeffect index 8d3020ad..7690f69e 100644 --- a/species/fenerox.raceeffect +++ b/species/fenerox.raceeffect @@ -1,92 +1,65 @@ { "stats": [ - { - "stat": "maxFood", - "effectiveMultiplier": 0.75 - }, - { - "stat": "maxHealth", - "baseMultiplier": 0.9 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.05 - }, - { - "stat": "electricResistance", - "amount": 0.4 - }, - { - "stat": "fireResistance", - "amount": -0.2 - }, - { - "stat": "poisonResistance", - "amount": 0.4 - }, - { - "stat": "shadowResistance", - "amount": -0.2 - }, - { - "stat": "cosmicResistance", - "amount": 0.25 - } + { "stat": "maxFood", "effectiveMultiplier": 0.75 }, + { "stat": "maxHealth", "effectiveMultiplier": 0.9 }, + { "stat": "powerMultiplier", "effectiveMultiplier": 1.05 }, + { "stat": "electricResistance", "amount": 0.4 }, + { "stat": "fireResistance", "amount": -0.2 }, + { "stat": "poisonResistance", "amount": 0.4 }, + { "stat": "shadowResistance", "amount": -0.2 }, + { "stat": "cosmicResistance", "amount": 0.25 } ], "diet" : "carnivore", "controlModifiers": { "speedModifier": 1.12, "airJumpModifier": 1.11 }, - "envEffects": [{ - "biomes": [ - "savannah" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.15 - }] - }], - "weaponEffects": [{ - "weapons": [ - "boomerang", - "chakram", - "spear" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.1 - }, - { - "stat": "critChance", - "amount": 2 - } + "envEffects": [ + { + "biomes": [ "savannah" ], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.15 } + ] + } + ], + "weaponEffects": [ + { + "weapons": [ "boomerang", "chakram", "spear" ], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.1 }, + { "stat": "critChance", "amount": 2 } ] }, { - "weapons": [ - "spear" - ], - "stats": [{ - "stat": "protection", - "effectiveMultiplier": 1.2 - }] + "weapons": [ "spear" ], + "stats": [ + { "stat": "protection", "effectiveMultiplier": 1.2 } + ] + } + ], + "weaponScripts": [ + { + "script": "/scripts/fr_weaponscripts/hungercost.lua", + "weapons": [ "spear" ], + "contexts": [ "spearstab-fire" ], + "args": { + "food": -0.05 + } } ], - "weaponScripts": [{ - "script": "/scripts/fr_weaponscripts/hungercost.lua", - "weapons": [ - "spear" - ], - "contexts": [ - "spearstab-fire" - ], - "args": { - "food": -0.05 + "scripts" : [ + { + "script" : "/scripts/fr_scripts/feneroxStuff.lua", + "args" : { + "foodDefault" : 1.0, + "foodThreshold" : 0.65, + "healingRate" : 0.0045, + "stats" : [ + { "stat" : "maxHealth", "effectiveMultiplier" : 1.08 }, + { "stat" : "powerMultiplier", "effectiveMultiplier" : 1.08} + ] + } } - }], - "special": [ - "darkregenfenerox" ], "tech" : [ "huntersclaw" ] -} \ No newline at end of file +} diff --git a/species/floran.raceeffect b/species/floran.raceeffect index 19e434ff..8ea6275c 100644 --- a/species/floran.raceeffect +++ b/species/floran.raceeffect @@ -1,115 +1,61 @@ { "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.05 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.2 }, + { "stat": "powerMultiplier", "effectiveMultiplier": 1.05 }, + { "stat": "electricResistance", "amount": 0.25 }, + { "stat": "fireResistance", "amount": -0.5 }, + { "stat": "iceResistance", "amount": 0.25 }, + { "stat": "poisonResistance", "amount": -0.25 }, + { "stat": "radioactiveResistance", "amount": 0.2 }, + { "stat": "electricStatusImmunity", "amount": 1 } + ], + "diet" : "carnivore", + "envEffects": [ { - "stat": "maxHealth", - "baseMultiplier": 1.05 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.2 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.05 - }, - { - "stat": "electricResistance", - "amount": 0.25 - }, - { - "stat": "fireResistance", - "amount": -0.5 - }, - { - "stat": "iceResistance", - "amount": 0.25 - }, - { - "stat": "poisonResistance", - "amount": -0.25 - }, - { - "stat": "radioactiveResistance", - "amount": 0.2 - }, - { - "stat": "electricStatusImmunity", - "amount": 1 + "biomes": "jungle", + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.1 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.1 } + ] } ], - "diet" : "carnivore", - "envEffects": [{ - "biomes": "jungle", - "stats": [{ - "stat": "maxHealth", - "baseMultiplier": 1.1 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.1 - } - ] - }], - "weaponEffects": [{ - "weapons": [ - "bow" - ], - "stats": [{ - "stat": "critChance", - "amount": 4 - }, - { - "stat": "critDamage", - "amount": 0.2 - } + "weaponEffects": [ + { + "weapons": [ "bow" ], + "stats": [ + { "stat": "critChance", "amount": 4 }, + { "stat": "critDamage", "amount": 0.2 } ], "controlModifiers": { "speedModifier": 1.15 } }, { - "weapons": [ - "dagger", - "spear" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.08 - }, - { - "stat": "critChance", - "amount": 3 - } + "weapons": [ "dagger", "spear" ], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.08 }, + { "stat": "critChance", "amount": 3 } ] }, { - "weapons": [ - "needler", - "thrown", - "floran" - ], - "stats": [{ - "stat": "critChance", - "baseMultiplier": 2 - }] + "weapons": [ "needler", "thrown", "floran" ], + "stats": [ + { "stat": "critChance", "amount": 2 } + ] }, { "combos": [ - [ - "needler", - "needler" - ], - [ - "floran", - "floran" - ] + [ "needler", "needler" ], + [ "floran", "floran" ] ], "controlModifiers": { "speedModifier": 1.08 } } ], - "weaponScripts": [{ + "weaponScripts": [ + { "script": "/scripts/fr_weaponscripts/hungercost.lua", "contexts": [ "boomerang-fire", @@ -122,18 +68,14 @@ }, { "script": "/scripts/fr_weaponscripts/hungercost.lua", - "contexts": [ - "fist-combo" - ], + "contexts": [ "fist-combo" ], "args": { "food": -0.002 } }, { "script": "/scripts/fr_weaponscripts/hungercost.lua", - "contexts": [ - "bowshot-fire" - ], + "contexts": [ "bowshot-fire" ], "args": { "food": -0.02 } @@ -151,39 +93,24 @@ { "script": "/scripts/fr_weaponscripts/hungercost.lua", "blacklist": true, - "weapons": [ - "spear", - "dagger" - ], - "contexts": [ - "meleeslash-fire" - ], + "weapons": [ "spear", "dagger" ], + "contexts": [ "meleeslash-fire" ], "args": { "food": -0.005 } }, { "script": "/scripts/fr_weaponscripts/hungercost.lua", - "weapons": [ - "spear", - "dagger" - ], - "contexts": [ - "meleeslash-fire" - ], + "weapons": [ "spear", "dagger" ], + "contexts": [ "meleeslash-fire" ], "args": { "food": -0.01 } }, { "script": "/scripts/fr_weaponscripts/randprojectile.lua", - "weapons": [ - "spear", - "dagger" - ], - "contexts": [ - "meleeslash-fire" - ], + "weapons": [ "spear", "dagger" ], + "contexts": [ "meleeslash-fire" ], "args": { "projectile": "furazorleafinvis", "chance": 3, @@ -215,8 +142,8 @@ }, "nightConfig" : { "stats" : [ - { "stat" : "maxHealth", "baseMultiplier" : 0.90 }, - { "stat" : "maxEnergy", "baseMultiplier" : 0.70 } + { "stat" : "maxHealth", "effectiveMultiplier" : 0.90 }, + { "stat" : "maxEnergy", "effectiveMultiplier" : 0.70 } ], "hungerLoss" : -0.0032, "hungerLossLight" : -0.0019, @@ -228,4 +155,4 @@ "special": [ "starvingedgefloran" ] -} \ No newline at end of file +} diff --git a/species/glitch.raceeffect b/species/glitch.raceeffect index 098eb6ee..e8544627 100644 --- a/species/glitch.raceeffect +++ b/species/glitch.raceeffect @@ -1,85 +1,42 @@ { "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.15 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.05 }, + { "stat": "protection", "effectiveMultiplier": 1.05 }, + { "stat": "physicalResistance", "amount": 0.2 }, + { "stat": "electricResistance", "amount": -0.3 }, + { "stat": "poisonResistance", "amount": 0.2 }, + { "stat": "cosmicResistance", "amount": -0.3 }, + { "stat": "radioactiveResistance", "amount": 0.2 }, + { "stat": "grit", "amount": 0.2 }, + { "stat": "poisonStatusImmunity", "amount": 1 }, + { "stat": "beestingImmunity", "amount": 1 } + ], + "diet" : [ { "ORGANIC" : false, "ROBOT_PLANT" : true }, { "MEAT_RAW" : true } ], + "weaponEffects": [ { - "stat": "maxHealth", - "baseMultiplier": 1.15 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.05 - }, - { - "stat": "protection", - "baseMultiplier": 1.05 - }, - { - "stat": "physicalResistance", - "amount": 0.2 - }, - { - "stat": "electricResistance", - "amount": -0.3 - }, - { - "stat": "poisonResistance", - "amount": 0.2 - }, - { - "stat": "cosmicResistance", - "amount": -0.3 - }, - { - "stat": "radioactiveResistance", - "amount": 0.2 - }, - { - "stat": "grit", - "amount": 0.2 + "weapons": [ "bow", "crossbow" ], + "stats": [ + { "stat": "critChance", "amount": 2 } + ] }, { - "stat": "poisonStatusImmunity", - "amount": 1 + "weapons": [ "mace", "axe", "greataxe" ], + "stats": [ + { "stat": "critChance", "amount": 2 }, + { "stat": "critBonus", "amount": 5 } + ] }, { - "stat": "beestingImmunity", - "amount": 1 + "weapons": [ "shield" ], + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.08 }, + { "stat": "shieldBash", "amount": 3 } + ] } ], - "diet" : "robot", - "weaponEffects": [{ - "weapons": [ - "bow", - "crossbow" - ], - "stats": [{ - "stat": "critChance", - "amount": 2 - }] - },{ - "weapons": ["mace","axe","greataxe"], - "stats": [{ - "stat": "critChance", - "amount": 2 - },{ - "stat": "critBonus", - "amount": 5 - }] - }, - { - "weapons": [ - "shield" - ], - "stats": [{ - "stat": "maxHealth", - "baseMultiplier": 1.08 - }, - { - "stat": "shieldBash", - "amount": 3 - }] - } - ], - "weaponScripts": [//{ + "weaponScripts": [ + //{ //"script": "/scripts/fr_weaponscripts/hungercost.lua", //"contexts": [ // "meleecombo-fire" @@ -90,15 +47,12 @@ //}, { "script": "/scripts/fr_weaponscripts/combobonus.lua", - "contexts": [ - "meleecombo-fire" - ], + "contexts": [ "meleecombo-fire" ], "args": { "comboMult": 2, - "stats": [{ - "stat": "protection", - "amount": 0 - }] + "stats": [ + { "stat": "protection", "amount": 0 } + ] } }, //{ @@ -122,79 +76,56 @@ //}, { "script": "/scripts/fr_weaponscripts/glitchbash.lua", - "contexts": [ - "shield-bash" - ], + "contexts": [ "shield-bash" ], "args": { "healthRecover": 1.2 } }, { "script": "/scripts/fr_weaponscripts/perfectblockbonus.lua", - "contexts": [ - "shield-perfectblock" - ], + "contexts": [ "shield-perfectblock" ], "args": { "name": "FR_glitchShieldPerfectBlock", - "stats": [{ - "stat": "powerMultiplier", - "amount": 0.02 - }], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.02 } + ], "statCombos": { "powerMultiplier": { "comboBase": 0.03, - "max": 0.3 + "max": 1.3 } } } }, { "script": "/scripts/fr_weaponscripts/freebonus.lua", - "contexts": [ - "shield-raised" - ], + "contexts": [ "shield-raised" ], "args": { "name": "FR_glitchShieldRaised", "stats": [ - { - "stat": "protection", - "amount": 3 - }, - { - "stat": "healthRegen", - "amount": 0.15 - } + { "stat": "protection", "amount": 3 }, + { "stat": "healthRegen", "amount": 0.15 } ] } }, { "script": "/scripts/fr_weaponscripts/shieldcancel.lua", - "contexts": [ - "shield-update" - ], + "contexts": [ "shield-update" ], "args": { "energyAmt": 0.25 } } ], - "special": [ - "glitchStuff" - ], - "liquidEffects": [{ - "name": "glitchLiquidEffect", - "liquids": [ 5,44,11 ], - "stats": [{ - "stat": "maxEnergy", - "baseMultiplier": 1.25 - }, - { - "stat": "energyRegenPercentageRate", - "amount": 0.484 - }, - { - "stat": "healthRegen", - "amount": 0.484 - } - ] - }] -} \ No newline at end of file + "special": [ "glitchStuff" ], + "liquidEffects": [ + { + "name": "glitchLiquidEffect", + "liquids": [ "oil", "liquidprotocite", "erchius" ], + "stats": [ + { "stat": "maxEnergy", "effectiveMultiplier": 1.25 }, + { "stat": "energyRegenPercentageRate", "amount": 0.484 }, + { "stat": "healthRegen", "amount": 0.484 } + ] + } + ] +} diff --git a/species/glitch.species.patch b/species/glitch.species.patch index be4ea073..74ec8ddb 100644 --- a/species/glitch.species.patch +++ b/species/glitch.species.patch @@ -4,7 +4,7 @@ "path" : "/charCreationTooltip/description" , "value" : "Their creation is lost to history. This suits them just fine, as they prefer a primitive state of being. Their medieval culture favors training with shields, maces and crossbows. - Diet: Robotic + Diet: Robotic/Omnivore ^orange;Perks^reset;: ^green;+15%^reset; Health, +^green;5%^reset; Energy, +^green;5%^reset; Protection diff --git a/species/human.raceeffect b/species/human.raceeffect index 1256ffb7..cecbadda 100644 --- a/species/human.raceeffect +++ b/species/human.raceeffect @@ -1,13 +1,7 @@ { "stats": [ - { - "stat": "maxFood", - "effectiveMultiplier": 1.3 - }, - { - "stat": "grit", - "amount": 0.2 - } + { "stat": "maxFood", "effectiveMultiplier": 1.3 }, + { "stat": "grit", "amount": 0.2 } ], "diet" : "omnivore", "controlParameters": { @@ -15,56 +9,43 @@ "jumpHoldTime": 0.28 } }, - "weaponEffects": [{ - "weapons": [ - "shortsword" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.12 - }, - { - "stat": "grit", - "amount": 0.2 - } + "weaponEffects": [ + { + "weapons": [ "shortsword" ], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.12 }, + { "stat": "grit", "amount": 0.2 } ] }, { - "weapons": [ - "assaultrifle" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.12 - }] + "weapons": [ "assaultrifle" ], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.12 } + ] }, { - "weapons": [ - "yoyo" - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.1 - }] + "weapons": [ "yoyo" ], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.1 } + ] } ], - "weaponScripts": [{ - "script": "/scripts/fr_weaponscripts/perfectblockbonus.lua", - "contexts": [ - "shield-perfectblock" - ], - "args": { - "stats": [{ - "stat": "protection", - "amount": 0 - }], - "statCombos": { - "powerMultiplier": { - "comboBase": 2, - "max": 16 - } - }, - "particles": "bonusBlock4" + "weaponScripts": [ + { + "script": "/scripts/fr_weaponscripts/perfectblockbonus.lua", + "contexts": [ "shield-perfectblock" ], + "args": { + "stats": [ + { "stat": "protection", "amount": 0 } + ], + "statCombos": { + "powerMultiplier": { + "comboBase": 2, + "max": 16 + } + }, + "particles": "bonusBlock4" + } } - }] -} \ No newline at end of file + ] +} diff --git a/species/hylotl.raceeffect b/species/hylotl.raceeffect index b760a935..a78a9da1 100644 --- a/species/hylotl.raceeffect +++ b/species/hylotl.raceeffect @@ -1,101 +1,55 @@ { "stats": [ - { - "stat": "maxHealth", - "baseMultiplier": 1.2 - }, - { - "stat": "powerMultiplier", - "baseMultiplier": 1.1 - }, - { - "stat": "electricResistance", - "amount": -0.4 - }, - { - "stat": "iceResistance", - "amount": 0.2 - }, - { - "stat": "shadowResistance", - "amount": -0.1 - } + { "stat": "maxHealth", "effectiveMultiplier": 1.2 }, + { "stat": "powerMultiplier", "effectiveMultiplier": 1.1 }, + { "stat": "electricResistance", "amount": -0.4 }, + { "stat": "iceResistance", "amount": 0.2 }, + { "stat": "shadowResistance", "amount": -0.1 } ], // Omnivores, but these like fish! "diet" : [ { "ORGANIC" : false, "FISH" : true }, { "MEAT_RAW" : true } ], - "envEffects": [{ - "biomes": [ - "ocean", - "oceanfloor" - ], - "stats": [{ - "stat": "maxHealth", - "baseMultiplier": 1.12 - }, - { - "stat": "maxEnergy", - "baseMultiplier": 1.12 - }, - { - "stat": "protection", - "baseMultiplier": 1.15 - } - ] - }], - "weaponEffects": [{ - "weapons": [ - "shortsword" + "envEffects": [ + { + "biomes": [ "ocean", "oceanfloor" ], + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.12 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.12 }, + { "stat": "protection", "effectiveMultiplier": 1.15 } + ] + } + ], + "weaponEffects": [ + { + "weapons": [ "shortsword" ], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.06 } ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.06 - }], "controlModifiers": { "speedModifier": 1.04 } }, { - "weapons": [ - "quarterstaff" + "weapons": [ "quarterstaff" ], + "stats": [ + { "stat": "protection", "amount": 6 } ], - "stats": [{ - "stat": "protection", - "amount": 6 - }], "controlModifiers": { "speedModifier": 1.12 } }, { - "combos": [ - [ - "katana" - ] - ], - "stats": [{ - "stat": "powerMultiplier", - "baseMultiplier": 1.1 - }, - { - "stat": "critDamage", - "amount": 0.25 - } + "combos": [ [ "katana" ] ], + "stats": [ + { "stat": "powerMultiplier", "effectiveMultiplier": 1.1 }, + { "stat": "critDamage", "amount": 0.25 } ] }, { "combos": [ - [ - "katana", - "dagger" - ] + [ "katana", "dagger" ] ], - "stats": [{ - "stat": "protection", - "amount": 4 - }, - { - "stat": "critChance", - "amount": 1 - } + "stats": [ + { "stat": "protection", "amount": 4 }, + { "stat": "critChance", "amount": 1 } ], "controlModifiers": { "speedModifier": 1.08 @@ -108,63 +62,55 @@ "katana", "longsword" ], - "scripts": [{ - "script": "/scripts/fr_weaponscripts/healthybonus.lua", - "contexts": [ - "healthyBonus" - ], - "args": { - "healthReq": 0.75, - "stats": [{ - "stat": "critChance", - "amount": 2 - }] + "scripts": [ + { + "script": "/scripts/fr_weaponscripts/healthybonus.lua", + "contexts": [ "healthyBonus" ], + "args": { + "healthReq": 0.75, + "stats": [ + { "stat": "critChance", "amount": 2 } + ] + } } - }] + ] } ], - "weaponScripts": [{ - "script": "/scripts/fr_weaponscripts/perfectblockbonus.lua", - "contexts": [ - "shield-perfectblock" - ], - "args": { - "resources": { - "health": { - "base": 0.025, - "comboBase": 0.0008, - "max": 0.05 - } - }, - "particles": "bonusBlock" + "weaponScripts": [ + { + "script": "/scripts/fr_weaponscripts/perfectblockbonus.lua", + "contexts": [ "shield-perfectblock" ], + "args": { + "resources": { + "health": { + "base": 0.025, + "comboBase": 0.0008, + "max": 0.05 + } + }, + "particles": "bonusBlock" + } } - }], - "special": [ - "swimboost2" ], - "liquidEffects": [{ - "liquids": [ - 1, - 6, - 58, - 12 - ], - "stats": [{ - "stat": "maxHealth", - "baseMultiplier": 1.25 - }, - { - "stat": "physicalResistance", - "amount": 0.2 - }, - { - "stat": "perfectBlockLimit", - "amount": 2 - }, - { - "stat": "maxBreath", - "amount": 1500 + "liquidEffects": [ + { + "controlModifiers" : { + "liquidImpedance" : 0.3, + "liquidForce" : 130, + "liquidJumpProfile" : { + "jumpSpeed" : 70.0 + }, + "speedModifier" : 1.8 } - ] - }] -} \ No newline at end of file + }, + { + "liquids": [ "water", "healingwater", "wastewater", "swampwater" ], + "stats": [ + { "stat": "maxHealth", "effectiveMultiplier": 1.25 }, + { "stat": "physicalResistance", "amount": 0.2 }, + { "stat": "perfectBlockLimit", "amount": 2 }, + { "stat": "maxBreath", "amount": 1500 } + ] + } + ] +} diff --git a/species/novakid.raceeffect b/species/novakid.raceeffect index b0c39166..4eca2e12 100644 --- a/species/novakid.raceeffect +++ b/species/novakid.raceeffect @@ -1,7 +1,7 @@ { "stats": [ - { "stat": "maxHealth", "baseMultiplier": 0.9 }, - { "stat": "maxEnergy", "baseMultiplier": 1.2 }, + { "stat": "maxHealth", "effectiveMultiplier": 0.9 }, + { "stat": "maxEnergy", "effectiveMultiplier": 1.2 }, { "stat": "physicalResistance", "amount": -0.15 }, { "stat": "electricResistance", "amount": -0.2 }, { "stat": "fireResistance", "amount": 0.25 }, @@ -29,7 +29,7 @@ { "weapons": [ "pistol" ], "stats": [ - { "stat": "powerMultiplier", "amount": 0.09 } + { "stat": "powerMultiplier", "effectiveMultiplier": 1.09 } ] }, { @@ -42,7 +42,7 @@ { "weapons": [ "shotgun" ], "stats": [ - { "stat": "powerMultiplier", "baseMultiplier": 1.2 }, + { "stat": "powerMultiplier", "effectiveMultiplier": 1.2 }, { "stat": "critDamage", "amount": 0.2 } ] }, @@ -51,7 +51,7 @@ "stats": [ { "stat": "grit", "amount": 0.25 }, { "stat": "maxEnergy", "effectiveMultiplier": 1.15 }, - { "stat": "powerMultiplier", "amount": 0.09 } + { "stat": "powerMultiplier", "effectiveMultiplier": 1.09 } ], "controlModifiers": { "speedModifier": 1.08, @@ -61,7 +61,7 @@ { "weapons": [ "whip" ], "stats": [ - { "stat": "powerMultiplier", "baseMultiplier": 1.15 } + { "stat": "powerMultiplier", "effectiveMultiplier": 1.15 } ], "controlModifiers": { "speedModifier": 1.1 @@ -110,4 +110,4 @@ } } ] -} \ No newline at end of file +}