X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fmap_object_actions.c;h=4217145843fc2d1bf80b22df7dd0cbe65f5be159;hb=657d5dbc6d362d7b20693c63b38d8d99f3d2dbbd;hp=23152e229de5d78476178c20feb3d6e179b68900;hpb=fb8ddca6abc66eb7e52a007850689309b4cda938;p=plomrogue

diff --git a/src/map_object_actions.c b/src/map_object_actions.c
index 23152e2..4217145 100644
--- a/src/map_object_actions.c
+++ b/src/map_object_actions.c
@@ -2,220 +2,211 @@
 
 #include "map_object_actions.h"
 #include <string.h> /* for strlen() */
-#include "yx_uint16.h" /* for yx_uint16 struct, mv_yx_in_dir(), yx_uint16_cmp */
+#include "yx_uint16.h" /* for yx_uint16 struct, mv_yx_in_dir(),
+                        * yx_uint16_cmp()
+                        */
+#include "map_objects.h" /* for MapObj, MapObjDef structs, get_player(),
+                          * set_object_position(), own_map_object()
+                          */
 #include "misc.h" /* for update_log(), turn_over() */
 #include "map.h" /* for Map struct */
 #include "main.h" /* for World struct */
-#include "map_objects.h" /* for structs MapObj, MapObjDef,
-                          * get_map_object_def()
-                          */
-#include "rrand.h" /* for rrand() */
 #include "command_db.h" /* for get_command_id() */
 
 
 
-/* Log monster (described by "dsc_monster1") bumping into "monster2". */
-static void monster_bumps_monster(struct World * world, char * dsc_monster1,
-                                  struct MapObj * monster2);
-
-/* Decrement player HPs due to attack of monster described by "dsc_monster",
- * kill player if his HP hit zero; log the whole action.
+/* One actor "wounds" another actor, decrementing his lifepoints and, if they
+ * reach zero in the process, killing it. Generates appropriate log message.
  */
-static void monster_hits_player(struct World * world, char * dsc_monster);
-
-/* Decrement HP of "monster" hit by player, kill it if its HP hit zero, create a
- * corpse and increment player's score by the amount of hitpoints the monster
- * started with; log the whole action.
- */
-static void player_hits_monster(struct World * world, struct MapObj * monster);
-
-/* Try moving the player in direction "d" towards coordinate "target"; log
- * success or failure of the whole action.
- */
-static void try_player_move(struct World * world,
-                            enum dir d, struct yx_uint16 target);
-
-
-
-static void monster_bumps_monster(struct World * world, char * dsc_monster1,
-                                  struct MapObj * monster2)
-{
-    char * bump_dsc = " bumps into ";
-    struct MapObjDef * mod = get_map_object_def(world, monster2->type);
-    char msg[strlen(dsc_monster1) + strlen(bump_dsc) + strlen(mod->name) + 3];
-    sprintf(msg, "\n%s%s%s.", dsc_monster1, bump_dsc, mod->name);
-    update_log(world, msg);
-}
+static void actor_hits_actor(struct World * world, struct MapObj * hitter,
+                             struct MapObj * hitted);
 
 
 
-static void monster_hits_player(struct World * world, char * dsc_monster)
+static void actor_hits_actor(struct World * world, struct MapObj * hitter,
+                             struct MapObj * hitted)
 {
-    char * hit_dsc = " hits you";
-    char msg[strlen(dsc_monster) + strlen(hit_dsc) + 3];
-    sprintf(msg, "\n%s%s.", dsc_monster, hit_dsc);
+    struct MapObjDef * mod_hitter = get_map_object_def(world, hitter->type);
+    struct MapObjDef * mod_hitted = get_map_object_def(world, hitted->type);
+    struct MapObj * player = get_player(world);
+    char * msg1 = "You";
+    char * msg2 = "wound";
+    char * msg3 = "you";
+    if      (player != hitter)
+    {
+        msg1 = mod_hitter->name;
+        msg2 = "wounds";
+    }
+    if (player != hitted)
+    {
+        msg3 = mod_hitted->name;
+    }
+    uint8_t len = 1 + strlen(msg1) + 1 + strlen(msg2) + 1 + strlen(msg3) + 2;
+    char msg[len];
+    sprintf(msg, "\n%s %s %s.", msg1, msg2, msg3);
     update_log(world, msg);
-    world->player->hitpoints--;
-
-    if (0 == world->player->hitpoints)
+    hitted->lifepoints--;
+    if (0 == hitted->lifepoints)
     {
-        update_log(world, "\nYou are dead.");
+        hitted->type = mod_hitted->corpse_id;
+        if (player == hitted)
+        {
+            update_log(world, " You die.");
+        }
+        else
+        {
+            update_log(world, " It dies.");
+            if (player == hitter)
+            {
+                world->score = world->score + mod_hitted->lifepoints;
+            }
+        }
     }
 }
 
 
 
-static void player_hits_monster(struct World * world, struct MapObj * monster)
+extern uint8_t move_actor(struct World * world, struct MapObj * actor,
+                          enum dir d)
 {
-    struct MapObjDef * mod = get_map_object_def(world, monster->type);
-    char * hit_dsc = "You hit the ";
-    char * monster_dsc = mod->name;
-    char hitmsg[strlen(hit_dsc) + strlen(monster_dsc) + 3];
-    sprintf(hitmsg, "\n%s%s.", hit_dsc, monster_dsc);
-    update_log(world, hitmsg);
-    monster->lifepoints--;
-    if (0 == monster->lifepoints)
-    {
-        hit_dsc = "You kill the ";
-        char kill_msg[strlen(hit_dsc) + strlen(monster_dsc) + 3];
-        sprintf(kill_msg, "\n%s%s.", hit_dsc, monster_dsc);
-        update_log(world, kill_msg);
-        struct MapObjDef * md = mod;
-        monster->type = md->corpse_id;
-        uint8_t score = md->lifepoints;
-        world->score = world->score + score;
+    struct yx_uint16 target = mv_yx_in_dir(d, actor->pos);
+    struct MapObj * other_actor;
+    for (other_actor = world->map_objs;
+         other_actor != 0;
+         other_actor = other_actor->next)
+    {
+        if (0 == other_actor->lifepoints || other_actor == actor)
+        {
+            continue;
+        }
+        if (yx_uint16_cmp(&target, &other_actor->pos))
+        {
+            actor_hits_actor(world, actor, other_actor);
+            return 2;
+        }
     }
+    if (is_passable(world->map, target))
+    {
+        set_object_position(actor, target);
+        return 0;
+    }
+    return 1;
 }
 
 
 
-static void try_player_move(struct World * world,
-                            enum dir d, struct yx_uint16 target)
+extern void move_player(struct World * world, enum dir d)
 {
     char * dsc_dir;
+    char * action_dsc_prototype = "player_";
+    uint8_t len_action_dsc_prototype = strlen(action_dsc_prototype);
+    char action_dsc[len_action_dsc_prototype + 2];
+    memcpy(action_dsc, action_dsc_prototype, len_action_dsc_prototype);
     if      (NORTH == d)
     {
         dsc_dir = "north";
+        action_dsc[len_action_dsc_prototype] = 'u';
     }
     else if (EAST  == d)
     {
         dsc_dir = "east" ;
+        action_dsc[len_action_dsc_prototype] = 'r';
     }
     else if (SOUTH == d)
     {
         dsc_dir = "south";
+        action_dsc[len_action_dsc_prototype] = 'd';
     }
     else if (WEST  == d)
     {
         dsc_dir = "west" ;
+        action_dsc[len_action_dsc_prototype] = 'l';
     }
-    char * dsc_move = "You fail to move ";
-    if (is_passable(world->map, target))
+    action_dsc[len_action_dsc_prototype + 1] = '\0';
+    uint8_t res = move_actor(world, get_player(world), d);
+    if (1 >= res)
     {
-        dsc_move = "You move ";
-        world->player->pos = target;
+        char * dsc_move = "You fail to move ";
+        if   (0 == res)
+        {
+            dsc_move = "You move ";
+        }
+        char msg[strlen(dsc_move) + strlen (dsc_dir) + 3];
+        sprintf(msg, "\n%s%s.", dsc_move, dsc_dir);
+        update_log(world, msg);
     }
-    char msg[strlen(dsc_move) + strlen (dsc_dir) + 3];
-    sprintf(msg, "\n%s%s.", dsc_move, dsc_dir);
-    update_log(world, msg);
+    turn_over(world, get_command_id(world, action_dsc));
 }
 
 
 
-extern void move_monster(struct World * world, struct MapObj * monster)
+extern void player_wait(struct World * world)
 {
-    char d = rrand() % 5;
-    struct yx_uint16 t = mv_yx_in_dir(d, monster->pos);
-    struct MapObjDef * mod = get_map_object_def(world, monster->type);
-    char * dsc = mod->name;
-    if (yx_uint16_cmp(&t, &world->player->pos))
-    {
-        monster_hits_player(world, dsc);
-        return;
-    }
-    struct MapObj * other_monster;
-    for (other_monster = world->map_objs;
-         other_monster != 0;
-         other_monster = other_monster->next)
+    update_log(world, "\nYou wait.");
+    turn_over(world, get_command_id(world, "wait"));
+}
+
+
+
+extern char is_passable(struct Map * map, struct yx_uint16 pos)
+{
+    char passable = 0;
+    if (0 <= pos.x && pos.x < map->size.x && 0 <= pos.y && pos.y < map->size.y)
     {
-        if (0 == other_monster->lifepoints || other_monster == monster)
-        {
-            continue;
-        }
-        if (yx_uint16_cmp(&t, &other_monster->pos))
+        if ('.' == map->cells[pos.y * map->size.x + pos.x])
         {
-            monster_bumps_monster(world, dsc, other_monster);
-            return;
+            passable = 1;
         }
     }
-    if (is_passable(world->map, t))
-    {
-        monster->pos = t;
-    }
+    return passable;
 }
 
 
 
-extern void move_player(struct World * world, enum dir d)
+extern void player_drop(struct World * world)
 {
-    char * action_dsc_prototype = "player_";
-    uint8_t len = strlen(action_dsc_prototype);
-    char action_dsc[len + 2];
-    memcpy(action_dsc, action_dsc_prototype, len);
-    if      (NORTH == d)
-    {
-        action_dsc[len] = 'u';
-    }
-    else if (SOUTH == d)
-    {
-        action_dsc[len] = 'd';
-    }
-    else if (WEST  == d)
-    {
-        action_dsc[len] = 'l';
-    }
-    else if (EAST  == d)
+    struct MapObj * player = get_player(world);
+    if (NULL == player->owns)
     {
-        action_dsc[len] = 'r';
+        update_log(world, "\nYou try to drop an object, but you own none.");
     }
-    action_dsc[len + 1] = '\0';
-    uint8_t action_id = get_command_id(world, action_dsc);
-    struct yx_uint16 t = mv_yx_in_dir(d, world->player->pos);
-    struct MapObj * monster;
-    for (monster = world->map_objs;
-         monster != 0;
-         monster = monster->next)
+    else
     {
-        if (0 < monster->lifepoints && yx_uint16_cmp(&t, &monster->pos))
+        struct MapObj * owned = player->owns;
+        uint8_t i = 0;
+        for (; i != world->inventory_select; i++, owned = owned->next);
+        if (0 < world->inventory_select)
         {
-            player_hits_monster(world, monster);
-            turn_over(world, action_id);
-            return;
-          }
+            world->inventory_select--;
+        }
+        own_map_object(&world->map_objs, &player->owns, owned->id);
+        update_log(world, "\nYou drop an object.");
     }
-    try_player_move(world, d, t);
-    turn_over(world, action_id);
+    turn_over(world, get_command_id(world, "drop"));
 }
 
 
 
-extern void player_wait (struct World * world)
+extern void player_pick(struct World * world)
 {
-    update_log(world, "\nYou wait.");
-    turn_over(world, get_command_id(world, "wait"));
-}
-
-
-
-extern char is_passable (struct Map * map, struct yx_uint16 pos)
-{
-    char passable = 0;
-    if (0 <= pos.x && pos.x < map->size.x && 0 <= pos.y && pos.y < map->size.y)
+    struct MapObj * player = get_player(world);
+    struct MapObj * picked;
+    for (picked = world->map_objs; NULL != picked; picked = picked->next)
     {
-        if ('.' == map->cells[pos.y * map->size.x + pos.x])
+        if (picked != player && yx_uint16_cmp(&picked->pos, &player->pos))
         {
-            passable = 1;
+            break;
         }
     }
-    return passable;
+    if (NULL == picked)
+    {
+        update_log(world, "\nYou try to pick up an object, but there is none.");
+    }
+    else
+    {
+        own_map_object(&player->owns, &world->map_objs, picked->id);
+        set_object_position(picked, player->pos);
+        update_log(world, "\nYou pick up an object.");
+    }
+    turn_over(world, get_command_id(world, "pick"));
 }