diff --git a/Main.java b/Main.java index b3adeb3..d7400a1 100644 --- a/Main.java +++ b/Main.java @@ -1,6 +1,5 @@ -import Pokemons.Gallade; -import Pokemons.Kirlia; -import Pokemons.Volcanion; +import pokemons.Gallade; +import pokemons.Volcanion; import ru.ifmo.se.pokemon.*; // Вариант 6310199 diff --git a/Makefile b/Makefile index baa2f59..7ad39e0 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ all: rm -rf target - javac -cp lib/pokemon.jar -d target -sourcepath . Main.java Pokemons/* Moves/* + javac -cp lib/pokemon.jar -d target -sourcepath . Main.java pokemons/* moves/* cd target; jar cfm app.jar ../MANIFEST.mf *.class ./**/*.class mv target/app.jar ./ rm -rf target diff --git a/Moves/Blizzard.java b/moves/Blizzard.java similarity index 91% rename from Moves/Blizzard.java rename to moves/Blizzard.java index 7d731a3..2061883 100644 --- a/Moves/Blizzard.java +++ b/moves/Blizzard.java @@ -1,4 +1,4 @@ -package Moves; +package moves; import ru.ifmo.se.pokemon.Effect; import ru.ifmo.se.pokemon.Pokemon; diff --git a/Moves/BodySlam.java b/moves/BodySlam.java similarity index 91% rename from Moves/BodySlam.java rename to moves/BodySlam.java index 906dc20..b155eb9 100644 --- a/Moves/BodySlam.java +++ b/moves/BodySlam.java @@ -1,4 +1,4 @@ -package Moves; +package moves; import ru.ifmo.se.pokemon.Effect; import ru.ifmo.se.pokemon.PhysicalMove; diff --git a/Moves/CalmMind.java b/moves/CalmMind.java similarity index 92% rename from Moves/CalmMind.java rename to moves/CalmMind.java index 8642ef8..34a64c8 100644 --- a/Moves/CalmMind.java +++ b/moves/CalmMind.java @@ -1,4 +1,4 @@ -package Moves; +package moves; import ru.ifmo.se.pokemon.Effect; import ru.ifmo.se.pokemon.Pokemon; diff --git a/Moves/DazzlingGleam.java b/moves/DazzlingGleam.java similarity index 89% rename from Moves/DazzlingGleam.java rename to moves/DazzlingGleam.java index 3d497b4..af9885d 100644 --- a/Moves/DazzlingGleam.java +++ b/moves/DazzlingGleam.java @@ -1,4 +1,4 @@ -package Moves; +package moves; import ru.ifmo.se.pokemon.SpecialMove; import ru.ifmo.se.pokemon.Type; diff --git a/Moves/DoubleTeam.java b/moves/DoubleTeam.java similarity index 92% rename from Moves/DoubleTeam.java rename to moves/DoubleTeam.java index a57b382..863a093 100644 --- a/Moves/DoubleTeam.java +++ b/moves/DoubleTeam.java @@ -1,4 +1,4 @@ -package Moves; +package moves; import ru.ifmo.se.pokemon.Effect; import ru.ifmo.se.pokemon.Pokemon; diff --git a/Moves/DrainingKiss.java b/moves/DrainingKiss.java similarity index 90% rename from Moves/DrainingKiss.java rename to moves/DrainingKiss.java index 7629deb..95c9ff0 100644 --- a/Moves/DrainingKiss.java +++ b/moves/DrainingKiss.java @@ -1,4 +1,4 @@ -package Moves; +package moves; import ru.ifmo.se.pokemon.*; diff --git a/Moves/FocusBlast.java b/moves/FocusBlast.java similarity index 91% rename from Moves/FocusBlast.java rename to moves/FocusBlast.java index 5842984..1cd95d7 100644 --- a/Moves/FocusBlast.java +++ b/moves/FocusBlast.java @@ -1,4 +1,4 @@ -package Moves; +package moves; import ru.ifmo.se.pokemon.*; diff --git a/Moves/Growl.java b/moves/Growl.java similarity index 91% rename from Moves/Growl.java rename to moves/Growl.java index aebca56..aa61f76 100644 --- a/Moves/Growl.java +++ b/moves/Growl.java @@ -1,4 +1,4 @@ -package Moves; +package moves; import ru.ifmo.se.pokemon.Effect; import ru.ifmo.se.pokemon.Pokemon; diff --git a/Moves/HydroPump.java b/moves/HydroPump.java similarity index 89% rename from Moves/HydroPump.java rename to moves/HydroPump.java index 32df858..77959b7 100644 --- a/Moves/HydroPump.java +++ b/moves/HydroPump.java @@ -1,4 +1,4 @@ -package Moves; +package moves; import ru.ifmo.se.pokemon.SpecialMove; import ru.ifmo.se.pokemon.Type; diff --git a/Moves/Swagger.java b/moves/Swagger.java similarity index 92% rename from Moves/Swagger.java rename to moves/Swagger.java index d16c935..14e82dd 100644 --- a/Moves/Swagger.java +++ b/moves/Swagger.java @@ -1,4 +1,4 @@ -package Moves; +package moves; import ru.ifmo.se.pokemon.Effect; import ru.ifmo.se.pokemon.Pokemon; diff --git a/Moves/ZenHeadbutt.java b/moves/ZenHeadbutt.java similarity index 92% rename from Moves/ZenHeadbutt.java rename to moves/ZenHeadbutt.java index ceabf70..234bc03 100644 --- a/Moves/ZenHeadbutt.java +++ b/moves/ZenHeadbutt.java @@ -1,4 +1,4 @@ -package Moves; +package moves; import ru.ifmo.se.pokemon.Effect; import ru.ifmo.se.pokemon.PhysicalMove; diff --git a/Pokemons/Gallade.java b/pokemons/Gallade.java similarity index 82% rename from Pokemons/Gallade.java rename to pokemons/Gallade.java index 65d6381..b9094cb 100644 --- a/Pokemons/Gallade.java +++ b/pokemons/Gallade.java @@ -1,6 +1,6 @@ -package Pokemons; +package pokemons; -import Moves.Swagger; +import moves.Swagger; import ru.ifmo.se.pokemon.Type; public class Gallade extends Kirlia { diff --git a/Pokemons/Kirlia.java b/pokemons/Kirlia.java similarity index 76% rename from Pokemons/Kirlia.java rename to pokemons/Kirlia.java index 649ff7b..e1527b3 100644 --- a/Pokemons/Kirlia.java +++ b/pokemons/Kirlia.java @@ -1,6 +1,6 @@ -package Pokemons; +package pokemons; -import Moves.DrainingKiss; +import moves.DrainingKiss; public class Kirlia extends Ralts { diff --git a/Pokemons/Ralts.java b/pokemons/Ralts.java similarity index 78% rename from Pokemons/Ralts.java rename to pokemons/Ralts.java index d52d133..a3b3bbc 100644 --- a/Pokemons/Ralts.java +++ b/pokemons/Ralts.java @@ -1,7 +1,7 @@ -package Pokemons; +package pokemons; -import Moves.CalmMind; -import Moves.DazzlingGleam; +import moves.CalmMind; +import moves.DazzlingGleam; import ru.ifmo.se.pokemon.Pokemon; import ru.ifmo.se.pokemon.Type; diff --git a/Pokemons/Slowking.java b/pokemons/Slowking.java similarity index 77% rename from Pokemons/Slowking.java rename to pokemons/Slowking.java index 1cefba9..8d6a183 100644 --- a/Pokemons/Slowking.java +++ b/pokemons/Slowking.java @@ -1,6 +1,6 @@ -package Pokemons; +package pokemons; -import Moves.FocusBlast; +import moves.FocusBlast; public class Slowking extends Slowpoke { public Slowking(String name, int level) { diff --git a/Pokemons/Slowpoke.java b/pokemons/Slowpoke.java similarity index 75% rename from Pokemons/Slowpoke.java rename to pokemons/Slowpoke.java index cca8b24..3f684ae 100644 --- a/Pokemons/Slowpoke.java +++ b/pokemons/Slowpoke.java @@ -1,8 +1,8 @@ -package Pokemons; +package pokemons; -import Moves.Blizzard; -import Moves.Growl; -import Moves.ZenHeadbutt; +import moves.Blizzard; +import moves.Growl; +import moves.ZenHeadbutt; import ru.ifmo.se.pokemon.Pokemon; import ru.ifmo.se.pokemon.Type; diff --git a/Pokemons/Volcanion.java b/pokemons/Volcanion.java similarity index 70% rename from Pokemons/Volcanion.java rename to pokemons/Volcanion.java index 8a71c1a..bd11473 100644 --- a/Pokemons/Volcanion.java +++ b/pokemons/Volcanion.java @@ -1,9 +1,9 @@ -package Pokemons; +package pokemons; -import Moves.BodySlam; -import Moves.DoubleTeam; -import Moves.HydroPump; -import Moves.Swagger; +import moves.BodySlam; +import moves.DoubleTeam; +import moves.HydroPump; +import moves.Swagger; import ru.ifmo.se.pokemon.*; public class Volcanion extends Pokemon {