Skip to content
Snippets Groups Projects
Commit ef6e0f5c authored by Lorenz Martin Diel's avatar Lorenz Martin Diel
Browse files

updated config.xml, now damagetable should completly work

parent b5f1013e
Branches
No related tags found
1 merge request!44updated config.xml, now damagetable should completly work
......@@ -40,7 +40,6 @@
<Weapons>
<PrimaryWeapon name="Bazooka">
<DamageTable>
<Damage unitId="recon" value="85"/>
<Damage unitId="apc" value="75"/>
<Damage unitId="anti_air_tank" value="65"/>
......@@ -50,7 +49,6 @@
<Damage unitId="artillery" value="70"/>
<Damage unitId="rocket_artillery" value="85"/>
<Damage unitId="anti_air_missile_launcher" value="85"/>
</DamageTable>
</PrimaryWeapon>
<SecondaryWeapon name="Machine-Gun">
......@@ -139,7 +137,6 @@
<Damage unitId="anti_air_missile_launcher" value="55"/>
<Damage unitId="transport_helicopter" value="105"/>
<Damage unitId="battle_helicopter" value="105"/>
<Damage unitId="stealth" value="75"/>
<Damage unitId="fighter" value="65"/>
<Damage unitId="bomber" value="75"/>
</DamageTable>
......@@ -244,7 +241,6 @@
<Weapons>
<PrimaryWeapon name="New Cannon">
<DamageTable>
<Damage unitId="recon" value="125"/>
<Damage unitId="apc" value="125"/>
<Damage unitId="anti_air_tank" value="115"/>
......@@ -254,7 +250,6 @@
<Damage unitId="artillery" value="115"/>
<Damage unitId="rocket_artillery" value="125"/>
<Damage unitId="anti_air_missile_launcher" value="125"/>
</DamageTable>
</PrimaryWeapon>
<SecondaryWeapon name="Machine-Gun">
......@@ -301,7 +296,6 @@
<Damage unitId="rocket_artillery" value="80"/>
<Damage unitId="anti_air_missile_launcher" value="80"/>
<Damage unitId="lander" value="55"/>
<Damage unitId="black_boat" value="55"/>
<Damage unitId="cruiser" value="50"/>
<Damage unitId="submarine" value="60"/>
<Damage unitId="battleship" value="40"/>
......@@ -334,7 +328,6 @@
<Damage unitId="rocket_artillery" value="85"/>
<Damage unitId="anti_air_missile_launcher" value="90"/>
<Damage unitId="lander" value="60"/>
<Damage unitId="black_boat" value="60"/>
<Damage unitId="cruiser" value="60"/>
<Damage unitId="submarine" value="85"/>
<Damage unitId="battleship" value="55"/>
......@@ -423,7 +416,6 @@
<PrimaryWeapon name="Torpedoes">
<DamageTable>
<Damage unitId="lander" value="95"/>
<Damage unitId="black_boat" value="95"/>
<Damage unitId="cruiser" value="25"/>
<Damage unitId="submarine" value="55"/>
<Damage unitId="battleship" value="55"/>
......@@ -456,7 +448,6 @@
<Damage unitId="rocket_artillery" value="85"/>
<Damage unitId="anti_air_missile_launcher" value="90"/>
<Damage unitId="lander" value="95"/>
<Damage unitId="black_boat" value="95"/>
<Damage unitId="cruiser" value="95"/>
<Damage unitId="submarine" value="95"/>
<Damage unitId="battleship" value="50"/>
......@@ -505,8 +496,6 @@
<DamageTable>
<Damage unitId="infantry" value="75"/>
<Damage unitId="mechanized_infantry" value="75"/>
</DamageTable>
</SecondaryWeapon>
</Weapons>
......@@ -526,7 +515,6 @@
<DamageTable>
<Damage unitId="transport_helicopter" value="100"/>
<Damage unitId="battle_helicopter" value="100"/>
<Damage unitId="fighter" value="55"/>
<Damage unitId="bomber" value="100"/>
</DamageTable>
......@@ -558,7 +546,6 @@
<Damage unitId="rocket_artillery" value="105"/>
<Damage unitId="anti_air_missile_launcher" value="105"/>
<Damage unitId="lander" value="95"/>
<Damage unitId="black_boat" value="95"/>
<Damage unitId="cruiser" value="85"/>
<Damage unitId="submarine" value="95"/>
<Damage unitId="battleship" value="75"/>
......
#pragma once
#include "Config.hpp"
#include "SDL_events.h"
#include "Scene.hpp"
#include "Spritesheet.hpp"
#include "Window.hpp"
#include <SDL.h>
#include <SDL_render.h>
#include <deque>
#include <memory>
#include <optional>
namespace advanced_wars
{
// Forward declaration
class Scene;
class Config;
/**
* @brief The main window of the game
*/
class Engine
{
public:
Engine(Window& window);
Engine(const Engine&) = delete;
Engine& operator=(const Engine&) = delete;
bool exited();
void exit();
void pump();
void pushScene(std::shared_ptr<Scene> scene);
std::optional<std::shared_ptr<Scene>> popScene();
void returnToMenu();
std::deque<SDL_Event>& events();
void setSpritesheet(Spritesheet& spritesheet);
Spritesheet* getSpritesheet();
int getStage();
Config& getUnitConfig();
void render();
SDL_Renderer* renderer();
~Engine();
private:
Window& m_window;
SDL_Renderer* m_SDLRenderer;
std::vector<std::shared_ptr<Scene>> m_scenes;
std::optional<Spritesheet*> m_spritesheet;
std::deque<SDL_Event> m_events;
bool m_quit;
int m_stage;
Config m_unitConfig;
};
} // namespace advanced_wars
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment