[Rpgworldmodel-commits] SF.net SVN: rpgworldmodel: [16] doc
Status: Inactive
Brought to you by:
deadwood_pl
Menu
▾
▴
[Rpgworldmodel-commits] SF.net SVN: rpgworldmodel: [16] doc
|
From: <dea...@us...> - 2006-07-14 18:48:54
|
Revision: 16 Author: deadwood_pl Date: 2006-07-14 11:19:50 -0700 (Fri, 14 Jul 2006) ViewCVS: http://svn.sourceforge.net/rpgworldmodel/?rev=16&view=rev Log Message: ----------- Added clothing for further equipment tests... oh and goblin is goblin not golbin :P Modified Paths: -------------- doc/RPGWorldModel_model.zuml src/RPGWorldModel.Abstracts/Item.cs src/RPGWorldModel.Abstracts/RPGWorldModel.Abstracts.csproj src/RPGWorldModel.Abstracts/Sword.cs src/RPGWorldModel.Implementation/RPGWorldModel.Implementation.csproj src/RPGWorldModel.Implementation/Swords.cs src/test_applications/tester/Form1.Designer.cs src/test_applications/tester/Form1.cs Added Paths: ----------- src/RPGWorldModel.Abstracts/Clothing.cs src/RPGWorldModel.Abstracts/Goblin.cs src/RPGWorldModel.Abstracts/Pants.cs src/RPGWorldModel.Abstracts/Shirt.cs src/RPGWorldModel.Implementation/Pants.cs src/RPGWorldModel.Implementation/Shirts.cs Removed Paths: ------------- src/RPGWorldModel.Abstracts/Golbin.cs Modified: doc/RPGWorldModel_model.zuml =================================================================== (Binary files differ) Added: src/RPGWorldModel.Abstracts/Clothing.cs =================================================================== --- src/RPGWorldModel.Abstracts/Clothing.cs (rev 0) +++ src/RPGWorldModel.Abstracts/Clothing.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -0,0 +1,20 @@ +using System; + +namespace RPGWorldModel.Abstracts.Entities.Items +{ + public abstract class Clothing : Item + { + #region Initialize Overrides + public override void InitializeNamedEntity() + { + if (!name.IsInitialized) + { + name.Value = "Unknown Clothing Entity"; + name.IsInitialized = true; + } + + base.InitializeNamedEntity(); + } + #endregion + } +} \ No newline at end of file Copied: src/RPGWorldModel.Abstracts/Goblin.cs (from rev 13, src/RPGWorldModel.Abstracts/Golbin.cs) =================================================================== --- src/RPGWorldModel.Abstracts/Goblin.cs (rev 0) +++ src/RPGWorldModel.Abstracts/Goblin.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Text; +using RPGWorldModel.Abstracts.Entities.LiveEntities; +using RPGWorldModel.Abstracts.Interfaces; + +namespace RPGWorldModel.TopLevelImplementation.Entities.LiveEntities +{ + public class Goblin : Humanoid + { + public Goblin() + { + } + + #region Initialize Overrides + + public override void InitializeNamedEntity() + { + if (!name.IsInitialized) + { + name.Value = "Goblin"; + name.IsInitialized = true; + } + } + + public override void InitializeLiveEntity() + { + if (!hp.IsInitialized) + { + // Base values for goblin + hp.BaseHP = 80; + hp.HPMargin = 20; + hp.IsInitialized = true; + hp.RandomizationRequired = true; + } + + if (hp.RandomizationRequired) + randomizeMaxHealthPoints(); + } + + #endregion + + + } +} Deleted: src/RPGWorldModel.Abstracts/Golbin.cs =================================================================== --- src/RPGWorldModel.Abstracts/Golbin.cs 2006-07-14 16:42:36 UTC (rev 15) +++ src/RPGWorldModel.Abstracts/Golbin.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using RPGWorldModel.Abstracts.Entities.LiveEntities; -using RPGWorldModel.Abstracts.Interfaces; - -namespace RPGWorldModel.TopLevelImplementation.Entities.LiveEntities -{ - public class Golbin : Humanoid - { - public Golbin() - { - } - - #region Initialize Overrides - - public override void InitializeNamedEntity() - { - if (!name.IsInitialized) - { - name.Value = "Goblin"; - name.IsInitialized = true; - } - } - - public override void InitializeLiveEntity() - { - if (!hp.IsInitialized) - { - // Base values for goblin - hp.BaseHP = 80; - hp.HPMargin = 20; - hp.IsInitialized = true; - hp.RandomizationRequired = true; - } - - if (hp.RandomizationRequired) - randomizeMaxHealthPoints(); - } - - #endregion - - - } -} Modified: src/RPGWorldModel.Abstracts/Item.cs =================================================================== --- src/RPGWorldModel.Abstracts/Item.cs 2006-07-14 16:42:36 UTC (rev 15) +++ src/RPGWorldModel.Abstracts/Item.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -85,8 +85,20 @@ durability = newDurability; } - public abstract void InitializeDamagable(); + public virtual void InitializeDamagable() + { + if (!durability.IsInitialized) + { + durability.BaseDurability = 0; + durability.DurabilityMargin = 0; + durability.IsInitialized = true; + durability.RandomizationRequired = true; + } + if (durability.RandomizationRequired) + randomizeMaxDurability(); + } + public virtual short DamageByPoints(short damagePoints) { if (damagePoints < 0) Added: src/RPGWorldModel.Abstracts/Pants.cs =================================================================== --- src/RPGWorldModel.Abstracts/Pants.cs (rev 0) +++ src/RPGWorldModel.Abstracts/Pants.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -0,0 +1,36 @@ +using System; +using RPGWorldModel.Abstracts.Entities.Items; +using RPGWorldModel.Abstracts.Support.Equipment; + +namespace RPGWorldModel.TopLevelImplementation.Entities.Items +{ + public class Pants : Clothing + { + #region Initialize Overrides + + public override void InitializeNamedEntity() + { + if (!name.IsInitialized) + { + name.Value = "Pants"; + name.IsInitialized = true; + } + + base.InitializeNamedEntity(); + } + + public override void InitializeEquipable() + { + equipmentLocationDescriptors.Clear(); + + // Building descriptors + EquipmentLocationDescriptor waistLegs = new EquipmentLocationDescriptor(); + waistLegs.AddEquipmentLocation(new EquipmentLocationLeftLeg()); + waistLegs.AddEquipmentLocation(new EquipmentLocationRightLeg()); + waistLegs.AddEquipmentLocation(new EquipmentLocationWaist()); + equipmentLocationDescriptors.Add(waistLegs); + } + + #endregion + } +} \ No newline at end of file Modified: src/RPGWorldModel.Abstracts/RPGWorldModel.Abstracts.csproj =================================================================== --- src/RPGWorldModel.Abstracts/RPGWorldModel.Abstracts.csproj 2006-07-14 16:42:36 UTC (rev 15) +++ src/RPGWorldModel.Abstracts/RPGWorldModel.Abstracts.csproj 2006-07-14 18:19:50 UTC (rev 16) @@ -36,10 +36,11 @@ <Compile Include="Animal.cs" /> <Compile Include="AnimatedEntity.cs" /> <Compile Include="Arachnid.cs" /> + <Compile Include="Clothing.cs" /> <Compile Include="EquipmentLocation.cs" /> <Compile Include="EquipmentSlot.cs" /> <Compile Include="GameEntity.cs" /> - <Compile Include="Golbin.cs" /> + <Compile Include="Goblin.cs" /> <Compile Include="Human.cs" /> <Compile Include="Humanoid.cs" /> <Compile Include="IDamagable.cs" /> @@ -53,7 +54,9 @@ <Compile Include="Initializable.cs" /> <Compile Include="Item.cs" /> <Compile Include="LiveEntity.cs" /> + <Compile Include="Pants.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Shirt.cs" /> <Compile Include="Spider.cs" /> <Compile Include="Sword.cs" /> <Compile Include="Weapon.cs" /> Added: src/RPGWorldModel.Abstracts/Shirt.cs =================================================================== --- src/RPGWorldModel.Abstracts/Shirt.cs (rev 0) +++ src/RPGWorldModel.Abstracts/Shirt.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -0,0 +1,36 @@ +using System; +using RPGWorldModel.Abstracts.Entities.Items; +using RPGWorldModel.Abstracts.Support.Equipment; + +namespace RPGWorldModel.TopLevelImplementation.Entities.Items +{ + public class Shirt : Clothing + { + #region Initialize Overrides + + public override void InitializeNamedEntity() + { + if (!name.IsInitialized) + { + name.Value = "Shirt"; + name.IsInitialized = true; + } + + base.InitializeNamedEntity(); + } + + public override void InitializeEquipable() + { + equipmentLocationDescriptors.Clear(); + + // Building descriptors + EquipmentLocationDescriptor torsoArms = new EquipmentLocationDescriptor(); + torsoArms.AddEquipmentLocation(new EquipmentLocationLeftArm()); + torsoArms.AddEquipmentLocation(new EquipmentLocationRightArm()); + torsoArms.AddEquipmentLocation(new EquipmentLocationTorso()); + equipmentLocationDescriptors.Add(torsoArms); + } + + #endregion + } +} \ No newline at end of file Modified: src/RPGWorldModel.Abstracts/Sword.cs =================================================================== --- src/RPGWorldModel.Abstracts/Sword.cs 2006-07-14 16:42:36 UTC (rev 15) +++ src/RPGWorldModel.Abstracts/Sword.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -9,10 +9,6 @@ { public class Sword : Weapon { - public Sword() - { - } - #region Initialization Overrides public override void InitializeNamedEntity() @@ -24,20 +20,6 @@ } } - public override void InitializeDamagable() - { - if (!durability.IsInitialized) - { - durability.BaseDurability = 0; - durability.DurabilityMargin = 0; - durability.IsInitialized = true; - durability.RandomizationRequired = true; - } - - if (durability.RandomizationRequired) - randomizeMaxDurability(); - } - public override void InitializeDamageInflictor() { // Preadding required descriptors @@ -86,10 +68,6 @@ public class TwoHandedSword : Sword { - public TwoHandedSword() - { - } - #region Initialization Overrides public override void InitializeNamedEntity() @@ -101,35 +79,6 @@ } } - public override void InitializeDamagable() - { - if (!durability.IsInitialized) - { - durability.BaseDurability = 0; - durability.DurabilityMargin = 0; - durability.IsInitialized = true; - durability.RandomizationRequired = true; - } - - if (durability.RandomizationRequired) - randomizeMaxDurability(); - } - - public override void InitializeDamageInflictor() - { - DamageDescriptorPhysical damageDesc = new DamageDescriptorPhysical(); - damageDesc.BaseMaxDamage = 0; - damageDesc.MaxDamageMargin = 0; - damageDesc.BaseMinDamage = 0; - damageDesc.MinDamageMargin = 0; - damageDesc.IsInitialized = true; - damageDesc.RandomizationRequired = true; - - addDamageDescriptorIfNotExisting(damageDesc); - - base.InitializeDamageInflictor(); - } - public override void InitializeEquipable() { equipmentLocationDescriptors.Clear(); Added: src/RPGWorldModel.Implementation/Pants.cs =================================================================== --- src/RPGWorldModel.Implementation/Pants.cs (rev 0) +++ src/RPGWorldModel.Implementation/Pants.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -0,0 +1,36 @@ +using System; +using RPGWorldModel.TopLevelImplementation.Entities.Items; + +namespace RPGWorldModel.Implementation.Entities.Items.Pants +{ + public class CottonPants : RPGWorldModel.TopLevelImplementation.Entities.Items.Pants + { + #region Initialization Overrides + + public override void InitializeNamedEntity() + { + if (!name.IsInitialized) + { + name.Value = "Cotton Pants"; + name.IsInitialized = true; + } + + base.InitializeNamedEntity(); + } + + public override void InitializeDamagable() + { + if (!durability.IsInitialized) + { + durability.BaseDurability = 300; + durability.DurabilityMargin = 10; + durability.IsInitialized = true; + durability.RandomizationRequired = true; + } + + base.InitializeDamagable(); + } + + #endregion + } +} \ No newline at end of file Modified: src/RPGWorldModel.Implementation/RPGWorldModel.Implementation.csproj =================================================================== --- src/RPGWorldModel.Implementation/RPGWorldModel.Implementation.csproj 2006-07-14 16:42:36 UTC (rev 15) +++ src/RPGWorldModel.Implementation/RPGWorldModel.Implementation.csproj 2006-07-14 18:19:50 UTC (rev 16) @@ -33,7 +33,9 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="Pants.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Shirts.cs" /> <Compile Include="Swords.cs" /> </ItemGroup> <ItemGroup> Added: src/RPGWorldModel.Implementation/Shirts.cs =================================================================== --- src/RPGWorldModel.Implementation/Shirts.cs (rev 0) +++ src/RPGWorldModel.Implementation/Shirts.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -0,0 +1,36 @@ +using System; +using RPGWorldModel.TopLevelImplementation.Entities.Items; + +namespace RPGWorldModel.Implementation.Entities.Items.Shirts +{ + public class CottonShirt : Shirt + { + #region Initialization Overrides + + public override void InitializeNamedEntity() + { + if (!name.IsInitialized) + { + name.Value = "Cotton Shirt"; + name.IsInitialized = true; + } + + base.InitializeNamedEntity(); + } + + public override void InitializeDamagable() + { + if (!durability.IsInitialized) + { + durability.BaseDurability = 350; + durability.DurabilityMargin = 15; + durability.IsInitialized = true; + durability.RandomizationRequired = true; + } + + base.InitializeDamagable(); + } + + #endregion + } +} \ No newline at end of file Modified: src/RPGWorldModel.Implementation/Swords.cs =================================================================== --- src/RPGWorldModel.Implementation/Swords.cs 2006-07-14 16:42:36 UTC (rev 15) +++ src/RPGWorldModel.Implementation/Swords.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -10,19 +10,32 @@ /// </summary> public class WoodenTrainingSword : Sword { - public WoodenTrainingSword() + #region Initialization Overrides + + public override void InitializeNamedEntity() { - name.Value = "Wooden Training Sword"; - name.IsInitialized = true; + if (!name.IsInitialized) + { + name.Value = "Wooden Training Sword"; + name.IsInitialized = true; + } - durability.BaseDurability = 500; - durability.DurabilityMargin = 20; - durability.IsInitialized = true; - durability.RandomizationRequired = true; + base.InitializeNamedEntity(); } - #region Initialization Overrides + public override void InitializeDamagable() + { + if (!durability.IsInitialized) + { + durability.BaseDurability = 500; + durability.DurabilityMargin = 20; + durability.IsInitialized = true; + durability.RandomizationRequired = true; + } + base.InitializeDamagable(); + } + public override void InitializeDamageInflictor() { DamageDescriptorPhysical damageDesc = new DamageDescriptorPhysical(); @@ -46,19 +59,32 @@ /// </summary> public class IronShortSword : Sword { - public IronShortSword() + #region Initialization Overrides + + public override void InitializeNamedEntity() { - name.Value = "Iron Short Sword"; - name.IsInitialized = true; + if (!name.IsInitialized) + { + name.Value = "Iron Short Sword"; + name.IsInitialized = true; + } - durability.BaseDurability = 1100; - durability.DurabilityMargin = 15; - durability.IsInitialized = true; - durability.RandomizationRequired = true; + base.InitializeNamedEntity(); } - #region Initialization Overrides + public override void InitializeDamagable() + { + if (!durability.IsInitialized) + { + durability.BaseDurability = 1100; + durability.DurabilityMargin = 15; + durability.IsInitialized = true; + durability.RandomizationRequired = true; + } + base.InitializeDamagable(); + } + public override void InitializeDamageInflictor() { DamageDescriptorPhysical damageDesc = new DamageDescriptorPhysical(); @@ -83,19 +109,31 @@ /// </summary> public class BronzeTwoHandedSword : TwoHandedSword { - public BronzeTwoHandedSword() + #region Initialization Overrides + + public override void InitializeNamedEntity() { - name.Value = "Bronze Two-Handed Sword"; - name.IsInitialized = true; + if (!name.IsInitialized) + { + name.Value = "Bronze Two-Handed Sword"; + name.IsInitialized = true; + } - durability.BaseDurability = 2000; - durability.DurabilityMargin = 20; - durability.IsInitialized = true; - durability.RandomizationRequired = true; + base.InitializeNamedEntity(); } - #region Initialization Overrides + public override void InitializeDamagable() + { + if (!durability.IsInitialized) + { + durability.BaseDurability = 2000; + durability.DurabilityMargin = 20; + durability.IsInitialized = true; + durability.RandomizationRequired = true; + } + base.InitializeDamagable(); + } public override void InitializeDamageInflictor() { DamageDescriptorPhysical damageDesc = new DamageDescriptorPhysical(); Modified: src/test_applications/tester/Form1.Designer.cs =================================================================== --- src/test_applications/tester/Form1.Designer.cs 2006-07-14 16:42:36 UTC (rev 15) +++ src/test_applications/tester/Form1.Designer.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -360,11 +360,11 @@ // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.label4.Location = new System.Drawing.Point(253, 318); + this.label4.Location = new System.Drawing.Point(319, 288); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(395, 13); + this.label4.Size = new System.Drawing.Size(207, 13); this.label4.TabIndex = 5; - this.label4.Text = "Select slot(back,waist,left hand, right hand), select item, click Equip"; + this.label4.Text = "Select slot, select item, click Equip"; // // btnEquipaSelected // Modified: src/test_applications/tester/Form1.cs =================================================================== --- src/test_applications/tester/Form1.cs 2006-07-14 16:42:36 UTC (rev 15) +++ src/test_applications/tester/Form1.cs 2006-07-14 18:19:50 UTC (rev 16) @@ -14,6 +14,8 @@ using RPGWorldModel.TopLevelImplementation.Entities.LiveEntities; using RPGWorldModel.TopLevelImplementation.Entities.Items; using RPGWorldModel.Implementation.Entities.Items.Swords; +using RPGWorldModel.Implementation.Entities.Items.Shirts; +using RPGWorldModel.Implementation.Entities.Items.Pants; /* * This is a simple WinForms application for testing features added to the framework. @@ -81,7 +83,7 @@ switch (enemySelect) { case(0): - enemy = new Golbin(); + enemy = new Goblin(); break; case(1): enemy = new Human(); @@ -340,6 +342,49 @@ g.FillPolygon(selectedBrush, points); } + + if (equipable is Shirt) + { + if (slot is EquipmentSlotLeftArm) + { + x = 145; y = 85; w = 20; h = 80; + g.FillRectangle(Brushes.Wheat, x, y, w, h); + } + + if (slot is EquipmentSlotRightArm) + { + x = 35; y = 85; w = 20; h = 80; + g.FillRectangle(Brushes.Wheat, x, y, w, h); + } + + if (slot is EquipmentSlotTorso) + { + x = 60; y = 90; w = 80; h = 80; + g.FillRectangle(Brushes.Wheat, x, y, w, h); + } + } + + if (equipable is Pants) + { + if (slot is EquipmentSlotLeftLeg) + { + x = 120; y = 190; w = 20; h = 80; + g.FillRectangle(Brushes.LightGray, x, y, w, h); + } + + if (slot is EquipmentSlotRightLeg) + { + x = 60; y = 190; w = 20; h = 80; + g.FillRectangle(Brushes.LightGray, x, y, w, h); + } + + if (slot is EquipmentSlotWaist) + { + x = 60; y = 175; w = 80; h = 10; + g.FillRectangle(Brushes.LightGray, x, y, w, h); + } + + } } } @@ -395,9 +440,17 @@ BronzeTwoHandedSword bthSword = new BronzeTwoHandedSword(); bthSword.InitializeEntity(); + CottonPants cPants = new CottonPants(); + cPants.InitializeEntity(); + + CottonShirt cShirt = new CottonShirt(); + cShirt.InitializeEntity(); + availableEquipable.Add(sword); availableEquipable.Add(wSword); availableEquipable.Add(bthSword); + availableEquipable.Add(cPants); + availableEquipable.Add(cShirt); refreshEquip(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
