-
Notifications
You must be signed in to change notification settings - Fork 0
/
diegetic-temperature
232 lines (205 loc) · 7.56 KB
/
diegetic-temperature
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
diff --git a/gameSource/LivingLifePage.cpp b/gameSource/LivingLifePage.cpp
index dff9d5ba2..ec63deaeb 100644
--- a/gameSource/LivingLifePage.cpp
+++ b/gameSource/LivingLifePage.cpp
@@ -155,6 +155,8 @@ static char followRoadsOnlyWhileRunning = 1;
static int ignoreTallObjects = 1;
+static int showShiverSweat = 0;
+
static int screenCenterPlayerOffsetX, screenCenterPlayerOffsetY;
@@ -2875,6 +2877,9 @@ LivingLifePage::LivingLifePage()
followRoadsOnlyWhileRunning = SettingsManager::getIntSetting( "followRoadsOnlyWhileRunning", 1 ) && maxDoubleClickFrames > 0;
ignoreTallObjects = SettingsManager::getIntSetting( "ignoreTallObjects", 1 );
+
+ showShiverSweat = SettingsManager::getIntSetting( "showShiverSweat", 0 );
+ setAnimationSweatSprite( SettingsManager::getIntSetting( "sweatDropSprite", 88 ) );
initLiveTriggers();
@@ -5007,6 +5012,18 @@ ObjectAnimPack LivingLifePage::drawLiveObject(
pos = add( pos, actionOffset );
}
+ // diegetic temperature
+ if( showShiverSweat && inObj->heat < 0.5 ) {
+ double shiverChance = 1.0 - inObj->heat * 2;
+ if( randSource.getRandomBoundedDouble( 0, 1.0 ) < pow(shiverChance, 3) ) {
+ double shiverMax = CELL_D * 0.01;
+ double shiverX = randSource.getRandomBoundedInt( 0, shiverMax );
+ double shiverY = randSource.getRandomBoundedInt( 0, shiverMax );
+ doublePair shiver = { shiverX, shiverY };
+
+ pos = add( pos, shiver );
+ }
+ }
AnimType curType = inObj->curAnim;
AnimType fadeTargetType = inObj->curAnim;
@@ -5141,6 +5158,13 @@ ObjectAnimPack LivingLifePage::drawLiveObject(
setAnimationEmotion( inObj->currentEmot );
addExtraAnimationEmotions( &( inObj->permanentEmots ) );
+
+ if ( showShiverSweat ) {
+ setAnimationHeat( inObj->heat );
+ }
+ else {
+ setAnimationHeat( 0.5 );
+ }
// draw young baby lying flat
double rot = 0;
@@ -5421,6 +5445,12 @@ ObjectAnimPack LivingLifePage::drawLiveObject(
restoreSkipDrawing( heldObject );
}
+ if ( showShiverSweat ) {
+ setAnimationHeat( inObj->heat );
+ }
+ else {
+ setAnimationHeat( 0.5 );
+ }
setAnimationBadge( badge );
if( badge != -1 ) {
@@ -5502,6 +5532,13 @@ ObjectAnimPack LivingLifePage::drawLiveObject(
setAnimationEmotion( babyO->currentEmot );
addExtraAnimationEmotions( &( babyO->permanentEmots ) );
+ if ( showShiverSweat ) {
+ setAnimationHeat( inObj->heat );
+ }
+ else {
+ setAnimationHeat( 0.5 );
+ }
+
doublePair babyHeldPos = holdPos;
if( babyO->babyWiggle ) {
diff --git a/gameSource/animationBank.cpp b/gameSource/animationBank.cpp
index 7af8c0887..20acb5ae8 100644
--- a/gameSource/animationBank.cpp
+++ b/gameSource/animationBank.cpp
@@ -73,7 +73,6 @@ static char outputMouthFrames = false;
static char mouthFrameOutputStarted = false;
-
static char shouldFileBeCached( char *inFileName ) {
if( strstr( inFileName, ".txt" ) != NULL ) {
return true;
@@ -555,6 +554,7 @@ void freeAnimationBank() {
delete [] mouthShapes;
mouthShapes = NULL;
}
+
if( mouthShapeFrameList != NULL ) {
delete [] mouthShapeFrameList;
@@ -1338,6 +1338,19 @@ void setClothingHighlightFades( float *inFades ) {
}
+static float drawWithHeat = 0.5;
+
+void setAnimationHeat( float heat ) {
+ drawWithHeat = heat;
+ }
+
+
+static int sweatDropSprite = 88;
+
+void setAnimationSweatSprite( int spriteID ) {
+ sweatDropSprite = spriteID;
+ }
+
static char shouldHidePersonShadows = false;
@@ -3461,6 +3474,50 @@ HoldingPos drawObjectAnim( int inObjectID, int inDrawBehindSlots,
+
+ // sweat drops
+ if( i == headIndex &&
+ obj->person &&
+ drawWithHeat > 0.5 ) {
+ doublePair offset = {0, 20};
+ double rot = 0.12;
+
+ if( inFlipH ) {
+ offset.x *= -1;
+ rot *= -1;
+ }
+
+ if( animHeadRotDelta != 0 ) {
+ offset = rotate( offset, -2 * M_PI * animHeadRotDelta );
+ }
+
+
+ doublePair sPos = add( animHeadPos, offset );
+
+ sPos = add( sPos, inPos );
+
+ double sinVal = getOscOffset(
+ inFrameTime,
+ 0,
+ 0.4,
+ 1.0,
+ 0 );
+
+ setDrawFade( (drawWithHeat - 0.5) * 2 );
+ SpriteHandle sweatDrop = getSprite( sweatDropSprite );
+ if( sweatDrop != NULL) {
+ drawSprite( sweatDrop,
+ sPos,
+ 1.5 + sinVal * 0.1,
+ animHeadRotDelta - rot,
+ inFlipH);
+ }
+ setDrawFade(1.0);
+ }
+
+
+
+
// shoes on top of feet
if( ! skipSprite &&
inClothing.backShoe != NULL && i == backFootIndex ) {
diff --git a/gameSource/animationBank.h b/gameSource/animationBank.h
index 11b25f12d..6e32d83b1 100644
--- a/gameSource/animationBank.h
+++ b/gameSource/animationBank.h
@@ -476,6 +476,8 @@ void setAnimationEmotion( Emotion *inEmotion );
// add an extra layer of emotion for drawObjectAnim calls
void addExtraAnimationEmotions( SimpleVector<Emotion*> *inList );
+void setAnimationHeat( float heat );
+void setAnimationSweatSprite( int spriteID );
// set to -1 to clear
// drawn on top of tunic of people who are drawn
diff --git a/gameSource/settings/wonlife-plus/showShiverSweat.ini b/gameSource/settings/wonlife-plus/showShiverSweat.ini
new file mode 100644
index 000000000..573541ac9
--- /dev/null
+++ b/gameSource/settings/wonlife-plus/showShiverSweat.ini
@@ -0,0 +1 @@
+0
diff --git a/gameSource/settings/wonlife-plus/sweatDropSprite.ini b/gameSource/settings/wonlife-plus/sweatDropSprite.ini
new file mode 100644
index 000000000..9f7285879
--- /dev/null
+++ b/gameSource/settings/wonlife-plus/sweatDropSprite.ini
@@ -0,0 +1 @@
+88
\ No newline at end of file
diff --git a/gameSource/settings/wonlife-vanilla/showShiverSweat.ini b/gameSource/settings/wonlife-vanilla/showShiverSweat.ini
new file mode 100644
index 000000000..573541ac9
--- /dev/null
+++ b/gameSource/settings/wonlife-vanilla/showShiverSweat.ini
@@ -0,0 +1 @@
+0
diff --git a/gameSource/settings/wonlife-vanilla/sweatDropSprite.ini b/gameSource/settings/wonlife-vanilla/sweatDropSprite.ini
new file mode 100644
index 000000000..9f7285879
--- /dev/null
+++ b/gameSource/settings/wonlife-vanilla/sweatDropSprite.ini
@@ -0,0 +1 @@
+88
\ No newline at end of file
diff --git a/gameSource/settings/wonlife-wondible/showShiverSweat.ini b/gameSource/settings/wonlife-wondible/showShiverSweat.ini
new file mode 100644
index 000000000..573541ac9
--- /dev/null
+++ b/gameSource/settings/wonlife-wondible/showShiverSweat.ini
@@ -0,0 +1 @@
+0
diff --git a/gameSource/settings/wonlife-wondible/sweatDropSprite.ini b/gameSource/settings/wonlife-wondible/sweatDropSprite.ini
new file mode 100644
index 000000000..9f7285879
--- /dev/null
+++ b/gameSource/settings/wonlife-wondible/sweatDropSprite.ini
@@ -0,0 +1 @@
+88
\ No newline at end of file