Heretic|Scripting: Added World.Thing.attack() method

Higher-level melee/missile attack. Returns nonzero if attack was made; 1 if melee, 2 if missile.
skyjake · Jan 20, 2019 · ae826b7 · ae826b7
1 parent 447ad66
commit ae826b7
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/doomsday/apps/plugins/common/src/common.cpp b/doomsday/apps/plugins/common/src/common.cpp
@@ -173,6 +173,20 @@ static de::Value *Function_Thing_SpawnMissile(de::Context &ctx, const de::Functi
     return nullptr;
 }
 
+#if defined(__JHERETIC__)
+static de::Value *Function_Thing_Attack(de::Context &ctx, const de::Function::ArgumentValues &args)
+{
+    using namespace de;
+
+    mobj_t *src = &instanceMobj(ctx);
+
+    const int meleeDamage = args.at(0)->asInt();
+    const mobjtype_t missileId = mobjtype_t(Defs().getMobjNum(args.at(1)->asText()));
+
+    return new NumberValue(P_Attack(src, meleeDamage, missileId));
+}
+#endif
+
 void Common_Load()
 {
     using namespace de;
@@ -181,9 +195,16 @@ void Common_Load()
     spawnMissileArgs["angle"] = new NoneValue;
     spawnMissileArgs["momz"] = new NumberValue(0.0);
 
+    Function::Defaults attackArgs;
+    attackArgs["damage"] = new NumberValue(0.0);
+    attackArgs["missile"] = new NoneValue;
+
     DENG2_ASSERT(gameBindings == nullptr);
     gameBindings = new Binder;
     gameBindings->init(ScriptSystem::get().builtInClass("World", "Thing"))
+#if defined(__JHERETIC__)
+            << DENG2_FUNC_DEFS(Thing_Attack, "attack", "damage" << "missile", attackArgs)
+#endif
             << DENG2_FUNC_DEFS(Thing_SpawnMissile, "spawnMissile", "id" << "angle" << "momz", spawnMissileArgs);
 }
 

diff --git a/doomsday/apps/plugins/heretic/include/p_enemy.h b/doomsday/apps/plugins/heretic/include/p_enemy.h
@@ -38,7 +38,8 @@ extern "C" {
 
 void        P_ClearBodyQueue(void);
 int         P_Massacre(void);
-void        P_NoiseAlert(mobj_t* target, mobj_t* emmiter);
+void        P_NoiseAlert(mobj_t* target, mobj_t* emitter);
+int         P_Attack(mobj_t *actor, int meleeDamage, mobjtype_t missileType);
 void        P_DSparilTeleport(mobj_t* actor);
 
 #ifdef __cplusplus

diff --git a/doomsday/apps/plugins/heretic/src/p_enemy.c b/doomsday/apps/plugins/heretic/src/p_enemy.c
@@ -1576,6 +1576,24 @@ void C_DECL A_MntrFloorFire(mobj_t* actor)
     }
 }
 
+int P_Attack(mobj_t *actor, int meleeDamage, mobjtype_t missileType)
+{
+    if (actor->target)
+    {
+        if (P_CheckMeleeRange(actor))
+        {
+            P_DamageMobj(actor->target, actor, actor, meleeDamage, false);
+            return 1;
+        }
+        else
+        {
+            P_SpawnMissile(missileType, actor, actor->target, true);
+            return 2;
+        }
+    }
+    return 0;
+}
+
 void C_DECL A_BeastAttack(mobj_t* actor)
 {
     if(!actor->target)