[ogs-changes] dist/c++/ogs/items Armor.cpp,1.1,1.2 Armor.h,1.2,1.3 Rings.h,1.1,1.2 Weapon.cpp,1.1,1.
Status: Alpha
Brought to you by:
elemings
Menu
▾
▴
[ogs-changes] dist/c++/ogs/items Armor.cpp,1.1,1.2 Armor.h,1.2,1.3 Rings.h,1.1,1.2 Weapon.cpp,1.1,1.2 Wonders.h,1.1,1.2
|
From: <ele...@us...> - 2003-03-25 06:13:17
|
Update of /cvsroot/ogs/dist/c++/ogs/items
In directory sc8-pr-cvs1:/tmp/cvs-serv1939/c++/ogs/items
Modified Files:
Armor.cpp Armor.h Rings.h Weapon.cpp Wonders.h
Log Message:
See C++ ChangeLog file (Mar 24) for details.
Index: Armor.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/items/Armor.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Armor.cpp 7 Jan 2003 07:41:33 -0000 1.1
--- Armor.cpp 25 Mar 2003 06:13:13 -0000 1.2
***************
*** 23,27 ****
#include <stdexcept>
! #include "Armor.h"
using ogs::core::Modifier;
--- 23,27 ----
#include <stdexcept>
! #include "ogs/items/Armor.h"
using ogs::core::Modifier;
Index: Armor.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/items/Armor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Armor.h 23 Mar 2003 22:14:36 -0000 1.2
--- Armor.h 25 Mar 2003 06:13:13 -0000 1.3
***************
*** 35,69 ****
* An item worn for protection in combat. Armor is typically a suit or
* partial suit of steel, leather, or other material that is worn over
! * the body. Armor is classified into one of three groups: light,
! * medium, or heavy. The armor group is used to determine the armor
! * proficiency required to use it effectively.
*
! * @see ogs::feats::ArmorGroup
*/
class Armor: public ogs::core::Item {
public:
! /**
! * Indicates the proficiency required to effectively utilize the
! * armor.
! */
! enum Group {
! /** Requires light armor proficiency. */
LIGHT = 1,
! /** Requires medium armor proficiency. */
MEDIUM = 2,
! /** Requires heavy armor proficiency. */
HEAVY = 3
};
! virtual Group getGroup () const = 0;
virtual ogs::core::Modifier& getDefenseBonus () = 0;
virtual ogs::core::Modifier& getArmorCheckPenalty () = 0;
virtual int getArcaneSpellFailure () = 0;
virtual ~Armor ();
};
OGS_END_ITEMS_NAMESPACE
--- 35,82 ----
* An item worn for protection in combat. Armor is typically a suit or
* partial suit of steel, leather, or other material that is worn over
! * the body. Armor belongs to one of three proficiencies: light,
! * medium, or heavy. The armor proficiency determines the armor
! * proficiency feat required to use it effectively.
*
! * @see ogs::feats::ArmorProficiency
*/
class Armor: public ogs::core::Item {
public:
! /** The proficiency required to effectively utilize the armor. */
! enum Proficiency {
! /** Requires light armor proficiency feat. */
LIGHT = 1,
! /** Requires medium armor proficiency feat. */
MEDIUM = 2,
! /** Requires heavy armor proficiency feat. */
HEAVY = 3
};
! /**
! * Determine the proficiency required to effectively utilize this
! * armor.
! *
! * @return Proficiency of this armor: LIGHT, MEDIUM, or HEAVY.
! */
! virtual Proficiency getProficiency () const = 0;
!
! /**
! * Determine the defense modifier added when wearing this armor.
! *
! * @return Defense modifier.
! */
virtual ogs::core::Modifier& getDefenseBonus () = 0;
+
virtual ogs::core::Modifier& getArmorCheckPenalty () = 0;
+
virtual int getArcaneSpellFailure () = 0;
virtual ~Armor ();
};
+
+ inline Armor::~Armor () { }
OGS_END_ITEMS_NAMESPACE
Index: Rings.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/items/Rings.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Rings.h 23 Mar 2003 22:14:36 -0000 1.1
--- Rings.h 25 Mar 2003 06:13:13 -0000 1.2
***************
*** 21,62 ****
*/
! #ifdef __cplusplus
!
! # ifndef OGS_ITEMS_RINGS_H
! # define OGS_ITEMS_RINGS_H
!
! //# include <ogs/items/rings/AnimalFriendship.h>
! //# include <ogs/items/rings/Blinking.h>
! //# include <ogs/items/rings/ChameleonPower.h>
! # include <ogs/items/rings/Climbing.h>
! //# include <ogs/items/rings/Counterspells.h>
! //# include <ogs/items/rings/DjinniCalling.h>
! //# include <ogs/items/rings/ElementalCommand.h>
! //# include <ogs/items/rings/ElementalResistance.h>
! //# include <ogs/items/rings/Evasion.h>
! //# include <ogs/items/rings/FeatherFalling.h>
! //# include <ogs/items/rings/ForceShield.h>
! //# include <ogs/items/rings/FreedomOfMovement.h>
! //# include <ogs/items/rings/FriendShield.h>
! //# include <ogs/items/rings/Invisibility.h>
! //# include <ogs/items/rings/Jumping.h>
! //# include <ogs/items/rings/MindShielding.h>
! # include <ogs/items/rings/Protection.h>
! //# include <ogs/items/rings/Ram.h>
! //# include <ogs/items/rings/Regeneration.h>
! //# include <ogs/items/rings/ShootingStars.h>
! //# include <ogs/items/rings/SpellStoring.h>
! //# include <ogs/items/rings/SpellTurning.h>
! //# include <ogs/items/rings/Sustenance.h>
! # include <ogs/items/rings/Swimming.h>
! //# include <ogs/items/rings/Telekinesis.h>
! //# include <ogs/items/rings/ThreeWishes.h>
! //# include <ogs/items/rings/Warmth.h>
! //# include <ogs/items/rings/WaterWalking.h>
! //# include <ogs/items/rings/Wizardry.h>
! //# include <ogs/items/rings/XRayVision.h>
! # endif /* !defined OGS_ITEMS_RINGS_H */
! #endif /* defined __cplusplus */
--- 21,59 ----
*/
! #ifndef OGS_ITEMS_RINGS_H
! # define OGS_ITEMS_RINGS_H
! // Uncomment these as they are completed.
! //# include <ogs/items/rings/AnimalFriendship.h>
! //# include <ogs/items/rings/Blinking.h>
! //# include <ogs/items/rings/ChameleonPower.h>
! # include <ogs/items/rings/Climbing.h>
! //# include <ogs/items/rings/Counterspells.h>
! //# include <ogs/items/rings/DjinniCalling.h>
! //# include <ogs/items/rings/ElementalCommand.h>
! //# include <ogs/items/rings/ElementalResistance.h>
! //# include <ogs/items/rings/Evasion.h>
! //# include <ogs/items/rings/FeatherFalling.h>
! //# include <ogs/items/rings/ForceShield.h>
! //# include <ogs/items/rings/FreedomOfMovement.h>
! //# include <ogs/items/rings/FriendShield.h>
! //# include <ogs/items/rings/Invisibility.h>
! //# include <ogs/items/rings/Jumping.h>
! //# include <ogs/items/rings/MindShielding.h>
! # include <ogs/items/rings/Protection.h>
! //# include <ogs/items/rings/Ram.h>
! //# include <ogs/items/rings/Regeneration.h>
! //# include <ogs/items/rings/ShootingStars.h>
! //# include <ogs/items/rings/SpellStoring.h>
! //# include <ogs/items/rings/SpellTurning.h>
! //# include <ogs/items/rings/Sustenance.h>
! # include <ogs/items/rings/Swimming.h>
! //# include <ogs/items/rings/Telekinesis.h>
! //# include <ogs/items/rings/ThreeWishes.h>
! //# include <ogs/items/rings/Warmth.h>
! //# include <ogs/items/rings/WaterWalking.h>
! //# include <ogs/items/rings/Wizardry.h>
! //# include <ogs/items/rings/XRayVision.h>
! #endif /* !defined OGS_ITEMS_RINGS_H */
Index: Weapon.cpp
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/items/Weapon.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Weapon.cpp 7 Jan 2003 07:41:33 -0000 1.1
--- Weapon.cpp 25 Mar 2003 06:13:13 -0000 1.2
***************
*** 21,25 ****
*/
! #include "Weapon.h"
using ogs::items::Weapon;
--- 21,25 ----
*/
! #include "ogs/items/Weapon.h"
using ogs::items::Weapon;
Index: Wonders.h
===================================================================
RCS file: /cvsroot/ogs/dist/c++/ogs/items/Wonders.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Wonders.h 23 Mar 2003 22:14:36 -0000 1.1
--- Wonders.h 25 Mar 2003 06:13:13 -0000 1.2
***************
*** 21,71 ****
*/
! #ifdef __cplusplus
!
! # ifndef OGS_ITEMS_WONDERS_H
! # define OGS_ITEMS_WONDERS_H
// Pretty sure these wonders can be fully implemented.
! //# include <ogs/items/wonders/AmuletOfHealth.h>
! //# include <ogs/items/wonders/AmuletOfNaturalArmor.h>
! //# include <ogs/items/wonders/BeltOfGiantStrength.h>
! //# include <ogs/items/wonders/BlessedBook.h>
! //# include <ogs/items/wonders/BootsOfElvenkind.h>
! //# include <ogs/items/wonders/BootsOfStrideAndSpring.h>
! //# include <ogs/items/wonders/BracersOfArmor.h>
! //# include <ogs/items/wonders/CloakOfCharisma.h>
! //# include <ogs/items/wonders/CloakOfElvenkind.h>
! //# include <ogs/items/wonders/CloakOfResistance.h>
! //# include <ogs/items/wonders/GauntletsOfOgrePower.h>
! //# include <ogs/items/wonders/GlovesOfDexterity.h>
! //# include <ogs/items/wonders/GlovesOfSwimAndClimb.h>
! //# include <ogs/items/wonders/HeadbandOfIntellect.h>
! //# include <ogs/items/wonders/LensOfDetection.h>
! //# include <ogs/items/wonders/MantleOfSpellResistance.h>
! //# include <ogs/items/wonders/ManualOfPhysicalAbility.h>
! //# include <ogs/items/wonders/Luckstone.h>
! //# include <ogs/items/wonders/TomeOfMentalAbility.h>
! //# include <ogs/items/wonders/VestmentOfFaith.h>
// Not exactly sure if these wonders can be implemented.
! //# include <ogs/items/wonders/AmuletOfUndeadTurning.h>
! //# include <ogs/items/wonders/BagOfHolding.h>
! //# include <ogs/items/wonders/MonksBelt.h>
! //# include <ogs/items/wonders/BeltOfDwarvenkind.h>
! //# include <ogs/items/wonders/CircletOfPersuasion.h>
! //# include <ogs/items/wonders/EyesOfTheEagle.h>
! //# include <ogs/items/wonders/GloveOfStoring.h>
! //# include <ogs/items/wonders/GogglesOfNight.h>
! //# include <ogs/items/wonders/MaskOfTheSkull.h>
! //# include <ogs/items/wonders/PearlOfPower.h>
! //# include <ogs/items/wonders/PeriaptOfHealth.h>
! //# include <ogs/items/wonders/ScabbardOfKeenEdges.h>
! //# include <ogs/items/wonders/VestOfEscape.h>
! //# include <ogs/items/wonders/DruidsVestment.h>
// Other wonders probably cannot be implemented in this context.
! # endif /* !defined OGS_ITEMS_WONDERS_H */
!
! #endif /* defined __cplusplus */
--- 21,67 ----
*/
! #ifndef OGS_ITEMS_WONDERS_H
! # define OGS_ITEMS_WONDERS_H
// Pretty sure these wonders can be fully implemented.
! //# include <ogs/items/wonders/AmuletOfHealth.h>
! //# include <ogs/items/wonders/AmuletOfNaturalArmor.h>
! //# include <ogs/items/wonders/BeltOfGiantStrength.h>
! //# include <ogs/items/wonders/BlessedBook.h>
! //# include <ogs/items/wonders/BootsOfElvenkind.h>
! //# include <ogs/items/wonders/BootsOfStrideAndSpring.h>
! //# include <ogs/items/wonders/BracersOfArmor.h>
! //# include <ogs/items/wonders/CloakOfCharisma.h>
! //# include <ogs/items/wonders/CloakOfElvenkind.h>
! //# include <ogs/items/wonders/CloakOfResistance.h>
! //# include <ogs/items/wonders/GauntletsOfOgrePower.h>
! //# include <ogs/items/wonders/GlovesOfDexterity.h>
! //# include <ogs/items/wonders/GlovesOfSwimAndClimb.h>
! //# include <ogs/items/wonders/HeadbandOfIntellect.h>
! //# include <ogs/items/wonders/LensOfDetection.h>
! //# include <ogs/items/wonders/MantleOfSpellResistance.h>
! //# include <ogs/items/wonders/ManualOfPhysicalAbility.h>
! //# include <ogs/items/wonders/Luckstone.h>
! //# include <ogs/items/wonders/TomeOfMentalAbility.h>
! //# include <ogs/items/wonders/VestmentOfFaith.h>
// Not exactly sure if these wonders can be implemented.
! //# include <ogs/items/wonders/AmuletOfUndeadTurning.h>
! //# include <ogs/items/wonders/BagOfHolding.h>
! //# include <ogs/items/wonders/MonksBelt.h>
! //# include <ogs/items/wonders/BeltOfDwarvenkind.h>
! //# include <ogs/items/wonders/CircletOfPersuasion.h>
! //# include <ogs/items/wonders/EyesOfTheEagle.h>
! //# include <ogs/items/wonders/GloveOfStoring.h>
! //# include <ogs/items/wonders/GogglesOfNight.h>
! //# include <ogs/items/wonders/MaskOfTheSkull.h>
! //# include <ogs/items/wonders/PearlOfPower.h>
! //# include <ogs/items/wonders/PeriaptOfHealth.h>
! //# include <ogs/items/wonders/ScabbardOfKeenEdges.h>
! //# include <ogs/items/wonders/VestOfEscape.h>
! //# include <ogs/items/wonders/DruidsVestment.h>
// Other wonders probably cannot be implemented in this context.
! #endif /* !defined OGS_ITEMS_WONDERS_H */
|