diff --git a/Monika After Story/game/script-ch30.rpy b/Monika After Story/game/script-ch30.rpy index ff569ce6ae..d45e1b13f5 100644 --- a/Monika After Story/game/script-ch30.rpy +++ b/Monika After Story/game/script-ch30.rpy @@ -1036,7 +1036,7 @@ init 999 python in mas_reset: ## accessory hotfixes # mainly to re add accessories that may have been removed for some reason # this is likely to occur in crashes / reloads - if persistent._mas_acs_enable_promisering: + if persistent._mas_acs_enable_promisering and not store.monika_chr.is_wearing_clothes_with_exprop("hide-ring"): # TODO: need to be able to add a different promise ring store.monika_chr.wear_acs_pst(store.mas_acs_promisering) diff --git a/Monika After Story/game/script-holidays.rpy b/Monika After Story/game/script-holidays.rpy index 899ce965f6..2fa27ac493 100644 --- a/Monika After Story/game/script-holidays.rpy +++ b/Monika After Story/game/script-holidays.rpy @@ -1126,6 +1126,54 @@ label greeting_o31_briaryoung_shuchiin_academy_uniform: call greeting_o31_cleanup return +#2b intro +init 5 python: + addEvent( + Event( + persistent.greeting_database, + eventlabel="greeting_o31_hatana_2b", + category=[store.mas_greetings.TYPE_HOL_O31] + ), + code="GRE" + ) + +label greeting_o31_hatana_2b: + call spaceroom(hide_monika=True, scene_change=True, dissolve_all=True) + #moni is off-screen + + if persistent._mas_o31_relaunch: + m "Almost ready, [player]..." + m "I just hope this skirt doesn't self-destruct." + m "{cps=*2}Although maybe you do...{/cps}{nw}" + $ _history_list.pop() + m "Okay, there. {w=0.2}Ready [player]?" + + else: + m "Okay there, {w=0.1}I think that's everything." + m "Just as long as this skirt doesn't self-destruct...{w=0.3}that'd be really embarrassing!" + m "Oh! {w=0.2}I think I hear something..." + m "[player]?" + + m "I have a question for you..." + m "To be..." + + #show moni now + call mas_transition_from_emptydesk("monika 3hub") + + m 3hub "...or not 2B?!" + m 1hub "Ahaha!" + m 2eka "So, what do you think?" + m 2hub "I think it's a really cool costume, thanks again for giving it to me!" + m 7rtu "Say [player], have I ever told you there is something calming about you?" + m 3euu "Well, I just wanted you to know that. {w=0.2}{nw}" + extend 3tuu "Hopefully it never gets wiped from your memory." + m 3eud "That reminds me, make sure you back up my data from time to time, I'd do the same for you if I could..." + m 1hksdlb "Oh gosh, I'm not even sure what that means, I'm just rambling now, ahaha!" + + call greeting_o31_deco + call greeting_o31_cleanup + return + label greeting_o31_deco: m 1eua "Anyway..." m 3eua "Do you like what I've done with the room?" diff --git a/Monika After Story/game/sprite-chart.rpy b/Monika After Story/game/sprite-chart.rpy index c3f489dba3..741bfd7488 100644 --- a/Monika After Story/game/sprite-chart.rpy +++ b/Monika After Story/game/sprite-chart.rpy @@ -382,9 +382,14 @@ init -100 python in mas_sprites: # v: ignored # marks that a clothing item is lingerie - # Value: ignored - # Marks that a clothing item is wet (appropriate for a bath/shower/pool/etc) EXP_C_WET = "wet" + # v: ignored + # marks that a clothing item is wet (appropriate for a bath/shower/pool/etc) + + EXP_C_HIDE_RING = "hide-ring" + # v: ignored + # marks clothes that hides the promise ring + # TODO: migrate to an acs (glove) exp prop once implemented # --- default exprops --- @@ -3838,7 +3843,7 @@ init -3 python: def set_acs(self, acs, wear): """ - Basically a single function so callers don't need to + Basically a single function so callers don't need to if-statement-toggle wearing and removal of ACS. IN: @@ -7591,7 +7596,7 @@ init -3 python: Use the functions to modify outfit data as appropriate. Supports: - - preventing ACS from being removed + - preventing ACS from being removed - preventing hair or ACS from being worn """ @@ -7634,7 +7639,7 @@ init -3 python: def set_acs_change_all(self, value): """ Enables or disables ALL ACS changing as part of outfit mode - + IN: value - pass True to enable, False to disable """ diff --git a/Monika After Story/game/zz_spriteobjects.rpy b/Monika After Story/game/zz_spriteobjects.rpy index cf7479b588..4c71f589df 100644 --- a/Monika After Story/game/zz_spriteobjects.rpy +++ b/Monika After Story/game/zz_spriteobjects.rpy @@ -521,7 +521,6 @@ init -2 python in mas_sprites: # find ACS and wear for this outfit _acs_wear_if_found(_moni_chr, "briaryoung_front_bow_black") - def _clothes_briaryoung_shuchiin_academy_uniform_exit(_moni_chr, **kwargs): """ Exit prog point for the shuchiin academy uniform @@ -529,6 +528,32 @@ init -2 python in mas_sprites: # NOTE: this prog point is chika specific. See above. _acs_remove_if_found(_moni_chr, "briaryoung_front_bow_black") + def _clothes_hatana_2b_entry(_moni_chr, **kwargs): + """ + Entry pp for hatana 2b + """ + outfit_mode = kwargs.get("outfit_mode", False) + + if outfit_mode: + # swap to echo_downshort hair if found, if not, hair_down + downshort = store.mas_sprites.get_sprite( + store.mas_sprites.SP_HAIR, + "echo_downshort" + ) + _moni_chr.change_hair(downshort if downshort is not None else store.mas_hair_down) + + # remove promise ring so it can't cli[ thru gloves + _acs_remove_if_found(_moni_chr, "promisering") + + + def _clothes_hatana_2b_exit(_moni_chr, **kwargs): + """ + Exit prog point for hatana 2b + """ + # re-wear promise ring if applicable + if store.persistent._mas_acs_enable_promisering: + _moni_chr.wear_acs(store.mas_acs_promisering) + ######### ACS [SPR030] ########### # available kwargs: diff --git a/spritepacks/released/hatana/hatana-2B/gifts/2bcosplay.gift b/spritepacks/released/hatana/hatana-2B/gifts/2bcosplay.gift new file mode 100644 index 0000000000..e69de29bb2 diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-crossed-10.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-crossed-10.png new file mode 100644 index 0000000000..1e0d097048 Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-crossed-10.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-crossed-5.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-crossed-5.png new file mode 100644 index 0000000000..d9f7d54b86 Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-crossed-5.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-leaning-def-left-def-10.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-leaning-def-left-def-10.png new file mode 100644 index 0000000000..7c52bf53f1 Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-leaning-def-left-def-10.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-leaning-def-right-def-10.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-leaning-def-right-def-10.png new file mode 100644 index 0000000000..5ba2bd20c0 Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-leaning-def-right-def-10.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-leaning-def-right-def-5.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-leaning-def-right-def-5.png new file mode 100644 index 0000000000..ed383ef7e2 Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-leaning-def-right-def-5.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-left-down-0.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-left-down-0.png new file mode 100644 index 0000000000..bd72c046af Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-left-down-0.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-left-rest-10.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-left-rest-10.png new file mode 100644 index 0000000000..c335991c84 Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-left-rest-10.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-right-down-0.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-right-down-0.png new file mode 100644 index 0000000000..0cd53e378c Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-right-down-0.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-right-point-0.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-right-point-0.png new file mode 100644 index 0000000000..d8f591c922 Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-right-point-0.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-right-restpoint-10.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-right-restpoint-10.png new file mode 100644 index 0000000000..f7a2fd058c Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-right-restpoint-10.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-steepling-10.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-steepling-10.png new file mode 100644 index 0000000000..d67bf86a3a Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/arms-steepling-10.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-def-0.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-def-0.png new file mode 100644 index 0000000000..bd2cbcd389 Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-def-0.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-def-1.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-def-1.png new file mode 100644 index 0000000000..46dd6525ec Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-def-1.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-leaning-def-0.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-leaning-def-0.png new file mode 100644 index 0000000000..0e67d3f3ee Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-leaning-def-0.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-leaning-def-1.png b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-leaning-def-1.png new file mode 100644 index 0000000000..5b5aaa4162 Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/c/hatana_2b/body-leaning-def-1.png differ diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/monika/j/hatana_clothes_yorha_2b_cosplay.json b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/j/hatana_clothes_yorha_2b_cosplay.json new file mode 100644 index 0000000000..b0bdf3f65a --- /dev/null +++ b/spritepacks/released/hatana/hatana-2B/mod_assets/monika/j/hatana_clothes_yorha_2b_cosplay.json @@ -0,0 +1,69 @@ +{ + "__author": "hatana", + "version": 3, + "type": 2, + "name": "hatana_2b", + "img_sit": "hatana_2b", + "pose_map": { + "mpm_type": 0, + "default": false, + "l_default": false, + "p1": true, + "p2": true, + "p3": true, + "p4": true, + "p5": true, + "p6": true, + "p7": true + }, + "stay_on_start": true, + "ex_props": { + "cosplay": true, + "costume": "o31", + "hide-ring": true + }, + "select_info": { + "display_name": "YoRHa No.2 Type B", + "thumb": "hatana_2b", + "group": "clothes" + }, + "giftname": "2bcosplay", + "pose_arms": { + "crossed": { + "tag": "crossed", + "layers": "5^10" + }, + "left-down": { + "tag": "down", + "layers": "0" + }, + "left-rest": { + "tag": "rest", + "layers": "10" + }, + "right-down": { + "tag": "down", + "layers": "0" + }, + "right-point": { + "tag": "point", + "layers": "0" + }, + "right-restpoint": { + "tag": "restpoint", + "layers": "10" + }, + "steepling": { + "tag": "steepling", + "layers": "10" + }, + "def|left-def": { + "tag": "def", + "layers": "10" + }, + "def|right-def": { + "tag": "def", + "layers": "5^10" + } + } +} diff --git a/spritepacks/released/hatana/hatana-2B/mod_assets/thumbs/clothes-hatana_2b.png b/spritepacks/released/hatana/hatana-2B/mod_assets/thumbs/clothes-hatana_2b.png new file mode 100644 index 0000000000..e7ff203d81 Binary files /dev/null and b/spritepacks/released/hatana/hatana-2B/mod_assets/thumbs/clothes-hatana_2b.png differ