diff --git a/DungeonAndDeamon/.export/dugeonanddemon.exe b/DungeonAndDeamon/.export/dugeonanddemon.exe deleted file mode 100644 index d2763c6..0000000 Binary files a/DungeonAndDeamon/.export/dugeonanddemon.exe and /dev/null differ diff --git a/DungeonAndDeamon/.export/dugeonanddemon.pck b/DungeonAndDeamon/.export/dugeonanddemon.pck deleted file mode 100644 index f92c486..0000000 Binary files a/DungeonAndDeamon/.export/dugeonanddemon.pck and /dev/null differ diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.cpp b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.cpp index d61ba66..6ebe080 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.cpp +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.cpp @@ -113,6 +113,7 @@ void GestionPlayer::bas() void GestionPlayer::saut() { + p.velocity.y = power_jump; } diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorp.h b/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorp.h index 14dd1ef..feb125f 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorp.h +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorp.h @@ -2,9 +2,18 @@ #include "MobsAgressif.h" #include #include +#include +#include +#include +#include + class MobsCorpACorp : public MobsAgressif { +public: + godot::Vector2 velocity; + + public: int rangeDegat; }; diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorpIA.cpp b/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorpIA.cpp index 3fde99b..d8a0bbd 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorpIA.cpp +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorpIA.cpp @@ -3,6 +3,7 @@ #include #include #include +#include "MobsCorpACorp.h" MobsCorpACorpIA::MobsCorpACorpIA() { @@ -28,6 +29,7 @@ void MobsCorpACorpIA::_register_methods() void MobsCorpACorpIA::_process(float delta) { + m.velocity = move_and_slide(m.velocity); } void MobsCorpACorpIA::_init() @@ -51,19 +53,7 @@ void MobsCorpACorpIA::_ready() void MobsCorpACorpIA::setupMobsCorpACorp() { - Transform2D t; - Vector2 v; - Size2 s; - //setup de la size - s.x = 1; - s.y = 1; - v.x = 500; - v.y = 10; - t.set_origin(v); - t.scale(s); - - set_transform(t); //Setup du shape Godot::print("SetUp de Shape Mobs"); @@ -83,3 +73,27 @@ void MobsCorpACorpIA::setupMobsCorpACorp() } +void MobsCorpACorpIA::setPosition(int x, int y) +{ + Transform2D t; + Vector2 v; + Size2 s; + + //setup de la size + s.x = 1; + s.y = 1; + v.x = x; + v.y = y; + t.set_origin(v); + t.scale(s); + + set_transform(t); +} + +void MobsCorpACorpIA::mouvement() +{ + m.velocity = Vector2(0, 0); + m.velocity.y += gravity; + +} + diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorpIA.h b/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorpIA.h index e51dc3c..55fe984 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorpIA.h +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/MobsCorpACorpIA.h @@ -5,6 +5,8 @@ #include #include #include "MobsCorpACorp.h" +#include + using namespace godot; @@ -33,11 +35,13 @@ public: void createMobsCorpACorp(); void setupMobsCorpACorp(); + void mouvement(); + void setPosition(int x, int y); + public: void Action(); + const int gravity = 90; + -private: - Vector2 velocity; - Vector2 FLOOR; };