From de7ede9d8d52253b868333cf0c9e1d28c069b779 Mon Sep 17 00:00:00 2001 From: tacigar Date: Sun, 18 Sep 2016 08:38:26 +0900 Subject: [PATCH 1/2] [ADD] Add update_infotext --- maidroid/api.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maidroid/api.lua b/maidroid/api.lua index 36576ad..edcf28b 100644 --- a/maidroid/api.lua +++ b/maidroid/api.lua @@ -370,6 +370,8 @@ function maidroid.register_maidroid(product_name, def) core.on_resume(self) end end + + update_infotext(self) end -- register a definition of a new maidroid. From b473843752adfce92b7fbca791391df5c54f589c Mon Sep 17 00:00:00 2001 From: tacigar Date: Sun, 18 Sep 2016 08:45:14 +0900 Subject: [PATCH 2/2] [FIX] Fix on_punch bug of maidroid --- maidroid/api.lua | 4 ++-- maidroid_core/cores/basic.lua | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/maidroid/api.lua b/maidroid/api.lua index edcf28b..74a9d1e 100644 --- a/maidroid/api.lua +++ b/maidroid/api.lua @@ -361,13 +361,13 @@ function maidroid.register_maidroid(product_name, def) self.pause = false if self.core_name ~= "" then local core = maidroid.registered_cores[self.core_name] - core.on_pause(self) + core.on_resume(self) end else self.pause = true if self.core_name ~= "" then local core = maidroid.registered_cores[self.core_name] - core.on_resume(self) + core.on_pause(self) end end diff --git a/maidroid_core/cores/basic.lua b/maidroid_core/cores/basic.lua index 26dc95d..417d9e2 100644 --- a/maidroid_core/cores/basic.lua +++ b/maidroid_core/cores/basic.lua @@ -6,6 +6,7 @@ local state = {IDLE = 0, ACCOMPANY = 1} local function on_start(self) + print("KOKO") self.state = state.IDLE self.object:setacceleration{x = 0, y = -10, z = 0} self.object:setvelocity{x = 0, y = 0, z = 0}