Changed monsters stats

Fixed bug with perk selection
ooxi · Sep 18, 2010 · d2cd02e · d2cd02e
1 parent 4035aeb
commit d2cd02e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/monsters/runner/stats b/monsters/runner/stats
@@ -1 +1 @@
-1.0 0.6 1.0
+1.0 0.6 1.0 0 0
diff --git a/monsters/spider/stats b/monsters/spider/stats
@@ -1 +1 @@
-1.7 0.6 0.7
+1.7 1.0 0.7 4000 2000
diff --git a/monsters/zombie/stats b/monsters/zombie/stats
@@ -1 +1 @@
-0.9 0.3 2.0
+1.1 0.3 2.5 10000 3000
diff --git a/src/program.cpp b/src/program.cpp
@@ -166,7 +166,7 @@ void spawnEnemy(float x, float y, float r, int baseLvl, int lvl) {
 			newMonster->Id, newMonster));
 }
 
-// The beginning of new game in a survival mode
+// The beginning of new game in selected mode
 void startGame(std::string elementName) {
 	if (aim)
 		delete aim;
@@ -526,6 +526,12 @@ void refreshCharStatsWindow() {
 		charStats->addElement("+looting", videoManager->RegularText->getObject(
 				"+", r, videoManager->RegularText->getHeight() * 9.0f,
 				TextManager::CENTER, TextManager::MIDDLE));
+
+	if (player->WideSight)
+		charStats->addElement("+widesight",
+				videoManager->RegularText->getObject("+", r,
+						videoManager->RegularText->getHeight() * 10.0f,
+						TextManager::CENTER, TextManager::MIDDLE));
 }
 
 void increaseVioletParam(std::string elementName) {
@@ -1698,6 +1704,12 @@ void handlePlayer(LifeForm* lf) {
 		player->teleport();
 		player->ActionMode = PLAYER_ACT_MODE_FIRE;
 		player->setMask(0.0f, 1.0f, 1.0f, 1.0f);
+
+		if (player->WideSight) {
+			player->TargetX = player->X;
+			player->TargetY = player->Y;
+		}
+
 		delete aim;
 		aim = new Aim(config);
 	}

diff --git a/src/system/InputHandler.cpp b/src/system/InputHandler.cpp
@@ -38,9 +38,9 @@ void InputHandler::setInputModeText(bool mandatory, std::string text) {
 		return;
 
 	if (mandatory)
-		setInputMode( TextMandatory);
+		setInputMode(TextMandatory);
 	else
-		setInputMode( Text);
+		setInputMode(Text);
 
 	m_textContent = text;
 	m_curTextPos = strlen(m_textContent.c_str());
@@ -68,9 +68,9 @@ bool InputHandler::getPressInput(GameInputEvents evnt) {
 }
 
 void InputHandler::resetMouseButtons() {
-	processEvent(Mouse,false,SDL_BUTTON_LEFT);
-	processEvent(Mouse,false,SDL_BUTTON_RIGHT);
-	processEvent(Mouse,false,SDL_BUTTON_MIDDLE);	
+	processEvent(Mouse, false, SDL_BUTTON_LEFT);
+	processEvent(Mouse, false, SDL_BUTTON_RIGHT);
+	processEvent(Mouse, false, SDL_BUTTON_MIDDLE);
 }
 
 void InputHandler::processEvent(BindingType type, bool down, int value) {
@@ -83,7 +83,7 @@ void InputHandler::processEvent(BindingType type, bool down, int value) {
 void InputHandler::processTextInput(SDL_Event event) {
 	switch (event.key.keysym.sym) {
 	case SDLK_ESCAPE:
-		setInputMode( Direct);
+		setInputMode(Direct);
 		break;
 	case SDLK_BACKSPACE:
 		if (m_curTextPos > 0)