Skip to content

Patch 1 #2

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
herbertmilhomme wants to merge 7 commits into
base: PokemonUnity
Choose a base branch
from
Open

Patch 1 #2

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c2aca2
Modified ToString Return
herbertmilhomme Jun 4, 2018
32e7e22
Correcting Typos
herbertmilhomme Jun 4, 2018
38e3b46
More NULL Checks, and Fixes
herbertmilhomme Jun 4, 2018
968a4dd
Last and final tweaks
herbertmilhomme Jun 4, 2018
08e86b9
Final FINAL tweaks...
herbertmilhomme Jun 4, 2018
b4d32f6
Update Pokemon.cs
herbertmilhomme Jun 5, 2018
7be8231
Merge branch 'PokemonUnity' into patch-1
herbertmilhomme Jun 5, 2018
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
101 changes: 51 additions & 50 deletions PokemonDatabase/Source Files/CSVDatabaseReader/CSVDatabaseReader/Pokemon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
Expand Down Expand Up @@ -94,53 +94,54 @@ public enum Types
///<summary>Int value doesnt matter, ex `.ToString(1);`</summary>
public override string ToString()
{
return string.Format("new PokemonData({0} {1} {2} {3} {4} {5} {6} {7} {8} {9} " +
"{10} {11} {12} {13} {14} {15} {16} {17} {18} {19} " +
"{20} {21} {22} {23} {24} {25} {26} {27} {28} {29} " +
"{30} {31}),",
NAME == null ? "" : "\nId: Pokemons." + NAME.ToUpper(),
RegionalDex == null ? "" : ",\nregionalDex: new int[]{" + RegionalDex + "}",
Type1 == null || Type1 == "Types.NONE" ? "" : ",\ntype1: Types." + Type1,
Type2 == null || Type2 == "Types.NONE" ? "" : ",\ntype2: Types." + Type2,
Ability1 == null || Ability1 == "Abilities.NONE" ? "" : ",\nability1: Abilities." + Ability1,
Ability2 == null || Ability2 == "Abilities.NONE" ? "" : ",\nability2: Abilities." + Ability2,
HiddenAbility == null || HiddenAbility == "Abilities.NONE" ? "" : ",\nhiddenAbility: Abilities." + HiddenAbility,
MaleRatio == null ? "" : ",\nmaleRatio: " + MaleRatio,
CatchRate == null ? "" : ",\ncatchRate: " + CatchRate,
EggGroup1 == null || EggGroup1 == "EggGroups.NONE" ? "" : ",\neggGroup1: EggGroups." + EggGroup1,
EggGroup2 == null || EggGroup2 == "EggGroups.NONE" ? "" : ",\neggGroup2: EggGroups." + EggGroup2,
HatchTime == null ? "" : ",\nhatchTime: " + HatchTime,
Height == null ? "" : ",\nheight: " + Height,
Weight == null ? "" : ",\nweight: " + Weight,
LevelingRate == null ? "" : ",\nlevelingRate: LevelingRate." + LevelingRate,//\n" +
PokedexColor == null ? "" : ",\npokedexColor: Color." + PokedexColor,
BaseFriendship == null ? "" : ",\nbaseFriendship: " + BaseFriendship,
EXPYield == null ? "" : ",\nbaseExpYield: " + EXPYield,
BSHP == null ? "" : ",\nbaseStatsHP: " + BSHP,
BSATK == null ? "" : ",baseStatsATK: " + BSATK,
BSDEF == null ? "" : ",baseStatsDEF: " + BSDEF,
BSSPA == null ? "" : ",baseStatsSPA: " + BSSPA,
BSSPD == null ? "" : ",baseStatsSPD: " + BSSPD,
BSSPE == null ? "" : ",baseStatsSPE: " + BSSPE,//\n" +
EYHP == null || EYHP == "0" ? "" : ",\nevHP: " + EYHP,
EYATK == null || EYATK == "0" ? "" : ",evATK: " + EYATK,
EYDEF == null || EYDEF == "0" ? "" : ",evDEF: " + EYDEF,
EYSPA == null || EYSPA == "0" ? "" : ",evSPA: " + EYSPA,
EYSPD == null || EYSPD == "0" ? "" : ",evSPD: " + EYSPD,
EYSPE == null || EYSPE == "0" ? "" : ",evSPE: " + EYSPE,//\n" +
//NAME == null? "" : "$"luminance: "+Luminance,\n" +
",\nmovesetmoves: new PokemonMoveset[] " +
//$"\n" +
"{\n" +
//trimend goes on last value, but there's also a comma before every value so it's fine
//it balances out the extra, and also if the value is null, you're not left with additional
//or dangling commas to trigger any errors.
Moves.TrimEnd(',') + "\n" +
"}",
//$"\n" +
PokemonEvolution == null ? "" : ",\nevolution: new IPokemonEvolution[] {" + PokemonEvolution + "}"
//,HeldItem == null? "" : "heldItem: "+HeldItem +","
);
}
}
return string.Format("new PokemonData({0} {1} {2} {3} {4} {5} {6} {7} {8} {9} " +
"{10} {11} {12} {13} {14} {15} {16} {17} {18} {19} " +
"{20} {21} {22} {23} {24} {25} {26} {27} {28} {29} " +
"{30} {31}),",
NAME == null? "" : "\nId: Pokemons."+NAME.ToUpper(),
RegionalDex == null? "" : ",\nregionalDex: new int[]{"+RegionalDex+"}",
Type1 == null || Type1 == "Types.NONE"? "" : ",\ntype1: Types."+Type1,
Type2 == null || Type2 == "Types.NONE"? "" : ",\ntype2: Types."+Type2,
Ability1 == null || Ability1 == "Abilities.NONE"? "" : ",\nability1: Abilities."+Ability1,
Ability2 == null || Ability2 == "Abilities.NONE"? "" : ",\nability2: Abilities."+Ability2,
HiddenAbility == null || HiddenAbility == "Abilities.NONE"? "" : ",\nhiddenAbility: Abilities."+HiddenAbility,
MaleRatio == null? "" : ",\nmaleRatio: "+MaleRatio,
CatchRate == null? "" : ",\ncatchRate: "+CatchRate,
EggGroup1 == null || EggGroup1 == "EggGroups.NONE"? "" : ",\neggGroup1: EggGroups."+EggGroup1,
EggGroup2 == null || EggGroup2 == "EggGroups.NONE"? "" : ",\neggGroup2: EggGroups."+EggGroup2,
HatchTime == null? "" : ",\nhatchTime: "+HatchTime,
Height == null? "" : ",\nheight: "+Height,
Weight == null? "" : ",\nweight: "+Weight,
LevelingRate == null? "" : ",\nlevelingRate: LevelingRate."+LevelingRate,//\n" +
PokedexColor == null? "" : ",\npokedexColor: Color."+PokedexColor,
BaseFriendship == null? "" : ",\nbaseFriendship: "+BaseFriendship,
EXPYield == null? "" : ",\nbaseExpYield: "+EXPYield,
BSHP == null? "" : ",\nbaseStatsHP: "+BSHP,
BSATK == null? "" : ",baseStatsATK: "+BSATK,
BSDEF == null? "" : ",baseStatsDEF: "+BSDEF,
BSSPA == null? "" : ",baseStatsSPA: "+BSSPA,
BSSPD == null? "" : ",baseStatsSPD: "+BSSPD,
BSSPE == null? "" : ",baseStatsSPE: "+BSSPE,//\n" +
EYHP == null || EYHP == "0"? "" : ",\nevHP: "+EYHP,
EYATK == null || EYATK == "0"? "" : ",evATK: "+EYATK,
EYDEF == null || EYDEF == "0"? "" : ",evDEF: "+EYDEF,
EYSPA == null || EYSPA == "0"? "" : ",evSPA: "+EYSPA,
EYSPD == null || EYSPD == "0"? "" : ",evSPD: "+EYSPD,
EYSPE == null || EYSPE == "0"? "" : ",evSPE: "+EYSPE,//\n" +
//NAME == null? "" : "$"luminance: "+Luminance,\n" +
",\nmovesetmoves: new PokemonMoveset[] " +
//$"\n" +
"{\n" +
//trimend goes on last value, but there's also a comma before every value so it's fine
//it balances out the extra, and also if the value is null, you're not left with additional
//or dangling commas to trigger any errors.
LevelMoves.TrimEnd(',') + "\n" +
","+TMMoves.TrimEnd(',') + "\n" +
"}",
//$"\n" +
PokemonEvolution == null? "" : ",\nevolution: new IPokemonEvolution[] {" + PokemonEvolution +"}"
//,HeldItem == null? "" : "heldItem: "+HeldItem +","
);
}
}
}