xonogotchi: add eat and sleep animation

diff --git a/gfx/hud/default/minigames/xonogotchi/pet_eat.png b/gfx/hud/default/minigames/xonogotchi/pet_eat.png
new file mode 100644 (file)
index 0000000..8f94bbc
Binary files /dev/null and b/gfx/hud/default/minigames/xonogotchi/pet_eat.png differ

diff --git a/gfx/hud/default/minigames/xonogotchi/pet_eat2.png b/gfx/hud/default/minigames/xonogotchi/pet_eat2.png
new file mode 100644 (file)
index 0000000..108622a
Binary files /dev/null and b/gfx/hud/default/minigames/xonogotchi/pet_eat2.png differ

diff --git a/gfx/hud/default/minigames/xonogotchi/pet_eat2_r.png b/gfx/hud/default/minigames/xonogotchi/pet_eat2_r.png
new file mode 100644 (file)
index 0000000..320f40e
Binary files /dev/null and b/gfx/hud/default/minigames/xonogotchi/pet_eat2_r.png differ

diff --git a/gfx/hud/default/minigames/xonogotchi/pet_eat_r.png b/gfx/hud/default/minigames/xonogotchi/pet_eat_r.png
new file mode 100644 (file)
index 0000000..f1322d7
Binary files /dev/null and b/gfx/hud/default/minigames/xonogotchi/pet_eat_r.png differ

diff --git a/gfx/hud/default/minigames/xonogotchi/pet_sleep.png b/gfx/hud/default/minigames/xonogotchi/pet_sleep.png
new file mode 100644 (file)
index 0000000..a22cc4b
Binary files /dev/null and b/gfx/hud/default/minigames/xonogotchi/pet_sleep.png differ

diff --git a/gfx/hud/default/minigames/xonogotchi/pet_sleep2.png b/gfx/hud/default/minigames/xonogotchi/pet_sleep2.png
new file mode 100644 (file)
index 0000000..0126f65
Binary files /dev/null and b/gfx/hud/default/minigames/xonogotchi/pet_sleep2.png differ

diff --git a/gfx/hud/default/minigames/xonogotchi/pet_sleep2_r.png b/gfx/hud/default/minigames/xonogotchi/pet_sleep2_r.png
new file mode 100644 (file)
index 0000000..0126f65
Binary files /dev/null and b/gfx/hud/default/minigames/xonogotchi/pet_sleep2_r.png differ

diff --git a/gfx/hud/default/minigames/xonogotchi/pet_sleep_r.png b/gfx/hud/default/minigames/xonogotchi/pet_sleep_r.png
new file mode 100644 (file)
index 0000000..a22cc4b
Binary files /dev/null and b/gfx/hud/default/minigames/xonogotchi/pet_sleep_r.png differ

diff --git a/qcsrc/common/minigames/minigame/all.qh b/qcsrc/common/minigames/minigame/all.qh
index 43fd10d0d1d6036a713e50a876f5d152ac4b1e54..72c154ed60b712f8b98318f59c42e960a1f40857 100644 (file)
--- a/qcsrc/common/minigames/minigame/all.qh
+++ b/qcsrc/common/minigames/minigame/all.qh
@@ -103,7 +103,7 @@ that .owner is set to the minigame session entity and .minigame_autoclean is tru
        MSLE(pong_paddle,FIELD(MINIG_SF_CREATE,Byte,team) FIELD(MINIG_SF_CREATE,Float,pong_length) FIELD(MINIG_SF_UPDATE,Vector2D,origin)) \
        MSLE(pong_ball,FIELD(MINIG_SF_CREATE,Float,pong_length) FIELD(PONG_SF_BALLTEAM,Byte,team) FIELD(MINIG_SF_UPDATE, Vector2D, velocity) FIELD(MINIG_SF_UPDATE, Vector2D, origin)) \
        MSLE(pong_ai, FIELD(MINIG_SF_CREATE,Byte,team) FIELD(PONG_SF_PLAYERSCORE, Long, pong_score)) \
-       MSLE(xonogotchi_pet,FIELD(MINIG_SF_UPDATE, Vector2D, origin) FIELD(MINIG_SF_UPDATE, Byte, xonogotchi_pet_movedir) FIELD(MINIG_SF_UPDATE, Float, xonogotchi_pet_level) FIELD(MINIG_SF_UPDATE, Float, xonogotchi_pet_health) FIELD(MINIG_SF_UPDATE, Float, xonogotchi_pet_hunger) FIELD(MINIG_SF_UPDATE, Float, xonogotchi_pet_energy)) \
+       MSLE(xonogotchi_pet,FIELD(MINIG_SF_UPDATE, Vector2D, origin) FIELD(MINIG_SF_UPDATE, Byte, xonogotchi_pet_movedir) FIELD(MINIG_SF_UPDATE, Byte, xonogotchi_pet_action) FIELD(MINIG_SF_UPDATE, Float, xonogotchi_pet_level) FIELD(MINIG_SF_UPDATE, Float, xonogotchi_pet_health) FIELD(MINIG_SF_UPDATE, Float, xonogotchi_pet_hunger) FIELD(MINIG_SF_UPDATE, Float, xonogotchi_pet_energy)) \
        MSLE(xonogotchi_nest,FIELD(MINIG_SF_UPDATE, Vector2D, origin)) \
        MSLE(xonogotchi_bowl,FIELD(MINIG_SF_UPDATE, Vector2D, origin) FIELD(MINIG_SF_UPDATE, Float, count)) \
        /*empty line*/

diff --git a/qcsrc/common/minigames/minigame/xonogotchi.qc b/qcsrc/common/minigames/minigame/xonogotchi.qc
index 3e40c98456522fb882ad3211a6b35303885675bb..70df3e66367ac73be86fab24beea4d2863242849 100644 (file)
--- a/qcsrc/common/minigames/minigame/xonogotchi.qc
+++ b/qcsrc/common/minigames/minigame/xonogotchi.qc
@@ -10,6 +10,9 @@ const vector XONOGOTCHI_PET_MINS = -XONOGOTCHI_PET_MAXS;
 const int XONOGOTCHI_PET_MOVE_LEFT = 0x01;
 const int XONOGOTCHI_PET_MOVE_RIGHT = 0x02;
 
+const int XONOGOTCHI_PET_ACTION_EAT = 1;
+const int XONOGOTCHI_PET_ACTION_SLEEP = 2;
+
 const float XONOGOTCHI_NEST_SIZE = 0.25;
 const vector XONOGOTCHI_NEST_MAXS = '1 1 0' * XONOGOTCHI_NEST_SIZE / 2;
 const vector XONOGOTCHI_NEST_MINS = -XONOGOTCHI_NEST_MAXS;
@@ -37,6 +40,7 @@ const float XONOGOTCHI_ANIM_DURATION = XONOGOTCHI_STEP_DURATION * XONOGOTCHI_STE
 .entity xonogotchi_bowl;
 
 .int xonogotchi_pet_movedir;
+.int xonogotchi_pet_action;
 .float xonogotchi_pet_goal;
 .float xonogotchi_pet_level;
 .float xonogotchi_pet_health;
@@ -82,7 +86,8 @@ void xonogotchi_pet_think(entity this)
        entity minigame = this.owner;
        entity bowl = minigame.xonogotchi_bowl;
        float energy_goal = minigame.xonogotchi_nest.origin.x;
-       float hunger_goal = minigame.xonogotchi_bowl.origin.x;
+       float hunger_goal_min = minigame.xonogotchi_bowl.origin.x + XONOGOTCHI_BOWL_MINS.x;
+       float hunger_goal_max = minigame.xonogotchi_bowl.origin.x + XONOGOTCHI_BOWL_MAXS.x;
        bool want_sleep = (this.xonogotchi_pet_energy < 10);
        bool want_food = !want_sleep && (this.xonogotchi_pet_hunger < 10) && bowl.count;
 
@@ -93,7 +98,14 @@ void xonogotchi_pet_think(entity this)
        else if(want_sleep)
                this.xonogotchi_pet_goal = energy_goal;
        else
-               this.xonogotchi_pet_goal = hunger_goal;
+       {
+               if((this.origin.x >= hunger_goal_min) && (this.origin.x <= hunger_goal_max))
+                       this.xonogotchi_pet_goal = this.origin.x;
+               else if(this.origin.x < hunger_goal_min)
+                       this.xonogotchi_pet_goal = hunger_goal_min;
+               else
+                       this.xonogotchi_pet_goal = hunger_goal_max;
+       }
 
        if(this.xonogotchi_pet_goal < this.origin.x)
                this.xonogotchi_pet_movedir = XONOGOTCHI_PET_MOVE_LEFT;
@@ -110,7 +122,8 @@ void xonogotchi_pet_walkthink(entity this)
        entity minigame = this.owner;
        entity bowl = minigame.xonogotchi_bowl;
        float energy_goal = minigame.xonogotchi_nest.origin.x;
-       float hunger_goal = minigame.xonogotchi_bowl.origin.x;
+       float hunger_goal_min = minigame.xonogotchi_bowl.origin.x + XONOGOTCHI_BOWL_MINS.x;
+       float hunger_goal_max = minigame.xonogotchi_bowl.origin.x + XONOGOTCHI_BOWL_MAXS.x;
        bool want_sleep = (this.xonogotchi_pet_energy < 10);
        bool want_food = !want_sleep && (this.xonogotchi_pet_hunger < 10) && bowl.count;
 
@@ -152,7 +165,7 @@ void xonogotchi_pet_walkthink(entity this)
        if(goal_reached)
                this.xonogotchi_pet_hunger = max(0, this.xonogotchi_pet_hunger - floor(random() * 5));
 
-       if(want_food && (this.xonogotchi_pet_goal != hunger_goal))
+       if(want_food && ((this.xonogotchi_pet_goal < hunger_goal_min) || (this.xonogotchi_pet_goal > hunger_goal_max)))
        {
                goal_reached = false;
                setthink(this, xonogotchi_pet_think);
@@ -169,11 +182,13 @@ void xonogotchi_pet_walkthink(entity this)
                }
                else if(want_sleep)
                {
+                       this.xonogotchi_pet_action = XONOGOTCHI_PET_ACTION_SLEEP;
                        setthink(this, xonogotchi_pet_sleepthink);
                        this.nextthink = time;
                }
                else
                {
+                       this.xonogotchi_pet_action = XONOGOTCHI_PET_ACTION_EAT;
                        setthink(this, xonogotchi_pet_eatthink);
                        this.nextthink = time;
                }
@@ -204,7 +219,10 @@ void xonogotchi_pet_sleepthink(entity this)
                this.xonogotchi_pet_health = min(100, this.xonogotchi_pet_health + random() * 5);
 
        if(this.xonogotchi_pet_energy == 100)
+       {
+               this.xonogotchi_pet_action = 0;
                setthink(this, xonogotchi_pet_think);
+       }
 
        this.nextthink = time + XONOGOTCHI_SLEEP_DURATION;
        this.SendFlags |= MINIG_SF_UPDATE;
@@ -221,12 +239,16 @@ void xonogotchi_pet_eatthink(entity this)
                bowl.count -= 5;
 
                if(this.xonogotchi_pet_hunger == 100)
+               {
+                       this.xonogotchi_pet_action = 0;
                        setthink(this, xonogotchi_pet_think);
+               }
 
                bowl.SendFlags |= MINIG_SF_UPDATE;
        }
        else
        {
+               this.xonogotchi_pet_action = 0;
                setthink(this, xonogotchi_pet_think);
        }
 
@@ -285,7 +307,7 @@ int xonogotchi_server_event(entity minigame, string event, ...)
 
 #elif defined(CSQC)
 
-const int XONOGOTCHI_PET_ANIM_WALK = 0x01;
+const int XONOGOTCHI_PET_ANIM_VARIANT = 0x01;
 const int XONOGOTCHI_PET_ANIM_LEFT = 0x02;
 const int XONOGOTCHI_PET_ANIM_RIGHT = 0x04;
 
@@ -353,16 +375,23 @@ void xonogotchi_hud_board(vector pos, vector mySize)
 
                        if(!e.anim_time || time > e.anim_time + XONOGOTCHI_ANIM_DURATION)
                        {
-                               switch(e.xonogotchi_pet_movedir)
+                               bool use_anim = false;
+
+                               if(e.xonogotchi_pet_action)
+                                       use_anim = true;
+
+                               if((e.xonogotchi_pet_movedir == XONOGOTCHI_PET_MOVE_LEFT) || (e.xonogotchi_pet_movedir == XONOGOTCHI_PET_MOVE_RIGHT))
+                                       use_anim = true;
+
+                               if(use_anim)
+                               {
+                                       e.anim_time = time;
+                                       e.anim_state ^= XONOGOTCHI_PET_ANIM_VARIANT;
+                               }
+                               else
                                {
-                                       case XONOGOTCHI_PET_MOVE_LEFT:
-                                       case XONOGOTCHI_PET_MOVE_RIGHT:
-                                               e.anim_time = time;
-                                               e.anim_state ^= XONOGOTCHI_PET_ANIM_WALK;
-                                               break;
-                                       default:
-                                               e.anim_time = 0;
-                                               e.anim_state &= ~XONOGOTCHI_PET_ANIM_WALK;
+                                       e.anim_time = 0;
+                                       e.anim_state &= ~XONOGOTCHI_PET_ANIM_VARIANT;
                                }
                        }
 
@@ -378,11 +407,19 @@ void xonogotchi_hud_board(vector pos, vector mySize)
                                        break;
                        }
 
-                       string anim_texture;
-                       if(!(e.anim_state & XONOGOTCHI_PET_ANIM_WALK))
-                               anim_texture = "xonogotchi/pet";
-                       else
-                               anim_texture = "xonogotchi/pet2";
+                       string anim_texture = "xonogotchi/pet";;
+                       switch(e.xonogotchi_pet_action)
+                       {
+                               case XONOGOTCHI_PET_ACTION_EAT:
+                                       anim_texture = strcat(anim_texture, "_eat");
+                                       break;
+                               case XONOGOTCHI_PET_ACTION_SLEEP:
+                                       anim_texture = strcat(anim_texture, "_sleep");
+                                       break;
+                       }
+
+                       if(e.anim_state & XONOGOTCHI_PET_ANIM_VARIANT)
+                               anim_texture = strcat(anim_texture, "2");
 
                        org = e.origin;
                        org.y -= XONOGOTCHI_PET_MINS.y;