2017-09-28 Fix stats screen caption showing only one winner if multiple teams have won
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 21:32:42 +0200] rev 12579
Fix stats screen caption showing only one winner if multiple teams have won
2017-09-28 ASA fruit03: Fix skipping not adding to turn time in next turn
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 19:26:22 +0200] rev 12578
ASA fruit03: Fix skipping not adding to turn time in next turn
2017-09-28 A Space Adventure: Remove or shorten intro sequences of side missions
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 18:39:59 +0200] rev 12577
A Space Adventure: Remove or shorten intro sequences of side missions Also increase initial ready time in death02 and fruit03
2017-09-28 Lua API: Add ReadyTimeLeft variable
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 18:36:24 +0200] rev 12576
Lua API: Add ReadyTimeLeft variable
2017-09-28 ASA: Improve displaying of mission panels all over the place
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 17:26:54 +0200] rev 12575
ASA: Improve displaying of mission panels all over the place Also fix mission panel often not shown when watching full intro sequence.
2017-09-28 Fix typo in Polish translation
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 08:55:10 +0200] rev 12574
Fix typo in Polish translation Reported from the Feedback dialog
2017-09-28 ASA: Explain team abbreviations + update changelog
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 07:45:28 +0200] rev 12573
ASA: Explain team abbreviations + update changelog
2017-09-28 ASA fruit02: Refactor captain lime hog, use 1 gear only instead of 2
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 07:40:39 +0200] rev 12572
ASA fruit02: Refactor captain lime hog, use 1 gear only instead of 2
2017-09-28 Fix team colors of most teams in A Space Adventure to denote correct ally status
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 07:09:18 +0200] rev 12571
Fix team colors of most teams in A Space Adventure to denote correct ally status A Space Adventure often gave different colors to allied teams, which is wrong! A few exceptions remain for technical reasons.
2017-09-28 ACF8: Fix mission panel being shown after victory (if the leader fled)
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 02:42:10 +0200] rev 12570
ACF8: Fix mission panel being shown after victory (if the leader fled)
2017-09-28 ACF7: Mention mines time
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 02:00:40 +0200] rev 12569
ACF7: Mention mines time
2017-09-27 Don't play “missed” taunt if a target has been hit
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 01:15:25 +0200] rev 12568
Don't play “missed” taunt if a target has been hit
2017-09-27 ASA: Fix 2 important fruit planet mission unlocking bugs
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 00:46:06 +0200] rev 12567
ASA: Fix 2 important fruit planet mission unlocking bugs
2017-09-27 ASA, Spacetrip: Fix stats screen messages when running out of fuel
Wuzzy <almikes@aol.com> [Thu, 28 Sep 2017 00:17:41 +0200] rev 12566
ASA, Spacetrip: Fix stats screen messages when running out of fuel
2017-09-27 ASA, death02: Use GetAmmoName for the enemy hog names
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 23:41:56 +0200] rev 12565
ASA, death02: Use GetAmmoName for the enemy hog names
2017-09-27 ASA,desert03: Fix no victory after destroying all targets
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 23:24:29 +0200] rev 12564
ASA,desert03: Fix no victory after destroying all targets
2017-09-27 ASA, desert03: Change box appearance, don't lose as long there are still flames in game
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 23:09:25 +0200] rev 12563
ASA, desert03: Change box appearance, don't lose as long there are still flames in game
2017-09-27 ASA, Spacetrip: Reset turn time on successful Moon landing
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 20:47:18 +0200] rev 12562
ASA, Spacetrip: Reset turn time on successful Moon landing
2017-09-27 ASA, Spacetrip: Drop weapons on player when landing on moon by rope
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 20:44:09 +0200] rev 12561
ASA, Spacetrip: Drop weapons on player when landing on moon by rope
2017-09-27 Update ChangeLog for ASA, increase spacetrip turn time to 20s
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 19:30:59 +0200] rev 12560
Update ChangeLog for ASA, increase spacetrip turn time to 20s
2017-09-27 ASA, Spacetrip: Better behaviour when entering mission while stuck on woon w/o fuel
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 19:26:12 +0200] rev 12559
ASA, Spacetrip: Better behaviour when entering mission while stuck on woon w/o fuel
2017-09-27 ASA, Spacetrip: Fix not properly recognizing crate collection
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 19:13:28 +0200] rev 12558
ASA, Spacetrip: Fix not properly recognizing crate collection
2017-09-27 ASA: Update mission texts properly after watching dialog
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 18:43:28 +0200] rev 12557
ASA: Update mission texts properly after watching dialog
2017-09-27 ASA: Spacetrip: Fix guards ignoring stealing completely, fix various other game logic fails
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 18:18:35 +0200] rev 12556
ASA: Spacetrip: Fix guards ignoring stealing completely, fix various other game logic fails
2017-09-27 ACF: Replace TurnTimeLeft=0 with EndTurn(true)
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 15:45:42 +0200] rev 12555
ACF: Replace TurnTimeLeft=0 with EndTurn(true)
2017-09-27 ACF: Use skull grave for cannibal teams (for real)
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 06:38:51 +0200] rev 12554
ACF: Use skull grave for cannibal teams (for real) There was a typo. “Skull” is invalid, it must be “skull”
2017-09-27 Fix ACF2 mission sometimes being unwinnable after returning to Leaks A Lot
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 06:17:41 +0200] rev 12553
Fix ACF2 mission sometimes being unwinnable after returning to Leaks A Lot After accepting cyborgs offer, combat should normally start after walking past the tree. This sometimes didn't work, the mission did not advance and you could never win, even after defeating the Stronglings.
2017-09-27 Infinite skips in ACF5
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 06:04:02 +0200] rev 12552
Infinite skips in ACF5
2017-09-27 ACF2: Convert to EndTurn
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 05:55:40 +0200] rev 12551
ACF2: Convert to EndTurn
2017-09-27 ACF2: Remove restart option when cooperating with cyborg
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 05:49:20 +0200] rev 12550
ACF2: Remove restart option when cooperating with cyborg
2017-09-27 Disable SD in ACF6 and ASA: The first stop
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 04:28:34 +0200] rev 12549
Disable SD in ACF6 and ASA: The first stop
2017-09-27 ACF6: Fix error message spam when falling into water when took last rope crate w/o touching ground
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 03:54:35 +0200] rev 12548
ACF6: Fix error message spam when falling into water when took last rope crate w/o touching ground
2017-09-27 ACF2: Fix weird skip ammos
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 02:57:44 +0200] rev 12547
ACF2: Fix weird skip ammos
2017-09-27 Shorten a mission text in ACF, mission 2
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 02:47:15 +0200] rev 12546
Shorten a mission text in ACF, mission 2
2017-09-27 ACF1: Fix various problems with the parachute section
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 02:26:33 +0200] rev 12545
ACF1: Fix various problems with the parachute section
2017-09-26 Improve the mission texts in ACF, mission 1
Wuzzy <almikes@aol.com> [Wed, 27 Sep 2017 01:00:35 +0200] rev 12544
Improve the mission texts in ACF, mission 1
2017-09-26 ACF, mission 3: Fix broken sequence when princess got caged (failed parcours)
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 22:54:11 +0200] rev 12543
ACF, mission 3: Fix broken sequence when princess got caged (failed parcours)
2017-09-26 ACF, mission 3: Put in 3 girders per girder crate
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 22:04:09 +0200] rev 12542
ACF, mission 3: Put in 3 girders per girder crate
2017-09-26 ACF, epilogue: Play default epilogue if campaign var is not found in team
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 20:55:19 +0200] rev 12541
ACF, epilogue: Play default epilogue if campaign var is not found in team
2017-09-26 Add ca. 10 announcer messages
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 20:00:30 +0200] rev 12540
Add ca. 10 announcer messages Shout-out to UltiMaxKom
2017-09-26 Use correct kill counts for the remaining ASA missions as well
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 19:13:26 +0200] rev 12539
Use correct kill counts for the remaining ASA missions as well
2017-09-26 Show correct kill counts in all ASA missions (fixes #147)
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 18:54:35 +0200] rev 12538
Show correct kill counts in all ASA missions (fixes #147)
2017-09-26 ASA, The first stop: Fix team ranking and kills in stats screen (bug 147)
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 16:25:57 +0200] rev 12537
ASA, The first stop: Fix team ranking and kills in stats screen (bug #147)
2017-09-26 New Lua API function: GetTeamStats, to get team stats
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 16:07:44 +0200] rev 12536
New Lua API function: GetTeamStats, to get team stats
2017-09-26 ASA, the final battle: Fix mission panel not appearing if you watched the dialog
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 05:09:33 +0200] rev 12535
ASA, the final battle: Fix mission panel not appearing if you watched the dialog
2017-09-26 ASA, death01: Slightly change professor's response if he got killed on the moon
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 04:56:19 +0200] rev 12534
ASA, death01: Slightly change professor's response if he got killed on the moon
2017-09-26 ASA, The first stop: Take possibility into account that whole team can be wiped out
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 03:58:23 +0200] rev 12533
ASA, The first stop: Take possibility into account that whole team can be wiped out
2017-09-26 ASA, a frozen adventure: Save bazooka and excess freezers in checkpoints
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 03:05:59 +0200] rev 12532
ASA, a frozen adventure: Save bazooka and excess freezers in checkpoints
2017-09-26 ASA: Reset checkpoint after completing checkpointed mission
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 02:31:01 +0200] rev 12531
ASA: Reset checkpoint after completing checkpointed mission
2017-09-26 ASA, a frozen adventure: Retain bazooka on checkpoint 2
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 02:27:33 +0200] rev 12530
ASA, a frozen adventure: Retain bazooka on checkpoint 2
2017-09-26 Improve and fix poor messaging in ASA: A frozen adventure
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 02:24:58 +0200] rev 12529
Improve and fix poor messaging in ASA: A frozen adventure
2017-09-25 ASA, Getting to the device: Add fake crate for the device part with proper collect message
Wuzzy <almikes@aol.com> [Tue, 26 Sep 2017 00:41:30 +0200] rev 12528
ASA, Getting to the device: Add fake crate for the device part with proper collect message
2017-09-25 Remove infinite teleport from ASA: Searching in the dust
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 23:55:53 +0200] rev 12527
Remove infinite teleport from ASA: Searching in the dust
2017-09-25 ASA: Searching in the dust: Fix incorrect crate content display after collecting device part
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 23:48:56 +0200] rev 12526
ASA: Searching in the dust: Fix incorrect crate content display after collecting device part
2017-09-25 ASA, Searching in the dust: Fix Hog Solo being able to rope past all smugglers
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 23:04:15 +0200] rev 12525
ASA, Searching in the dust: Fix Hog Solo being able to rope past all smugglers
2017-09-25 ASA: Inform the player about a checkpoint reset
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 22:25:10 +0200] rev 12524
ASA: Inform the player about a checkpoint reset
2017-09-25 ASA: Reset mission checkpoints when going to Spacetrip
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 21:41:38 +0200] rev 12523
ASA: Reset mission checkpoints when going to Spacetrip
2017-09-25 Fix ASA: A frozen adventure not working when starting from checkpoint
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 21:18:59 +0200] rev 12522
Fix ASA: A frozen adventure not working when starting from checkpoint
2017-09-25 Remove checkpoints in ASA: Searching in the dust
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 20:46:26 +0200] rev 12521
Remove checkpoints in ASA: Searching in the dust Same rationale as for ASA: Getting to the device
2017-09-25 Remove checkpoints in ASA: Getting to the device
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 20:09:33 +0200] rev 12520
Remove checkpoints in ASA: Getting to the device This means the player now must win this mission in one go. Justification: There were many ways for the mission to be saved in an unwinnable state, there are many ways to win this mission and the checkpoints try to "force" one particular way. Also, this mission isn't too long anyway.
2017-09-25 ASA, Spacetrip: Improve messages when running out of fuel
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 19:32:36 +0200] rev 12519
ASA, Spacetrip: Improve messages when running out of fuel
2017-09-25 ASA, Spacetrip: Fix mission fail if touching ground in flying saucer but still got fuel
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 19:25:39 +0200] rev 12518
ASA, Spacetrip: Fix mission fail if touching ground in flying saucer but still got fuel
2017-09-25 ASA, Spacetrip mission: Fix poor detection of crate collection
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 19:16:14 +0200] rev 12517
ASA, Spacetrip mission: Fix poor detection of crate collection
2017-09-25 Fix first ASA mission rapidly skipping turns on failure
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 18:58:50 +0200] rev 12516
Fix first ASA mission rapidly skipping turns on failure
2017-09-25 Fix hard-to-read blue team color in ASA campaign
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 18:17:44 +0200] rev 12515
Fix hard-to-read blue team color in ASA campaign
2017-09-25 Use EndTurn to replace TurnTimeLeft=0 in ASA campaign (fixes #225)
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 18:02:35 +0200] rev 12514
Use EndTurn to replace TurnTimeLeft=0 in ASA campaign (fixes #225)
2017-09-25 Fix crate types in A Space Adventure and some user missions
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 17:06:35 +0200] rev 12513
Fix crate types in A Space Adventure and some user missions
2017-09-25 Fix crate types (weapon/utility) in A Classic Fairytale missions
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 16:50:35 +0200] rev 12512
Fix crate types (weapon/utility) in A Classic Fairytale missions
2017-09-25 ACF mission 6: Fix incorrect crate types (weapon vs utility)
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 16:35:07 +0200] rev 12511
ACF mission 6: Fix incorrect crate types (weapon vs utility)
2017-09-25 Fix mines not working in first turn in ACF, mission 6 (bug 180)
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 16:07:31 +0200] rev 12510
Fix mines not working in first turn in ACF, mission 6 (bug #180)
2017-09-25 Remove explicit (and redundant) SD message in ACF mission 6
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 15:34:07 +0200] rev 12509
Remove explicit (and redundant) SD message in ACF mission 6 The SD message is already handld properly by the engine, no need to repeat it in Lua.
2017-09-25 ACF, mission 6: Fix messages, now they imply that destroying crates is also OK
Wuzzy <almikes@aol.com> [Mon, 25 Sep 2017 15:25:16 +0200] rev 12508
ACF, mission 6: Fix messages, now they imply that destroying crates is also OK
2017-09-24 Remove white stripes in flags of armenia, ireland, turkey
Wuzzy <almikes@aol.com> [Sun, 24 Sep 2017 04:13:04 +0200] rev 12507
Remove white stripes in flags of armenia, ireland, turkey
2017-09-23 Write documentation to explain those files in Data/Names
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 22:00:23 +0200] rev 12506
Write documentation to explain those files in Data/Names
2017-09-23 Randomized teams now can have any random hats (not just from types.ini)
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 21:05:57 +0200] rev 12505
Randomized teams now can have any random hats (not just from types.ini) The predefined hat sets still work, however. There are now 3 types of hat selections: 1) Use hats from types.ini 2) Randomly select one hat for all hedgehogs 3) Randomly select hat for each hedgehog (rare)
2017-09-23 Clean up name .cfg files, remove implicit defaults
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 20:05:16 +0200] rev 12504
Clean up name .cfg files, remove implicit defaults
2017-09-23 More random names: angel, morbid, pokemon-like, viking, darth vader, stormtrooper, war-themed
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 19:49:41 +0200] rev 12503
More random names: angel, morbid, pokemon-like, viking, darth vader, stormtrooper, war-themed
2017-09-23 Chance that clicking the random hats button produces a set of equal hats
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 09:35:45 +0200] rev 12502
Chance that clicking the random hats button produces a set of equal hats
2017-09-23 Use completely random hats when clicking on "Random hats" button in team editor
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 09:12:35 +0200] rev 12501
Use completely random hats when clicking on "Random hats" button in team editor - Previously this button used the hat sets from types.txt
2017-09-23 Fix random teams rarely being empty
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 07:45:18 +0200] rev 12500
Fix random teams rarely being empty This is because I managed to screw up types.ini ... XD
2017-09-23 Stop PhysFS from complaining when a random name .cfg file is missing
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 07:38:41 +0200] rev 12499
Stop PhysFS from complaining when a random name .cfg file is missing
2017-09-23 Add random female hedgehog names
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 06:54:48 +0200] rev 12498
Add random female hedgehog names
2017-09-23 Add more random team names and hats
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 06:47:13 +0200] rev 12497
Add more random team names and hats
2017-09-23 Add a bunch of random team names
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 04:59:16 +0200] rev 12496
Add a bunch of random team names
2017-09-23 Add many random hedgehog names for more variety
Wuzzy <almikes@aol.com> [Sat, 23 Sep 2017 03:36:30 +0200] rev 12495
Add many random hedgehog names for more variety Mostly tried to be generic but also fun sometimes. I tried to keep it simple.
2017-09-22 mix it up some more. also had screwed up -- inside quotes
nemo [Fri, 22 Sep 2017 18:45:51 -0400] rev 12494
mix it up some more. also had screwed up -- inside quotes
2017-09-22 should be harder to dodge than a xor
nemo [Fri, 22 Sep 2017 18:07:11 -0400] rev 12493
should be harder to dodge than a xor
2017-09-22 Fix charging sound continuing to play on hog damage (#236)
Wuzzy <almikes@aol.com> [Fri, 22 Sep 2017 23:07:52 +0200] rev 12492
Fix charging sound continuing to play on hog damage (#236)
2017-09-22 Fix the key for toggling team bars being incorrectly described in the settings page
Wuzzy <almikes@aol.com> [Fri, 22 Sep 2017 19:26:57 +0200] rev 12491
Fix the key for toggling team bars being incorrectly described in the settings page
2017-09-22 Backed out changeset c19e5ece5b3f
Wuzzy <almikes@aol.com> [Fri, 22 Sep 2017 19:17:06 +0200] rev 12490
Backed out changeset c19e5ece5b3f Because the controls scheme was actually intentional. Whoops!
2017-09-22 Upddate changelog for previous commit
Wuzzy <almikes@aol.com> [Fri, 22 Sep 2017 18:59:54 +0200] rev 12489
Upddate changelog for previous commit
2017-09-22 Fix rotatemask (hedgehog info) key toggling team bars instead of changing hedgehog tags
Wuzzy <almikes@aol.com> [Fri, 22 Sep 2017 18:46:28 +0200] rev 12488
Fix rotatemask (hedgehog info) key toggling team bars instead of changing hedgehog tags Pressing rotatemask toggled the team bars, but it was clearly indicatd otherwise in the controls menu. To change hog tags, you must have pressed rotatemask+precise which is not what users expect. New behaviour: - rotatemask changes hog tags - rotatemask+precise toggles team bars
2017-09-22 Fix more typos in de.txt
Wuzzy <almikes@aol.com> [Fri, 22 Sep 2017 18:02:37 +0200] rev 12487
Fix more typos in de.txt
2017-09-22 Add some German announcer messages (mostly by Topf)
Wuzzy <almikes@aol.com> [Fri, 22 Sep 2017 17:46:36 +0200] rev 12486
Add some German announcer messages (mostly by Topf)
2017-09-22 Unstretch and recolor 5 poorly made flags
Wuzzy <almikes@aol.com> [Fri, 22 Sep 2017 17:12:16 +0200] rev 12485
Unstretch and recolor 5 poorly made flags
2017-09-22 Fix a couple of German typos
Wuzzy <almikes@aol.com> [Fri, 22 Sep 2017 05:28:25 +0200] rev 12484
Fix a couple of German typos
(0) -10000 -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 tip