diff --git a/game/base-system/attitudes.twee b/game/base-system/attitudes.twee index 2061fb8f836f662fdad373f136ec03cbde690e64..c370b98755c1a8988aaf0b38353a20a8a0781a4e 100644 --- a/game/base-system/attitudes.twee +++ b/game/base-system/attitudes.twee @@ -306,6 +306,21 @@ <<if _args[0] is true>> <<set _leftHand["Punch"] to "lefthit">> + <<if $umbrellaDurability gte 1>> + <<set _leftaction["Umbrella"] to "leftumbrella">> + <</if>> + <<if $combatExtended.blocking is 1>> + <<set _leftaction["Block"] to "leftblock">> + <</if>> + <<if $combatExtended.countering is 1>> + <<set _leftaction["Counter"] to "leftcounter">> + <</if>> + <<if $combatExtended.feinting is 1>> + <<set _leftaction["Feint"] to "leftfeint">> + <</if>> + <<if $combatExtended.hookpunching is 1 and $combatExtended.stabilityLost is 0>> + <<set _leftaction["Hook Punch"] to "lefthookpunch">> + <</if>> <<set _leftHand["Pull their hand off your neck"] to "stopchokenoncon">> <<else>> <<set _leftHand["Press their hand to your neck"] to "keepchoke">> @@ -352,6 +367,21 @@ <<if _args[0] is true>> <<set _rightHand["Punch"] to "righthit">> + <<if $umbrellaDurability gte 1>> + <<set _rightaction["Umbrella"] to "rightumbrella">> + <</if>> + <<if $combatExtended.blocking is 1>> + <<set _rightaction["Block"] to "rightblock">> + <</if>> + <<if $combatExtended.countering is 1>> + <<set _rightaction["Counter"] to "rightcounter">> + <</if>> + <<if $combatExtended.feinting is 1>> + <<set _rightaction["Feint"] to "rightfeint">> + <</if>> + <<if $combatExtended.hookpunching is 1 and $combatExtended.stabilityLost is 0>> + <<set _rightaction["Hook Punch"] to "righthookpunch">> + <</if>> <<set _rightHand["Pull their hand off your neck"] to "stopchokenoncon">> <<else>> <<set _rightHand["Press their hand to your neck"] to "keepchoke">> @@ -394,6 +424,9 @@ }>> <<if _args[0] is true>> <<set _feet["Kick"] to "kick">> + <<set _feetaction["Dodge"] to "dodge">> + <<set _feetaction["Plant"] to "plant">> + <<set _feetaction["Submit"] to "submit">> <</if>> <<if $promiscuity gt 34 or $deviancy gt 34 or _args[0] is true>> <<set _feet["Grab their penis"] to "grab">> diff --git a/game/base-system/feats.twee b/game/base-system/feats.twee index 068ed50835d81e82abbf109817737640b4365e2c..e9a4bd3ef3923eabe76d96a50edc7f10631b1f27 100644 --- a/game/base-system/feats.twee +++ b/game/base-system/feats.twee @@ -122,7 +122,7 @@ newLife:{cost:20, limit: _newLifeLimit, minCount: 1, count:_newLife, exclusive:""}, aNewBestFriend:{cost:10, limit: 10 * _earSlimeFeats, minCount: 1, count:_earSlimeFeats, exclusive:""}, tattoos:{cost:5, limit: 25, minCount: 2, count:_tattoosFeats, exclusive:""}, - defaultMoves:{cost:5, limit: 25, minCount: 1, count:_keys.count("A New Life"), exclusive:""}, + defaultMoves:{cost:5, limit: 100, minCount: 1, count:_keys.count("A New Life"), exclusive:""}, randomClothing:{cost:1, limit: 20, minCount: 0, count:0, exclusive:""}, specialClothing:{cost:40, limit: 40, minCount: 1, count:_keys.count("Curious Attire"), exclusive:""}, sexToys:{cost:30, limit: 30 * _sexToysFeats, minCount: 1, count:_sexToysFeats, exclusive:""}, diff --git a/game/base-system/widgets.twee b/game/base-system/widgets.twee index 3b10d89b792ed015e3e4c5858bcb915afbdab314..67d14cd96a0c0ba9dc31d45091d9b177235278dc 100644 --- a/game/base-system/widgets.twee +++ b/game/base-system/widgets.twee @@ -897,7 +897,7 @@ <<widget "combatskulduggeryskilluse">> <<if $statFreeze isnot true>> - <<if $skulduggery gte 1000>> + <<if $skulduggery gt 1000>> <<set $skulduggery += 3 / $AMCTraits.skulduggery>> <<else>> <<set $skulduggery += 3>> @@ -911,7 +911,7 @@ <<widget "lockpickTrainingSetuse">> <<if $statFreeze isnot true>> - <<if $skulduggery gte 1000>> + <<if $skulduggery gt 1000>> <<set $skulduggery += _args[0] / $AMCTraits.skulduggery>> <<else>> <<set $skulduggery += _args[0]>> @@ -926,7 +926,7 @@ <<widget "swimmingskilluse">> <<if $statFreeze isnot true>> - <<if $swimmingskill gte 1000>> + <<if $swimmingskill gt 1000>> <<set $swimmingskill += 9 / $AMCTraits.swimming>> <<else>> <<set $swimmingskill += 9>> @@ -972,7 +972,7 @@ <</if>> <</if>> - <<if _AMCmod is 2 and V[$subject] gte 1000>> + <<if _AMCmod is 2 and V[$subject] gt 1000>> <<set V[$_subject + "_exam"] to Math.clamp(V[$_subject + "_exam"] + ($_gain * _skill_mod / _AMCmod), -107, 200)>> <<else>> <<set V[$_subject + "_exam"] to Math.clamp(V[$_subject + "_exam"] + ($_gain * _skill_mod), -107, 200)>> @@ -985,7 +985,7 @@ <</widget>> <<widget "scienceskill">> - <<if $science gte 1000>> + <<if $science gt 1000>> <<set _args[0] to _args[0] / $AMCTraits.science>> <<else>> <<set _args[0] to _args[0]>> @@ -994,7 +994,7 @@ <</widget>> <<widget "mathsskill">> - <<if $maths gte 1000>> + <<if $maths gt 1000>> <<set _args[0] to _args[0] / $AMCTraits.maths>> <<else>> <<set _args[0] to _args[0]>> @@ -1003,7 +1003,7 @@ <</widget>> <<widget "englishskill">> - <<if $english gte 1000>> + <<if $english gt 1000>> <<set _args[0] to _args[0] / $AMCTraits.english>> <<else>> <<set _args[0] to _args[0]>> @@ -1012,7 +1012,7 @@ <</widget>> <<widget "historyskill">> - <<if $history gte 1000>> + <<if $history gt 1000>> <<set _args[0] to _args[0] / $AMCTraits.history>> <<else>> <<set _args[0] to _args[0]>> @@ -1111,7 +1111,7 @@ <<elseif $exposed is 1>> <<set $athletics += 1>> <</if>> - <<if $athletics gte 1000>> + <<if $athletics gt 1000>> <<set $athletics += Math.trunc(_temp * 1.4 / $AMCTraits.athletics)>> <<else>> <<set $athletics += Math.trunc(_temp * 1.4)>> @@ -1122,7 +1122,7 @@ <<widget "tending">> <<if _args[0] and $statFreeze isnot true>> - <<if $tending gte 1000>> + <<if $tending gt 1000>> <<set $tending += (_args[0] * 2 / $AMCTraits.tending)>> <<else>> <<set $tending += (_args[0] * 2)>> @@ -1133,7 +1133,7 @@ <<widget "housekeeping">> <<if _args[0] and $statFreeze isnot true and $housekeeping lt _args[1]>> - <<if $housekeeping gte 1000>> + <<if $housekeeping gt 1000>> <<set $housekeeping += (_args[0] * 2 / $AMCTraits.housekeeping)>> <<else>> <<set $housekeeping += (_args[0] * 2)>> @@ -1144,7 +1144,7 @@ <<widget "danceskill">> <<if _args[0] and $statFreeze isnot true>> - <<if $danceskill gte 1000>> + <<if $danceskill gt 1000>> <<set $danceskill += _args[0] / $AMCTraits.dancing>> <<else>> <<set $danceskill += _args[0]>> @@ -1161,7 +1161,7 @@ <<elseif $exposed is 1>> <<set _temp *= 1.1>> <</if>> - <<if $physique gte $physiquesize>> + <<if $physique gt $physiquesize>> <<set $physique += 10 * _temp / $AMCTraits.physique>> <<else>> <<set $physique += 10 * _temp>>