CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: David White <[EMAIL PROTECTED]> 05/03/01 00:26:59
Modified files:
src : actions.cpp
data/units : Dwarvish_Ulfserker.cfg
data/translations: english.cfg
Log message:
changed Ulfserker's attack to 5-4; make 'berserk' ability only active
when on offense
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.192&tr2=1.193&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Ulfserker.cfg.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/translations/english.cfg.diff?tr1=1.175&tr2=1.176&r1=text&r2=text
Patches:
Index: wesnoth/data/translations/english.cfg
diff -u wesnoth/data/translations/english.cfg:1.175
wesnoth/data/translations/english.cfg:1.176
--- wesnoth/data/translations/english.cfg:1.175 Sun Jan 2 13:21:10 2005
+++ wesnoth/data/translations/english.cfg Tue Mar 1 00:26:59 2005
@@ -93,7 +93,7 @@
This attack deals double damage if a friendly unit is on the opposite side of
the target. (This doesn't work with allied units.)"
weapon_special_berserk_description= _ "Berserk:
-Whether used offensively or defensively, this attack presses the engagement
until one of the combatants is slain."
+When used offensively, this attack presses the engagement until one of the
combatants is slain."
weapon_special_charge_description= _ "Charge:
This attack deals double damage to the target. It also causes this unit to
take double damage from the target's counterattack."
Index: wesnoth/data/units/Dwarvish_Ulfserker.cfg
diff -u wesnoth/data/units/Dwarvish_Ulfserker.cfg:1.5
wesnoth/data/units/Dwarvish_Ulfserker.cfg:1.6
--- wesnoth/data/units/Dwarvish_Ulfserker.cfg:1.5 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Dwarvish_Ulfserker.cfg Tue Mar 1 00:26:59 2005
@@ -28,7 +28,7 @@
type=blade
special=berserk
range=short
- damage=4
+ damage=5
number=4
[frame]
begin=-100
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.192 wesnoth/src/actions.cpp:1.193
--- wesnoth/src/actions.cpp:1.192 Fri Feb 25 01:07:19 2005
+++ wesnoth/src/actions.cpp Tue Mar 1 00:26:59 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.192 2005/02/25 01:07:19 ydirson Exp $ */
+/* $Id: actions.cpp,v 1.193 2005/03/01 00:26:59 Sirp Exp $ */
/*
Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -311,9 +311,6 @@
if (counterattack) {
const attack_type& defend = defender_attacks[defend_with];
res.defender_special = defend.special();
- if (res.defender_special == to_the_death_string) {
- res.to_the_death = true;
- }
//magical attacks always have a 70% chance to hit
if (res.defender_special == magical_string) {
