fixed a lot of small bugs and stuff from the game show

tizian · Oct 21, 2017 · 968c97f · 968c97f
1 parent 1a894a8
commit 968c97f
Show file tree

Hide file tree

Showing 25 changed files with 203 additions and 203 deletions.
diff --git a/db/game_data.db b/db/game_data.db
diff --git a/db/insert_scripts/insert_text_core_utf8.sql b/db/insert_scripts/insert_text_core_utf8.sql
@@ -196,7 +196,7 @@ INSERT INTO text (text_id, english, german, swiss_german, spanish) values ('Scre
 INSERT INTO text (text_id, english, german, swiss_german, spanish) values ('SecondSpell','2. Spell','2. Zauber','2. Zauber','2. Hechizo');
 INSERT INTO text (text_id, english, german, swiss_german, spanish) values ('ShadowDamage','Shadow Damage','Schattenschaden','Schatteschade','Daño de sombra');
 INSERT INTO text (text_id, english, german, swiss_german, spanish) values ('ShadowResistance','Shadow Resistance','Schattenresistenz','Schatteresistenz','Resistencia a sombra');
-INSERT INTO text (text_id, english, german, swiss_german, spanish) values ('Smoothing','Texture Smoothing','Texturen glätten','Texture verschmiere','Suavizado de textura');
+INSERT INTO text (text_id, english, german, swiss_german, spanish) values ('Smoothing','Texture Smoothing','Texturen glätten','Texture glätte','Suavizado de textura');
 INSERT INTO text (text_id, english, german, swiss_german, spanish) values ('Sound','Sound','Musik','Musig','Sonido');
 INSERT INTO text (text_id, english, german, swiss_german, spanish) values ('SoundVolume','Sound Volume','Lautstärke Effekte','Effekt-Luutstärchi','Volumen de sonido');
 INSERT INTO text (text_id, english, german, swiss_german, spanish) values ('MusicVolume','Music Volume','Lautstärke Musik','Musig-Luutstärchi','Volumen de música');

diff --git a/db/insert_scripts/insert_text_credits_utf8.sql b/db/insert_scripts/insert_text_credits_utf8.sql
@@ -66,6 +66,8 @@ Haab
 
 "Crypt Keep"
 
+"Cathedral Theme"
+
 ---
 
 -- Susanne Aubert --
@@ -90,8 +92,6 @@ Haab
 
 "Elysia''s Theme"
 
-"Cathedral Theme"
-
 "Lighthouse Theme"
 
 ---
@@ -255,6 +255,8 @@ Haab
 
 "Crypt Keep"
 
+"Cathedral Theme"
+
 ---
 
 -- Susanne Aubert --
@@ -279,8 +281,6 @@ Haab
 
 "Elysia''s Theme"
 
-"Cathedral Theme"
-
 "Lighthouse Theme"
 
 ---
@@ -441,6 +441,8 @@ Haab
 
 "Crypt Keep"
 
+"Cathedral Theme"
+
 ---
 
 -- Susanne Aubert --
@@ -465,8 +467,6 @@ Haab
 
 "Elysia''s Theme"
 
-"Cathedral Theme"
-
 "Lighthouse Theme"
 
 ---

diff --git a/db/insert_scripts/insert_text_hint_utf8.sql b/db/insert_scripts/insert_text_hint_utf8.sql
@@ -7,7 +7,7 @@ INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) va
 INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('Inventory', 'hint_desc','to open the inventory.','um das Inventar zu öffnen.','zums Inventar ufmache.','para abrir el inventario.');
 
 INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('Chop', 'hint','Attack (Chop)','Attackieren (Schlagen)','Attackiere (Haue)','Ataque (Pegar)');
-INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('Chop', 'hint_desc','to chop with your weapon. You can also use a left mouse click, if that attack is selected.','um mit deiner Waffe zu schlagen. Du kannst auch einen linken Mausklick verwenden, wenn diese Attacke ausgwählt ist.','zum mit dinere Waffe haue. Du chasch au en lingge Muusklick verwende, wenn die Attacke usgwählt isch.','para pegar con el arma. También puedes hacer clic con el botón izquierdo del mouse, si ese ataque está seleccionado.');
+INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('Chop', 'hint_desc','or left click to chop with your weapon.','oder klicke um mit deiner Waffe zu schlagen.','oder klick zum mit dinere Waffe haue.','para pegar con el arma. También puedes hacer clic con el botón izquierdo del mouse, si ese ataque está seleccionado.');
 
 INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('LeaveLevel', 'hint','Leave Level','Level verlassen','Level verlah','Salir del nivel');
 INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('LeaveLevel', 'hint_desc','when standing at a level exit to leave the level.','wenn du bei einem Level-Ausgang stehst, um das Level zu verlassen.','wenn du vor emne Level-Usgang stahsch zum use gah.','al estar en la salida de un nivel, para salir del nivel.');
@@ -26,7 +26,7 @@ INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) va
 
 
 INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('Jump', 'hint','Jump','Springen','Springe','Salar');
-INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('Jump', 'hint_desc','briefly for a small jump, and longer for a high jump.','kurz für einen kleinen Sprung, und länger für einen hohen.','churz für en chline Sprung und länger für en hoche Sprung.','para salar.');
+INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('Jump', 'hint_desc','to jump.','um zu springen.','zum springe.','para salar.');
 
 INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('Pickup', 'hint','Item pickup','Gegenstände aufnehmen','Gegeständ ufnä','Levantar objeto');
 INSERT INTO text (text_id, text_type, english, german, swiss_german, spanish) values ('Pickup', 'hint_desc','to pick up an item.','um einen Gegenstand aufzuheben','zum es Item ne.','para levanter un objeto.');

diff --git a/db/insert_scripts/insert_text_sign_utf8.sql b/db/insert_scripts/insert_text_sign_utf8.sql
@@ -1,10 +1,6 @@
 INSERT INTO text (text_id, text_type, english, german, swiss_german) values ('Inn','sign','Inn','Gasthof','Gasthof');
 INSERT INTO text (text_id, text_type, english, german, swiss_german) values ('Gandria','sign','Gandria','Gandria','Gandria');
 INSERT INTO text (text_id, text_type, english, german, swiss_german) values ('NoSwimming','sign','No swimming','Nicht schwimmen','Nid schwümme');
-INSERT INTO text (text_id, text_type, english, german, swiss_german) values ('DangerRockfall','sign','DANGER
-Rockfall Area','GEFAHR
-Felssturz','ACHTUNG
-Felssturz');
 INSERT INTO text (text_id, text_type, english, german, swiss_german) values ('NeedIce','sign','Try ice magic','Versuch''s mit Eismagie','Probier''s mit Iismagie');
 INSERT INTO text (text_id, text_type, english, german, swiss_german) values ('NeedLight','sign','Need light...','Brauchst Licht...','Bruuchsch es Liechtli...');
 INSERT INTO text (text_id, text_type, english, german, swiss_german) values ('ElonaGrave','sign','Here lies my dear Elona

diff --git a/include/Level/DynamicTiles/FallingTile.h b/include/Level/DynamicTiles/FallingTile.h
@@ -35,7 +35,7 @@ class FallingTile final : public LevelDynamicTile, public MovableGameObject {
 
 	const float GRAVITY_ACCELERATION = 1000.f;
 	const float RETURN_VELOCITY = 80.f;
-	const float AGGRO_DISTANCE = 200.f;
+	const float AGGRO_DISTANCE = 250.f;
 	const sf::Time WAITING_TIME = sf::seconds(2.f);
 
 	float m_initialHeight = 0.f;

diff --git a/include/Level/DynamicTiles/TorchTile.h b/include/Level/DynamicTiles/TorchTile.h
@@ -13,7 +13,10 @@ namespace particles {
 class TorchTile final : public LevelDynamicTile {
 public:
 	TorchTile(LevelScreen* levelScreen);
+	~TorchTile();
 	bool init(const LevelTileProperties& properties) override;
+	void render(sf::RenderTarget& target) override;
+	void update(const sf::Time& frameTime) override;
 	void loadAnimation(int skinNr) override;
 	void onHit(Spell* spell) override;
 	const std::string& getColor() const;
@@ -24,7 +27,7 @@ class TorchTile final : public LevelDynamicTile {
 	void loadComponents();
 	std::string getSpritePath() const override;
 	LightComponent* m_lightComponent;
-	ParticleComponent* m_particleComponent;
+	ParticleComponent* m_particleComponent = nullptr;
 	particles::AimedVelocityGenerator* m_velGen = nullptr;
 	std::string m_color;
 };
diff --git a/include/Level/MOBBehavior/MovingBehavior.h b/include/Level/MOBBehavior/MovingBehavior.h
@@ -67,7 +67,7 @@ class MovingBehavior {
 	// helper method used for collision checking
 	void checkXYDirection(const sf::Vector2f& nextPosition, bool& collidesX, bool& collidesY);
 	// if the position delta is too high (> tileSize), the mob is killed and no further collisions are checked.
-	void checkForCollisionTilt(const sf::Vector2f& oldPosition);
+	void checkForCollisionTilt(const sf::Vector2f& oldPosition, float oldVelocity);
 	bool m_isCollisionTilt = false;
 	bool m_isCollisionTiltSuppressed = false;
 

diff --git a/include/Screens/LevelScreen.h b/include/Screens/LevelScreen.h
@@ -40,7 +40,6 @@ class LevelScreen final : public WorldScreen {
 	const LevelData* getWorldData() const override;
 
 	// extra render textures for particles using special blend
-	sf::RenderTexture& getParticleBTRenderTexture();
 	sf::RenderTexture& getParticleFGRenderTexture();
 	sf::RenderTexture& getParticleBGRenderTexture();
 	sf::RenderTexture& getParticleEQRenderTexture();
@@ -75,7 +74,6 @@ class LevelScreen final : public WorldScreen {
 	ScreenOverlay* m_gamePausedOverlay = nullptr;
 
 	sf::Color m_equipmentColor = COLOR_WHITE;
-	sf::RenderTexture m_particleBTRenderTexture;
 	sf::RenderTexture m_particleBGRenderTexture;
 	sf::RenderTexture m_particleFGRenderTexture;
 	sf::RenderTexture m_particleEQRenderTexture;