Author: esr
Date: Wed Nov 26 22:51:30 2008
New Revision: 31102
URL: http://svn.gna.org/viewcvs/wesnoth?rev=31102&view=rev
Log:
Clean up some more ecruitment-payttern glitches.
This involved cvhanging some unit types that looked mis-assigned to me;
Troll Rocklobber from fighter to mixed fighter, and Dwarvish Explorer
from mixed fighter to scout.
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg
trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
trunk/data/campaigns/Under_the_Burning_Suns/units/Dwarvish_Explorer.cfg
trunk/data/core/units/trolls/Rocklobber.cfg
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
Wed Nov 26 22:51:30 2008
@@ -77,7 +77,11 @@
[ai]
{NO_SCOUTS}
+#ifdef EASY
recruitment_pattern=fighter
+#else
+ recruitment_pattern=fighter,fighter,mixed fighter
+#endif
aggression=0.75
[target]
race=elf
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
Wed Nov 26 22:51:30 2008
@@ -55,7 +55,11 @@
[ai]
{NO_SCOUTS}
recruitment_ignore_bad_movement=yes
+#ifdef EASY
recruitment_pattern=fighter
+#else
+ recruitment_pattern=fighter,fighter,mixed fighter
+#endif
aggression=0.75
[/ai]
[ai]
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg Wed
Nov 26 22:51:30 2008
@@ -158,7 +158,11 @@
[ai]
{NO_SCOUTS}
recruitment_ignore_bad_movement=yes
+#ifdef EASY
recruitment_pattern=fighter
+#else
+ recruitment_pattern=fighter,fighter,mixed fighter
+#endif
grouping=no
{ATTACK_DEPTH 4 5 6}
[/ai]
Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg Wed Nov
26 22:51:30 2008
@@ -345,7 +345,7 @@
village_value=0.0
leader_value=50.0
villages_per_scout=0.0
- recruitment_pattern=fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
[target]
id=Tallin
@@ -375,7 +375,7 @@
village_value=0.0
leader_value=50.0
villages_per_scout=0.0
- recruitment_pattern=fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
[target]
id=Tallin
@@ -405,7 +405,7 @@
village_value=0.0
leader_value=50.0
villages_per_scout=0.0
- recruitment_pattern=fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
[target]
id=Tallin
@@ -436,7 +436,7 @@
village_value=0.0
leader_value=50.0
villages_per_scout=0.0
- recruitment_pattern=fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
[target]
id=Tallin
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
Wed Nov 26 22:51:30 2008
@@ -803,7 +803,7 @@
[ai]
leader_value=2
village_value=0.2
- recruitment_pattern=fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
[target]
side=1
Modified:
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
--- trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg
(original)
+++ trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg
Wed Nov 26 22:51:30 2008
@@ -46,7 +46,11 @@
canrecruit=yes
[ai]
passive_leader=yes
+#ifndef HARD
recruitment_pattern=fighter
+#else
+ recruitment_pattern=fighter,fighter,mixed fighter
+#endif
recruitment_ignore_bad_movement=yes
grouping=defensive
{QUANTITY aggression 0.3 0.4 0.5}
Modified: trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
--- trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
(original)
+++ trunk/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg Wed
Nov 26 22:51:30 2008
@@ -128,7 +128,7 @@
[ai]
{NO_SCOUTS}
recruitment_ignore_bad_movement=yes
- recruitment_pattern=fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
grouping=no
{ATTACK_DEPTH 5 5 6}
[/ai]
Modified: trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/07a_Into_The_Depths.cfg Wed
Nov 26 22:51:30 2008
@@ -146,7 +146,11 @@
canrecruit=yes
[ai]
+#ifdef EASY
+ recruitment_pattern=fighter,fighter,mixed fighter
+#else
recruitment_pattern=fighter
+#endif
aggression=0.1
caution=0.9
[avoid]
@@ -184,7 +188,7 @@
share_view=yes
[ai]
- recruitment_pattern=fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
aggression=0.9
caution=0.5
village_value=0.0
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
Wed Nov 26 22:51:30 2008
@@ -46,31 +46,9 @@
team_name=troll
user_team_name=_"Trolls"
-#ifdef EASY
recruit=Troll Whelp, Troll, Troll Rocklobber
-#endif
-
-#ifdef NORMAL
- recruit=Troll Whelp, Troll, Troll Rocklobber
-#endif
-
-#ifdef HARD
- recruit=Troll Whelp, Troll, Troll Rocklobber
-#endif
-
[ai]
-#ifdef EASY
- recruitment_pattern=fighter,archer,fighter,mixed fighter
-#endif
-
-#ifdef NORMAL
- recruitment_pattern=fighter,archer,fighter,mixed fighter
-#endif
-
-#ifdef HARD
- recruitment_pattern=fighter,archer,fighter,mixed fighter
-#endif
-
+ recruitment_pattern=fighter,fighter,mixed fighter
aggression=0.8
caution=0.05
grouping=offensive
@@ -128,15 +106,15 @@
[ai]
#ifdef EASY
- recruitment_pattern=fighter,archer,fighter,mixed fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
#endif
#ifdef NORMAL
- recruitment_pattern=fighter,archer,fighter,mixed fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
#endif
#ifdef HARD
- recruitment_pattern=fighter,archer,fighter,mixed fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
#endif
# AI will attack a weak unit with a max of 3,4,5 units
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
Wed Nov 26 22:51:30 2008
@@ -77,15 +77,15 @@
[ai]
#ifdef EASY
- recruitment_pattern=fighter,archer,fighter,mixed fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
#endif
#ifdef NORMAL
- recruitment_pattern=fighter,archer,fighter,mixed fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
#endif
#ifdef HARD
- recruitment_pattern=fighter,archer,fighter,mixed fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
#endif
# AI will attack a weak unit with a max of 3,4,5 units
@@ -122,7 +122,7 @@
#endif
[ai]
- recruitment_pattern=fighter,archer,fighter,mixed fighter
+ recruitment_pattern=fighter,fighter,mixed fighter
# AI will attack a weak unit with a max of 3,4,5 units
# depending on the difficulty (default=5)
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/units/Dwarvish_Explorer.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/units/Dwarvish_Explorer.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/units/Dwarvish_Explorer.cfg
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/units/Dwarvish_Explorer.cfg Wed
Nov 26 22:51:30 2008
@@ -7,7 +7,6 @@
{DEFENSE_ANIM "units/dwarves/explorer-defend.png"
units/dwarves/explorer.png {SOUND_LIST:DWARF_HIT} }
hitpoints=60
movement_type=dwarvishfoot
- #keep dwarves from racing across lava
[movement_costs]
frozen=3
[/movement_costs]
@@ -23,8 +22,8 @@
pierce=70
impact=70
[/resistance]
- usage=mixed fighter
- description= _ "Dwarven Explorers often travel alone through unknown
lands, slaying enemies and scouting out new deposits of ore and other precious
minerals. They are strong enough to wear thicker armor, giving them added
protection against physical attacks. They are the powerful fighters, second
only to the Dwarven lords, and their amazing maneuverability makes them
dangerous indeed."
+ usage=scout
+ description= _ "Dwarven Explorers often travel alone through unknown
lands, slaying enemies and scouting out new deposits of ore and other precious
minerals. They are strong enough to wear thicker armor, giving them added
protection against physical attacks. They are powerful fighters, second only to
the Dwarven lords, and their amazing maneuverability makes them dangerous
indeed."
die_sound={SOUND_LIST:DWARF_DIE}
#weakened from 12 damage to 10 damage
[attack]
Modified: trunk/data/core/units/trolls/Rocklobber.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/trolls/Rocklobber.cfg?rev=31102&r1=31101&r2=31102&view=diff
==============================================================================
--- trunk/data/core/units/trolls/Rocklobber.cfg (original)
+++ trunk/data/core/units/trolls/Rocklobber.cfg Wed Nov 26 22:51:30 2008
@@ -16,7 +16,7 @@
{AMLA_DEFAULT}
undead_variation=troll
cost=29
- usage=fighter
+ usage=mixed fighter
description= _ "The thought of throwing a boulder in combat has certainly
occurred to many trolls, and some have taken to them as a weapon of choice.
Because such stones are not always easy to find, Rocklobbers have taken to
carrying them in sacks slung over their shoulders. The same leather out of
which the sack is formed is easily adapted to a crude
sling."+{SPECIAL_NOTES}+{SPECIAL_NOTES_REGENERATES}
die_sound={SOUND_LIST:TROLL_DIE}
[abilities]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
