bleary
Member
revision 9957 didn't remove all the kludges implementing the weight bugs. (at least) one remained in Modifiers.java.
Code:
Index: Modifiers.java
===================================================================
--- Modifiers.java (revision 9962)
+++ Modifiers.java (working copy)
@@ -1980,19 +1980,16 @@
int familiarId = familiar.getId();
int weight = familiar.getWeight();
- if ( familiarId != FamiliarPool.SCARECROW )
- {
- weight += (int) this.get( Modifiers.FAMILIAR_WEIGHT );
- weight += (int) this.get( Modifiers.HIDDEN_FAMILIAR_WEIGHT );
- weight += ( familiar.getFeasted() ? 10 : 0 );
+ weight += (int) this.get( Modifiers.FAMILIAR_WEIGHT );
+ weight += (int) this.get( Modifiers.HIDDEN_FAMILIAR_WEIGHT );
+ weight += ( familiar.getFeasted() ? 10 : 0 );
+
+ float percent = this.get( Modifiers.FAMILIAR_WEIGHT_PCT ) / 100.0f;
+ if ( percent != 0.0f )
+ {
+ weight = (int) Math.floor( weight + weight * percent );
+ }
- float percent = this.get( Modifiers.FAMILIAR_WEIGHT_PCT ) / 100.0f;
- if ( percent != 0.0f )
- {
- weight = (int) Math.floor( weight + weight * percent );
- }
- }
-
weight = Math.max( 1, weight );
this.lookupFamiliarModifiers( familiar, weight, famItem );
}
Last edited:
