fix bug

Quests/Kanto/BoulderBadgeQuest.lua

@@ -93,7 +93,7 @@ function BoulderBadgeQuest:new()
 end
 
 function BoulderBadgeQuest:isDoable()
-	if self:hasMap()
+	if self:hasMap() and not hasItem("HM01")
 	then
 		return true
 	end
@@ -106,11 +106,11 @@ end
 
 -- in case of black out
 function BoulderBadgeQuest:ViridianPokémonCenter()
-	return moveToArea("Viridian City")
+	return moveToCell(9, 129)
 end
 
 function BoulderBadgeQuest:ViridianCity()
-	return moveToArea("Route 2")
+	return moveToCell(142,48)
 end
 
 function BoulderBadgeQuest:Route2()
@@ -171,7 +171,9 @@ function BoulderBadgeQuest:Route2Stop2()
 end
 
 function BoulderBadgeQuest:route2Up()
-    if not dialogs.npcYoungsterJohn.state then 
+    if not self:isTrainingOver() then
+	  moveToGrass()
+    elseif not dialogs.npcYoungsterJohn.state then 
 	   talkToNpcOnCell(26,78)
     else 
 	   moveToCell(20,56)
@@ -180,7 +182,9 @@ end
 
 function BoulderBadgeQuest:PewterCity()
 	--if not hasBadge("Boulder Badge") then 
-	 if not  dialogs.npcBrock.state then
+	 if not self:isTrainingOver() then
+	    moveToCell(21,63)
+	 elseif not  dialogs.npcBrock.state then
 		if not dialogs.npcDavePewter.state    then 
 		   return talkToNpcOnCell(22,55)
 		elseif   not game.isTeamFullyHealed() then

Quests/Kanto/CascadeBadgeQuest.lua

@@ -10,7 +10,7 @@ local Dialog = require "Quests/Dialog"
 
 local name        = 'Cascade Badge Quest'
 local description = 'From Cerulean to Route 5'
-local level       = 10
+local level       = 29
 
 local dialogs = {
 	npcMisty = Dialog:new({
@@ -38,14 +38,14 @@ function CascadeBadgeQuest:new()
 end
 
 function CascadeBadgeQuest:isDoable()
-	if self:hasMap() and not hasItem("HM01 - Cut") then
+	if self:hasMap() and not hasItem("HM09") then
 		return true
 	end
 	return false
 end
 
 function CascadeBadgeQuest:isDone()
-	if getMapName() == "Route 5" then
+	if getAreaName() == "Route 5" then
 		return true
 	else
 		return false
@@ -54,12 +54,12 @@ end
 
 
 function CascadeBadgeQuest:CeruleanCity()
-    if self:needPokecenter()  or not game.isTeamFullyHealed() then
+    if self:needPokecenter()  or not game.isTeamFullyHealed() or self.registeredPokecenter !=  "Cerulean Pokémon Center" then
 		return moveToCell(162,114)
-	--elseif self:needPokemart() then
+--	elseif self:needPokemart() then
 	--	return moveToCell(166,133) -- pokemart
-	elseif  not self:isTrainingOver() then
-		return moveToCell(39,0)-- Route 24 Bridge'
+	elseif  not self:isTrainingOver() or getPokemonLevel(1) < level  then
+		return moveToCell(115,101)-- Route 24 Bridge'
 	elseif not isTrainerInfoReceived()   then
            log("getting trainer info")
            return askForTrainerInfo()
@@ -68,7 +68,7 @@ function CascadeBadgeQuest:CeruleanCity()
     elseif not hasItem("S.S. Ticket") then 
 	     return moveToCell(183,73)
 	else
-		return moveToCell(155,138) -- Route 5
+		return moveToCell(155,140) -- Route 5
 	end
 end
 
@@ -80,16 +80,25 @@ function CascadeBadgeQuest:CeruleanHouse6()
 	end
 end
 
+function CascadeBadgeQuest:Route4()
+	if not self:isTrainingOver() or getPokemonLevel(1) < level then
+		return moveToGrass()
+	else 
+		return moveToCell(130,101)
+	end
+end
+
 function CascadeBadgeQuest:CeruleanPokémonMart()
 	self:pokemart(22,7)
 end
 
 function CascadeBadgeQuest:CeruleanPokémonCenter()
- if not game.isTeamFullyHealed() then
-	return self:pokecenter("Cerulean City")
-  else
-  return moveToCell(61,26)
-  end 
+-- if not game.isTeamFullyHealed() then
+--	return self:pokecenter("Cerulean City")
+ -- else
+ -- return moveToCell(61,26)
+--  end 
+return self:pokecentercell(61,26)
 end
 
 
@@ -124,18 +133,20 @@ end
 
 
 function CascadeBadgeQuest:CeruleanGym() -- get Cascade Badge
-		if not isTrainerInfoReceived()   then
+	if not isTrainerInfoReceived()   then
            log("getting trainer info")
            return askForTrainerInfo()
-		   elseif  not game.isTeamFullyHealed() then
+    else
+	 if  not game.isTeamFullyHealed() then
 		return moveToCell(51,136)
-	elseif countBadges() <= 1 and ccountBadges() >= 0 then
+	elseif countBadges() <= 1 and countBadges() >= 0 then
 		return talkToNpcOnCell(51, 109)
 	elseif countBadges() == 2  and not dialogs.npcafterbeat.state then 
 	     return talkToNpcOnCell(55, 131)
 	else 
 	   return  moveToCell(51,136)
 	end
+	end 
 end
 
 return CascadeBadgeQuest

Quests/Kanto/EarthBadgeQuest.lua

@@ -0,0 +1,222 @@
+-- Copyright � 2016 g0ld <g0ld@tuta.io>
+-- This work is free. You can redistribute it and/or modify it under the
+-- terms of the Do What The Fuck You Want To Public License, Version 2,
+-- as published by Sam Hocevar. See the COPYING file for more details.
+-- Quest: @Rympex
+
+
+local sys    = require "Libs/syslib"
+local game   = require "Libs/gamelib"
+local Quest  = require "Quests/Quest"
+local Dialog = require "Quests/Dialog"
+local name		  = 'Earth Badge'
+local description = ' Beat Giovanni'
+local level = 48
+local dialogs = {
+	Lance = Dialog:new({ 
+		"There is always someone better than you!",
+	}),
+	Gary = Dialog:new({ 
+		"Ok ok, you are the champ, I'm the loser...",
+	}),
+}
+local EarthBadgeQuest = Quest:new()
+
+function EarthBadgeQuest:new()
+	local o = Quest.new(EarthBadgeQuest, name, description, level,dialogs)
+	o.statusrepel = false
+	return o
+end
+
+function EarthBadgeQuest:isDoable()
+	if self:hasMap() then --Fixed DC on gym after win
+		return true
+	end
+	return false
+end
+
+function EarthBadgeQuest:isDone()
+	if  getMapName() == "Pallet House" then --Fixed DC on gym after win, and Blackout
+		return true
+	end
+	return false	
+end
+
+function EarthBadgeQuest:Route21()
+ if getPlayerY() < 70  then
+	 moveToCell(84,27)
+  else 
+   moveToCell(150,203)
+ end 
+
+end
+
+function EarthBadgeQuest:Route22()
+
+moveToCell(39,89)
+end
+
+function EarthBadgeQuest:PokémonLeagueReception()
+
+moveToCell(25,11)
+end
+
+function EarthBadgeQuest:Route23()
+if getPlayerX() <= 52 and getPlayerY() > 92 then
+moveToCell(32,94)
+else 
+ if not self:isTrainingOver() then 
+ moveToCell(53,94)
+ else
+moveToCell(41,50)
+end 
+
+end
+end 
+
+function EarthBadgeQuest:IndigoPlateau()
+ if not self:isTrainingOver() then 
+ moveToCell(41,53)
+ else
+moveToCell(42,24)
+end 
+end 
+function EarthBadgeQuest:VictoryRoad()
+   if not self:isTrainingOver() then 
+   moveToRectangle(23,235,25,236)
+ else
+   moveToCell(23,240)
+    end 
+end
+function EarthBadgeQuest:PokémonLeague()
+   if not self:isTrainingOver() then 
+   moveToCell(40,55)
+ else
+ if isNpcOnCell(52,35)  then 
+ talkToNpcOnCell(52,35)
+ else 
+   moveToCell(51,31)
+    end 
+	end 
+end
+
+function EarthBadgeQuest:KantoLeague()
+  if game.inRectangle(15,5,35,30) then 
+     moveToCell(25,7)
+	 elseif game.inRectangle(15,58,35,84) then 
+     moveToCell(25,60) 
+	  elseif game.inRectangle(67,5,87,32) then 
+     moveToCell(77,7) 
+	   elseif game.inRectangle(66,60,100,97) then 
+	   if not dialogs.Lance.state then 
+
+	   talkToNpcOnCell(76,72)
+	   else 
+     moveToCell(77,62) 
+	 end 
+ end 
+
+end
+
+function EarthBadgeQuest:KantoHallofFame()
+ if not dialogs.Gray.state then 
+   talkToNpcOnCell(134,105)
+   end 
+
+end
+
+
+function EarthBadgeQuest:VictoryRoad1F()
+if self.statusrepel == false and hasItem("Max Repel") then
+self.statusrepel = true 
+return useItem("Max Repel")
+else
+	return  moveToCell(9,9)
+end 
+-- end 
+end
+function EarthBadgeQuest:VictoryRoad2F()
+ --if getPlayerY() > 24 then
+	 moveToCell(11,96)
+-- end 
+end
+
+function EarthBadgeQuest:VictoryRoad3F()
+ --if getPlayerY() > 24 then
+
+	 moveToCell(41,159)
+
+-- end 
+end
+function EarthBadgeQuest:Route21Gate()
+ --if getPlayerY() > 24 then
+	 moveToCell(11,10)
+-- end 
+end
+
+function EarthBadgeQuest:PlayerBedroomPallet()
+	return moveToArea("Player House Pallet")
+end
+
+function EarthBadgeQuest:PlayerHousePallet()
+ if getPlayerY() > 24 then
+	return moveToCell(4,10)
+ end 
+end
+
+function EarthBadgeQuest:PalletTown()
+moveToCell(150,168)
+end
+
+function EarthBadgeQuest:Route1()
+ moveToArea("Viridian City")
+end
+
+
+function EarthBadgeQuest:ViridianPokémonCenter()
+   self.statusrepel = false
+	self:pokecenter("Viridian City")
+end
+
+function EarthBadgeQuest:ViridianPokémonMart()
+	self:pokemartrepel(10,68)
+end
+
+function EarthBadgeQuest:ViridianCity()
+self.statusrepel = false
+if not isTrainerInfoReceived()   then
+           log("getting trainer info")
+           return askForTrainerInfo()
+else 
+	if self:needPokecenter() or not game.isTeamFullyHealed() or  self.registeredPokecenter ~= "Viridian Pokémon Center"  then
+		moveToCell(146, 91)
+	elseif self:needPokemart() then
+		return moveToArea("Viridian Pokemart")
+	elseif countBadges() < 8 then
+		return moveToCell(159,68)
+--	elseif not self:isTrainingOver() then
+	--	return fatal("Error This team can't beat Giovanni")
+
+	else
+		return moveToArea("Route 22")--Cell(98,103) --Viridian Gym 2
+	end
+end
+end 
+
+
+function EarthBadgeQuest:ViridianGym()
+if not isTrainerInfoReceived()   then
+           log("getting trainer info")
+           return askForTrainerInfo()
+else 
+	if countBadges() < 8 and getPlayerY() >= 60 then
+		return requestPathForQuestId(getMainQuestId())
+	elseif countBadges() < 8  then
+	   return 	talkToNpcOnCell(171,58)
+	else
+		return requestPathForQuestId(getMainQuestId())
+	end
+end 
+end
+
+return EarthBadgeQuest