AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 20:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Additional work on CMorphBall

Browse Source
This commit is contained in:
Jack Andersen
2017-09-11 19:51:17 -10:00
parent c2f3e02702
commit c0d5cee8b1
10 changed files with 380 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
DataSpec/DNAMP1/Tweaks/CTweakBall.cpp
View File

@@ -79,10 +79,10 @@ void CTweakBall::read(athena::io::IStreamReader& __dna_reader)
xc4_[6] = __dna_reader.readFloatBig();
/* xc4_[7] */
xc4_[7] = __dna_reader.readFloatBig();
/* xe4_spiderBallRollSpeed */
xe4_spiderBallRollSpeed = __dna_reader.readFloatBig();
/* xe8_ */
xe8_ = __dna_reader.readFloatBig();
/* xe4_ballGravity */
xe4_ballGravity = __dna_reader.readFloatBig();
/* xe8_ballWaterGravity */
xe8_ballWaterGravity = __dna_reader.readFloatBig();
/* x14c_ */
x14c_ = __dna_reader.readFloatBig();
/* x150_ */
@@ -210,7 +210,7 @@ void CTweakBall::read(athena::io::IStreamReader& __dna_reader)
/* x218_ */
x218_ = __dna_reader.readFloatBig();
/* x21c_ */
x21c_ = __dna_reader.readFloatBig();
x21c_boostBallMinRelativeSpeedForDamage = __dna_reader.readFloatBig();
/* x220_ */
x220_ = __dna_reader.readFloatBig();
/* x224_ */
@@ -299,10 +299,10 @@ void CTweakBall::write(athena::io::IStreamWriter& __dna_writer) const
__dna_writer.writeFloatBig(xc4_[6]);
/* xc4_[7] */
__dna_writer.writeFloatBig(xc4_[7]);
/* xe4_spiderBallRollSpeed */
__dna_writer.writeFloatBig(xe4_spiderBallRollSpeed);
/* xe8_ */
__dna_writer.writeFloatBig(xe8_);
/* xe4_ballGravity */
__dna_writer.writeFloatBig(xe4_ballGravity);
/* xe8_ballWaterGravity */
__dna_writer.writeFloatBig(xe8_ballWaterGravity);
/* x14c_ */
__dna_writer.writeFloatBig(x14c_);
/* x150_ */
@@ -430,7 +430,7 @@ void CTweakBall::write(athena::io::IStreamWriter& __dna_writer) const
/* x218_ */
__dna_writer.writeFloatBig(x218_);
/* x21c_ */
__dna_writer.writeFloatBig(x21c_);
__dna_writer.writeFloatBig(x21c_boostBallMinRelativeSpeedForDamage);
/* x220_ */
__dna_writer.writeFloatBig(x220_);
/* x224_ */
@@ -539,10 +539,10 @@ void CTweakBall::read(athena::io::YAMLDocReader& __dna_docin)
/* xc4_[7] */
xc4_[7] = __dna_docin.readFloat("xc4_");
}
/* xe4_spiderBallRollSpeed */
xe4_spiderBallRollSpeed = __dna_docin.readFloat("xe4_spiderBallRollSpeed");
/* xe8_ */
xe8_ = __dna_docin.readFloat("xe8_");
/* xe4_ballGravity */
xe4_ballGravity = __dna_docin.readFloat("xe4_ballGravity");
/* xe8_ballWaterGravity */
xe8_ballWaterGravity = __dna_docin.readFloat("xe8_ballWaterGravity");
/* x14c_ */
x14c_ = __dna_docin.readFloat("x14c_");
/* x150_ */
@@ -670,7 +670,7 @@ void CTweakBall::read(athena::io::YAMLDocReader& __dna_docin)
/* x218_ */
x218_ = __dna_docin.readFloat("x218_");
/* x21c_ */
x21c_ = __dna_docin.readFloat("x21c_");
x21c_boostBallMinRelativeSpeedForDamage = __dna_docin.readFloat("x21c_");
/* x220_ */
x220_ = __dna_docin.readFloat("x220_");
/* x224_ */
@@ -775,10 +775,10 @@ void CTweakBall::write(athena::io::YAMLDocWriter& __dna_docout) const
/* xc4_[7] */
__dna_docout.writeFloat("xc4_", xc4_[7]);
}
/* xe4_spiderBallRollSpeed */
__dna_docout.writeFloat("xe4_spiderBallRollSpeed", xe4_spiderBallRollSpeed);
/* xe8_ */
__dna_docout.writeFloat("xe8_", xe8_);
/* xe4_ballGravity */
__dna_docout.writeFloat("xe4_ballGravity", xe4_ballGravity);
/* xe8_ballWaterGravity */
__dna_docout.writeFloat("xe8_ballWaterGravity", xe8_ballWaterGravity);
/* x14c_ */
__dna_docout.writeFloat("x14c_", x14c_);
/* x150_ */
@@ -906,7 +906,7 @@ void CTweakBall::write(athena::io::YAMLDocWriter& __dna_docout) const
/* x218_ */
__dna_docout.writeFloat("x218_", x218_);
/* x21c_ */
__dna_docout.writeFloat("x21c_", x21c_);
__dna_docout.writeFloat("x21c_", x21c_boostBallMinRelativeSpeedForDamage);
/* x220_ */
__dna_docout.writeFloat("x220_", x220_);
/* x224_ */

10
DataSpec/DNAMP1/Tweaks/CTweakBall.hpp
View File

@@ -38,8 +38,8 @@ struct CTweakBall final : public ITweakBall
Value<float> xbc_;
Value<float> xc0_;
Value<float> xc4_[8];
Value<float> xe4_spiderBallRollSpeed;
Value<float> xe8_;
Value<float> xe4_ballGravity;
Value<float> xe8_ballWaterGravity;
float xec_ = 10000.f;
float xf0_ = 1000.f;
float xf4_ = 40000.f;
@@ -110,7 +110,7 @@ struct CTweakBall final : public ITweakBall
float x208_;
Value<float> x20c_;
Value<float> x218_;
Value<float> x21c_;
Value<float> x21c_boostBallMinRelativeSpeedForDamage;
Value<float> x220_;
Value<float> x224_;
Value<float> x210_;
@@ -140,11 +140,13 @@ struct CTweakBall final : public ITweakBall
float GetMaxBallTranslationAcceleration(int s) const { return x4_maxTranslationAcceleration[s]; }
float GetBallTranslationFriction(int s) const { return x24_translationFriction[s]; }
float GetBallTranslationMaxSpeed(int s) const { return x44_translationMaxSpeed[s]; }
float GetSpiderBallRollSpeed() const { return xe4_spiderBallRollSpeed; }
float GetBallGravity() const { return xe4_ballGravity; }
float GetBallWaterGravity() const { return xe8_ballWaterGravity; }
float GetBallCameraControlDistance() const { return x1d0_ballCameraControlDistance; }
float GetLeftStickDivisor() const { return x1e4_leftStickDivisor; }
float GetRightStickDivisor() const { return x1e8_rightStickDivisor; }
float GetBallTouchRadius() const { return x204_ballTouchRadius; }
float GetBoostBallMinRelativeSpeedForDamage() const { return x21c_boostBallMinRelativeSpeedForDamage; }
};
}
}