Skip to content

Complete and refactor Lannister house character #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fredmomo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Complete and refactor Lannister house character #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions practicas/gameofthrones/characters/CerseiLannister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,34 @@
/**
*
* @author ReturnHttp402(https://github.com/ReturnHttp402)
*
*/
public class CerseiLannister extends Character {

private List<String> titles = new ArrayList<String>();
titles.add("Queen of the Andals and the First Men");
titles.add("Protector of the Seven Kingdoms");
titles.add("Lady of the Casterly Rock");
titles.add("Lady Paramount of the Westerlands");
titles.add("Wardeness of the West");
titles.add("Queen Mother");
titles.add("Queen Regent");
titles.add("Queen Consort");
private String fullname = "Queen Cersei I Lannister";
private String portrayedBy = "Lena Headey";
private House house = "House Lannister"
private List<String> titles;
private String nickname;
private String fullName;
private String portrayedBy;
private House house;

public CerseiLannister(House house){
his.titles = new ArrayList<String>();
this.generateTitles();
this.nickname = "Queen of the Seven Kingdoms";
this.fullName = "Queen Cersei I Lannister";
this.portrayedBy = "Lena Headey";
//house might be better assigned if it was passed into the constructor
//this character, could be from different houses, but only could be currently in a house
this.house = house;
}
private void generateTitles() {
this.titles.add("Queen of the Andals and the First Men");
this.titles.add("Protector of the Seven Kingdoms");
this.titles.add("Lady of the Casterly Rock");
this.titles.add("Lady Paramount of the Westerlands");
this.titles.add("Wardeness of the West");
this.titles.add("Queen Mother");
this.titles.add("Queen Regent");
this.titles.add("Queen Consort");
}
}
10 changes: 0 additions & 10 deletions practicas/gameofthrones/characters/Jaime.java
View file
Open in desktop

This file was deleted.

29 changes: 29 additions & 0 deletions practicas/gameofthrones/characters/JaimeLannister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/**
*
* @author ReturnHttp402(https://github.com/ReturnHttp402)
*
*/
public class JaimeLannister extends Character {

private List<String> titles;
private String nickname;
private String fullName;
private String portrayedBy;
private House house;

public JaimeLannister(House house){
his.titles = new ArrayList<String>();
this.generateTitles();
this.nickname = "Kingslayer";
this.fullName = "Jaime Lannister";
this.portrayedBy = "Nikolaj Coster-Waldau"
//house might be better assigned if it was passed into the constructor
//this character, could be from different houses, but only could be currently in a house
this.house = house;
}
private void generateTitles() {
this.titles.add("Kingslayer");
this.titles.add("Oathbreaker");
}

}
29 changes: 29 additions & 0 deletions practicas/gameofthrones/characters/LancelLannister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/**
*
* @author ReturnHttp402(https://github.com/ReturnHttp402)
*
*/
public class LancelLannister extends Character {
private List<String> titles;
private String nickname;
private String fullName;
private String portrayedBy;
private House house;

public LancelLannister(House house){
his.titles = new ArrayList<String>();
this.generateTitles();
this.nickname = "";
this.fullName = "Lancel Lannister";
this.portrayedBy = "EUGENE SIMON"
//house might be better assigned if it was passed into the constructor
//this character, could be from different houses, but only could be currently in a house
this.house = house;
}
private void generateTitles() {
this.titles.add("A first cousin of Queen Cersei");
this.titles.add("Oathbreaker");
}


}