Merge branch 'main' into lib-cutscene

scripts/lib/ball.dsc

@@ -20,6 +20,13 @@ ball_create:
     - define size <[ball_collision].bounding_box.get[1].sub[<[ball_collision].location>].x.abs.add[0.01]>
     - spawn zombie[silent=true;has_ai=false;gravity=false;visible=false] <[location].with_pitch[0].with_yaw[0].below[<[size].add[1]>]> save:ball_display
     - define ball_display <entry[ball_display].spawned_entity>
+    - if <[ball_display].is_baby>:
+        - age <[ball_display]> adult lock
+    - if <[ball_display].is_inside_vehicle>:
+        # CHICKEN JOCKEEEEEEEEEEEEEEEEEEEEEEEEEY
+        - define chicken <[ball_display].vehicle>
+        - adjust <[chicken]> passengers:<list[]>
+        - remove <[chicken]>
     - adjust <[ball_display]> equipment:<map[].with[helmet].as[<[display_item]>]>
     - flag <[ball_collision]> ball:<[id]>
     - flag <[ball_collision]> ball_display:<[ball_display]>

scripts/liteprofilesutils/liteprofilesutils_world.dsc

@@ -66,6 +66,10 @@ liteprofilesutils_world:
         - narrate <[joinleavedata].get[join].parsed> targets:<[setting_enabled_players]>
         ## prevent /profile remove
         on command:
+        - if <context.source_type> != player:
+            - stop
+        - if <player.is_op>:
+            - stop
         - if <context.command.to_lowercase> == profile || <context.command.to_lowercase> == account || <context.command.to_lowercase> == pf:
             - if <context.args.get[1].to_lowercase.if_null[null]> == remove:
                 - determine cancelled passively

scripts/storyboard/ch1/ch1_1_preassign.dsc

@@ -2,9 +2,11 @@ ch1_1_preassign:
     debug: false
     type: world
     events:
-        on player joins:
+        after player joins:
+        - wait 1s
         - if <proc[storyboard_player_state_get].context[<player>|preassign]> == null:
-            - run storyboard_npc_memalloc "def:<player>|marie|player|<location[-4,2,-15,world]>|Marie Ayashibayomi|true|<script[storyboard_skin_dump].data_key[marie].get[a]>"
+            - if !<proc[storyboard_npc_exists].context[<player>|marie]>:
+                - run storyboard_npc_memalloc "def:<player>|marie|player|<location[-4,2,-15,world]>|Marie Ayashibayomi|true|<script[storyboard_skin_dump].data_key[marie].get[a]>"
             - run storyboard_npc_set_assignment def.player:<player> def.name:marie def.assignment:ch1_1_marie_assign
             - run storyboard_player_state_set def.player:<player> def.key:preassign def.value:true
 
@@ -131,6 +133,7 @@ ch1_1_marie_interact:
                         - ~run textbox_write def.player:<player> def.queue:<queue> "def.line3s:* Mkay." def.avatar_unicode:<script[storyboard_avatar_dump].data_key[marie].get[upset]>
                         - wait 1s
                         - disengage player
+                        - run storyboard_player_end_atomic_sequence def.queue:<queue> def.player:<player>
                         - stop
                     - ~run textbox_write def.player:<player> def.queue:<queue> "def.line3s:* Hm. Are you now?" def.avatar_unicode:<script[storyboard_avatar_dump].data_key[marie].get[upset]>
                     - ~run textbox_write def.player:<player> def.queue:<queue> "def.line3s:* You know, that was kind of$$nlmean of you." def.avatar_unicode:<script[storyboard_avatar_dump].data_key[marie].get[upset]>

scripts/storyboard/tasks/storyboard_npc_tasks.dsc

@@ -41,6 +41,7 @@ storyboard_npc_memalloc:
         - define npcs <[player].flag[storyboard_state].get[npcs].if_null[<map[]>]>
         - create <[type]> <[npc_id]> <[at]> registry:<[registry]> save:npc
         - define npc <entry[npc].created_npc>
+        - playeffect at:<[npc].location.above[1]> offset:0.35,1,0.35 effect:SOUL_FIRE_FLAME quantity:20
         - define npc_state <map[]>
         - define assignment null
         - if <[npcs].contains[<[name]>]>:
@@ -137,6 +138,14 @@ storyboard_npc_memdestroy:
     - define npc <proc[storyboard_npc_by_name].context[<[player]>|<[name]>]>
     - remove <[npc]>
 
+# Checks if an NPC exists for the given player.
+storyboard_npc_exists:
+    debug: false
+    type: procedure
+    definitions: player|name
+    script:
+    - determine <proc[storyboard_npc_by_name].context[<[player]>|<[name]>].if_null[null].equals[null].not>
+
 # Flags the NPC by name, mapping the given key to the given value.
 storyboard_npc_state_set:
     debug: false
@@ -215,6 +224,7 @@ storyboard_npc_internal_auto_memory_management:
     type: world
     events:
         after player joins:
+        - wait 1s
         - define npcs <player.flag[storyboard_state].get[npcs].if_null[<map[]>]>
         - foreach <[npcs]> key:name as:data:
             - define allocated  <[data].get[allocated].if_null[null]>