333/tarinai
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ss

Browse source
This commit is contained in:
33333-33333 2026-08-08 15:31:31 +09:00
commit 28591233f3
85 changed files with 946 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/tarinai_social_move_life.js
View file

@ -376,6 +376,17 @@
o._achievementLastFightDamageAt = this.world.time || 0;
this.damage(damageToThis, "\u55a7\u5629");
o.damage(damageToOther, "\u55a7\u5629");
const nowFightVoice = Number(this.world?.time || 0) || 0;
const ochibiAttackVoice = attacker => {
if (!attacker?.isAcquiredTarinai || nowFightVoice < Number(attacker.ochibiFightHitVoiceAt || 0)) return;
attacker.ochibiFightHitVoiceAt = nowFightVoice + 1.25;
if (attacker.bubble?.("ちね！", 1.0, "rgba(120,54,44,0.84)", { force: true })) {
const a = globalThis.TarinaiAudio;
if (a?.playSample) a.playSample("voice_ochibi_fight_hit_004", 0.8, "voice") || a.play?.("voice_ochibi_fight_hit_004", { category: "voice", minGap: 0.8 });
}
};
if (damageToOther > 0.01) ochibiAttackVoice(this);
if (damageToThis > 0.01) ochibiAttackVoice(o);
this.world.maybeDefeatFromFightDamage?.(this, o, damageToThis);
this.world.maybeDefeatFromFightDamage?.(o, this, damageToOther);
this.hurtTimer = Math.max(this.hurtTimer, 1.4);
@ -815,6 +826,7 @@
if (this.sleepDisease) return "\u306d\u3080\u308a\u75c5";
if (this.explosionDisease) return "\u7206\u767a\u75c5";
if (this.fightDisease) return "\u304d\u305a\u3064\u304d\u75c5";
if (this.mamekusaredakeDisease) return "マメクサレダケ病";
return "";
};
if (this.energy <= 0) {
@ -834,6 +846,7 @@
this.dead = true;
this.deathReason = finalReason;
this.deathTime = Number(this.world?.time || 0) || 0;
if (this.mamekusaredakeDisease) globalThis.TarinaiMamekusaredakeSystem?.plantFromHost?.(this);
this.world.syncTarinaiCountEntry?.(this);
this.world.deadCount += 1;
globalThis.TarinaiAchievements?.evaluateEvent?.(this.world, "population", { tarinai: this, delta: -1, reason: finalReason });