Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Slotterleet committed Mar 16, 2024
2 parents 6c1f732 + e6ac7d9 commit 82396ff
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 0 deletions.
Binary file modified core/res/sprites/blocks/walls/diamond-wall-large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/res/sprites/blocks/walls/diamond-wall.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/res/sprites/blocks/walls/tin-wall-large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/res/sprites/blocks/walls/tin-wall.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions core/src/fos/content/FOSUnitTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,15 @@ public static void load(){
targetAir = false;

legCount = 3;
legLength = 8f;
legContinuousMove = true;
legExtension = -2f;
legBaseOffset = 3f;
legMaxLength = 1.1f;
legMinLength = 0.2f;
legLengthScl = 0.96f;
legForwardScl = 1.1f;
legGroupSize = 1;

weapons.add(
new Weapon("fos-radix-weapon"){{
Expand Down Expand Up @@ -589,6 +598,14 @@ public static void load(){
targetAir = false;

legCount = 3;
legGroupSize = 1;
legStraightness = 0.4f;
baseLegStraightness = 0.5f;
legLength = 9f;
legForwardScl = 0.45f;
legMoveSpace = 0.8f;
rippleScale = 2f;
legExtension = -5f;

weapons.add(
new Weapon("fos-foetus-weapon"){{
Expand Down Expand Up @@ -657,6 +674,16 @@ public static void load(){
hitSize = 22;
rotateSpeed = 1.5f;

legCount = 4;
legGroupSize = 2;
legStraightness = 0.6f;
baseLegStraightness = 0.5f;
legLength = 11f;
legForwardScl = 0.45f;
legMoveSpace = 1f;
rippleScale = 2f;
legExtension = -5f;

weapons.add(
new Weapon("fos-vitarus-weapon"){{
x = 0; y = 6;
Expand Down

0 comments on commit 82396ff

Please sign in to comment.