co-exist merge update

FrostBitten-Wiki · Nov 5, 2024 · 11a5a39 · 11a5a39
1 parent d47847c
commit 11a5a39
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 5 deletions.
diff --git a/pagedata/applications.yaml b/pagedata/applications.yaml
@@ -10,6 +10,7 @@ page:
 
   header:
     description: |
+      !!INFOBOX TITLE:"Early Access Content / Beta Content" COLOR:"#23358C" TEXT:"*\"Careful now...\"* - Fang\nv(This page is content reserved for a future update, and is here to make editing post-update easier. Most of the info shown are with the discretion that it can and will change.)"
        Applications are software within the game that can be downloaded using the Synchronized Transferable App Repository, or STAR App. Each application serves their own unique purpose, affecting more than just your phone. Some of these range from statistics, to ordering already experienced events, among other things.
        \n\n
        Existing apps that are already pre-packaged within your phone however, are instead within the [Phone's](phone-overhauled) own page. External applications will only be displayed here.

diff --git a/pagedata/applications/caser.yaml b/pagedata/applications/caser.yaml
@@ -0,0 +1,27 @@
+editable: true
+page:
+  title: Caser
+  description: The Caser app is a paid external application within Bus Simulator that allows you to customize the casing of your phone, either by material, color, or adding a decal to it. Don't question how it works with the hyper-advanced nanotechnology. It's just how it is.
+  keywords: wiki, roblox bus simulator, roblox bus sim, roblox bus sim <categoryname>
+
+  tags: phone, starter item, android, android nougat, is nougat a real thing?
+
+  header:
+    description: |
+      Category: h[Applications]
+      
+    image: ''
+    imageBanner: /assets/bussim/images/items/phone/caser.webp
+
+attributions:
+  - made by fang
+
+content: |-
+  !!INFOBOX TITLE:"Early Access Content / Beta Content" COLOR:"#23358C" TEXT:"*\"Careful now...\"* - Fang\nv(This page is content reserved for a future update, and is here to make editing post-update easier. Most of the info shown are with the discretion that it can and will change.)"
+  !!INFOBOX TITLE:"Work In Progress / Placeholder Content" COLOR:"#C4FF96" TEXT:"*\"Oh dear, is that a bomb? Oh gosh i hope you dont explode in 3 seconds, that would be quite unfortunate.\"* - Charlotte\nv(This page is under construction and is only here so that it won't lead to an error!! I promise I'll work on it!!!! - Fang)"
+  "Do you feel lost? Directionless? Like your life is going nowhere?\nMaybe you should try doing some quests!" -"Pear's Place"
+  ##[Info]
+  The Caser app is a paid external application costing 1000 Coins, but allows you to customize the casing of your phone, either by material, color, or adding a decal to it. 
+  \n\n 
+  ##[Trivia]
+  - caseify
diff --git a/pagedata/applications/pears-place.yaml b/pagedata/applications/pears-place.yaml
@@ -18,7 +18,7 @@ attributions:
   - made by fang
 
 content: |-
-  !!INFOBOX TITLE:"Early Access Content" COLOR:"#23358C" TEXT:"*"The night's still young!"* - Fang\nv(This page is content reserved for a future update, and is here to make editing post-update easier. Most of the info shown are with the discretion that it can and will change.)"
+  !!INFOBOX TITLE:"Early Access Content / Beta Content" COLOR:"#23358C" TEXT:"*\"Careful now...\"* - Fang\nv(This page is content reserved for a future update, and is here to make editing post-update easier. Most of the info shown are with the discretion that it can and will change.)"
   "Do you feel lost? Directionless? Like your life is going nowhere?\nMaybe you should try doing some quests!" -"Pear's Place"
   ##[Info]
   Pear's Place is a free external application developed by Pear Paw in Bus Simulator. The app allows you to gain Coins as a form of currency, and has an array of various hosts and quests to choose from.
@@ -104,7 +104,7 @@ content: |-
   ###[__Miscellaneous__]
   | Image | Item | Cost | Description |
   |-------|------|------|-------------|
-  |![120x120](/bussim-assets/images/items/phone/pears-place/screen-repair.webp)|Screen Repair| <clr:#FFE669>(115 Coins) | Fix a cracked display. |
+  |![120x120](/bussim-assets/images/items/phone/screen-repair.webp)|Screen Repair| <clr:#FFE669>(115 Coins) | Fix a cracked display. |
   ##[Trivia]
   - The items that can't be purchased but are part of the events are those that are only purchasable (and permanent) with <clr:#FFE669>(Coins) or originally [Passenger Reputation](reputation).
     - Examples such as [Compass](compass), [Gas Station Coil](gas-station-coil), [Gas Station Ice Cream](gas-station-ice-cream) and [Flying Skillbook](flying-skillbook) all can be purchased with <clr:#FFE669>(Coins) but aren't on the Shop.

diff --git a/pagedata/applications/rider.yaml b/pagedata/applications/rider.yaml
@@ -0,0 +1,29 @@
+editable: true
+page:
+  title: Rider
+  description: Rider is a free external application that tracks various things throughout your entire bus journey, from events, currently playing radio songs, badges, items, to even some of the most bizzare things you didn't anticipate would be on here.
+
+  keywords: wiki, roblox bus simulator, roblox bus sim, roblox bus sim <categoryname>
+
+  tags: phone, starter item, android, android nougat, is nougat a real thing?
+
+  header:
+    description: |
+      Category: h[Applications]
+      
+    image: ''
+    imageBanner: /assets/bussim/images/items/phone/rider.webp
+
+attributions:
+  - made by fang
+
+content: |-
+  !!INFOBOX TITLE:"Early Access Content / Beta Content" COLOR:"#23358C" TEXT:"*\"Careful now...\"* - Fang\nv(This page is content reserved for a future update, and is here to make editing post-update easier. Most of the info shown are with the discretion that it can and will change.)"
+  !!INFOBOX TITLE:"Work In Progress / Placeholder Content" COLOR:"#C4FF96" TEXT:"*\"Oh dear, is that a bomb? Oh gosh i hope you dont explode in 3 seconds, that would be quite unfortunate.\"* - Charlotte\nv(This page is under construction and is only here so that it won't lead to an error!! I promise I'll work on it!!!! - Fang)"
+  "Do you feel lost? Directionless? Like your life is going nowhere?\nMaybe you should try doing some quests!" -"Pear's Place"
+  ##[Info]
+  Rider is a free external application that tracks various things throughout your entire bus journey, from events, currently playing radio songs, badges, items, to even some of the most bizzare things you didn't anticipate would be on here.
+  \n 
+
+  ##[Trivia]
+  - boo
diff --git a/pagedata/items/phone-overhauled.yaml b/pagedata/items/phone-overhauled.yaml
@@ -19,7 +19,7 @@ attributions:
   - made by fang
 
 content: |
-  !!INFOBOX TITLE:"Early Access Content" COLOR:"#23358C" TEXT:"*\"The night's still young!\"* - Fang\nv(This page is content reserved for a future update, and is here to make editing post-update easier. Most of the info shown are with the discretion that it can and will change.)"
+  !!INFOBOX TITLE:"Early Access Content / Beta Content" COLOR:"#23358C" TEXT:"*\"Careful now...\"* - Fang\nv(This page is content reserved for a future update, and is here to make editing post-update easier. Most of the info shown are with the discretion that it can and will change.)"
   "Runs something or other!" -"Phone"
   ##[Info]
   The Phone is the first tool added in Bus Simulator and similarly is the first tool you spawn off with, recieving a full overhaul throughout the end of August 2024. It serves a multitude of functions, from being a flashlight to communicating with others privately; all with customizations to your desire.

diff --git a/pagedata/mockup.yaml b/pagedata/mockup.yaml
@@ -37,6 +37,10 @@ content: |
  Color: Orange \n\n
  !!INFOBOX TITLE:"Early Access Content" COLOR:"#23358C" TEXT:"*\"The night's still young!\"* - Fang\nv(This page is content reserved for a future update, and is here to make editing post-update easier. Most of the info shown are with the discretion that it can and will change.)"
  Color: Navy (ALT Early Access) \n\n
+ !!INFOBOX TITLE:"Early Access Content / Beta Content" COLOR:"#23358C" TEXT:"*\"Careful now...\"* - Fang\nv(This page is content reserved for a future update, and is here to make editing post-update easier. Most of the info shown are with the discretion that it can and will change.)"
+ Color: Navy (Beta Early Access)
+ !!INFOBOX TITLE:"Work In Progress / Placeholder Content" COLOR:"#C4FF96" TEXT:"*\"Oh dear, is that a bomb? Oh gosh i hope you dont explode in 3 seconds, that would be quite unfortunate.\"* - Charlotte\nv(This page is under construction and is only here so that it won't lead to an error!! I promise I'll work on it!!!! - Fang)"
+ Color: Pale Lime (Placeholder Severity)
  !!INFOBOX TITLE:"Work In Progress" COLOR:"#c0700c" TEXT:"*\"not much to talk here, but.. well..\"* - efeuc\nv(This page is a stub, it may not contain all of the information in the game; so adding more information to this page is always appreciated!)"
  Color: Ginger \n\n
  !!INFOBOX TITLE:"Deleted Content" COLOR:"#ff0000" TEXT:"*\"Ehhhh... I'm kind of feeling a bit spooked right now. I have a big sense of like, deja vu.. Maybe next time...\"* -Tazer\nv(This page has content that's already been deleted from the game, however will be kept purely for archival purposes.)"

diff --git a/pagedata/others/coins.yaml b/pagedata/others/coins.yaml
@@ -18,6 +18,8 @@ attributions:
   - woof woof bark bark
 
 content: |-
+  !!INFOBOX TITLE:"Early Access Content / Beta Content" COLOR:"#23358C" TEXT:"*\"Careful now...\"* - Fang\nv(This page is content reserved for a future update, and is here to make editing post-update easier. Most of the info shown are with the discretion that it can and will change.)"
+  !!INFOBOX TITLE:"Work In Progress" COLOR:"#c0700c" TEXT:"*\"not much to talk here, but.. well..\"* - efeuc\nv(This page is a stub, it may not contain all of the information in the game; so adding more information to this page is always appreciated!)"
   "HOW ARE YOU IN" -"<clr:#FFE669>(Coins)"
   ##[Info]
   <clr:#FFE669>(Coins) are the main currency in Bus Simulator, used to purchase apps, items, and more. Replacing [Passenger Reputation](reputation) as a form of currency in almost all purchases in the game.

diff --git a/pagedata/others/vehicles.yaml b/pagedata/others/vehicles.yaml
@@ -31,7 +31,7 @@ content: |
   \n\n
   When you also attempt to jump onto any of the six vehicles, you may also be subjected into being flinged in extreme velocity unless if you are holding or using the [Mini Bus](items/mini-bus), in this case; you won't be tripped nor flung.
   \n\n 
-  One thing to note, is that if you crash into any vehicle, then your [Phone](phone) will crack, requiring you to repair it at [Pear's Place](pears-place).
+  One thing to note within the Beta Build of Bus Simulator, is that if you crash into any vehicle, then your [Phone](phone-overhauled) will crack, requiring you to repair it at [Pear's Place](pears-place).
   ##[Ice Cream Truck]
   The ice cream truck is a special vehicle, only stopping when the bus stops (even after it spawns) and being faster than The Bus while moving.
   \n

diff --git a/template.html b/template.html
@@ -206,7 +206,7 @@
 
                 <button onclick="location.href='applications'">
                     <img src="/assets/bussim/images/menuIcons/applications.png" style="user-select: none; margin-left: 7px;" width="24" height="auto">
-                    <text type="hoverText">Applications</text>
+                    <text type="hoverText">Applications (BETA)</text>
                 </button>
 
                 <button onclick="location.href='npcs'">