Merge pull request #3 from MisterGC/feature/score-times-and-end

Feature/score times and end

src/CMakeLists.txt

@@ -9,10 +9,6 @@ find_package(Qt5 COMPONENTS Core Quick REQUIRED)
 
 add_executable (${PROJECT_NAME}
 main.cpp
-main.qml
-Sandbox.qml
-Player.qml
-Wall.qml
 res.qrc
 sound/sound.qrc
 visual/visual.qrc

src/Enemy.qml

@@ -26,7 +26,7 @@ GameEntity
         var e = fixture.getBody().target;
         if (theWorld.isInstanceOf(e, "Player")) {
             if (e.isDodging) theEnemy.destroy();
-            else text = "Got ya!";
+            else e.energy -= 1;
         }
     }
 

src/GameEnding.qml

@@ -0,0 +1,35 @@
+// (c) [email protected] - zlib license, see "LICENSE" file
+import QtQuick 2.12
+
+Rectangle {
+    id: theGameEnding
+
+    property Referee referee: null
+
+    visible: false
+    anchors.fill: parent
+    Component.onCompleted: {
+        referee.playerDied.connect(onPlayerDied);
+        referee.gardenDied.connect(onGardenDied);
+        referee.seasonEnded.connect(onSeasonEnded);
+    }
+
+    function onGardenDied() {showEnd("Garden died!");}
+    function onPlayerDied()  {showEnd("Player died!");}
+    function onSeasonEnded()  {showEnd("Season ended!");}
+
+    function showEnd(txt) {
+        if (!visible) {
+            theEndTxt.text = txt;
+            visible = true;
+        }
+    }
+
+    Text {
+        id: theEndTxt
+        anchors.centerIn: parent
+        font.pixelSize: parent.height * .1
+        text: "The Game ends ..."
+    }
+}
+

src/Garden.qml

@@ -16,8 +16,9 @@ GameEntity
                   collCat.magicProtection
     debug: true
     color: protection > 0 ? "lightgreen" : "green"
+    property int maxEnergy: widthWu * heightWu
     // Energy of the garden, if it is 0, the garden dead
-    property int energy: 100
+    property int energy: maxEnergy
     // Protection decreases dealt damage
     property int protection: 0
 

src/Player.qml

@@ -10,6 +10,9 @@ GameEntity
     id: thePlayer
     bodyType: Body.Dynamic
     bullet: true
+
+    property int energy: 3
+
     property real moveSpeed: 25
     property real dodgeSpeed: 0
     property real _desiredVeloX: 0
@@ -23,7 +26,8 @@ GameEntity
     onIsProtectingChanged: { awake = false; awake = true; }
 
     debug: true
-    onIsDodgingChanged: text = isDodging ? "~==>" : ""
+    text: energy > 0 ? "♥".repeat(energy) : "☠"
+
     categories: collCat.player
     collidesWith: collCat.enemy | collCat.staticGeo | collCat.garden
 

src/Referee.qml

@@ -0,0 +1,69 @@
+// (c) [email protected] - zlib license, see "LICENSE" file
+import QtQuick 2.12
+
+Item {
+    property var gardens: []
+    property var player: undefined
+    property real gardenPercentage: 100.0
+    property int maxEnergyGarden: 0
+    property int timeElapsed: 0
+
+    readonly property int seasonLength: 300
+    readonly property real seasonPercentage: Math.round(timeElapsed * 100.0 / seasonLength)
+    onSeasonPercentageChanged: {
+        if (seasonPercentage >= 100) {
+            theOneSecTimer.stop();
+            seasonEnded();
+        }
+    }
+
+    onPlayerChanged: {
+        if (player) {
+            player.energyChanged.connect(_onPlayerEnergyChanged);
+            theOneSecTimer.start();
+        }
+        else {
+            theOneSecTimer.stop();
+            gardens=[];
+            gardenPercentage=100.0;
+            maxEnergyGarden=0;
+            timeElapsed=0;
+        }
+    }
+
+
+    signal playerDied()
+    signal gardenDied()
+    signal seasonEnded()
+
+    Timer {
+        id: theOneSecTimer
+        interval: 1000
+        Component.onCompleted: start()
+        onTriggered: timeElapsed++
+        repeat: true
+    }
+
+    onGardenPercentageChanged: {
+        if (gardenPercentage <= 0) gardenDied()
+    }
+
+    function addGarden(garden) {
+        gardens.push(garden);
+        garden.energyChanged.connect(_onGardenEnergyChanged);
+        maxEnergyGarden += garden.maxEnergy;
+    }
+
+    function _onGardenEnergyChanged() {
+        let energy = 0;
+        for (const g of gardens)
+            energy += g.energy;
+        gardenPercentage = Math.round((energy/maxEnergyGarden) * 100.0);
+    }
+
+    function _onPlayerEnergyChanged() {
+        if (player.energy <= 0)
+            playerDied();
+    }
+
+}

src/Sandbox.qml

@@ -9,12 +9,13 @@ import Clayground.World 1.0
 ClayWorld {
     id: theWorld
 
-    map: "map.svg"
+    map: ""
     pixelPerUnit: height/70
     gravity: Qt.point(0,0)
     timeStep: 1/60.0
 
     property var player: null
+    //physicsDebugging: true
 
     QtObject {
         id: collCat
@@ -27,7 +28,10 @@ ClayWorld {
         readonly property int noCollision: Box.None
     }
 
-    onWorldAboutToBeCreated: player = null;
+    onWorldAboutToBeCreated: {
+        player = null;
+        theWeather.running = false;
+    }
     onWorldCreated: {
 //        theGameCtrl.selectKeyboard(Qt.Key_Up,
 //                                   Qt.Key_Down,
@@ -37,21 +41,38 @@ ClayWorld {
 //                                   Qt.Key_S);
         theGameCtrl.selectGamepad(0, true);
         theWorld.observedItem = player;
+        theWeather.running = true;
     }
 
-    Weather { }
+    Weather {id: theWeather }
+    Referee {
+        id: theReferee
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: parent.top
+        anchors.topMargin: 0.04 * parent.height
+        player: theWorld.player
+        Text {
+            id: refereeSays
+            anchors.centerIn: parent
+            text: Math.round(parent.gardenPercentage)
+                  + (parent.player ? ("/" + parent.player.energy) : "")
+                  + "/" + parent.seasonPercentage
+        }
+    }
 
     Keys.forwardTo: theGameCtrl
     GameController {
         id: theGameCtrl
         anchors.fill: parent
 
         onButtonAPressedChanged: {
+            if (!player) return;
             if (player.isProtecting) return;
             player.moveSpeed = buttonAPressed ? 35 : 18;
         }
 
         onButtonBPressedChanged: {
+            if (!player) return;
             let p = player;
             if (buttonBPressed) {
                 if (p.desiresToMove) p.dodgeSpeed = 75;
@@ -62,17 +83,20 @@ ClayWorld {
         }
 
         onAxisXChanged: {
+            if (!player) return;
             if (player.isProtecting) return;
             if (axisX > 0) player.moveRight();
             else if (axisX < 0) player.moveLeft();
             else { player.stopLeft(); player.stopRight();}
         }
         onAxisYChanged: {
+            if (!player) return;
             if (player.isProtecting) return;
             if (axisY > 0) player.moveUp();
             else if (axisY < 0) player.moveDown();
             else { player.stopUp(); player.stopDown();}
         }
+        //showDebugOverlay: true
 
     }
 
@@ -84,6 +108,9 @@ ClayWorld {
         else if (isInstanceOf(obj, "Enemy")) {
             obj.source = theWorld.resource("visual/enemy.png");
         }
+        else if (isInstanceOf(obj, "Garden")) {
+           theReferee.addGarden(obj);
+        }
     }
 
     SoundEffect {
@@ -93,4 +120,36 @@ ClayWorld {
         source: theWorld.resource("sound/bgmusic.wav")
         loops: SoundEffect.Infinite
     }
+
+    StartScreen {
+       visible: true
+        Component.onCompleted: {
+            theGameCtrl.buttonAPressedChanged.connect(startOnDemand)
+            theGameCtrl.buttonBPressedChanged.connect(startOnDemand)
+        }
+        function startOnDemand() {
+            if (visible) {
+                map = "";
+                map = "map.svg";
+                visible = false;
+            }
+        }
+    }
+
+    GameEnding {
+        referee: theReferee
+        Component.onCompleted: {
+            theGameCtrl.buttonAPressedChanged.connect(restartOnDemand)
+            theGameCtrl.buttonBPressedChanged.connect(restartOnDemand)
+        }
+
+        function restartOnDemand() {
+            if (visible) {
+                map = "";
+                map = "map.svg";
+                visible = false;
+            }
+        }
+    }
+
 }

src/StartScreen.qml

@@ -0,0 +1,20 @@
+// (c) [email protected] - zlib license, see "LICENSE" file
+import QtQuick 2.12
+
+Rectangle {
+    id: theStartScreen
+
+    property Referee referee: null
+    signal requestStart()
+
+    visible: false
+    anchors.fill: parent
+
+    Text {
+        anchors.centerIn: parent
+        font.pixelSize: parent.height * .07
+        text: "Welcome to the Game"
+    }
+}
+
+

src/Storm.qml

@@ -32,14 +32,5 @@ GameEntity
         repeat: true
     }
 
-    Component.onCompleted: {
-        for (let i=0; i<fixtures.length; ++i) {
-            let f = fixtures[i];
-            f.beginContact.connect(_onCollision);
-        }
-    }
-
-    function _onCollision(fixture) {
-    }
 }
 

src/Weather.qml

@@ -2,10 +2,21 @@
 import QtQuick 2.12
 
 Item {
-    Component.onCompleted: console.log("Test")
+    id: theWeather
+
+    property bool running: false
+    signal _destroyStorms()
+    onRunningChanged: {
+        if (running) theTimer.start()
+        else {
+            theTimer.stop()
+            _destroyStorms()
+        }
+    }
+
     Timer {
-        Component.onCompleted: start()
-        interval: 10000
+        id: theTimer
+        interval: 2000
         onTriggered: {
             let x = Math.random() * theWorld.worldXMax
             let y = Math.random() * theWorld.worldYMax
@@ -19,11 +30,10 @@ Item {
                                                   widthWu: 50,
                                                   heightWu: 50
                                               });
+            theWeather._destroyStorms.connect(storm.destroy);
         }
         repeat: true
     }
-    Component {
-       id: theStorm
-       Storm {}
-    }
+
+    Component { id: theStorm; Storm {} }
 }

src/res.qrc

@@ -2,10 +2,13 @@
     <qresource prefix="/">
         <file>main.qml</file>
         <file>Player.qml</file>
+        <file>GameEnding.qml</file>
         <file>GameEntity.qml</file>
         <file>Garden.qml</file>
         <file>Enemy.qml</file>
+        <file>Referee.qml</file>
         <file>Sandbox.qml</file>
+        <file>StartScreen.qml</file>
         <file>Storm.qml</file>
         <file>Weather.qml</file>
         <file>Wall.qml</file>