[ogs-changes] dist/c++/ogs/cclasses Barbarian.h,1.3,1.4 Bard.h,1.5,1.6 Cleric.h,1.5,1.6 Druid.h,1.5,
Status: Alpha
Brought to you by:
elemings
Menu
▾
▴
[ogs-changes] dist/c++/ogs/cclasses Barbarian.h,1.3,1.4 Bard.h,1.5,1.6 Cleric.h,1.5,1.6 Druid.h,1.5,1.6 Fighter.h,1.8,1.9 Makefile.am,1.3,1.4 Monk.h,1.4,1.5 Paladin.cpp,1.7,1.8 Paladin.h,1.5,1.6 Ranger.h,1.5,1.6 Rogue.h,1.3,1.4 Sorcerer.h,1.5,1.6 Wizard.h,1.5,1.6 Commoner.h,1.2,NONE
|
From: <ele...@us...> - 2003-05-02 19:07:03
|
Update of /cvsroot/ogs/dist/c++/ogs/cclasses
In directory sc8-pr-cvs1:/tmp/cvs-serv32451/ogs/cclasses
Modified Files:
Barbarian.h Bard.h Cleric.h Druid.h Fighter.h Makefile.am
Monk.h Paladin.cpp Paladin.h Ranger.h Rogue.h Sorcerer.h
Wizard.h
Removed Files:
Commoner.h
Log Message:
See C++ ChangeLog (May 2) for details.
Index: Barbarian.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Barbarian.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Barbarian.h 13 Apr 2003 05:24:49 -0000 1.3
--- Barbarian.h 2 May 2003 19:06:29 -0000 1.4
***************
*** 26,29 ****
--- 26,30 ----
# define OGS_CCLASSES_BARBARIAN_H
+ # include <ogs/core/Attack.h>
# include <ogs/core/CClass.h>
# include <ogs/core/Die.h>
***************
*** 81,85 ****
inline Barbarian::Barbarian (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::XP::getStrongAttack (xpLevel),
ogs::core::Saves::getStrongBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
--- 82,86 ----
inline Barbarian::Barbarian (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::Attack::getStrongBonus (xpLevel),
ogs::core::Saves::getStrongBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
***************
*** 96,100 ****
inline ogs::core::Modifier::Value
Barbarian::getBaseAttackValue () const {
! return (ogs::core::XP::getStrongAttack (getLevel ()));
}
--- 97,101 ----
inline ogs::core::Modifier::Value
Barbarian::getBaseAttackValue () const {
! return (ogs::core::Attack::getStrongBonus (getLevel ()));
}
Index: Bard.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Bard.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Bard.h 18 Apr 2003 01:41:00 -0000 1.5
--- Bard.h 2 May 2003 19:06:29 -0000 1.6
***************
*** 28,31 ****
--- 28,32 ----
# include <vector>
+ # include <ogs/core/Attack.h>
# include <ogs/core/CClass.h>
# include <ogs/core/Die.h>
***************
*** 87,91 ****
inline Bard::Bard (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::XP::getAverageAttack (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getStrongBonus (xpLevel),
--- 88,92 ----
inline Bard::Bard (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::Attack::getAverageBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getStrongBonus (xpLevel),
Index: Cleric.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Cleric.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Cleric.h 18 Apr 2003 01:41:00 -0000 1.5
--- Cleric.h 2 May 2003 19:06:29 -0000 1.6
***************
*** 28,31 ****
--- 28,32 ----
# include <vector>
+ # include <ogs/core/Attack.h>
# include <ogs/core/CClass.h>
# include <ogs/core/Die.h>
***************
*** 86,90 ****
inline Cleric::Cleric (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::XP::getAverageAttack (xpLevel),
ogs::core::Saves::getStrongBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
--- 87,91 ----
inline Cleric::Cleric (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::Attack::getAverageBonus (xpLevel),
ogs::core::Saves::getStrongBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
Index: Druid.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Druid.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Druid.h 18 Apr 2003 01:41:00 -0000 1.5
--- Druid.h 2 May 2003 19:06:29 -0000 1.6
***************
*** 28,31 ****
--- 28,32 ----
# include <vector>
+ # include <ogs/core/Attack.h>
# include <ogs/core/CClass.h>
# include <ogs/core/Die.h>
***************
*** 88,92 ****
inline Druid::Druid (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::XP::getAverageAttack (xpLevel),
ogs::core::Saves::getStrongBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
--- 89,93 ----
inline Druid::Druid (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::Attack::getAverageBonus (xpLevel),
ogs::core::Saves::getStrongBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
Index: Fighter.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Fighter.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Fighter.h 13 Apr 2003 05:24:49 -0000 1.8
--- Fighter.h 2 May 2003 19:06:29 -0000 1.9
***************
*** 26,29 ****
--- 26,30 ----
# define OGS_CCLASSES_FIGHTER_H
+ # include <ogs/core/Attack.h>
# include <ogs/core/CClass.h>
# include <ogs/core/Die.h>
***************
*** 79,83 ****
inline Fighter::Fighter (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::XP::getStrongAttack (xpLevel),
ogs::core::Saves::getStrongBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
--- 80,84 ----
inline Fighter::Fighter (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::Attack::getStrongBonus (xpLevel),
ogs::core::Saves::getStrongBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
***************
*** 95,99 ****
inline ogs::core::Modifier::Value
Fighter::getBaseAttack () const {
! return (ogs::core::XP::getStrongAttack (getLevel ()));
}
--- 96,100 ----
inline ogs::core::Modifier::Value
Fighter::getBaseAttack () const {
! return (ogs::core::Attack::getStrongBonus (getLevel ()));
}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am 23 Mar 2003 22:14:36 -0000 1.3
--- Makefile.am 2 May 2003 19:06:29 -0000 1.4
***************
*** 27,31 ****
Bard.h \
Cleric.h \
- Commoner.h \
Druid.h \
Fighter.h \
--- 27,30 ----
Index: Monk.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Monk.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Monk.h 18 Apr 2003 01:41:00 -0000 1.4
--- Monk.h 2 May 2003 19:06:29 -0000 1.5
***************
*** 26,29 ****
--- 26,30 ----
# define OGS_CCLASSES_MONK_H
+ # include <ogs/core/Attack.h>
# include <ogs/core/CClass.h>
# include <ogs/core/Die.h>
***************
*** 91,95 ****
inline Monk::Monk (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::XP::getAverageAttack (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
--- 92,96 ----
inline Monk::Monk (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::Attack::getAverageBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
Index: Paladin.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Paladin.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Paladin.cpp 18 Apr 2003 01:41:00 -0000 1.7
--- Paladin.cpp 2 May 2003 19:06:29 -0000 1.8
***************
*** 44,48 ****
Paladin::Paladin (XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! XP::getStrongAttack (xpLevel),
Saves::getStrongBonus (xpLevel),
Saves::getWeakBonus (xpLevel),
--- 44,48 ----
Paladin::Paladin (XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! Attack::getStrongBonus (xpLevel),
Saves::getStrongBonus (xpLevel),
Saves::getWeakBonus (xpLevel),
Index: Paladin.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Paladin.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Paladin.h 18 Apr 2003 01:41:01 -0000 1.5
--- Paladin.h 2 May 2003 19:06:29 -0000 1.6
***************
*** 28,31 ****
--- 28,32 ----
# include <vector>
+ # include <ogs/core/Attack.h>
# include <ogs/core/CClass.h>
# include <ogs/core/Die.h>
Index: Ranger.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Ranger.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Ranger.h 18 Apr 2003 01:41:01 -0000 1.5
--- Ranger.h 2 May 2003 19:06:29 -0000 1.6
***************
*** 28,31 ****
--- 28,32 ----
# include <vector>
+ # include <ogs/core/Attack.h>
# include <ogs/core/CClass.h>
# include <ogs/core/Die.h>
***************
*** 89,93 ****
inline Ranger::Ranger (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::XP::getAverageAttack (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
--- 90,94 ----
inline Ranger::Ranger (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::Attack::getAverageBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
***************
*** 104,108 ****
inline ogs::core::Modifier::Value
Ranger::getBaseAttackValue () const {
! return (ogs::core::XP::getStrongAttack (getLevel ()));
}
--- 105,109 ----
inline ogs::core::Modifier::Value
Ranger::getBaseAttackValue () const {
! return (ogs::core::Attack::getStrongBonus (getLevel ()));
}
Index: Rogue.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Rogue.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Rogue.h 13 Apr 2003 05:24:49 -0000 1.3
--- Rogue.h 2 May 2003 19:06:29 -0000 1.4
***************
*** 28,31 ****
--- 28,32 ----
# include <vector>
+ # include <ogs/core/Attack.h>
# include <ogs/core/CClass.h>
# include <ogs/core/Die.h>
***************
*** 75,79 ****
inline Rogue::Rogue (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::XP::getAverageAttack (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
--- 76,80 ----
inline Rogue::Rogue (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::Attack::getAverageBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
Index: Sorcerer.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Sorcerer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Sorcerer.h 18 Apr 2003 01:41:01 -0000 1.5
--- Sorcerer.h 2 May 2003 19:06:29 -0000 1.6
***************
*** 28,31 ****
--- 28,32 ----
# include <vector>
+ # include <ogs/core/Attack.h>
# include <ogs/core/CClass.h>
# include <ogs/core/Die.h>
***************
*** 76,80 ****
inline Sorcerer::Sorcerer (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::XP::getAverageAttack (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
--- 77,81 ----
inline Sorcerer::Sorcerer (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::Attack::getAverageBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
***************
*** 91,95 ****
inline ogs::core::Modifier::Value
Sorcerer::getBaseAttackValue () const {
! return (ogs::core::XP::getWeakAttack (getLevel ()));
}
--- 92,96 ----
inline ogs::core::Modifier::Value
Sorcerer::getBaseAttackValue () const {
! return (ogs::core::Attack::getWeakBonus (getLevel ()));
}
Index: Wizard.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/cclasses/Wizard.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Wizard.h 18 Apr 2003 01:41:01 -0000 1.5
--- Wizard.h 2 May 2003 19:06:29 -0000 1.6
***************
*** 28,31 ****
--- 28,32 ----
# include <vector>
+ # include <ogs/core/Attack.h>
# include <ogs/core/CClass.h>
# include <ogs/core/Die.h>
***************
*** 97,101 ****
inline Wizard::Wizard (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::XP::getAverageAttack (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
--- 98,102 ----
inline Wizard::Wizard (ogs::core::XP::Level xpLevel):
CClass (HIT_DIE, SKILL_RATE, xpLevel,
! ogs::core::Attack::getAverageBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
ogs::core::Saves::getWeakBonus (xpLevel),
***************
*** 112,116 ****
inline ogs::core::Modifier::Value
Wizard::getBaseAttackValue () const {
! return (ogs::core::XP::getWeakAttack (getLevel ()));
}
--- 113,117 ----
inline ogs::core::Modifier::Value
Wizard::getBaseAttackValue () const {
! return (ogs::core::Attack::getWeakBonus (getLevel ()));
}
--- Commoner.h DELETED ---
|