Skip to content

Commit

Permalink
Remove experimental recruitment
Browse files Browse the repository at this point in the history
  • Loading branch information
@CelticMinstrel
CelticMinstrel committed Mar 24, 2016
1 parent d7205d4 commit ab443bc
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 1,324 deletions.
29 changes: 0 additions & 29 deletions data/ai/dev/testing_recruiting.cfg
View file

This file was deleted.

2 changes: 0 additions & 2 deletions projectfiles/CodeBlocks/wesnoth.cbp
View file
Expand Up @@ -195,8 +195,6 @@
<Unit filename="../../src/ai/testing.hpp" />
<Unit filename="../../src/ai/testing/ca_testing_move_to_targets.cpp" />
<Unit filename="../../src/ai/testing/ca_testing_move_to_targets.hpp" />
<Unit filename="../../src/ai/testing/ca_testing_recruitment.cpp" />
<Unit filename="../../src/ai/testing/ca_testing_recruitment.hpp" />
<Unit filename="../../src/ai/testing/stage_sf_with_rca.cpp" />
<Unit filename="../../src/ai/testing/stage_sf_with_rca.hpp" />
<Unit filename="../../src/animated.hpp" />
Expand Down
56 changes: 0 additions & 56 deletions projectfiles/VC9/wesnoth.vcproj
View file
Expand Up @@ -2291,62 +2291,6 @@
RelativePath="..\..\src\ai\testing\ca_testing_move_to_targets.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\testing\ca_testing_recruitment.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_with_VLD|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
<FileConfiguration
Name="Test_Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseDEBUG|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\ai\testing\"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\ai\testing\ca_testing_recruitment.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\testing\stage_sf_with_rca.cpp"
>
Expand Down
8 changes: 0 additions & 8 deletions projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
View file
Expand Up @@ -722,8 +722,6 @@
B5BB6EFE0F93B83500444FBF /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = B5BB6EFD0F93B83500444FBF /* SDLMain.nib */; };
B5CE46F912A0417D00D665EE /* side_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CE46F712A0417D00D665EE /* side_filter.cpp */; };
B5CE46FA12A0417D00D665EE /* side_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CE46F712A0417D00D665EE /* side_filter.cpp */; };
B5CE46FD12A041CE00D665EE /* ca_testing_recruitment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CE46FB12A041CE00D665EE /* ca_testing_recruitment.cpp */; };
B5CE46FE12A041CE00D665EE /* ca_testing_recruitment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CE46FB12A041CE00D665EE /* ca_testing_recruitment.cpp */; };
B5CE470512A041EF00D665EE /* campaign_difficulty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CE46FF12A041EF00D665EE /* campaign_difficulty.cpp */; };
B5CE470612A041EF00D665EE /* edit_label.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CE470112A041EF00D665EE /* edit_label.cpp */; };
B5CE470712A041EF00D665EE /* simple_item_selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CE470312A041EF00D665EE /* simple_item_selector.cpp */; };
Expand Down Expand Up @@ -2005,8 +2003,6 @@
B5BB6EFD0F93B83500444FBF /* SDLMain.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SDLMain.nib; path = Resources/SDLMain.nib; sourceTree = "<group>"; };
B5CE46F712A0417D00D665EE /* side_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = side_filter.cpp; sourceTree = "<group>"; };
B5CE46F812A0417D00D665EE /* side_filter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = side_filter.hpp; sourceTree = "<group>"; };
B5CE46FB12A041CE00D665EE /* ca_testing_recruitment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ca_testing_recruitment.cpp; sourceTree = "<group>"; };
B5CE46FC12A041CE00D665EE /* ca_testing_recruitment.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ca_testing_recruitment.hpp; sourceTree = "<group>"; };
B5CE46FF12A041EF00D665EE /* campaign_difficulty.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = campaign_difficulty.cpp; sourceTree = "<group>"; };
B5CE470012A041EF00D665EE /* campaign_difficulty.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = campaign_difficulty.hpp; sourceTree = "<group>"; };
B5CE470112A041EF00D665EE /* edit_label.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = edit_label.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3520,8 +3516,6 @@
children = (
B552D92A108694BB002D8F86 /* ca_testing_move_to_targets.cpp */,
B552D92B108694BB002D8F86 /* ca_testing_move_to_targets.hpp */,
B5CE46FB12A041CE00D665EE /* ca_testing_recruitment.cpp */,
B5CE46FC12A041CE00D665EE /* ca_testing_recruitment.hpp */,
EC4E3B1E19B2D8480049CBD7 /* stage_sf_with_rca.cpp */,
EC4E3B1F19B2D8480049CBD7 /* stage_sf_with_rca.hpp */,
);
Expand Down Expand Up @@ -4351,7 +4345,6 @@
B5599AD40EC62181008DD061 /* button.cpp in Sources */,
B5A9BD5B0ECA805A002BE442 /* button.cpp in Sources */,
B552D92D108694BB002D8F86 /* ca_testing_move_to_targets.cpp in Sources */,
B5CE46FD12A041CE00D665EE /* ca_testing_recruitment.cpp in Sources */,
B54AC6E60FEA9EB5006F6FBD /* ca.cpp in Sources */,
B5599B810EC62181008DD061 /* callable_objects.cpp in Sources */,
B5951A9B1013BB5A00C10B66 /* callable_objects.cpp in Sources */,
Expand Down Expand Up @@ -4872,7 +4865,6 @@
B597C5690FACD6CA00CE81F5 /* button.cpp in Sources */,
B597C65A0FACDDE800CE81F5 /* button.cpp in Sources */,
B552D92F108694BB002D8F86 /* ca_testing_move_to_targets.cpp in Sources */,
B5CE46FE12A041CE00D665EE /* ca_testing_recruitment.cpp in Sources */,
B54AC6D50FEA9EB5006F6FBD /* ca.cpp in Sources */,
B597C5310FACD6CA00CE81F5 /* callable_objects.cpp in Sources */,
B5951A9D1013BB5A00C10B66 /* callable_objects.cpp in Sources */,
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
View file
Expand Up @@ -720,7 +720,6 @@ set(wesnoth-main_SRC
ai/simulated_actions.cpp
ai/testing.cpp
ai/testing/ca_testing_move_to_targets.cpp
ai/testing/ca_testing_recruitment.cpp
ai/testing/stage_sf_with_rca.cpp
animated_game.cpp
attack_prediction.cpp
Expand Down
1 change: 0 additions & 1 deletion src/SConscript
View file
Expand Up @@ -245,7 +245,6 @@ wesnoth_sources = Split("""
ai/simulated_actions.cpp
ai/testing.cpp
ai/testing/ca_testing_move_to_targets.cpp
ai/testing/ca_testing_recruitment.cpp
ai/testing/stage_sf_with_rca.cpp
animated_game.cpp
attack_prediction.cpp
Expand Down
7 changes: 0 additions & 7 deletions src/ai/registry.cpp
View file
Expand Up @@ -37,7 +37,6 @@
#include "ai/default/aspect_attacks.hpp" // for aspect_attacks
#include "ai/default/ca.hpp" // for leader_shares_keep_phase, etc
#include "ai/testing/ca_testing_move_to_targets.hpp"
#include "ai/testing/ca_testing_recruitment.hpp"
#include "ai/testing/stage_sf_with_rca.hpp"
#include "ai/default/stage_rca.hpp"

Expand Down Expand Up @@ -111,9 +110,6 @@ static register_candidate_action_factory<testing_ai_default::testing_move_to_tar
static register_candidate_action_factory<ai_default_rca::leader_control_phase>
leader_control_phase_factory("ai_default_rca::leader_control_phase");

static register_candidate_action_factory<testing_ai_default::testing_recruitment_phase>
testing_recruitment_phase_factory("ai_default_rca::testing_recruitment_phase");

static register_candidate_action_factory<ai_default_rca::leader_shares_keep_phase>
leader_shares_keep_phase_factory("ai_default_rca::leader_shares_keep_phase");

Expand Down Expand Up @@ -158,9 +154,6 @@ static register_candidate_action_factory<testing_ai_default::testing_move_to_tar
static register_candidate_action_factory<ai_default_rca::leader_control_phase>
old_leader_control_phase_factory("testing_ai_default::leader_control_phase");

static register_candidate_action_factory<testing_ai_default::testing_recruitment_phase>
old_testing_recruitment_phase_factory("testing_ai_default::testing_recruitment_phase");

static register_candidate_action_factory<ai_default_rca::leader_shares_keep_phase>
old_passive_leader_shares_keep_phase_factory("testing_ai_default::passive_leader_shares_keep_phase");

Expand Down

0 comments on commit ab443bc

Please sign in to comment.