From e7c78eb816d271532dcd2ca991851092f1f39459 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 17 Jan 2025 02:12:24 +0900 Subject: [PATCH] =?UTF-8?q?Kick=E3=82=B9=E3=82=AD=E3=83=AB=E7=94=A8?= =?UTF-8?q?=E3=81=AE=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E5=90=8D?= =?UTF-8?q?=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crane_robot_skills/src/attacker.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crane_robot_skills/src/attacker.cpp b/crane_robot_skills/src/attacker.cpp index 8ed7430b..7313597a 100644 --- a/crane_robot_skills/src/attacker.cpp +++ b/crane_robot_skills/src/attacker.cpp @@ -77,13 +77,13 @@ Attacker::Attacker(RobotCommandWrapperBase::SharedPtr & base) } } if (chip_kick) { - kick_skill.setParameter("kick_with_chip", true); + kick_skill.setParameter("chip_kick", true); kick_skill.setParameter("kick_power", 0.9); kick_skill.setParameter("with_dribble", true); kick_skill.setParameter("dribble_power", 0.7); } else { kick_skill.setParameter("kick_power", 0.2); - kick_skill.setParameter("kick_with_chip", false); + kick_skill.setParameter("chip_kick", false); kick_skill.setParameter("dribble_power", 0.0); } kick_skill.run(); @@ -196,7 +196,7 @@ Attacker::Attacker(RobotCommandWrapperBase::SharedPtr & base) kick_skill.setParameter("target", world_model()->getTheirGoalCenter()); kick_skill.setParameter("kick_power", 0.8); kick_skill.setParameter("dot_threshold", 0.9); - kick_skill.setParameter("kick_with_chip", true); + kick_skill.setParameter("chip_kick", true); return kick_skill.run(); }); @@ -278,7 +278,7 @@ Attacker::Attacker(RobotCommandWrapperBase::SharedPtr & base) auto [nearest_enemy, enemy_distance] = world_model()->getNearestRobotWithDistanceFromSegment( ball_to_target, world_model()->theirs.getAvailableRobots()); if (nearest_enemy->getDistance(world_model()->ball.pos) < 2.0) { - kick_skill.setParameter("kick_with_chip", true); + kick_skill.setParameter("chip_kick", true); } } kick_skill.setParameter("kick_power", 0.4); @@ -324,7 +324,7 @@ Attacker::Attacker(RobotCommandWrapperBase::SharedPtr & base) kick_skill.setParameter("target", world_model()->getTheirGoalCenter()); kick_skill.setParameter("kick_power", 0.8); kick_skill.setParameter("dot_threshold", 0.95); - kick_skill.setParameter("kick_with_chip", true); + kick_skill.setParameter("chip_kick", true); command.disableBallAvoidance(); return kick_skill.run(); }); @@ -376,7 +376,7 @@ Attacker::Attacker(RobotCommandWrapperBase::SharedPtr & base) kick_skill.setParameter("target", world_model()->getTheirGoalCenter()); kick_skill.setParameter("kick_power", 0.9); // kick_skill.setParameter("dot_threshold", 0.95); - kick_skill.setParameter("kick_with_chip", false); + kick_skill.setParameter("chip_kick", false); return kick_skill.run(); });