Rewrite Rolling Stone prototype

1 files changed, 57 insertions, 1 deletions

diff --git a/npc/023-3/logic.txt b/npc/023-3/logic.txt
index 422605410..55cf48885 100644
--- a/npc/023-3/logic.txt
+++ b/npc/023-3/logic.txt
@@ -238,7 +238,7 @@ OnTouchNPC:
     unitwarp(0, "023-3", 42, 26);
     end;
 }
-*/
+
 // TODO: Rolling Stone core
 023-3,0,0,0	script	#0233RollStone	NPC_HIDDEN,{
     end;
@@ -275,5 +275,61 @@ OnTimer250:
     initnpctimer;
     end;
 }
+*/
+
+// TODO: NPC walking cannot trigger OnTouch events >.>
+023-3,47,23,0	script	#0233RollStoneA	NPC_ROLLINGSTONE,0,0,{
+    end;
+
+OnInit:
+    npcspeed(180);
+    initnpctimer;
+    npcwalkto(47, 41);
+    end;
+
+OnTimer180:
+    if (.y >= 40) {
+        movenpc(.name$, 47, 23);
+        npcwalkto(47, 41);
+    }
+    initnpctimer;
+    end;
+
+OnTouch:
+    percentheal -100, -100;
+    end;
+
+OnTouchNPC:
+    sc_start SC_COMA, 60000, 0;
+    end;
+}
+
+023-3,48,25,0	script	#0233RollStoneB	NPC_ROLLINGSTONE,0,0,{
+    end;
+
+OnInit:
+    npcspeed(180);
+    initnpctimer;
+    npcwalkto(48, 41);
+    end;
+
+OnTimer180:
+    if (.y >= 40) {
+        movenpc(.name$, 48, 23);
+        npcwalkto(48, 41);
+    }
+    initnpctimer;
+    end;
+
+OnTouch:
+    percentheal -100, -100;
+    end;
+
+OnTouchNPC:
+    sc_start SC_COMA, 60000, 0;
+    end;
+}
 
+023-3,47,30,0	duplicate(#0233RollStoneA)	#0233RollStoneC	NPC_ROLLINGSTONE,0,0
+023-3,48,37,0	duplicate(#0233RollStoneB)	#0233RollStoneD	NPC_ROLLINGSTONE,0,0