summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-12-29 16:19:31 -0300
committerJesusaves <cpntb1@ymail.com>2020-12-29 16:19:31 -0300
commit855efedd94fd3cdb4d11d919381e357979409e90 (patch)
treed2694d5850a3abc4efeb795fb0b6cda80d09401b
parent879b47781af227aac2fcf0a8348e720671ea89f6 (diff)
downloadclient-855efedd94fd3cdb4d11d919381e357979409e90.tar.gz
client-855efedd94fd3cdb4d11d919381e357979409e90.tar.bz2
client-855efedd94fd3cdb4d11d919381e357979409e90.tar.xz
client-855efedd94fd3cdb4d11d919381e357979409e90.zip
Clean up BATTLE once battle is over (hopefully to avoid accidental bugs)
-rw-r--r--game/battle.rpy6
-rw-r--r--game/quest.rpy3
2 files changed, 8 insertions, 1 deletions
diff --git a/game/battle.rpy b/game/battle.rpy
index 2d51b69..5cbb4a7 100644
--- a/game/battle.rpy
+++ b/game/battle.rpy
@@ -278,7 +278,11 @@ label results:
# Maybe we should update player quest
if not (quest["flags"] & 4):
if Player["quest"] < Battle["quest_id"]:
- Player["quest"]=Battle["quest_id"]
+ Player["quest"]=copy.copy(Battle["quest_id"])
+
+ # Cleaning up
+ python:
+ del Battle
jump restore
diff --git a/game/quest.rpy b/game/quest.rpy
index c1d6759..7e3dc21 100644
--- a/game/quest.rpy
+++ b/game/quest.rpy
@@ -169,5 +169,8 @@ label quest_selected:
#play music MUSIC_BATTLE.id() fadein 0.5
$ renpy.free_memory()
window hide
+ #$ renpy.jump_out_of_context("combat")
+ #$ renpy.call_in_new_context("combat")
+ #jump restore
jump combat