Merge branch 'v1.3.5' into feature/night-music

README.md

@@ -50,9 +50,9 @@ An After-Story style mod for Natsuki from DDLC, focusing on building a post-game
  </td>
  <td align="center">
   <a href="https:/Edgarmods">
-  <img src="https://avatars.githubusercontent.com/u/68255592?v=4" width="100;" alt="Edgarmods"/>
+  <img src="https://avatars.githubusercontent.com/u/68255592?v=4" width="100;" alt="Primrose"/>
   <br />
-  <sub><b>Edgarmods</b></sub>
+  <sub><b>Primrose</b></sub>
   </a>
  </td></tr>
 <tr>
@@ -126,6 +126,30 @@ An After-Story style mod for Natsuki from DDLC, focusing on building a post-game
  - InspectorJ
  - launemax
  - LG
+ - angeliqueperdikes
+ - Bee09
+ - Bertrof
+ - brandondelehoy
+ - ChazzRavenelle
+ - cupido-1
+ - Daleonfire
+ - Euphrosyyn
+ - Garuda1982
+ - HogantheLogan
+ - JasonElrod
+ - Joao_Janz
+ - jrssandoval
+ - Mydo1
+ - Robinhood76
+ - ryanharding95
+ - Sai-AnnNadesan
+ - SDLx
+ - Sirkoto51
+ - suntemple
+ - Syna-Max
+ - TinyRay
+ - tmkappelt
+ - valli39
 
  </details>
 - Our [contributors](https:/Just-Natsuki-Team/NatsukiModDev/graphs/contributors)!
@@ -168,7 +192,7 @@ It's rude to keep someone waiting, you know...
 
 Download the official launcher and follow the installation steps [here](https:/Just-Natsuki-Team/NatsukiModInstaller/releases/tag/release)!
 
-#### Manual installation
+#### Manual installation (not recommended: see [using the official installer](#using-the-official-jn-installer-recommended))
 
 <details>
 <summary>Details</summary>
@@ -198,7 +222,7 @@ Download the official launcher and follow the installation steps [here](https://
 
 Download the official launcher and follow the update steps [here](https:/Just-Natsuki-Team/NatsukiModInstaller/releases/tag/release)!
 
-#### Manual update
+#### Manual update (not recommended: see [using the official installer](#using-the-official-jn-installer-recommended))
 
 <details>
 <summary>Details</summary>
@@ -262,7 +286,7 @@ If so, then please consider joining us on Discord: we'd love to see you there!
 
 <br>
 <p align="center">
- <a href="https://discord.gg/sFxdsCBh94">
+ <a href="https://discord.gg/jr59Tts23d">
   <img src="https://discordapp.com/api/guilds/930206430148063242/widget.png?style=banner4"/>
  </a>
 </p>

game/activity.rpy

@@ -112,7 +112,7 @@ init python in jn_activity:
  return renpy.substitute(random.choice(self.notify_text))
 
  return None
- 
+
  class JNActivityManager:
  """
  Management class for handling activities.
@@ -225,7 +225,7 @@ init python in jn_activity:
  ))
  ACTIVITY_MANAGER.registerActivity(JNPlayerActivity(
  activity_type=JNActivities.music_applications,
- window_name_regex="(^spotify$|^spotify premium$|^groove$|^zune$|^itunes$)",
+ window_name_regex="(^spotify$|^spotify premium$|^groove$|^zune$|^itunes$|^musicbee$|^aimp$|^winamp$)",
  notify_text=[
  "You better play something good!",
  "New playlist, [player]?",
@@ -468,13 +468,13 @@ init python in jn_activity:
  """
  Gets the title of the currently active window.
 
- IN: 
+ IN:
  - delay - int amount of seconds to wait before checking window
 
  OUT:
  - str representing the title of the currently active window
  """
- global ACTIVITY_SYSTEM_ENABLED 
+ global ACTIVITY_SYSTEM_ENABLED
  if ACTIVITY_SYSTEM_ENABLED:
  if delay is not 0:
  store.jnPause(delay, hard=True)

game/definitions.rpy

@@ -1463,6 +1463,18 @@ init -100 python in jn_utils:
  """
  return random.randint(1, faces) == 1
 
+ def diceRoll(faces):
+ """
+ Returns True or False based on whether a roll with the given faces returns one.
+
+ IN:
+ - faces - int number of faces for the diceroll
+
+ OUT:
+ - True if the roll equals one, otherwise False
+ """
+ return random.randint(1, faces) == 1
+
  def getPlayerInitial():
  """
  Returns the first letter of the player's name.
@@ -2005,6 +2017,7 @@ init -100 python in jn_utils:
 
  if store.persistent.affinity >= (store.persistent._jn_gs_aff + 250):
  store.persistent._jn_pic_aff = store.persistent.affinity
+ store.persistent._jn_snpsht_aff = store.persistent.affinity
  store.persistent.affinity = store.persistent._jn_gs_aff
  jn_utils.log("434346".decode("hex"))
  store.persistent._jn_pic = True
@@ -2056,6 +2069,9 @@ define audio.t4g = "<loop 1.000>bgm/4g.ogg"
 # JN resources
 
 # Singleton sound effects
+define audio.anime_generic_theme = "mod_assets/sfx/anime_generic_theme.ogg"
+define audio.anime_punch = "mod_assets/sfx/anime_punch.ogg"
+define audio.anime_slash = "mod_assets/sfx/anime_slash.ogg"
 define audio.blow = "mod_assets/sfx/blow.ogg"
 define audio.book_closing = "mod_assets/sfx/book_closing.ogg"
 define audio.button_mashing_a = "mod_assets/sfx/button_mashing_a.ogg"

game/desk-items.rpy

@@ -204,6 +204,22 @@ init -55 python in jn_desk_items:
  image_path="mod_assets/props/plant_care_book_held.png"
  ))
 
+ __registerDeskItem(JNDeskItem(
+ reference_name="jn_a_la_mode_manga_held",
+ item_type=JNDeskItemTypes.normal,
+ desk_slot=JNDeskSlots.centre,
+ unlocked=False,
+ image_path="mod_assets/props/a_la_mode_manga_held.png"
+ ))
+
+ __registerDeskItem(JNDeskItem(
+ reference_name="jn_step_by_step_manga_held",
+ item_type=JNDeskItemTypes.normal,
+ desk_slot=JNDeskSlots.centre,
+ unlocked=False,
+ image_path="mod_assets/props/step_by_step_manga_held.png"
+ ))
+
  __registerDeskItem(JNDeskItem(
  reference_name="jn_parfait_manga_held",
  item_type=JNDeskItemTypes.normal,