From e276514a6b6b9eb55b2e87f19c073dfc1091d760 Mon Sep 17 00:00:00 2001 From: tacigar Date: Wed, 14 Sep 2016 08:27:13 +0900 Subject: [PATCH 1/4] [UPDATE] Update register -> core/basic --- .../{register.lua => cores/basic.lua} | 26 ++++++++++--------- maidroid_core/init.lua | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) rename maidroid_core/{register.lua => cores/basic.lua} (79%) diff --git a/maidroid_core/register.lua b/maidroid_core/cores/basic.lua similarity index 79% rename from maidroid_core/register.lua rename to maidroid_core/cores/basic.lua index 963f2f5..b2d0e58 100644 --- a/maidroid_core/register.lua +++ b/maidroid_core/cores/basic.lua @@ -3,10 +3,7 @@ -- https://github.com/tacigar/maidroid ------------------------------------------------------------ -local state = { - IDLE = 0, - ACCOMPANY = 1, -} +local state = {IDLE = 0, ACCOMPANY = 1} local function on_start(self) self.state = state.IDLE @@ -19,6 +16,10 @@ local function on_stop(self) self.object:setvelocty{x = 0, y = 0, z = 0} end +local on_resume = on_start + +local on_pause = on_stop + local function on_step(self, dtime) local player = self:get_nearest_player(10) if player == nil then @@ -55,12 +56,13 @@ local function on_step(self, dtime) end end -maidroid.register_core("maidroid_core:core_basic", { - description = "maidroid core : basic", - inventory_image = "maidroid_core_basic.png", - on_start = on_start, - on_stop = on_stop, - on_resume = on_start, - on_pause = on_stop, - on_step = on_step, +-- register a definition of a new core. +maidroid.register_core("maidroid_core:basic", { + description = "maidroid core : basic", + inventory_image = "maidroid_core_basic.png", + on_start = on_start, + on_stop = on_stop, + on_resume = on_resume, + on_pause = on_pause, + on_step = on_step, }) diff --git a/maidroid_core/init.lua b/maidroid_core/init.lua index e7f7996..61a9ed3 100644 --- a/maidroid_core/init.lua +++ b/maidroid_core/init.lua @@ -8,4 +8,4 @@ maidroid_core = {} maidroid_core.modname = "maidroid_core" maidroid_core.modpath = minetest.get_modpath(maidroid_core.modname) -dofile(maidroid_core.modpath .. "/register.lua") +dofile(maidroid_core.modpath .. "/cores/basic.lua") From d4c1a050b04f38bf9ffb68ce9c0e7e027336f759 Mon Sep 17 00:00:00 2001 From: tacigar Date: Wed, 14 Sep 2016 08:42:19 +0900 Subject: [PATCH 2/4] [ADD] Add texture --- maidroid_core/textures/maidroid_core_basic.png | Bin 0 -> 864 bytes maidroid_core/textures/maidroid_core_basic.xcf | Bin 0 -> 1513 bytes maidroid_core/textures/maidroid_core_empty.png | Bin 0 -> 868 bytes maidroid_core/textures/maidroid_core_empty.xcf | Bin 0 -> 1521 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 maidroid_core/textures/maidroid_core_basic.png create mode 100644 maidroid_core/textures/maidroid_core_basic.xcf create mode 100644 maidroid_core/textures/maidroid_core_empty.png create mode 100644 maidroid_core/textures/maidroid_core_empty.xcf diff --git a/maidroid_core/textures/maidroid_core_basic.png b/maidroid_core/textures/maidroid_core_basic.png new file mode 100644 index 0000000000000000000000000000000000000000..966e2e84d7e01f96ced9829b07c7718841a73480 GIT binary patch literal 864 zcmV-m1E2hfP)WFU8GbZ8()Nlj2>E@cM*00P8GL_t(I%XO1oOB-nv z$A8b$IO9B-U}oJ4f(Exslm;Rqh~gF_S@4CnK?{C?C0D)N58$oB_8ZjhP5cPnc@Y8@ zUs8>N;7%?CyY5BoMuHukiE(E3qBOK!dv4G9|2QxIBf>D`z9^MSUnMe`jJU5(1VMlh z;$GqQ_BMuLFfuaoU68oCxAXxlcCNQB|xVY<4yC>DzV3=Iu^1u7PcKS;-M za2$tLtHqydYXHp7&N4YUiR-$YpPw^6KF-X{3_!bPZ*NcC-rn|#YPCwaTn?2|Xqtv) zSzKOTqU$=Rr>6`K4sv#OMsIH~W;9Cc?hXLo_W_359lU$D&%+-dQm@yEMx(S^E!Nl9 zSzcadU|;}%kB-xf$KzaFTmT@YynfKv*B6Fi$cKMFkW41|=s1L7$l>83xm=Eki3x1m zCXq;lp65kswHm(fW11#X%HO5qIBafi^5mB%93LO^*U1U1tE)^+O|h`J$l{9^{QT$< zD=RCaYTIac64;`{_popXEJzR6U(yL-`{6pae=6cp6u-GB*wCODU_7rL#PS`J`SVio*p8ED#{Vm98?u*v4m;fQOvJHTVTd*D~)!mm9x2U zO=z&F*1;KE9Lu!xu2!b5;oNx|DNLpER)d+VG&^{f`Y>BT%ABrF3&%L^7M?BFmYK{( zyT$Hc%2KA%VQw)nRmZDRk_A*tp>iy3$x$TOOx-C2^06^j*-4X8 zB%iX6F4UkB)F6tW0Hu)Z9TF6R3X)$EXn%Oem)E>rL|2I)VjG|4n}rXni?Nk;p;=f8 zula+sFCWc&<98!31R)xI?d^IMia*xtg-CeiK{W2ZVPAMS>j?&i7H6mK$AtF!saqcX zGk{RT;Pjhb!BR8ncI!g`!TNA4HX^Wm<2CoFVftxLM0k5o5PWQHx5G1_*Wa88t^}e_ zd@RfLJ9|96BX^df@p#ndW0l6fVRzp|w$goZjyO7W%7P5@m|X0-L??e&6|*!h5^d^Qq5#{k3K}m z4)3#+_spKWN5^E|MCN@Vo%h5ZychmA?<>3d{V(3w?>~4q_V2Ub*?6BB9&gF$_sNWY zo8*2I732{OsEH1?NfAz}782SD0{M_UMj#i&EgS){gd!12A^AB8I!L_V6hQ@IDuK>O ok|&^sugUH0L{bz>a2qxJ6cGac3Us);26xw1sBt(|fJ0aO3u(V)L;wH) literal 0 HcmV?d00001 diff --git a/maidroid_core/textures/maidroid_core_empty.png b/maidroid_core/textures/maidroid_core_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..37103e1cda341b586533073f415d6809c84e7887 GIT binary patch literal 868 zcmV-q1DpJbP)WFU8GbZ8()Nlj2>E@cM*00PKKL_t(I%XO1qOCx6# z#((d-amIOPf|=SC1Pyjelnq2g5XCM=Qt%JmhV6x4pyaBT{Q%x7bicv6y@?;eJ1;`O z#Xnh%f?y{Xf?InLw~^qEW|DDcda*R@w(hw-=lSs*&T~W*MLbmHa{04HHk%a>&51A! z5kfpD+}+*9FbpOpCcX#~H#avZrP$fo=?WdkAr^}@2NTi_6PPrl+S_SXcn)&Kw*Zs7|LdC~CDDl}aU2N}*{Q zwrz8LeT}Z`oS&aFIy%b5#RY?dgIK1Ce}4}^5Ci~YT?cR99`g9>$21xZOw+{oeKt2Y zSzTRaWMl+@53buzBobU*T>&7aynQq@G!#Wq#QVSBlS-xd;JQRn#PRVl`Fx(4nHe0% zA(>1@p6A8t^*TWiU|AMY%3r1Hx@>Q6^X$84oSvTY$JrU{>+8(T&EfmL+39qqzJ2n9 zwY4=-a~w2HBb`pOzrPPa?AE>I-!-lq4UiImX0r+4ODW^`L2wgAk@Ym4mYSx~Xf&`a z>*E;9r|B$LUH z4zk&-D3{BT*Yaq!JetiWQc5zJ3@?9s3Gj4fWrcRT&E4Hylt?6mWmyD4KoA7Kh+?tW zO`i~gR4PTiUdOg=gb+w6Lo05DhHj7<&j{Cbg_KeNgkd-=KaJ<>SFdm!hk=0s;_*0P z7$T*VrZOK5Cx_+9$%%Zuu^~Lq6Z7-)GMCH!75g;TKNkuBY;A3!X*&7*k63YwH*a=? zrs-mGa*`jOKd04d;dvgty}gKHvG~O=tW+u}Wsu8#k5USy6iZ7>;^^o|8HVwVVHmal u0sadTLZXzx^767!hQd%r7gnuS2mS#<>NUG3B{V(&00000(M##^ACxnV5Bx0uYl!^%`DXMwXln^X1~ zE;)D)!#m8)oSW1;EfzQD`F%lBz1{W8lUYjMgDiANL12~skTkk~zdXr#vC=Oozg{?X+%zaP*QDu81fALkp<`_;wR$~tO9 zOOdrec;>~!d4K%Q+;fDY(O3SCm(%e_MkAVwtOTQR?{(+GgBf2qG_W``aW95iYbS2{ zj8B92r|bGBUw0#0)wtJdoDK%VwUJnC2(f(qRqwEA@=4bmdUF>cfvxUz`TC5;8&lzx zQ1r3DvRtpb%hx@0dnp=^M+JdZnR^DkJ!5mXF3e&KYnt6ORu7Jv`H?{A8x~Z8iv4=@ zM2D|`H4vH=as-;);+&Di<+tmhUGZ*EcsFG7ekSu?%H-X$5X#1Ts;-alzF0Nh*_FZj z4B2ZQ8f=Sikq^_L8`B*$m;an_j!3ant1W6DRb;lr-(471vVm(g2+mx^x tOQ}RMDw;-5a}Y_R|U literal 0 HcmV?d00001 From 35fdce250b7ced46a19861d6e03ee169a8c2d2ae Mon Sep 17 00:00:00 2001 From: tacigar Date: Wed, 14 Sep 2016 08:46:51 +0900 Subject: [PATCH 3/4] [ADD] Add core empty --- maidroid_core/cores/empty.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 maidroid_core/cores/empty.lua diff --git a/maidroid_core/cores/empty.lua b/maidroid_core/cores/empty.lua new file mode 100644 index 0000000..163fd05 --- /dev/null +++ b/maidroid_core/cores/empty.lua @@ -0,0 +1,14 @@ +------------------------------------------------------------ +-- Copyright (c) 2016 tacigar. All rights reserved. +-- https://github.com/tacigar/maidroid +------------------------------------------------------------ + +maidroid.register_core("maidroid_core:empty", { + description = "maidroid core : empty", + inventory_image = "maidroid_core_empty.png", + on_start = function(self) end, + on_stop = function(self) end, + on_resume = function(self) end, + on_pause = function(self) end, + on_step = function(self, dtime) end, +}) From 9cefda432a4c5a9b352fec83f2f9b16202d620f7 Mon Sep 17 00:00:00 2001 From: tacigar Date: Wed, 14 Sep 2016 08:53:10 +0900 Subject: [PATCH 4/4] [ADD] Add a line --- maidroid_core/init.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/maidroid_core/init.lua b/maidroid_core/init.lua index 61a9ed3..98f0535 100644 --- a/maidroid_core/init.lua +++ b/maidroid_core/init.lua @@ -8,4 +8,5 @@ maidroid_core = {} maidroid_core.modname = "maidroid_core" maidroid_core.modpath = minetest.get_modpath(maidroid_core.modname) +dofile(maidroid_core.modpath .. "/cores/empty.lua") dofile(maidroid_core.modpath .. "/cores/basic.lua")