From b1d6e51ee5fb6ccb0d5c777b2ff665d66537c776 Mon Sep 17 00:00:00 2001 From: Joshua-Ashton01 Date: Tue, 25 Oct 2022 11:41:58 -0600 Subject: [PATCH] updating package --- 1410_DND/src/dnd/Background.java | 4 ++-- 1410_DND/src/dnd/Character.java | 4 ++++ 1410_DND/src/dnd/CharacterStats.java | 5 +++-- 1410_DND/src/dnd/Charisma.java | 9 ++++++++- 1410_DND/src/dnd/ClassTemplate.java | 2 +- 1410_DND/src/dnd/Cleric.java | 2 +- 1410_DND/src/dnd/Constitution.java | 9 ++++++++- 1410_DND/src/dnd/Dexterity.java | 9 ++++++++- 1410_DND/src/dnd/Fighter.java | 2 +- 1410_DND/src/dnd/Intelligence.java | 9 ++++++++- 1410_DND/src/dnd/Skills.java | 2 +- 1410_DND/src/dnd/Stats.java | 3 +-- 1410_DND/src/dnd/Strength.java | 9 ++++++++- 1410_DND/src/dnd/Wisdom.java | 9 ++++++++- 1410_DND/src/dnd/Wizard.java | 2 +- 1410_DND/src/dnd/dndTestClient.java | 4 ++-- 16 files changed, 65 insertions(+), 19 deletions(-) diff --git a/1410_DND/src/dnd/Background.java b/1410_DND/src/dnd/Background.java index 1df0646..a21c657 100644 --- a/1410_DND/src/dnd/Background.java +++ b/1410_DND/src/dnd/Background.java @@ -1,4 +1,4 @@ -package background; +package dnd; import java.util.Arrays; @@ -63,7 +63,7 @@ public class Background { proficientStatus[0] = true; proficientStatus[12] = true; skillProficiencies = skills[0] + ", " + skills[12]; - feature = "By Popular Demand" + "\nYou can always find a place to perform, usually in an inn or tavern but possibly with a circus, at a theater, or even in a noble’s court. At such a place, you receive free lodging and food of a modest or comfortable standard (depending on the quality of the establishment), as long as you perform each night. In addition, your performance makes you something of a local figure. When strangers recognize you in a town where you have performed, they typically take a liking to you."; + feature = "By Popular Demand" + "\nYou can always find a place to perform, usually in an inn or tavern but possibly with a circus, at a theater, or even in a noble�s court. At such a place, you receive free lodging and food of a modest or comfortable standard (depending on the quality of the establishment), as long as you perform each night. In addition, your performance makes you something of a local figure. When strangers recognize you in a town where you have performed, they typically take a liking to you."; } /** diff --git a/1410_DND/src/dnd/Character.java b/1410_DND/src/dnd/Character.java index 50db29d..b88bf5b 100644 --- a/1410_DND/src/dnd/Character.java +++ b/1410_DND/src/dnd/Character.java @@ -88,5 +88,9 @@ public class Character { return hair; } + @Override + public String toString() { + return name; + } } diff --git a/1410_DND/src/dnd/CharacterStats.java b/1410_DND/src/dnd/CharacterStats.java index 4508dd6..9751554 100644 --- a/1410_DND/src/dnd/CharacterStats.java +++ b/1410_DND/src/dnd/CharacterStats.java @@ -1,5 +1,4 @@ -package com.builder; - +package dnd; public class CharacterStats { private Stats[] stats; @@ -13,6 +12,7 @@ public class CharacterStats { // TODO: Need to implement constructor, validates all proposed ability scores and creates new objects containing corresponding values. public CharacterStats(int str, int dex, int con, int intel, int wis, int cha) { + System.out.println("Constructor started in CharacterStats."); this.stats = new Stats[]{ new Strength(str), @@ -23,6 +23,7 @@ public class CharacterStats { new Charisma(cha) }; + System.out.println("stats[] created with new stats."); } diff --git a/1410_DND/src/dnd/Charisma.java b/1410_DND/src/dnd/Charisma.java index 8944559..26eed1f 100644 --- a/1410_DND/src/dnd/Charisma.java +++ b/1410_DND/src/dnd/Charisma.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; public class Charisma extends Stats { @@ -45,4 +45,11 @@ public class Charisma extends Stats { } + @Override + void increaseScore() { + + abilityScore++; + + } + } diff --git a/1410_DND/src/dnd/ClassTemplate.java b/1410_DND/src/dnd/ClassTemplate.java index f845aff..852bcb3 100644 --- a/1410_DND/src/dnd/ClassTemplate.java +++ b/1410_DND/src/dnd/ClassTemplate.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; public interface ClassTemplate { diff --git a/1410_DND/src/dnd/Cleric.java b/1410_DND/src/dnd/Cleric.java index 0fae989..b20f68b 100644 --- a/1410_DND/src/dnd/Cleric.java +++ b/1410_DND/src/dnd/Cleric.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; public class Cleric implements ClassTemplate { diff --git a/1410_DND/src/dnd/Constitution.java b/1410_DND/src/dnd/Constitution.java index 13f7cab..3b89d49 100644 --- a/1410_DND/src/dnd/Constitution.java +++ b/1410_DND/src/dnd/Constitution.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; public class Constitution extends Stats { @@ -45,4 +45,11 @@ public class Constitution extends Stats { } + @Override + void increaseScore() { + + abilityScore++; + + } + } diff --git a/1410_DND/src/dnd/Dexterity.java b/1410_DND/src/dnd/Dexterity.java index 2b8a7cd..8f7a6e1 100644 --- a/1410_DND/src/dnd/Dexterity.java +++ b/1410_DND/src/dnd/Dexterity.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; public class Dexterity extends Stats { @@ -45,4 +45,11 @@ public class Dexterity extends Stats { } + @Override + void increaseScore() { + + abilityScore++; + + } + } diff --git a/1410_DND/src/dnd/Fighter.java b/1410_DND/src/dnd/Fighter.java index 45040a4..bca8ab5 100644 --- a/1410_DND/src/dnd/Fighter.java +++ b/1410_DND/src/dnd/Fighter.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; public class Fighter implements ClassTemplate { diff --git a/1410_DND/src/dnd/Intelligence.java b/1410_DND/src/dnd/Intelligence.java index 16f8fc4..051ed92 100644 --- a/1410_DND/src/dnd/Intelligence.java +++ b/1410_DND/src/dnd/Intelligence.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; public class Intelligence extends Stats{ @@ -45,4 +45,11 @@ public class Intelligence extends Stats{ } + @Override + void increaseScore() { + + abilityScore++; + + } + } diff --git a/1410_DND/src/dnd/Skills.java b/1410_DND/src/dnd/Skills.java index 2221899..adff257 100644 --- a/1410_DND/src/dnd/Skills.java +++ b/1410_DND/src/dnd/Skills.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; /** * diff --git a/1410_DND/src/dnd/Stats.java b/1410_DND/src/dnd/Stats.java index e861b34..dcb5e46 100644 --- a/1410_DND/src/dnd/Stats.java +++ b/1410_DND/src/dnd/Stats.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; public abstract class Stats { @@ -53,5 +53,4 @@ public abstract class Stats { abstract String getDescription(); - } diff --git a/1410_DND/src/dnd/Strength.java b/1410_DND/src/dnd/Strength.java index 70e5be5..df00aa0 100644 --- a/1410_DND/src/dnd/Strength.java +++ b/1410_DND/src/dnd/Strength.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; public class Strength extends Stats { @@ -57,4 +57,11 @@ public class Strength extends Stats { } + @Override + void increaseScore() { + + abilityScore++; + + } + } diff --git a/1410_DND/src/dnd/Wisdom.java b/1410_DND/src/dnd/Wisdom.java index 1bb2252..8dc39cc 100644 --- a/1410_DND/src/dnd/Wisdom.java +++ b/1410_DND/src/dnd/Wisdom.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; public class Wisdom extends Stats { @@ -45,4 +45,11 @@ public class Wisdom extends Stats { } + @Override + void increaseScore() { + + abilityScore++; + + } + } diff --git a/1410_DND/src/dnd/Wizard.java b/1410_DND/src/dnd/Wizard.java index 0f97c26..5e62c93 100644 --- a/1410_DND/src/dnd/Wizard.java +++ b/1410_DND/src/dnd/Wizard.java @@ -1,4 +1,4 @@ -package com.builder; +package dnd; public class Wizard implements ClassTemplate { diff --git a/1410_DND/src/dnd/dndTestClient.java b/1410_DND/src/dnd/dndTestClient.java index 6beacbe..9ba3edb 100644 --- a/1410_DND/src/dnd/dndTestClient.java +++ b/1410_DND/src/dnd/dndTestClient.java @@ -9,7 +9,7 @@ public class dndTestClient { CharacterStats stats = new CharacterStats(10, 10, 10, 10, 10, 10); - Race chosenRace = new Human("Goblin"); + Human chosenRace = new Human("Goblin"); for(int i = 0; i < chosenRace.getASI().length; i++) { @@ -19,7 +19,7 @@ public class dndTestClient { Character characterInfo = new Character("Generic", 50, 4, 6, 150, "brown", "black", chosenRace); - System.out.println(); + System.out.println(characterInfo.toString()); }