Mission fix

data/scripts/missions/easymission.lua

@@ -0,0 +1,47 @@
+function main() 
+	showMessage("Welcome to another mission script")
+
+	ships = {}
+	count = 5
+	radius = 40
+
+	playerPos = position(playerShip())
+
+	for i = 1, count do
+		local type = "basicship"
+		local ship = createShip(type)
+		local angle = (i/count) * (2 * math.pi)
+
+		local position = vec3(playerPos.x - 10 + math.cos(angle) * radius, playerPos.y -10 + math.sin(angle) * radius, playerPos.z - 60)
+
+		setPosition(ship, position)
+
+		task = createFightTask(ship)
+		addFightTaskTarget(task, playerShip())		
+
+		spawn(ship)
+		ships[i] = ship
+
+		onWorldObjectDestroyed(ship, "destroyed")
+	end
+
+	missionMessage("...and go!")
+end
+
+function missionTitle() 
+	return "Leave the turtle be" 
+end
+
+function missionCaption() 
+	return "The turtle has down thou no harm" 
+end
+
+function destroyed(ship) 
+	count = count - 1
+	if count == 0 then
+		missionSucceed()
+	end
+end
+
+
+

data/scripts/missions/killemall.lua

@@ -2,7 +2,7 @@ function main()
 	showMessage("Welcome to a mission script")
 
 	ships = {}
-	count = 6
+	count = 1
 	radius = 40
 
 	playerPos = position(playerShip())

data/scripts/scenarios/demo.lua

@@ -21,6 +21,11 @@ function startFightingMission(player)
 	onMissionSuccess(mission, "firework")
 end
 
+function startEasyFightingMission(player)
+	local mission = missionStart("easymission")
+	onMissionFailure(mission, "reset")
+end
+
 function reset(dummy) 
 	missionStartBanner = createWorldObject("missionstart")
 	setShowOnHud(missionStartBanner, true)
@@ -37,8 +42,11 @@ function firstChallengeTaken(dummy)
 end
 
 function startSecondChallenge()
-	print("lol, mission over")
-
+    initDifficultSecondChallenge()
+    initEasySecondChallenge()
+end
+
+function initDifficultSecondChallenge() 	
 	dareyouBanner = createWorldObject("idareyou")
 	setShowOnHud(dareyouBanner, true)
 	setCanLockOn(dareyouBanner, false)
@@ -49,6 +57,14 @@ function startSecondChallenge()
 	onAABBEntered(playerShip(), vec3(-120, 30, -380), vec3(-80, 70, -340), "startFightingMission")
 end
 
+function initEasySecondChallenge() 
+    tortess = createShip("startortress")    
+	setPosition(tortess, vec3(200, 50, -300))
+	spawn(tortess)
+
+	onAABBEntered(playerShip(), vec3(180, 30, -320), vec3(220, 70, -280), "startEasyFightingMission")
+end
+
 function secondChallengeTaken(dummy) 
 	createSingleShotTimer("firework", 3)
 end

src/collision/collisiondetector.cpp

@@ -74,7 +74,6 @@ std::list<VoxelCollision>& CollisionDetector::checkCollisions() {
     return m_collisions;
 }
 
-
 std::list<VoxelCollision>& CollisionDetector::checkCollisions(const std::unordered_set<WorldTreeGeode*>& possibleColliders) {
     for (WorldTreeGeode* possibleCollider : possibleColliders) {
         assert(possibleCollider->worldObject() != nullptr);

src/events/aabbenteredpoll.cpp

@@ -18,10 +18,7 @@ bool AABBEnteredPoll::isDead() {
 }
 
 bool AABBEnteredPoll::poll() {
-    if (m_worldObject.valid()) {
-        return m_worldObject->bounds().aabb().intersects(m_aabb);
-    }
-    return false;
+    return m_worldObject.valid() ? m_worldObject->bounds().aabb().intersects(m_aabb) : false;
 }
 
 void AABBEnteredPoll::specialOnCallback() {

src/events/missionstatepoll.cpp

@@ -1,20 +1,20 @@
 #include "missionstatepoll.h"
 
 
-MissionStatePoll::MissionStatePoll(const Handle<Mission>& mission, MissionState state, const Callback& callback):
+MissionStatePoll::MissionStatePoll(Mission& mission, MissionState state, const Callback& callback):
     EventPoll(callback),
-    m_mission(mission),
+    m_mission(&mission),
     m_state(state),
     m_dead(false)
 {
 }
 
 bool MissionStatePoll::isDead() {
-    return m_dead || !m_mission.valid();
+    return m_dead;
 }
 
 bool MissionStatePoll::poll() {
-    return m_mission.valid() && m_mission->state() == m_state;
+    return m_mission->state() == m_state;
 }
 
 void MissionStatePoll::specialOnCallback() {

src/events/missionstatepoll.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <glow/ref_ptr.h>
+
 #include "missions/mission.h"
 
 #include "utils/handle/handle.h"
@@ -9,13 +11,13 @@
 
 class MissionStatePoll : public EventPoll {
 public:
-    MissionStatePoll(const Handle<Mission>& mission, MissionState state, const Callback& callback);
+    MissionStatePoll(Mission& mission, MissionState state, const Callback& callback);
 
     virtual bool isDead() override;
 
 
 protected:
-    Handle<Mission> m_mission;
+    const glow::ref_ptr<Mission> m_mission;
     MissionState m_state;
     bool m_dead;
 

src/missions/mission.cpp

@@ -38,18 +38,27 @@ void Mission::succeed() {
 
     m_state = MissionState::Succeeded;
     m_script->onSuccess();
-    m_script->stop();
+
+    over();
 }
 
 void Mission::fail() {
     assert(m_state == MissionState::Running);
 
     m_state = MissionState::Failed;
     m_script->onFailure();
-    m_script->stop();
+
+    over();
 }
 
 void Mission::update(float deltaSec) {
 
 }
 
+void Mission::over() {
+    m_script->stop();
+
+    assert(world());
+    world()->removeElement(this);
+}
+

src/missions/mission.h

@@ -3,12 +3,13 @@
 #include <memory>
 #include <string>
 
-#include "utils/handle/handleowner.h"
-
 #include "scripting/scriptable.h"
 
+#include "world/worldelement.h"
+
 
 class MissionScript;
+class World;
 
 enum class MissionState {
     Idle,
@@ -17,7 +18,7 @@ enum class MissionState {
     Succeeded
 };
 
-class Mission : public Scriptable, public HandleOwner {
+class Mission : public WorldElement {
 public:
     Mission(const std::string& path);
     ~Mission();
@@ -41,6 +42,10 @@ class Mission : public Scriptable, public HandleOwner {
     void update(float deltaSec);
 
 
+protected:
+    void over();
+
+
 protected:
     std::shared_ptr<MissionScript> m_script;
     MissionState m_state;

src/scenarios/missionscenario.cpp

@@ -1,7 +1,6 @@
 #include "missionscenario.h"
 
 #include "missions/mission.h"
-#include "missions/missionsystem.h"
 
 #include "player.h"
 
@@ -18,7 +17,7 @@ MissionScenario::MissionScenario(GamePlay* gamePlay, const std::string& path):
     BaseScenario(gamePlay),
     m_mission(new Mission(path))
 {
-
+    World::instance()->addElement(m_mission);
 }
 
 void MissionScenario::populateWorld() {
@@ -28,6 +27,7 @@ void MissionScenario::populateWorld() {
     m_world->god().scheduleSpawn(playerShip);
 
     World::instance()->player().setShip(playerShip);
-    World::instance()->missionSystem().addMission(m_mission);
+
+    m_mission->start();
 }
 

src/scenarios/missionscenario.h

@@ -15,7 +15,7 @@ class MissionScenario : public BaseScenario {
 
 
 protected:
-    std::shared_ptr<Mission> m_mission;
+    Mission* m_mission;
 
     virtual void populateWorld() override;
 };

src/scripting/bindings/externalmissionbindings.cpp

@@ -3,8 +3,6 @@
 #include "events/eventpoller.h"
 #include "events/missionstatepoll.h"
 
-#include "missions/missionsystem.h"
-
 #include "scripting/scriptengine.h"
 #include "scripting/gameplayscript.h"
 #include "scripting/elematelua/luawrapper.h"
@@ -29,8 +27,10 @@ void ExternalMissionBindings::bind() {
 apikey ExternalMissionBindings::apiMissionStart(const std::string& name) {
     std::string path = std::string("data/scripts/missions/") + name + ".lua";
 
-    auto mission = std::make_shared<Mission>(path);
-    World::instance()->missionSystem().addMission(mission);
+    auto mission = new Mission(path);
+    World::instance()->addElement(mission);
+
+    mission->start();
 
     return mission->scriptKey();
 }
@@ -49,7 +49,7 @@ apikey ExternalMissionBindings::createStatePoll(apikey missionKey, MissionState
        return -1;
     }
 
-    auto poll = std::make_shared<MissionStatePoll>(makeHandle(mission), state, createCallback(callback, missionKey));
+    auto poll = std::make_shared<MissionStatePoll>(*mission, state, createCallback(callback, missionKey));
 
     World::instance()->eventPoller().addPoll(poll);
     m_script.addLocal(poll);

src/scripting/gameplayscript.cpp

@@ -20,11 +20,7 @@
 GamePlayScript::GamePlayScript(ScriptEngine& scriptEngine):
     m_scriptEngine(&scriptEngine)
 {
-    addBindings(new CommonBindings(*this));
-    addBindings(new WorldObjectBindings(*this));
-    addBindings(new AiBindings(*this));
-    addBindings(new SquadBindings(*this));
-    addBindings(new ExternalMissionBindings(*this));
+    addGamePlayBindings();
 }
 
 GamePlayScript::~GamePlayScript() {
@@ -60,3 +56,12 @@ void GamePlayScript::addLocal(Scriptable* scriptable) {
     scriptable->setScriptLocal(true);
     m_locals.push_back(scriptable->scriptKey());
 }
+
+void GamePlayScript::addGamePlayBindings() {
+    addBindings(new CommonBindings(*this));
+    addBindings(new WorldObjectBindings(*this));
+    addBindings(new AiBindings(*this));
+    addBindings(new SquadBindings(*this));
+    addBindings(new ExternalMissionBindings(*this));
+}
+