fix ex_prop, keep braided locked, added todo

Monika-After-Story · Oct 26, 2020 · b185aab · b185aab
1 parent b373d2f
commit b185aab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Monika After Story/game/script-holidays.rpy b/Monika After Story/game/script-holidays.rpy
@@ -700,7 +700,9 @@ init 5 python:
 label greeting_o31_rin:
     python:
         title_cased_hes = hes.capitalize()
-        mas_selspr.unlock_hair(mas_hair_braided)
+        #TODO: Unlock this hairstyle once we clean it up such that it doesn't require bows
+        #Will need update script
+        #mas_selspr.unlock_hair(mas_hair_braided)
         mas_sprites.zoom_out()
 
     # ASSUME vignette

diff --git a/Monika After Story/game/sprite-chart.rpy b/Monika After Story/game/sprite-chart.rpy
@@ -302,9 +302,9 @@ init -100 python in mas_sprites:
     # v: ignored
     # marks that a hair style has no tails. By default we assume ponytail.
 
-    EXP_H_NH = "no-hat"
+    EXP_H_TB = "twinbraid"
     #v: ignored
-    #marks the hair as not capable of having a hat
+    #marks the hair as a twinbraid hairstyle
 
     # ---- CLOTHES ----
 

diff --git a/Monika After Story/game/zz_spriteobjects.rpy b/Monika After Story/game/zz_spriteobjects.rpy
@@ -767,7 +767,7 @@ init -1 python:
             use_reg_for_l=True
         ),
         ex_props={
-            store.mas_sprites.EXP_H_NH: True
+            store.mas_sprites.EXP_H_TB: True
         },
         entry_pp=store.mas_sprites._hair_braided_entry,
         exit_pp=store.mas_sprites._hair_braided_exit
@@ -1416,7 +1416,7 @@ init -1 python:
         # muxtype handled by defaults
         ex_props={
             store.mas_sprites.EXP_A_RQHP: store.mas_sprites.EXP_H_NT,
-            store.mas_sprites.EXP_A_EXCLHP: store.mas_sprites.EXP_H_NH
+            store.mas_sprites.EXP_A_EXCLHP: store.mas_sprites.EXP_H_TB
         },
         rec_layer=MASMonika.AFH_ACS
     )