isaacscript 2.6.2 → 2.7.0

package/isaacscript-watcher/main.lua

@@ -21,11 +21,11 @@ font:Load("font/pftempestasevencondensed.fnt") -- A vanilla font good for this k
 local connected = false
 local sprite = nil
 
-local IsaacScriptWatcher = RegisterMod("IsaacScript Watcher", 1)
+local mod = RegisterMod("IsaacScript Watcher", 1)
 
 -- On mod initialization, nuke the "save#.dat" folder to get rid of old messages that might be left
 -- there from IsaacScript.
-IsaacScriptWatcher:SaveData("")
+mod:SaveData("")
 
 local function pushMessageArray(msg)
   frameOfLastMsg = Isaac.GetFrameCount()
@@ -45,20 +45,20 @@ local function getScreenBottomRightPos()
 end
 
 -- ModCallbacks.MC_POST_RENDER (2)
-function IsaacScriptWatcher:PostRender()
+function mod:PostRender()
   -- Don't do anything while fading in to a new run to prevent crashes.
   if game:GetFrameCount() < 1 then
     return
   end
 
-  IsaacScriptWatcher:RenderSprite()
-  IsaacScriptWatcher:RenderText()
-  IsaacScriptWatcher:LoadSaveDat()
-  IsaacScriptWatcher:CheckInput()
-  IsaacScriptWatcher:CheckRestart()
+  mod:RenderSprite()
+  mod:RenderText()
+  mod:LoadSaveDat()
+  mod:CheckInput()
+  mod:CheckRestart()
 end
 
-function IsaacScriptWatcher:RenderSprite()
+function mod:RenderSprite()
   -- Determine if IsaacScript is connected or not.
   local frameCount = Isaac.GetFrameCount()
   connected = frameCount - frameOfLastSuccessfulLoad <= FRAMES_BEFORE_DISCONNECTED
@@ -68,7 +68,14 @@ function IsaacScriptWatcher:RenderSprite()
     if sprite == nil then
       sprite = Sprite()
       sprite:Load("gfx/logo.anm2", true)
-      sprite:SetFrame("Default", 0)
+
+      local lastMsg = messageArray[#messageArray]
+      local compiling = string.match(lastMsg, "Compiling the mod for the first time...")
+      local animation = "Default"
+      if compiling ~= nil then
+        animation = "Green"
+      end
+      sprite:Play(animation)
     end
   else
     if sprite ~= nil then
@@ -80,11 +87,11 @@ function IsaacScriptWatcher:RenderSprite()
   if sprite ~= nil then
     local bottomRightPos = getScreenBottomRightPos()
     local position = bottomRightPos + SPRITE_BOTTOM_RIGHT_OFFSET
-    sprite:RenderLayer(0, position)
+    sprite:Render(position)
   end
 end
 
-function IsaacScriptWatcher:RenderText()
+function mod:RenderText()
   -- Don't draw IsaacScript text when custom consoles are open.
   if AwaitingTextInput then
     return
@@ -124,24 +131,9 @@ function IsaacScriptWatcher:RenderText()
     return
   end
 
-  local white = KColor(1, 1, 1, alpha)
-  local red = KColor(1, 0, 0, alpha)
-  local green = KColor(0, 1, 0, alpha)
-
   -- Go through each message.
   for i, msg in ipairs(messageArray) do
-    local color = white
-
-    local hasSuccess = string.match(msg, "Compilation successful.")
-    if hasSuccess ~= nil then
-      color = green
-    end
-
-    local hasErrors = string.match(msg, "Found [0-9]+ errors.")
-    if hasErrors ~= nil then
-      color = red
-    end
-
+    local color = mod:GetColorForMsg(msg, alpha)
     font:DrawStringScaledUTF8(
       msg,
       x,
@@ -155,7 +147,25 @@ function IsaacScriptWatcher:RenderText()
   end
 end
 
-function IsaacScriptWatcher:LoadSaveDat()
+function mod:GetColorForMsg(msg, alpha)
+  local white = KColor(1, 1, 1, alpha)
+  local red = KColor(1, 0, 0, alpha)
+  local green = KColor(0, 1, 0, alpha)
+
+  local hasSuccess = string.match(msg, "Compilation successful.")
+  if hasSuccess ~= nil then
+    return green
+  end
+
+  local hasErrors = string.match(msg, "Found [0-9]+ errors.")
+  if hasErrors ~= nil then
+    return red
+  end
+
+  return white
+end
+
+function mod:LoadSaveDat()
   -- Local variables
   local isaacFrameCount = Isaac.GetFrameCount()
 
@@ -165,13 +175,13 @@ function IsaacScriptWatcher:LoadSaveDat()
   end
 
   -- Check to see if there a "save.dat" file for this save slot.
-  if not Isaac.HasModData(IsaacScriptWatcher) then
-    IsaacScriptWatcher:ClearSaveDat()
+  if not Isaac.HasModData(mod) then
+    mod:ClearSaveDat()
     return
   end
 
   -- The server will write JSON data for us to the "save#.dat" file in the mod subdirectory.
-  if not pcall(IsaacScriptWatcher.Load) then
+  if not pcall(mod.Load) then
     -- Sometimes loading can fail if the file is currently being being written to, so give up for
     -- now and try again on the next interval.
     Isaac.DebugString(
@@ -184,12 +194,12 @@ function IsaacScriptWatcher:LoadSaveDat()
 
   if #saveData > 0 then
     local saveDatContents = saveData
-    IsaacScriptWatcher:ClearSaveDat()
-    IsaacScriptWatcher:LoadSuccessful(saveDatContents)
+    mod:ClearSaveDat()
+    mod:LoadSuccessful(saveDatContents)
   end
 end
 
-function IsaacScriptWatcher:LoadSuccessful(saveDatContents)
+function mod:LoadSuccessful(saveDatContents)
   frameOfLastSuccessfulLoad = Isaac.GetFrameCount()
 
   for _, entry in ipairs(saveDatContents) do
@@ -205,23 +215,35 @@ function IsaacScriptWatcher:LoadSuccessful(saveDatContents)
     elseif entry.type == "msg" then
       Isaac.DebugString(MOD_NAME .. " - " .. entry.data)
       pushMessageArray(entry.data)
+
+      if sprite ~= nil then
+        local starting1 = string.match(entry.data, "TypeScript change detected.")
+        local starting2 = string.match(entry.data, "Compiling the mod for the first time...")
+        local finished1 = string.match(entry.data, "Compilation successful.")
+        local finished2 = string.match(entry.data, "Found [0-9]+ errors.")
+        if starting1 ~= nil or starting2 ~= nil then
+          sprite:Play("Green")
+        elseif finished1 ~= nil or finished2 ~= nil then
+          sprite:Play("Default")
+        end
+      end
     end
   end
 end
 
-function IsaacScriptWatcher:ClearSaveDat()
+function mod:ClearSaveDat()
   saveData = {}
-  IsaacScriptWatcher:Save()
+  mod:Save()
 end
 
-function IsaacScriptWatcher:Save()
+function mod:Save()
   local saveDataJSON = json.encode(saveData)
-  IsaacScriptWatcher:SaveData(saveDataJSON)
+  mod:SaveData(saveDataJSON)
 end
 
-function IsaacScriptWatcher:Load()
+function mod:Load()
   -- Read the "save#.dat" file into a string.
-  local saveDataJSON = Isaac.LoadModData(IsaacScriptWatcher)
+  local saveDataJSON = Isaac.LoadModData(mod)
 
   -- Handle the case of a 0 byte file.
   if saveDataJSON == "" then
@@ -232,7 +254,7 @@ function IsaacScriptWatcher:Load()
   saveData = json.decode(saveDataJSON)
 end
 
-function IsaacScriptWatcher:CheckInput()
+function mod:CheckInput()
   if game:IsPaused() then
     return
   end
@@ -249,7 +271,7 @@ function IsaacScriptWatcher:CheckInput()
   end
 end
 
-function IsaacScriptWatcher:CheckRestart()
+function mod:CheckRestart()
   if not RESTART_GAME_ON_RECOMPILATION then
     return
   end
@@ -263,7 +285,7 @@ function IsaacScriptWatcher:CheckRestart()
   Isaac.ExecuteCommand("restart")
 end
 
-IsaacScriptWatcher:AddCallback(ModCallbacks.MC_POST_RENDER, IsaacScriptWatcher.PostRender)
+mod:AddCallback(ModCallbacks.MC_POST_RENDER, mod.PostRender)
 
 local initMessage = "IsaacScript Watcher initialized."
 Isaac.DebugString(initMessage)

package/isaacscript-watcher/resources/gfx/logo.anm2

@@ -1,11 +1,13 @@
 <AnimatedActor>
-	<Info CreatedBy="Unknown" CreatedOn="2/1/2017 6:09:20 AM" Version="2" Fps="30"/>
+	<Info CreatedBy="Unknown" CreatedOn="6/26/2022 2:14:32 PM" Version="3" Fps="30"/>
 	<Content>
 		<Spritesheets>
 			<Spritesheet Path="logo.png" Id="0"/>
+			<Spritesheet Path="logo-green.png" Id="1"/>
 		</Spritesheets>
 		<Layers>
 			<Layer Name="Layer 0" Id="0" SpritesheetId="0"/>
+			<Layer Name="Layer 1" Id="1" SpritesheetId="1"/>
 		</Layers>
 		<Nulls/>
 		<Events/>
@@ -19,6 +21,20 @@
 				<LayerAnimation LayerId="0" Visible="true">
 					<Frame XPosition="0" YPosition="0" XPivot="0" YPivot="0" XCrop="0" YCrop="0" Width="44" Height="28" XScale="66" YScale="66" Delay="1" Visible="true" RedTint="255" GreenTint="255" BlueTint="255" AlphaTint="255" RedOffset="0" GreenOffset="0" BlueOffset="0" Rotation="0" Interpolated="false"/>
 				</LayerAnimation>
+				<LayerAnimation LayerId="1" Visible="false"/>
+			</LayerAnimations>
+			<NullAnimations/>
+			<Triggers/>
+		</Animation>
+		<Animation Name="Green" FrameNum="1" Loop="true">
+			<RootAnimation>
+				<Frame XPosition="0" YPosition="0" XScale="100" YScale="100" Delay="1" Visible="true" RedTint="255" GreenTint="255" BlueTint="255" AlphaTint="255" RedOffset="0" GreenOffset="0" BlueOffset="0" Rotation="0" Interpolated="false"/>
+			</RootAnimation>
+			<LayerAnimations>
+				<LayerAnimation LayerId="0" Visible="false"/>
+				<LayerAnimation LayerId="1" Visible="true">
+					<Frame XPosition="0" YPosition="0" XPivot="0" YPivot="0" XCrop="0" YCrop="0" Width="44" Height="28" XScale="66" YScale="66" Delay="1" Visible="true" RedTint="255" GreenTint="255" BlueTint="255" AlphaTint="255" RedOffset="0" GreenOffset="0" BlueOffset="0" Rotation="0" Interpolated="false"/>
+				</LayerAnimation>
 			</LayerAnimations>
 			<NullAnimations/>
 			<Triggers/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript",
-  "version": "2.6.2",
+  "version": "2.7.0",
   "description": "A command line tool for managing Isaac mods written in TypeScript.",
   "keywords": [
     "isaac",