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

Made the plunger-in-face duration configurable and dependent on

Browse Source 
difficulty.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2010-10-18 11:08:22 +00:00
parent 9d5b51e797
commit eae17a7133
4 changed files with 91 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/stk_config.xml
View File

@@ -259,11 +259,12 @@
pushed to the side, hardly anything happens. -->
<collision side-impulse="0"/>
<!-- Kart-specific rubber band handling: max-length is the
maximum length of rubber band before it snaps. force is
<!-- Kart-specific plunger and rubber band handling: max-length is
the maximum length of rubber band before it snaps. force is
the force a plunger/rubber band applies to the kart(s).
duration is the duration a rubber band acts. -->
<rubber-band max-length="50" force="1500" duration="1"/>
<plunger band-max-length="50" band-force="1500" band-duration="1"
in-face-time="5 7 10"/>
<!-- Kart-specific explosion parameters. Height: how high this
this kart is being pushed in the sky by an explosion.

7
src/karts/kart.hpp
View File

@@ -314,8 +314,11 @@ public:
bool hasViewBlockedByPlunger() const
{ return m_view_blocked_by_plunger > 0; }
// ------------------------------------------------------------------------
/** Sets that the view is blocked by a plunger. */
void blockViewWithPlunger() { m_view_blocked_by_plunger = 10;}
/** Sets that the view is blocked by a plunger. The duration depends on
* the difficulty, see KartPorperties getPlungerInFaceTime. */
void blockViewWithPlunger()
{ m_view_blocked_by_plunger =
m_kart_properties->getPlungerInFaceTime();}
// -------------------------------------------------------------------------
/** Returns a bullet transform object located at the kart's position
and oriented in the direction the kart is going. Can be useful

136
src/karts/kart_properties.cpp
View File

@@ -73,7 +73,9 @@ KartProperties::KartProperties(const std::string &filename)
m_track_connection_accel = m_min_speed_turn = m_angle_at_min =
m_max_speed_turn = m_angle_at_max =
m_rubber_band_max_length = m_rubber_band_force =
m_rubber_band_duration = m_time_till_max_skid =
m_rubber_band_duration = m_plunger_in_face_duration[0] =
m_plunger_in_face_duration[1] = m_plunger_in_face_duration[2] =
m_time_till_max_skid =
m_skid_decrease = m_skid_increase = m_skid_visual = m_skid_max =
m_slipstream_length = m_slipstream_collect_time =
m_slipstream_use_time = m_slipstream_add_power =
@@ -387,11 +389,20 @@ void KartProperties::getAllData(const XMLNode * root)
//TODO: wheel front right and wheel front left is not loaded, yet is listed as an attribute in the xml file after wheel-radius
//TODO: same goes for their rear equivalents
if(const XMLNode *rubber_band_node= root->getNode("rubber-band"))
if(const XMLNode *plunger_node= root->getNode("plunger"))
{
rubber_band_node->get("max-length", &m_rubber_band_max_length);
rubber_band_node->get("force", &m_rubber_band_force );
rubber_band_node->get("duration", &m_rubber_band_duration );
plunger_node->get("band-max-length", &m_rubber_band_max_length );
plunger_node->get("band-force", &m_rubber_band_force );
plunger_node->get("band-duration", &m_rubber_band_duration );
std::vector<float> v;
plunger_node->get("in-face-time", &v);
if(v.size()!=3)
{
printf("Invalid plunger in-face-time specification.");
}
m_plunger_in_face_duration[0] = v[0];
m_plunger_in_face_duration[1] = v[1];
m_plunger_in_face_duration[2] = v[2];
}
if(const XMLNode *camera_node= root->getNode("camera"))
@@ -480,62 +491,65 @@ void KartProperties::checkAllSet(const std::string &filename)
strA,filename.c_str());exit(-1); \
}
CHECK_NEG(m_mass, "mass" );
CHECK_NEG(m_min_speed_turn, "turn min-speed-angle" );
CHECK_NEG(m_min_radius, "turn min-speed-angle" );
CHECK_NEG(m_max_speed_turn, "turn max-speed-angle" );
CHECK_NEG(m_max_radius, "turn max-speed-angle" );
CHECK_NEG(m_time_full_steer, "turn time-full-steer" );
CHECK_NEG(m_time_full_steer_ai, "turn time-full-steer-ai" );
CHECK_NEG(m_wheel_damping_relaxation, "wheels damping-relaxation" );
CHECK_NEG(m_wheel_damping_compression, "wheels damping-compression" );
CHECK_NEG(m_wheel_radius, "wheels radius" );
CHECK_NEG(m_friction_slip, "friction slip" );
CHECK_NEG(m_roll_influence, "stability roll-influence" );
CHECK_NEG(m_chassis_linear_damping, "stability chassis-linear-damping");
CHECK_NEG(m_chassis_angular_damping, "stability chassis-angular-damping");
CHECK_NEG(m_engine_power[0], "engine power[0]" );
CHECK_NEG(m_engine_power[1], "engine power[1]" );
CHECK_NEG(m_engine_power[2], "engine power[2]" );
CHECK_NEG(m_max_speed[0], "engine maximum-speed[0]" );
CHECK_NEG(m_max_speed[1], "engine maximum-speed[1]" );
CHECK_NEG(m_max_speed[2], "engine maximum-speed[2]" );
CHECK_NEG(m_max_speed_reverse_ratio, "engine max-speed-reverse-ratio");
CHECK_NEG(m_brake_factor, "engine brake-factor" );
CHECK_NEG(m_suspension_stiffness, "suspension stiffness" );
CHECK_NEG(m_suspension_rest, "suspension rest" );
CHECK_NEG(m_suspension_travel_cm, "suspension travel-cm" );
CHECK_NEG(m_collision_side_impulse, "collision side-impulse" );
CHECK_NEG(m_jump_velocity, "jump velocity" );
CHECK_NEG(m_upright_tolerance, "upright tolerance" );
CHECK_NEG(m_upright_max_force, "upright max-force" );
CHECK_NEG(m_track_connection_accel, "track-connection-accel" );
CHECK_NEG(m_rubber_band_max_length, "rubber-band max-length" );
CHECK_NEG(m_rubber_band_force, "rubber-band force" );
CHECK_NEG(m_rubber_band_duration, "rubber-band duration" );
CHECK_NEG(m_skid_decrease, "skid decrease" );
CHECK_NEG(m_time_till_max_skid, "skid time-till-max" );
CHECK_NEG(m_skid_increase, "skid increase" );
CHECK_NEG(m_skid_max, "skid max" );
CHECK_NEG(m_skid_visual, "skid visual" );
CHECK_NEG(m_slipstream_length, "slipstream length" );
CHECK_NEG(m_slipstream_collect_time, "slipstream collect-time" );
CHECK_NEG(m_slipstream_use_time, "slipstream use-time" );
CHECK_NEG(m_slipstream_add_power, "slipstream add-power" );
CHECK_NEG(m_slipstream_min_speed, "slipstream min-speed" );
CHECK_NEG(m_camera_distance, "camera distance" );
CHECK_NEG(m_camera_forward_up_angle, "camera forward-up-angle" );
CHECK_NEG(m_camera_backward_up_angle, "camera forward-up-angle" );
CHECK_NEG(m_nitro_power_boost, "nitro power-boost" );
CHECK_NEG(m_nitro_consumption, "nitro consumption" );
CHECK_NEG(m_nitro_big_container, "nitro big-container" );
CHECK_NEG(m_nitro_small_container, "nitro small-container" );
CHECK_NEG(m_rescue_height, "rescue height" );
CHECK_NEG(m_rescue_time, "rescue time" );
CHECK_NEG(m_rescue_vert_offset, "rescue vert-offset" );
CHECK_NEG(m_explosion_time, "explosion time" );
CHECK_NEG(m_explosion_radius, "explosion radius" );
CHECK_NEG(m_ai_steering_variation, "ai steering-variation" );
CHECK_NEG(m_mass, "mass" );
CHECK_NEG(m_min_speed_turn, "turn min-speed-angle" );
CHECK_NEG(m_min_radius, "turn min-speed-angle" );
CHECK_NEG(m_max_speed_turn, "turn max-speed-angle" );
CHECK_NEG(m_max_radius, "turn max-speed-angle" );
CHECK_NEG(m_time_full_steer, "turn time-full-steer" );
CHECK_NEG(m_time_full_steer_ai, "turn time-full-steer-ai" );
CHECK_NEG(m_wheel_damping_relaxation, "wheels damping-relaxation" );
CHECK_NEG(m_wheel_damping_compression, "wheels damping-compression" );
CHECK_NEG(m_wheel_radius, "wheels radius" );
CHECK_NEG(m_friction_slip, "friction slip" );
CHECK_NEG(m_roll_influence, "stability roll-influence" );
CHECK_NEG(m_chassis_linear_damping, "stability chassis-linear-damping");
CHECK_NEG(m_chassis_angular_damping, "stability chassis-angular-damping");
CHECK_NEG(m_engine_power[0], "engine power[0]" );
CHECK_NEG(m_engine_power[1], "engine power[1]" );
CHECK_NEG(m_engine_power[2], "engine power[2]" );
CHECK_NEG(m_max_speed[0], "engine maximum-speed[0]" );
CHECK_NEG(m_max_speed[1], "engine maximum-speed[1]" );
CHECK_NEG(m_max_speed[2], "engine maximum-speed[2]" );
CHECK_NEG(m_max_speed_reverse_ratio, "engine max-speed-reverse-ratio");
CHECK_NEG(m_brake_factor, "engine brake-factor" );
CHECK_NEG(m_suspension_stiffness, "suspension stiffness" );
CHECK_NEG(m_suspension_rest, "suspension rest" );
CHECK_NEG(m_suspension_travel_cm, "suspension travel-cm" );
CHECK_NEG(m_collision_side_impulse, "collision side-impulse" );
CHECK_NEG(m_jump_velocity, "jump velocity" );
CHECK_NEG(m_upright_tolerance, "upright tolerance" );
CHECK_NEG(m_upright_max_force, "upright max-force" );
CHECK_NEG(m_track_connection_accel, "track-connection-accel" );
CHECK_NEG(m_rubber_band_max_length, "rubber-band max-length" );
CHECK_NEG(m_plunger_in_face_duration[0],"plunger: in-face-time[0]" );
CHECK_NEG(m_plunger_in_face_duration[1],"plunger: in-face-time[1]" );
CHECK_NEG(m_plunger_in_face_duration[2],"plunger: in-face-time[2]" );
CHECK_NEG(m_rubber_band_force, "rubber-band force" );
CHECK_NEG(m_rubber_band_duration, "rubber-band duration" );
CHECK_NEG(m_skid_decrease, "skid decrease" );
CHECK_NEG(m_time_till_max_skid, "skid time-till-max" );
CHECK_NEG(m_skid_increase, "skid increase" );
CHECK_NEG(m_skid_max, "skid max" );
CHECK_NEG(m_skid_visual, "skid visual" );
CHECK_NEG(m_slipstream_length, "slipstream length" );
CHECK_NEG(m_slipstream_collect_time, "slipstream collect-time" );
CHECK_NEG(m_slipstream_use_time, "slipstream use-time" );
CHECK_NEG(m_slipstream_add_power, "slipstream add-power" );
CHECK_NEG(m_slipstream_min_speed, "slipstream min-speed" );
CHECK_NEG(m_camera_distance, "camera distance" );
CHECK_NEG(m_camera_forward_up_angle, "camera forward-up-angle" );
CHECK_NEG(m_camera_backward_up_angle, "camera forward-up-angle" );
CHECK_NEG(m_nitro_power_boost, "nitro power-boost" );
CHECK_NEG(m_nitro_consumption, "nitro consumption" );
CHECK_NEG(m_nitro_big_container, "nitro big-container" );
CHECK_NEG(m_nitro_small_container, "nitro small-container" );
CHECK_NEG(m_rescue_height, "rescue height" );
CHECK_NEG(m_rescue_time, "rescue time" );
CHECK_NEG(m_rescue_vert_offset, "rescue vert-offset" );
CHECK_NEG(m_explosion_time, "explosion time" );
CHECK_NEG(m_explosion_radius, "explosion radius" );
CHECK_NEG(m_ai_steering_variation, "ai steering-variation" );
} // checkAllSet

8
src/karts/kart_properties.hpp
View File

@@ -141,6 +141,8 @@ private:
float m_rubber_band_max_length;/**< Max. length of plunger rubber band.*/
float m_rubber_band_force; /**< Force of an attached rubber band.*/
float m_rubber_band_duration;/**< Duration a rubber band works. */
float m_plunger_in_face_duration[3]; /**< Duration of plunger in face
depending on difficulty.*/
float m_wheel_base; /**< Wheel base of the kart. */
float m_nitro_power_boost; /**< Nitro power boost. */
float m_nitro_consumption; /**< Nitro consumption. */
@@ -280,7 +282,7 @@ public:
getGroups () const {return m_groups; }
/** Returns the mass of this kart. */
float getMass () const {return m_mass; }
/** Returns the maximum engine power. */
/** Returns the maximum engine power depending on difficulty. */
float getMaxPower () const {return m_engine_power[race_manager->getDifficulty()];}
/** Returns the time the kart needs to fully steer in one direction from
@@ -398,6 +400,10 @@ public:
/** Returns the duration a rubber band is active for. */
float getRubberBandDuration () const {return m_rubber_band_duration; }
/** Returns duration of a plunger in your face. */
float getPlungerInFaceTime () const
{return m_plunger_in_face_duration[race_manager->getDifficulty()];}
/** Returns additional rotation of 3d model when skidding. */
float getSkidVisual () const {return m_skid_visual; }