From 508c10a195bf12d5d4b8e737f7b27fda0c9242db Mon Sep 17 00:00:00 2001
From: hgn <hgodden00@gmail.com>
Date: Mon, 10 Feb 2025 17:51:50 +0000
Subject: [PATCH] mark only certain scripts as story events

---
 content_skaterift/maps/dev_heaven/main.mdl | Bin 890960 -> 897520 bytes
 content_skaterift/models/rs_icons.mdl      | Bin 74184 -> 95184 bytes
 src/entity.h                               |   6 +-
 src/gui.h                                  |  10 +-
 src/skaterift_script.c                     | 138 ++++++++++++---------
 src/skaterift_script.h                     |  24 ++++
 src/world.h                                |   8 ++
 src/world_entity.c                         |  38 ++++--
 src/world_load.c                           |   6 +-
 src/world_map.c                            |  20 ++-
 10 files changed, 172 insertions(+), 78 deletions(-)

diff --git a/content_skaterift/maps/dev_heaven/main.mdl b/content_skaterift/maps/dev_heaven/main.mdl
index 30f138cd5e87b958bc1906e6b61fea8a299d0188..6aadd05397506cb594eb2261b3ac9e26b02bc616 100644
GIT binary patch
delta 7331
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

delta 1442
zcmYk6e`s4(6vt0qk}fZ6y0lH3AA5Ptx-Cf|g_(z&j7?jITG<MlZtkCrE~Ig0CT&dP
zoG`{vu_zT1zp_o~pojzAx{^_}2t@`{nNp$u2rcU${$@)4aDVv6u%PGWy`=ZTdG~(K
z`JVIck9XhSzwTbH?jFn&QG~6NO=HWBjb_eq-)stxT8M1iO_Yk+vC|XH5V?pBRtEjf
zD?uWE<)lAc4%fvLU`>8BH<C}4GR15vCsHDn%2wsDUYQFi7xl{bp}jLYk(UD(*)n6L
zkzDrlOC=tQHWM{p`52EytWX>;)C2rji9)x9ltK)9ZK3_QW2Vw!DbwlvXhV6|iiw4Z
zD(O@{Q%srB`y89VO`CuJIgd(5j}wUsV$!??*>uKK-96(bZ@<01{6Z@IvgtLSE0;a=
z8f=Q+ah=<IK&dM8HAli8x$(tNN9HWoDHX?wLvR1m=9x$rvxQQm?wddA8rp=FEpc@-
zR}wp0h3Ylj4O&z1v^Uwrnu0eZTvzawH`z>W#Y3;rBn^+Y8)~anHi1_p+J~DG9m1ay
zoxskHjl3LE5}n6YiKehB(KNa`H}Yn2M50B!C(#nV>onYrnXTE;;!8HMX2+8fuG?|J
zmuxPh6<_)c)nhG6!#@%w@JN@Twpp=#$V+qxpD}H*VkhvsL^*8h-iV#YNr|TLAyeZt
zrtu?FW8$-D_ixZ5h9z3UJAUaD9r)Itbc-)s9C6J7C6IKtTe$AP<AJ2wVWAhV2MkqQ
zLZOY|b0(ifyYN7w0rUqAwabbfMwY2j^c1cI4VxFKU?*z9c%V`5Eho#ZR{vJxq5C%H
zr|fwigIZ6U2v-M)irnAm#h9koUA==ut9<`|?!`x%?h&eg4-h?N=UL(#t*7o8c!ua6
zd)n~8s<ibW(QmB%qYrwxSN)GM%&U3<&xW_F+AxuiZ`uf64R3evIzqI>(xn7GX6ZU(
znNi0NES-9eXa~~;JY;E==@U-8)Q_mHyZDzRuGV!7>7&DL2GPX7>KL2Yk7a4ijP#=A
zPYB>P^Ox9Zel;hF@lU$R%V_V}6a0X)Mfn--XW16bYEOJUpX%A;@^o{eDd!Nb#qKC;
zPMnEHm6{Xp$D?nS`zFhMHa3OL&gNiqE|mLP%HxxfxfZrfY_5gKoSHa0sm0uEo7q|y
Pw3z48yO&pQdAk1x*~kXE

diff --git a/content_skaterift/models/rs_icons.mdl b/content_skaterift/models/rs_icons.mdl
index 4d303ddbfd273c5e2ceac60387fff8848ee7450f..ecbe3bcc79c43f306392654c04a0ec1da3fbf7bb 100644
GIT binary patch
delta 21123
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
KarHFuF8>Ef?}}Rh

delta 543
zcmYk2KS%;m9LImpPRTz-lUiuhW?&FRAYG7BOVr?4P}rqcU7n|$CtM)pA~Y&Lnp)fv
zC&QrDs39oIww8#dXlQD23HrUfgMQri`+kql`@Y}fx*yKF8zFH3028EPQi!Bz8QG-O
zt|kLWlIVk?p)1;6(MHg70F2ZV0q2#AH(P-t)7?KAq%*mUn#xIrtSgerBQ=YSSj>=3
zqom6mL4z2t7>Va3ost%`S;1mEd95F!J!kx7QIf0~tEse<lXZ!9R9)**d!VE#bgPor
z{;>%4d|*~S+|?;-=bA$O(LbO31c-Y91nU(293^cHPx={b6XW9xQaa0%cC{yQoQ?V7
z(rH;MsVcNutxlXRGi*C%m=E6_B8y;nKx7NJLB573<eT_RuHuj&vNEoa*RV?7z-#gg
z{2{+3I*Y1vkiGEE?W2kO0X;l-iY$m<<Pn^5i7eK6b=^By2$?59KI#dFD~kYqeG7Bc
a|5b(ePY=D$lBfE1b{u8Xm+Sk?^!@^QICuj9

diff --git a/src/entity.h b/src/entity.h
index 5c4570d..aec5420 100644
--- a/src/entity.h
+++ b/src/entity.h
@@ -563,9 +563,11 @@ struct ent_objective{
    f32 time_limit;
 };
 
-enum ent_challenge_flag {
+enum ent_challenge_flag 
+{
    k_ent_challenge_timelimit = 0x1,
-   k_ent_challenge_is_story  = 0x2
+   k_ent_challenge_is_story  = 0x2,
+   k_ent_challenge_locked    = 0x4,
 };
 
 struct ent_challenge{
diff --git a/src/gui.h b/src/gui.h
index 53dfbcc..dc38d32 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -28,6 +28,8 @@ enum gui_icon {
    k_gui_icon_glider,
    k_gui_icon_spawn,
    k_gui_icon_spawn_select,
+   k_gui_icon_story2d,
+   k_gui_icon_story_done2d,
 
    k_gui_icon_count,
 };
@@ -314,10 +316,10 @@ static void gui_init(void)
    gui.icons[ k_gui_icon_glider ] = gui_find_icon( "icon_glider" );
    gui.icons[ k_gui_icon_spawn ] = gui_find_icon( "icon_spawn" );
    gui.icons[ k_gui_icon_spawn_select ] = gui_find_icon( "icon_spawn_select" );
-   gui.icons[ k_gui_icon_rift_run_gold ] =
-      gui_find_icon("icon_rift_run_medal_gold");
-   gui.icons[ k_gui_icon_rift_run_silver]=
-      gui_find_icon("icon_rift_run_medal_silver");
+   gui.icons[ k_gui_icon_rift_run_gold ] = gui_find_icon("icon_rift_run_medal_gold");
+   gui.icons[ k_gui_icon_rift_run_silver]= gui_find_icon("icon_rift_run_medal_silver");
+   gui.icons[ k_gui_icon_story2d ]= gui_find_icon("icon_story2d");
+   gui.icons[ k_gui_icon_story_done2d ]= gui_find_icon("icon_story_done2d");
 
    vg_linear_clear( vg_mem.scratch );
    if( !gui.model_icons.texture_count )
diff --git a/src/skaterift_script.c b/src/skaterift_script.c
index 30f3bad..23a0347 100644
--- a/src/skaterift_script.c
+++ b/src/skaterift_script.c
@@ -11,12 +11,8 @@
 #define KCOL_FBI  KGRN
 #define KCOL_JESUS KMAG
 
-enum escript_event
-{
-   k_escript_event_call = 0,
-   k_escript_event_update = 1,
-   k_escript_event_cutscene_marker = 2
-};
+#include "entity.h"
+#include "ent_challenge.h"
 
 /* you can add anything you want to this. */
 enum escript_state
@@ -1774,8 +1770,7 @@ enum escript_script_id
    k_escript_script_id_ch3s3,
    k_escript_script_id_ch4s1a,
    k_escript_script_id_ch4s1, /* NOTE: 1 and 2 are backwards in order (accident) */
-   k_escript_script_id_ch4s2,
-   k_escript_script_id_ch4s3,
+   k_escript_script_id_ch4s2, k_escript_script_id_ch4s3,
    k_escript_script_id_max 
 };
 
@@ -1784,40 +1779,43 @@ struct
    enum escript_script_id script_id;
 }
 static _script = { .script_id = k_escript_script_id_max };
-
-struct script_info
+static struct script_info _script_infos[] =
 {
-   const char *alias;
-   bool( *jump )( enum escript_event ev, const char *inf );
+   [k_escript_script_id_test] = {  "test",  _skaterift_script_test },
+   [k_escript_script_id_intro] = { "intro", _skaterift_script_intro,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch1s2] = { "ch1s2", _skaterift_script_ch1s2,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch1s3] = { "ch1s3", _skaterift_script_ch1s3,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch1s3b] = {"ch1s3b",_skaterift_script_ch1s3b, SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch1s4] = { "ch1s4", _skaterift_script_ch1s4,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch1s5] = { "ch1s5", _skaterift_script_ch1s5,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch1s6a] = {"ch1s6a",_skaterift_script_ch1s6a, SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch2s1] = { "ch2s1", _skaterift_script_ch2s1,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch2s2] = { "ch2s2", _skaterift_script_ch2s2,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch2s3a] = {"ch2s3a",_skaterift_script_ch2s3a, SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch2s4] = { "ch2s4", _skaterift_script_ch2s4,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch2e1] = { "ch2e1", _skaterift_script_ch2e1,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch2s5] = { "ch2s5", _skaterift_script_ch2s5,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch2s6] = { "ch2s6", _skaterift_script_ch2s6,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch3s1] = { "ch3s1", _skaterift_script_ch3s1,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch3s2] = { "ch3s2", _skaterift_script_ch3s2,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch3s3] = { "ch3s3", _skaterift_script_ch3s3,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch4s1a]= { "ch4s1a",_skaterift_script_ch4s1a, SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch4s1] = { "ch4s1", _skaterift_script_ch4s1,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch4s2] = { "ch4s2", _skaterift_script_ch4s2,  SCRIPT_FLAG_STORY_EVENT },
+   [k_escript_script_id_ch4s3] = { "ch4s3", _skaterift_script_ch4s3,  SCRIPT_FLAG_STORY_EVENT },
+};
 
-   bool availible;
-   u64 viewed_time;
-}
-_script_infos[] =
+struct script_info *skaterift_script_get_info( const char *alias )
 {
-   [k_escript_script_id_test] = { "test", _skaterift_script_test },
-   [k_escript_script_id_intro] = { "intro", _skaterift_script_intro },
-   [k_escript_script_id_ch1s2] = { "ch1s2", _skaterift_script_ch1s2 },
-   [k_escript_script_id_ch1s3] = { "ch1s3", _skaterift_script_ch1s3 },
-   [k_escript_script_id_ch1s3b] = { "ch1s3b", _skaterift_script_ch1s3b },
-   [k_escript_script_id_ch1s4] = { "ch1s4", _skaterift_script_ch1s4 },
-   [k_escript_script_id_ch1s5] = { "ch1s5", _skaterift_script_ch1s5 },
-   [k_escript_script_id_ch1s6a] = { "ch1s6a", _skaterift_script_ch1s6a },
-   [k_escript_script_id_ch2s1] = { "ch2s1", _skaterift_script_ch2s1 },
-   [k_escript_script_id_ch2s2] = { "ch2s2", _skaterift_script_ch2s2 },
-   [k_escript_script_id_ch2s3a] = { "ch2s3a", _skaterift_script_ch2s3a },
-   [k_escript_script_id_ch2s4] = { "ch2s4", _skaterift_script_ch2s4 },
-   [k_escript_script_id_ch2e1] = { "ch2e1", _skaterift_script_ch2e1 },
-   [k_escript_script_id_ch2s5] = { "ch2s5", _skaterift_script_ch2s5 },
-   [k_escript_script_id_ch2s6] = { "ch2s6", _skaterift_script_ch2s6 },
-   [k_escript_script_id_ch3s1] = { "ch3s1", _skaterift_script_ch3s1 },
-   [k_escript_script_id_ch3s2] = { "ch3s2", _skaterift_script_ch3s2 },
-   [k_escript_script_id_ch3s3] = { "ch3s3", _skaterift_script_ch3s3 },
-   [k_escript_script_id_ch4s1a]= { "ch4s1a",_skaterift_script_ch4s1a },
-   [k_escript_script_id_ch4s1] = { "ch4s1", _skaterift_script_ch4s1 },
-   [k_escript_script_id_ch4s2] = { "ch4s2", _skaterift_script_ch4s2 },
-   [k_escript_script_id_ch4s3] = { "ch4s3", _skaterift_script_ch4s3 },
-};
+   for( u32 i=0; i<k_escript_script_id_max; i ++ )
+   {
+      if( vg_str_eq( alias, _script_infos[i].alias ) ) 
+      {
+         return &_script_infos[i];
+      }
+   }
+   return NULL;
+}
 
 void skaterift_script_write_savedata( vg_msg *sav )
 {
@@ -1825,15 +1823,18 @@ void skaterift_script_write_savedata( vg_msg *sav )
    {
       struct script_info *info = &_script_infos[i];
 
-      vg_msg_frame( sav, info->alias );
+      if( info->flags & SCRIPT_FLAG_STORY_EVENT )
       {
-         vg_msg_wkvnum( sav, "viewed_time", 
-                        k_vg_msg_u64, 1, &info->viewed_time );
+         vg_msg_frame( sav, info->alias );
+         {
+            vg_msg_wkvnum( sav, "viewed_time", 
+                           k_vg_msg_u64, 1, &info->viewed_time );
 
-         u8 availible = info->availible;
-         vg_msg_wkvnum( sav, "availible", k_vg_msg_u8, 1, &availible );
+            u8 availible = info->availible;
+            vg_msg_wkvnum( sav, "availible", k_vg_msg_u8, 1, &availible );
+         }
+         vg_msg_end_frame( sav );
       }
-      vg_msg_end_frame( sav );
    }
 }
 
@@ -1846,14 +1847,17 @@ void skaterift_script_load_savedata( vg_msg *sav )
       sav->cur = orig;
       struct script_info *info = &_script_infos[i];
 
-      if( vg_msg_seekframe( sav, info->alias ) )
+      if( info->flags & SCRIPT_FLAG_STORY_EVENT )
       {
-         vg_msg_getkvintg( sav, "viewed_time", k_vg_msg_u64, 
-                           &info->viewed_time, NULL );
+         if( vg_msg_seekframe( sav, info->alias ) )
+         {
+            vg_msg_getkvintg( sav, "viewed_time", k_vg_msg_u64, 
+                              &info->viewed_time, NULL );
 
-         u8 availible;
-         vg_msg_getkvintg( sav, "availible", k_vg_msg_u8, &availible, NULL );
-         info->availible = availible? 1: 0;
+            u8 availible;
+            vg_msg_getkvintg( sav, "availible", k_vg_msg_u8, &availible, NULL );
+            info->availible = availible? 1: 0;
+         }
       }
    }
 }
@@ -1873,12 +1877,20 @@ static void _skaterift_script_hook_apply_action( u32 script_id,
    struct script_info *info = &_script_infos[ script_id ];
 
    if( action == k_script_action_unlock )
+   {
       info->availible = 1;
 
+      if( info->linked_challenge )
+         info->linked_challenge->flags &= ~((u32)k_ent_challenge_locked);
+   }
+
    if( action == k_script_action_reset )
    {
       info->availible = 0;
       info->viewed_time = 0;
+
+      if( info->linked_challenge )
+         info->linked_challenge->flags |= (u32)k_ent_challenge_locked;
    }
 
    if( action == k_script_action_play )
@@ -1940,17 +1952,17 @@ static int _skaterift_script_hook( int argc, const char *argv[] )
    }
    else
    {
-      for( u32 i=0; i<k_escript_script_id_max; i ++ )
+      struct script_info *info = skaterift_script_get_info( argv[1] );
+      if( info )
       {
-         if( vg_str_eq( argv[1], _script_infos[i].alias ) ) 
-         {
-            _skaterift_script_hook_apply_action( i, action );
-            return 1;
-         }
+         _skaterift_script_hook_apply_action( info-_script_infos, action );
+         return 1;
+      }
+      else
+      {
+         vg_error( "No such script '%s'\n", argv[0] );
+         return 0;
       }
-      
-      vg_error( "No such script '%s'\n", argv[0] );
-      return 0;
    }
 }
 
@@ -2001,3 +2013,9 @@ void _skaterift_script_init(void)
    vg_console_reg_cmd( "script", _skaterift_script_hook, 
                                  _skaterift_script_hook_poll );
 }
+
+void _skaterift_script_unlink_all_challenges(void)
+{
+   for( u32 i=0; i<VG_ARRAY_LEN( _script_infos ); i ++ )
+      _script_infos[i].linked_challenge = NULL;
+}
diff --git a/src/skaterift_script.h b/src/skaterift_script.h
index 9d153a1..b26c4a9 100644
--- a/src/skaterift_script.h
+++ b/src/skaterift_script.h
@@ -1,8 +1,32 @@
 #pragma once
 
+#define SCRIPT_FLAG_STORY_EVENT 0x1
+
+enum escript_event
+{
+   k_escript_event_call = 0,
+   k_escript_event_update = 1,
+   k_escript_event_cutscene_marker = 2
+};
+
+struct script_info
+{
+   const char *alias;
+   bool( *jump )( enum escript_event ev, const char *inf );
+   u32 flags;
+
+   bool availible;
+   u64 viewed_time;
+
+   ent_challenge *linked_challenge;
+};
+
 void _skaterift_script_update(void);
 void _skaterift_script_init(void);
 void _skaterift_script_marker( const char *marker );
 void skaterift_script_write_savedata( vg_msg *sav );
 void skaterift_script_load_savedata( vg_msg *sav );
 static int _skaterift_script_hook( int argc, const char *argv[] );
+struct script_info *skaterift_script_get_info( const char *alias );
+
+void _skaterift_script_unlink_all_challenges(void);
diff --git a/src/world.h b/src/world.h
index 2cff650..5576fb6 100644
--- a/src/world.h
+++ b/src/world.h
@@ -176,6 +176,14 @@ struct world_instance
                  ent_region,
                  ent_glider;
 
+   /* These share the indexes of ent_challenge. 
+    * So ent_challenge[x] is related to events[x] */
+   struct event_info 
+   {
+      struct script_info *story_script;
+   }
+   * events;
+
    enum skybox {
       k_skybox_default,
       k_skybox_space
diff --git a/src/world_entity.c b/src/world_entity.c
index 3e87cef..c4b745f 100644
--- a/src/world_entity.c
+++ b/src/world_entity.c
@@ -778,19 +778,39 @@ void world_entity_start( world_instance *world, vg_msg *sav )
    /* read savedata 
     * ----------------------------------------------------------------------- */
 
-   for( u32 i=0; i<af_arrcount(&world->ent_challenge); i++ ){
+   for( u32 i=0; i<af_arrcount(&world->ent_challenge); i++ )
+   {
       ent_challenge *challenge = af_arritm( &world->ent_challenge, i );
       const char *alias = af_str( &world->meta.af, challenge->pstr_alias );
 
-      u32 result;
-      vg_msg_getkvintg( sav, alias, k_vg_msg_u32, &result, NULL );
+      if( challenge->flags & k_ent_challenge_is_story )
+      {
+         struct script_info *script = skaterift_script_get_info( alias );
+         world->events[i].story_script = script;
 
-      if( result ){
-         ent_call call;
-         call.data = NULL;
-         call.function = 0;
-         call.id = mdl_entity_id( k_ent_challenge, i );
-         entity_call( world, &call );
+         if( script )
+         {
+            script->linked_challenge = challenge;
+
+            if( !script->availible )
+            {
+               challenge->flags |= k_ent_challenge_locked;
+            }
+         }
+      }
+      else
+      {
+         u32 result;
+         vg_msg_getkvintg( sav, alias, k_vg_msg_u32, &result, NULL );
+
+         if( result )
+         {
+            ent_call call;
+            call.data = NULL;
+            call.function = 0;
+            call.id = mdl_entity_id( k_ent_challenge, i );
+            entity_call( world, &call );
+         }
       }
    }
 
diff --git a/src/world_load.c b/src/world_load.c
index 66fed1c..9abcd14 100644
--- a/src/world_load.c
+++ b/src/world_load.c
@@ -103,6 +103,9 @@ static void world_instance_load_mdl( world_instance *world, const char *path,
       world->info.flags = 0;
    }
 
+   world->events = vg_linear_alloc( heap, 
+               af_arrcount(&world->ent_challenge)*sizeof(struct event_info) );
+
    vg_loader_set_user_information( "Compiling world details" );
 
    time_t seconds = time(NULL) % ((u32)vg_maxf(1.0f,k_day_length)*60);
@@ -368,7 +371,8 @@ void world_switcher_update(void)
 
       if( !all_world_audio_stopped )
          return;
-
+      
+      _skaterift_script_unlink_all_challenges();
       world_instance_free_graphics_data( &_world.main );
       _world.loader_state = k_world_loader_ready;
       vg_loader_set_user_information( "Waiting for loading thread" );
diff --git a/src/world_map.c b/src/world_map.c
index 4dbacfd..9752533 100644
--- a/src/world_map.c
+++ b/src/world_map.c
@@ -229,10 +229,26 @@ void world_map_pre_update(void)
    for( u32 i=0; i<af_arrcount(&world->ent_challenge); i++ )
    {
       ent_challenge *challenge = af_arritm( &world->ent_challenge, i );
+      if( challenge->flags & k_ent_challenge_locked ) 
+         continue;
 
       enum gui_icon icon = k_gui_icon_exclaim_2d;
-      if( challenge->status )
-         icon = k_gui_icon_tick_2d;
+      if( challenge->flags & k_ent_challenge_is_story )
+      {
+         icon = k_gui_icon_story2d;
+         if( world->events[i].story_script )
+         {
+            if( world->events[i].story_script->viewed_time )
+            {
+               icon = k_gui_icon_story_done2d;
+            }
+         }
+      }
+      else
+      {
+         if( challenge->status )
+            icon = k_gui_icon_tick_2d;
+      }
 
       respawn_map_draw_icon( cam, icon, challenge->transform.co, 1.0f );
    }
-- 
2.25.1