Merge pull request #28 from ZtModArchive/develop

Develop

Author: Zt-freak

castor.json

@@ -2,7 +2,7 @@
   "ArchiveName": "zzz-ArluqTools",
   "RepoName": "ZtModArchive/ArluqTools",
   "Author": "Apodemus",
-  "Version": "v2.5",
+  "Version": "v2.6",
   "Type": "package",
   "License": "MIT License",
   "Description": "This is a lua library that is an abstraction  layer around ZT2's libraries.",

scripts/arluq.lua

@@ -5,6 +5,7 @@ include "modules/ZtModArchive/ArluqTools/scripts/services/AnimalService.lua"
 include "modules/ZtModArchive/ArluqTools/scripts/services/CollectionService.lua"
 include "modules/ZtModArchive/ArluqTools/scripts/services/FenceService.lua"
 include "modules/ZtModArchive/ArluqTools/scripts/services/GuestService.lua"
+include "modules/ZtModArchive/ArluqTools/scripts/services/StaffService.lua"
 include "modules/ZtModArchive/ArluqTools/scripts/services/TimeService.lua"
 include "modules/ZtModArchive/ArluqTools/scripts/services/ZooService.lua"
 
@@ -19,5 +20,6 @@ aq.collection = CollectionService
 aq.animal = AnimalService
 aq.fence = FenceService
 aq.guest = GuestService
+aq.staff = StaffService
 aq.time = TimeService
 aq.zoo = ZooService

scripts/lua/logging.lua

@@ -5,22 +5,26 @@ log = {}
 --- @param message string
 function log.debug (message)
     print(os.date("[%Y-%m-%d %H:%M:%S] ") .. "[DEBUG] " .. message)
+    io.flush()
 end
 
 --- Log error to output
 --- @param message string
 function log.error (message)
     print(os.date("[%Y-%m-%d %H:%M:%S] ") .. "[ERROR] " .. message)
+    io.flush()
 end
 
 --- Log info to output
 --- @param message string
 function log.info (message)
     print(os.date("[%Y-%m-%d %H:%M:%S] ") .. "[INFO] " .. message)
+    io.flush()
 end
 
 --- Log warning to output
 --- @param message string
 function log.warn (message)
     print(os.date("[%Y-%m-%d %H:%M:%S] ") .. "[WARN] " .. message)
+    io.flush()
 end

scripts/lua/try.lua

@@ -1,4 +1,4 @@
-include "scripts/lua/logging.lua"
+include "modules/ZtModArchive/ArluqTools/scripts/lua/logging.lua"
 
 --- Function for try-catching
 --- @param func function
@@ -15,6 +15,8 @@ function try(func)
         end
         -- Show exception in log output
         log.error(exception)
+    else
+        log.info(status)
     end
 end
 

scripts/services/StaffService.lua

@@ -0,0 +1,9 @@
+-- Include Zoo Tycoon 2 libraries
+include "scenario/scripts/entity.lua"
+include "scenario/scripts/misc.lua"
+include "scenario/scripts/token.lua"
+include "scenario/scripts/ui.lua"
+include "scripts/canreproduce.lua"
+
+--- Service for modifiying animals
+StaffService = {}

scripts/services/ZooService.lua

@@ -60,6 +60,6 @@ end
 
 --- Get zoo name
 --- @return string
-function ZooService.getZooName   ()
+function ZooService.getZooName ()
     return getZooName ()
 end