ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add enabled property to skid characteristics

Browse Source
This commit is contained in:
Flakebi 2015-11-21 23:27:00 +01:00
parent b4904b182f
commit 2f1d08edbd
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/kart_characteristics.xml
View File

@ -163,7 +163,7 @@
bonus-force="250 350"
physical-jump-time="0" graphical-jump-time="0.4"
post-skid-rotate-factor="1"
reduce-turn-min="0.2" reduce-turn-max="0.8" />
reduce-turn-min="0.2" reduce-turn-max="0.8" enabled="true" />
<!-- Camera
Distance between kart and camera.

16
src/karts/abstract_characteristic.cpp
View File

@ -262,6 +262,8 @@ AbstractCharacteristic::ValueType AbstractCharacteristic::getType(
return TYPE_FLOAT;
case SKID_REDUCE_TURN_MAX:
return TYPE_FLOAT;
case SKID_ENABLED:
return TYPE_BOOL;
/* <characteristics-end getProp1> */
} // switch (type)
@ -484,6 +486,8 @@ std::string AbstractCharacteristic::getName(CharacteristicType type)
return "SKID_REDUCE_TURN_MIN";
case SKID_REDUCE_TURN_MAX:
return "SKID_REDUCE_TURN_MAX";
case SKID_ENABLED:
return "SKID_ENABLED";
/* <characteristics-end getProp2> */
} // switch (type)
@ -1709,6 +1713,18 @@ float AbstractCharacteristic::getSkidReduceTurnMax() const
return result;
} // getSkidReduceTurnMax
// ----------------------------------------------------------------------------
bool AbstractCharacteristic::getSkidEnabled() const
{
bool result;
bool is_set = false;
process(SKID_ENABLED, &result, &is_set);
if (!is_set)
Log::fatal("AbstractCharacteristic", "Can't get characteristic %s",
getName(SKID_ENABLED).c_str());
return result;
} // getSkidEnabled
/* <characteristics-end getter> */

2
src/karts/abstract_characteristic.hpp
View File

@ -216,6 +216,7 @@ public:
SKID_POST_SKID_ROTATE_FACTOR,
SKID_REDUCE_TURN_MIN,
SKID_REDUCE_TURN_MAX,
SKID_ENABLED,
/* <characteristics-end enum> */
@ -380,6 +381,7 @@ public:
float getSkidPostSkidRotateFactor() const;
float getSkidReduceTurnMin() const;
float getSkidReduceTurnMax() const;
bool getSkidEnabled() const;
/* <characteristics-end defs> */
};

2
src/karts/xml_characteristic.cpp
View File

@ -593,6 +593,8 @@ void XmlCharacteristic::load(const XMLNode *node)
&m_values[SKID_REDUCE_TURN_MIN]);
sub_node->get("reduce-turn-max",
&m_values[SKID_REDUCE_TURN_MAX]);
sub_node->get("enabled",
&m_values[SKID_ENABLED]);
}

2
tools/create_kart_properties.py
View File

@ -48,7 +48,7 @@ Rescue: duration, vertOffset, height
Explosion: duration, radius, invulnerabilityTime
Nitro: duration, engineForce, consumption, smallContainer, bigContainer, maxSpeedIncrease, fadeOutTime, max
Slipstream: duration, length, width, collectTime, useTime, 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"""
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)"""
""" A GroupMember is an attribute of a group.
In the xml files, a value will be assigned to it.