diff --git a/PriceTable.md b/PriceTable.md index f559d5034..29c4a7f1b 100644 --- a/PriceTable.md +++ b/PriceTable.md @@ -87,7 +87,7 @@ Other items that can be bought at any moment. **Omnisights** and **Embiggeners** Ragekit | 500000 Lämp | 70000 -### Collectables +### Collectibles Items that can sometimes be found in special boxes hidden in secret rooms. When collected they give credits according to their price. diff --git a/language.def_lore b/language.def_lore index 55a8ff63c..5b1da7cac 100644 --- a/language.def_lore +++ b/language.def_lore @@ -388,7 +388,7 @@ SWWM_LORETXT_CRONOS = "\cxName:\c-\n\cf Cronos\c-\n\cxClassification:\c-\n\cf Cl SWWM_LORETAG_CHANCEBOX = "Lucky Chancebox"; SWWM_LORETAB_CHANCEBOX = "Item"; SWWM_LOREREL_CHANCEBOX = "NosKora;Saya"; -SWWM_LORETXT_CHANCEBOX = "\cxDesignation:\c-\n\cf Lucky Chance Box\c-\n\cxManufacturer:\c-\n\cf Plutoni Incorporated\c-\n\cxClassification:\c-\n\cf Surprise Mechanic\c-\n\cxExcitement:\c-\n\cf Guaranteed\c-\n\nThese wondrous little boxes are full of surprises. Every single one, 100%, is guaranteed to provide you with a most precious treasure, should you first be able to track it down, as they will be strategically hidden throughout your mission, as reward for thorough secret-hunting.\n\nComplete your collection! Among the items you can find in these boxes, there are unique collectibles to obtain, all quite valuable as you might see, selected personally by us, for you.\n\n\cxSaya's Notes:\c-\n\cfOK, FUCK THIS SHIT. THIS IS LITERALLY FUCKING GACHA BULLSHIT NOW, IT'S EXACTLY JUST THAT\c-\n\n\cfThose two have brought MOTHERFUCKING LOOTBOXES into real life, are you shitting me? They could have used their cool reality bending powers for anything else they wanted, like... making moth girls real or something, but instead, this shit.\c-\n\n\cfOK yeah maybe the moth girls thing is something that I WOULD want, but you get what I mean.\c-\n\n\cf... god I wish moth girls were real\c-"; +SWWM_LORETXT_CHANCEBOX = "\cxDesignation:\c-\n\cf Lucky Chance Box\c-\n\cxManufacturer:\c-\n\cf Plutoni Incorporated\c-\n\cxClassification:\c-\n\cf Surprise Mechanic\c-\n\cxExcitement:\c-\n\cf Guaranteed\c-\n\nThese wondrous little boxes are full of surprises. Every single one, 100%, is guaranteed to provide you with a most precious treasure, should you first be able to track it down, as they will be strategically hidden throughout your mission, as reward for thorough secret-hunting.\n\nComplete your collection! Among the items you can find in these boxes, there are unique collectibles to obtain, all quite valuable as you might see, selected personally by us, for you.\n\nOnce you obtain a collectible, it will be nicely tracked within your \cfKeychain\c- tab. The item's actual (or estimated) market price will be attached, too, should you be curious about that.\n\n\cxSaya's Notes:\c-\n\cfOK, FUCK THIS SHIT. THIS IS LITERALLY FUCKING GACHA BULLSHIT NOW, IT'S EXACTLY JUST THAT\c-\n\n\cfThose two have brought MOTHERFUCKING LOOTBOXES into real life, are you shitting me? They could have used their cool reality bending powers for anything else they wanted, like... making moth girls real or something, but instead, this shit.\c-\n\n\cfOK yeah maybe the moth girls thing is something that I WOULD want, but you get what I mean.\c-\n\n\cf... god I wish moth girls were real\c-"; SWWM_LORETAG_FRISPYCORN = "Frispy Corn Snack"; SWWM_LORETAB_FRISPYCORN = "Item"; SWWM_LOREREL_FRISPYCORN = "Saya;Vestal"; diff --git a/language.version b/language.version index 059aedab0..5c3455d0b 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r564 \cu(Tue 20 Oct 14:01:25 CEST 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r564 \cu(Wed 21 Oct 12:46:07 CEST 2020)"; diff --git a/lore/default/chancebox.txt b/lore/default/chancebox.txt index eb62b89d3..f44ae9795 100644 --- a/lore/default/chancebox.txt +++ b/lore/default/chancebox.txt @@ -18,6 +18,8 @@ These wondrous little boxes are full of surprises. Every single one, 100%, is gu Complete your collection! Among the items you can find in these boxes, there are unique collectibles to obtain, all quite valuable as you might see, selected personally by us, for you. +Once you obtain a collectible, it will be nicely tracked within your **Keychain** tab. The item's actual (or estimated) market price will be attached, too, should you be curious about that. + \cxSaya's Notes:\c- \cfOK, FUCK THIS SHIT. THIS IS LITERALLY FUCKING GACHA BULLSHIT NOW, IT'S EXACTLY JUST THAT\c- diff --git a/sndinfo.txt b/sndinfo.txt index 5be2261dc..65638fd49 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -952,11 +952,6 @@ lamp/on sounds/items/lampon.ogg lamp/off sounds/items/lampoff.ogg lamp/appear sounds/items/lampappear.ogg lamp/disappear sounds/items/lampdisappear.ogg -// maybe eventually -mashiro/giggle sounds/mashiro/moth_giggle.ogg -//mashiro/see (some sort of creepy yandere girl giggling I guess) -//mashiro/active (more creepy giggles?) -//mashiro/attack (clawing) moth/scrape1 sounds/items/mothatk1.ogg moth/scrape2 sounds/items/mothatk2.ogg moth/scrape3 sounds/items/mothatk3.ogg @@ -968,7 +963,34 @@ moth/die2 sounds/items/mothdie2.ogg $random moth/die { moth/die1 moth/die2 } moth/fly sounds/items/mothfly.ogg $limit moth/fly 30 - +// white lady (not actually mashiro) +mashiro/appear sounds/mashiro/moth_appear.ogg +mashiro/giggle1 sounds/mashiro/moth_giggle1.ogg +mashiro/giggle2 sounds/mashiro/moth_giggle2.ogg +mashiro/giggle3 sounds/mashiro/moth_giggle3.ogg +mashiro/giggle4 sounds/mashiro/moth_giggle4.ogg +mashiro/giggle5 sounds/mashiro/moth_giggle5.ogg +mashiro/giggle6 sounds/mashiro/moth_giggle6.ogg +$random mashiro/giggle { mashiro/giggle1 mashiro/giggle2 mashiro/giggle3 mashiro/giggle4 mashiro/giggle5 mashiro/giggle6 } +mashiro/see1 sounds/mashiro/moth_anger1.ogg +mashiro/see2 sounds/mashiro/moth_anger2.ogg +$random mashiro/see { mashiro/see1 mashiro/see2 } +mashiro/attack1 sounds/mashiro/moth_attack1.ogg +mashiro/attack2 sounds/mashiro/moth_attack2.ogg +$random mashiro/attack { mashiro/attack1 mashiro/attack2 } +mashiro/hit1 sounds/mashiro/moth_hit1.ogg +mashiro/hit2 sounds/mashiro/moth_hit2.ogg +$random mashiro/hit { mashiro/hit1 mashiro/hit2 } +mashiro/flesh1 sounds/mashiro/moth_hitf1.ogg +mashiro/flesh2 sounds/mashiro/moth_hitf2.ogg +mashiro/flesh3 sounds/mashiro/moth_hitf3.ogg +$random mashiro/flesh { mashiro/hitf1 mashiro/hitf2 mashiro/hitf3 } +mashiro/active1 sounds/mashiro/moth_postatk1.ogg +mashiro/active2 sounds/mashiro/moth_postatk2.ogg +mashiro/active3 sounds/mashiro/moth_postatk3.ogg +mashiro/active4 sounds/mashiro/moth_postatk4.ogg +$random mashiro/active { mashiro/active1 mashiro/active2 mashiro/active3 mashiro/active4 } +mashiro/die sounds/mashiro/moth_defeat.ogg fabricator/use sounds/items/makeammo.ogg chancebox/explode1 sounds/items/lootexpl1.ogg diff --git a/sounds/mashiro/moth_anger1.ogg b/sounds/mashiro/moth_anger1.ogg new file mode 100644 index 000000000..5d4721ec3 Binary files /dev/null and b/sounds/mashiro/moth_anger1.ogg differ diff --git a/sounds/mashiro/moth_anger2.ogg b/sounds/mashiro/moth_anger2.ogg new file mode 100644 index 000000000..3e3e2bd7f Binary files /dev/null and b/sounds/mashiro/moth_anger2.ogg differ diff --git a/sounds/mashiro/moth_giggle.ogg b/sounds/mashiro/moth_appear.ogg similarity index 100% rename from sounds/mashiro/moth_giggle.ogg rename to sounds/mashiro/moth_appear.ogg diff --git a/sounds/mashiro/moth_attack1.ogg b/sounds/mashiro/moth_attack1.ogg new file mode 100644 index 000000000..0c488eb36 Binary files /dev/null and b/sounds/mashiro/moth_attack1.ogg differ diff --git a/sounds/mashiro/moth_attack2.ogg b/sounds/mashiro/moth_attack2.ogg new file mode 100644 index 000000000..1aaf7b48b Binary files /dev/null and b/sounds/mashiro/moth_attack2.ogg differ diff --git a/sounds/mashiro/moth_defeat.ogg b/sounds/mashiro/moth_defeat.ogg new file mode 100644 index 000000000..277fd5b2b Binary files /dev/null and b/sounds/mashiro/moth_defeat.ogg differ diff --git a/sounds/mashiro/moth_giggle1.ogg b/sounds/mashiro/moth_giggle1.ogg new file mode 100644 index 000000000..cdb5d15da Binary files /dev/null and b/sounds/mashiro/moth_giggle1.ogg differ diff --git a/sounds/mashiro/moth_giggle2.ogg b/sounds/mashiro/moth_giggle2.ogg new file mode 100644 index 000000000..0f490e9e3 Binary files /dev/null and b/sounds/mashiro/moth_giggle2.ogg differ diff --git a/sounds/mashiro/moth_giggle3.ogg b/sounds/mashiro/moth_giggle3.ogg new file mode 100644 index 000000000..07be3a79a Binary files /dev/null and b/sounds/mashiro/moth_giggle3.ogg differ diff --git a/sounds/mashiro/moth_giggle4.ogg b/sounds/mashiro/moth_giggle4.ogg new file mode 100644 index 000000000..750a6c027 Binary files /dev/null and b/sounds/mashiro/moth_giggle4.ogg differ diff --git a/sounds/mashiro/moth_giggle5.ogg b/sounds/mashiro/moth_giggle5.ogg new file mode 100644 index 000000000..4341103c0 Binary files /dev/null and b/sounds/mashiro/moth_giggle5.ogg differ diff --git a/sounds/mashiro/moth_giggle6.ogg b/sounds/mashiro/moth_giggle6.ogg new file mode 100644 index 000000000..f5fed73a2 Binary files /dev/null and b/sounds/mashiro/moth_giggle6.ogg differ diff --git a/sounds/mashiro/moth_hit1.ogg b/sounds/mashiro/moth_hit1.ogg new file mode 100644 index 000000000..9a46431b3 Binary files /dev/null and b/sounds/mashiro/moth_hit1.ogg differ diff --git a/sounds/mashiro/moth_hit2.ogg b/sounds/mashiro/moth_hit2.ogg new file mode 100644 index 000000000..64ce1e815 Binary files /dev/null and b/sounds/mashiro/moth_hit2.ogg differ diff --git a/sounds/mashiro/moth_hitf1.ogg b/sounds/mashiro/moth_hitf1.ogg new file mode 100644 index 000000000..e09e69d65 Binary files /dev/null and b/sounds/mashiro/moth_hitf1.ogg differ diff --git a/sounds/mashiro/moth_hitf2.ogg b/sounds/mashiro/moth_hitf2.ogg new file mode 100644 index 000000000..2540033e7 Binary files /dev/null and b/sounds/mashiro/moth_hitf2.ogg differ diff --git a/sounds/mashiro/moth_hitf3.ogg b/sounds/mashiro/moth_hitf3.ogg new file mode 100644 index 000000000..084b85833 Binary files /dev/null and b/sounds/mashiro/moth_hitf3.ogg differ diff --git a/sounds/mashiro/moth_postatk1.ogg b/sounds/mashiro/moth_postatk1.ogg new file mode 100644 index 000000000..8689146a4 Binary files /dev/null and b/sounds/mashiro/moth_postatk1.ogg differ diff --git a/sounds/mashiro/moth_postatk2.ogg b/sounds/mashiro/moth_postatk2.ogg new file mode 100644 index 000000000..527d747e9 Binary files /dev/null and b/sounds/mashiro/moth_postatk2.ogg differ diff --git a/sounds/mashiro/moth_postatk3.ogg b/sounds/mashiro/moth_postatk3.ogg new file mode 100644 index 000000000..285cb4912 Binary files /dev/null and b/sounds/mashiro/moth_postatk3.ogg differ diff --git a/sounds/mashiro/moth_postatk4.ogg b/sounds/mashiro/moth_postatk4.ogg new file mode 100644 index 000000000..17ec003cc Binary files /dev/null and b/sounds/mashiro/moth_postatk4.ogg differ diff --git a/zscript/swwm_hud.zsc b/zscript/swwm_hud.zsc index 7611f49ee..6037d4fcb 100644 --- a/zscript/swwm_hud.zsc +++ b/zscript/swwm_hud.zsc @@ -841,35 +841,20 @@ Class SWWMStatusBar : BaseStatusBar private void DrawScore() { - if ( ScoreInter2.GetValue() > 0 ) + String sstr; + if ( ScoreInter2.GetValue() > 0 ) sstr = String.Format("%d%09d",ScoreInter2.GetValue(),ScoreInter.GetValue()); + else sstr = String.Format("%09d",ScoreInter.GetValue()); + int digits = sstr.Length(); + int xx = 19+6*digits; + Screen.DrawTexture(ScoreTex[0],false,ss.x-(margin+xx),margin,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + xx -= 15; + for ( int i=0; i