don't teleport the player home

Author: oflatt

src/Animation.py

@@ -23,7 +23,9 @@ def __init__(self, picnames, framerate, loopp = True, surfacelist = False, offse
         self.relativeframerate = False
         self.offsetlist = offsetlist
 
-    def current_frame(self, outerframerate = None, begin_time = None, current_time = variables.settings.current_time):
+    def current_frame(self, outerframerate = None, begin_time = None, current_time = None):
+        if current_time == None:
+            current_time = variables.settings.current_time
         if begin_time == None:
             begin_time = self.beginning_time
         at = current_time-begin_time

src/Battle.py

@@ -92,7 +92,7 @@ def __init__(self, enemy):
         self.battlechoice = ChoiceButtons(
             ["   DANCE!   ", "leave", variables.settings.soundpack, self.getscalename()], 13 / 16)
 
-        self.retrychoice = ChoiceButtons(["retry", "go home"], 13/16)
+        self.retrychoice = ChoiceButtons(["retry", "flee"], 13/16)
 
         # if pausetime is 0 it is not paused, otherwise it is paused and it records when it was paused
         self.pausetime = 0
@@ -629,6 +629,10 @@ def ontick(self):
                     classvar.player.health = self.newplayerhealth  # set it to the new health when done
                     if self.newplayerhealth <= 0:
                         self.state = "lose"
+                        classvar.player.addstoryevents(
+                            self.enemy.storyeventsonlose)
+                        classvar.player.timeslost += 1
+                        classvar.player.totalbattles += 1
                         if self.enemy.name == "chimney":
                             maps.engage_conversation("losetochimney", True)
                     elif self.newenemyhealth == self.enemy.health:  # if done with the animation
@@ -647,6 +651,7 @@ def ontick(self):
                 if self.enemy.health <= self.newenemyhealth:
                     self.enemy.health = self.newenemyhealth
                     if self.newenemyhealth <= 0:
+                        classvar.player.totalbattles += 1
                         self.state = "win"
                     elif classvar.player.health == self.newplayerhealth:  # if done with the animation
                         self.state = "dance"  # exit
@@ -676,21 +681,15 @@ def togotexp(self):
             classvar.player.heal()
         self.state = "got exp"
 
+    # go home (currently unused)
 
-    def lose(self):
-        # go home
-        classvar.player.addstoryevents(self.enemy.storyeventsonlose)
-        
+    def teleport_home(self):
         maps.teleportplayerhome()
-        
-        classvar.player.timeslost += 1
-        classvar.player.totalbattles += 1
         returntoworld()
 
 
     def win(self):
         classvar.player.addstoryevents(self.enemy.storyeventsonwin)
-        classvar.player.totalbattles += 1
         returntoworld()
 
     def flee(self):
@@ -711,7 +710,7 @@ def change_scale(offset):
 
         if(devoptions.devmode):
             if(key == devoptions.devlosebattlekey):
-                self.lose()
+                self.flee()
             elif(key == devoptions.devwinbattlekey):
                 self.win()
         if self.state == 'dance':
@@ -759,7 +758,7 @@ def change_scale(offset):
                 if self.retrychoice.getoption() == "retry":
                     self.startnew()
                 else:
-                    self.lose()
+                    self.flee()
             else:
                 self.retrychoice.leftrightonkey(key)
         elif self.state == "win" and variables.checkkey("enter", key):

src/bearly_dancing.py

@@ -274,8 +274,8 @@ def draw_world():
 
 
     # update the screen
-    if len(variables.dirtyrects) > 0 and devoptions.devmode:
-        pygame.draw.rect(variables.screen, variables.BLUE, variables.dirtyrects[0], 1)
+    #if len(variables.dirtyrects) > 0 and devoptions.devmode:
+    #pygame.draw.rect(variables.screen, variables.BLUE, variables.dirtyrects[0], 1)
 
     variables.updatescreen()
 

src/devoptions.py

@@ -5,7 +5,7 @@
 testsmallp = False
 devmode = True
 # skip the fight with steve, add the event to the player
-skipsteve = True
+skipsteve = False
 # adds all the soundpacks and keys to the player
 addallrewards = False
 # generates a new world on load no matter what

src/properties.txt

@@ -58,7 +58,6 @@ sound
 battle
 - Feedback on starting a note, not just ending it?
 - Croc too wide
-
 - change color of note while holding note
 - battle code is ugly and convoluted with all the time/health variables
 
@@ -86,7 +85,6 @@ Knob ideas for the beatmap generator
 - sway probabilities for repeating at different lengths, and the size of these repetitions
 
 
-
 graphics
 - frames around progress bars
 - random drumming octopus, drum mode