diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eadd93eb22f..3b867eb6390 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: env: PRDESC: ${{ github.event.pull_request.body }} run: | - echo "$PRDESC" | grep -qv '"' || ( echo "::error:: Description of Pull Request shouldn't contain quote symbols [\"], please replace them with single quote [']."; false ) + echo "$PRDESC" | grep -qvz '"' || ( echo "::error:: Description of Pull Request shouldn't contain quote symbols [\"], please replace them with single quote [']."; false ) # Check Lua files with "luacheck" tool (Lua static analyzer). luacheck: diff --git a/items/active/weapons/ranged/unique/burster.activeitem b/items/active/weapons/ranged/unique/burster.activeitem index 991280b1d62..dac1dfdb54f 100644 --- a/items/active/weapons/ranged/unique/burster.activeitem +++ b/items/active/weapons/ranged/unique/burster.activeitem @@ -11,7 +11,7 @@ "level" : 1, "tooltipKind" : "gun2", "weaponType" : "Grenade Launcher", - "itemTags" : ["weapon","ranged","grenadelauncher","bioweapon","blister", "upgradeableWeapon"], + "itemTags" : ["weapon","ranged","grenadelauncher", "upgradeableWeapon"], "twoHanded" : false, "animation" : "/items/active/weapons/ranged/gun.animation", diff --git a/recipes/armory/melee/broadsword/aetheriumcleaver.recipe b/recipes/armory/melee/broadsword/aetheriumcleaver.recipe index 74e85cd5453..13dad304f5f 100644 --- a/recipes/armory/melee/broadsword/aetheriumcleaver.recipe +++ b/recipes/armory/melee/broadsword/aetheriumcleaver.recipe @@ -3,7 +3,7 @@ { "item" : "aetheriumalloy", "count" : 24 }, { "item" : "precursorfluid", "count" : 25 }, { "item" : "densiniumbar", "count" : 24 }, - { "item" : "elderrelic3", "count" : 5 } + { "item" : "elderrelic3", "count" : 1 } ], "output" : { "item" : "aetheriumcleaver", "count" : 1 }, "groups" : [ "armory3", "melee2", "all" ] diff --git a/scripts/fr_raceEffects.lua b/scripts/fr_raceEffects.lua index 5c8bd3af707..baeb9769552 100644 --- a/scripts/fr_raceEffects.lua +++ b/scripts/fr_raceEffects.lua @@ -108,19 +108,19 @@ function update(dt) self.helper:applyControlModifiers(self.helper.controlModifiers,self.helper.controlParameters) end self.helper:runScripts("racialscript", self, dt) ---[[--disabling - -- Breath handling - -- which, as it happens, is already handled by the vanilla script. so this applies TWICE. + + -- Waterbreathing: negate the breath loss when submerged in liquid. if entity.entityType() ~= "npc" then local mouthPosition = vec2.add(mcontroller.position(), status.statusProperty("mouthPosition")) - if status.statPositive("breathProtection") or world.breathable(mouthPosition) - or status.statPositive("waterbreathProtection") and world.liquidAt(mouthPosition) + + -- We don't need to do anything if there is "breathProtection" or location is breathable, + -- because vanilla Lua script already handles this case. + if not status.statPositive("breathProtection") and status.statPositive("waterbreathProtection") + and not world.breathable(mouthPosition) and world.liquidAt(mouthPosition) then status.modifyResource("breath", status.stat("breathRegenerationRate") * dt) - else - status.modifyResource("breath", -status.stat("breathDepletionRate") * dt) end - end]] + end tagCaching.update() masteries.update(dt) end @@ -137,4 +137,4 @@ end --function getLevelByExp(exp) -- return math.floor((math.sqrt(3) * math.sqrt(243*(exp+1)^2-48600*(exp+1)+3680000)+27 * (exp+1)-2700)^(1/3)/30^(2/3)-(5*10^(2/3))/(3^(1/3)*(math.sqrt(3)*math.sqrt(243*(exp+1)^2-48600*(exp+1)+3680000)+27*(exp+1)-2700)^(1/3))+2) ---end \ No newline at end of file +--end diff --git a/stats/effects/fu_armoreffects/set_bonuses/tier8/shoggothsetbonuseffect.lua b/stats/effects/fu_armoreffects/set_bonuses/tier8/shoggothsetbonuseffect.lua index 37e7f5cd0ff..b5fa70a22e0 100644 --- a/stats/effects/fu_armoreffects/set_bonuses/tier8/shoggothsetbonuseffect.lua +++ b/stats/effects/fu_armoreffects/set_bonuses/tier8/shoggothsetbonuseffect.lua @@ -19,7 +19,7 @@ armorBonus={ {stat = "snowslowImmunity", amount = 1}, {stat = "protoImmunity", amount = 1}, {stat = "shadowImmunity", amount = 1}, - {stat = "pressureImmunity", amount = 1}, + {stat = "extremepressureProtection", amount = 1}, {stat = "darknessImmunity", amount = 1}, {stat = "radiationburnImmunity", amount = 1} } @@ -34,4 +34,4 @@ function update(dt) if not checkSetWorn(self.setBonusCheck) then effect.expire() end -end \ No newline at end of file +end