Update kart characteristics with python script

This commit is contained in:
Benau 2020-03-16 11:27:21 +08:00
parent 8449bf2714
commit a589ab4a10
5 changed files with 41 additions and 40 deletions

View File

@ -331,6 +331,8 @@ std::string AbstractCharacteristic::getName(CharacteristicType type)
return "ENGINE_POWER";
case ENGINE_MAX_SPEED:
return "ENGINE_MAX_SPEED";
case ENGINE_GENERIC_MAX_SPEED:
return "ENGINE_GENERIC_MAX_SPEED";
case ENGINE_BRAKE_FACTOR:
return "ENGINE_BRAKE_FACTOR";
case ENGINE_BRAKE_TIME_INCREASE:
@ -351,6 +353,8 @@ std::string AbstractCharacteristic::getName(CharacteristicType type)
return "CAMERA_DISTANCE";
case CAMERA_FORWARD_UP_ANGLE:
return "CAMERA_FORWARD_UP_ANGLE";
case CAMERA_FORWARD_SMOOTHING:
return "CAMERA_FORWARD_SMOOTHING";
case CAMERA_BACKWARD_UP_ANGLE:
return "CAMERA_BACKWARD_UP_ANGLE";
case JUMP_ANIMATION_TIME:
@ -515,8 +519,6 @@ std::string AbstractCharacteristic::getName(CharacteristicType type)
return "SKID_REDUCE_TURN_MAX";
case SKID_ENABLED:
return "SKID_ENABLED";
case ENGINE_GENERIC_MAX_SPEED:
return "ENGINE_GENERIC_MAX_SPEED";
/* <characteristics-end getName> */
} // switch (type)
@ -875,7 +877,7 @@ bool AbstractCharacteristic::getCameraForwardSmoothing() const
Log::fatal("AbstractCharacteristic", "Can't get characteristic %s",
getName(CAMERA_FORWARD_SMOOTHING).c_str());
return result;
} // getCameraForwardSmoothing (advanced option)
} // getCameraForwardSmoothing
// ----------------------------------------------------------------------------
float AbstractCharacteristic::getCameraBackwardUpAngle() const
@ -974,7 +976,7 @@ float AbstractCharacteristic::getParachuteFriction() const
} // getParachuteFriction
// ----------------------------------------------------------------------------
int AbstractCharacteristic::getParachuteDuration() const
float AbstractCharacteristic::getParachuteDuration() const
{
float result;
bool is_set = false;
@ -982,11 +984,11 @@ int AbstractCharacteristic::getParachuteDuration() const
if (!is_set)
Log::fatal("AbstractCharacteristic", "Can't get characteristic %s",
getName(PARACHUTE_DURATION).c_str());
return stk_config->time2Ticks(result);
return result;
} // getParachuteDuration
// ----------------------------------------------------------------------------
int AbstractCharacteristic::getParachuteDurationOther() const
float AbstractCharacteristic::getParachuteDurationOther() const
{
float result;
bool is_set = false;
@ -994,7 +996,7 @@ int AbstractCharacteristic::getParachuteDurationOther() const
if (!is_set)
Log::fatal("AbstractCharacteristic", "Can't get characteristic %s",
getName(PARACHUTE_DURATION_OTHER).c_str());
return stk_config->time2Ticks(result);
return result;
} // getParachuteDurationOther
// ----------------------------------------------------------------------------
@ -1595,7 +1597,7 @@ float AbstractCharacteristic::getSlipstreamMaxCollectTime() const
Log::fatal("AbstractCharacteristic", "Can't get characteristic %s",
getName(SLIPSTREAM_MAX_COLLECT_TIME).c_str());
return result;
} // getSlipstreamMaxCollecTime
} // getSlipstreamMaxCollectTime
// ----------------------------------------------------------------------------
float AbstractCharacteristic::getSlipstreamAddPower() const

View File

@ -312,8 +312,8 @@ public:
float getAnvilSpeedFactor() const;
float getParachuteFriction() const;
int getParachuteDuration() const;
int getParachuteDurationOther() const;
float getParachuteDuration() const;
float getParachuteDurationOther() const;
float getParachuteDurationRankMult() const;
float getParachuteDurationSpeedMult() const;
float getParachuteLboundFraction() const;

View File

@ -723,7 +723,7 @@ float KartProperties::getEngineMaxSpeed() const
float KartProperties::getEngineGenericMaxSpeed() const
{
return m_cached_characteristic->getEngineGenericMaxSpeed();
} // getEngineMaxSpeed
} // getEngineGenericMaxSpeed
// ----------------------------------------------------------------------------
float KartProperties::getEngineBrakeFactor() const
@ -785,6 +785,7 @@ float KartProperties::getCameraForwardUpAngle() const
return m_cached_characteristic->getCameraForwardUpAngle();
} // getCameraForwardUpAngle
// ----------------------------------------------------------------------------
bool KartProperties::getCameraForwardSmoothing() const
{
return m_cached_characteristic->getCameraForwardSmoothing();
@ -839,13 +840,13 @@ float KartProperties::getParachuteFriction() const
} // getParachuteFriction
// ----------------------------------------------------------------------------
int KartProperties::getParachuteDuration() const
float KartProperties::getParachuteDuration() const
{
return m_cached_characteristic->getParachuteDuration();
} // getParachuteDuration
// ----------------------------------------------------------------------------
int KartProperties::getParachuteDurationOther() const
float KartProperties::getParachuteDurationOther() const
{
return m_cached_characteristic->getParachuteDurationOther();
} // getParachuteDurationOther
@ -905,10 +906,9 @@ float KartProperties::getBubblegumTorque() const
} // getBubblegumTorque
// ----------------------------------------------------------------------------
int KartProperties::getBubblegumFadeInTicks() const
float KartProperties::getBubblegumFadeInTime() const
{
return stk_config->time2Ticks(m_cached_characteristic
->getBubblegumFadeInTime());
return m_cached_characteristic->getBubblegumFadeInTime();
} // getBubblegumFadeInTime
// ----------------------------------------------------------------------------
@ -996,10 +996,9 @@ float KartProperties::getPlungerBandSpeedIncrease() const
} // getPlungerBandSpeedIncrease
// ----------------------------------------------------------------------------
int KartProperties::getPlungerBandFadeOutTicks() const
float KartProperties::getPlungerBandFadeOutTime() const
{
return stk_config->time2Ticks(m_cached_characteristic
->getPlungerBandFadeOutTime());
return m_cached_characteristic->getPlungerBandFadeOutTime();
} // getPlungerBandFadeOutTime
// ----------------------------------------------------------------------------
@ -1062,7 +1061,7 @@ float KartProperties::getNitroDuration() const
return m_cached_characteristic->getNitroDuration();
} // getNitroDuration
// ------------------------------------------------------------------------
// ----------------------------------------------------------------------------
float KartProperties::getNitroEngineForce() const
{
return m_cached_characteristic->getNitroEngineForce();
@ -1171,10 +1170,9 @@ float KartProperties::getSlipstreamMaxSpeedIncrease() const
} // getSlipstreamMaxSpeedIncrease
// ----------------------------------------------------------------------------
int KartProperties::getSlipstreamFadeOutTicks() const
float KartProperties::getSlipstreamFadeOutTime() const
{
return stk_config->time2Ticks(m_cached_characteristic
->getSlipstreamFadeOutTime());
return m_cached_characteristic->getSlipstreamFadeOutTime();
} // getSlipstreamFadeOutTime
// ----------------------------------------------------------------------------
@ -1285,5 +1283,6 @@ bool KartProperties::getSkidEnabled() const
return m_cached_characteristic->getSkidEnabled();
} // getSkidEnabled
/* <characteristics-end kpgetter> */

View File

@ -362,7 +362,14 @@ public:
// ------------------------------------------------------------------------
float getAccelerationEfficiency() const;
// ------------------------------------------------------------------------
/** Returns minimum time during which nitro is consumed when pressing nitro
* key, to prevent using nitro in very short bursts
*/
int8_t getNitroMinConsumptionTicks() const
{ return m_nitro_min_consumption; }
// ------------------------------------------------------------------------
bool isAddon() const { return m_is_addon; }
// Script-generated content generated by tools/create_kart_properties.py defs
// Please don't change the following tag. It will be automatically detected
@ -418,8 +425,8 @@ public:
float getAnvilSpeedFactor() const;
float getParachuteFriction() const;
int getParachuteDuration() const;
int getParachuteDurationOther() const;
float getParachuteDuration() const;
float getParachuteDurationOther() const;
float getParachuteDurationRankMult() const;
float getParachuteDurationSpeedMult() const;
float getParachuteLboundFraction() const;
@ -431,7 +438,7 @@ public:
float getBubblegumDuration() const;
float getBubblegumSpeedFraction() const;
float getBubblegumTorque() const;
int getBubblegumFadeInTicks() const;
float getBubblegumFadeInTime() const;
float getBubblegumShieldDuration() const;
float getZipperDuration() const;
@ -449,7 +456,7 @@ public:
float getPlungerBandForce() const;
float getPlungerBandDuration() const;
float getPlungerBandSpeedIncrease() const;
int getPlungerBandFadeOutTicks() const;
float getPlungerBandFadeOutTime() const;
float getPlungerInFaceTime() const;
std::vector<float> getStartupTime() const;
@ -472,6 +479,7 @@ public:
float getNitroMaxSpeedIncrease() const;
float getNitroFadeOutTime() const;
float getNitroMax() const;
float getSlipstreamDurationFactor() const;
float getSlipstreamBaseSpeed() const;
float getSlipstreamLength() const;
@ -482,7 +490,7 @@ public:
float getSlipstreamAddPower() const;
float getSlipstreamMinSpeed() const;
float getSlipstreamMaxSpeedIncrease() const;
int getSlipstreamFadeOutTicks() const;
float getSlipstreamFadeOutTime() const;
float getSkidIncrease() const;
float getSkidDecrease() const;
@ -502,14 +510,6 @@ public:
float getSkidReduceTurnMin() const;
float getSkidReduceTurnMax() const;
bool getSkidEnabled() const;
// ------------------------------------------------------------------------
/** Returns minimum time during which nitro is consumed when pressing nitro
* key, to prevent using nitro in very short bursts
*/
int8_t getNitroMinConsumptionTicks() const
{ return m_nitro_min_consumption; }
// ------------------------------------------------------------------------
bool isAddon() const { return m_is_addon; }
/* <characteristics-end kpdefs> */

View File

@ -30,11 +30,11 @@ import sys
characteristics = """Suspension: stiffness, rest, travel, expSpringResponse(bool), maxForce
Stability: rollInfluence, chassisLinearDamping, chassisAngularDamping, downwardImpulseFactor, trackConnectionAccel, angularFactor(std::vector<float>/floatVector), smoothFlyingImpulse
Turn: radius(InterpolationArray), timeResetSteer, timeFullSteer(InterpolationArray)
Engine: power, maxSpeed, brakeFactor, brakeTimeIncrease, maxSpeedReverseRatio
Engine: power, maxSpeed, genericMaxSpeed, brakeFactor, brakeTimeIncrease, maxSpeedReverseRatio
Gear: switchRatio(std::vector<float>/floatVector), powerIncrease(std::vector<float>/floatVector)
Mass
Wheels: dampingRelaxation, dampingCompression
Camera: distance, forwardUpAngle, backwardUpAngle
Camera: distance, forwardUpAngle, forwardSmoothing(bool), backwardUpAngle
Jump: animationTime
Lean: max, speed
Anvil: duration, weight, speedFactor
@ -47,7 +47,7 @@ Plunger: bandMaxLength, bandForce, bandDuration, bandSpeedIncrease, bandFadeOutT
Startup: time(std::vector<float>/floatVector), boost(std::vector<float>/floatVector)
Rescue: duration, vertOffset, height
Explosion: duration, radius, invulnerabilityTime
Nitro: duration, engineForce, consumption, smallContainer, bigContainer, maxSpeedIncrease, fadeOutTime, max
Nitro: duration, engineForce, engineMult, consumption, smallContainer, bigContainer, maxSpeedIncrease, fadeOutTime, max
Slipstream: durationFactor, baseSpeed, length, width, innerFactor, minCollectTime, maxCollectTime, addPower, minSpeed, maxSpeedIncrease, fadeOutTime
Skid: increase, decrease, max, timeTillMax, visual, visualTime, revertVisualTime, minSpeed, timeTillBonus(std::vector<float>/floatVector), bonusSpeed(std::vector<float>/floatVector), bonusTime(std::vector<float>/floatVector), bonusForce(std::vector<float>/floatVector), physicalJumpTime, graphicalJumpTime, postSkidRotateFactor, reduceTurnMin, reduceTurnMax, enabled(bool)"""