Remove previously deprecated `dbgprint` function.

4 files changed, 12 insertions, 15 deletions

diff --git a/battle/main.py b/battle/main.py
index c686231..f3b13f9 100644
--- a/battle/main.py
+++ b/battle/main.py
@@ -47,7 +47,7 @@ def advance_wave(token, world, quest_id, next_wave):
 
     quest=dl_search(allquests[world], "quest_id", quest_id)
     if quest == "ERROR":
-        print("ERROR, INVALID QUEST")
+        stdout("ERROR, INVALID QUEST: %d" % (quest_id))
         # TODO: HANDLE THIS ERROR (FIXME)
 
     for en in quest["waves"][next_wave]:
diff --git a/battle/skills.py b/battle/skills.py
index 56ee4ac..e88a2ff 100644
--- a/battle/skills.py
+++ b/battle/skills.py
@@ -16,7 +16,7 @@
 #     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ########################################################################################
 # Battle Module - Skills
-from utils import dbgprint, Battle
+from utils import stdout, Battle
 from consts import (SK_SINGLE_DMG, SK_MULTI_DMG, SK_ATK_UP, SK_DEF_UP,
     SK_SINGLE_HEAL, SK_MULTI_HEAL, SC_ATKUP, SC_DEFUP)
 from battle.common import find_target, calc_dmg, attackall
@@ -39,7 +39,7 @@ def skill_core(token, mask, force, element):
     if mask & SK_SINGLE_DMG:
         # Single Damage skill: 1 strength = 1 damage
         target_id=find_target(token, "enemy")
-        dbgprint("Enemy selected: %d" % target_id)
+        stdout("Enemy selected: %d" % target_id)
         target=Battle[token]["enemy"][target_id]
         target["hp"]-=calc_dmg(token, dummy, target, dummy["atk"])
 
diff --git a/battle/summons.py b/battle/summons.py
index 5f0abf7..f3f4fd1 100644
--- a/battle/summons.py
+++ b/battle/summons.py
@@ -17,7 +17,7 @@
 #################################################################################
 # Battle Module - Summons
 import json
-from utils import (dbgprint, compress, allsummons, stdout, dl_search,
+from utils import (compress, allsummons, stdout, dl_search,
     Player, Battle)
 from consts import (ERR_ERR, ERR_BAD, ST_TOWN)
 from battle.skills import skill_core
@@ -39,19 +39,19 @@ def handle_summon(token, summon):
     # Check for victory/defeat conditions
     # Huge code duplication
 
-    dbgprint("Summon: Victory/Defeat Check")
+    stdout("Summon: Victory/Defeat Check")
     # HOLD THAT! Handle event
     if (not check_enemy_alive(token)):
         # You won! Do we have a next wave?
-        dbgprint("You won!")
+        stdout("You won!")
         if (Battle[token]["wave"] < Battle[token]["max_wave"]):
-            dbgprint("Next wave detected: %s, Quest ID: %s\nWave: %s" % (token, Battle[token]["quest_id"], Battle[token]["wave"]))
+            stdout("Next wave detected: %s, Quest ID: %s\nWave: %s" % (token, Battle[token]["quest_id"], Battle[token]["wave"]))
             advance_wave(token, Battle[token]["world"], Battle[token]["quest_id"], Battle[token]["wave"])
             # Do not continue this loop: End the turn now
             return battle_endturn(token, Battle[token]["spheres"])
         else:
             # You won!
-            dbgprint("Total Victory")
+            stdout("Total Victory")
             Player[token]["status"]=ST_TOWN
             # TODO: enemy die = add reward
             result=get_result(token, True, Battle[token]["world"], Battle[token]["quest_id"])
diff --git a/utils.py b/utils.py
index b8b8aad..c4f94c4 100644
--- a/utils.py
+++ b/utils.py
@@ -76,26 +76,23 @@ def date_from_now():
     return return_date(dt)
 
 
-def dbgprint(mx):
+def stdout(mx, verbose=1):
     print(mx)
-    if (debug):
+    if (debug >= verbose):
         dfile=open("debug.txt", 'a')
         dt=datetime.datetime.now().timetuple()
         date="[%04d-%02d-%02d %02d:%02d:%02d]" % (dt[0], dt[1], dt[2], dt[3], dt[4], dt[5])
         dfile.write("%s %s\n" % (date, mx))
         dfile.close()
 
-def stdout(mx):
-    dbgprint(mx)
-
 def compress(string):
-    dbgprint("Compress: Received JSON data: %s" % (string))
+    stdout("Compress: Received JSON data: %s" % (string))
     sjs=json.dumps(string)
     sjs=sjs.encode("ascii")
     sjs=zlib.compress(sjs)
     sjs=base64.b64encode(sjs)
     sjs=sjs.decode("ascii")
-    dbgprint("Compress: Sending base64+zlib JSON ASCII data: %s" % (sjs))
+    stdout("Compress: Sending base64+zlib JSON ASCII data: %s" % (sjs))
     return sjs
 
 # Search for array[?][key]==search in an array of dicts