Skip to content

Commit

Permalink
Merge branch 'sayterdarkwynd:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Kukagres authored Jan 23, 2025
2 parents 9e846aa + bbe8d0d commit 9fc4829
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
8 changes: 6 additions & 2 deletions .github/scripts/detect-unoptimized-png-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@ THRESHOLD=5
# Run optipng with "-o1", which is much faster than default (-o2)
OPTIPNG_COMMAND="optipng -o1"

# Check only files that don't already exist in the master branch of this repository.
UPSTREAM_GIT_URL="https://github.com/sayterdarkwynd/FrackinUniverse.git"

###############################################################################

fails=0
IFS=$'\n' # To iterate over filenames with spaces.

# If some image wasn't added/modified compared to the master branch, then it won't be checked,
# because we have 30k+ images, and rechecking them every time would take ~8 minutes.
git fetch --depth=1 origin master
FILES=$(git diff origin/master --name-only --no-renames --diff-filter=ACM | grep -E '\.png$' | sort)
git remote add upstream "$UPSTREAM_GIT_URL"
git fetch --depth=1 upstream master
FILES=$(git diff upstream/master --name-only --no-renames --diff-filter=ACM | grep -E '\.png$' | sort)

if [ "x$FILES" == 'x' ]; then
echo "Nothing to check: no images changed since the master branch."
Expand Down
2 changes: 1 addition & 1 deletion .metadata
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"requires" : [],
"steamContentId" : "729480149",
"tags" : "Crafting and Building|Miscellaneous|Planets and Environments|NPCs and Creatures|Weapons|Quests|Dungeons|Ships|Species|User Interface|Furniture and Objects|Food and Farming|Mechanics|Vehicles and Mounts|Armor and Clothes",
"version" : "6.4.8.2"
"version" : "6.4.8.3"
}
5 changes: 5 additions & 0 deletions _FUversioning.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

^orange;Official Wiki^reset;: frackinuniverse.miraheze.org^reset;

^cyan;6.4.8.3^reset;
------------------
* Fixed food poisoning causing insane slowdown.


^cyan;6.4.8.1^reset;
------------------
* Tooltips of frames, queens and drones no longer show Mite Resistance.
Expand Down
11 changes: 3 additions & 8 deletions stats/effects/food/penalty/foodpenalty.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,14 @@ function update(dt)
damageSourceKind = "poison",
sourceEntityId = entity.id()
})
local modifierSet=self.foodControlMods or {}
modifierSet.airJumpModifier=0.08
modifierSet.speedModifier=0.08
applyFilteredModifiers(modifierSet)
effect.setParentDirectives("fade=806e4f="..self.tickTimer * 0.25)
status.removeEphemeralEffect("wellfed")
if status.resourcePercentage("food") > 0.85 then status.setResourcePercentage("food", 0.85) end
else
if self.foodControlMods then
applyFilteredModifiers(self.foodControlMods)
end
end

if self.foodControlMods then
applyFilteredModifiers(self.foodControlMods)
end
end

function uninit()
Expand Down

0 comments on commit 9fc4829

Please # to comment.